diff --git a/Manifest b/Manifest
index 7a49caa339ae..3795ac065bff 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29605 BLAKE2B d01a3c78170935edd48bbbd788d60499a8695db42033b93ecd906f2c861a03198ee445165895d96d8739eee971fd7fd958b0f7093eea1db2921b9684528cd160 SHA512 fb083d25d48b6db93e8f6c1f74608767cb73c9967a27baaa96be0adb8948b3caeb7f2f6a12489aa6f92b613e876bef4cb95c90147c12c55409336ba9d1a727c4
-TIMESTAMP 2022-05-27T09:39:55Z
+MANIFEST Manifest.files.gz 29609 BLAKE2B 529f74e0c58a492bb43b08052705206720c12d84dd6f0579b159c86569742936dc3eda2d5c93ea684189d3fe1e9530582a6f5a32f0059d310e784761ee4ca7f5 SHA512 830e86fe6e55b25e31e91bf74efeea7728f09308ec044b093576f2c09a039d54c286a7f26b01947ce008f96fb26c7737917000a88cf6349e3c88cf12e2b718af
+TIMESTAMP 2022-05-31T06:09:35Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKQnGtfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKVsR9fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBqmRAAkaH34jdC/OnQirBTWcoPYaLROSGI6IV6/xsqnL/kzStPTRYtmdU/1jWm
-MAZCuBKQ0ZYVXmKzp8FJEo6geIwZCOwjdpbeVXMEJ6bmbzRWxIgtDtO5KrTKDWqW
-HEOWTjEK2AnCMrFPfwvbUcjEZK9REw6AqmvV0h5YulLeaSiNKu+bWD/18E8UDReD
-0zTn764Vu6Rzla3gLfktpCP4iADMh+E769q25DQjGCjVLaMUUWbtFxBRwTIy2rYJ
-fxqlkA7ugF7h2UXIzQToQFVsR9Bax8Se55r9/5fNR7tyNuhvezV3DIIVkz0jFiPQ
-xMTWjEzxadAf1cCGym5cpErBejvTVzP7Mszrb1NyHJsR3dv/6PJ+uqgjlsHKehFi
-XtLUTcVwzzPgtAtTQoaWfz/21C5q515l8n3EuLZhKQeZS9QNoCNhRXx7io9hCAFV
-YJds/Z9F0JY4+KUkLgRlCEgUF/SjBnJaAoYlneq8DfjEQzzc90OyWXg8/2+7YlGl
-UexDUvESCHc7Na1M0AShLpVVwQ+DKZdNfO5ABFUqlEI4MnhiaxtfIThlxEMlOeDg
-GuheId+MIQwNPCbFUI/TQyPfNdLSU87fwUAGqdmtgzirwKjWfbqvDREecmPVZIJo
-GNKD5RzgWjQE4ZYrpwcz/+JyrG10eKrJFbnDKko60QRMLa9qGU4=
-=wZwk
+klDU7w/7BWzg7ByjE88rX5r/L+6ngeEDPX1F+cUs/qsH45i+8xpkZGi3oI9SYE4c
+DIhhweUaVN+oEUtImAdus7CuZfxo7wgwiAt6nZiiM035gHuz6Z7Tu4LdXbtA3YHh
+iw2aEJK1knvT0zuODxPIirGX8Oa30wSUKB893tqIypTJ5t2VXTy8tUXSmVtF020F
+1KKJs2mz6sB4IVq/LyaaGmkxbhrtnvT1UiFfCNWCp9E7qzq11gh/6olb6n3uGYvN
+qjIgFm+VQy+I8nd7VHcoYb40dWjXUvj0wacMEa28dj/NLXKWqsDh+V2SmLfD71oW
+64wPjyfK3C72jd2zSzvz5NiQTdPVMpJ/JoZ2j6irr7Sxw/enulfFB4T0rd5LFcVZ
+zCjoy/A9MJmpnVbkoz7v2lLN9Ul+XhcgUtABDKwu4B/0ORObWf0QVKApUbK0isMe
+6eLA7WlpcU32tQqqGWax+0lUX/TtlEMmfAvvhmTcnbghXBVMafq3FVY+pSfgNgHN
+z2kijUNrU9S/ObY5rA5Et9iziOKWI9gP+JHWS1affv/48Rkx4AbvUgHe5tEswCaD
+8NatpVHzWYobR5GuR2KjdLw7o/pcrTMdTjcocRPXqGcy3DX+LGT1nv34oBFEXkNe
++BvKeUOZ+aqekIur7LG6PpEGrbGxVvLnglmK5h6TeL6w4CPfaKg=
+=paly
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 62afd3c57e20..8147dea9a487 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index b55161d6e32d..5764b3a7e451 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index 4686a292bc5d..04f681eb0a67 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -6,5 +6,5 @@ DIST at-spi2-core-2.44.0.tar.xz 209692 BLAKE2B 149251ba4061f5dbfac1e27775491bb6d
 DIST at-spi2-core-2.44.1.tar.xz 209780 BLAKE2B e76f0b0c478564181db774633dfc9613bdfa6c74c5c52878d877723e37605b7b7169fee45a9025b331e84bf5af8132eed50b388db9ac1aee0fec7776a633628a SHA512 8d85df75f886c4a19d829d14e5a9412b607b9cbe2d1b7ecb95b4082602f0624e90747fe955f96d378c3a52bc0e732074b97008bb34e6acc2722c7056b2c0504e
 EBUILD at-spi2-core-2.42.0.ebuild 1510 BLAKE2B f9ccee7e9bf28fc0c9865284cdf2fd76215d6cc90a7130c17ee21eb67d56998594a130530a467758ccf095c2de5ed560e1686ea1751b8b22f73040fc173c6ea8 SHA512 d4da094c2b88c0eb26a41c89bde4be1793888a50cb43c88dd4801bca5c02d24e744d19ce73f5c3dab5f07b15d6426a85c2f8530068f05acc46899dfb39d776fe
 EBUILD at-spi2-core-2.44.0.ebuild 1520 BLAKE2B e43adcb6ff0f55e4ea43f2a87a442e108b4e144d3fc1b2ce7da3872d6b6606f92fbd5f202a7af005033985fd60abb1c67dd9a3626b25c957d1ea66f1c792b2ea SHA512 ea203e37cebb4d89c9bc4f5b23085ac4c275368ba62f69350b5a4d6936d4dfa3e17256d83779d5652b06de0b7c93f13d50f03cba2a34ca4f593d9e65229bc09a
-EBUILD at-spi2-core-2.44.1.ebuild 1472 BLAKE2B 5c68d2fc308ac9b9491bf30b3625486e9deda8634881e3fa5aaa20134d82b87d4a19ff7b3b8e251c11e32fe045c6b5b42655ab73dca4d2c41fb6fa638cc88454 SHA512 f034ea55818890454becd9f334daf6f0098c591d58cd28d206882f9135ded712af1a6041ebe821595fa64d60a1556ef349475ed1dcc5d2e3de495e2bf4fb67b9
+EBUILD at-spi2-core-2.44.1.ebuild 1465 BLAKE2B 0f0940cac6487bc10a12f7be25d854334363c4cb32efd5463c3a0b02a2baedb7850123ce6bc32ef4d97e50d1fd54348c71619269563b60235579c58c79177480 SHA512 c2872411daca454670871b7784dafc80cfecddd49e7a8adb13dd4753f69daf60ef72bf5e6716c62b90bc8bad92e708cc086dc193e2063327ad535d800e3ef556
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
index cc1490ec802f..a43938b296e1 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
 REQUIRED_USE="gtk-doc? ( X )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
diff --git a/app-accessibility/edbrowse/Manifest b/app-accessibility/edbrowse/Manifest
index ecda679cdbcb..d9d66ef672ba 100644
--- a/app-accessibility/edbrowse/Manifest
+++ b/app-accessibility/edbrowse/Manifest
@@ -1,5 +1,6 @@
+AUX edbrowse-3.8.2.1-quickjs-respect-flags.patch 1090 BLAKE2B 2f47f98bdbac25911650577bfe469291f9e489786eb5eb971283589a3dad8f582f9423a4c08d9696ad18217a7e47f70c21d50cb2bfbc2b737c3a8c731c1693a3 SHA512 a86f8fc67b319311b72c919e5829943c406926a535b90ab01fbd9aeb9559b40d25ad912068a8df090804c2324ce47b8610e10b2a0bf6e793d4d1ee29d01122f7
 AUX edbrowse-3.8.2.1-respect-ldflags.patch 392 BLAKE2B 65237beadceab3928786d56c6ac8872564f085b886e80e4638cf4872f2104fffa34119b7fa7443dc1d90fae0e5a3a9b124691ee69877aad8f6d786286b85c850 SHA512 cc7f096f30fb93f5fd3d15af77edfab43ef83df1ab341ff8984372c1c4a22aaf4cfb823446d2ed8da380a2baf178debb647dde05c1d633dd88cb6987b172cb0f
 DIST edbrowse-3.8.2.1.tar.gz 909574 BLAKE2B e5358861f6747dfe12498403b2d4761ab16dabc513fe94455d88c44e07793fb1128b0c1b7ebdf9ef922e371148182f8127f67f11eb123877e804858cb7e6378b SHA512 b5774a836efe96aae77052b02f6fcc85920b5f86a6ab8436a6dc363d81531b30e7f9c7555aacb20af27e59565042bdd685eed2acd4dfde8b99e2ad0358f19927
 DIST quickjs-2788d71.tar.gz 599260 BLAKE2B 67618f491c3efd1aa15a8906557983dd7123a3cfb2584f2f499f005667ccac4ded1c77934d2807cfce9e042572c6c41d63982b3df7afab5b2c67f4ce9f357879 SHA512 4493d11bc60855711955e0159e9f568d7e3db59c9843ef3aae00846f82c5e33f501372f7f5861b431353355f400f77720f3265963ea7bc0e38635ab5b89a27a0
-EBUILD edbrowse-3.8.2.1-r1.ebuild 1266 BLAKE2B e7328e8263f61e0025200b1a586d647eaf0c146b4c78af3604fe6826c085e8913b4ea4cb9c0d59fcc7ddafd4b7f6b1a043a23023995c00c19787247aa4d56a6c SHA512 6fc658efeec35a44bff32fdb2af4e09ee1a12b2ce7f12111290bede9b2865378547670bdf42568327f19f9ed428351869bcdf589b3ca11d654a5744a2a720585
+EBUILD edbrowse-3.8.2.1-r2.ebuild 1442 BLAKE2B 8bdaa3d9e6afb074dedfb2de9f93e7f669170393a50ef606cf6651862864ce4f9030223c34facd8ef3765316bde87495f1c3d1ee058ce2ac014bf5321368f0eb SHA512 7e31b07b7ef601120aa6d67dff1f00c27d7cea7147ddb77de3dd204c053038ddc89d867838514c1fa6d86fa11f7efb1d76c1acc438c61b4cb602d6f1ef7b5a7c
 MISC metadata.xml 340 BLAKE2B 13c88efa300cbf9a242554fa41b530a764b874060608cc3720ce7e835a3fff28524efb121270bc80a5ef8aeac04e1a0b51ac5eb421c7173b9896b9c8fa56e02f SHA512 03dd5a0561636f582985dc98b8d1b37a268f6d7a4109844be462066cae2162f53f8f09dd3d63f5a87e188c6754297b9daca190e481cd323ab6c9c045e8c33cc2
diff --git a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
similarity index 74%
rename from app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
rename to app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
index d9e6b8f22449..98763b8f9d32 100644
--- a/app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
+++ b/app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
@@ -2,6 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
+inherit edo toolchain-funcs
+
 QUICKJS_HASH=2788d71e823b522b178db3b3660ce93689534e6d
 QUICKJS_SHORT=2788d71
 QUICKJS_S="${WORKDIR}/quickjs-${QUICKJS_HASH}"
@@ -15,29 +18,39 @@ SRC_URI="https://github.com/CMB/edbrowse/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="odbc"
 
 RDEPEND="
 	>=app-text/htmltidy-5.0.0:=
+	dev-db/unixODBC
 	dev-libs/libpcre2:=
 	net-misc/curl
 	sys-libs/readline:=
-	odbc? ( dev-db/unixODBC )"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/perl
 	sys-apps/ed
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}"-respect-ldflags.patch
+)
 
-	PATCHES=(
-		"${FILESDIR}/${P}"-respect-ldflags.patch
-	)
+src_prepare() {
+	default
+
+	cd "${QUICKJS_S}" || die
+	eapply "${FILESDIR}/${P}"-quickjs-respect-flags.patch
+}
 
 src_compile() {
 	# First build quickjs so we can link to its static library.
 	# Also, quickjs doesn't appear to tag releases.
-	tools/quickjobfixup "${QUICKJS_S}" || die
-	emake -C "${QUICKJS_S}"
+	edo tools/quickjobfixup "${QUICKJS_S}"
+	emake -C "${QUICKJS_S}" CC="$(tc-getCC)" AR="$(tc-getAR)" libquickjs.a
+
+	tc-export CC
 	emake -C src QUICKJS_DIR="${QUICKJS_S}" STRIP=
 }
 
diff --git a/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
new file mode 100644
index 000000000000..f0af474427f0
--- /dev/null
+++ b/app-accessibility/edbrowse/files/edbrowse-3.8.2.1-quickjs-respect-flags.patch
@@ -0,0 +1,41 @@
+* Don't overwrite CFLAGS
+* Respect CPPFLAGS
+
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@
+ ifdef CONFIG_CLANG
+   HOST_CC=clang
+   CC=$(CROSS_PREFIX)clang
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wextra
+   CFLAGS += -Wno-sign-compare
+   CFLAGS += -Wno-missing-field-initializers
+@@ -87,7 +87,7 @@
+ else
+   HOST_CC=gcc
+   CC=$(CROSS_PREFIX)gcc
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO
+     AR=$(CROSS_PREFIX)gcc-ar
+@@ -110,7 +110,7 @@
+ CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
+-CFLAGS_OPT=$(CFLAGS) -O2
++CFLAGS_OPT=$(CFLAGS)
+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
+ LDFLAGS=-g
+ ifdef CONFIG_LTO
+@@ -269,7 +269,7 @@
+ 	$(CC) $(CFLAGS_OPT) -fPIC -DJS_SHARED_LIBRARY -c -o $@ $<
+ 
+ $(OBJDIR)/%.nolto.o: %.c | $(OBJDIR)
+-	$(CC) $(CFLAGS_NOLTO) -c -o $@ $<
++	$(CC) $(CFLAGS_NOLTO) $(CPPFLAGS) -c -o $@ $<
+ 
+ $(OBJDIR)/%.m32.o: %.c | $(OBJDIR)
+ 	$(CC) -m32 $(CFLAGS_OPT) -c -o $@ $<
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 8a78a0a11c4b..3426fe215f19 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -3,5 +3,5 @@ DIST orca-42.0.tar.xz 3658384 BLAKE2B 7b8b83205e9b8c16021cb3582ca8ada195384b5dee
 DIST orca-42.1.tar.xz 3700132 BLAKE2B 1310a1b43da709e9b273ce21374fff9fa30fbf08d1d0e171eb7eff4511ad5e2bcee12a2d6549a4c0c8e21526fb6f4b3b311d0e09fd6bfa863e29168809df9c10 SHA512 98f016087317666c4dcc7543d16ffb93214075d49d3708a1aa3dc8b6dd5d9d85c52dd31e650f4511371061c58d53e73455a09d6d7b4405b8a972b58ff1d7db91
 EBUILD orca-41.2.ebuild 1562 BLAKE2B 23c0907b11da9aca993aed45ea94f9bed04553d421fcf76bd241d582f3189943edb8d7e9dd7d09ce158573b06bd71a231126e854cab047a31a2323a52da7d484 SHA512 9ce417d9e0175bf2dd5790a85bfdc6feec6a00b919b18c6dc9ea28d4b899860cc41e8e949f1a2d441dd3d9cf0ff79442bf62b8afc6b12dbe933ff5b6ead149ce
 EBUILD orca-42.0.ebuild 1565 BLAKE2B 63b5a2cb9baeae99b1aaba4157e7d1f8413252f645792884803a1cea218d9c383b3c2f3e07374be94bee34853591ef308b0f6daa6deebfec6f320bcd273e6fe4 SHA512 2e6213329641e0529f81008bf151b662708f186b00f813d009ca99344cbcee35876dcfd827d3390d1d8e57561ab59c4705384e4560bff3e2cea1d6e5025ec666
-EBUILD orca-42.1.ebuild 1565 BLAKE2B 63b5a2cb9baeae99b1aaba4157e7d1f8413252f645792884803a1cea218d9c383b3c2f3e07374be94bee34853591ef308b0f6daa6deebfec6f320bcd273e6fe4 SHA512 2e6213329641e0529f81008bf151b662708f186b00f813d009ca99344cbcee35876dcfd827d3390d1d8e57561ab59c4705384e4560bff3e2cea1d6e5025ec666
+EBUILD orca-42.1.ebuild 1562 BLAKE2B 23c0907b11da9aca993aed45ea94f9bed04553d421fcf76bd241d582f3189943edb8d7e9dd7d09ce158573b06bd71a231126e854cab047a31a2323a52da7d484 SHA512 9ce417d9e0175bf2dd5790a85bfdc6feec6a00b919b18c6dc9ea28d4b899860cc41e8e949f1a2d441dd3d9cf0ff79442bf62b8afc6b12dbe933ff5b6ead149ce
 MISC metadata.xml 641 BLAKE2B 2a9a0582cf597e46cf71f11034a17ed3146f5d2709855be3f64530c94be53bdbb7ac8e8be859969706c67e6b32e1f8a33fe97b3e54d41b27a4f6ee3807f19fd6 SHA512 4119f9cc00c1978ada19d63f559ba35bec6299732bf50e3fb724c531dae3c3052e26fb1e7ec7830c55c98ef800ff0a6ecbb01df98e3b64781ff42eb7ef9ce7fb
diff --git a/app-accessibility/orca/orca-42.1.ebuild b/app-accessibility/orca/orca-42.1.ebuild
index b5714207dce1..3e8ea706bcd3 100644
--- a/app-accessibility/orca/orca-42.1.ebuild
+++ b/app-accessibility/orca/orca-42.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4448fae0e643..81dc255a33a1 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index d430bbe661cd..6d7140cb3395 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -7,7 +7,7 @@ DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
 EBUILD ansible-base-2.12.3.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.4.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
-EBUILD ansible-base-2.12.5.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
+EBUILD ansible-base-2.12.5.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.6.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
 EBUILD ansible-base-2.13.0.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
 EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
diff --git a/app-admin/ansible-base/ansible-base-2.12.5.ebuild b/app-admin/ansible-base/ansible-base-2.12.5.ebuild
index 06d9ba54c027..e8c2a3cb1c45 100644
--- a/app-admin/ansible-base/ansible-base-2.12.5.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.5.ebuild
@@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 7a8863c88083..4996503c7b90 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,8 +1,8 @@
 AUX ansible-lint-6.0.2_test-module-check.patch 689 BLAKE2B 69152c8799165f8efcf44640ad44133147e95945aeb4aee7a5a45aa0e74432fce599040f017ae92fb7264855f74c0bcd71a44e26abf0abebfcce2cbcaea39ada SHA512 01be971c7d33086aa799910ac744cfceb07b4d5041716043c49667075ab8c8579b57f0c14a8094248f96462c93fff3ac110776aa0aa1ea3adf11dc622028ca7e
 DIST ansible-lint-5.4.0.tar.gz 349353 BLAKE2B 9f41abdf1e9485afa4c8ed9498627b0dcbdcf57916f3b57c9886de8bd806e4e5b34e7e9c2e66b44ac8009a0afcea4d8566900ee8d391eaca61081fa23323c41c SHA512 f1bbbb49eb77991d60b6087646c695a938d328d719bba67707af4ed858de857d383b78490bcf0930cffebd13a0b0abde20269a47e47e4713a37da715a28c5da0
 DIST ansible-lint-6.0.2.tar.gz 195044 BLAKE2B 3334049dd1dc05444c6c362601da8d7e808c6b3473e87613b8892651cecb76058cb0aa370aa5d00cf6bc76ee3b096480fdce52facee4f043c01d6c76084860ba SHA512 a47e79c59dfcf3e36654247bd206581798f2559261142e3943b60e0688d75b5a6332832a9f9127f99b2faa6afff959a33c55fbc80aa5881f064725998420f679
-DIST ansible-lint-6.1.0.tar.gz 223702 BLAKE2B 5aeaccbaf9c1bd8e7236e946b408779b42e0839766a485bdbb80ece19ed63b57fa38cb44796c860f6929bb2e98acd21a3de3a9c07486535ed3e6ab5cb499c8d9 SHA512 c1ca5abe8e5f441a86db6a4b4fa03c2d87ed2277151ada9af34c3d8af6934d2c1d4b6bffbc11d6cfb7cd7601c9e43a041fe8a2b940fa0630532df05004e11d15
+DIST ansible-lint-6.2.2.tar.gz 232952 BLAKE2B 571dce6dc348c1158fed396fc29054421d172964facd8cbb0f8c1560036de574aa304f59497c8c76415ac99424d0450c8b06509ced113c9a997808e960793621 SHA512 ae119b29d87ce59e7bd5c401a8fcbc2194bdddecd5a65010ea02aee62cff1764a767803a57edcfd297e9ad0cbdf70fe69212625ed80b21afb53b4ebe429a7636
 EBUILD ansible-lint-5.4.0.ebuild 1852 BLAKE2B 913794c189a58ed0fa3cd0febde7b0ac4788294bee7b1309eb1d70f5619289d4c80f57a8227a7a834ce299c6a24a7c59285425c737d7b0cbd1e53c47ac570650 SHA512 5ca55f7c4d72b01d95813ecef1f3e984ff92993fb0cbf7e5090d938349dba942b88e695e6e34e022385c5a4d6e1fb457766d19aee606ceddedc458fa84c91bb4
 EBUILD ansible-lint-6.0.2.ebuild 2259 BLAKE2B 5fecb95420b58fe2892e0f825e935494bc548d8e2b7a89a43b5706c224f13c463b4bb1f95299549dc5974976a3d20ab430c588016e0588065a967e0e40baedc1 SHA512 96383643638ab38ab80a77c1ff513086632e6ccc9e55b79d8e74df1986f8a1af261ca45a0113ab8e0be403bcb3bda6e2573c0e8728405afcacecc0e95f36e7e8
-EBUILD ansible-lint-6.1.0.ebuild 2849 BLAKE2B 12f9937ecb8163eb90b994a17bcbf3e13af0b7d04efd0c173a055ee90b1fd60a17368598e25f7473074976c6486751dcd7e359482a63285d2ebc50ee88b720b3 SHA512 8ac94aa2c13f20ae8c6cd899e079843e6b6c096abe80b5c25f71f4a8076a3e9046ca340eb0dcf6a0a4139a2ff1c10749193d66379e84064a1eeda838dd38bf35
+EBUILD ansible-lint-6.2.2.ebuild 2443 BLAKE2B 65f93d1523c1cea6ceab40516c4b228881660718f4f7a4a2d98ffe205e7aa4e1b43d57ba6f081ff0d8e291889ba470f701e479fa24848eb0ad561fc85def2b5a SHA512 ddd4cfcf1940a27b3af62bd440e81c21c5fc7a6faaec5875398396bfc1dda54ee00023199e8d6f0e10f3c225a3d5ee26c5fd21edd1d59e3cb51e2342e8b8c1f5
 MISC metadata.xml 561 BLAKE2B 0f55fc4da270c495c445e5afff0a8f7aaedd01abf3640f848cd9dc21e01fa7324c78846ee4bf917e4869b6c377fef61254a2288fa3d572c1bb77279571fb6631 SHA512 bd6bf6b916a0b736a0bfdd633f6569ce3124458169d77ef1cd86d6dda4099774088871560ce0106e11f139a2b48f13445e7a844e03a8669160c7e3fa44be5f36
diff --git a/app-admin/ansible-lint/ansible-lint-6.1.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild
similarity index 68%
rename from app-admin/ansible-lint/ansible-lint-6.1.0.ebuild
rename to app-admin/ansible-lint/ansible-lint-6.2.2.ebuild
index 994f48b51065..8e20fa3a01ff 100644
--- a/app-admin/ansible-lint/ansible-lint-6.1.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.2.2.ebuild
@@ -17,14 +17,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~riscv"
 
-# Since 6.0.2, access to Ansible Galaxy (i.e. the Internet) is required even to get
-# the test suite started (Bug #836582). TODO: Talk to upstream about how to bypass this.
+# Since 6.2.0 ansible-lint once again does not need access to Ansible Galaxy
+# even to get the test suite started, however quite a large fraction of tests
+# fails without network access. Needs more work.
 PROPERTIES="test_network"
 RESTRICT="test"
 
 RDEPEND="
 	>=app-admin/ansible-base-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-2.0.3[${PYTHON_USEDEP}]
+	>=dev-python/ansible-compat-2.0.4[${PYTHON_USEDEP}]
 	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.5.1[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
@@ -46,7 +47,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
 )
 
-# Skip problematic tests:
+# Skip problematic tests (TODO: update this list for ansible-lint-6.2.0+):
 #  - test_call_from_outside_venv doesn't play nicely with the sandbox
 #  - all test_eco and some test_prerun tests require Internet access
 #  - as of 5.4.0, test_cli_auto_detect fails even when run manually with tox
@@ -63,15 +64,9 @@ EPYTEST_DESELECT=(
 distutils_enable_tests pytest
 
 python_test() {
-	# For some reason the schema files do not get installed in spite of being present in release tarballs,
-	# with the test suite relying on "refreshing" them (i.e. downloading them from the Internet) instead
-	# - and seemingly occasionally failing to do even that right. Just stick with the bundled files.
-	# TODO: check if this is still needed every new release.
-	local schemadir="${BUILD_DIR}/install/$(python_get_sitedir)/ansiblelint/schemas/"
-	cp src/ansiblelint/schemas/*.json "${schemadir}" || die
+	# As of 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules
+	# in both ${ED} and ${S}.
+	cd "${S}" || die
 
 	epytest test
-
-	# Make sure src_install() does not install these regardless of whether src_test() has run or not.
-	rm "${schemadir}"/*.json || die
 }
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index dd236d105181..a07c67fdc374 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -6,6 +6,6 @@ DIST ansible-5.7.1.tar.gz 35657258 BLAKE2B e13d294327ff6e6ca42a5fe95d5795c984319
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
 EBUILD ansible-5.4.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.5.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
-EBUILD ansible-5.7.0.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
+EBUILD ansible-5.7.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.7.1.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
diff --git a/app-admin/ansible/ansible-5.7.0.ebuild b/app-admin/ansible/ansible-5.7.0.ebuild
index 999bc1a1edb8..21e85e45cd01 100644
--- a/app-admin/ansible/ansible-5.7.0.ebuild
+++ b/app-admin/ansible/ansible-5.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-base-2.12.0
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a7f9b2b20c48..6fb4773248af 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,6 +1,7 @@
 DIST aws-cli-1.23.9.gh.tar.gz 2204177 BLAKE2B 6f3b975ffa10b027a4ccd07bb27ec9a9c0b1e5151fe2e33685c6eb15eafd551afde3a619e7b2f60cf42328b5f53ff0de2c2e41f1c105807e13fa77ebe957d5cb SHA512 75e9222bc3fb26c2f8c5cbe7c32ee06a48163517e14d23e8432178af8a702e26444cee78336703a1bfa7f6963d7fd05cf2581d887382daf1650cfb9c8bc2eeb8
 DIST aws-cli-1.24.0.gh.tar.gz 2206596 BLAKE2B 5b73eca17e16dec43bfdee4271fc29f3dd7194c2de6cc27d00ec3fab5f0dc968b46312a490eb6b53760ceb12370a247f95f0a1b433d3e16b09f09c6d594c51a0 SHA512 d9c5778352d9ca787db305905214fc7b71b5bbc36ee0de4815bbc7d0bcac549c11e5b480090f5fac904aa8bf7735850a3151912abdceb225bd4a998100f48a3d
 DIST aws-cli-1.24.1.gh.tar.gz 2213336 BLAKE2B 2d442ac650b524c8b52be2288aefa76693221a3becbbc752d1add748d731887cbac6b96b0a30e48587714e31d399830fef848598b2104e749de40a52e96917d5 SHA512 097ac7b3d64f017ca5c3c979ed5bc191860cb7431cc9eea81e4f9f760f8760e4884ea04d3c93fbc839f1d0c03c3431c3041f32508026f869b27e25c280ef458b
+DIST aws-cli-1.24.10.gh.tar.gz 2219050 BLAKE2B 9655429a65c81b5c6436f0bafb293243d8f6d2160573902bbd3f2b10ab69ef24796ac0c1bd112000afc3d15cc4d8560fc95f774c38739cf8e2d3303a4512e3ec SHA512 592564ff501ff52572655973c518366928a20371333ccf4f7234d414070343a38287a8870a5652bbbe6a8c35c8cd8731439f1520c0988100ade22d842f11ad2d
 DIST aws-cli-1.24.2.gh.tar.gz 2214514 BLAKE2B 93c2e58377f302435c078a0ad4a8b3f465631965633ce51a2993ce57152026b99eb9599620c1400ced0ddd6d1024258d93dca3c4f3bfa3a6f59c3ff56a98a897 SHA512 5f58967714c1285ca065e90aa567370c3b3b11619e812fa271aaeb1e1c5af55a2388fadcccc441a808e6cf73275c3cffbba86699dc4cbd86f09fbcf20c7f1734
 DIST aws-cli-1.24.3.gh.tar.gz 2215539 BLAKE2B b571cac95eed696dd3a9242d8291d42ab9c66d192bf090c8df02cdccfe2ab84bdbf73fa145d9ca30cdf3313f39c5b66a931bf5aa3745ad56202aaff787b827d8 SHA512 e9eadd4e82d3fe56eb227eff0fa6bb0080755f4f7ae4219340c73dabbca5b6e6256bdd3a9ff116878becd47e7a245752ad6ea25c7908d9429c41a12b14ab2c59
 DIST aws-cli-1.24.4.gh.tar.gz 2215845 BLAKE2B 9b95b53feba4d61e44276c7ee1587a45f91d4171ba102327bb23b308b801a7322873a8e48e420c66a72123fa6ed3e49f54d8d63eaac638d1bd0f80d27a9f1013 SHA512 345e6fc02c04e6a1c2635a29e4c2a00a2ba14ccf2f1de6167ac8113a05cee01b33add850b4bf95ce9ca22449101c0b49993841097d4d3bc7836ca9fd9f80748d
@@ -12,6 +13,7 @@ DIST aws-cli-1.24.9.gh.tar.gz 2218350 BLAKE2B 9e2a672330a7fa9c814a02786e99830943
 EBUILD awscli-1.23.9.ebuild 1811 BLAKE2B 5c7a4c3e43e396098987682075dbe1e49ef6d15d826b99276a0c12202200935251d9e2ef93c98db98a24a62672696c4a17ebb4bab667337b308ae2d8dd64f474 SHA512 5fee61d8edc58cac265d84d893cb557a032d22f6e132c63eb5061ce0c3afac0f14eb1fded3cef03533137e4fcc43f7668cccb93e0e450b151fafd54852c24d11
 EBUILD awscli-1.24.0.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
 EBUILD awscli-1.24.1.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
+EBUILD awscli-1.24.10.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
 EBUILD awscli-1.24.2.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
 EBUILD awscli-1.24.3.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
 EBUILD awscli-1.24.4.ebuild 1813 BLAKE2B f1e86ab8f5c8ac7817b46709cfb3e860985a475107a700c6818922d3aaabe1787ef128816eb8eb9580d46325e5b01aa643b9cb08f94df1957e32296e310fd16a SHA512 c4af586ec56601df3308c5395e37060410080f18662c4e52f9f6bfbe860a516a72bb64db97017d2aae6e97dc648fef9c97eed24e95d71d18821302e1878e12a3
diff --git a/app-admin/awscli/awscli-1.24.10.ebuild b/app-admin/awscli/awscli-1.24.10.ebuild
new file mode 100644
index 000000000000..acabee851193
--- /dev/null
+++ b/app-admin/awscli/awscli-1.24.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 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 bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/checksec/Manifest b/app-admin/checksec/Manifest
index 3bc3c319e3c0..cae976d6a3b0 100644
--- a/app-admin/checksec/Manifest
+++ b/app-admin/checksec/Manifest
@@ -2,7 +2,9 @@ AUX checksec-1.7.2-path.patch 510 BLAKE2B d17d260f41cf0c7e71accfa4b728a9c35511d1
 DIST checksec-2.2.3.tar.gz 2241535 BLAKE2B 850977dc14d1b57dc947f81af904aca71a7d664bf695619de2b6f7a1014a95176813c4fcd8c39a6c89b028291fa1a08a2beaf6f4dce27f53624202bb0e72ed2c SHA512 d1516dc4321f30a57f88d3279fa228b4dbb0f16345c3c7e9d89575ddc3ed9dffae42f392e76321a5a9aba876717aae959365fc829f0abb58c1c21f34dbbf59b7
 DIST checksec-2.4.0.tar.gz 2242079 BLAKE2B c1878c1312d13591147f0efd1a2d535ae8e75292dbc53e7ba0802c8d165b18b4bc0b22a5cc3a9159ddcf05a1518d58c18cb54700ea5a52ff29d261068194b96a SHA512 1a02dfac48b5979cb5c2eb7b8f1fe290d3ac090726d1b95a14864bfc4bc3d32eefc10e2cc227c9dc01809c78fe003d1faea9b720d5cb5fbc16599fc0e2512947
 DIST checksec-2.5.0.tar.gz 2623122 BLAKE2B b4a876dfc8b9f02d5d74b6720b59ee216fbdab4e7df471aa4a78e7e6a98830b1b03f9a66d8b9dd344261fe1a253db4e5e9bede53f47e1fd171b2d23b0e04f031 SHA512 dd76061976d7f97c250b9d24b9cc7c6ea26c9df7e3521e3a1f39f56812485afaae6d60c611e1b7f4817b1585d10fc2116eaa032bb690e39a0243529e324943ab
+DIST checksec-2.6.0.tar.gz 2624551 BLAKE2B bfda79dfdfc672119d70612497893ba91f093719f95e2b387d27da81d7f8b50e2bc54e9d030d84db76dc2a599bb1f866608529149896259ce517450318640c82 SHA512 71ba0f24b7db0c7fa74dfeaa74b2722ffe792c77941316da916dc7aae888f147c81f98d1522f63b96aa3a76aff7bb1d98522a02efa312b3b3a9dd9a137239010
 EBUILD checksec-2.2.3.ebuild 757 BLAKE2B f0752c0d0636142ecadf0abd561bebe82ee923570ef55374cfe567776d22785ad99e1ccd1cd5660723a24c0a2a9a9d428f43f3622e5bb472a4347514d8bf7692 SHA512 aa6e146d7ce82d49ada59ffb4f2f327c99608b5b2c164af317d4c0a627f28f10a8760f4b958678f1726fcaa496f87689165185f8a6e9bd2cb0c1cbb297fb7f91
 EBUILD checksec-2.4.0.ebuild 781 BLAKE2B 00490a46040ca8941022cf242fd98033e1dea0b923085c39c4d294aa632de3822eb32ce055c5f67fb65668beaba54c5b53d0de6b6b938ea35f937d5420c95685 SHA512 afcd0a3a9aa2690a9ef0881045e58907d1ddb42930a8f2e199ad4f71ddb074952c20c800fe0d5c803d44f401e144312898fbb0ef85a53800908c79bc1a0c867b
 EBUILD checksec-2.5.0.ebuild 785 BLAKE2B bb1f654903da6f13b3b708318e643a4962857d1a2dbc70851549e1600198236e0cc82f3eaeb9556d6b29d29586281be63f89af0b4336f7ef9436f5a4896ee142 SHA512 140488b6744699a027ed02fb0085e61e5dbe8332c22578971576076f81e68add6d01376ad449df9e22a93b6a0a05a489ca22786eb7d604c390d86e28b81dcb0c
+EBUILD checksec-2.6.0.ebuild 734 BLAKE2B b4c554f8c46bdc33014eb067252bb88f353d505e9f2e8dd3d2386c5a7867a41d752fa3a3fb803eefd4e00b8a247b5052364c82306547132117f48ff536dfa4a8 SHA512 f7f614e89774c8dbd254e9ef29445c463c14747d532c4dd1f8b95beaa3b9af3240ed235e9d747bd13fe87e13e61e04da1706b00856bad35120bd9f4dda9d0a0d
 MISC metadata.xml 335 BLAKE2B 99e07579c1f644b8fa7d4b52de2110716ff7aef864466b323567f923623b41b6b1eccdfab55a0acb64ab0d8400497aa0b48bbb2095b2e115ecffb693a3ae40fe SHA512 c48521c1ce01a289d48974025a9aa8e6d8e00437bb89e1f35f862764872f73a988e17e53a903cf2c4ccfbebbaaa1cf57e548fc1741fabb0f958e991b4e0a02e5
diff --git a/app-admin/checksec/checksec-2.6.0.ebuild b/app-admin/checksec/checksec-2.6.0.ebuild
new file mode 100644
index 000000000000..1811c76d6d91
--- /dev/null
+++ b/app-admin/checksec/checksec-2.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+MY_PN=${PN}.sh
+DESCRIPTION="Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)"
+HOMEPAGE="https://github.com/slimm609/checksec.sh"
+SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_PN}-${PV}
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	sed 's,^pkg_release=false,pkg_release=true,' -i ${PN} || die
+	default
+}
+
+src_install() {
+	default
+
+	doman extras/man/*
+
+	insinto /usr/share/zsh/site-functions
+	doins extras/zsh/_${PN}
+
+	dobin ${PN}
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index fe51009b9f05..f3b39dbd29ac 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -4,6 +4,6 @@ DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d
 EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
 EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
 EBUILD keepassxc-2.7.0-r2.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
-EBUILD keepassxc-2.7.1-r1.ebuild 2373 BLAKE2B f864e4da175f6c3498fe7353359f95c119f59bba95506185a74ded1e747ca8678ea9c3053087474a19853bd67f965d748741cf9429f0b11be9f161e535610501 SHA512 d1243f9a04b99291c6627e6084512d0b3f3d8f587b26b6bf333087c231b5fadc42cbb1ac0100fb0aec0f05073dcfbb1ffc71f9aa1232ee218772b24b7bb1b94d
+EBUILD keepassxc-2.7.1-r1.ebuild 2371 BLAKE2B 9bd8707b862566c9b1c1ddda68ef69e6a17f576ab4eb0a987a177220192a6af12696079fc98a3e840a481f9ea2bd7fc8acc314dd610f518b8abc3eb2b7407878 SHA512 436e42d7de68f4424c1acae462163628d9c7ddc498aa894f86020d6aa7a690651ec858643cfb5e21576ef651db605697c5aaa9c051c9325caf29b6e0fb37fcea
 EBUILD keepassxc-9999.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
 MISC metadata.xml 1042 BLAKE2B 2fd425f8c61e45707a1f1c18a3ee5db9b902eaeb347ced5302495d92e82495fa5f87d73400ee849e5b97302d02faeeeb91f403646132c5e8b0206af04385af56 SHA512 d59770092ee152198e217f12207a257a58cfc5dd794170bbd8fb7f3ad6ed644714285874ecd70c77389bba95f4587e70dbb2a120067631d33acebb75f3f2f352
diff --git a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
index 0793091a0b25..5dfddb908929 100644
--- a/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != *9999 ]] ; then
 	else
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index dad61d1c2e7a..4b959c600163 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,3 +1,3 @@
 DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r2.ebuild 758 BLAKE2B a33a2d3da7f9d8323df878f53eff5b1f63e6a05e04451ddf742f04486c129e07c9ee5c06b1662b9badc7f7fd41c902c1eee092097c6cb7be65c79445fe4e3fbc SHA512 f5842b8b85e62573ca485501818986c572aae778316e98d260b77586a63bff3a62f9a7977cada69e8523a9f5bb4a60fc44deb0c66291583c02ae4474015732cf
+EBUILD pydf-12-r2.ebuild 760 BLAKE2B 12a6bd2d2bd414a1c8ec3e133178b01b7bbf4a62973bf43513ba44cdc8b1d69e62b82a03f36056f8e3bd62a0f52395c4c1d4420a7d1368d39dbbea86c5eb4bed SHA512 c6e0a0282082922f863cb387ffbb6f17f449870bc5d398c1ad5d0cec7cdb1f8d370b5e5aeb691e3b6d7d4b3a46403af0001af885bda8fb430273b2b044a00d77
 MISC metadata.xml 252 BLAKE2B 8f2e88684cd606ebc706b4e8bf466be2e06420edfc6fcddda38c60beb4e61a953708892650a5fddfc15292ada69dbf91e8e93f7b67ade205cb599a08f6813418 SHA512 4068eb10878300b604c77bbdd87052cdb8c976f220b3117bcc1f6b0fc79132503ce96e811f01f994388afc306f0eac49f34668da24ba344c966861bc3f0a332d
diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild
index d7c8357b072c..76d281b91643 100644
--- a/app-admin/pydf/pydf-12-r2.ebuild
+++ b/app-admin/pydf/pydf-12-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit python-r1
 
@@ -16,9 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index c713027e8302..6e68714bb75e 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -2,6 +2,8 @@ AUX sysklogd.confd3 71 BLAKE2B 26e34fc5bd8fe936cb5cbe1ad7b3dc9ae47e153d731ecde62
 AUX sysklogd.logrotate 402 BLAKE2B 2aba98bcef0516602268132507248ea44097541ac5659427f24a286661c500e6ff92b387f184bba84d0f10669ff9c917d7c8ee613c7fdb3a472434485b5f8c78 SHA512 655b25bc92c6d73807b11b0d64f97d619c067efb9fc16ee9c2aba5ba349b13991a22c83e7adaafb95e17578b17992992cab16d18b7bdb2be7d4fc876df5824f7
 AUX sysklogd.rc10 443 BLAKE2B 04d5d645a6e79582ce4532fdf5eb4453c61e66017596c641b6ebc087963f7667dc3dcef6d2d90c0602da753fb77fdd063a1bae5907798c47e7c0e92feb9a884c SHA512 274642e7555badc2395e4a08684b07e4b5be91cfe92f5f2e47903263dde1ccb67c9a5932864eb623d11d97a3ad429b28a8ab7a8d93177e949a2f8dec9a1aaea4
 DIST sysklogd-2.3.0.tar.gz 441168 BLAKE2B fa2ec9975d51bcb26d7acc88ab02e211453fc7e6d722ec6d38543a20833ae9c49b9a274d323e7a32deb82ca9c38025947e25b15424084a0ce345410a2e686a4d SHA512 7a16dd3f45a71015ad055e64aa62f4f94b0a8aa739f407c03376241cbc16ff764a768a698362cb428d150b169934798b774622b330903b287f9af5dd846775fc
+DIST sysklogd-2.4.0.tar.gz 450757 BLAKE2B 65f7174ebad122d17032e0095c65df80110a992a40b41a3ecddb1f813605094ce59c1313f5d4f35ae33d0cb7557392a176fc9c2f0f69162b74cb69d531be0a09 SHA512 0f9c4498b3677636abd636a80a8256095798b09f43b6febbcb386b3bce7faae23c44aebc54234462a7aa53fb8e5bf821e89081bdbdba0f72218ac8481365029c
 EBUILD sysklogd-2.3.0.ebuild 2112 BLAKE2B 1f8cb90a6f5ab144eaebc6625b6ab1bffe003a1e3a1ce8e182da214f9bb77ddcfd2a59b95192f8b68230a2315003792bafd68aa9470b7e8412d3e735de32fd55 SHA512 0c2ab19307e93aee1773fd759c734de47869b555b2abe968e3db5ebfb6ad9bbc01c94d2be128fe7e1553a584bd69bbdb59919cd495a6d272022f49ddb486c39b
-EBUILD sysklogd-9999.ebuild 2118 BLAKE2B 9e6ff76cdc6ea39e641a5f23038c1433326816318ce645dcad7565f4bf3b3a7d8aca08d9eec35e16c11002da6659eff8318d3c01d62f75d7170ac635afa4aea6 SHA512 4897b96c8fafebfca0354e4a208612f35663c63d4b212db66cbb6d6486724dbec1cda4c13f941af47cbf94f1b801d1eb93d3c137eb8a203d485f7d6661554373
+EBUILD sysklogd-2.4.0.ebuild 2138 BLAKE2B 0888ef036055107e8d2c3351ae9a4c3f5fbb05d09e28dfeb37bf639374ffe501e59a2d0b5f18894c1fa55a55aef2cea17f930bab25e638b2558e74998449efc2 SHA512 dc9b32d23ba04caeaef35cd519a238bc2a607d3f03cc77f1237b434acc76c989008ad3fc55ebb93f989cd652d9b667c5f891e7f2c2aa7e51e0715b217a3b42c2
+EBUILD sysklogd-9999.ebuild 2138 BLAKE2B 0888ef036055107e8d2c3351ae9a4c3f5fbb05d09e28dfeb37bf639374ffe501e59a2d0b5f18894c1fa55a55aef2cea17f930bab25e638b2558e74998449efc2 SHA512 dc9b32d23ba04caeaef35cd519a238bc2a607d3f03cc77f1237b434acc76c989008ad3fc55ebb93f989cd652d9b667c5f891e7f2c2aa7e51e0715b217a3b42c2
 MISC metadata.xml 433 BLAKE2B b1b1737ea499d650246868d4b0fa748dfa8d72b0f974fc45481a43c20fe7165d8d24ad57731a014cf68ea465641109e66edada5d8f3a6c8896fe0e3d684b5905 SHA512 1bbbe31ecb193b016d57fc59d3d0faa1431c13de0040786a7ce96134c303df741092bae99c5230b7108462d898a5fafa09a631333b8d9dcb2dc13ab1ba930b3b
diff --git a/app-admin/sysklogd/sysklogd-2.4.0.ebuild b/app-admin/sysklogd/sysklogd-2.4.0.ebuild
new file mode 100644
index 000000000000..53e3b031b00b
--- /dev/null
+++ b/app-admin/sysklogd/sysklogd-2.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Standard log daemons"
+HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
+else
+	SRC_URI="https://github.com/troglobit/sysklogd/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="logger logrotate systemd"
+# Needs network access
+RESTRICT="test"
+
+DEPEND="
+	logger? (
+		!<sys-apps/util-linux-2.34-r3
+		!>=sys-apps/util-linux-2.34-r3[logger]
+	)
+"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
+
+DOCS=( ChangeLog.md README.md )
+
+pkg_setup() {
+	append-lfs-flags
+	tc-export CC
+}
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--runstatedir="${EPREFIX}"/run
+		$(use_with logger)
+		$(use_with systemd systemd $(systemd_get_systemunitdir))
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins syslog.conf
+	keepdir /etc/syslog.d
+
+	newinitd "${FILESDIR}"/sysklogd.rc10 sysklogd
+	newconfd "${FILESDIR}"/sysklogd.confd3 sysklogd
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/sysklogd.logrotate sysklogd
+		sed 's@ -r 10M:10@@' -i "${ED}"/etc/conf.d/sysklogd || die
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if ! use logrotate && [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.0 ; then
+		elog "Starting with version 2.0 syslogd has built in log rotation"
+		elog "functionality that does no longer require a running cron daemon."
+		elog "So we no longer install any log rotation cron files for sysklogd."
+	fi
+	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 2.1 ; then
+		elog "Starting with version 2.1 sysklogd no longer provides klogd."
+		elog "syslogd now also logs kernel messages."
+	fi
+}
diff --git a/app-admin/sysklogd/sysklogd-9999.ebuild b/app-admin/sysklogd/sysklogd-9999.ebuild
index cb5409c61e4c..53e3b031b00b 100644
--- a/app-admin/sysklogd/sysklogd-9999.ebuild
+++ b/app-admin/sysklogd/sysklogd-9999.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic systemd toolchain-funcs
 DESCRIPTION="Standard log daemons"
 HOMEPAGE="https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd"
 
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/troglobit/sysklogd.git"
 else
@@ -19,6 +19,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="logger logrotate systemd"
+# Needs network access
 RESTRICT="test"
 
 DEPEND="
@@ -39,7 +40,8 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
diff --git a/app-admin/syslog-summary/Manifest b/app-admin/syslog-summary/Manifest
index 24c517d9bace..c02adc3fdb51 100644
--- a/app-admin/syslog-summary/Manifest
+++ b/app-admin/syslog-summary/Manifest
@@ -2,5 +2,5 @@ AUX syslog-summary-1.14-fix-ignore-code.patch 306 BLAKE2B e319592affd7f13c88cd4e
 AUX syslog-summary-1.14-py3.patch 3982 BLAKE2B e468d0312a9a83b5f6a779223169cb95ad1dc86419c3e82bd5cc6b8955894fcca59723f48ab3b9c3bdc1bfad2b7d9b4524d1da40524432fe58e7391ee808560a SHA512 e3b806e31c4d4456c771f35203a164f85e1859d4885b8ccee35b22856e9628f668f05b5d0ef621c8e41e652d2365670a901ed99a582ff7d8b78452d3b1a209fc
 AUX syslog-summary-1.14-remove-file-magic.patch 836 BLAKE2B a4b2d7d40ab7c15ac33325c97d8bea3df7d7f824c3d301a6be764ac0a5ce9721fd7d6dbdd6a6f48432931fdfca7a2f1cf141eab897e8bdfa1eba20f2f9485153 SHA512 1f860cb96cf5eef124217c8253264fe24f6b7fde3d078d2f41e419490bdb3d9d4df6fed7c9b8cc68a855dfc06f81dfdc4c7e868d9812ed1a306ac65cbc97f833
 DIST syslog-summary-1.14.tar.gz 7278 BLAKE2B 609e506c099b734be87ba6d6e21f70283d4654ab5c6d3794da71099f3e590d178348c13ab271ddb84682220091adfd702c107bf2dee792419de3ce14d2a9c9db SHA512 db1f0660ad435eea26fc3ec4cd475f5f1b98bb629495707741077e52aef88fe8bff4a318bb5b0821e57ccfa0646454c6825a5a4fc1fb4b73ea67cbd4defef277
-EBUILD syslog-summary-1.14-r5.ebuild 888 BLAKE2B ca9de21574e08b741325ad6dbbb00d3643181963e27ec60a872142c677a6185dfad3cdf71ef644bedf3a25fe366757afcf9b808ebdae65e5def985dc36ec895a SHA512 76efbb764a09063c441b44dbc9a339c06ef2062b2336dfbd827bbea8bf8781ae3f1d6e1acbbbabc2b16900ce66d4c5f717c74cb60e537264e5bd9d6846475f72
+EBUILD syslog-summary-1.14-r5.ebuild 887 BLAKE2B 0b84816ef441b1f921b848e68ae7f5b01dc9e3e7ed035fa4d487dfa8cc1c3f046f9b337f22cc69d750bd211f74981e6b108895b4f3a9c846fdbe06171e0a164b SHA512 1db40a1322d1eec84bffa9a4dd5bd1ddd21c1caca5fbd9886e7cc59cb2a930db65f4660efb82d86315a33bd659570cb4b2aa50349026e49117f163422b232508
 MISC metadata.xml 520 BLAKE2B 026de4750d61ac614fdfd94a34b70c50e4ff1f164fe47573709ee11f0b97e56f59f7f898806301c3cebfcd42950f12665262e0c54359493e9681c89deaedeb89 SHA512 a4f7e6ddc67653e86aa6ddf96a92d5fb7c544f8448bb6234bf8d705487dc72b1838e13419bf13e5670e4a50ccd701693734bba2d9608951d6c8a81a186149afc
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
index 6a28fe832410..1a2b2ae756f5 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{9,10} )
 
 inherit python-single-r1
 
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 030392fd1cd8..6e990b42a451 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 431e3a23db60..6facc2a343fb 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -2,6 +2,6 @@ AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649d
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B 571c95c541b3def87351a232b69bd291dc0d50b9676a08a7a2a0a757d5fc993bad72efab1dc29c37302b2126370b5356d1571b232c9b520c43ea176247bbfc9b SHA512 e159729140a4e9046ec5a850dd7fb1d3f22c32adfc6b54748512abcf7aac0a266852a769814aea9a0219b2076c35cfa7b3b0dd33c6dfc1a0b05dbbb315f69ef9
-EBUILD brotli-1.0.9-r4.ebuild 1784 BLAKE2B cc898306038efb987046186e5d5211e4296e5ed7a44b446a9641b13578d16de71301910f81ac0bfc3859bbad3c1f9a60c16fd4a268e22b82ae1cff16c5d24fa9 SHA512 560b079c8416b5ce5e14c9fbc7ebadb7d576f85dd771aa52c733276ea6c3777f942caf4cd5b03f515b0778e0be189260c3a041251afcd8b42be0765d90227608
-EBUILD brotli-9999.ebuild 1784 BLAKE2B cc898306038efb987046186e5d5211e4296e5ed7a44b446a9641b13578d16de71301910f81ac0bfc3859bbad3c1f9a60c16fd4a268e22b82ae1cff16c5d24fa9 SHA512 560b079c8416b5ce5e14c9fbc7ebadb7d576f85dd771aa52c733276ea6c3777f942caf4cd5b03f515b0778e0be189260c3a041251afcd8b42be0765d90227608
+EBUILD brotli-1.0.9-r4.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
+EBUILD brotli-9999.ebuild 1824 BLAKE2B f7d32683b5a0eb543e70ee63635b8bf23193b83cae6c0817676e26d2602236b2df523640dd64b1a6281cd139819bfc7c2fb8a64703077289d450487a0f322e26 SHA512 d09035c96481d6011e659af2ad5536223f4dd5056c060b335f7dd555cd110b08e31d1a95f6c0d9ee0d5eaf76ce50d60d68e8ae7fe9f91771a9e033e432aced71
 MISC metadata.xml 770 BLAKE2B 6e73f34b47e5edbb8007e253191dbc0dd399d1d3f9f1817df851fa6f56bb6e71c90ffed925e5251041a479d0ff6e8084734c45a0d8c56a914a890992c121fedc SHA512 5b43dbaadb8a7c53ec111335ffc57682ade5f30beba4e98cb53a64244fb835baaf3394ffa210763ed36b0abe6c444263117499d4046c4138d644e924683d931a
diff --git a/app-arch/brotli/brotli-1.0.9-r4.ebuild b/app-arch/brotli/brotli-1.0.9-r4.ebuild
index f206ce927497..c61d17cd14ae 100644
--- a/app-arch/brotli/brotli-1.0.9-r4.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r4.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 DOCS=( README.md CONTRIBUTING.md )
 
diff --git a/app-arch/brotli/brotli-9999.ebuild b/app-arch/brotli/brotli-9999.ebuild
index f206ce927497..c61d17cd14ae 100644
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
+BDEPEND="python? ( ${DISTUTILS_DEPS} )"
 
 DOCS=( README.md CONTRIBUTING.md )
 
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 11733d2e8fae..7782a17dbf87 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -2,5 +2,5 @@ AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78f
 DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
 DIST file-roller-3.42.0.tar.xz 878968 BLAKE2B af3a8bb566a0549434f20911315358dbcfb98aab17ca47adaad166f620fc3b8cfc6b60301842a55a0d35ca29f6317b16d07497de759b55bc42b61100e7357066 SHA512 ad151e1dc6546ca45550ab4c7384fb89e91dc2fc17a29437922192fefd5cbcd115d1f064e090dac48ae3fca33709a54bac918cbe03cbfd0e6fc3554913dd8322
 EBUILD file-roller-3.40.0.ebuild 2199 BLAKE2B 5acf854c76e94908a8d5af013d298df9827ab447208549623c2aa026c95bc105f5d10911aeabba3e78dcd3f313e1768c69b9a064875107176e048af5481be3c4 SHA512 fb686a7aa3ef1c5a5bd382a1b8c3556b59d0be208539b043f7da38092aa4136a3a9e272abbca962cee9a08827e3a2be63f744ee7a416ea76e31de50e70e38f6e
-EBUILD file-roller-3.42.0.ebuild 2247 BLAKE2B 956e33e72aa27d2256aaf8d07ceb1b08c17bd4e5837fc5ecd34c6a526b7561b4f0a7397d3171afb000126f2e22507c716faa2e469956a4a3024658adc54ce71e SHA512 8773e9918958d972133b4333927f74a733ad4c05e32b1f7cae8b750205cf7baaa6e26019fa1414aba780931e123990276f3e83691b05ba97c8fbb3fe41ce9689
+EBUILD file-roller-3.42.0.ebuild 2244 BLAKE2B b36266be2187e3472bd06cd572982f9cb543c31192e847b91d1921b6b9c779a7d40727d8477735146ce0666fa9de68bc725d49b0d279233877c242a62bcf74d9 SHA512 e199dd0ad875976b75c249b51e86070a0fb5f0a4d9a4af93e5e78198246f609c8d65043fe0b5541823be6c7d37543f85e35664f568f67c7b22c026a7e13472a8
 MISC metadata.xml 523 BLAKE2B 44d1f4c6636070d561c1d0fdb6bfaaae0f92b81608f52de78f6b5168ca717a7ab0c54ca24a8bde59cd7a7e0be96f195bd8f7eb5e53e820917fec5cf692cea7ec SHA512 79b172bc5f64b91f389c6dee90da6dca10705f07fd469b04486eb90d11988a07002233c0718c3f223df9fd63050b3fb17dc3d5f56b8923e47dfbcc231834fdc9
diff --git a/app-arch/file-roller/file-roller-3.42.0.ebuild b/app-arch/file-roller/file-roller-3.42.0.ebuild
index 4f1ac8f72ee6..1f4a5a97cd14 100644
--- a/app-arch/file-roller/file-roller-3.42.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index f5609f01549f..54e1e405c21c 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -3,7 +3,9 @@ AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0
 DIST unrar-6.0.7.tar.gz 232903 BLAKE2B eba5179f622726046fabedac03e8c05f7dd2f64782dc0be18010deb22c1036b895cbb9429f44239e63d9c04f3e031b4f9787462f4f643f8bca11b135de08f547 SHA512 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
 DIST unrar-6.1.2.tar.gz 234257 BLAKE2B c04b40e4ed08e9bfaad6c7675b392cc52d62c04b9897707c8def726be34187eedee6870a2b055cb0eef1a9df0bcd7bd1130d547184826c2f8c1af226f4e00247 SHA512 7a34db3a5383046a2b2bd5c7abfeb6b80c81666609caf619a700bda09bca908731b03985ad9d2b5d889605807832109fae11b7091d86c1a67c2e46288a42b777
 DIST unrar-6.1.4.tar.gz 235483 BLAKE2B 4fb0dab62dc504bc4535add9cbc6a45e38c16def3206e54359b9dcffdb5626234cfcedd132da83e2300f0dc9a1f410420e0c467dd0f30f0da8a27da895d4b590 SHA512 2996436a3264374593fd97975f4ad53c19c39b57c83a6557c4f34095e5c952528b469ff6698c84b83b9bff5b2e33be47523fdc5b2a02ba2be049624af06d1a5e
+DIST unrar-6.1.7.tar.gz 236798 BLAKE2B e33a7500b4a03a54f84b018ab90934366f52ef54c83257ed7fe4419ba993d2a8c21de26f445ae18d870aa5232cfbf1f5d8fbc0b3965803aeec6cac5e5a38e949 SHA512 b1a95358ff66b0e049597bbc4e1786d0bc909a8aff4aca94ee793d0d5a3c8b052eb347d88f44b6bc2e6231e777f1b711c198711118ae9ffbe8db2f72e7fbe846
 EBUILD unrar-6.0.7.ebuild 1819 BLAKE2B 09a83ed35afafe32d2558bf4a86a08f8158f869f56a8f7db2f8687e777edf24ff9a325c2a493ac34048ac590d8bf67fd9b675a0c07caed9e3284f6f8802194ba SHA512 47304020560aaad41a062245c4a181eaf48de5f21cb90927915b2d001f96586309b585d7a862dba6d7b497d813418a0277f4b5ee355a388ea518fda7779defc6
 EBUILD unrar-6.1.2.ebuild 1825 BLAKE2B aa7ad0f4cd70bec7a91b176526a445dc42350af6a9b046506be8fab9d80a5d2edfd84cb6c21927956bd07e94faa353a43f1b145c33d5ee567e6b2b079fb2c3ec SHA512 2d0d7974dd47d38b145533d37cd79fa6a43292bf2792f1a8fa9b47f8548034a1018beea3494cc47bcc0aaf8be7af631c8ac0e630cc9be5464ed33e13e819a864
 EBUILD unrar-6.1.4.ebuild 1832 BLAKE2B cebc4f475294f1d15143a012733f41f72f747a1afb663e1ace88c1bb8d1b7a820a06668669f92dbcbfa46e63e4bd71c8f5acbf580a0d71fa7d66b6ca38c31a95 SHA512 a6b1a46feec9690f34d696d17570cc3d52dedbfd2b1ca1bc202d269e1193fe1d6f2caa723a107278fc00e87899abeb222d1776626d458e07b568528f822e674f
+EBUILD unrar-6.1.7.ebuild 1832 BLAKE2B cebc4f475294f1d15143a012733f41f72f747a1afb663e1ace88c1bb8d1b7a820a06668669f92dbcbfa46e63e4bd71c8f5acbf580a0d71fa7d66b6ca38c31a95 SHA512 a6b1a46feec9690f34d696d17570cc3d52dedbfd2b1ca1bc202d269e1193fe1d6f2caa723a107278fc00e87899abeb222d1776626d458e07b568528f822e674f
 MISC metadata.xml 521 BLAKE2B bf6d200d054dac732bfbb968ccb376a62230e0d2948a42c6c94ecb6823407877edbf3ec98f33ea21c22ea52b13b32dec508576dccfa34d4948de79741f863882 SHA512 2a4bac4e32c01b93d51cee66abd62f227f1f4b3c57a1d4e3e325724d349508107bf1a078282bcdc5fb5481058cf657040c697a3ff939fb8146f24fce7938eb4d
diff --git a/app-arch/unrar/unrar-6.1.7.ebuild b/app-arch/unrar/unrar-6.1.7.ebuild
new file mode 100644
index 000000000000..f76d44206582
--- /dev/null
+++ b/app-arch/unrar/unrar-6.1.7.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs
+
+MY_PN="${PN}src"
+
+DESCRIPTION="Uncompress rar files"
+HOMEPAGE="https://www.rarlab.com/rar_add.htm"
+SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
+
+LICENSE="unRAR"
+SLOT="0/6" # subslot = soname version
+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 ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.9.3-build.patch
+	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
+	else
+		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
+	fi
+	sed -i "${sed_args[@]}" makefile || die
+}
+
+src_configure() {
+	mkdir -p build-{lib,bin} || die
+	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
+	cp build-{lib,bin}/Makefile || die
+}
+
+src_compile() {
+	unrar_make() {
+		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
+	}
+
+	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
+
+	unrar_make -C build-bin
+}
+
+src_install() {
+	dobin build-bin/unrar
+	dodoc readme.txt
+
+	dolib.so build-lib/libunrar*
+
+	insinto /usr/include/libunrar${PV%.*.*}
+	doins *.hpp
+	dosym libunrar${PV%.*.*} /usr/include/libunrar
+
+	find "${ED}" -type f -name "*.a" -delete || die
+}
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 29650cab0e9a..5cf07ea71eca 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/apptainer/Manifest b/app-containers/apptainer/Manifest
index 9c4c8da3ab94..272f0914d3cb 100644
--- a/app-containers/apptainer/Manifest
+++ b/app-containers/apptainer/Manifest
@@ -1,5 +1,6 @@
+AUX apptainer-1.0.2-trim_upstream_cflags.patch 1142 BLAKE2B 7238229b70a8ac37f3401a163d19dc705adb6a4ab6355e4eaa386ad5c639bfc1443cf61507112a53b66816399ca5fe2c32de964dd602ea16c5dfbf9003343f8c SHA512 1351ee000274567bb5a63aa740fbc43510d84ccad42c9af0c555943b99d93d86a2b036801c1681b93548a874bda1bab3304c2bf0da83bbca102a71e82574a032
 DIST apptainer-1.0.1.tar.gz 11977965 BLAKE2B ba0187c82321583825210f418744add120b682af3f14ee6d8071b927cd884b7e58f67f891ccc53c0d7d98bd786a27abcc26b2bafe79ed723a2f4f38a8e1a344b SHA512 273e94a348be2eaf83cf14b4c72a571670a9fa5cd185a90a0f557ba58ea7eb90d3a0f4bdb749673b0009e2291dd994dc715223c38ce82f9fcd6bf142e7692363
 DIST apptainer-1.0.2.tar.gz 11984629 BLAKE2B 56ed18bf86fe51e3bb27605f2c87a2c20fd9f3457594f1e0628b00d8616befa275b76bc4aba2a4306c854217e03662aab7eb7022c6ca5db418537df011b2398b SHA512 c29d04eff3a2ee7126c9bbb65664540a446fe695efc9c4662a6da151b2e809d55c1f5a7b5bddb82ba4fdd41a49ceb538c00a72778a4ed1d0306ff5f49d2f4d53
 EBUILD apptainer-1.0.1.ebuild 1454 BLAKE2B f49832a2dc065bf0a245d627be5647e7e8f50a7ad1f2be2d5388f2c70c7195028de7bf690679e2a15a8fae7042c6d7ad5a5c31528e7b52e2421266c693ebbeff SHA512 9e8d484dc1ee64f9330375cc7a2862678f6edc06e8234f6b958c1d09b30d27238b199c8da2ddc3be942b395965e5df2bebd79c928c1de894cb39ab8fd7fb6a35
-EBUILD apptainer-1.0.2.ebuild 1455 BLAKE2B 7597124c81907ce80b3bd59334355054de6c79f560c7a1e25d307cbebd4d7aaac38e98585d9071ab32717682683a401213f4f8c87b222a7a7e8cb4a59885af31 SHA512 3391d40fa87d3e162707e9e5b475d83a2b300ad659a4ea5e96d8ae7c64e610615eb8078c5e57b854809472b336b6175077fe941dc0ec8f3cecd25b97ffb4be51
+EBUILD apptainer-1.0.2.ebuild 1522 BLAKE2B 6ceaa823f2718812bdadc901cacf9cb6f90289b80c7ceea20c3cd6fe3e1133d13804e3620e23b1d4d8f3b3e332df148dac6a9b52e0a1ad95cd220a2d2b43997f SHA512 ff966e8f2dd66eb998cad08efa1b12bafa33549276e652cb2e5ccac392a43a59f936e1827a85c4e298b043a2e0f14bee949c7788564f700c8c19a51351a7d9e9
 MISC metadata.xml 454 BLAKE2B 7891b6acae30424b8b6877166b856c1113a13e40ebec9051935df10a0650bf941f52d75bdb6a4258795e07b080082979469b8b8242d2ddd56c52f9c5b6759f0e SHA512 ef53c2dee45734f36403ab71549494f3c24707bc183353e4bd9c548a97b3ab5d7877f4fc9d311d9e86ab249cbdb379f0a1a211ee36afda99fd552f0a5cac30bb
diff --git a/app-containers/apptainer/apptainer-1.0.2.ebuild b/app-containers/apptainer/apptainer-1.0.2.ebuild
index 9f711a070ada..56b48324770c 100644
--- a/app-containers/apptainer/apptainer-1.0.2.ebuild
+++ b/app-containers/apptainer/apptainer-1.0.2.ebuild
@@ -30,6 +30,10 @@ BDEPEND="virtual/pkgconfig"
 
 CONFIG_CHECK="~SQUASHFS"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-trim_upstream_cflags.patch
+)
+
 DOCS=( README.md CONTRIBUTORS.md CONTRIBUTING.md )
 
 src_configure() {
diff --git a/app-containers/apptainer/files/apptainer-1.0.2-trim_upstream_cflags.patch b/app-containers/apptainer/files/apptainer-1.0.2-trim_upstream_cflags.patch
new file mode 100644
index 000000000000..b1329b5d9d3e
--- /dev/null
+++ b/app-containers/apptainer/files/apptainer-1.0.2-trim_upstream_cflags.patch
@@ -0,0 +1,24 @@
+--- a/mconfig
++++ b/mconfig
+@@ -42,14 +42,14 @@
+ 
+ # user_cflags - user-defined CFLAGS without all the cflags_opts
+ user_cflags="$CFLAGS"
+-cflags_opts="-Wall -Werror -Wfatal-errors -Wno-unknown-warning-option \
++cflags_opts="-Wall -Wfatal-errors -Wno-unknown-warning-option \
+ -Wstrict-prototypes -Wpointer-arith -Wbad-function-cast \
+ -Woverlength-strings -Wframe-larger-than=2047 \
+ -Wno-sign-compare -Wclobbered -Wempty-body -Wmissing-parameter-type \
+ -Wtype-limits -Wunused-parameter -Wunused-but-set-parameter \
+ -Wno-discarded-qualifiers -Wno-incompatible-pointer-types \
+ -pipe -fmessage-length=0 -fPIC"
+-cflags="$CFLAGS -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fstack-protector --param ssp-buffer-size=4"
++cflags="$CFLAGS -Wformat -Wformat-security -fstack-protector --param ssp-buffer-size=4"
+ ldflags=$LDFLAGS
+ 
+ package_name=apptainer
+--- a/mlocal/frags/go_runtime_opts.mk
++++ b/mlocal/frags/go_runtime_opts.mk
+@@ -1 +1 @@
+-CGO_CFLAGS += -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -fstack-protector --param ssp-buffer-size=4
++CGO_CFLAGS += -O2 -Wformat -Wformat-security -fstack-protector --param ssp-buffer-size=4
diff --git a/app-containers/cri-tools/Manifest b/app-containers/cri-tools/Manifest
index 5dcf9704ccc6..9da8e72f606a 100644
--- a/app-containers/cri-tools/Manifest
+++ b/app-containers/cri-tools/Manifest
@@ -1,7 +1,9 @@
 DIST cri-tools-1.23.0.tar.gz 6823865 BLAKE2B 75d394ec1f9ccf2122476c9b845499212d668f8170ae8551913e3e057271986ab77454bdd0fa646127bfadda203fabdc57cc448dfe1e64dd7cdbedc8f5ee8cf6 SHA512 36700eaf872da14921e0b2c8fa68f91e3e0226364e29a5b8e132fbd52504e130e0bc2cce30aba21e7def576a4682f150b0b051d44b78aa694c225c10999d7155
 DIST cri-tools-1.24.0.tar.gz 5868141 BLAKE2B 281c397bb60bb5075d2b99cab11a44cf8746c1f744dfafc4f051dd6c2344a53eba948a35d90f814105ef3cb2b0bef3e7e1723408069a2ab4293801f906ec48b0 SHA512 5c7468c15b9f030d5cf93112abc28f8024e1d1b46f85459cb0a10c84ab63d07f5dfa830d019f8ed1a31bf04ea14c5e200b11d85ae7573be44860b74312e66dbc
 DIST cri-tools-1.24.1.tar.gz 5928557 BLAKE2B 42d2f0fc8227fd704c3884f1e8a195952aff1a64fb85629bef4122c011f76d0c7eb94ddcec7d56df610af6b3599b345676efa416249ce292725ec2bb35e8da66 SHA512 d36fda28e733fbf29a53c0384da86abf56373f4471797aaa030dc3d63a2f4682dddb0a5fd9a54ae74ac20c76e8acc5244781d8688ae03f8e930e56bcbe896fb0
+DIST cri-tools-1.24.2.tar.gz 5968560 BLAKE2B 8dce8d16d5218aa73705b4a49b31391eaa25b21deb97f3dfe553f43d7371adf58206d9198f3e22e1c9cbcb7f41b832b0600b324d7c0f943ef313dc89900da46d SHA512 9b5907b37bb5f00295eff4fa4207ae55d930feae7e0f48fa130c7ecc936bcd259a11d59ed240684a3e12c8bcee40f2c67d7f4af52c2a76df3d7bf82e5e388a75
 EBUILD cri-tools-1.23.0.ebuild 857 BLAKE2B bf93d04d671c1b42ed9cb8e0ff6e77c5c2bb123513e10814ca45d2a439fd237fddc91d62c54321009d62afb3f175eea2345f3178fa2f595c5d9a0b018ed9fa7b SHA512 cbac966a3e496779a52d98d495e5d82a2402114de10390313a8fc6d9a4f2ff1a80eeb8dcd5f7d5ab64a456427212600c65daa9a06114a6359e090323949bc504
 EBUILD cri-tools-1.24.0.ebuild 858 BLAKE2B 502603915b37de1a2d861fc65f3531a257866fffdfa0c6397758fddb5ccd92b39b860d4f990bf0e19b2f4b688d3d1af2ebe113d47259bee9eb47a68fae42c1b9 SHA512 eb8e260618b408936d88608d54c4e247075971aaf99b36ac99d7b5cc59541e75b98b7cd2d02433bf774a2d0ba8facfcbbfe0adff111941120cd8718d4f0464c4
 EBUILD cri-tools-1.24.1.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
-MISC metadata.xml 263 BLAKE2B e2391971af70d0ca75212246843424e954c3b21333f7ee119d5c084e93cd5d0d5882d5a460b0478f697173da346fe38db1f1e371e5408559c0395fa1f4c63fa3 SHA512 92be722523029265ad69f50a4c9eb434a2949ec609e4e0b026d3ee27f565c306ba164fea3d8880061265e206a0e2f108a695835c3ba995355ac8f4601870c483
+EBUILD cri-tools-1.24.2.ebuild 864 BLAKE2B 7ebfdbcbf2d25fc0b7f57b4e4901a61014c771d96128ef0cd7cfa1237245181c0e31b57d91e6540da1b1cc3feedc95946f9a99ba7af9f0169d0c079cb94d57e3 SHA512 cb0c92161fde44266e721b864007f4d6850db1c808ca2573a5e47f6cb64da58366f6c1435e81a62447d8886f13260a13f9f290ba8e50467f6b105685f9354cba
+MISC metadata.xml 335 BLAKE2B 2144a466f521028b7bc93b372ec9b8f81f6ef5317285dede88a71736bff65aa0908bd1c8ed18b2b7b0563f14a24b10862efc81985e78c75b5c2a786d501331b1 SHA512 ae1cb972ec7ddc298a8e1747503400f52b27e899ed51b1aeba877a66c8f883248ca782b437ffea4d06cb1ad80ff6e8f071445ba848f98240e48ef5814c866c2e
diff --git a/app-containers/cri-tools/cri-tools-1.24.2.ebuild b/app-containers/cri-tools/cri-tools-1.24.2.ebuild
new file mode 100644
index 000000000000..0ae021d25349
--- /dev/null
+++ b/app-containers/cri-tools/cri-tools-1.24.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI and validation tools for Kubelet Container Runtime (CRI)"
+HOMEPAGE="https://github.com/kubernetes-sigs/cri-tools"
+SRC_URI="https://github.com/kubernetes-sigs/cri-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="dev-lang/go"
+
+RESTRICT+=" test"
+
+src_compile() {
+	emake VERSION="${PV}"
+	./build/bin/crictl completion bash > "crictl.bash" || die
+	./build/bin/crictl completion zsh > "crictl.zsh" || die
+}
+
+src_install() {
+	dobin ./build/bin/crictl
+
+	newbashcomp crictl.bash crictl
+	insinto /usr/share/zsh/site-functions
+	newins crictl.zsh _crictl
+
+	dodoc -r docs {README,RELEASE,CHANGELOG,CONTRIBUTING}.md
+}
diff --git a/app-containers/cri-tools/metadata.xml b/app-containers/cri-tools/metadata.xml
index ebe162c4841a..8d6a4c5d53d2 100644
--- a/app-containers/cri-tools/metadata.xml
+++ b/app-containers/cri-tools/metadata.xml
@@ -1,8 +1,11 @@
 <?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">kubernetes-sigs/cri-tools</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kubernetes-sigs/cri-tools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ed503ec34460..4b0981c554a9 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index d6c5c9ec2e1d..b822bcda78fb 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,7 @@
 AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff13fc2a0faab5c5327cea2f53ccc1bcc0e805166de93d2de8a52e8c344bdab64dae5671f238b49ecedebb657afca0823 SHA512 8207e9eb534fed58712b805df0e90bcf8406fe1c2907f91cd54500babcc49d0a72dc1d039d9fdb8077967058aaafb6c37336c1b0fcd041edfb3c4604c7cea4c2
 DIST eid-mw-5.0.28.tar.gz 13615312 BLAKE2B 1dbc39267688ad322059009ee0aecdd52e7133d3029285255d019819075249755153b7bf10acd775cee7fef86603de4440ff4e47338a28ff9a1ddfce79ff7adc SHA512 05705180f69cb68617660a793baf314486407557f40a223e474047e2f7f9ca8e125feb60f6b0cd47cba6e84653cfe02cdbf48c7169fe78b39b08ec621e3a7898
+DIST eid-mw-5.1.4.tar.gz 13646645 BLAKE2B 3d1ede2078e4293a082bbdc19b942f4aa5a71cf5b852edb68a18cfa78f2d5b53a609b1190bc9b81dc87938de4619e99c9d4b19b4980e62631910e30683bf983b SHA512 903ca2dd7566e760badfb9fb1ea40e7cada42173d7d8f3795c1df16643f082c1cb8dd1ee3cd9e031b6306ca2dd2118df179f547a6b1f5f1a7ba05a45f247cc1d
 EBUILD eid-mw-5.0.28.ebuild 2867 BLAKE2B 47131bfb0df05f30f2578d3b2544d6cd6fd1d48c371cb11ba50b6bdf069c3556decdfcd924c4afdceb9af587d72d53a113dbf7d291b142b6d40ef69e27fa4277 SHA512 5b4b983bb3243a8631fd9a2f103dc1c652db80917db9f4d11fa355951688477036d3832040b4ef66ae1092f6dd89a577c8ba963535c1524a46aeb42235239e1a
+EBUILD eid-mw-5.1.4.ebuild 2867 BLAKE2B eea4c01faa9f7adf4c3235d3c75170c77d03b58822f5562357aca25d1f5d7851f4f6df363f955a6e2049668b90656752ad80c1a450658b8531308c847649c683 SHA512 f5e03ed772c0d019993444f68837fa0d3bb5e67d2526206af9150b811ba73268e444a2cbb46487c765a08a2f54fff7df880ee660f573b0fd1eb0c40af52b1d4a
 EBUILD eid-mw-9999.ebuild 2633 BLAKE2B 0d109c1acd44750de8a2444f995e8a675a50ec59d5c04c81b0eec97add7ed7ec3b3f5f493ca036cb332b3193f19e9d3e560c0fdabfb45fc64701eb84e38b6dca SHA512 483d80741db63a07e965151884e58902f8bdf7947f4f4c27274417048a2514220b5e2386253629fede31be56a7d3ba0b69c9e30bac255f4e9c9cc3eeb8cef2e6
 MISC metadata.xml 1436 BLAKE2B 0c727b14a272275fbd9f898f4254500aa16653dadd5929d3d27cd1f50d576b4782b0817b3cf2a66b1d1b3dd7f0b0468e71a3cdce8dcc5d0a70a81e5bbd8698a5 SHA512 3c1a21c95620c845ac722b9b6b8574d50bdca3e0525fe5058bcc316949d95a9fb14e990b1d19d71db6cef40156a2e40dc1125f074a1f6b8c93bd13ff26755c09
diff --git a/app-crypt/eid-mw/eid-mw-5.1.4.ebuild b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
new file mode 100644
index 000000000000..cb218b605e07
--- /dev/null
+++ b/app-crypt/eid-mw/eid-mw-5.1.4.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop gnome2-utils xdg-utils
+
+DESCRIPTION="Electronic Identity Card middleware supplied by the Belgian Federal Government"
+HOMEPAGE="https://eid.belgium.be"
+SRC_URI="https://codeload.github.com/fedict/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+dialogs +gtk p11-kit"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9
+	gtk? (
+		x11-libs/gdk-pixbuf[jpeg]
+		x11-libs/gtk+:3
+		dev-libs/libxml2
+		net-misc/curl[ssl]
+		net-libs/libproxy
+		>=app-crypt/pinentry-1.1.0-r4[gtk]
+	)
+	p11-kit? ( app-crypt/p11-kit )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="dialogs? ( gtk )"
+
+src_prepare() {
+	default
+
+	# Buggy internal versioning when autoreconf a tarball release.
+	# Weird numbering is required otherwise we get a seg fault in
+	# about-eid-mw program.
+	echo "${PV}-v${PV}" > .version
+
+	# xpi module : we don't want it anymore
+	sed -i -e '/SUBDIRS/ s:plugins_tools/xpi ::' Makefile.am || die
+	sed -i -e '/plugins_tools\/xpi/ d' configure.ac || die
+
+	# hardcoded lsb_info
+	sed -i \
+		-e "s:get_lsb_info('i'):strdup(_(\"Gentoo\")):" \
+		-e "s:get_lsb_info('r'):strdup(_(\"n/a\")):" \
+		-e "s:get_lsb_info('c'):strdup(_(\"n/a\")):" \
+		plugins_tools/aboutmw/gtk/about-main.c || die
+
+	# Fix libdir for pkcs11_manifestdir
+	sed -i \
+		-e "/pkcs11_manifestdir/ s:prefix)/lib:libdir):" \
+		cardcomm/pkcs11/src/Makefile.am || die
+
+	# See bug #732994
+	sed -i \
+		-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
+		configure.ac || die
+
+	# See bug #751472
+	eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
+	# See bug #811270 (remove uml build)
+	sed -i \
+		-e 's:cardlayer/uml::' \
+		cardcomm/pkcs11/src/Makefile.am || die
+	sed -i \
+		-e 's:uml::' \
+		plugins_tools/eid-viewer/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable dialogs) \
+		$(use_enable p11-kit p11kit) \
+		$(use_with gtk gtkvers 'detect') \
+		--with-gnu-ld \
+		--disable-static
+}
+
+src_install() {
+	default
+	rm -r "${ED}"/usr/$(get_libdir)/*.la || die
+	if use gtk; then
+		domenu plugins_tools/eid-viewer/eid-viewer.desktop
+		doicon plugins_tools/eid-viewer/gtk/eid-viewer.png
+	fi
+}
+
+pkg_postinst() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+
+		local peimpl=$(eselect --brief --colour=no pinentry show)
+		case "${peimpl}" in
+		*gnome*|*qt*) ;;
+		*)	ewarn "The pinentry front-end currently selected is not supported by eid-mw."
+			ewarn "You may be prompted for your pin code in an inaccessible shell!!"
+			ewarn "Please select pinentry-gnome3 as default pinentry provider:"
+			ewarn " # eselect pinentry set pinentry-gnome3"
+		;;
+		esac
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		gnome2_schemas_update
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index ede036a48d7a..af3c0efd3377 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -5,5 +5,6 @@ DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
 EBUILD gpgme-1.16.0.ebuild 3034 BLAKE2B c807335ac78d88b1170f57b3c4eb771b8dd78b02ea54a8df4aaa062334d3a430459a274ddbe7977c3e1fd66995582a3e30dc2e3deceefabc05db296afb51822d SHA512 06d033131be2310cc8e96b5e3b65ec3cb6f70c9f01fa35ea57ffb97b95c80237bbc27b4923d2e9a99b0c94f779a50a89b38c30ce31fd5684f7a0ec7db2bd378e
+EBUILD gpgme-1.17.1-r1.ebuild 3379 BLAKE2B 541ccaeddee24dd3489a8f119f7d0aa94994dcb37ca95dc29d58ff005b0601883b3e01cf59737ce07aafda85d734983a83b5a9625139824f496e5ac335a7ada0 SHA512 17f47e628761df1f7ea73c96c18238346e1806a4de6d18c68077bd7e3403ff3de3cd29aa565dc037ae708188bc6e84b48dd49d614d43487462bd85d273f834c4
 EBUILD gpgme-1.17.1.ebuild 3332 BLAKE2B c6d069cf0243e546825e645c34b8b34dc7f1d15ed8947a6a228981487ea5ed97d55dc38eb9dc8d9f8bb7a3d1ed49698697fe7bd3805e9e17ee2cb4bf1f51a009 SHA512 b3e23d0d942d73450fff126857e8a3a43a4e1b355fb883770fe98dd72e001ce6ea0977a99a14a396c4267a41b63711be2ff37c0884c6acc3335049f3a38e6eef
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
new file mode 100644
index 000000000000..18243537cea5
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+
+inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
+	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
+SLOT="1/11.6.15"
+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="common-lisp static-libs +cxx python qt5 test"
+RESTRICT="!test? ( test )"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	test? (
+		qt5? ( dev-qt/qttest:5 )
+	)"
+BDEPEND="python? ( dev-lang/swig )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
+		die "Could not run tests as requested with too-long WORKDIR."
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	# bug #847955
+	append-lfs-flags
+
+	# bug #811933 for libassuan prefix
+	econf \
+		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
+		--enable-languages="${languages[*]}" \
+		--with-libassuan-prefix="${ESYSROOT}"/usr \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	default
+
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+
+	do_python
+
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# Backward compatibility for gentoo
+	# (in the past, we had slots)
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 76267eba5027..ed1a6e8828c4 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,4 @@
 DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
-EBUILD libsecret-0.20.5-r3.ebuild 3719 BLAKE2B c89de8dc1e1255fafa208606ed0e9fe46601262112feeaa8aa2c220bb13433ccfe76c6b456cb6ca9351f94626a5d4aad53c75aca31480859e0e322b542ceb89d SHA512 1415cdeb327f6887f85871db2d4ed158d4200df06ea37b7ae50eb43c1568b02554366dc7b0d2fbf586e6044d93245451e44d12838940872d1cd9edda0387c437
+EBUILD libsecret-0.20.5-r3.ebuild 3713 BLAKE2B 4d05ddc03033eabcb6aad347dbab16f5fd86b63cd308a682c715825435704aa2e73c8ac548968fbe6634c49b9ae4d04361da6e358cfe3a5ac6c3f01aea5c511b SHA512 420156a2302229f7e9297f671c503358e26411ee4bb2dee63bfd74364851b924584dfd7a66f71e2e6c967e5e9d17fe7561b7bbf1f47a37794a4cafac914b59b1
 EBUILD libsecret-0.20.5.ebuild 2225 BLAKE2B 8b5730b19340eeffad72c3b055ff26cecf2d0b0859358969ce5e7588dad9e134119021377c7db0d7c289135dde411eee2f5863b59339e1035d719fa26d0f555b SHA512 5f860e90a98696369febf9d4833da8110cfff203b54f36229f7e498c05ad32a1302305c45d3bfa3b6536bc1151f54d9b5970e5b2a4f006e55366fde0d423bb07
 MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
index c16fe9ac3396..8693e1bedfea 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	gtk-doc? ( crypt )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index ec3584b3a41f..393a5ced5b35 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -17,6 +17,8 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
 DIST krb5-1.19.3.tar.gz 8741343 BLAKE2B 79e68237ee82affa85299060c509e303453c0fab965adc6b9ed305ab64a1f73bd51e65df1b3faadc60815cd506ffefaeed535765ca060d393a9141812f85b48a SHA512 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351
+DIST krb5-1.20.tar.gz 8660756 BLAKE2B fdaaab6c16dbe073c4308f312e321536b582b75fad10e5450be66b6b828825c8c775e56f5287d4a7df819d20889e5c0d9cc1d179d861c9caba185332c0db7387 SHA512 9aed84a971a4d74188468870260087ec7c3a614cceb5fe32ad7da1cb8db3d66e00df801c9f900f0131ac56eb828674b8be93df474c2d13b892b70c7977388604
 EBUILD mit-krb5-1.19.2-r4.ebuild 4240 BLAKE2B a2e6580cf7fe53c850a3ad83ffe749dbb75835423ab2b0dd8f9b75a47deecec8449ccd32511cbfcee2219689899b578d39f71ff46577b0429a8276f8692bd7ab SHA512 135b5f3dc618aef1b87e56f9931559d1981e993830d3d9af2a4813789959161a59c104b5374657a15ad59e7beaa24be8adbbb907ee5343c3a66ab4617c98fa8f
 EBUILD mit-krb5-1.19.3-r2.ebuild 4212 BLAKE2B 46b4a2a47a41e332587510fdb19540ed6eaaf49e2122213438b646243a9abc526c889cf52a094ab223e18428e91cfb7f52648309233423e07101334316f8f05f SHA512 2e2de2baaaa91ef4b6d922baba1a19ae3f0c7ae62b17d042fbccc5edfe2daeff5413f7cd0bba3bb8bb2de8707dd3b2718b8a24258b33c117eb7aecf4dd372ed5
+EBUILD mit-krb5-1.20.ebuild 3929 BLAKE2B 0b0945758dd20d7d1a46424cc02334de8adc5996fa44e99829af081ab13238c6d4af7ede7c9daed36bf572149b34a39326e4c950cf26d81849a17b48bd711fc0 SHA512 4c5a36de3ffe853d2b7d584d7cd437c65c8ff7395960acfb69caa64cfe72996faf3526e396ef1b1e5057b3013394520a7e99cad1966e4e1b7507d49569ea378e
 MISC metadata.xml 824 BLAKE2B 7f8486768dd9da718f2514da9a9b6928a89c43d26fd73f4be651438a4b02cd7a1db7839c580ca4f0812387e77cd002fa3caba86163ec2ecc1c2cdbcd1ffa4270 SHA512 0c075a303679455bd7f288b9345855bb38aa59da73e93f31b697688062399713dae64b39c775f4c74fa1f46fc1c3567732217ddcac7588bf3ae77c3e20e64144
diff --git a/app-crypt/mit-krb5/mit-krb5-1.20.ebuild b/app-crypt/mit-krb5/mit-krb5-1.20.ebuild
new file mode 100644
index 000000000000..c808d256547c
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.20.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb:= )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? ( dev-util/cmocka )
+	"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index f804809c8882..ca47e5af9c0d 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -3,5 +3,5 @@ AUX pius-3.0.0-Fix-typos-132.patch 1277 BLAKE2B 8c35c09224472a7a1b1c4deabe0df916
 AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d547ba149f25eaeef01c24471c4f5472dbece4ad5e72446ede919cac5351096f8796f3d67f13a0258dab45b4648e2bdba2a0e33dac1a844078d SHA512 4978309350025e818e8950dde21509b3a2feba5dd650720ca83b00e23cff93926c3f35eab028a15ef69750c619fcb23d62ef910e89e57a4f8072923316d4146f
 AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
-EBUILD pius-3.0.0-r1.ebuild 877 BLAKE2B 4ce34605005d1afa28c76bf158b01803e4a52db9907b5c1c6594d8be3ffb15fe8fd9d144d5142a536216fd81fd496e3d91d2f861530214986ab6da8fbf6616af SHA512 5e86eedf186ce5b72bd1bf99dd0ce01349a50c2dcc56aaf85b6671a041e0d4c49c5bf95f93f89ff9227ba7e038c55f8124f39f0a054c3360c5e319eff111fe5e
+EBUILD pius-3.0.0-r1.ebuild 878 BLAKE2B 10508e52485bd24862868db446da0d3856e2aa0097c0bf60717f55df96dd77cc5468894d3a12f6e5e1749a163b48f4b3396c353c97b7f9b9a2223fe4f91b4ae8 SHA512 0e5102258e41f1ec5e725658ca6af783cf90e6b672ded1536293688720481c862d2fcbe7e9ce62b39972508736042c68b9ad4063b4718eedfdd4e7542a696e62
 MISC metadata.xml 853 BLAKE2B 6165c11116e7624ea188e772b67f66104e3431d6f4029ffa09b19958ccc2fcd71d696a9cf2711fb509bdb1f083d5931eaa26b5b1892e3fee8732523b0141aff0 SHA512 85679ab6340568c5ebb87cbad2006f6c586555aed81e85ad0a3f0f79972ae48a14bb9b2cecd0a92a34ca8d4f4ff54de3217976c7d847d86eef586aa0d772ddca
diff --git a/app-crypt/pius/pius-3.0.0-r1.ebuild b/app-crypt/pius/pius-3.0.0-r1.ebuild
index 49fe29ec9207..c7ce49f2b85d 100644
--- a/app-crypt/pius/pius-3.0.0-r1.ebuild
+++ b/app-crypt/pius/pius-3.0.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 67af8a93b9a8..b144c36dea94 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,6 +1,8 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
 DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
 DIST veracrypt-1.25.7.tar.gz 26108318 BLAKE2B e3974e6abec3ff462239b6c7a775ebfde4138dde295863c8788de88b593bc4bcd69db66eb81dd08333055b0efed2cccccf24d5f038099f6fc25b8f550cb90347 SHA512 955d5354d7401625196f1bd43d5e40695f4a2ebc7742cdfe0850d3b974a02126446346fe7e3174e16a38de39b507fc436b45b5e43d6fb714f37a4b8b394843dd
+DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
 EBUILD veracrypt-1.24_p8.ebuild 2633 BLAKE2B 9cbbde75cc90c56405c49235eecb9e2b997cfa60bd0048c56d849734c49a9c2059d804d7bad217a3b2603e4e49f15dc66c391d1a739884c606ee35ef80f85a9b SHA512 e67824eb329231342c1b0b932736305de87adeb107290e1cdcea7080b347f9e813a0188c69716e2318609597ace85b330469313f77aa4b07c1d45a8ab0b85ad7
 EBUILD veracrypt-1.25.7.ebuild 2578 BLAKE2B 3dcad45a436142ff44dd980ca78b925c1b339caf2328bd1f1199b65b2ef2dd4eb9e6e4b1a1998eb750e0c488a636374be6a3cfa07bac701816c53fdad19eefba SHA512 1759f4df7495ffc3105176f8fbd13eeff6622a9aa4545876b11750a4a06d5224fcfac1e1c49c02febd420798ec797bfdf75981dfcd4dd908f51108cc71c0fb70
+EBUILD veracrypt-1.25.9.ebuild 2578 BLAKE2B 3dcad45a436142ff44dd980ca78b925c1b339caf2328bd1f1199b65b2ef2dd4eb9e6e4b1a1998eb750e0c488a636374be6a3cfa07bac701816c53fdad19eefba SHA512 1759f4df7495ffc3105176f8fbd13eeff6622a9aa4545876b11750a4a06d5224fcfac1e1c49c02febd420798ec797bfdf75981dfcd4dd908f51108cc71c0fb70
 MISC metadata.xml 400 BLAKE2B 9dedf1fc4c897fe4061f844b05a281b3b629beb82fa7806527550362528de0cb0b894c6901b4eceb7b86bfa07a0708dd6557e388a506151eeb17c307ffa66e8e SHA512 2923a0c7330435996e1fee89531ce36897a50ad7592978742dea69b9e07a58b322b92cfc2f83b0a5bfcc58705951fd53e8764dd770787681b298f6ec66c74c0a
diff --git a/app-crypt/veracrypt/veracrypt-1.25.9.ebuild b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
new file mode 100644
index 000000000000..41d225cd1baf
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.25.9.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+src_configure() {
+	setup-wxwidgets
+
+	# https://bugs.gentoo.org/786741
+	# std::byte clashes with src/Common/Tcdefs.h typedef
+	append-cxxflags -std=c++14
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x /usr/share/doc/${PF}/EFI-DCS
+		HTML_DOCS=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+	fi
+
+	pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 7655f6206d46..63f87e958369 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/halibut/Manifest b/app-doc/halibut/Manifest
index fa5e5090c680..e69683af51bc 100644
--- a/app-doc/halibut/Manifest
+++ b/app-doc/halibut/Manifest
@@ -1,4 +1,6 @@
 AUX halibut-1.2-fno-common.patch 408 BLAKE2B b976e2385b0e2feacddb50bc63094d419cc11d4c840ccc948049b76df8425e64dc0589190d62ede4e510f4fab25d7c9db3d860372889f04b141c7cf48b081e8e SHA512 e1559fe7288c735c6cc29eb86d615d4d9e593c360226cef916e105bef3498d5ba269dab897d1be37702b8642ff8d40f9f9128f20d42d1b41c57bd10d47d7242e
 DIST halibut-1.2.tar.gz 991975 BLAKE2B e5751d2f90968240825e3ddadbc070de856f6a340e832bcf0977fb8d31f7b7c8eefa776f3bba4df58641d22cca7e9ac562eef236069e1d9a8e9cdb41324a7376 SHA512 b04cc5c52f2d7cd2bb9a36a1aa896c6a4fd11bcfc5fad3d9c74576bf2576ce237cd7ac3ceeff3bd10dfd5a229614d06d23323509d3a83ff74b4a1965e1d726fc
+DIST halibut-1.3.tar.gz 995916 BLAKE2B 78a4409ff1f787134f7cd4eb307e77c81865a2591b55b359b0ef7a45b303cd361f85d344972714dfe8b3e823345de715d99ea542bf3cdf63d6d92548d027c27b SHA512 872f0cdb398002843d7e1b19f6eaf80ff848ce5ffee8653fa88da63c57e89efcbfaadc09b476280d25d38136f7d8af286fa98b9b36598515e0eb50f1945ee34a
 EBUILD halibut-1.2.ebuild 895 BLAKE2B 8f43ac3c6b6f625f860aa1ab2255b20118c790df4bf40d2467865ae29ad7b732c9e6ba2c4177bea4f7a223b42e3e7aa144495e3626c8c121eb43dfbbcbff7deb SHA512 dfa91ced51ff0d907c88d96e16b0488a4bc8d9b4a6785e814be13814676853401f2d8b1249820ddec47480c02b3704f844790ef37d4eda41fda136f21fa65e62
+EBUILD halibut-1.3.ebuild 389 BLAKE2B cf27307645a3cd1fab6761f39211699649d8d716cb6d1cc7917f79b6929b8eec66d672a12c54282642257003725751ff2d235064338017554627c08b5cc938a5 SHA512 88f9d47b9637f7c68a1e3aac42f292465d11f63af749182a273b313d76e3c7dca1eb3c0765904ace9dc6e7fe571d5d30c41fa46498c4a67cb563aef96e06e24b
 MISC metadata.xml 249 BLAKE2B 5e71cf7a2f9476509b6ac566cec5ef6e688f8a4ffa7246050e3ee32a1560f3cadd71b358f695416e707da471c5edaa5cbad2b4276cc9e1c2640f3b3f76ab2eee SHA512 34b65b47ef81671f908505ccd62ba01f34286951f221a9e6c1b65dd94b4c4e461b8705a5c7f95063bda37bcbe7c16b04b4cff473b7e0a12d3239ab0516d1e84a
diff --git a/app-doc/halibut/halibut-1.3.ebuild b/app-doc/halibut/halibut-1.3.ebuild
new file mode 100644
index 000000000000..934fae0662c7
--- /dev/null
+++ b/app-doc/halibut/halibut-1.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="yet another free document preparation system"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/halibut/"
+SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 72071c13aaa2..3277d3b47c1c 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 7b7d6b30a895..40ae6b5f4d2a 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -1,4 +1,5 @@
 AUX bluefish-2.2.9-charmap_configure.patch 728 BLAKE2B fc7231ab28c0d0c4480e48f965d26ee18ae5819e412488ab8a5e30e3cee6925b73daa72fa178cdf204e00d1074121ddc57fd4c5795ccc6335460409a245bca5c SHA512 46482a73b6d374cdd5881e9ed7a79199c85cb436cc700950c09541a94d61fc4f200613a34575e74d013409f0e42a7c1df4ed25ed65880f25cbebd926d47c6889
 DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754
+EBUILD bluefish-2.2.12-r1.ebuild 2459 BLAKE2B eec16cbac14d1e11d15212029ad6a85aab1f21c3be125d81fc9759438472f5766a389e123a10441fde17a5ca6a83af5cb22255944ac871a17f05c33a339a8dc2 SHA512 57420024d52dea27990dae3726f54981ede4279a8ca515d08def57c16b46e3a7b1fb4ecd6caacf6b4add5deba52f604d64c735f7ed890fb95bf57b2b1a946af1
 EBUILD bluefish-2.2.12.ebuild 2463 BLAKE2B 96e7b71add78bf5ac5e6888d6f27e9fe18502bfc6819653402119fe3adfd684654fd7d042cf6d25e8ed4fefa15a01dca26f14c085edc4ab539b0a64a81752a38 SHA512 6a8ad043ef2c2d1db89cea9f8ac3535678d4425207729c0facf67604d5f2fab9aae8a955f83a017d502ca7a92b0426ad577b7784013d2e44631ff12aea1ba1dc
 MISC metadata.xml 333 BLAKE2B 5a5f339d26d78d99050d8324891a3d6ef97af31e3e6a397e763cc2e7561f892e43856e38fefe72be28db1962a4da153b0ebde42db6a53074bdf6b9c13eb74d87 SHA512 144b48f78b13ad3f07868b3171db5935431befd92821a6b70b6e626943996bcc4219ff27808b9062b2da4b5ff1c86dcb1c3778757b0b2a905c5bea3e90dcf152
diff --git a/app-editors/bluefish/bluefish-2.2.12-r1.ebuild b/app-editors/bluefish/bluefish-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..02c2c22c45b3
--- /dev/null
+++ b/app-editors/bluefish/bluefish-2.2.12-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_P=${P/_/-}
+inherit autotools python-single-r1 xdg
+
+DESCRIPTION="GTK HTML editor for the experienced web designer or programmer"
+HOMEPAGE="https://bluefish.openoffice.nl/"
+SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+SLOT="0"
+IUSE="gucharmap nls python spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="sys-libs/zlib
+	x11-libs/gtk+:3
+	gucharmap? ( gnome-extra/gucharmap:2.90 )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:2 )"
+DEPEND="${RDEPEND}
+	x11-libs/pango"
+BDEPEND=">=dev-libs/glib-2.24:2
+	dev-libs/libxml2:2
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+# there actually is just some broken manpage checkup -> not bother
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# eautoreconf seems to no longer kill translation files.
+	eautoreconf
+	sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile"
+}
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}/bin/bash" econf \
+		--disable-update-databases \
+		--disable-xml-catalog-update \
+		--with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \
+		--without-gtk2 \
+		$(use_with gucharmap charmap) \
+		$(use_enable nls) \
+		$(use_enable spell spell-check) \
+		$(use_enable python)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	einfo "Adding XML catalog entries..."
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
+		--add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \
+		--add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \
+		--add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \
+		"${EROOT}"/etc/xml/catalog \
+		|| ewarn "Failed to add XML catalog entries."
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	einfo "Removing XML catalog entries..."
+	"${EPREFIX}"/usr/bin/xmlcatalog  --noout \
+		--del 'Bluefish/DTD/Bflang' \
+		--del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \
+		--del 'http://bluefish.openoffice.nl/DTD' \
+		"${EROOT}"/etc/xml/catalog \
+		|| ewarn "Failed to remove XML catalog entries."
+}
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index bb7e5ea36a12..4885573a1d5b 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST gedit-plugins-41.0.tar.xz 948364 BLAKE2B d5efe779e1f0f70e23a7dadb01b0e5b22c47d3326df6530559698ace274e2a4a3647d34640e89bb250d76bee1f6369d5728316730ce9cf89f3a7db627b3c4d49 SHA512 e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34
 DIST gedit-plugins-42.0.tar.xz 949068 BLAKE2B d9076d7ef420177b5d859bdee651b4304da183430d651510ea4ab50bc7286d23f536c1be47e6a6f425bdf90dcb31f015fa315e9ed530d54eb235832d92c4f438 SHA512 b7b6b6c71538ca767e20e4bdde0a5530657bf3d444fee5e1b2918b768188f224acfd2a44c4b0b6203ee3bde9ec47d2bacb0e25426cf49e500120461d44ae6b9a
+DIST gedit-plugins-42.1.tar.xz 946368 BLAKE2B 6ee8c42d5d5214cdb9095bce71623f9486c973ade69aad91eed4ae13a1ad5ab59bcc43d30078bdb9db46527160f8bc6b183a56c255d10f8027c4ff2e603fffa6 SHA512 2e36919f7b7232e4471e2c1277c33e2f79ff513b76574cf765e451064979587c170ae003c9517d33f3b9cfce916cb7f25f9e3d0a4f6a6b203086fcfff9f265aa
 EBUILD gedit-plugins-41.0.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b
-EBUILD gedit-plugins-42.0.ebuild 2728 BLAKE2B 7c6899d997fe6f337d97930ac5c696622cc58d6e458a039d8511516b741201476cdc9ab65f8daf6b3231cae7518ee0fad46f6b4b87cb0cabc09aa75d800e0dbf SHA512 704bbdd88b0bd4586ceec5fe28f592b11b2d0795fbc507194d5da6f21834485909e72c3547c07c8b2ce9c9da39267797265c7f129c3bd81e18cb54c857c24e06
+EBUILD gedit-plugins-42.0.ebuild 2726 BLAKE2B 58ff2d0860ede52aeea65ff02b50ebe4524429970f35146109a0d7ee47540e1ac1ef4093faddc6adec5c6ed54dbe0dbfbdab2f53fd973c518945ec1f98f234f8 SHA512 18da728cf94893ee321e0670c8609be7947e54dfc0d12fccba88240aed79182a9046a1e5f04a85a535e75b3f255f2995662087bffb4e49f37400ddf8baf34be8
+EBUILD gedit-plugins-42.1.ebuild 2728 BLAKE2B 7c6899d997fe6f337d97930ac5c696622cc58d6e458a039d8511516b741201476cdc9ab65f8daf6b3231cae7518ee0fad46f6b4b87cb0cabc09aa75d800e0dbf SHA512 704bbdd88b0bd4586ceec5fe28f592b11b2d0795fbc507194d5da6f21834485909e72c3547c07c8b2ce9c9da39267797265c7f129c3bd81e18cb54c857c24e06
 MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
index 092e6a590b14..c47763a5db74 100644
--- a/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 SLOT="0"
 
 IUSE="charmap git +python terminal vala"
diff --git a/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
new file mode 100644
index 000000000000..092e6a590b14
--- /dev/null
+++ b/app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="Collection of extra plugins for the gedit Text Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+SLOT="0"
+
+IUSE="charmap git +python terminal vala"
+REQUIRED_USE="
+	charmap? ( python )
+	git? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	terminal? ( python )
+"
+
+RDEPEND="
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=app-editors/gedit-40.0
+
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.9:3
+	>=x11-libs/gtksourceview-4.0.2:4
+
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+			>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		')
+		>=x11-libs/gtk+-3.9:3[introspection]
+		>=x11-libs/gtksourceview-4.0.2:4[introspection]
+		x11-libs/pango[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+	)
+	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
+	git? ( >=dev-libs/libgit2-glib-0.0.6[python] )
+	terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+" # vte-0.52+ for feed_child API compatibility
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplugin_bookmarks=true
+		$(meson_use python plugin_bracketcompletion)
+		$(meson_use charmap plugin_charmap)
+		$(meson_use python plugin_codecomment)
+		$(meson_use python plugin_colorpicker)
+		$(meson_use python plugin_colorschemer)
+		$(meson_use python plugin_commander)
+		-Dplugin_drawspaces=true
+		$(meson_use vala plugin_findinfiles)
+		$(meson_use git plugin_git)
+		$(meson_use python plugin_joinlines)
+		$(meson_use python plugin_multiedit)
+		$(meson_use python plugin_sessionsaver)
+		$(meson_use python plugin_smartspaces)
+		$(meson_use python plugin_synctex)
+		$(meson_use terminal plugin_terminal)
+		$(meson_use python plugin_textsize)
+		$(meson_use python plugin_translate)
+		-Dplugin_wordcompletion=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index e91537debc26..843f31eeee26 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,5 +1,7 @@
 DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e
 DIST gedit-42.0.tar.xz 6923352 BLAKE2B 751c4cae8ad0c146f2607f259ab72f4723c433934f75356bf71e44daadc82d4403e19228b52ec2f98c3fa7bc61274a6ed648ef8af143adb7c89213d39db64473 SHA512 d0f3c05e0a6f96634cc2deb24d95d906e5bb9d380b248a810560b60ac8590831fb25672a41e143fe7bba3882a08ec7ec85208f896751a7b66cabe4ade00cdaca
+DIST gedit-42.1.tar.xz 6916780 BLAKE2B a4350a62811ee689f9a7f70a4b166aa82185a17ab6c6f0f6264404756a2e7f2b93e81b2cf88beaf4141527720437f9e6ee9f7584e65e63fe242975e346d26586 SHA512 b7b1dd4ab31412a2bdeb6298065d1e3f52a9c813e26e943aea606b30e3de9b7690cc8ba478e2d0e49fb51bed57dd3f7c441184964270629d51dc1f6d132045a6
 EBUILD gedit-41.0.ebuild 1885 BLAKE2B b0595f782edd0b276965eb4c42d3a73562e12bdbb83775b174f6e26f8befa22238a1e020dc0da55ce5f8fe09f18adda5c42e15d70098a541f82e3af8c105fbc1 SHA512 431b90921835a15040037a89cc9b95d9c9b393bb471fcbf36155e5ef3fd5a51fd18bc28abba269b8e57c54b0ff77797ea2a13af70b5277736909e404b8343daa
-EBUILD gedit-42.0.ebuild 1934 BLAKE2B 493674d1c02662948f2b0e1ac1360b198857dd0f2834df9e72bba05df9f6d4281d563d8e214fc784c5836f517fe704bb028c9b0057eb48436bfc7d8b331593db SHA512 1c34f3f2f749644be8e2e262efb00e1f616ee770a6ecd0559f52144418fd1582cf4754fed9148e3444fc622ce3636f6594251f66c4930e41869b9a48d8ce2ae7
+EBUILD gedit-42.0.ebuild 1931 BLAKE2B 3d9a00b326c1c696cd224f4a9a22d328ddb04b2cf29ee3f881396fa412fcf262e8517de984f33ac22052a37bf636fb476ea5dc02b768445a6174ab7e4135f3f8 SHA512 fe4e7e13da0fbe5209794a8d209555b9423b7b6c37a118a8a9ae825cf29b175f6ef6d10da8c65ade5f22bd56f7a7cf63af5f002d8f34524dd1929b5d49e734ef
+EBUILD gedit-42.1.ebuild 1939 BLAKE2B 51245ba03c4ba43baaf8a15f0b7e4fe5a87236ffe0ff4b7b4fb9f5baa50e4743572c03ef5d148319bcd514cb15e02a132e26aa2386ff7380c867e8228bf638a3 SHA512 8441cf0605a1e4df336a31f26ba0a10d8775c14b4871e1a878c5f60bd44cb1e1bcac5ca3c4b4178106b8fcee671fe8043aab869d6210be6df430ac8dd3f88e92
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/gedit-42.0.ebuild b/app-editors/gedit/gedit-42.0.ebuild
index 6028c770e278..846500147d20 100644
--- a/app-editors/gedit/gedit-42.0.ebuild
+++ b/app-editors/gedit/gedit-42.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+python gtk-doc spell"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.64:2
diff --git a/app-editors/gedit/gedit-42.1.ebuild b/app-editors/gedit/gedit-42.1.ebuild
new file mode 100644
index 000000000000..5d3830ed2ae1
--- /dev/null
+++ b/app-editors/gedit/gedit-42.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_MIN_API_VERSION="0.26"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
+
+DESCRIPTION="A text editor for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+python gtk-doc spell"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.64:2
+	>=x11-libs/gtk+-3.22.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.2:4[introspection,vala]
+	>=dev-libs/libpeas-1.14.1[gtk]
+	>=dev-libs/libxml2-2.5.0:2
+	>=dev-libs/gobject-introspection-1.54:=
+
+	spell? ( >=app-text/gspell-0.2.5:0= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pycairo[${PYTHON_USEDEP}]
+			>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
+		')
+	)
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gvfs
+"
+BDEPEND="
+	$(vala_depend)
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1 )
+	dev-util/itstool
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use python)
+		$(meson_feature spell)
+		-Duser_documentation=true
+		-Denable-gvfs-metadata=yes
+
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python; then
+		python_optimize
+		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 486b00a37bb7..5d3c5b743bb3 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -5,6 +5,6 @@ DIST ghex-42.2.tar.xz 1003120 BLAKE2B db44dbb7c2cb7447dea3dd48a1ad90ee75c6ce5b9c
 EBUILD ghex-3.41.1.ebuild 688 BLAKE2B eb2299b663b824da78475537d939b41f2d3be2f1f0c8d2f28852dc613d78b60221500ec592c0a93af2b0f865f9dd593a21e6f2d149077244695f13de0b68d996 SHA512 30750b262e0282ddc7e44b5f893e9dd4cbddf99acb2923d7c409884775a928b9d3ce1f7427d5060a66e62997989c4cee9b997e44c846430b02ff9b6e695bccfe
 EBUILD ghex-42.0-r1.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 EBUILD ghex-42.1.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
-EBUILD ghex-42.2.ebuild 1145 BLAKE2B 099778e4549aaa45647450e023553a1d81e0136aaaaf15102f994b8bf175f90b32810d7fde0ac19207d5eac0f1562a859a3d059e638bf6bbaa3538dee4d070ed SHA512 9a479828bf3fe8588c2cd90bb235338d286cd5f4a2cb5e4a6d05a2119b8c0d8622e8a483a2deabea8f5b2ca929bd0b49c3aadff0953ce3378012547b89862729
+EBUILD ghex-42.2.ebuild 1141 BLAKE2B 4115c3ce3a4d786dbc56b9d25f529306c6d9e1495dd8d8fa5544c494b2ef5c83c24935ec1de544bc0937320f80470eeb02624a7a091dc09c811ad39fdae8ed30 SHA512 ddcd5e958f36b07a77a08a57a0f63be8755047427881b1e306c28a7b2a0e92bc36cf31a32e9b88d0f070b13034f93e9e6042545fbd9d7b089a09fa3026da5ea4
 EBUILD ghex-9999.ebuild 1133 BLAKE2B 292942cc63824ecc03559a0fa8cf8151fa28996cf9ee167fe76df7d8a65209917b93ab23d99e0232de494140448d0e5db59f3ebda252e9efddd8ff547fde5173 SHA512 3b18ffc6c3ac5ea2db326e140bba172ca95809a4412f508e56a39f4e2d30315331cc31c205f137d414a3900e56ff88c971d12ec85f318804ef470454cc66f1df
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/ghex/ghex-42.2.ebuild b/app-editors/ghex/ghex-42.2.ebuild
index 60b2aa480d88..af0a9aa90029 100644
--- a/app-editors/ghex/ghex-42.2.ebuild
+++ b/app-editors/ghex/ghex-42.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2+ FDL-1.1+"
diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest
index 9e0ee8bb095f..6c97f7e291e3 100644
--- a/app-editors/gnome-text-editor/Manifest
+++ b/app-editors/gnome-text-editor/Manifest
@@ -2,5 +2,5 @@ AUX 42.0-appdata-fix-appstream-validation.patch 712 BLAKE2B d8d19718488343f41c01
 DIST gnome-text-editor-42.0.tar.xz 1126224 BLAKE2B 7e02cea493696630284d7994f1d227a5589ad7aa7d7b98e5f67655ebcd69f7e2ded1195368e666ad26621b6b32168c7defde1cd3c2e278ca8741bf572979154e SHA512 4462ef0e0113863e752ce2c4d499386cbf9d72c67126fb60512eea39bd53bed6d56b2a62511e9af62024f9704ba722411ebbd5040aabcefce0b460925b91ad1f
 DIST gnome-text-editor-42.1.tar.xz 1131572 BLAKE2B 8d1b59131d8230af0dc9e3029798f1200b6a00f8991e912c34ce4808ca5517e14763825aa8ed7aecdac88e422e9d224d3c027282f6373c023c4ffe9f3e4896b6 SHA512 4616750d15d61b2bd2c708e414b564d0aa6c1202c765fbb895e60cdb46f8335fbefa70a24e8d99f208b186f2c8c244b752475cefdbe0184a67b60de116d5ac2f
 EBUILD gnome-text-editor-42.0.ebuild 1108 BLAKE2B a27db557a0419cb0ce7797b14e6552f19c4aa98cdd4ade357e9e12d7c3e92b0a1470d20d0f2c1101abb1e3c61bcc24dd741f17fed3aac9a5a58d031b36da61ac SHA512 154f0fc1bd5fe9eb64388b458a6a60d7d97e3c90b9a8805a817cdd4e29d677ffb66fdb710946b74754604aa445b174aeecfe3ad2e800aa62f49095a17819ea24
-EBUILD gnome-text-editor-42.1.ebuild 1035 BLAKE2B 9acfd1099bdcf2f61b276d6022449e7b48aed1649395ddb40afbf23660b853023f7eb3f4b4361dfbe85e2f6055e88220d61e1556403959f18eeddc16c19bdd38 SHA512 372fccc9cd4c7ae22081b4ea1f7a09e999f364844951c5e555df05268661001d16ce9f19e10a30058e2c941d33410e7d544b62ecf1c16f13a3c382019fc12380
+EBUILD gnome-text-editor-42.1.ebuild 1034 BLAKE2B 529a22dedf22189af0f29a43f858cf45a85407ebe0a2e3381d0822c482c3106ed306f9d566615fce747114f002d1b7ef723a22e3858a5cb8fb26b9dd21e47447 SHA512 a42fe9bc4648c8f32beb360c20531ca0df19055231467214280b50390cb22463f4b2683d12d67a22400544753fa801840ac38c45a732914ac5c845d8b60384a8
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
index 979bb30ca006..7b3a567e5004 100644
--- a/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
+++ b/app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 
 IUSE="spell"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	>=dev-libs/glib-2.69:2
diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest
index 16b2104e1de9..584cf65c6215 100644
--- a/app-editors/qhexedit2/Manifest
+++ b/app-editors/qhexedit2/Manifest
@@ -5,8 +5,8 @@ AUX qhexedit2-0.8.9-fix-crash.patch 1437 BLAKE2B 8a58e4dc74de1fb5120ea7fc53df92f
 AUX qhexedit2-0.8.9.patch 1135 BLAKE2B fb9c3c9a4fa01b6cba9b3ca12a1a1e82f1503663bb186835b56d2610145bf3c1e211ab31c705d55cc9f3e22312c566058b816c20a4a65c7d7a501bd05db3fb8f SHA512 934bd0422b539459b446fc6ea18806f9fe6f6e107822dc4a94150632fdef35b091ca309cb0a5b7eb96c325c4d71091314c89907ce6c6404e0a6d8ebd126c58c3
 DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d
 DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c
-EBUILD qhexedit2-0.8.6_p20190316-r1.ebuild 2307 BLAKE2B 9101dcf48a570657462856993d31dd86c948ea64aca17b5f6697712333d7434f236b69c506b5dc351f43e7b221fe1efc681157b31380bb2e0d3602ac88a62271 SHA512 e6326af3296e16ecb1a9c058176e8a4e0d39d43f6c2370ddeb5d23f06b7bb45800aafc33bed19f8dcf11b9776973c32ab2e34d341b08f371a53b6cd659f8afb3
+EBUILD qhexedit2-0.8.6_p20190316-r2.ebuild 2316 BLAKE2B 8ac5a20c15a084f68e5a08caf89f2048df6c648405373e90deb9974eb9b6986393361965e2ed33b49d27103b5e29ad4827d82832b5862b0c1b312a505303054e SHA512 14a7b5d75d68ebfde850f09f9e94063131b672efd22f0670b50482b60b3ac5acbb52023374f8b00bd657a26f42ecd3bafce13ff5b9941ea3c1d16066ea02bce2
 EBUILD qhexedit2-0.8.6_p20190316.ebuild 1878 BLAKE2B deb3b0b20fd1681443e3e05fec6d35006966f94613e6397940f08220db939b5240924929aaa6095670c590f9bebdd6857a517b45855fb1f7081202248e3abe63 SHA512 1722f81744db0e01ed78ca3f2ae664510fd11a5fc42db897a8bf2defd8f432a0c06470e19a70b365b6c31f625f7b793d45d131c089b3368a13ef6b549694930a
-EBUILD qhexedit2-0.8.9_p20210525-r1.ebuild 2395 BLAKE2B b097f11d2f331c92cb3457e1cdead0808f47d9c890fdf032b13128ddfc86481f71cc781a5b38cb6a53c8676d5cb43a83a6bdbf5409a49242807a175118336c9e SHA512 2ed0cb27c9ca7207c1f9efe52f33039a792a03233a8dd5fc947259fb8f1cb0efe12c752161cd12bf01aa23b317865504bce1fa8c5f120eef4804cbb544975c2e
+EBUILD qhexedit2-0.8.9_p20210525-r2.ebuild 2404 BLAKE2B 27fd43502a7b37b04f261adb201fd3c9e92144b8c108bdf3f8cefd207306c8840a9bc0ea7ab2fe216a5966fd065799dfdf8710a4faaa866a3e2acf3531145946 SHA512 47fc54aafae4e7c95b5bc450b7221db577d2e5972f8afce723f180971a427b9e52deb327e3ed4377dc4c6352f0c6c62a4096bc5bd7c6c0f88ecd1f02f905a2e0
 EBUILD qhexedit2-0.8.9_p20210525.ebuild 1671 BLAKE2B e36e973b9137abda5736e5e9eba1c5f0a2396651315e86c4b6f91f499d5ccbcb2b64e9c552fc88503d62f8d28cdbbd80056680da8876b6e0a3cecfa17da68848 SHA512 d941ac5d83ccb9e1bee51a64397bb749416df4d7a363f88bf36c8108f565eee6d9399f3dc58266aeea0921137b8f8d4445041ce233ae154dba342b6c26dd0d26
 MISC metadata.xml 877 BLAKE2B f7343c25b4643b468d75938b4af93a8e52e10ebb1bc774c3caada33d202d0ea938789bc9400584fc78098b05c7a029c9be781f37302ac8edf7cae40659f6d9a9 SHA512 897f7435ec755c6689192e762172fc02a10ea043d7ba2662eb88dd7db4856dbe82e95c3b7fed890ee6dd2f8b11a3dd77e25af4ec56b69cb7191c5805b31371b3
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r1.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
similarity index 97%
rename from app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r1.ebuild
rename to app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
index 5a67a0db9e25..1b6a21c4bd95 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r1.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r1.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
similarity index 97%
rename from app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r1.ebuild
rename to app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
index eb3f2601963f..e4232394a04c 100644
--- a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r1.ebuild
+++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep '
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+			>=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}]
 		')
 	)
 "
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e3429c8f90bb..c715fa5817b7 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/assess/Manifest b/app-emacs/assess/Manifest
new file mode 100644
index 000000000000..20c593451ff1
--- /dev/null
+++ b/app-emacs/assess/Manifest
@@ -0,0 +1,4 @@
+AUX 50assess-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST assess-0.6.tar.gz 20771 BLAKE2B 29e8f84c20575314271d9a08ed3ac93f28f1c1b5c2df2ac35e397226f4eea033210ff9b96c90a282a44c60e301f5abc38be88efc74c21a2a7fdc29340d6d43e5 SHA512 ff50731867646f07b8c6f3edd1123695d008fa5265ab8b3543cbf32a54a4a0415a91304067e0dacf53890850b56377594802c9763601616bd828316f7a8cef69
+EBUILD assess-0.6.ebuild 757 BLAKE2B e420aca0039852949fdd2878b5e253801847c5dd649d98f6d1cf96d34149976787778a1e985c6bdcc4c73b9ff2259b487a2d515b07a3e9509316b869790e6304 SHA512 ab5fd569b9aaa428171ed4a6737bbb3ef23243dafc3deeaab0e7382757de1d2f6e366f92baebd297e65108224231022e542f2d8b644c6b242e84ed859b048ecc
+MISC metadata.xml 1095 BLAKE2B e29668af7cd5fd16e5ac06dc874692b9a480561a569b70d61091eeaeb39a60d69e121b1732bd0bbde9548779f9cca5587032fd8a57f86449001e47abbd392329 SHA512 9d61d5ab2005666ae61375726527ae35b7450d04653ab2171d86da7c12e5f6844ad1311a8772e82705f56851832f9306b29b81f71c789fe438ed26194f5b351a
diff --git a/app-emacs/assess/assess-0.6.ebuild b/app-emacs/assess/assess-0.6.ebuild
new file mode 100644
index 000000000000..6d09c2dc615c
--- /dev/null
+++ b/app-emacs/assess/assess-0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Test support functions for Emacs"
+HOMEPAGE="https://github.com/phillord/assess/"
+SRC_URI="https://github.com/phillord/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-emacs/m-buffer"
+BDEPEND="
+	${RDEPEND}
+	test? ( app-emacs/load-relative )
+"
+
+DOCS=( README.md )
+
+# Remove a test helper accessing the network, luckily unnecessary
+ELISP_REMOVE="test/local-sandbox.el"
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+			 -l assess-discover -f assess-discover-run-and-exit-batch || die
+}
diff --git a/app-emacs/assess/files/50assess-gentoo.el b/app-emacs/assess/files/50assess-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/assess/files/50assess-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/assess/metadata.xml b/app-emacs/assess/metadata.xml
new file mode 100644
index 000000000000..79e64c29fbc3
--- /dev/null
+++ b/app-emacs/assess/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    Assess provides additional support for testing Emacs packages. It provides:
+    a set of predicates for comparing strings, buffers and file contents,
+    explainer functions for all predicates giving useful output, macros for
+    creating many temporary buffers at once, and for restoring the buffer list,
+    methods for testing indentation, by comparison or "roundtripping", methods
+    for testing fontification.
+    Assess aims to be a stateless as possible, leaving Emacs unchanged whether
+    the tests succeed or fail, with respect to buffers, open files and so on;
+    this helps to keep tests independent from each other.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/phillord/assess/issues/</bugs-to>
+    <remote-id type="github">phillord/assess</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/cask-mode/Manifest b/app-emacs/cask-mode/Manifest
new file mode 100644
index 000000000000..5be59b41b99a
--- /dev/null
+++ b/app-emacs/cask-mode/Manifest
@@ -0,0 +1,4 @@
+AUX 50cask-mode-gentoo.el 170 BLAKE2B 04561e2a93cf163bd9ca76286df64d1876c808f470c59b3072dc4427b0047fe5cc8307a915e83bb429f8b54708c42d17ff581431a494d5892106836c07bfe052 SHA512 753fe32c4a3586fceba21c914c479fedb09c2d97ab1d5863c65a4003b06addc7d6afa9794492426035930c191691e423a56612679d2816e14c8d86289be483c1
+DIST cask-mode-0.1.tar.gz 42693 BLAKE2B 07c3cd998aee36d275c0d3d5dfdb190a1ad59aaa72695272e7dc33e410413de6723003ae28f30e91f96f0ea95142e97cf7fda28a1986fbd509bd281de91693c1 SHA512 4b9861e9fb5a69db476a32b3cc2cfec8e9418d618cb2e348f1476d6aefa22615c539dd3666914be5c42aed1370d5835c7b78775d3bb4578df845b16dbda91727
+EBUILD cask-mode-0.1.ebuild 776 BLAKE2B 8a1807e06e341a9d81ca16e933afa799e9b29041b5f19d86a931f4991ed7e14dc55064d89e27e509c394149e7b68186c65a1a1331a4f025d733f842779c586d8 SHA512 6255204eae137c53bd20a73c85a3a4322092c8c10ba986407bc47de11bdbc4c2d1c0c03197b5ce7a4095a68c86ec0f2ecc09fe161d5837f55cb14c3711158346
+MISC metadata.xml 589 BLAKE2B 87f0bec7c6825e5403cb8e70d92f86b3588e77cdc56eeaa1eff06a76fd337a9291b86aa07da97c8d46a103e4977977008ce70cdb3ce8f793a7baf2639869360b SHA512 0635c793aed24cf5a2c4bfc3c6d699cd9c12e423cbaaa6d708be506daa66f92fb8b01488934041a017069dc80bf0dd1d476a0f2dbb1bcf56c82cba9963995abe
diff --git a/app-emacs/cask-mode/cask-mode-0.1.ebuild b/app-emacs/cask-mode/cask-mode-0.1.ebuild
new file mode 100644
index 000000000000..e2eb648d65ea
--- /dev/null
+++ b/app-emacs/cask-mode/cask-mode-0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+NEED_EMACS=24.3
+
+inherit elisp
+
+DESCRIPTION="Major mode for editing Cask files for Emacs"
+HOMEPAGE="https://github.com/Wilfred/cask-mode/"
+SRC_URI="https://github.com/Wilfred/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-emacs/assess
+		app-emacs/ert-runner
+	)
+"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	elisp_src_prepare
+
+	# Silence a broken test
+	sed "s|ert-deftest cask-mode-highlight-comment|lambda|" \
+		-i test/${PN}-test.el || die
+}
+
+src_test() {
+	ert-runner -L . -L test --reporter ert+duration --script test || die
+}
diff --git a/app-emacs/cask-mode/files/50cask-mode-gentoo.el b/app-emacs/cask-mode/files/50cask-mode-gentoo.el
new file mode 100644
index 000000000000..481b1b9dc272
--- /dev/null
+++ b/app-emacs/cask-mode/files/50cask-mode-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'cask-mode "cask-mode"
+  "Major mode for editing Cask files." t)
+(add-to-list 'auto-mode-alist '("/Cask\\'" . cask-mode))
diff --git a/app-emacs/cask-mode/metadata.xml b/app-emacs/cask-mode/metadata.xml
new file mode 100644
index 000000000000..9ffdb8cff63f
--- /dev/null
+++ b/app-emacs/cask-mode/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    cask-mode is a major mode for editing Cask files. It provides syntax
+    highlighting, comment toggling and indentation.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/Wilfred/cask-mode/issues/</bugs-to>
+    <remote-id type="github">Wilfred/cask-mode</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/compat/Manifest b/app-emacs/compat/Manifest
new file mode 100644
index 000000000000..4e267be24a32
--- /dev/null
+++ b/app-emacs/compat/Manifest
@@ -0,0 +1,3 @@
+DIST compat-28.1.1.1.tar.gz 71771 BLAKE2B 48feaada7e32f07b425048f8b993b2936450dbed8ba20e0f6319d4b098bcc8007323416bf300221a00fb13ff152698c2beaeea6e743d46b1d32b9c0a016a895c SHA512 e733836934671cb373f70a92a20084622e160f2731c5e5c6ce9df348820261db399da0e78d6b95293d9b6992469e96298e9fe83e331a4caaa377fc6ce61f7040
+EBUILD compat-28.1.1.1-r1.ebuild 480 BLAKE2B e0577d26c6c6724d8a7b631ef2856903ac2459657152fed6855eb769bb41834c948227a8a9ac8f0db2ce8911731817683646aae44ba9512fbd7ec520a0f0937b SHA512 718c6a0290929acf3487b6b824d59609fc3f7f4c9b5bd6d25c99f957a2de0412a73d47d86f483e09fae7ccb5486b3e0a287b999ee8fabceb892042ddab9c336b
+MISC metadata.xml 293 BLAKE2B 07085bc46a57a9592b46c4442f0ca6995a5d1857ce51bb85384d389114b3385b71f3977cfed5d7180fd574cc4211824a327c98f5f690a9d959320f9d960af88a SHA512 c3af1c6afe14f621f3d1689ea4fda1b7215c3dd9e3c578e45edda24cc4eae1ec11dc29d42d87c762f3c6decf9f9bdf356b109736d47951c9eaefcca8d9111d56
diff --git a/app-emacs/compat/compat-28.1.1.1-r1.ebuild b/app-emacs/compat/compat-28.1.1.1-r1.ebuild
new file mode 100644
index 000000000000..8964a682162d
--- /dev/null
+++ b/app-emacs/compat/compat-28.1.1.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Compatibility libraries for Emacs"
+HOMEPAGE="https://git.sr.ht/~pkal/compat"
+SRC_URI="https://git.sr.ht/~pkal/compat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="sys-apps/texinfo"
+
+ELISP_TEXINFO="compat.texi"
+
+src_prepare() {
+	default
+	rm Makefile compat-tests.el || die
+}
diff --git a/app-emacs/compat/metadata.xml b/app-emacs/compat/metadata.xml
new file mode 100644
index 000000000000..3264e3c57176
--- /dev/null
+++ b/app-emacs/compat/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-emacs/consult/Manifest b/app-emacs/consult/Manifest
index 9a879f244d23..1c000b995896 100644
--- a/app-emacs/consult/Manifest
+++ b/app-emacs/consult/Manifest
@@ -1,4 +1,6 @@
 AUX 50consult-gentoo.el 82 BLAKE2B 3443827f490db8caacfe842cc7f1d1315f3889dec007210f451909576a76139f70ac5795346a7a1b11befccd3152874fd3c86ad7a20c0fbf84f793f8deb595cd SHA512 dd2ba1149c847d95d6c54265bc03de36e198dfecedc10336f6879fb3a1fc9d92e2c6de190d4f9aaab6c3d15f268fb80e082b49b6e96165697ff786333a50a601
 DIST consult-0.15.tar.gz 90201 BLAKE2B 1652d5a2c1f559c67f6899fe26b221bfdf0599a20af7309e2dc57a4701a795c8decd2f878056297204611d045829ee1aa24ccb665e36c15f6a2a3a14eb81f382 SHA512 2b8926638c13633e2ccf48d63a3a76245d075694f046e20575e8c9bcce983a3610ef648374b01dbff4dbf97d116830040c8e76d9d75d05ca23278253e68138e5
+DIST consult-0.18.tar.gz 93440 BLAKE2B cc67e8cbc49846964114a8e01a10d41454fde2e4a2e98e3af315092fab5631ea1418f649eb92ca798672c0ea153dd2862b555aee6530a1baa84ac4050df7a3c6 SHA512 74005c211ba7af0cf3c0a06fdec8d85da111ea84edb4eef2c60d231ae6eb87905298ee8bbbcdac8bf8b13a21ed9070422383b93433e422d6ad6b743c8bc80938
 EBUILD consult-0.15.ebuild 456 BLAKE2B cc4edada3d2a580436f812bcee60e56015f354d10442fc63a9e48d4c57c77cae8f5bea75828478009b28049d715ba46e5042d37e8633f53fdadf70b98b4994d4 SHA512 9ec27b2cbc037a83b5ef583ca0d997863f1c993a6f200feadd9c0f914cd875b29d0194fdc118988e9345c233d0aba3cb869324cbe69016b3dd3bea3eb736e6cd
+EBUILD consult-0.18.ebuild 512 BLAKE2B 56b9e691d89d705a6cfee1850c3662f9e23b32d16d9066001c0b88dd2a9e3cbf1142b15f23ce13368300531556c66c69e9d10770495613d00dd93cdf3ef50fd3 SHA512 aedace27479c09512b196fc31d57e882967a5c95958c2d1f8e053866a41d6e7b2828a075127c149e97ff5512a53089e9602c3a0ae47f231186e276a16f699c84
 MISC metadata.xml 359 BLAKE2B 569bd0c5fe81610f0b67c94e8c431edddb5060800a6e22d0833a4d5f120df34545dc49c879c12a6522ccbe791472df47be42af97fbb228498e79d9e0893697f3 SHA512 8e01b569f019ea43209f43c783fd41b9661a7235d300363a9441179058b10921629cf8b891874c706d2c1ec106248f6c1e0a3501df7bfcdd02000d08f7997c29
diff --git a/app-emacs/consult/consult-0.18.ebuild b/app-emacs/consult/consult-0.18.ebuild
new file mode 100644
index 000000000000..d2a809943fab
--- /dev/null
+++ b/app-emacs/consult/consult-0.18.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=27
+
+inherit elisp
+
+DESCRIPTION="Consulting complete-read"
+HOMEPAGE="https://github.com/minad/consult"
+SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=app-emacs/compat-28.1"
+BDEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	elisp_src_compile
+	elisp-make-autoload-file
+}
diff --git a/app-emacs/editorconfig-emacs/Manifest b/app-emacs/editorconfig-emacs/Manifest
index 080fe7f345a4..e18aadd062a0 100644
--- a/app-emacs/editorconfig-emacs/Manifest
+++ b/app-emacs/editorconfig-emacs/Manifest
@@ -2,5 +2,5 @@ AUX 50editorconfig-emacs-gentoo.el 436 BLAKE2B 3472733b5554060e3067ac6b4efdfcfb2
 DIST editorconfig-emacs-0.7.8.tar.gz 28250 BLAKE2B 8c09b7e495ff38d4276cdbaf60109f91b3e32215f2c6a8aceffd80a02cf024d79eac1739b3f2efa3697b78804da32d0cc2969db628d1064a0fb1db1b059a191d SHA512 21815a5a778ffef68b5205e409aa827c1bd6c9a8c542647ebec889a9f00f5b3f71e3a2072bc2f0373e8ce30c1bb57f5f6350953a3c149742a8e2e46ca9846c9a
 DIST editorconfig-emacs-0.8.2.tar.gz 39675 BLAKE2B a2a9641185a00c2908715b59a7e4429008f7587e00552ebc19f6cc38b6a10423c26a25557b887caaddc47d9c136fdec82476ef916e18c06b8228925b4554428b SHA512 6934418fd7890c49d8df7cdac1a0afe066e07ddf6274f674a4624dca47de278a78778f25beca793cdb537852beb7c8df5ea46743fb0bc753acccbb9974448e18
 EBUILD editorconfig-emacs-0.7.8-r3.ebuild 643 BLAKE2B 208c992003325e6032e9e0e4fb8d5a809525fb47df3ce9230ca06e0ded7a1f3d2f784665d523d2f04e9bf68af17c3832c23b99d3e4bf20f243922881a7d623c2 SHA512 a723535a6344b20ade6cc9642c96075abcd6e596f1683231f5b5b436fe3cb611e1dc3ba5c132c4acc70a28c4303ed54c05db48709cd76138113f4e5c955aa10b
-EBUILD editorconfig-emacs-0.8.2-r2.ebuild 645 BLAKE2B 6a50acd15b16fcf9f84ba56ae90ce01730fa0fe08ccfabc8869d9bbd346e7a5ee63ce27ee706345919eff5c82b3f5fd4888343617acf2d7a218c5760f72a6d56 SHA512 62cc565c9d667f7669c1c8e7f4a388b59626b4cb81d3d1c55127c9ace545518edc0c0b2d8c5d52525d0f9f3d8a010013bfab35389704f5ab5f5adca3f3d2d6e3
+EBUILD editorconfig-emacs-0.8.2-r2.ebuild 643 BLAKE2B cd8b1c3edf7fb93e11d195423f0e8a88ed62973d9233fa202f79737a41f2c8b57490d38d05b44f60abcc87f8b1d6a760356ff5be0921707e034e794f5b085b02 SHA512 9147e98b5153d9965a66b67107f1891c9de1994673607dae4b1bb430715ff6db927b2a29ad487223beef5873e59a5478dc990ebc3db17ebf6069821beb1de437
 MISC metadata.xml 461 BLAKE2B e8415c92944d44ef9186b4882d7a5b912ccc16f224da3faef90b43ee8077e94496234341b80eaaf20a17118ebe6f8e8b0cfb70910c948a3ef5a8f853a02cba22 SHA512 a679c75eda6a98c3810b3fc1982ed8c7ff9349a63541eaf3c2b5dfdfec4d1a97f7c540d6b6442511c2645aed46e4b6d346f01ed952a51eb12d076aab8d29351f
diff --git a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
index d24511f11c4b..7f577a0477fa 100644
--- a/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
+++ b/app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"		# make test requires a git repo
 
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/f/Manifest b/app-emacs/f/Manifest
index 3fae737772a8..bdaafd8ebd26 100644
--- a/app-emacs/f/Manifest
+++ b/app-emacs/f/Manifest
@@ -1,6 +1,6 @@
 AUX 50f-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST f-0.19.0.tar.gz 19477 BLAKE2B 47cfb8c876e11cae7eca61815085c4290f65f9d72a7c5d397d8b53f6d57421f46997786556074027de5405acbf38ddb42ecbb767c809763e84d880286e6942dc SHA512 694eca1872cb0a0da7f75f610e4101993a79a5e7601c3f72fd2c642b1a44f5eada24777313b5166d901d9d983c18b4d412b4c6f01c382ace7530bacaa3b67c56
 DIST f-0.20.0.tar.gz 19907 BLAKE2B 20b82a19b227d2e0863e540e75bc5094c0cf267eae00d699ff5b00fa574213d303135c246c454c92785080feae63ba6c529b115aeb1368774dd548852d94fb48 SHA512 0c44e63cd527a37bd5582d5a2a4cb2269d179930d7f41b378b9100ad5bb4518291b02197b1d55e1bf603bb5b1c12181b982d9b9a3f8fbd48860f6e86ea36c03e
-EBUILD f-0.19.0.ebuild 526 BLAKE2B c8f84f7ea67d86cccf39dccb13e887026da2c4a52b16c9cbf9272c62694af5dbf5666a0688d0e8c8bad8d5b3639040676df11cbcad4ef1eb7eb4e325ecfeb4ba SHA512 f56bdbcd85b0aae7c3c70d3b9edee58ef668f9f12939f4f87e705d64d68dccd28f97e2838c0dfcdd6f64be780a5628af349507c9601fc054b6f536a4ca24e356
-EBUILD f-0.20.0.ebuild 541 BLAKE2B 8483c4ea300583a939361c7738abb84d9ac8b524509f79fd8ecc2a500bf061422359e6c7e76b3a3be9b06a04cda7f85c24daba4a54dff7616d5726e6eaf4fc47 SHA512 87510b9d844aa5b99b5048ead021920783747485d924c610d14dd81c21f126e580f612bcc597b976e00a73d1fe79f3621c624c6a4c414bd075ebf69af6633053
+EBUILD f-0.19.0-r1.ebuild 523 BLAKE2B 62e8f52b873e9a4e879689547677301f0d31627bdff7cb3b7ae18f28c1854ba4ce46cb134fbb26240353de5972b24464e5503ca7a7b7e7575fb34dcb134fbea7 SHA512 c11136a9763e32d3ad8fc58000d8849f3c4c1e823483ae1a8c7a711e79c5524b60bfb491f9a8206ad0c018ed432420ffe86516fae2e882c56827e5b61847f42b
+EBUILD f-0.20.0-r1.ebuild 541 BLAKE2B 217d1f81ce726f117401526a646cb9ba65d5af368fa506ced181cc92aeebd3c319f0370212a65dffec8a64d5c9d0f5a52c5071fde6ba0e37240e7bfb892aee4e SHA512 4df9fe0600f0f5300831bf57b875988b642ed2276321ef0d2c3fe6c652a4f657c4b34288b82d11699eb66a4b020fd7012b962e67f3cc0efc34e7b9cd01f43810
 MISC metadata.xml 357 BLAKE2B a60c6938e7ac515ba2a2455784adc08fc1271acbdb8cffe5f78fb28eb532c491fa102dda5207a46b65c45e9eee680e18e5adcbae9ead84eb2ba7fdc785818533 SHA512 3a326f0132b4e6619d3c280d2740b231d03a00c3a9b5d77be10a017435cefe645be2f1c8a83e4a34336da5511a87913406b31be06e8e46de280dee3221b45a3b
diff --git a/app-emacs/f/f-0.19.0.ebuild b/app-emacs/f/f-0.19.0-r1.ebuild
similarity index 91%
rename from app-emacs/f/f-0.19.0.ebuild
rename to app-emacs/f/f-0.19.0-r1.ebuild
index 72b552759a6e..c87a18f235d6 100644
--- a/app-emacs/f/f-0.19.0.ebuild
+++ b/app-emacs/f/f-0.19.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
diff --git a/app-emacs/f/f-0.20.0.ebuild b/app-emacs/f/f-0.20.0-r1.ebuild
similarity index 91%
rename from app-emacs/f/f-0.20.0.ebuild
rename to app-emacs/f/f-0.20.0-r1.ebuild
index a26344476647..70ca0a2b0183 100644
--- a/app-emacs/f/f-0.20.0.ebuild
+++ b/app-emacs/f/f-0.20.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
diff --git a/app-emacs/jde/Manifest b/app-emacs/jde/Manifest
deleted file mode 100644
index 7264f7586b2f..000000000000
--- a/app-emacs/jde/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 70jde-gentoo.el 406 BLAKE2B 236be929cb339aedb7025d80eacb0a548b72c50e04ce0020d8a4b99b87886a3a7f32bdde004b8d18cc7328f5b32766589b8b8780a22693fa8f14d0f7c7d1cb23 SHA512 9d7f65d67d897272c4aa24e3fa77abd217b077561d391ccec8181838d4e162f9086f95fb724ee9bba3bdd44f954f14d67c044ebd78a059a69bc0f12c03c0fc28
-AUX jde-2.4.0.1-classpath-gentoo.patch 2291 BLAKE2B 6eed82127107933d274218e72f052ab1d4b2a737f36ad0834b88724d2c9dc550f8480966fddaad902e5b63c98c98135ceb77cc7820fa0d1512dbe6607a69f6e6 SHA512 c18378500f04b2f6cbed5c4a20d03600ea01174faf93d460c1ea274c50ca95891096f49e471160255e4ec27cda2330ee6c28fe29e96633994c3d5f910876f848
-AUX jde-2.4.0.1-fix-paths-gentoo.patch 7175 BLAKE2B ee0e51e50afb1bcd86432f6546a0b2105a987b3b8a616dd88a21817667f362eb554bf6f6af41f3b0efe409654e4a3a6ea85f4f753e7c668081fad79228ce73f7 SHA512 179e6bd8cc0165ee1f0d3383aec76bdb97f6164562663fe577a9ef04ac236afeccf1137594d7d4d8962ce4577befeb81e393d03c08bf68473657de7e18debb7e
-AUX jde-2.4.1-doc-directory.patch 1806 BLAKE2B 6e13265c71beb4247aba97ddb05f7b500822f7a8f619c40dca229533497c101b93ee6d891a3c85e51f9d56f39b2fec229c44f922f1bc2d79b3b5942bed6913a5 SHA512 3818474077c2f387bdef6fb297a40b94529622e1da3fb31c3d7b3734111fb4e607062f9cdca9f1f5b020dec8d8e9e6601d5bf7831a20415f393f2f029e97c101
-DIST jdee-2.4.1.tar.xz 2742232 BLAKE2B f022cb55583acc7846bc04b59e843050947819c6bb2494bbe08ac3895c15d914df28d3c3a50cfd945efa7ed507cda9906a42866c85463907544095377cc1bf07 SHA512 5ce5f0f84b2502e9af808f33210511e8b7682902b1f342d678fe42dd8f9f3690b90ef7bb22583550eb769818782c50f545d6baf47b52bc7f4502fab411ab5359
-EBUILD jde-2.4.1-r2.ebuild 1908 BLAKE2B a563841edc5a24f340ee36ced4f2510a0b36e7e8488889767403a81efc045a1940a0dd5f4a31cad12563acd321e79f1f7bc8bd406a5c154b824da13951e49a00 SHA512 9e2abd3c2c5558237f352c4f56a7fb4b51cc612129994e8211337c5e276c71097f2ac9c796194b34befccc390a3123558a734fb95873e559f99330d1a36d2407
-MISC metadata.xml 991 BLAKE2B 657c5e22e11e634944730d2e8de9db43efa34950c8986fd8c856a0953a98659d648d57046a9a4b4890c3d6b7097a1d4cae3f4359c21d937466c35d5e4b7ba42e SHA512 86ff31fc86cc49666bcab4f446491dd56862b144a3e05f7e88723a500be82be12fffa909230b5a74a2fd67fbd7a9f20c9da9f44d0d264dfa84bc3b8423201e64
diff --git a/app-emacs/jde/files/70jde-gentoo.el b/app-emacs/jde/files/70jde-gentoo.el
deleted file mode 100644
index c7fff6a61b4d..000000000000
--- a/app-emacs/jde/files/70jde-gentoo.el
+++ /dev/null
@@ -1,10 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
-(require 'jde-autoload)
-
-(setq jde-java-directory "/usr/share/jde")
-(setq jde-bsh-jar-file "@BSH_JAR@")
-(setq jde-checkstyle-jar-file "@CHECKSTYLE_JAR@")
-(setq jde-checkstyle-style "/usr/share/checkstyle/checks/sun_checks.xml")
-(setq jde-html-directory "/usr/share/doc/@PF@/html")
-(setq bsh-html-directory "/usr/share/doc/@PF@/html")
-(setq jde-check-version-flag nil)
diff --git a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
deleted file mode 100644
index 47fdd4e11e47..000000000000
--- a/app-emacs/jde/files/jde-2.4.0.1-classpath-gentoo.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Initialise classpath for beanshell and checkstyle using java-config.
-Gentoo specific patch.
-
---- jde-orig/lisp/beanshell.el
-+++ jde/lisp/beanshell.el
-@@ -809,6 +809,14 @@
-   "BeanShell intended to be used independently of any other
- Emacs package.")
- 
-+(defun bsh-get-gentoo-classpath ()
-+  (or bsh-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "bsh")
-+	(skip-chars-backward "\n")
-+	(setq bsh-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod initialize-instance ((this bsh-standalone-bsh) &rest fields)
-   "Constructor for the standard bsh BeanShell instance."
-   (call-next-method)
-@@ -845,7 +853,7 @@
- 	bsh-vm)
-      (executable-find (if (eq system-type 'windows-nt) "javaw" "java"))))
- 
--  (oset this cp bsh-classpath)
-+  (oset this cp (bsh-get-gentoo-classpath))
- 
-   (oset this startup-dir bsh-startup-directory))
- 
---- jde-orig/lisp/jde-bsh.el
-+++ jde/lisp/jde-bsh.el
-@@ -187,7 +187,7 @@
- 		       (jde-get-tools-jar)
- 		       (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
--		      bsh-classpath
-+		      (bsh-get-gentoo-classpath)
- 		      (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
---- jde-orig/lisp/jde-checkstyle.el
-+++ jde/lisp/jde-checkstyle.el
-@@ -305,6 +305,14 @@
-        (format "-D%s=%s" (car prop) (cdr prop)))
-      jde-checkstyle-expanded-properties))
- 
-+(defun jde-checkstyle-get-gentoo-classpath ()
-+  (or jde-checkstyle-classpath
-+      (with-temp-buffer
-+	(call-process "java-config" nil t nil "-d" "-p" "checkstyle")
-+	(skip-chars-backward "\n")
-+	(setq jde-checkstyle-classpath
-+	      (split-string (buffer-substring (point-min) (point)) ":+")))))
-+
- (defmethod jde-checkstyle-exec ((this jde-checkstyle-checker))
- 
-   (jde-checkstyle-create-checker-buffer this)
-@@ -327,9 +335,8 @@
- 		  (jde-checkstyle-get-property-args this))
- 		(oref this :interactive-args)
- 		(list "-classpath"
--		      (if jde-checkstyle-classpath
--			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path jde-checkstyle-jar-file)))
-+		      (jde-build-classpath
-+		       (jde-checkstyle-get-gentoo-classpath)))
- 		(list jde-checkstyle-class)
- 		(list "-c"
- 		      (if jde-checkstyle-style
diff --git a/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch b/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
deleted file mode 100644
index a129b588587c..000000000000
--- a/app-emacs/jde/files/jde-2.4.0.1-fix-paths-gentoo.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-Make paths of directories and jar files configurable.
-
-Part of this patch was taken from Debian and heavily modified, see:
-http://patch-tracking.debian.net/patch/series/view/jde/2.3.5.1-5/0005-Set-the-location-of-needed-files-for-beanshell.el-an.patch
-
---- jde-orig/lisp/beanshell.el
-+++ jde/lisp/beanshell.el
-@@ -891,14 +891,21 @@
- 
- (add-to-list 'auto-mode-alist '("\\.bsh\\'" . bsh-script-mode))
- 
-+(defcustom bsh-html-directory
-+  (let ((jde-dir (jde-find-jde-doc-directory)))
-+    (if jde-dir
-+	(expand-file-name "doc/html/bsh-ug" jde-dir)))
-+  "Directory of the beanshell HTML documentation."
-+  :group 'bsh
-+  :type 'directory)
-+
- ;;;###autoload
- (defun bsh-script-help ()
-   "Display BeanShell User's Guide."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (bsh-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/bsh-ug/bsh-ug.html" jde-dir))))
-+  (let ((bsh-help
-+	 (if bsh-html-directory
-+	     (expand-file-name "bsh-ug.html" bsh-html-directory))))
-     (if (and
- 	 bsh-help
- 	 (file-exists-p bsh-help))
---- jde-orig/lisp/jde-bsh.el
-+++ jde/lisp/jde-bsh.el
-@@ -91,22 +91,59 @@
- 		   "The single instance of the JDEE's BeanShell."))
-   "Class of JDEE BeanShells. There is only one per Emacs session.")
- 
-+(defcustom jde-java-directory
-+  (expand-file-name "java" (jde-find-jde-data-directory))
-+  "Top-level directory of JDE Java files."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-bsh-commands-directory
-+  (expand-file-name "bsh-commands" jde-java-directory)
-+  "Directory of beanshell commands."
-+  :group 'bsh
-+  :type 'directory)
-+
-+(defcustom jde-classes-directory
-+  (expand-file-name "classes" jde-java-directory)
-+  "Directory of JDE classes."
-+  :group 'jde-project
-+  :type 'directory)
-+
-+(defcustom jde-checkstyle-jar-file
-+  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory)
-+  "Path of the checkstyle-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-regexp-jar-file
-+  (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory)
-+  "Path of the regexp-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-jde-jar-file
-+  (expand-file-name "lib/jde.jar" jde-java-directory)
-+  "Path of the jde-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
-+(defcustom jde-bsh-jar-file
-+  (expand-file-name "lib/bsh.jar" jde-java-directory)
-+  "Path of the bsh-jar file."
-+  :group 'jde-project
-+  :type 'file)
-+
- (defmethod initialize-instance ((this jde-bsh) &rest fields)
-   "Constructor for the JDEE BeanShell instance."
-   (call-next-method)
--  (let* ((jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/")))
--
--    (oset this bsh-cmd-dir (expand-file-name "bsh-commands" jde-java-directory))
--    (oset this checkstyle-jar  (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))
--    (oset this regexp-jar (expand-file-name "lib/jakarta-regexp.jar" jde-java-directory))
--    (oset this jde-classes-dir (expand-file-name "classes" jde-java-directory))
--    (oset this jde-jar (expand-file-name "lib/jde.jar" jde-java-directory))
--    (oset this jar  (expand-file-name "lib/bsh.jar" jde-java-directory))
--    (oset this separate-error-buffer jde-bsh-separate-buffer)
--    (oset-default 'jde-bsh the-bsh this)))
-+  (oset this bsh-cmd-dir jde-bsh-commands-directory)
-+  (oset this checkstyle-jar jde-checkstyle-jar-file)
-+  (oset this regexp-jar jde-regexp-jar-file)
-+  (oset this jde-classes-dir jde-classes-directory)
-+  (oset this jde-jar jde-jde-jar-file)
-+  (oset this jar jde-bsh-jar-file)
-+  (oset this separate-error-buffer jde-bsh-separate-buffer)
-+  (oset-default 'jde-bsh the-bsh this))
- 
- (defmethod bsh-create-buffer ((this jde-bsh))
-   "Creates the JDEE's beanshell buffer."
-@@ -150,6 +187,7 @@
- 		       (jde-get-tools-jar)
- 		       (if ant-home (expand-file-name "lib" ant-home)))
- 		      (jde-pi-get-bsh-classpath)
-+		      bsh-classpath
- 		      (jde-expand-classpath (jde-get-global-classpath)))))))
- 
- ;; Create the BeanShell wrapper object.
---- jde-orig/lisp/jde-bug.el
-+++ jde/lisp/jde-bug.el
-@@ -2438,10 +2438,10 @@
- (defun jde-bug-help ()
-   "Displays the JDEbug User's Guide."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jdebug-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/jdebug-ug/jdebug-ug.html" jde-dir))))
-+  (let ((jdebug-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jdebug-ug/jdebug-ug.html"
-+			       jde-html-directory))))
-     (if (and
- 	 jdebug-help
- 	 (file-exists-p jdebug-help))
---- jde-orig/lisp/jde-checkstyle.el
-+++ jde/lisp/jde-checkstyle.el
-@@ -322,10 +322,6 @@
- 	 (vm-path (oref (jde-run-get-vm) :path))
- 	 (source-file
- 	  (concat (file-name-nondirectory buffer-file-name)))
--	 (jde-java-directory
--	  (concat
--	   (jde-find-jde-data-directory)
--	   "java/"))
- 	 (args (append
- 		(unless jde-checkstyle-expanded-properties-file
- 		  (jde-checkstyle-get-property-args this))
-@@ -333,13 +329,13 @@
- 		(list "-classpath"
- 		      (if jde-checkstyle-classpath
- 			  (jde-build-classpath jde-checkstyle-classpath)
--			(jde-normalize-path
--			 (expand-file-name "lib/checkstyle-all.jar" jde-java-directory))))
-+			(jde-normalize-path jde-checkstyle-jar-file)))
- 		(list jde-checkstyle-class)
- 		(list "-c"
- 		      (if jde-checkstyle-style
- 			  (jde-normalize-path jde-checkstyle-style)
--			(concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml")))
-+			(expand-file-name "lib/sun_checks.xml"
-+					  jde-java-directory)))
- 		(if jde-checkstyle-expanded-properties-file
- 		    (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
- 		(if jde-checkstyle-module-package-names-file
---- jde-orig/lisp/jde-dbs.el
-+++ jde/lisp/jde-dbs.el
-@@ -907,9 +907,6 @@
- 		  (jde-normalize-path 'jde-run-working-directory)
- 		source-directory))
- 	     (vm (oref (jde-run-get-vm) :path))
--	     (jde-java-directory
--	      (expand-file-name "java"
--	       (jde-find-jde-data-directory)))
- 	     (vm-args
- 		(let (args)
- 		  (setq args
---- jde-orig/lisp/jde.el
-+++ jde/lisp/jde.el
-@@ -1722,14 +1722,19 @@
- jde.el."
-   (jde-find-jde-data-directory))
- 
-+(defcustom jde-html-directory
-+  (expand-file-name "doc/html" (jde-find-jde-doc-directory))
-+  "Directory of the JDE HTML documentation."
-+  :group 'jde-project
-+  :type 'directory)
-+
- ;;;###autoload
- (defun jde-show-help ()
-   "Displays the JDE User's Guide in a browser."
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jde-help
--	  (if jde-dir
--	      (expand-file-name "doc/html/jde-ug/jde-ug.html" jde-dir))))
-+  (let ((jde-help
-+	 (if jde-html-directory
-+	     (expand-file-name "jde-ug/jde-ug.html" jde-html-directory))))
-     (if (and
- 	 jde-help
- 	 (file-exists-p jde-help))
---- jde-orig/lisp/jde-jdb.el
-+++ jde/lisp/jde-jdb.el
-@@ -1459,10 +1459,10 @@
- 
- (defun jde-jdb-help ()
-   (interactive)
--  (let* ((jde-dir (jde-find-jde-doc-directory))
--	 (jdb-ug-path
--	  (if jde-dir
--	      (expand-file-name "doc/html/jdb-ug/jdb-ug-frame.html" jde-dir))))
-+  (let ((jdb-ug-path
-+	 (if jde-html-directory
-+	     (expand-file-name "jdb-ug/jdb-ug-frame.html"
-+			       jde-html-directory))))
-     (if (and
- 	 jdb-ug-path
- 	 (file-exists-p jdb-ug-path))
diff --git a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch b/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
deleted file mode 100644
index c96fcd861594..000000000000
--- a/app-emacs/jde/files/jde-2.4.1-doc-directory.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Move definition of jde-find-jde-doc-directory to jde-util.el.
-
---- jdee-orig/lisp/beanshell.el
-+++ jdee/lisp/beanshell.el
-@@ -82,7 +82,7 @@
- (eval-when-compile
-   (require 'cl))
- 
--(declare-function jde-find-jde-doc-directory "jde" nil)
-+(require 'jde-util)
- 
- (defgroup bsh nil
-   "Customizations for the Emacs inteface to Pat Neimeyer's Java
---- jdee-orig/lisp/jde-util.el
-+++ jdee/lisp/jde-util.el
-@@ -139,6 +139,17 @@
- 	  (if dir dir (jde-root)))
-       (jde-root))))
- 
-+(defun jde-find-jde-doc-directory ()
-+  "Return the path of the JDE documentation directory.
-+Returns  nil if the directory cannot be found. At some
-+point, XEmacs will include the JDE. Versions of XEmacs
-+that include JDE will store the JDE doc in a data
-+directory called jde. On all other Emacs versions, the JDE
-+expects to find the documentation in a subdirectory
-+named doc of the directory that contains the file
-+jde.el."
-+  (jde-find-jde-data-directory))
-+
- (defun jde-temp-directory ()
- "Get the location used by the host system to store temporary files."
-   (or (if (boundp 'temporary-file-directory) temporary-file-directory)
---- jdee-orig/lisp/jde.el
-+++ jdee/lisp/jde.el
-@@ -1762,17 +1762,6 @@
- 
- 
- ;; JDE help
--(defun jde-find-jde-doc-directory ()
--  "Return the path of the JDE documentation directory.
--Returns  nil if the directory cannot be found. At some
--point, XEmacs will include the JDE. Versions of XEmacs
--that include JDE will store the JDE doc in a data
--directory called jde. On all other Emacs versions, the JDE
--expects to find the documentation in a subdirectory
--named doc of the directory that contains the file
--jde.el."
--  (jde-find-jde-data-directory))
--
- (defcustom jde-html-directory
-   (expand-file-name "doc/html" (jde-find-jde-doc-directory))
-   "Directory of the JDE HTML documentation."
diff --git a/app-emacs/jde/jde-2.4.1-r2.ebuild b/app-emacs/jde/jde-2.4.1-r2.ebuild
deleted file mode 100644
index a4bcf20cc0e5..000000000000
--- a/app-emacs/jde/jde-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 elisp
-
-DESCRIPTION="Java Development Environment for Emacs"
-HOMEPAGE="http://jdee.sourceforge.net/"
-# snapshot of svn://svn.code.sf.net/p/jdee/code/branches/2.4.1 (rev 292)
-# (upstream's distfile misses build.xml)
-SRC_URI="mirror://gentoo/jdee-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=virtual/jdk-1.8:*
-	dev-java/bsh:0
-	dev-java/junit:0
-	dev-util/checkstyle:0"
-DEPEND="${RDEPEND}
-	dev-java/ant-contrib:0"
-
-S="${WORKDIR}/jdee-${PV}"
-SITEFILE="70${PN}-gentoo.el"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.0.1-fix-paths-gentoo.patch"
-	"${FILESDIR}/${PN}-2.4.0.1-classpath-gentoo.patch"
-	"${FILESDIR}/${PN}-2.4.1-doc-directory.patch"
-)
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-	elisp_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	local bshjar csjar
-	bshjar=$(java-pkg_getjar --build-only bsh bsh.jar) || die
-	csjar=$(java-pkg_getjar --build-only checkstyle checkstyle.jar) || die
-	sed -e "s:@BSH_JAR@:${bshjar}:;s:@CHECKSTYLE_JAR@:${csjar}:" \
-		-e "s:@PF@:${PF}:" "${FILESDIR}/${SITEFILE}" >"${SITEFILE}" || die
-
-	cd java/lib || die
-	java-pkg_jar-from --build-only checkstyle checkstyle.jar checkstyle-all.jar
-	java-pkg_jar-from junit
-	java-pkg_jar-from bsh
-}
-
-src_compile() {
-	ANT_TASKS="ant-contrib" \
-		eant bindist $(usex doc source-doc "")
-}
-
-src_install() {
-	local dist="dist/jdee-${PV%_*}"
-
-	java-pkg_dojar ${dist}/java/lib/jde.jar
-	insinto "${JAVA_PKG_SHAREPATH}"
-	doins -r java/bsh-commands
-
-	use source && java-pkg_dosrc java/src/*
-	use doc && java-pkg_dojavadoc ${dist}/doc/java/api
-
-	elisp-install ${PN} ${dist}/lisp/*.{el,elc}
-	elisp-site-file-install "${SITEFILE}"
-
-	dobin ${dist}/lisp/jtags
-
-	dodoc -r doc/html
-	find "${ED}"/usr/share/doc -iname "*makefile" -delete || die
-}
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
deleted file mode 100644
index 2a92351c1b18..000000000000
--- a/app-emacs/jde/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<maintainer type="project">
-  <email>java@gentoo.org</email>
-  <name>Java</name>
-</maintainer>
-<longdescription>
-  The Java Development Environment for Emacs is a software package
-  that interfaces Emacs to command-line Java development tools (for
-  example, JavaSoft's JDK). JDEE features include:
-
-    * JDEE menu with compile, run, debug, build, browse, project, and
-      help commands
-    * syntax coloring
-    * auto indentation
-    * compile error to source links
-    * source-level debugging
-    * source code browsing
-    * make file support
-    * automatic code generation
-    * Java source interpreter (Pat Neimeyer's BeanShell)
-</longdescription>
-<upstream>
-  <remote-id type="sourceforge">jdee</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-emacs/load-relative/Manifest b/app-emacs/load-relative/Manifest
new file mode 100644
index 000000000000..616ab25feb3f
--- /dev/null
+++ b/app-emacs/load-relative/Manifest
@@ -0,0 +1,4 @@
+AUX 50load-relative-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST load-relative-1.3.1.tar.gz 33985 BLAKE2B 5e2f4329d380d9bc001e23ea4dd096422357cf18e3685d0eeff80c319172ab3ac0afeb722a9322e0cccd8d99c809ace42bc3352a38161f1aea0a3d3d3af27241 SHA512 22d31bfeee37a14bb9820df818a6d1d3cd4d2efb98bbf41ef9e866df602bd18ac0896c625c70195b50f98703d9e0ba2797e0095f051e2937455c29d8be5599c0
+EBUILD load-relative-1.3.1.ebuild 532 BLAKE2B 9738d4768e97cf2c8af171b58ad0928f116515b968500c3ecd877fbd0afb362c52e8bd3087cb94206ce4636d13426f4b7cc5f10ca0d400f5edaccaca34b48530 SHA512 9b01961cba1addcbcc8a0b8e0b545a7942a753f7917d839d87cc5176f6fa5a5aaac816ab0969c57dd114b87dd42cebe114bdb26ae84092243fbe411e68beb754
+MISC metadata.xml 589 BLAKE2B 80558a5fda032030a5ac7b378502c5a99ee5e08222ccd7a72842127a397e894c018c94493f5a064ed64985e4d8121ea6136cdd3de586b298b37369b6d5fc341d SHA512 a75c9aa6182f6b7aed9b3f65fcb6520a3e18569c5527ae6af8c9830b9ccd1d6b5f29c234204b2afb538da1108a90370f0c60ef4c687619f68688b7e12b11dd36
diff --git a/app-emacs/load-relative/files/50load-relative-gentoo.el b/app-emacs/load-relative/files/50load-relative-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/load-relative/files/50load-relative-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/load-relative/load-relative-1.3.1.ebuild b/app-emacs/load-relative/load-relative-1.3.1.ebuild
new file mode 100644
index 000000000000..53a2b90b909c
--- /dev/null
+++ b/app-emacs/load-relative/load-relative-1.3.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Relative loads for Emacs Lisp files"
+HOMEPAGE="https://github.com/rocky/emacs-load-relative/"
+SRC_URI="https://github.com/rocky/emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/emacs-${P}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DOCS=( ChangeLog README.md )
+ELISP_REMOVE="el-get-install.el"  # Unnecessary, used for install using el-get
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/load-relative/metadata.xml b/app-emacs/load-relative/metadata.xml
new file mode 100644
index 000000000000..54ce9d0ed7bb
--- /dev/null
+++ b/app-emacs/load-relative/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    Relative loads for Emacs Lisp files. Adds functions __FILE__ and
+    load-relative and require-relative.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/rocky/emacs-load-relative/issues/</bugs-to>
+    <remote-id type="github">rocky/emacs-load-relative</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/m-buffer/Manifest b/app-emacs/m-buffer/Manifest
new file mode 100644
index 000000000000..947462483c57
--- /dev/null
+++ b/app-emacs/m-buffer/Manifest
@@ -0,0 +1,4 @@
+AUX 50m-buffer-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
+DIST m-buffer-0.15.tar.gz 19211 BLAKE2B b4cbb7bdac9e68622db03acba07b5422181599e69e6d92740aa364684c998de9a24c8740cc2d7ec0dc40e9eee56f211a93bcfd734d30b9b44b8ca3b54ec4f39c SHA512 94465cbec24137d82498ce68d7e76f871e3986afae0bb419b8e65b740c54d6c65db8ab0dedf87392cbd2b383c7ca8eb96cf295139bb1322e7652e44ac41937ae
+EBUILD m-buffer-0.15.ebuild 661 BLAKE2B b79981d6657afa089d64e605ab0c7ac9e4ae0e898eed7ed809272f8f69e642015619588d4e588c070b939fc08e91de2b9ff6e990e23d6cbbe4c06a104e454aed SHA512 5500592116bb1b6ddddb4d524fbc6ff70bd94143c6f85ca1d0a9e9106391cec99f6c1b749d04cc09a6fc91ce9fe32dbaa055abe911d56ddc5d4c85a7e1821d97
+MISC metadata.xml 755 BLAKE2B 9b9962af5c52d285c92201219ca6c83399a8993b9d927c73188dd1d9fcf60a6140ac69d331f112961e268bd957038adc20db1ac334b58ee920d6440e04419ec4 SHA512 91bd5c9a64990f3099459be3117f17bc7778d5590b22ae8694ce42bf8c36b1accfcbe0b68e999db372c36dddb224a4796efd0cc19571a464b3cb6cf1962c1c2b
diff --git a/app-emacs/m-buffer/files/50m-buffer-gentoo.el b/app-emacs/m-buffer/files/50m-buffer-gentoo.el
new file mode 100644
index 000000000000..431f7e90ae73
--- /dev/null
+++ b/app-emacs/m-buffer/files/50m-buffer-gentoo.el
@@ -0,0 +1 @@
+(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/m-buffer/m-buffer-0.15.ebuild b/app-emacs/m-buffer/m-buffer-0.15.ebuild
new file mode 100644
index 000000000000..69f1a9262033
--- /dev/null
+++ b/app-emacs/m-buffer/m-buffer-0.15.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="List Oriented Buffer Operations for Emacs"
+HOMEPAGE="https://github.com/phillord/m-buffer-el/"
+SRC_URI="https://github.com/phillord/${PN}-el/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-el-${PV}
+
+LICENSE="GPL-3+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( app-emacs/load-relative )"
+
+DOCS=( README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+src_test() {
+	${EMACS} ${EMACSFLAGS} -L . -L test \
+		-l dev/assess-discover -f assess-discover-run-and-exit-batch || die
+}
diff --git a/app-emacs/m-buffer/metadata.xml b/app-emacs/m-buffer/metadata.xml
new file mode 100644
index 000000000000..84e803c50139
--- /dev/null
+++ b/app-emacs/m-buffer/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package provides a set of list-orientated functions for operating over
+    the contents of Emacs buffers. Functions are generally purish: i.e. they
+    may change the state of one buffer by side-effect, but should not affect
+    point, current buffer, match data or so forth.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/phillord/m-buffer-el/issues/</bugs-to>
+    <remote-id type="github">phillord/m-buffer-el</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/racket-mode/Manifest b/app-emacs/racket-mode/Manifest
index bcffe168014c..f02086f2e3c5 100644
--- a/app-emacs/racket-mode/Manifest
+++ b/app-emacs/racket-mode/Manifest
@@ -3,6 +3,6 @@ DIST racket-mode-20220219.tar.gz 298876 BLAKE2B b3dfbcd9b436648da1ecacf4b7434c3e
 DIST racket-mode-20220411.tar.gz 303095 BLAKE2B 7fed011b915e86f6d40d6a9f8640ea2b066c201cf28e20a941fae841e96bf3649f3cf0ad7847091984a7cf490e9b98142617e47038dea70c44999510144dda3a SHA512 ec17ade728390f8f8b783703ca319ee15502afa7f82e86d9aa8b60361ecc65af21990cf89532b38bfc211887c00b5aa4c820dc0e66a1b1a1a9aacbc08673d35d
 DIST racket-mode-20220505.tar.gz 305491 BLAKE2B ca6a6ee6ae9f95f397959d9f0fa979e524ab0c6345bc5d7d67b5e681e6059175336303f06a7480d5b7ac51ae13cb851c182175eac44f37b3a21b56409f14079b SHA512 a66b991e0416f60d3a6001d17e24be95caccb627cf0e4d0f3115b7b94eda9d15583d8b94c72326708a0d5f90ab1b51711785c01d566758a4fb329bd26ea7e44c
 EBUILD racket-mode-20220219.ebuild 1138 BLAKE2B 3cb184db500812f19b1c62aff0afcdb1e52358dc0c597fb124c90b792c947e6e098dc61f855c204d19d1e22ca64c032668d5461c6ea00d673ce98acf6f5439e0 SHA512 c7eab6dcd960c37253dd19704de785f97030dd6046a30cd37cb0eb6e8c4f999010d57b55138c53af2b8089c0d14c6b9788f825e9a36184025f1a984cd4bf3dd7
-EBUILD racket-mode-20220411.ebuild 1242 BLAKE2B 38aabde4e518e9b298e0e15df6563822f0dc914eb7f3e53484ba5fc2810c6deb760da7c621eccafda0044d5818ff708d7194661f4bcb7fd1f9ed9f2f522c4923 SHA512 aa16ce86b8f23c6ee0be79472fd2bbe119872d470249d67b5c0b33daf5c2df6246f7c3fcbb853f21797e754aa2905c244c2317f75829c68fd15e40e31f9c21fd
+EBUILD racket-mode-20220411.ebuild 1241 BLAKE2B d1a4ba8103e7a9cb57099e5e8a52c95e6456576484a0caac206a021422484c292f4cbdeb74c2aa9cdce6854145f13a674a9ea46448239a40511d1870965c8311 SHA512 b64a61f4d1849d62612538cf1570312beb4c747b13538d3db037a1ca77cf2e6b48d0d058a30cf4332547f9bf508e31ed3a9ebea2c17169f3a181b483b1df57a5
 EBUILD racket-mode-20220505.ebuild 1242 BLAKE2B 499e375b31bc26bdf8a3e26432f366847836a857e777942d9b3923e2e11d192a11fe8c9acfd5698b8a6aab9677dc2af67a3536a72da6df454bf094e46bb959fc SHA512 5533ecfc1cef4697d394171528569d1d97898beab7dbd9cedb44037860526b39e1f487dc5220cba0f08bbdf2ce54c32880401ab468c1f3ab21193f1908f4fcde
 MISC metadata.xml 818 BLAKE2B 6029673bee9510c74b9cf89bbbef03638cdfcfeaaae49f2f94d57cd960c616c7b43c8dc3a0c79892be87dace9e7549b3b4453b13fcc7a23f7b6a02066dbce29a SHA512 8b487cb9f4018d3ec7a2cf130b26d58522772bef05d258100068fc89500577a5f680f480b89f06ef63d99c4a6d4e4fd825ea3338934438715fb83a946f6fe7cc
diff --git a/app-emacs/racket-mode/racket-mode-20220411.ebuild b/app-emacs/racket-mode/racket-mode-20220411.ebuild
index 46f695097f04..7660d6f56ec0 100644
--- a/app-emacs/racket-mode/racket-mode-20220411.ebuild
+++ b/app-emacs/racket-mode/racket-mode-20220411.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${H}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-scheme/racket:=[-minimal]"
 BDEPEND="${RDEPEND}"
diff --git a/app-emacs/s/Manifest b/app-emacs/s/Manifest
index fd2dcc34adff..f3002a4fef2e 100644
--- a/app-emacs/s/Manifest
+++ b/app-emacs/s/Manifest
@@ -1,4 +1,4 @@
 AUX 50s-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c672377208b56951791b83c6ef22b2c872d313084e199dd5d7b533a99106a87dbc7f15b5ee6126f71bf5f2e84165ffa SHA512 5c00bcabe2d7cc03013dc7a54b2c653940c08098ca5646d7c73624cb1ca04376ae9dcf88a7166b1925c69f0c5d192d90f6bd790fdef8ed8c3b0f9d163c987da5
 DIST s-1.12.0.tar.gz 59193 BLAKE2B 89e4c453b6590116a4cc08fc1be73519e6c95586c1e80b37f37d7273232aa707cd030cf74106fdd7eb7f05fe8ebd04253592076573472c3927cc1428b4c029f8 SHA512 036369011295dfde7567ae8bd479be9635de479e8821c3fe117a6c3827bc83492bb91e6ac64d4b20b061da95690f5585ed58f116a2b8c877dceee22153c8c990
-EBUILD s-1.12.0.ebuild 457 BLAKE2B 501820173974c3eec5812c2844849859ada1ef5c8f1cc4ec711f8c8e5727821fdb62bd1097a78c192e63f3fd044f7863c32bd9a45dc9d79fc3d3db4a35daf8d8 SHA512 250638d81585dc593fea52e88add79f9d0ff878f16f9f8e79392a697b4f28aecea59b059a62dbe86c48f3d143056c369df093dffd78a3c5533ed0549ea5ffc5e
+EBUILD s-1.12.0-r1.ebuild 499 BLAKE2B a7add64afde8acf76ff7ac5cf7bdd3193b1555f18135b3a14f2500f6411e5fb634136009e027239e5f6b6ba2237ebe19293d44aff4cfaf9fff1bd59d33adfe07 SHA512 3826bfc67bf5b3992aded1c23297dc6fbdbecfead3a21fa5c22f7d1f2111189b1fb5c885c82916f7a3cb09b731b83c3e386e9577965c90bf0623dcb8dfe33030
 MISC metadata.xml 358 BLAKE2B c966645ca03d9831e511a7b54ab031c9c9764ee8295d5b0a90dc1f80d93a68c95076329af5d8951dc025d86ab0f15580109b2c521178ff68694cfdce5fe0f9bf SHA512 268ef26faa4a736d2301efa6c3f745f90cc41fbc6fbaeb63931a6206a2cd78e66546d30f16dc956c7918a644522a637311047e71dc4318bdc588957085fca914
diff --git a/app-emacs/s/s-1.12.0.ebuild b/app-emacs/s/s-1.12.0-r1.ebuild
similarity index 74%
rename from app-emacs/s/s-1.12.0.ebuild
rename to app-emacs/s/s-1.12.0-r1.ebuild
index 1d0ca0aa37d0..7c91889d847b 100644
--- a/app-emacs/s/s-1.12.0.ebuild
+++ b/app-emacs/s/s-1.12.0-r1.ebuild
@@ -1,18 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit elisp
 
 DESCRIPTION="The long lost Emacs string manipulation library"
 HOMEPAGE="https://github.com/magnars/s.el"
 SRC_URI="https://github.com/magnars/s.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/s.el-${PV}
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
-S="${WORKDIR}/s.el-${PV}"
+DOCS=( README.md )
 SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
+
+src_test() {
+	sh run-tests.sh || die
+}
diff --git a/app-emacs/vertico/Manifest b/app-emacs/vertico/Manifest
index 236cdc857055..e27f44ea1b96 100644
--- a/app-emacs/vertico/Manifest
+++ b/app-emacs/vertico/Manifest
@@ -1,6 +1,6 @@
 AUX 50vertico-gentoo.el 82 BLAKE2B 89e0376cb0361d71ad40318455820607ac23fe004dbc80c77c9943a94426c47ee409956e0770a1f8c3157b50f0f105275337b0c94b597755dac59baeac29eecc SHA512 ea5c77218cab48e770cf56d1732b8101bbe453fe5e98fccf92c6adf53fd3aa8c1c3fd4d33e02fcb02d7ef44c56661e9c593588ffefec0852ecd43c00da30a5dd
-DIST vertico-0.22.tar.gz 42487 BLAKE2B f6863b4078f25fba318685fd16a34abe016c9fb9fd94a7ad6fcbce02c72526786c74f67177a44433ee5aa747382db81762015fcfe98da252f19aa88f219d294d SHA512 108348cb43f07909570dd40e058c1ea612c6a8c39794a365ef0ee0111d7f43dde37f82c46bcac0319eba44e6e5553bde2bc09f8755bb1e3f4b22999fdacc23c2
 DIST vertico-0.23.tar.gz 42631 BLAKE2B ccb5a30cb3da9bed0a16af06919635ebc23777d0f19fad4fbbb422b0bf04e38f1de1a51e375263f212b0ae25881f4428e9fc6d665ef46ff9aaabd3964b4ab006 SHA512 7425b33a7628e8fd246386908835ee52ef357ecd3909a6cde0f9ed89dc468590fc854b599c2ed13572003ef6b36bd8df26db3da0764feadc407918ed68ba910a
-EBUILD vertico-0.22.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+DIST vertico-0.24.tar.gz 42777 BLAKE2B 64e3f11dfb425c814665b49d755a52db4146c875969be7621539892f72df6ef9c4186be05373230b48369f1e2e85aee8e97cb829afe3618b9507170c4a8ca1a0 SHA512 67edb7e45e257c2cdf53d7adb2b29eed8cb3a1ac42dcec41bd555d553c60e4fc9806c6ad51b5cc183abb1d3967a4f43ab0e4ce0d317f77eb4d7cdedb9ea39834
 EBUILD vertico-0.23.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
+EBUILD vertico-0.24.ebuild 520 BLAKE2B edbaf5bc705dfd6c08b2ba2a253ed15c0e7293de324d27bc9745a85417dc49fe4a483a0e6f89d15b7eb4b624f90e9b56dc8adbef7db4975320cac08f9a3baf6b SHA512 4e5554b24d22b0efdc3122b35c9d5717e3a44ece867eb99cd257b270b14b10c277de23a3f8d9463c2e11f9dedb2c02c030f3274ee522310188afc97a9951fecc
 MISC metadata.xml 359 BLAKE2B d5d9e7f1c0ec1dc75d7fde73aa75f364f15740857e6a2bf39b3374424c3fcff4e79ceda481141598fee17c694b4c3538059f5bf95186aad6d535eacabcdb3341 SHA512 93e435f0f7bdb4d26a48525109688b964049a0b61d4b5633bd61dfd14ab68a5bd7e367d0cb7e45f5f1a57d73b8b63a9b2f8b0da9ac289bd4242da3b6f434b987
diff --git a/app-emacs/vertico/vertico-0.22.ebuild b/app-emacs/vertico/vertico-0.24.ebuild
similarity index 100%
rename from app-emacs/vertico/vertico-0.22.ebuild
rename to app-emacs/vertico/vertico-0.24.ebuild
diff --git a/app-emulation/86Box/86Box-3.4.1-r1.ebuild b/app-emulation/86Box/86Box-3.5.ebuild
similarity index 100%
rename from app-emulation/86Box/86Box-3.4.1-r1.ebuild
rename to app-emulation/86Box/86Box-3.5.ebuild
diff --git a/app-emulation/86Box/Manifest b/app-emulation/86Box/Manifest
index 51fe63ce0dc7..0f7548d5cb4f 100644
--- a/app-emulation/86Box/Manifest
+++ b/app-emulation/86Box/Manifest
@@ -1,3 +1,3 @@
-DIST 86Box-3.4.1.tar.gz 4221251 BLAKE2B 20e3dfbab2a624a834766e4b7767fade045358ef394d3178d02b909e1e696b723e89618bf97e0636bfff882353ae77be23fccc4367513f95fc2e4a08c22d53c5 SHA512 76a4f8d129bdad6d4eef5d34c68b4a90840b00ba0bc2771d07a24ffcf7baa8db6ce2a23936675e0126a2938f48486a734bcebae7f2df2bbaf67ffa7e8dc3b5fa
-EBUILD 86Box-3.4.1-r1.ebuild 1531 BLAKE2B ab2dbd5177a1e03b3cc6dc674cdb2926e8d6a8b710f0ad0b78843fcd399f8cac5c268b6fea894526e601602ed7e822175437cb2bda64606719555eb1359bc3a5 SHA512 adc8e79d5f31ccc9b660e3dfcab4ff7e60eb998f88cb7a3e6b493c5a913ba046bb5aac69c6244ab2b2e2b23b4bed5a6e7786422ac47e1e3f31072ec4fcbb6689
+DIST 86Box-3.5.tar.gz 4260258 BLAKE2B 080f4b3f4937633cb60a9bba5ac9b70756ffd5096843158033c30ee648fa78d40b539a08383bd5d96e3208ad73ad811c21a24cda08d7ad54188b62753ef2ec2f SHA512 8f40d918e0fbae388a4aa4f037adaa7fa1920cafd5c0493f1f052ee59c677a898226ab7958b8f22899e3983664c2e63c9bcbaf82e27b42efebfb22bdcf4717dc
+EBUILD 86Box-3.5.ebuild 1531 BLAKE2B ab2dbd5177a1e03b3cc6dc674cdb2926e8d6a8b710f0ad0b78843fcd399f8cac5c268b6fea894526e601602ed7e822175437cb2bda64606719555eb1359bc3a5 SHA512 adc8e79d5f31ccc9b660e3dfcab4ff7e60eb998f88cb7a3e6b493c5a913ba046bb5aac69c6244ab2b2e2b23b4bed5a6e7786422ac47e1e3f31072ec4fcbb6689
 MISC metadata.xml 1266 BLAKE2B 45b789d3b456cf4fd28ab8ef5ab32bd8ef02c2da36f157a405ca2a90154d882f8c37a28dfa16cd6ea1e3d45d30ebd4130b37699792e0b1d0daf7ae32592e99a3 SHA512 8da4ab4b5d57caf7adc895d186ab3086857f196d2bc66513266305ace183f26f3b3304bbc861b7a31a95046d67bc7f008aa14d28c9848db9e09fae25724636f2
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c834f0669450..2d9ece5e38d8 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index 36f5e2f0c5c5..2c07486e0ac2 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,5 +1,7 @@
 DIST protontricks-1.7.0.tar.gz 139203 BLAKE2B d93bbb672286d32743da1473e132508084bae527159911367c51e88686c38d3bad0a2f72a2c0f0feb09412e31e6d5bb20dfe113b9e71e4e655693bfbe663a968 SHA512 c12f211051bc23c8eb03c5385e8245361d72dcce1e641a7da1f87f344db5fdc7d698bd7691e0855ae025c1d94944db89b380805664d87123b6252d06259480ff
 DIST protontricks-1.8.1.tar.gz 151972 BLAKE2B 1e7b600bfc22c46e879c5684229e374699548bc96d172c23d4b3c7c08871c0baf629436e81ad35d0d5e93e11515c8a20d4365658d10610cd60b04d6982b83b7c SHA512 246e65f61ef4fd6825e426aa2b4ed3df26ad1443fabca079194890a8115805ff2f51be96ce410854407b61451dafbec6abd1e26f029c1e442af10a209c75377a
+DIST protontricks-1.8.2.tar.gz 153142 BLAKE2B c0757973f7e1c442ab0bba27c2c739a7b24d45bab31ec308ec195290e35392d222369dbfe64f558e21ed1b61d13bdae629c0ba8b2f81b9af2b4f2f94c30ba9ea SHA512 9b83c34847e8ea8ae86f77330f626748a8ef5682c99619d90fea0c52de3ccd5b4285e5dfc676b8c046b9deec996847dbb0586596428507e162e255a852b28cd1
 EBUILD protontricks-1.7.0.ebuild 1561 BLAKE2B e9d4a3c2b48ce79f6639d2c6efc146797fdfee1ce6d0dd68d61381e19c9ef3c6643b0737f0b982e5f2e395ef8668c01e49e5cb4de22c77e646caeac9fe9e2966 SHA512 5fbd53dd0a4ddcc4ef760225231fecd12603135aa4a4fda2cf5ae7f956bbb849c6fa2e4747fd4d1153a5c9772dd64f90b4b065b05361b49e9ba82f81842e7da6
 EBUILD protontricks-1.8.1.ebuild 1562 BLAKE2B 2d1f12f2aaf762aa6ce807a25cda700ae81bf886ee18aff7c510e4caddb284403d16a94468e0288ab20e487363c69c276143e6b64569ea8128d1c3d5cfe96358 SHA512 a8603cb1daca3d04f068b66794c8bfb7fb50536dcb59d82422b47293ce13332ed04efc409c13fbd5044084f503455d793d968dbaf68cd883ceec2e0f162082fc
+EBUILD protontricks-1.8.2.ebuild 1562 BLAKE2B 301f4eb1b8aa3ca6801a560614f1eaee2f917791a74eeaf173a1f3373a9768c87d2308bd8089dcd7448c3658f580476063dbffc637a2b9aac82dadb2d55f761b SHA512 5152a113f79b6788996dceebe23a64ee3ff8db232c6d89fa02500e4f18013c96079e2aa58a441636d4286232a581744504a0c08e3b9338fac3fb7b7b590e4cb2
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.8.2.ebuild b/app-emulation/protontricks/protontricks-1.8.2.ebuild
new file mode 100644
index 000000000000..d33c17e8e46a
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.8.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="app-emulation/winetricks
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity
+		|| (
+			app-emulation/winetricks[gtk]
+			app-emulation/winetricks[kde]
+		)
+	)"
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+')"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index f54abb2c2a1c..8f3fab957756 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -420,6 +420,6 @@ DIST xcb-0.8.2.crate 129071 BLAKE2B 83596850decb752c8fca84c383986e3cf1ca0708a682
 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
 EBUILD ruffle-0_p20220429.ebuild 10570 BLAKE2B 8f2f7c0f0f276fc15f698e62d833570b87a9208cbd18711fba5da93c0a47882a6a3fe7e8ba28855fe5c89fcaa42ebbf0da8dcec106d4aac048c26e513c3f76db SHA512 8b1264ada685e1ccfb4185587607bc788072bf19b053256373798474b31dd0a9f6be85dfd592c2fd4f27956bf9f23f6be0520a1eb7ad3b5e26877e5cd5544465
-EBUILD ruffle-0_p20220516.ebuild 10570 BLAKE2B 9257b514b69515444df531ec2be26611c5bbde1a9e4978a4322988d1838e60f3cd0fb8a68163ad7b60d1aab542d75232f5bff08200bdd70c5c92d051e9c5386b SHA512 c187bfdb561350861845f2ae4be1f81d16e825739bf74e90d983c6bf5994c54a219265ba05a5ab01b788cfb3f616f4feb82b4088a31eb613e1998869faa36c49
-EBUILD ruffle-9999.ebuild 1392 BLAKE2B fee22a43dd7bade1b2ef406b2aa2f8c8cc31251a0ce4a2728eae49996d666b909cdb8468e8e8fb03f6bdf0a4d9f5388f86c4b94cf229c612fe450500b8c21e47 SHA512 4077fae6e953af244545547d3321be63947bbae88c1e0aac751469e1faeb14e8504460d304dec93a7593d9a83e5adaef8d9b9b9d98bca827d3fdcf38eb32a057
+EBUILD ruffle-0_p20220516.ebuild 10570 BLAKE2B 3012d641ac476df924a65c91188026d0a91586ecb0627a7bef548a3ec7df7ee19eccb8bfe55dfe6fdd04985b29ae96ef9e397c2ca6676932449069f5cd41b8ed SHA512 3a62daa680992b8b7f5d421bc82798cd526f963e25bf44b21086becdb133e82eed764283c4b37c9548e21ade51e65f01a8f6f02c66fc4169d07f1c8d10c819ce
+EBUILD ruffle-9999.ebuild 1392 BLAKE2B b2d3ad9b5bc496daf73c024590f763e25f20cc7761005bddf08a0341192ea28e11ed24f16c74b4452f6390fbfeea809adcfe65708dfd1359f5f3be5a31122529 SHA512 776f1da19d854cb46cc0f134843a99c848468ddc94a31f1c43a11adb3f0cee28b181d932ad4866041147d06933712bd34a689a53a9c11dbc4c9832f25c6bf3c4
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20220516.ebuild b/app-emulation/ruffle/ruffle-0_p20220516.ebuild
index 3f9cb8691fb0..fa62d357ea44 100644
--- a/app-emulation/ruffle/ruffle-0_p20220516.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20220516.ebuild
@@ -452,7 +452,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	>=virtual/rust-1.56"
+	>=virtual/rust-1.60"
 
 QA_FLAGS_IGNORED="
 	usr/bin/${PN}
diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
index 881e17764a61..6f79e3b92a43 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
-	>=virtual/rust-1.56"
+	>=virtual/rust-1.60"
 
 QA_FLAGS_IGNORED="
 	usr/bin/${PN}
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 0862426072e0..de51e2493f80 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -8,6 +8,6 @@ AUX xorg.conf.vbox 274 BLAKE2B 3a3035fcbdbd5810c54505f5a5e6deefa1540e5e01a038bab
 DIST VirtualBox-6.1.32.tar.bz2 165758238 BLAKE2B 24873d7cc8bd306ea3552fe75379fbe7be767c85406042344eb047ed31184c3357aea07dda5e15c275f5036ae63106ef1d2e6524b143bc645a6b5ba0016f1391 SHA512 8bf7af6b8b4d3ba90f0e91589cf26400648436eb9da6d31c1a760460bfe5eb7311ac3220b4c9a98ac50e559641d3d5f559134be65288821038255de1c2c7ce1e
 DIST VirtualBox-6.1.34.tar.bz2 165761216 BLAKE2B d3c8f7d3d6f408e4c4275c2b2815e92819c871359501ec4fa7212bf7cdc852613e2e4703d8650371097a5bc805efa04ea75bb03ab83d24a869a677555f6e22d5 SHA512 46d63a9fd9df76af654af59fab5cf555858bc2c4b5dc34e2378d85ae784e6380b6def4aab06909a9b5e114a7297269f90cfb2c3d8d6529b423d703afbad18c64
 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123
-EBUILD virtualbox-guest-additions-6.1.32.ebuild 6221 BLAKE2B 650c48ca288e1f599fa7b905507b83f3f3f27fb419226ecf679926390cd16b7609f88b80c30e063df024503d46af9cf7e4739ee7fe6df357c5170bb0042a19bf SHA512 357850c5d2721456f9783f55b9601bd34f2298bbfe17f8d31574efc29fc9f65d1afa9e551646350ea0c7187478c5e8168cc8b19a52d1598db4739017b04b2b3d
-EBUILD virtualbox-guest-additions-6.1.34.ebuild 6223 BLAKE2B 87ff12013ec13de3c91c8039fe1ff48487d6130110b948ce640cfcee9ad1cc0a2021167a4bb1bf22cbf8207896b5a8b98ff2766c0b1991a122989bf6698b77c3 SHA512 3a442248cd46e4d0831e20bee5ae310bd9431df925d3193b36a3d4423e94cd93eabf62047289d90dc612d3fd87ceacfba5476fa261abc501d63cf14c30697296
+EBUILD virtualbox-guest-additions-6.1.32-r1.ebuild 6280 BLAKE2B 68ef78d95ffbc6847b3a7d948848741e714c57788535c9ecd639b3969bdb28048b4075aef131d5614a3da51d1b603a30d6c9b7b289fd6ea8c912ed52de0613f4 SHA512 7a91705459852d2d53debaeaec17027ee12138926395c46181ffc603232775e16986a35a9e3d287b889e262f4ed7b115251f4e00b01677da51f9b1a325081ad9
+EBUILD virtualbox-guest-additions-6.1.34-r1.ebuild 6282 BLAKE2B 696de6d8cf22409ddae78794d4d3d12f3d8cea49884d6317420baefceb3554354d63234fda6b20027293939aa4629e9d84cc241a343f0bb08a84c7a78d8db696 SHA512 37b29dedd36f3bc43753f910ba2dd57c36f84be2c097ca56c6c1b5b52523645d4a0ceff537716fbf673726009c5e2e40884023458275cc0ee3b2c5c9c00e1419
 MISC metadata.xml 260 BLAKE2B 4ce222a9e0137a4b97dc321ce99b3e9ef20450e4568d4db28d02050cb3a6e7780dc9d6bcbcbb225bed2d82a18294cdfb3d497fdec008c82c34d9a6a655bbdf0d SHA512 f6ba7c58d992fb2f14fedc3ce6a1de848bd56e3718022f225c1a2847893214dcac142c63587427a2db5e895b4b1e37828a4356deb761bd50b98f5a632fd138b4
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32-r1.ebuild
similarity index 99%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32-r1.ebuild
index a5164104500b..0fe9fe142731 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32-r1.ebuild
@@ -154,6 +154,8 @@ src_install() {
 	if use X ; then
 		doins VBoxClient
 		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
 
 		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
 			|| die
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r1.ebuild
similarity index 99%
rename from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34.ebuild
rename to app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r1.ebuild
index 854435f84e8b..ba2e1c3daac9 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r1.ebuild
@@ -154,6 +154,8 @@ src_install() {
 	if use X ; then
 		doins VBoxClient
 		fperms 0755 /usr/bin/VBoxClient
+		doins VBoxDRMClient
+		fperms 4755 /usr/bin/VBoxDRMClient
 
 		pushd "${S}"/src/VBox/Additions/x11/Installer &>/dev/null \
 			|| die
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 659387a2098a..8ef705a7288b 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 11cfb21de4bd..b51ca39ea2ef 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -3,5 +3,5 @@ AUX ibus-1.5.26-src-Fix-refcounting-issues.patch 9275 BLAKE2B c9035aa6877848cd8f
 DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5fa692cf05e9ce13894fcee200c41de91ec0ad88ae9e745e3061b9c92b7fd18641bd297f5bf4a9bc308ace983 SHA512 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
 DIST ibus-1.5.26.tar.gz 3715263 BLAKE2B 80eb293b028d431b76c015c6d6d9fea92888554f6f34ec126853df189746d9976569ec2380146187d13337a011668b1f15fc57a95284658c8afc7824a67b5898 SHA512 923607c17114af673dcc36532fb44a278b61161ee1b7d4e01b2e0dcffc40c95eb91c6416acc9c0da0333e933863e15263e9a5ff1e467cfc02b71398d601b9714
 EBUILD ibus-1.5.25-r1.ebuild 4554 BLAKE2B d556e48be48939664695c425fd5ead30ad0c5f2e93950d257050f1a6ca89fee3c8b74965637eabf84aefcc69191f36e7d395c7d2900af28928e1c1db5a66e44a SHA512 477391216467e331eef285c8abdd65f38db9fe26439606f89bd33402b394607163189f38020c464c7917b12a258a6f543541f93ebc9ddac6eb30acd69c957e39
-EBUILD ibus-1.5.26-r1.ebuild 5522 BLAKE2B 970302727bd4afc6507219245140d1d0f0ba9fd39068cfcfb10083fd747e3338fb5c4f1ecfeeb64ffc5ca9755d4575d44eb98887f10c613be3840c37a94ca022 SHA512 cc29ac12b18600110d86357f44d671b51811d8493c2c6fb4e65f9be10e05726248402d847d2e9913fb5674f4457b6f223a81c8cc0d14afd75349c0514ddc8888
+EBUILD ibus-1.5.26-r1.ebuild 5518 BLAKE2B 07001a9fae53bd79868d7db14d63fe86728c49ba0bab5702feb6089863d75807393fb86a60d6af5612db0989747f35189dd930339b29f426852b1bc496ddb0ee SHA512 817afa83c269350bb86b2ddda3d2a68d47cc91a2825ba4296bf490e528e59a0335ae73e61242dab1f896b8fc51fe3a4ba143d28bd488de0d0bf16b954f8c39fc
 MISC metadata.xml 989 BLAKE2B 9103c61af6f3766fa483864877a674455d0a47a2e7fc1e7ef0f62d835e1f57d6c71816737c64938babd5f29a7228d67f64c1d7aaaae0e9b10cc793ed373a698c SHA512 1552ed06ec527f6c9868b2b006b1d5d7bdc7101d34d4c4438eba6de74f398744a2720e31f73dc203f034631aa900db0a2ad8d429a67e577b69005cda1440f1ef
diff --git a/app-i18n/ibus/ibus-1.5.26-r1.ebuild b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
index 5a8130de4b99..a0b753a5695d 100644
--- a/app-i18n/ibus/ibus-1.5.26-r1.ebuild
+++ b/app-i18n/ibus/ibus-1.5.26-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86"
 IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index 8cc1f8c02d3d..ef5fba57f6a3 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/rogauracore/Manifest b/app-laptop/rogauracore/Manifest
index 45102d4e3f4d..c11c00d134f6 100644
--- a/app-laptop/rogauracore/Manifest
+++ b/app-laptop/rogauracore/Manifest
@@ -1,6 +1,6 @@
-DIST rogauracore-1.4.tar.gz 10305 BLAKE2B 27e94af50d318a3ce87f87236367aea72ee8daa2b0db896daeaa19bb75b6266faca2aca127d6444b759e6b7029c9f2eee1076ca4a197d70c4dfc2c611f5419ed SHA512 5179bfdfa8eeca5d7ac3ec87e4226429fa8d7987dc2d824a73a8a99142ceaf6fbda16f9844a62ecc8c629c44e334f940dff318bb3e2a3057c0bd1620d0f92c36
 DIST rogauracore-1.5.tar.gz 10442 BLAKE2B 1720ebd4808e814f0af77ed55027accd37645a0375eb3d29a814fe50624b8fadd2cde274cf0f33b87b83dd3be60d06513054df04f4e00a4e0168f5ff42d1ef50 SHA512 7ea47b9fa411ebe1176d9fbba3a814dbe67697d23b991547674f0ce2fd9b6536fce806e9dcf005f41de47f70bca543a7d8e77fa1fb35ed239ebc59a48746e1fc
-EBUILD rogauracore-1.4.ebuild 630 BLAKE2B 3732d44657e7b1389d1ae00f8483453c04d0d3b0a7cd985b579744b74e479eff16da1bd056b5643b194d1556ebf2ee2309c54df5961aa350a9b98b597039c5b5 SHA512 6d1e374212d977115be88483858d13d64f0712f76197e5f9664ccbcd7dabb7c760c84b3b2e969dd8c8d0e27bff05b5e80681221988be8fc6cf7dc5b9ff47e5ef
-EBUILD rogauracore-1.5.ebuild 630 BLAKE2B 3732d44657e7b1389d1ae00f8483453c04d0d3b0a7cd985b579744b74e479eff16da1bd056b5643b194d1556ebf2ee2309c54df5961aa350a9b98b597039c5b5 SHA512 6d1e374212d977115be88483858d13d64f0712f76197e5f9664ccbcd7dabb7c760c84b3b2e969dd8c8d0e27bff05b5e80681221988be8fc6cf7dc5b9ff47e5ef
-EBUILD rogauracore-9999.ebuild 630 BLAKE2B 3732d44657e7b1389d1ae00f8483453c04d0d3b0a7cd985b579744b74e479eff16da1bd056b5643b194d1556ebf2ee2309c54df5961aa350a9b98b597039c5b5 SHA512 6d1e374212d977115be88483858d13d64f0712f76197e5f9664ccbcd7dabb7c760c84b3b2e969dd8c8d0e27bff05b5e80681221988be8fc6cf7dc5b9ff47e5ef
+DIST rogauracore-1.6.tar.gz 10617 BLAKE2B 5472346f94326fd94bb51b1b8561a1257c07ed82e95f1e7ff3cd5be162ed2ef2ade6035d78ef2e1d8213ddc94c84975d86180042e0cbb97ab60d7de36c14a37f SHA512 93446614ebfb56a4bc63b14fcbd65632e35f8ec3eec463db311fd58bf525a60982dc6c5debc94841bb5c0dcc052608f5fb288065a0765c8eda94c40830b367d3
+EBUILD rogauracore-1.5.ebuild 629 BLAKE2B 952bd1b353c3b766455f188e09dee47c623faae16041ab2a59a1297d0e54a08088f8b6a3f8630cf71592c0218e23d9ffbdd4918e395c88a8e248051d4111d1fc SHA512 1d1e09786c471ea07e7df4ec8896ddf4944634f7b58d9ce7caf84e94638572d8a33eac01607e7c43f37f5cc5767770e633154af5fbe083c9b92950b9fdb8c1e0
+EBUILD rogauracore-1.6.ebuild 668 BLAKE2B b2617f50d7b9e325c6b3a36ce934399d61aca64058f17b9b6bfdda60a07769d61bcd218fe0f346bdad4f843d43a00def68cc73b2340f72997fc32e147fc1b879 SHA512 c13974004470e0b6a1d128995861105a4d90fbb6f5bdd1727de6f3165fac8736a46a006f594e0b1e9dfdda749d20c4e62d58bb9ba1b2e92e35ec9e8526e3340a
+EBUILD rogauracore-9999.ebuild 668 BLAKE2B b2617f50d7b9e325c6b3a36ce934399d61aca64058f17b9b6bfdda60a07769d61bcd218fe0f346bdad4f843d43a00def68cc73b2340f72997fc32e147fc1b879 SHA512 c13974004470e0b6a1d128995861105a4d90fbb6f5bdd1727de6f3165fac8736a46a006f594e0b1e9dfdda749d20c4e62d58bb9ba1b2e92e35ec9e8526e3340a
 MISC metadata.xml 403 BLAKE2B 3241ff091acb3c4aac53798fbf465a6ac7c01514ac126aced90ebe799f9d9b96851311ecc3f1aaf6e12de7a6f30e6377d05bb7f3c348d152ee9420941d56a0f5 SHA512 795ddd25dc534f3b26f755a34789dce0e6c25d18abf5f83906f9d47756e53800c317aea49e83bce3526c2a24c0b94cae2824d89bafaffe9f3bc86b6f0cfff3c1
diff --git a/app-laptop/rogauracore/rogauracore-1.5.ebuild b/app-laptop/rogauracore/rogauracore-1.5.ebuild
index a6678b687a8b..083d9ea4e335 100644
--- a/app-laptop/rogauracore/rogauracore-1.5.ebuild
+++ b/app-laptop/rogauracore/rogauracore-1.5.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
@@ -10,7 +10,7 @@ if [[ ${PV} = "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/wroberts/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="RGB keyboard control for Asus ROG laptops"
diff --git a/app-laptop/rogauracore/rogauracore-1.4.ebuild b/app-laptop/rogauracore/rogauracore-1.6.ebuild
similarity index 85%
rename from app-laptop/rogauracore/rogauracore-1.4.ebuild
rename to app-laptop/rogauracore/rogauracore-1.6.ebuild
index a6678b687a8b..5c7ce4a941bd 100644
--- a/app-laptop/rogauracore/rogauracore-1.4.ebuild
+++ b/app-laptop/rogauracore/rogauracore-1.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools udev
 
 if [[ ${PV} = "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/wroberts/rogauracore.git"
@@ -33,3 +33,7 @@ src_configure() {
 src_compile() {
 	emake
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-laptop/rogauracore/rogauracore-9999.ebuild b/app-laptop/rogauracore/rogauracore-9999.ebuild
index a6678b687a8b..5c7ce4a941bd 100644
--- a/app-laptop/rogauracore/rogauracore-9999.ebuild
+++ b/app-laptop/rogauracore/rogauracore-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit autotools udev
 
 if [[ ${PV} = "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/wroberts/rogauracore.git"
@@ -33,3 +33,7 @@ src_configure() {
 src_compile() {
 	emake
 }
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 542c375a12ea..5056608614f2 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/broot/Manifest b/app-misc/broot/Manifest
index d65f215ce7eb..7f638118ff63 100644
--- a/app-misc/broot/Manifest
+++ b/app-misc/broot/Manifest
@@ -28,6 +28,7 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST broot-1.10.0.tar.gz 9419669 BLAKE2B 6b8bf45b13d3f95488677f6c5322bb74f0c60d51b6686760a6d8aa0c53e9705c7e2c6120868433be38324f4ec38c2506bfb32f67a645fc9dfd23f49b46807e9b SHA512 24a098eb1f2ff428030e84ca8a875169291b830bf6b64ca4f2442aede80ffbcee9297ca1dd17183b03621a9d6352d9c1fec85db8a3afe7f4cbe630a70a521caf
 DIST broot-1.11.1.tar.gz 10039048 BLAKE2B 5d52bf08658a117d6240f9f0502f6b366fab8516c3e7638611b5397ea1981405c77d788539c6d4c957c64298014980461b97156350c982dc9c0c5097ef7f3981 SHA512 dd8478a904df85999221a8e6466d3025de0d80ad9f7f1d1d0627a103893a6de3f379c1434ac59afe534bb28bda9a3ea0c269efe7d3266bdf87cbc5efcf07421f
 DIST broot-1.12.0.tar.gz 10041150 BLAKE2B f6c47b137844d2615389552a9e245003ab2c5c1bb7b266e8d89e729ea1218c01f8924b378f892386ca5154085f5f1ba5052a2e7ba5e477a1c5053970d1688a40 SHA512 47d4940c077d782b79e1fde6a74eac42ac60444a078a2d96d8fbb9cf9ded2f3753ff6cc4f0983df849234535e750f881d0bebae3fe625a121d2b23652c7ef6b9
+DIST broot-1.13.0.tar.gz 10040791 BLAKE2B 7719d884ac69ba64de24e21a8b53d731d615c7ea36ed84b6e8496322ba191174695a33512eb7d66031eb619b1800fcc44671936ce68cff4cbf197d9415979bad SHA512 a828ea3ea1de8d3b89f8ad325dfd9cc82dd7f03436759100311642f47e1d0deb4552e759e6bc35fc7e56813a6574790810ebac1a5f196911e63dad9f352ae0ae
 DIST broot-1.8.1.tar.gz 9417690 BLAKE2B 499cd7fc32c7a7151a2ea0599e4c9332162a235a83a22e953b0f4dad098c95320986352f0129eacc4b4feb8d68c81276274bd9d8072ade8158fb89bb5a0c6048 SHA512 ddd84d7dad2416c63bcab2e8e72375aa14b4748a5a29708c47b7df5f4a203691ad8d0587dde1ba961658195fe6ecfea154729bcfd7e757777a53a16cde9f2a09
 DIST broot-1.9.2.tar.gz 9421208 BLAKE2B 15f0df8f69d0a3a70a025cebe2e930381a7b198d2e70f7effb81bc4bec4b5b1f8095167512ae592ae0682abf1cf6853d33415be05bdd7e1e54b24ae573248d3a SHA512 3bd69d58913866a7bad11d97dc50a9eb22b0ceb4536a0a78b1b76bb2b83fbedc6feaf8d0f0500db30191f93e6d7cb369ea440e9857cdfb85f967b29a65053605
 DIST broot-1.9.3.tar.gz 9418812 BLAKE2B 02e007f8ab1faa3d7297b7106166311f7eaa4aa37e13fb82a9200ab84c9cce6bab4c2ae892a75290f2982391a4e55a3ab07cdb0cbc9878c6367ae35b464bb143 SHA512 dec999d5b00dfad7ff7104244774f124b7d4d4e7b9cedbc7c0bbda2df7be01622c65e3fa88abc6483621b697b18868bca481c82a2d4407cac1138a3f7fc5f28c
@@ -261,6 +262,7 @@ DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f14
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST umask-1.0.0.crate 4380 BLAKE2B 3e1adf758039cf60d27d62417bdfd6b6fccc5fc4c2db483c81698e83d2689a7a6c89a9c45e68a8808d50f2481b0bdcb1a224d18eaed7ad9aafaecb5c2f199a1d SHA512 096b11f02ba12e0bc112481920d600d3e782ad296f6a287c4d2a36d78e35f0b4d38d13d32d73ccc58830711521f27e3d22f204d1e4474596973dc8fd8ef3c4b4
 DIST umask-1.0.1.crate 4359 BLAKE2B ea20021b4fb2f384b9928c5c95f6ce1e8874128719aabaa0cc72d8e2d330bb80ead8438f0ef838e12e22449e8ab4b58d2a7064a2cc133437ae501ccfc39b45a9 SHA512 30eab4d1eee571b4f8210740dc7f1f24c17e564e359254ce9f078eb1e6164005c9ca3407d748ae379d3e90b8f40deae5e7d81055f4a6e513d62330347a6422ef
+DIST umask-2.0.0.crate 5496 BLAKE2B 7d89830b80eb72af1c10f6ab7ddd5623790b6476e9a39d05189457b8e3cb7355a9e335fe77e7a1cd3e39e8335fd16bdaf7d5e6403992b8804b6e83bcb8f6805c SHA512 819fc76df67f58bed7e8508405484c703e1961f04d9c37eefea0657957f1944f068972f209df506c7426bd5135956182517c8cc105a8206af2c8a89bb6faa1a3
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
@@ -288,6 +290,7 @@ DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a6
 EBUILD broot-1.10.0.ebuild 4724 BLAKE2B e13e4163a0ad1571f2c784d99387a6a5d36c99cab790be2bae88aa2e54eec90a3f13e0e15fee550399f4a6c128a6011ce96743b9e463a0ce13a76e4087211b91 SHA512 33977c27bcca26ef89dfd0132690200a6742bf1926b87f4c43009655b8432525f9a651adb4604706566faef4910234b4384fbf75ca3af51043603340cf46e99a
 EBUILD broot-1.11.1.ebuild 4726 BLAKE2B 02aaf695de78329cbc952f2454dbfc8f742c37a590a5bc2ba5fc41392787d132e03fd21ffd24ce6839af228ac417c483ebdc2ec010894e70f928e3cb38ebee36 SHA512 038175ee519bcf5d628fa3340809ad775ec692308e89849df54d6d36d1ab39e1cb798c7f88913f097f14dfa644f0008bc0ec2294bc14a2ccf8caecb143f1dd5e
 EBUILD broot-1.12.0.ebuild 4780 BLAKE2B 421e432bd1b1253dfbc3242288e7629370cb11f09ad92b0ad78e8f0189f8d0681a5633c5036876644ca8ebb08b432b8c4220ba94acd97f9b522aa9515c61c0f7 SHA512 a2a02e67253c4f38c88934caaffc30bfee478c458c3e7fc28797c441d58e6fa01e01db85646ffd5d7f56967b73d33388ee6b56a237861e8582108c333b29809e
+EBUILD broot-1.13.0.ebuild 4780 BLAKE2B 6b74046cb80bb87a73ebefe2c1d8fde44a6fa9986d00fc0b4ca7015a47e45e3ee63213885cc4e7e3dc90e460107ccc65d6ebc24a96ad47ce6717bb4929c0401c SHA512 989068c4f8578f271ed42c463b728a8ff5d0edd5dfeac42d6684d26f157383b6f2ce32f1d55b40f9412d000550e3958802ec0aa7dcc7e53605ff94cc8b954d49
 EBUILD broot-1.8.1.ebuild 4564 BLAKE2B 5e3958df321e20a68b6a3982eaa07d5eff329525189bd94b677c321fe394a90ba772d302b133e26b161678b4fc52ce9014d3e9737046fe43c8ea384383342171 SHA512 6cec0e09e46150e09047f7d5fbbc4ba269a542306cd3fd3821449d77129fea969534bd492fa9f69291d188cb5573418fea19a4cb00782cf87f642e5f9233f933
 EBUILD broot-1.9.2.ebuild 4593 BLAKE2B 13ad217d95abc40ecfd15aa09e436fa2f4311ebc1dd1a529d265bc32b8d4382c24fb74c0eb59b851466cf3a0512411d1b90fd2c3109eac2af17a0a1a24fcec03 SHA512 4e4196bd17309b2e318518c45f7461ef45748bca00b5b77c884274d62d1c177ba722a1247004a34d218b18b798a50d3a9cf0eec102766e483abdc663b8615253
 EBUILD broot-1.9.3.ebuild 4672 BLAKE2B 63c7668419110b6ec68937f87c6990bf58acbceaedb51bbda744254d5b65492798158aaee8c2780387a7513f2ee0330c5814abddb6172a265e01277b42ca9849 SHA512 e1f9b9ccfc645e822a400c540a504bbd7a456493dd0b5cfb1671add7898baf5a4fac7370ef8b33ed42ed21130112ef4c3084eb7b1a5b0058c56745636072ac8c
diff --git a/app-misc/broot/broot-1.13.0.ebuild b/app-misc/broot/broot-1.13.0.ebuild
new file mode 100644
index 000000000000..a668760779b7
--- /dev/null
+++ b/app-misc/broot/broot-1.13.0.ebuild
@@ -0,0 +1,273 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+adler-1.0.2
+adler32-1.2.0
+ahash-0.4.7
+ahash-0.7.6
+aho-corasick-0.7.18
+ansi_colours-1.1.1
+ansi_term-0.12.1
+anyhow-1.0.56
+argh-0.1.7
+argh_derive-0.1.7
+argh_shared-0.1.7
+atty-0.2.14
+autocfg-1.1.0
+base64-0.13.0
+bet-1.0.1
+bincode-1.3.3
+bitflags-1.3.2
+bstr-0.2.17
+bytemuck-1.8.0
+byteorder-1.4.3
+cc-1.0.73
+cfg-if-1.0.0
+char_reader-0.1.1
+chrono-0.4.19
+clap-2.34.0
+cli-log-0.1.0
+cli-log-2.0.0
+clipboard-win-4.4.1
+color_quant-1.1.0
+coolor-0.3.1
+crc32fast-1.3.2
+crokey-0.4.0
+crokey-proc_macros-0.4.0
+crossbeam-0.8.1
+crossbeam-channel-0.5.2
+crossbeam-deque-0.8.1
+crossbeam-epoch-0.9.7
+crossbeam-queue-0.3.4
+crossbeam-utils-0.8.7
+crossterm-0.19.0
+crossterm-0.22.1
+crossterm_winapi-0.7.0
+crossterm_winapi-0.9.0
+csv-1.1.6
+csv-core-0.1.10
+csv2svg-0.1.6
+custom_error-1.9.2
+deflate-0.8.6
+deser-hjson-1.0.2
+directories-3.0.2
+directories-next-2.0.0
+dirs-sys-0.3.6
+dirs-sys-next-0.1.2
+doc-comment-0.3.3
+either-1.6.1
+error-code-2.3.1
+fallible-iterator-0.2.0
+fallible-streaming-iterator-0.1.9
+fastrand-1.7.0
+file-size-1.0.3
+flate2-1.0.22
+fnv-1.0.7
+form_urlencoded-1.0.1
+getrandom-0.2.5
+gif-0.11.3
+git2-0.13.25
+glassbench-0.3.1
+glob-0.3.0
+hashbrown-0.9.1
+hashbrown-0.11.2
+hashlink-0.6.0
+heck-0.3.3
+hermit-abi-0.1.19
+id-arena-2.2.1
+idna-0.2.3
+image-0.23.14
+indexmap-1.8.0
+instant-0.1.12
+is_executable-1.0.1
+itoa-0.4.8
+itoa-1.0.1
+jobserver-0.1.24
+jpeg-decoder-0.1.22
+lazy-regex-2.3.0
+lazy-regex-proc_macros-2.3.0
+lazy_static-1.4.0
+lfs-core-0.11.0
+libc-0.2.119
+libgit2-sys-0.12.26+1.3.0
+libsqlite3-sys-0.20.1
+libz-sys-1.1.5
+line-wrap-0.1.1
+linked-hash-map-0.5.4
+lock_api-0.4.6
+log-0.4.14
+matches-0.1.9
+memchr-2.4.1
+memmap-0.7.0
+memoffset-0.6.5
+minimad-0.7.1
+minimad-0.9.0
+miniz_oxide-0.3.7
+miniz_oxide-0.4.4
+mio-0.7.14
+miow-0.3.7
+nix-0.22.3
+ntapi-0.3.7
+num-integer-0.1.44
+num-iter-0.1.42
+num-rational-0.3.2
+num-traits-0.2.14
+num_cpus-1.13.1
+num_threads-0.1.4
+once_cell-1.10.0
+onig-6.3.1
+onig_sys-69.7.1
+open-1.7.1
+opener-0.5.0
+parking_lot-0.11.2
+parking_lot_core-0.8.5
+pathdiff-0.2.1
+percent-encoding-2.1.0
+phf-0.9.0
+phf_generator-0.9.1
+phf_macros-0.9.0
+phf_shared-0.9.0
+pkg-config-0.3.24
+plist-1.3.1
+png-0.16.8
+ppv-lite86-0.2.16
+proc-macro-hack-0.5.19
+proc-macro2-1.0.36
+proc-status-0.1.1
+quick-xml-0.22.0
+quote-1.0.15
+rand-0.8.5
+rand_chacha-0.3.1
+rand_core-0.6.3
+rayon-1.5.1
+rayon-core-1.9.1
+redox_syscall-0.2.11
+redox_users-0.4.0
+regex-1.5.5
+regex-automata-0.1.10
+regex-syntax-0.6.25
+remove_dir_all-0.5.3
+rgb-0.8.32
+rusqlite-0.24.2
+ryu-1.0.9
+safemem-0.3.3
+same-file-1.0.6
+scoped_threadpool-0.1.9
+scopeguard-1.1.0
+secular-1.0.1
+serde-1.0.136
+serde_derive-1.0.136
+serde_json-1.0.79
+signal-hook-0.1.17
+signal-hook-0.3.13
+signal-hook-mio-0.2.1
+signal-hook-registry-1.4.0
+siphasher-0.3.10
+smallvec-1.8.0
+snafu-0.7.0
+snafu-derive-0.7.0
+splitty-0.1.0
+str-buf-1.0.5
+strict-0.1.4
+strsim-0.8.0
+svg-0.8.2
+syn-1.0.86
+syntect-no-panic-4.6.1
+tempfile-3.3.0
+termimad-0.10.3
+termimad-0.20.0
+terminal-clipboard-0.3.1
+termux-clipboard-0.1.0
+textwrap-0.11.0
+thiserror-1.0.30
+thiserror-impl-1.0.30
+tiff-0.6.1
+time-0.1.43
+time-0.3.7
+tinyvec-1.5.1
+tinyvec_macros-0.1.0
+toml-0.5.8
+umask-2.0.0
+unicode-bidi-0.3.7
+unicode-normalization-0.1.19
+unicode-segmentation-1.9.0
+unicode-width-0.1.9
+unicode-xid-0.2.2
+url-2.2.2
+users-0.11.0
+vcpkg-0.2.15
+vec_map-0.8.2
+version_check-0.9.4
+walkdir-2.3.2
+wasi-0.10.2+wasi-snapshot-preview1
+weezl-0.1.5
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+x11-clipboard-0.5.3
+xcb-0.10.1
+xml-rs-0.8.4
+xterm-query-0.1.0
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A new way to see and navigate directory trees"
+HOMEPAGE="https://dystroy.org/broot/ https://github.com/Canop/broot"
+SRC_URI="https://github.com/Canop/broot/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="X"
+
+RDEPEND="
+	dev-libs/libgit2:=
+	X? ( x11-libs/libxcb:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=virtual/rust-1.58"
+
+QA_FLAGS_IGNORED="usr/bin/${PN}"
+
+src_configure() {
+	export RUSTFLAGS="-Cstrip=none ${RUSTFLAGS}" #835400
+	local myfeatures=( $(usev X clipboard) )
+
+	cargo_src_configure --no-default-features
+}
+
+src_prepare() {
+	default
+
+	local mandate=$(date -r man/page +'%Y/%m/%d' || die)
+	sed -e "s|#version|${PV}|" \
+		-e "s|#date|${mandate}|" \
+		man/page > "${T}"/${PN}.1 || die
+}
+
+src_install() {
+	cargo_src_install
+
+	doman "${T}"/${PN}.1
+
+	local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out )
+	cd ${build_dir[0]} || die
+
+	newbashcomp ${PN}.bash ${PN}
+	newbashcomp br.bash br
+
+	insinto /usr/share/zsh/site-functions
+	doins _${PN}
+	doins _br
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+	doins br.fish
+}
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 77069fe1aecb..94724274f6ef 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -2,5 +2,5 @@ AUX gnote-3.38.1-cstddef.patch 988 BLAKE2B 8281bd3b515d642b57e49e365b76b134a3ccc
 DIST gnote-40.2.tar.xz 3422560 BLAKE2B d7d7fa862e02c1d889c736ae733db503a06db93cfc79c12bd1efa89acbe4a5825d0cf0cab00cfa916566002c1b838d118b37f5b0204f20ac9fcab2f892cccf52 SHA512 e1dc3ed4fb7b7c4f346a4a1e63a2e357b197375caf5d1d2026c159cfda012ace76ad598ecaf8e7d7649fb80abedc0cd4febd369160ddaf4510cfcc6b41185aed
 DIST gnote-42.0.tar.xz 3330504 BLAKE2B 847c1c66b86902c13a7e9cd349e0b1e565f046ba81809dca002bfdc07d1e3dc4e12797da90e7689d8fde886ced580da9b744ca736697d1fd933a93cc344304bd SHA512 fcdd653a29ae957faf177bacbe1bbdced186416c04a8f45f194a055914544b0679019935f482834e515a20865f358dfdfc32aa846c0fd24596cf5e569e21b997
 EBUILD gnote-40.2.ebuild 1575 BLAKE2B 5c081c144d811da893477c18e077637cbfd870d67462262c4ed4f361a67aba1148c4e8799129cb1e35598a93b51a210df5541072190e4e88b32321535e8ab77d SHA512 38ee320d652fd6268b36639481570ff61e3171fd839f3c10870b4b6b04dd4a3dfc342ef270fb3665c7286eb647d1974603797ffc1c8af91ee37d4d4abc80a1f8
-EBUILD gnote-42.0.ebuild 1531 BLAKE2B 701bbd0c3c162abb1e5dd6df41fe3f35b065e502934096853272238761ed9bf0590c2533550452790acafd4bd01d7300df81cc0ab759fc08dd508664c50419e7 SHA512 1199fc10659751737c226278e3ffad458c3ddb4a8ff4e57c63c807f72d82c7eb6895798e9db823c6b60500264bbc42d2d2e17196b30a4335517f3a8f02b4c9a9
+EBUILD gnote-42.0.ebuild 1529 BLAKE2B 25b2bbbc16b22e051f3bf98dbded4ae9151b64330003b84b8b529c428fcb076d4c40f493f66a02d9138f415d7819a1dd64701785e80e3e3b961f8d501461a234 SHA512 c0e89681d3b0acb65c66d0050cedc52cdaa63c094721d57589abab87f8c7de1095d91cbfdbb0d92867d8f45eecc68e6d8f3a903001267a92d1d6caca5a0ca54f
 MISC metadata.xml 343 BLAKE2B 7ee97c51a3909fa5375a7ad9ee680ef0e52cbf09098f385eb3a11441af6a31b76e8c7674a0b57d7adc8a07546b9b5c31f8eb4007e58e030cf348fc5ca2499718 SHA512 d304542c83029fc3ff18100e14539f9b9a01474b5847e1495d4f01ee48d8b16f06a7efeb3919a9f3f1686770f23b30185441cfacd4c081eab4a34c21b3307a50
diff --git a/app-misc/gnote/gnote-42.0.ebuild b/app-misc/gnote/gnote-42.0.ebuild
index ffd488033aaf..a448ad104dbf 100644
--- a/app-misc/gnote/gnote-42.0.ebuild
+++ b/app-misc/gnote/gnote-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index befff04e62c6..443c7be7738b 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,5 +4,5 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8a577f53bf67e0f1ff5a8087ed7fb63d49b6743809d40e5be4ce905f528f964642020c298e5540d834f725928315eec3ee8e9022f20823795f20d656ebdc3084 SHA512 7de73915bc37f7b17b598193d101b1524624668d818e970a6f7af7b0f5d9e5da2c85ec832ce67b065cb9f56d3af8724acf9bd34ab471c6e9404dba94775c2d24
-EBUILD inputlircd-0.0.1_pre15-r3.ebuild 892 BLAKE2B b98e4f68eafbab5ceb224ab965aa8c14ba8682944cd9611ebafd888b133c7001f4ab43d8b5ed452780446dd90f2c975b72c4c887c33b2e32a37d2c2631cf4269 SHA512 201fb5f314dde08d2009107c86584e58f2c8d2b53d02138d2e26a4ce4ed500712f9b45f219de0fafbc414cd5b53fff2639541c792f1b3f83ead7bd59141db50e
+EBUILD inputlircd-0.0.1_pre15-r3.ebuild 892 BLAKE2B 6933f4e21633a27bb1e4fa6cf328773928b3d6e7ad7a3cc6b198e5cf5606b2ef3f1339c817cdac61639bfa3a074cfe7f7ab0e9b8e912e7e2354bad4e72a97f10 SHA512 a8c5b515da0b9966c6c27e617da1e63c7f533d59abb1dec526152740f1a8d8b830fa7b7eee82cc9ea89baf2618dd2f72f28de407a2bd6e7f2b2308f21ce2086e
 MISC metadata.xml 259 BLAKE2B c37e63028ff67345f2840423e9d03b3e011b4132f4c80ce8a4b6c94e9ad069be10dbf4e6f9a96a848619b673dd0670ae41fad3e51ce382bee44e097d2245bc4b SHA512 33692b38a520781ebab5dcf3c02f4b5a082a3e4d001527e7c7f6e283eae28aff68ce0fecfce53809b9705d84cb110ff8c9bed38f40cfc918d4760984a94f9a96
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
index b262f5a39eba..95f0ac773007 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
 	ver=${ver#sys-kernel/linux-headers-}
-	if ver_test 4.4 -ge ${ver}; then
+	if ver_test ${ver} -ge 4.4; then
 		eapply "${FILESDIR}/inputlircd-linux-4.4-fix.patch"
 	fi
 
diff --git a/app-misc/tmux2html/Manifest b/app-misc/tmux2html/Manifest
index 76087065e6c4..df9a4c2451f9 100644
--- a/app-misc/tmux2html/Manifest
+++ b/app-misc/tmux2html/Manifest
@@ -1,3 +1,3 @@
 DIST tmux2html-0.1.11.tar.gz 20002 BLAKE2B 690e170bf903682a9bdbbfa49ec7a2995d19bfa9372533b5cecff5b7dfa4c389832a8e2315c3438d435c3b4f75bec8b7fc43161691912ef29d910779d46af24e SHA512 b478a697413acd90a92b3a349fc3c477ee1014f47816190d2066058711e2025a9f99e3f973dfd3165782a566d12aae4e3c491f58a924769d1d28c3f48c9e9601
 EBUILD tmux2html-0.1.11.ebuild 450 BLAKE2B 772c68297b86fd079f46cf3bd722495258bf2eae066646eb593ad78ab3e958b8dbf9074a55ac5d259c89f553b454356a7ea6c42fbc57ef30979f3cb2d97d55af SHA512 9a14849fddead3f41b3ae46903b51db2ebf98b73fec9c43270dc84251b71f069472409eb45873ed5a5da6b1e9ce47ab5b01820d33e5cab78942883bfe62dae89
-MISC metadata.xml 461 BLAKE2B 53eeda61e700b6088bd3be518823fe8b597cc8a250662d1091662fd557874e4dafa1b92b7630f2be6030b5ee6182bc36cf09a185c860125838d2d3e326c0f92a SHA512 620a672c014f7a990528a503ab14dd0596be44cbdddf5ea92b0cd9961961a00e92e72a9274b864879d14c76ecab3295dc4e27fa8aefbdb38e1e7dcc956761d2f
+MISC metadata.xml 465 BLAKE2B 6b6979d9db6ec0bc712261f7d7ef59d56106f3d04e7d27d567e0e7a3535a518cb19434175d8090cece7f6347d17427969dbb018d23577f0e66d792276ed5dfe5 SHA512 cf7831ad5c24d4974994ed00736dbf0450e76961e5febc1160cfe2bf71743404b5d0136eda0eeb2f108d45567d2754032d000c7eb81c3970dcdee0b9a0e6b5f8
diff --git a/app-misc/tmux2html/metadata.xml b/app-misc/tmux2html/metadata.xml
index a924dcb767d6..5457921bd235 100644
--- a/app-misc/tmux2html/metadata.xml
+++ b/app-misc/tmux2html/metadata.xml
@@ -10,6 +10,6 @@
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">greymd/tmux-xpanes</remote-id>
+		<remote-id type="github">tweekmonster/tmux2html</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-misc/tracker-miners/Manifest b/app-misc/tracker-miners/Manifest
index bd164ac46342..5bf342d87dc1 100644
--- a/app-misc/tracker-miners/Manifest
+++ b/app-misc/tracker-miners/Manifest
@@ -7,5 +7,5 @@ DIST tracker-miners-3.3.0.tar.xz 7243888 BLAKE2B 3dcbb03808e823e46141ddc13c074a5
 EBUILD tracker-miners-2.3.5-r1.ebuild 4729 BLAKE2B a9b88ca7efee49e804ad2ba2a14f4b73924c4192c0054ef4dff784b72ab9f1e7ae23e88ddd9e31b7b6bab9cb21d6e57ac15be175e4a7c853b2d3eb9aa316e86a SHA512 4e384b35ddeb2b61fa9b5c9d65ee8a9856d8040bf19fea746c2940e1a14f19bae857bc20fade912ca825d6743576d0ed34b6f704fd1856ab194928a5df2533f9
 EBUILD tracker-miners-3.2.1.ebuild 4754 BLAKE2B facec9761c21544f37842fead42b3ef18b0a86d3e0d011ec788bd7539c3cf9c9df9db693c55f2f0788498c6ed2c83a6beae78c083d0ba3ee40a87983020cfb09 SHA512 fc2f9a8de0e71c761e0848e0d837294093e7c2075248e80be4f410f82e83bc77170051ca2ae12e2536aaca162215a44ea4943286a1c1f9cdf144ef294a5c897d
 EBUILD tracker-miners-3.2.2.ebuild 4757 BLAKE2B 78076f587ae368ad6e0ff8d33bc5dbc78e62ca7389d4f54dbadca231e9c39e69ca02a17991642ad640d9c93f627976cde6d085d93aefc656217413388b7e6b8f SHA512 a0e88a8cdee82674816bbe95227bad90c855d12d51df51307898591b2d5e24138e2d927fea091e7bb3775b1eba9daf77a8da759f1b4ae91e97a47d61ccec78b8
-EBUILD tracker-miners-3.3.0.ebuild 4550 BLAKE2B 51016e95c4ae4aa13613f65e46d27327eb8582fe79e2ba7d53d78cdb807c3ae28a4b2d9a7f3a4440eee273a6bb0f65ae3dc8b6414198a0a3c3b8b4dfe405f2ee SHA512 c43179c7614d3be4eff2550919756ac8f910256f05f1fd8a9ec20730ae07f8f49c00e9332fb75d44e16bca689d1e4b9fcaad6a987b7597bbfc15d9bbc81a04e5
+EBUILD tracker-miners-3.3.0.ebuild 4547 BLAKE2B afadcad92ee66614ee538d8365ae03edf2c2d530b9d79199f24c23acdb8032f3b6d79c1b98e0e30dc40106a678ea0dcb0d3bdb265151a20dd8028cfe854fc6b8 SHA512 2be5ccda4b6234766b8dea65083774e6a2dabbadbd2df5d2be52f72ec5e44b48a0cbd5ed6a67486644625024a2fab76113e6cc4ee477316e4c373fe24a7870ba
 MISC metadata.xml 740 BLAKE2B 038c1a4f3d5a1dce875cdd315187b3299b9a5ac0831dbd6d7967b9d5ea99610e134d9ccbffe3717819b88843e4836fc74c125bdfaa827f7b8479565cebd521d3 SHA512 474d28d444a83797a8f8bf287fd67b8e432dc7e93dccb30774e5eed254547840ae72eff5ccffbff6a020385a4d55fa1d7b0e3fc36280d6a6968f8b53ceff50a7
diff --git a/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
index 292e8a512afc..bd5ac146967b 100644
--- a/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
+++ b/app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
@@ -16,7 +16,7 @@ IUSE="cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +pl
 REQUIRED_USE="cue? ( gstreamer )" # cue is currently only supported via gstreamer, not ffmpeg
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 # tracker-2.1.7 currently always depends on ICU (theoretically could be libunistring instead); so choose ICU over enca always here for the time being (ICU is preferred)
 RDEPEND="
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 9482f8113936..81052bf4f7d5 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -7,5 +7,5 @@ DIST tracker-3.2.1.tar.xz 1947304 BLAKE2B 9095a457157cd2bedfd34b01afc9fd832af0a5
 DIST tracker-3.3.0.tar.xz 1969132 BLAKE2B a43183599ee3d3947450e4d58fd02094a41d5978d0c3be120b995844eca5ddc0f7e37bd98e886bec99d5c9342f5ba6f92eec2cd729a1793ce2141bfa5ff99908 SHA512 0a55a80b44c2267f149c4c83ecbe42ca27a0645bd4fc206984999520f6bed3b7c63c71f81450f40ce2896223ce17326add20e7f39a71c821d754f30b8ce157bc
 EBUILD tracker-2.3.6-r1.ebuild 2695 BLAKE2B 9efdfa78e327053de5b3b60f929de47a9fe3dabd10f527d655e385f8b68e03191e076e651cd935b3c1a963e540663bf31665da7c519a5cc391f70da3fec749f5 SHA512 d52f8aa7859f722947bda55ef56bf21d54b3aeb54f11d84e2a151578a52198b48a847de7442b59fd2c46474f446c7260b866edf70f95b330da32d550de20151a
 EBUILD tracker-3.2.1.ebuild 2895 BLAKE2B eb7ca2ef765ba72afb857f28589b74acb33f6a3787a497b5b360c63d71eb00765ea7c8554e1d8d50812a277abf15cd83bd9f7fe2d06992cca45159dc8ed5c999 SHA512 624f62c6f6a8a2a214ed18b1e04b7c311492374c13a28b9f5861faf37d23e214231dc7a289f9e114ac706be0ee792f172f83207379132ea6cb0dccbcc3aade4b
-EBUILD tracker-3.3.0.ebuild 2641 BLAKE2B 3238db2d7322bbbdbb1fbe45b8bad368f9955b69a18cb85e47878a581c6586a89b821fd86fc86f2fca2f1755f08edb7351bce77dee9c7cc1e0ca64ff9c8d67d9 SHA512 b73acdd7f65aa30468a662d52d4e9b5773e25e3505065cd93607b2f1489f8565d69f17eb368e08905287cbca0cabab5c6c284d8b68b3e98e362c39b8a7aa6f57
+EBUILD tracker-3.3.0.ebuild 2638 BLAKE2B 09c29b24078b848cbbadc632489ddfd4a1ca9ea533570f790c006458fba7c65a80d15447dde9edfc8f5b4b357fd86848edeed36825c0f179d71fde1c87a21b87 SHA512 b2630ed5256722e9b73e30671a9944336be354151dd3bd41a3d58a75f29db614ac2b49a156e0ff085cdfa45defb7db2325de6fc168f12a57e1c76965515c02e5
 MISC metadata.xml 498 BLAKE2B 53cd3148f5755776613afbd38fa6b0eac4d10bb60765e7af7922ff70c5875f78ba25a78ef81af69f7767bc9da9fc854d9c833f4aa8bf18e52811fc4292dc47f7 SHA512 b81b2eb4705e5280286c6b6d9cc37945c671cd9ab635d31d7cef7d7ed2a3cf7a2ba5107e37363a78d8c707a2095a3d002e4ca6c233555a075ae21a9f8885d6db
diff --git a/app-misc/tracker/tracker-3.3.0.ebuild b/app-misc/tracker/tracker-3.3.0.ebuild
index 8875b2911b7e..ca215455981b 100644
--- a/app-misc/tracker/tracker-3.3.0.ebuild
+++ b/app-misc/tracker/tracker-3.3.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="3/0" # libtracker-sparql-3.0 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk-doc +miners stemmer test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1863b6582320..fb657be9bc07 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 71142bc1507b..e44555317b57 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,5 +2,5 @@ AUX gnumeric-1.12.52-slibtool.patch 1489 BLAKE2B aff4a76659bbe81f178baeadea99678
 DIST gnumeric-1.12.51.tar.xz 18117120 BLAKE2B 7d30dc01cda93a99ef8d47ccdf6bcfd1b6b6964a806599c7ade486f9bbfb61a876ef942174425cb2f59e018f5ec95a9df36a9deb0cd67d23e1801c2c289d83bd SHA512 c46164d9deb29831ab059613548743d84cb15461ac363305a28097832eb69d3fbf3cf8784c420c777bd09e32212b2ef6237bfa56ca28a7e08fd3befde9dfed36
 DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca9660dd38973e4bb529d38797a3029db4a0a399e40f69c84ddf33b96d27cfc184fd079fbe16590b92e056c1a836b037 SHA512 3baa2d2c4ed5f740429454f988ea527991febf38f49df17f0d88affe501c676bae95149fb0cdb4b369ef8d32247c1f4fe4c0eeab9a60329e1332aaf9c566f868
 EBUILD gnumeric-1.12.51.ebuild 2316 BLAKE2B 396826ed17b3c86f49fa45163a0bb9172244d07dd26d9da820aed2e097d35cb2a7469588a8390745d2920c5d777c81f2448574cd019dbf8d7ca0e223033a8b97 SHA512 b6e6e0f6a766f3cc0044ec591110b894947b94d86778bb6b61f8cc6b72a13c7334dee87dace6eb92467d9f277def9a4f6a668e23a1e6595f8e1cf3795551422d
-EBUILD gnumeric-1.12.52.ebuild 2424 BLAKE2B ebbb326f4ec9692535aebc50d5d6b1e68cd2a21547c073ccf760f212462d7fb2d9a2d950a434353457f44cde0e7a244471d33aba81d0449ef7330893b573f626 SHA512 0dc54cfe0d26e64dc0fb888e8397c0bfbdb6cdcebb31808e2893d3ff1cab4018f7e65bde99c8ae59e91831f73e1e4be9848746ab24f27ff92e4f2c9eae15a6da
+EBUILD gnumeric-1.12.52.ebuild 2423 BLAKE2B 760e90aa2225771c84c6ba69fe018e6f74a832cbadd6d49b9068d9d2d7ac6cd659877fff1b6535a4a345f3b798d517ea5ba884112a7bf487f29c41ddbe601e7b SHA512 8140135fa451576eb3a80d561a96c5d723c46950d5c8c774356384bdac46b8ed42448a499a91384b1c4d92f35968b862a72108c66aeed6d48d7dec10ab23bffd
 MISC metadata.xml 520 BLAKE2B cdd4d61e6b2192b820c122370c47ea2ff0c8b4130474a1273f59ccb83d74decccc174632d0a605b17c5d2efd3312409f4afeb45b66adb332b5c5b1fbce305ef9 SHA512 50a15120cea4f1b2cdadac5819bd215175fb4e9e468647f2228b229c1b50fc01c3a35f125b2404ab0c45e4174c028e39873bb91c8a53f7cbb8d0ec488b5c96e7
diff --git a/app-office/gnumeric/gnumeric-1.12.52.ebuild b/app-office/gnumeric/gnumeric-1.12.52.ebuild
index 9d77d7085a44..1f8d25865c92 100644
--- a/app-office/gnumeric/gnumeric-1.12.52.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.52.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnumeric.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+introspection libgda perl"
 REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4f1304431ebc..3409d0f26000 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index ba8988961ac4..1542fc3fddbf 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,6 +1,10 @@
 AUX implementations.txt 868 BLAKE2B d7319947a1e548f877a3fd2799cb9f5387d8c6d6787073edcc4763a15220c5dec2fcad48f81de0505569615dd5b67541a330044af61e4035cd4a697e4b989d46 SHA512 ff34a2a4c31799c21e1eb9001da8be85bd84b1e956e1905271b8c9e4b1e44cd9703b72dccf665c1122cd706da5e0b65e9ce409227f39c53d61cb24a2f1e17cd8
 DIST gpyutils-0.6.1.tar.gz 23914 BLAKE2B 1e799ce33a949037b68262cb7a6ca5fd99b4ca4ec74c3044bfb31ea08b59906a21f6c96cdf99330f6af16d68be6ee7ab49c3cf05979691899abaacc9d62032eb SHA512 74d984e496ccfa7124cfefd9f8f79d5fab4bb4dbf5e61f4400b39367dd54e23b871f286eef28007a5c255b862533a34948449bbf7aed55cf8fe315e76ac876ea
 DIST gpyutils-0.7.1.tar.gz 18464 BLAKE2B 6f19aeddbae7b64a3f523b7bbad45ddeef6ba22b6261fd0bf6ac280f962de338a3ba4da509685c5ce665d96b9d25e1175d65c0229f9b901924d7848010b0363d SHA512 46b60c52996c39139e51241abf08034c1fe16189df9d37a9517a1ccd22410bf7646c274a875a576d703973d2ae5846b26799a1ab0adbc22e363d8de32424362e
+DIST gpyutils-0.8.1.gh.tar.gz 19750 BLAKE2B 90d4b917765bf138ebbe09cc0640996d88bc3092ec2e78e07408f8b13363089141f25d12f84a7a519982f7327e2d6c52913376df7da5f2900b364a0c135cf822 SHA512 43a4c6411d881f2b7a35a6370c73676bb5c33fb2c9c47d2e5cdd9778034c142babe3f86d12efd8491930ce5bab04b73eb65560f8808d3b6ba39258b11bcb2b3d
+DIST gpyutils-0.8.2.gh.tar.gz 20247 BLAKE2B acbde89975e233ebd7d7dcaba629d35c09a9064be48ae1d529e9f5f814b9486e9a208506ff194894dcf827069cf24faa81efa14258866fb32cf5946dafadaf6f SHA512 932500c730635ed1f8f529012f7c65c48385d92db4a673abc0145fdbb14edf8c8b5a5ed4a4c7f892e7df310b92cd8fa0532af95340096f2bd4ef7047d6b6163b
 EBUILD gpyutils-0.6.1.ebuild 533 BLAKE2B ea2261a01292c724986700c55c155ee2fa725590b949863a138d1ea30a34d531c176bfd8349a695833fd42d9f6654ec164da8896a3963594b582767e756951aa SHA512 d57486c1ef169e2e15e58d8457e0e1871fc8ce6e9d12a62f74ab252d68e31253bf78e95c57b911950b4acc16bace02b42a2f21855436f8e05d79fa88cf44f81d
 EBUILD gpyutils-0.7.1.ebuild 627 BLAKE2B 69f921c66f5ef45d6598e835f36f3d737bb2224d66a0b252df32317705e139b9f96f25167cf2fb3c7ded89e9154308803fb645405481d18e07192e2d45b42190 SHA512 de973565dff80898baa03e362d9f2881f20af9dbd81d4f5ebac59cc4017a72eb1fb4e194d89aadf5f8ffe2891bb808e336cda4caf40008cfdbcc404f7ecf9d2e
+EBUILD gpyutils-0.8.1.ebuild 575 BLAKE2B 4bb7294fa54083c6d35e3011d7153d2252232e141c0c999617fe37301b34cfedc073f49d3fa983e141da73fbb657c32f6a9aaea165c61d0a7166d32efcdfb304 SHA512 10026a4726aa59d16de842063099a06c976f217669707e439e041b795265500cd0ffddfdeacfe3ed3198fc60124a91a0749668dfbbde37cfde6baccbff3094f1
+EBUILD gpyutils-0.8.2.ebuild 575 BLAKE2B 4bb7294fa54083c6d35e3011d7153d2252232e141c0c999617fe37301b34cfedc073f49d3fa983e141da73fbb657c32f6a9aaea165c61d0a7166d32efcdfb304 SHA512 10026a4726aa59d16de842063099a06c976f217669707e439e041b795265500cd0ffddfdeacfe3ed3198fc60124a91a0749668dfbbde37cfde6baccbff3094f1
 MISC metadata.xml 601 BLAKE2B 55e9b56b636971035d53b432dcdc5100127f286512a3d2c7568baf91970656803db20ec62ae8161fc2dfb0c27343ed8d869c73d71f0889860d4b648faaa9a96e SHA512 7f7e83d43dbe3fe944178e1547737973ff2012510aca40a8f30b9a081db894d23ad0126047f418f9fbe7748a8ea6133487af07e2f0f26ba5d04fe6a918853820
diff --git a/app-portage/gpyutils/gpyutils-0.8.1.ebuild b/app-portage/gpyutils/gpyutils-0.8.1.ebuild
new file mode 100644
index 000000000000..7981acdda5c2
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.8.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="
+	https://github.com/mgorny/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-portage/gpyutils/gpyutils-0.8.2.ebuild b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
new file mode 100644
index 000000000000..7981acdda5c2
--- /dev/null
+++ b/app-portage/gpyutils/gpyutils-0.8.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Utitilies for maintaining Python packages"
+HOMEPAGE="
+	https://github.com/mgorny/gpyutils/
+	https://pypi.org/project/gpyutils/
+"
+SRC_URI="
+	https://github.com/mgorny/gpyutils/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-portage/gentoopm-0.3.2[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 100a01ed5381..38561fb526f2 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/nushell/Manifest b/app-shells/nushell/Manifest
index 99688e75f86e..3ca3afb333a1 100644
--- a/app-shells/nushell/Manifest
+++ b/app-shells/nushell/Manifest
@@ -1,3 +1,4 @@
+AUX nushell-0.63.1-reedline-from-crates.io.patch 3097 BLAKE2B 4a4533c280461c0d304b72c82931bf6be99a14867749a965c5f48ec86582d43a3d3701ab92d7085306814699d621a620777ba7f36faa4aa98658b2ed4592dca6 SHA512 7e36ed3ce8df9d8f2796cd606d11e38d59f4c3b97bb9a993dfe33369f1e57ee6ecc3738fb1e95ff768ae64852332543b5b66ff9c6c80a74be8ba455eaf0d662a
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
@@ -6,6 +7,7 @@ DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST alloc-no-stdlib-2.0.3.crate 10199 BLAKE2B 725d0ee96e91bf93434757340427bb59b6efb1e169e202fa9153b1ff34c002fd69e08de6940e1830484ab40cf72530abecf0ffde6e2a238e2974b2c568c79022 SHA512 44dc8360a77dd984e4211648d1a2465df9d664885ab8f523dd0b3200e3d28799e4149d7b3df87df8a9cb19602331e98badf596a626f484756cd14926bfea6078
 DIST alloc-stdlib-0.2.1.crate 6304 BLAKE2B 949abd6c77f4c448a32eec2df8a2ced03a2fe9cbe39acd15648d7a9f791896ede108cd16d0d82b9b746885cbe6b78a46087024609126c837bc666bfc6bf3667b SHA512 282f1d34d40b994dfb008abba45c99c1bb7dd30a1bd7e168f4fda7297bec5edbfe28358eb3447d89d02cfada0a6035ef69388c7c533b00c31dbd4a1e873a483a
+DIST alphanumeric-sort-1.4.4.crate 5740 BLAKE2B 1509fcc1994a7ee14d55e1e094110e6422d3466486f00e9cf481e676149c46642806c44f4c02b146752a3b6ae7346e81cce43d7051ed11b79e0b0b8994fdf294 SHA512 1ba7e4634bb585faf43a85930de922cf9988aab44ce8ef33cf3a1c4f5b75dfb8e0d0a229b16e56681b161dcfba75fe83ddd0792d284346943dab968f217dc008
 DIST ansi-cut-0.2.0.crate 8751 BLAKE2B f7af95980ccb33fa08eabd63a7edf295d58638ff813f114405f23d2dbfd5db797d204d38d4f7d0f73c92520e2d1443f65c63c3b7b3cad3fe5d52c8a05dbbcc3d SHA512 690fa12529cb6392a847a24e06fe268c297f478921def654b04a438d2a3d7f93503a3636cae0c3acc668a6b928f88fe4e53cdfd83d06ad60e8000a320431fe71
 DIST ansi-parser-0.8.0.crate 11752 BLAKE2B fda164c2d48a9e57b118b7d4535e5777c129e9dec93ce078d049d2a865c934f6d0fa6bb153396b39707e6838195c78a23a58dfa37b6d5d9b684a5b2142835479 SHA512 46a53f94d048c0552690d048cce66dd7fe5a85bc1aa1a254f11f32f54bb5114ddb5d8c12609de3b65ec266f50a9bd777322eec53b6a9690534c1d427779b1cef
 DIST ansi-str-0.1.1.crate 14205 BLAKE2B 3045be10f45d8437f7ddc7bc6336b64adb025e9ba4f8180a7d2729f016283c5884a50b61e13e4bc8745b6fbdb76a3bd64d6c1f5244040e725c8138af965f7e17 SHA512 4be380f41fdbca9a5e042cfae02d1dccaf1c3648e2810b4d946d711baae223fb959adb1fcab80cf24495928e6fd95729da6f742b39e72561a69ba3cc1a45e557
@@ -13,6 +15,7 @@ DIST ansi_colours-1.0.4.crate 10525 BLAKE2B f71ef0dc730cb35e634623cbf6888abb7251
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.51.crate 44100 BLAKE2B 20683fd139775cd399bd0fd63599f64a646f8b74c65415af965d3c24690fd81fe48205bedaaaab92075b487b71d5d315be5fdf38ff7c5ecf3e1a1d693a3505ee SHA512 e8e3feebc3c96b7301787502f000b9940a20343a466ac48186c9aa170fb52f0db17768630535a8b475077733ad6ff9f843a3bd5ae4415c86bf83cae0ed0bad7c
 DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
+DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
 DIST array-init-cursor-0.2.0.crate 2590 BLAKE2B 18edba438963c13054dd29878754de1b0c46d7a6d2e666d535cac9b2ff90997e7c593c0c63f38ffa5de1edb1b6c54ee918719d82a4953f317fe30d8ba7854174 SHA512 f4698cbf9ab3011ef8a0f9fc29d9d58d2572df0db336ad4ee6e72dec0bf4be89d06e2693d7037082788b6d120cb2ad5f1223932c185e25258a1594c60d429eba
 DIST arrayvec-0.4.12.crate 26551 BLAKE2B 45514f09f0fd1fae7afb7dc812142ac8d88d1f4b81901db405c79dbeba2d29fea13ec22cb08a43433321931295a9f14456a300e814431b8fb14037d2f47529e9 SHA512 c03972056ab8fa30fc53fdc2bfc5e501f7644223998eccb73fdc2e737f7e25f4bb0e531f3eec38f7f3514760fb385fafd06c3d38531d13d92faf841820d4ed2b
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@@ -20,6 +23,7 @@ DIST arrayvec-0.7.2.crate 29341 BLAKE2B eae9d3f494033ea2d837a6024cb24bd4574683ed
 DIST arrow-format-0.3.0.crate 45421 BLAKE2B bd9e316a9f9f76533ceab586aba9521b113ca4a78dd3ed73bd17dff9e8b1c20987925b0a39021bbf29d405d71482818f6f42861aeb64b4e4b75a0511e86556d4 SHA512 bae00890f5171017cf6370cc15c0e2ae00f7819b32d2e90caad46dddeda4d3cd6c82bd813bb49fa123a0abe6b965c092634b82cba3d0279794b65cdd6ec0532a
 DIST arrow-format-0.4.0.crate 34727 BLAKE2B c34a4e7dabb300adce3b5312d4c3801e5b5e9f462c025661cd460dc0eab3150689a0f84f0883d3fda7278312ef78c5552587601120d2181566eb4a4217dde60e SHA512 312276a234d9f839235b7c66276a8a5b3089c26a0cda1178a562705d29f668de7a066c5a69af3e5552cd173f75f10e9bc6ed1c09a2e697d0f4d3248890d0bab6
 DIST arrow2-0.10.1.crate 704609 BLAKE2B a4002367b2d937feff67ec24b94926af9ac17ac4f669ab9184de5a2eddab03ef5517f82f0297116af81a131540305db6e9fd068298aa1d623edff5a1be7926ec SHA512 c36d3329cd1e5bc7d37dcb6c1911d9f7c0822cbc7dd8ba608bf3a05698c68a1ad1fc9232660c4eeae0285ce764d52dfacc4389658185397cbc3e1d5abcd205bf
+DIST arrow2-0.11.2.crate 720117 BLAKE2B d3cfb13fac143a19742f723dc286683c51f40ffb86fecc739b10fb295eb5064c53b5dd99b06ea0d0fa3ca5ac87c3b17d7936ea8173a0f2f29aa1da1f9e861443 SHA512 72183511fd95726c5cac98928f66b6ce610297ce99b9dbf72a7c0bb860206e1695881a348a6ec2cea95a8e7214cb18911a0e4f7143384fb9002ec99f1ca3a314
 DIST arrow2-0.7.0.crate 640998 BLAKE2B 79628b7b83e92e893dce6344bd4df6f2179f9ae716a6fbabb65cffc11c02242accd5639cfea5cf6abcf5dc7ced88a68b48436de8b97bacbd49783be31fc64458 SHA512 d822c7fe2710f2bbe8f4667f493f47873062c4d46032423ec49c963256b2edb49aa97c0c78ca2620dba398e04e107b40f92cd797f7c8d121a001a5fbdd4477fd
 DIST as-slice-0.1.5.crate 7986 BLAKE2B cebed41646fde627d759292bb9b1f5ad5033b526298a61aedb425d99473f37e2d3713b2cb10235986a50737573dcda3250dbf62c931a9f4752a5d0e01fc60462 SHA512 ada4f8ab265d6c6a8da0f98159a379dc4c4f4eb6cc827ccdf18fd525339d391ea4396de6f4322092ad00eb53156fa43f90ee0df09155554a3f6de033e5abc58e
 DIST assert_cmd-2.0.4.crate 22581 BLAKE2B 7fc9fe4577e486f26d07b2b4419c331022ca61923d0664f4e8a25abbe6d6305600b47c739f9f065ef778bdeb59b6309ab73df2be11e5f8387cac2e7e8c70a4a2 SHA512 c389e0210153e9a6ccbba4dbc6a6c7a23533e5fe76e717dbc36415be2adbabfbc0de33a2e6d05e3d70779b7a278580edba400c688c9a6b446403b59a78d93720
@@ -30,15 +34,21 @@ DIST async-stream-impl-0.3.3.crate 4072 BLAKE2B 33577ae90f52bf9c50e2b264b65ccf2f
 DIST async-trait-0.1.51.crate 25531 BLAKE2B b4ae85616d5f84392381539d98c1751baaa01cf936045423179538fa4e027d86c8aaf42f98d4e781e0f8ce7ee3bf95d64fc5aa624997fa4aedd06f1e9144b11b SHA512 9a0505109f984bde511a6e1543925ac447935824594fb0ae3da6af3f72fca29cbbfa0cc282f751bb2c597e73084d831fd75c202beb5998cd368eb0c13a067990
 DIST async-trait-0.1.52.crate 25913 BLAKE2B fed6b6688cf10c712597dd612d505aabca0953c825b45e2a63cdb0fdee231e70436b3a7a02a56eca34ef7c11951f52eb2d67740c5c7226ed4417df55745714c6 SHA512 1a17e3771d0f8ded921a561ce052f397e997c99599fbcd741a69b7f43ebc10476d412dd9cc18a096c791717ada71e8439ce38d0312d6aa59dd4c0c34b5465696
 DIST async-trait-0.1.53.crate 26210 BLAKE2B b48cd91fd63579c7e0317a72befec93168bf067ca08cb4e51f1121ccd5bbe3e3ac03d343a97c57e19571af31636901ba335f4296b0cdba997dd3630e176a25d2 SHA512 33fac59f2329997b3b17b076f816e32cd667f3317b324b74e1bf4ea28ef1d3ed53572316f9e034d1149cb8456dcb29e78474426aa04c42fa8bcb0dcf1da53763
+DIST atomic-polyfill-0.1.8.crate 12267 BLAKE2B 3bd18fc212219735d4ae39e9b01f787c86d1ea3374c8a4058428d6f688654c3f2eb49cf5792839559d63e87295fc488dd43040d1944d1734cf4ee219853bc4a7 SHA512 aa6e8021baba1a5df607f2e50b81c07f2c53005d22020f6594a8c1597de52f18d1fb8fe3ee421776d578dfecf837b0e7e215cfae22e3342b539413366569667c
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.63.crate 74280 BLAKE2B 825fcabaddb436d33e179630301657d212c9364b323bfe72e8ed8edda5c0c34abe36142b0bc34501d1885d40d55ab53c0f8bc6387e35ef86f14a9d010c426bf5 SHA512 25cf411ee21c796f39a45e6320374b38f62580ca853e560b3a8ec596f0ca6d60b94539662b1a8a3a3046f481b8b84a5b84983e1d2624aea297090382eb99b25a
 DIST backtrace-0.3.64.crate 74311 BLAKE2B 32650d755fec8a9e04f915572c999eb6cffc782284a4bd71f2e0f3f73519d5b84fa016199fc11fdbbe510316498adc2bd4f8e059e9c447e5a64ec5853e75243a SHA512 37435cca0587c1c7b511536478ff448914d423c9cf6152ec8bb884c19d1c2466c377b270ebce2028960b4a380f3152fbfeb940de943ef4071ed271c7cd576f2e
+DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd30212bb7204ab720fedb1df64259bae44500d9162c1c001d2e9d70ff5d698e02e5ac51e5734dbb7c601e602b3f SHA512 9cf3cda1d86deb6b7f3cada0ed7a9e6e54e2d323533e385222a260b2f667bd1989a552cc35806a1579c1493ee1177e474b1d42b29480c09a2735251586740321
+DIST bare-metal-0.2.5.crate 7923 BLAKE2B 0deff5451744c1d8bc85b36b10e6c85e40e5122779663cd3fb9f19b363b40f6087068a6769473af927c1306c90c6e5adc178553dfcaf2e0aad613ba28259c4f9 SHA512 63556c017a21aa4b37f4789fe3e26bdfdf7d0edf4fdf9a7f4ba131c60308cfa4618f0f92dcc673ac508a0db6adab9f2157352a2162ac169a7a05eb30e9bf8e8d
+DIST bare-metal-1.0.0.crate 10650 BLAKE2B cc3185e5aa6cd7856e8ae507eaf87afb45a78668ae9a9da306b2bbe847d5ac8232b1ac77f407a2e92d8576961edb64bdee825181c18806367ab7864e40207e7b SHA512 909b0d45aadb809bea8890d1beaf4df5948eaec83e8fb49c88c7dd43d17cf075b3ceea8a2fade7171651934c6ea4275f6e4231c12181705186e1f1bd45f1f2de
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bat-0.18.3.crate 1333856 BLAKE2B d2262bfec356eca6dfe6508e4ad9e3fbc01f6f3edd6523950ba1e2e9b9be840437a857a0f94fa84a2eaa4f886581ab100cbd399e6c5d83c565ce40e749f376f1 SHA512 078a08248b63ab602b78f05efd1721a3e1173c1b6ec9eb1f0d0e6bad954ef6c2063c6221558c102e4dac79433c2ed3bc69003d0aec4b49722b6e574bd8f7f7b3
 DIST bigdecimal-0.3.0.crate 26679 BLAKE2B f0bc55c8b90b6cee84b3452a078008263bc04590adcc60f680e833ebd8b125699af05073e4e3cc739dff7985a481601be466c349a8125db69c7d45c62bca9890 SHA512 3a55f6ab1450974fe58dac268019fa7f76b0dee131ed66f5c5529ea28da5d9e7d11579585f28c0d3d45a6456992cdeee81df524c0c7bcc5c3dc86b26d4f12981
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
+DIST bit_field-0.10.1.crate 10576 BLAKE2B 3a906092be85cce6af9e2ac48632d8545864c5fd1610e7e28731bd5cc44c9513f2c7eb52fa1be0b4eed65bffe130ddc98c95dfeba2f9de28ada4091396e5695d SHA512 4848d7ec592642913c7bd06cd3a0da49d3bb14291866cd22ead8e9a6b2939a787035d5cded87be3d2d3491283e31ea2cfb105885df4114720da98beb82990ee6
+DIST bitfield-0.13.2.crate 16479 BLAKE2B c34f150e135579452d5b6e13bac0fb4a3a897219660289c861646330f7050d19a10d041affe8d250bf314c35eb19ee519b1fa0dd12eed94a93a5e904b95380d9 SHA512 5ed9ad97913828d67b19d5f10a264592f4c03aba8e4ea791f7a20e61da79066daa1d5ce678c822d8f6f1d065a65a3aa6afec23980abd1da38b44dc6cbb96166f
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
@@ -94,16 +104,19 @@ DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6
 DIST console-0.15.0.crate 23507 BLAKE2B 49694683baddb53e0f35584403aa93616164c2d3b94b39e0e35ebc4f915c37c8e794619d57b44ac0ea460ddbf7ec43323adecf657cc6f2869f313b3cdbf3a46a SHA512 70bd6abfafa533903f273ec3b34da6783856bd1abedaf139fddafac0dbb03fa9154f8e1e1bef01fd8de3c53100bbaa93313518c42f8ce51217c23ef34d3f9d62
 DIST const-sha1-0.2.0.crate 9079 BLAKE2B 52d44c4d9ebd3fc33e57bed83b3d7e2cc7f42eab47f6f9268c14c6f12aa81530f18398aacf0174b47f1e423f78b29c1545c1184279ccda9a314a53e07ebe7f35 SHA512 9dde193471e608cab47ab391c3b5a07f7cf4de4e285047bc7278e357b45b964f260094e906c59d214c3b29300b097e0acb78e75b93383fc492d0f40384df338b
 DIST const_format-0.2.22.crate 72234 BLAKE2B 89d6f58458777d10e21bcf960e57d24069bf2325fd63904dddef10b6186570bf937fb1dc99d5302a1184d2946c35175d92970db583288bf5af45139aa8ac6e7f SHA512 3ed65106b3fa49fe7cbc0592a8a5b0fc9b99d9d44cb51c1fbdb2fb2eb916d801aa19d9ec568560d6df33373324ea226de3db6e82cbeb9a850426589472a1ec9c
+DIST const_format-0.2.23.crate 72319 BLAKE2B 3cb7a72e52709989207d84387cd5c7bb9681d76c9b12834843dd299a75ad8deb49d0d744837a7000d6b5ec799b69fb5f7e9ed0c4bcb7a41c98e27e0ae941330a SHA512 cc6b3254d82be2285e240b86e90593c971bf122ce576a6943281df660a6febecf5b69d7a4512a3c0f3f4759cb2314ce1acd49063a492821a0a957433744b30ac
 DIST const_format_proc_macros-0.2.22.crate 24274 BLAKE2B 61a41f89bb1302cd8a9b2b5b2bb6a90eea2aa6e331840c2b0033acdaef5ddb9cb7a63df028db9e6065a4883aa53002330c6af0bc0b8b3479ef8260c5d088cd71 SHA512 a0382a50502cff46c966fca1518ae1102cc749a9fff142a7fc29c3f3dce4b947ef05576e27248ed682aa9db2e1c0af149f41981d02d8415b63734a0ceccb68f4
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
 DIST core-foundation-0.9.2.crate 26857 BLAKE2B 9090a489f2d3cf8cbe59472530470dea0ae9e1a0838207424953be812586aae013f9f6cafc4ecbe68be302f4ca208d8c892c87b5736dadddffd6d739e6427934 SHA512 9f68929963fdeb16954e6642f27173fa5d08d39e835d74f03e18d7cb23e9077572d712e7c9afc8ab0be377fd1d845625986d0a905eb6d55331027be2a25d4f9a
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
+DIST cortex-m-0.7.4.crate 140302 BLAKE2B af5c66845b212dd82ec10b5b6e73e294b58c650fc7284bd75ccc2e51a4f7340f10566dfb1efaafbf5b0200fb8d7d5603df76755e68ddb2330d6d12135328d496 SHA512 d9c4e0e70dcb73dd452fcfef9d2522474789b45a9eabbb13850a0aa312386455cf6d9bc1cfcfe6a7eeef9cbdbd5c1b239d3ede51a20b8a256f6f2c48b66d9ee0
 DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crc32fast-1.3.0.crate 38565 BLAKE2B 4191cbfdf05964a39933f66453752c5f14b177c43fa5fa44de02d74b6fb4e4d874218f5a369c4a1d1ea71461cd541203f42afee259343ea139e305043e155ee7 SHA512 6ff361acfc0bb134672b30fb438f6d3ac93841d06332a6ff156025620b23870a79a4ceacf57d4b14ea1744838cffcfb77b413352d055809e74acd853ae912673
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
+DIST critical-section-0.2.7.crate 6094 BLAKE2B c910f974a6b5906266026a5f1cab6620bdf5094f22dd7a4e44a40cf3e20d895b7f57ea0d1f024b40de8f32d9c37e66c4cac3c7e5dc86aec01777e931b24ad7ba SHA512 8402410866786adbfdf82a0cba0fdbd49b278052560ea98e9d1151647cda9804cdeb2a9c7e1d9f458180b2a37a19f1266d72712d4cf9ced0f486b55de655d51f
 DIST crossbeam-channel-0.5.1.crate 86919 BLAKE2B b223d0dcacbb09850d457825cb2a018494d798d0000a20eed3f54b1152e41ebca4698e7d50e81f467b86543779155ad08566da9496eee36aa06644b69cf5d7eb SHA512 f15aff67e9105584f5fe41e1ee650ae4fdd0d0ca0fa9202ee83c6f6025398a300decaa50d1b4682e8afb9bd6e11e95b69bcf23f68ae117419aa84df14ee7747b
 DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
@@ -133,6 +146,7 @@ DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099
 DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
 DIST ctrlc-3.2.0.crate 12894 BLAKE2B a2998cffcb7fdd82939c94bf03e47231c2a9c0e94575a889404c474d5820b502fa1b22341589f204660afd8c69e6da36b99db0e91407005116acf8dc66c03048 SHA512 8ee32c5ee0706efc064ae1cc85ed4aa6dc156fb95988e7122c208ea9469f2feae2eb76e7e01156fdad9198146e3a6e4e2b05c16cfe9929a4f7330cfe36935969
 DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
+DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
 DIST cty-0.2.2.crate 7230 BLAKE2B f8fc087e6a990a354a1de9a8d0c078757a512e13fb7ca0e337949a22c3af158111b0c1edb50857c0e97db5417943165e695b4f41c328948cb344614f922f214b SHA512 1b6fb2cac48ab796ddae5c51dd27c41ff584b2503ee15f1fdecf29ca92086826efca33d2467b5721dc1dc13b5103a76c0a320f416747230bb48d1b2c4ac784b8
 DIST deflate-0.8.6.crate 62365 BLAKE2B 05b1f81e4c423f9fdd823bc33352d8421f2ca0c26d43cf0c5990db12f5e31c46ff7769f1baa3b971166b4146eb448ed0bd3ffe68f7c4aff5885b47826f77d847 SHA512 7e2e23205c56cc4c834ade2a6a22b056253c32e29346907558117714a18d8433882a712711413addb15da79f9f59e089a06dfd680b756ab2725b500a49dc16b2
 DIST derive-new-0.5.9.crate 7733 BLAKE2B 3f0a19b794c10e529da5b3618cfeaa4e575ee31597d2ff1f95618eb5163568c6c8836c5a634323dda65f448bf3fba2bbf066df5f815feb07f59ff99d1f46da26 SHA512 9ce0991fe63d8339a88d9552fcd8cc744d8bbc2c6525f60959faf519e1ffa84256c773291df2101912483c0d9accd4fe5f7dbb199dbd36d299ceae8f607e0b30
@@ -159,6 +173,7 @@ DIST ego-tree-0.6.2.crate 8962 BLAKE2B 012f88e588384169768a340e76bec42713cc0a29f
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST embed-resource-1.7.1.crate 13583 BLAKE2B f7cbef6b69ee247514ce729ce1e2765b0c470fb6bf5227896054d2029c018520097f74b52cb68edc04a89ccb0dfc1e665538de9a128b34b8683bc244d2e86d3f SHA512 db1df05c56ee48063fc6b390148c90c9c6e3c0f91f09d18f408b084ac1e6a4da426916c8d462e5ac5a2bf375f77d5d204165960c5114654369b5e6f06d93d838
 DIST embed-resource-1.7.2.crate 13583 BLAKE2B 7776da8219ec73bb4ba890722ca87c92c0b07f0c64198f4b701d9815f8b6e04c0e05f22af25fa26fad325c7f9b60d0447ee6285b892c79396ac6c421246b8348 SHA512 db2d7eb090967edfde1053b245be75576ace1e8f52633bfe242f2cc95c64ba4f1b3f9f43cc86ce7e69f17321f57dfb87e7d64e641ac649e424aa4e346b7077d9
+DIST embedded-hal-0.2.7.crate 32623 BLAKE2B 0e1fd19a4880d5c9bd2b6d2407e7cd0f97909a374f9250f23e129d2492a54f98d86dddd4940035c61f07ced41643cfd85d723f80acdf79c17b48c65cf604eb7a SHA512 32adb640e03ce927e6e9df47ca8afbf64802f415fce11988ecd447ac9a7e23764908a0cbc5893d6a2e8adc291721018ac71a99706342ad617ff2fc4be12e3c98
 DIST eml-parser-0.1.2.crate 12537 BLAKE2B fb05915c79572c2df132da9a3196ebb6b893947d8378845ce6eff084786e78e8ba14529926825d9b963740d33ca49d6a044a5840d73fe5f9d54708494bb30e78 SHA512 1e341b1887108b0420a24eed758ed55f79bd553e6d3327537be4ea138684d962cae7d1527c8586e540f04508e558635e8f0ae9ac51bea134ff9f2d606bab8af7
 DIST eml-parser-0.1.3.crate 12755 BLAKE2B 6f598c7ae4f7a84fcd215718a2e6ae5242262b464d6bfbbc181698e7b5aefe762c6a78bfc2109a095ff08bbfe874a378fd425d8e36934e87eca8a8b1abd21fed SHA512 95408df5e9f3fdca39d0d3a3e48d5773360c38504f7a463622a248eaff5af4aa0ff4299193ae75e311072fc0469cb6b9613e778f911f789250cb5e40044b1aa2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
@@ -191,6 +206,7 @@ DIST fd-lock-3.0.4.crate 13381 BLAKE2B 9c5ab7b23768cb45da0e839e521c02e6fa8a751b8
 DIST fd-lock-3.0.5.crate 13383 BLAKE2B 554729ecd142e9f783112ff479de14e52554b902319c061321a38e37ed80a1a445d4eb9b45ed91a44fc913b02f98aab8f7187b29e692e08b67edd789a337d936 SHA512 7173838a01960e0870ae90055fd97173d647fe9eb7457f76c0bfbb95f7d95c02e4ec9a9a7c7ea528ecefc4400b4c6b99f6c847248c55392e72d94248ad6db239
 DIST filesize-0.2.0.crate 5066 BLAKE2B c43cc098a2b4ec4f9a2990ccfb17a6379e7eaa01686cf9d077ae4b3f80f517f5abdae2eb3244989f0fc4e9a1c6c9b6ed1f43921d3067d474211d74fe31cb75ac SHA512 d80ca58ed1c2c9959cb98033c270ebc520ab050b812c17e22cb1bda3cfd44d35542e56c45da36765873e9ef18f21a01b8d615bafc6bdfc9cf555d9175b47bdce
 DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
+DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST flatbuffers-2.0.0.crate 22491 BLAKE2B 06d8a7d314a159c7469d16dd75ad75f66f78a172fc81bfa7d93b0025dcf4a350a049b629a45c9152a3492c197df2b30684848b9f4b66b1f013dba6879a678195 SHA512 26ed2ff2c383b239ae3b75771c697308d02568153b6cedfee0f0263eb68cd6adfce42071628d32fdbea11ea7fe1e3a78fb917eb2d43c7c0535132302607a1803
 DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
@@ -238,11 +254,13 @@ DIST getrandom-0.2.5.crate 27719 BLAKE2B 881c4d498cecb55b2d89b1b382dc26e9f2f26df
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST getset-0.1.2.crate 8831 BLAKE2B b1408f4c0b2ece039d06180e3e2990db2a4ca3c74575be3b4d3df562fc48a43ee8feda42cd957786aa481fc77a554a8e944f34a6a718c07012aea153a1c299c0 SHA512 54f162d0d072253abcf26c8779a9d8eb423db9df85716da13a785edb4c61757cf0c03f3563dde5de4534be9d4d50498c03b8337dcaafeaefc29c9c836dff1371
 DIST ghost-0.1.2.crate 12777 BLAKE2B 34293c1ec8412ef207627ca2a041f2dd8822c2d8990df8e0f17ffdfc865a1662991a80680c484ddef505758578177d358c2e56003003a2cb685f07a41d6a9feb SHA512 4258fdfab59946a4955f053cf0b73f964d5bdf25ac9357ef8f4cb21948299fb749bf0c0e89a9c1e95a8606e74c6b3a3630fb4f6316815d83882a9531e3b78b5a
+DIST ghost-0.1.4.crate 13788 BLAKE2B cb76481e1223fbeec63bbcabf1fea264712ca7c0f8071741d2e3d39b794a8220632efcf791859fca88d6a0d84e8c201ed173401eb35e534b48cb9382a347e74e SHA512 1c59cf596dcb360c6cc345b3733fdd8a5adfec001b668acf527a5d74f261b1468c79086ddc1110981d10baf311d0df2960203c86e97d639f500db09abc7b701e
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
 DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
 DIST git2-0.13.25.crate 194192 BLAKE2B 7286ce8f37421e5cb626c3b3d4f0005d4ddbf4f893fa4885a9bad28ba3f0e24d4b2161df8788430d909394ceff77eae586b26ffe343d6b0ca287ea0b63087068 SHA512 666f11464f34d82abd994f00a0b81e960551c4c524b4f00d28e5c728172dfa894fec65050767cc96d18d1d5de57f1e901154fe8d70e2e31b93b93790bce021ab
 DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
+DIST git2-0.14.4.crate 196849 BLAKE2B 020e8c87fedb49fcf38727a8c0abc975dce2b70dfcb1db996e526967bd71455be8f81ed7d7e58d56e584f34adcfa2aaad7765d262b2d4899370ed9e0a7e2175d SHA512 05a5894eb90e5371525222f69321c2376f6b8e0306a04ff05a9917005ca77a86b6100ec19338e47265599f3a61603511991ea8664e7c64702a580841ef98963a
 DIST gjson-0.8.0.crate 2975387 BLAKE2B 0fca1f6611592f1152bfa69c423029b26a593dfa335e82bab5db4be9b193c7f77a6fb5f5e21ccbbba7c789bc5ed9fe1cbffd4507a2328c6c7a82084396fafc2a SHA512 0af6072b1843e046d67f36410d38849f6fa288722ee77737e13377f5251cab7bc6994be7e23c53ce6ee125a7e35f4b0d29d884c6e0b865bc3e2a852f6d814693
 DIST gjson-0.8.1.crate 2975684 BLAKE2B a6488541edef2a5d84f04d0b3b7f1be30bb8c3b192f406d1b128b3dbdf36a74da0deea1beb0d0845f3db58642b9c949151a5cf7098573ab8a2e67e1c7a29e16f SHA512 37f1a06d7002873991c67dc551c6db83dd2f6d6702eb4b3656b10a79a4310ef8dad01a51650b601413d96cc5fa7a5bd1dbaabfdc406942fdd35c4ff99d9e55ed
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
@@ -257,9 +275,11 @@ DIST hash32-0.2.1.crate 11168 BLAKE2B 26e157c3e8e1c3f72c06a804b0e991544d92dc46ed
 DIST hash_hasher-2.0.3.crate 11057 BLAKE2B cb4bc67a258ed3c340dfff78481ae085391d44a45383f2976287a08b505c014f826d7b3f5d87c832b97af976bfd6b77ef4eff498f806649222f365e8a72d2ee5 SHA512 de542ae43796fdafb843c9552d812e325cd8e8ca66f74c463ccca730ac556bb210885c16cce1620fead52737825b754d152abc333d8caa05d9be59e540015895
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashbrown-0.12.0.crate 90663 BLAKE2B 6cfdd2de3f1dfd89ad5819f4a9a33227c25fca2d9b892ec852635e5f3d4469acede1e7ddccb914d9b90432e03adc254ed2d1a630f47a845f7580723944116a41 SHA512 11497d1278af7f758d76daeb7fac83ddfb4ef8307c9d9db03ca73f10885a074d1567c3d9fb2a233aed68a0fcc77a75ddbb579734248ce5da61b240468f419dce
+DIST hashbrown-0.12.1.crate 90855 BLAKE2B 0d38ca94f1a7b750b31bc5469ffc1fbdb79a789d0410dc51583f0319569c94ed03b7a8b5f02972cd370a48ad8252eaa6ecc6eca4cb92911ae7366992b9b43cba SHA512 a037554dda19d8c1d79e74fe59f0297855173a1bd0b119c8fbe724b18a07ec7c2475162213d2502483279712a46ff1247f1681aceb97f67c2e7a53b60779b418
 DIST hashlink-0.7.0.crate 25309 BLAKE2B 39370daa12ee047f1fbf4251b46dfc797a75cadb743b1dddaf94295352888d0d9cd2fc2049e6646ffefac527cd16126c2d61b62f271c9cb678ba40a2677e8da9 SHA512 bef02ac4ff270a7021e0da24f6f0a7c2d601c20e2bf347bb4ab24058d97d25fc863d6aaad7971fbb7fb777643f66c7e1af47251acd89e12a123056c0a7810861
 DIST heapless-0.5.6.crate 59214 BLAKE2B c7c1ead94a9b0e2f6fdc827ee2232528962b4a946ca5d9424462b332e5d568260b823a0b0ce7592e9861c9fb615126bc3ae1cbffe58ebc05058f5797bdbfee03 SHA512 0329cd45c34e52493d0763f09ea1a38e503fb7e93ed814f021e08f52dae1ee58ea12c4ec0e101dd83d7d9e5e481694b7e5cd3a54788fe4db26b5adff76c015e3
 DIST heapless-0.7.10.crate 70211 BLAKE2B ffc3968a0a07ac172cd8ad1ef58d9e38e38df196411797d1692a27c7b9506caa5f2ffbad063403f22bd0a44cc04a8a2b7f04c95ab3dc246b228ea7c7c2e01740 SHA512 bd7636387fd8177004c58426b85555503ed43777d3ece8982dbc39c4ec648269de4f72456a49e3799b4c6f0e38c1a08764b811732a235aa33b16cc14a434a6d5
+DIST heapless-0.7.13.crate 73190 BLAKE2B c9acca4f777b4f89f8aebe2b7711b25b26a7f02ff35b59491b32a99640388e049b291c4cf1b1290865837f518bf7aee78325b08b7f37b1fd27a4e7fd44e59153 SHA512 97841af2f002affc6eea442eac637d5ec7fb52f1fe38bd50ccdf31b7de619ba8c41d18d7ab27930f917bb11432e5720cb076f3dbe831880f2ee4509c4f015ba9
 DIST heapless-0.7.8.crate 68584 BLAKE2B 0eb5619d4ec98f0ea96758e38d4115d4651abf72214d852900ea9efce422c5fc8f5ce020576d1deea5ed3cd36b41e68e3add2703583cfc2bc2e259551f21537e SHA512 ae2e3341168ca0c7f0ce57e4c01c94f235332eeec8b650fb1c4c4f9de321b9b11695d635049dabb39a4364e7ed3bc8951d5e8c00a782afcfc073cbe161e20cc5
 DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
 DIST heck-0.4.0.crate 11161 BLAKE2B 13b8bc39cf3ab90e71433e3c7b3e5f1c19404bec58dc4298dca05d94d5c14c2fc97350de737cb78aa45196b1241aa8f1ccf3a11ca309da5fe0f6a657673412b3 SHA512 33bdbf4ff9ecc4f4d74cf06590e056f4d96bf0d990d5381b9da5b65682b2495ed74e27b45419c2afa986c1f6200909d5175b137ae73ced5cc8ac869e4e1bce8f
@@ -272,10 +292,13 @@ DIST html5ever-0.25.2.crate 72780 BLAKE2B b9dc442ab8b6e502eac5bffde57d7fd85f8da2
 DIST htmlescape-0.3.1.crate 53226 BLAKE2B 428d4b1d8d5acf473a44069cd7592ffbd00e970e95d1db876e34a672b90c03676b6a80ba039c877a9932db1268a13f632691b78479f5f7520efb5b4ce57cca94 SHA512 36bc5c45ea5a802dd0206b28b4ece4b00d2e143b638219455e34e04110d35d4f12818f641f9eb2623fed8dd124ec8a36a99a36a5fdd99ceaa6121c4d5479bf6b
 DIST http-0.2.5.crate 106297 BLAKE2B 02917ea704475510cf9d71739b4cf3cf8f87a013fdd7b9ebbc21c702642bbfc9e33d7c7ba47e084c86cbae4d95a72a51b7f7d3c00ed5652931c9286d83f5b980 SHA512 ec56bea9a6329c82053a757b6d537834985284f22dd677f9bdd335785e8ae71acefce0e07a7fff57c6648d0fae54a8039d71d74936f10a9b5547fd90d2fdf7d0
 DIST http-0.2.6.crate 106384 BLAKE2B 7c6627eeb73834c56dee8280bf2415a5e0045ff721b02ea207ddb2cf286b69487874af0bd3d40942474989642c59efbb35c0db75d9e4156a66efde2b2c51900f SHA512 ffafa748077a1122d3f7f1b9f34da43f5923dc8cf09b7b492d286d8a924b3fc9949c3df5bebe358b11801adcea8f20d8e8986eeda1e63a2ab92d4ed1fe0e6746
+DIST http-0.2.7.crate 104219 BLAKE2B a36788bca43effd34d8a328b428a896d71b1a036c6faa3559f4f452f6ff7a1bfa3237160392ccb04a3a33c518682ed7f4d3a43c720727bc413cbc1e025a0bacb SHA512 ab0227703cf3721d15de8b8e7aea441611d038928f60e04c6a7d40a66b1c1a4107c86848fe64376ba3ba99a3135ca1f60f2bc240b7f55251f110835576b88eeb
 DIST http-body-0.4.4.crate 7836 BLAKE2B 7f417ff8520753324d5915e3f092988fdd26b2413db5e917045a1201d7d701d8308b468c05da4d4ddb9abb7b0a0eeaf82f15a786f29cb1ef621e4c168f4e4bfb SHA512 cbfa91e31e91807f004df77a9d8999b1224f862d4765ba92ad4d34d288fcab67372734295f30760a96eb32454d78fc527c6519eb45b484e341617686e743381c
+DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
 DIST httparse-1.5.1.crate 26758 BLAKE2B c2f17a601b54032c1898b88feb836ec380465b5305e240d9466760aea85bc709ed873d1677714acba0d493d27fa5f5288931cb7d62f240e50e2d6b84d4e72046 SHA512 70eec6bec5927e272d7cbd09472a14b0f33d153498d5e1894c0853bfd35981c0d249a799c3f4acc01b8499c29519a49d81efb755bdbce124e55f73eb75cf8592
 DIST httparse-1.6.0.crate 28175 BLAKE2B e3c079f26fd250a89747f65e02632b2e3808a3a1d3d78d2356803bec3e228ade5d26d80d92cfac2dc3b1d6b3dff05488ab1ea27a3d51d93c6d3b6c18593c9201 SHA512 6f1f39c778dc5c14be863d2462e76f521ce3ec0b945799f5370828d29453760c0bc2eff888a529db74bf287c22673771bf4a5568b3a997a87004ebf292a4e237
 DIST httparse-1.7.0.crate 29323 BLAKE2B 4cf5e58074df8c250ee74893ee84018eefb89d30d378a48db7e0018cfb29355b44948084801766e256ec8f6838ebd03bb4685eb591117090fb01ffc0ea3a30eb SHA512 eb24d0ebbd78c1d76a8b8b46fdf0876b8893cf1977adc73038e6a4b4d7ad6280f97fbbe8c92465fa34d6696d0a40288f41795df7cf15733588d1bfa8dfed8584
+DIST httparse-1.7.1.crate 29379 BLAKE2B 2e938694bb1afb0bcd79d19637a4dfd9201b217661fda14dff7b6652666e14fbdea6454743778530ea12d3c51ab51944981d29aa06ebf6e58e493684886be2dd SHA512 6db3892a754a49d9d529859acdacd548a71203eafc29c485b83006650a26f82b6e34969bd5e11d3f259259eae4d71bbdd0992fc7cad78a9a6f102977d057a8ba
 DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST hyper-0.14.15.crate 175489 BLAKE2B 2509f448ce9c101ec1fccfd8946d3800b76591a97252fe393b81f0b7960f4cd1f1fec543045aa431e50b2c1f20a7be06c5464c8f40be6ce6837915750637729a SHA512 0d60aacc2146107de291c53c3cc275066140e54b478db81b6f77e4ac44cfb634dbb4858689d0f0a43c12b9f38c723ceb30f6d8a8912b7eb22ee6af04a6e00283
@@ -297,11 +320,13 @@ DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed8139206896
 DIST integer-encoding-3.0.2.crate 12365 BLAKE2B 21532d3e2f3184649694f82827a7aa9619c7db38d094596f07a54e664e1a279df89310476f2460865c575c376c1251a65850a997446c6c2dab8cb376c80d7a5f SHA512 f00f3e6a51933db262c73fdcc692942e5b4bb6eb97c5a7a5fb40f6b7872750df566932ce76327d7266aa74ee8c602d3f0573aed7d864296905270fb8fb1177cd
 DIST integer-encoding-3.0.3.crate 12224 BLAKE2B abc7d7bccf408cb6bc35b0bd5f32158e78ae15eab716d2f57eb31ee45a18199f07d32725b0bff4e66d1112633966e5241138ca50ffda54d09f99fd180fa58e0d SHA512 b4f3e6cc2b91f749a3f322345bb345dc3859636a0ad3be35fec45dec779b0de954ab88824ca18842a44222bcfcdcff68d19b5eea09abd09cdf36592b7635e0e6
 DIST inventory-0.2.2.crate 13623 BLAKE2B db5e0848b82057b8a2788766380572a276a3745d6e1d8f1ffcccc126472473e3f5b62ff49383990b21ff8dc9f1a58de33d52ed6026bd70856d4bc8dd1df2c949 SHA512 fdf23e0b3ac277c69817181a1c24362276755c25c16f307198a110d2b8d0272cf85f1cb08a92d4e2b1f4430a5b87db4dc21f31ff0b0b7fddeddbc44982e2ec18
+DIST inventory-0.2.3.crate 13590 BLAKE2B 157bc9565c94add7e96449ade77ecd03b2ec58cb73ae39233fea791db2f26072b50eb509a49f25fb505789862977e9c1ae3299fc82126e1b48719e88f5574bea SHA512 25fb89ad1432c3522a5047838b1d3131cd74942dcee17550f05aeede75913f78c7ff23f3654aeceaf8f9d2fc5d97615f302e52184141e74200d9afdc3c133dd3
 DIST io-lifetimes-0.5.3.crate 37540 BLAKE2B af8290e740e0ab7b9b832aa265cb7970dcf27e489b3e3a17bdafdef060e0b48365d855731758abf7e82bcdf8d619440bc423106d364f0ae1a750c594b05cf01e SHA512 8fdb7b785aa9ad9ad256f3d5dd9e258ea6d6f3fa4c0c47326624356467ae137f7bcc64582ba94ab008fe3e0ab4279b4de3c741fe0b1b161d8fe635462f6cd265
 DIST io-lifetimes-0.6.1.crate 37632 BLAKE2B 5e38a460d823b5b63253e7b41bdda2443b7153ee4b5cd7772784dd9d10830208ffcfee5f8bc74662584a805c24d9eb2af9333d65b5b90f01fecd061c7673b4ee SHA512 2e2003e47f5c21c44d45ecb9d371534ca8ae6c1ef6f7d2e2ca2f56f9e3d4f18ebb6fafdbb241495b472dbcfabd5e274167179667b6d9ee2f22c70b0f15c77da3
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
 DIST ipnet-2.3.1.crate 24932 BLAKE2B 26be72376dd7f62d3d01cb9d3287f9aa19e7f52e01f3b47ba8dca1734f959683f17506d4ce071072b8f288e7c494b3daba9054770b9f5f9959e9a450b82a0baf SHA512 db74ad4850e61b20b5280d0637a33a0a1dc2e3388bda38efbbdc221c04dfe04d304d57c3704fa68a824e65e8a3bdea2e743b2d0c2d06b1a8710c192cec1b6100
 DIST ipnet-2.4.0.crate 25186 BLAKE2B 98d53e3585f9a1587aca577391200a5083b8868de48a71d8403de3a6006e6576161b8ca90fe143d327b253458de05cf00865e23ee5754a6c2c51473420ce408e SHA512 8658cf15c500969f58b3515cca0f7d055b6060cc2978121f184d51e2ea7eb876fd36a947b41939a0d9929ce492b377d3502d69507ffe3f08507ca597eee2b689
+DIST ipnet-2.5.0.crate 25808 BLAKE2B 8fbc550daddf083d3d4e90941a807d5f15bf0b95931e2f47db25eb3284f4c7bbab655f2a88682911bc00543c24131aab6c514ed30a2fab8b751975eb5f43ad33 SHA512 40c841c71694d47f77757860c62a1b109bfb2e2d490e9b6d441d39116f7bda57e7be866d25348c1afb522f4b1caa75122fef79dfe9e3fec824345f3cc54376f9
 DIST is_ci-1.1.1.crate 4143 BLAKE2B f594a9c7b58927c8e1c8f53d3bb5ad2e6497ff72980938c9a7a521fea4b891e9eef6897088f3694e4eb5c9ddb090b9c4d01cc185fbf68d018381d3e3629a1008 SHA512 89341da9fe86cf4aa5a107f8dfab21020c581e661ea551e4f2e33e39efa21dc0c2e46b2fef08fbe75d16fb1028118971561b1a4e0c351ab7de6125b7102372b6
 DIST is_debug-1.0.1.crate 1897 BLAKE2B 870200e87f264b1e3b886b9a103853de480ec6d5fb4f7bfe4943f06d445d7c7c5725cdbb230acdc62c8520834c4fbba2145c7589a63443c56a11d7d9d2504ff4 SHA512 08eac6f8ae7eb63a9c90430572c3e76159bce772d78eb892bd93cc53fe05d4706a72fc9408c72daf6f0a0287cc100dc201b1a197de4d7b66ef4e8e42f43ef594
 DIST is_executable-1.0.1.crate 9550 BLAKE2B 64fbfd2805b9e7a2498a59bd1ff924f84a42c5f1061ba59e7d3cd72cbecb394272c3f9af101f838c7a6a636746d8ed3b7f698c5720857675c58127cec9846d81 SHA512 677980983db2c8ed72e87a2f2df3bac328dc6ba6dba6c3e8c4e4eaa7b8fee160ef4e81d105f65ed718fb7263137ffdb21d86b148f614f04fb9e24201417c8a29
@@ -309,6 +334,7 @@ DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-0.4.8.crate 11926 BLAKE2B e5a648b490908d0ffa3a0832342ad11264eb4357939bb39aad014aed3938bb60e82703b7e31929a458525061e9bc40539d33753bdbd722a03b6804e57dd1f70c SHA512 6911d269ff3ed7350e4f0dcfc6e9e0d70e25833e1e7cfcc57d5b8aff1f47b8be4f2e9baf1b92e5517cff63492be489b6d29b48dd9bb642e428acaa431216b68e
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
 DIST joinery-2.1.0.crate 14163 BLAKE2B 0a51050953baabac243f747ba6f4395c52688657567e1ee58ae639a141b069ca75de8fc664f857d058341d0be1f111c7d301e20bb0afd66c1c603387a8fc9347 SHA512 13b510a6f9f3369ffb1b9bd32b2ee1b66d9cfae064e919e40b2308e03df801a6e33c999ed3c37beee2fb8140156655008dde83063515781ec12f78fab997493d
 DIST jpeg-decoder-0.1.22.crate 228366 BLAKE2B 97dee932aae8d7d08ceaf37c9659d52a93be7c964468087aa39377fb2657c64cf8fe20516337cbe5fe0452c3686e9d1b7cd6c0932bf1ca6562358fd4a8cd69be SHA512 3edf415eb11909b7b16755f54c6a5b082200f81e6ce5dede413e41be221c8be5c14035a171fa1c21771c8d11f30cd990f57e6e98e3204e34e3f0e7ca2c3e38b4
@@ -320,25 +346,34 @@ DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST lexical-6.0.1.crate 24183 BLAKE2B e3047bd8b42bf12a0fa8a1b2a3ea5062052754dccad121d3da9519ed75d0601742f6c97a0f8031acad8ed9737dc4a1670e01719c0eb8f1713e326922c7f59a9a SHA512 6f81c9c413dc1d65181c96f227f8d5b6906945759473fc633fb2fee7855b5d1a3619f95bb9ed46e0bdb7c4ade5a7761fe916d77a1dacb2eb1decd9d178a2844e
 DIST lexical-6.1.0.crate 24280 BLAKE2B 4c58649418f1a63489dc582119211f2f634a456ea12eb128dfdef7c6c604f85e9d0f3c639a17d2047ed43d8de503d9eceafb997f1eacf1d9ca91a977198246d5 SHA512 7bbfa2c8578589582a5e1c3c54479e5ab64c0a950c70030b2c411bdaaefcb34150659b5748f5ad077fffc8e25d3a5ed7861c7249e2f0d0cdb682dcc3c4aa09e0
+DIST lexical-6.1.1.crate 24330 BLAKE2B 43c0290110a9210d64c785e8fdd1a63dcbb5eea728e6c4a4cfbfe93d7275557e868d0da50a4cfe904a9538bb10e3b323dafeaf9e19f626d8bac147ff1608b039 SHA512 ded5a010a4fd8bc077fa4962ad2eacd989ecee5d361cc032d516db354649be94fb2f2925aaa5a54e3b6a59ddb03b7c437e0593f4cb6609ca2b08e53d350e9243
 DIST lexical-core-0.8.2.crate 26711 BLAKE2B 114b86589b4aede9437c59706ea45b73e0dfae25e840e697297686624815c424869f94971e03380bcc92db796205a95843c316697f1de62364626efb718a5e3b SHA512 e1f326b4c1b7ba2e6ccbdc6f7bf900c9000dac37365dc0124e24ac72f54f3c118b0c51d3dab13f31065690b3b00fe12d1dbb7b5e994880bd47389eb402810d4f
 DIST lexical-core-0.8.3.crate 26779 BLAKE2B 12df79357a884402284c81c38224caa03813f81f2106fb5a0b9b8413974a2741d9b1d7badf2229e2d741da4459f18c4a0a90c0abdd3ca2d7870807f557d98fb8 SHA512 fd1b49fd0dbd9810fe2183e6ba4048cc7f001bc843a49abc312914f87721a300c508ecc6aab8ad73d1864b9c4f7f663336a8e94e2005d84ce52eb206df4ab20a
+DIST lexical-core-0.8.5.crate 26680 BLAKE2B 71f3cc95f47fa636f68d6d25612a47d4a178e2ffe484aa66760e78fb71e55633c055892647decaac08120d1b8b3b79d80d1a23d46a74d13b5e52d6b912839ea0 SHA512 f98d2b5afd331c6f4f599d24599ed8791ee3628a2fa2b8172b698cfe9a180e1ccd2da4dca4dd33fc76ef3417114c580399106d01a8d6153b45b38bceacee1018
 DIST lexical-parse-float-0.8.2.crate 179658 BLAKE2B 399adb323e47423af34e7c29ad984cba64b2adf6c1ce38c9a7013c214e0896f00d0db3b66d3f90e9405da19e0c1924835a20b18b42038443fe433b7adfb4efa6 SHA512 7f7ca756c1d01a87b2949d2aa039fbbf6bcdb983eb3fc3c6cf60ce0308f6053b3b55f296546344b9de77bcb23fef066c4a92cae84ed15db320066f38cc3753a0
 DIST lexical-parse-float-0.8.3.crate 180161 BLAKE2B fcbfe3accded29d6de0f918dae921f9a6580d52181036450293e3bc8049efbc79ca636385f37bc7b9705fcd287923dbc1a4e1dc9b50560f83d67504b35fd2e5b SHA512 0a96600a0cdbb54081ca90cd5062b61b06cc7ca3d99cf16881f9b57e7595f70b93e6629157b4df8847f9c28bbc4289cbef51adf8b13ba865add1db656b76e13b
+DIST lexical-parse-float-0.8.5.crate 180161 BLAKE2B 881e4db32a21c26a1919fd1373aef1ea16a6fca3d799edb18ff0c9e4a79d481f8ade7a93f9ded2a660ad10cf815eb757f6eec7887945f8203c467e700af7a9a3 SHA512 ef012cbf18f2e306724dd700ac259aaa73b44f6c4531377deb9979c80d31ae66fc1a8b2671bd677e0ebfad8f77e9a5cf25707c67a1c5b1f554953c036cb39d46
 DIST lexical-parse-integer-0.8.0.crate 30131 BLAKE2B c49d74bf73e1a298ca260e23d6cb3aa3b252ef9c4d30c3b363ef347f3c800c12a23862a288cc1010c60508759f962a656baf52b698274b4b46df2fdc906353e3 SHA512 b98acbede491df3e397ca8a7ac796474920dcbbb16daf7a266effe69bf256ad16f1b4c0cf891307c02c7940ed64ef2b5d750faf112d313980757743962b94e36
 DIST lexical-parse-integer-0.8.3.crate 33597 BLAKE2B d81d78919b4fd2be77ccd3621e812af1442054a85795396424c84cf13d4b26c262974f876c78d7bf17c631e652b3493bdeb029a0e650b54fb78e52c5f08b6ff0 SHA512 cea12e0578d296874e3b7d60c7ba6eb712c91f8877f821d03e0adb476eec968761244e9e8e9b5aed1b61822fe5ca54faeeae3163187acff5f95cb475c178d1a8
+DIST lexical-parse-integer-0.8.5.crate 33603 BLAKE2B 9d75cf4fac0ba064ea681993ebdf8e74c6eae52825501ab8bbceeb03294ec87e0823411aaf2fec463a5ee38af8c5a7759cbf307b7fe4458968c796694add2f73 SHA512 921f857cdb2a990926bfc00df8e64983d2bb65483eefb60ad2ed9e7598a442fd51eaceda7b95baa0442095e1b95b7b8236946d0fdbb7641ad35a0ec8808fa0df
 DIST lexical-util-0.8.1.crate 85045 BLAKE2B e7991e90d6a38423f096357c9577d3616382f91ac9f3e6eaa5128e598588312cc41cf1dc50ecda4fe5d7450fecaf3386d4545ae6e9c731ddb17f49eb633ed143 SHA512 e943cee76a4ab022694f65b2ff76ae72c575166ca10b99df20594540a1b5b8affdec4accb4e2434861cb9ad43e5576fe811b99c3d926cbb62ada2dbcc30a82f7
 DIST lexical-util-0.8.3.crate 85091 BLAKE2B 75f6e03a234f2da8ce5d490bc6f68aea8920aaa49109deb26226daa2f1e6fcb0476c04e9c2dea53de55996cb63b63140c0d51d283d180037f9eac96cda9347d2 SHA512 b7b1db4a255bf9b40ac71d52a3198ffe58e46e7593cb66afa5a853e4691e135d93abdeecd776ba4ddba7da78f9102f5e3b444539119529621ab8276633d68c0a
+DIST lexical-util-0.8.5.crate 85152 BLAKE2B 42a968c6f9d20cb4cb10906399d37d6581b425eadb31439fec4a71395819133249c4fb75b1d962100e77ba35b6f6b4cd428d5b5c161b405b22333ee390e671a6 SHA512 449c7f2a22c109cd179937c36e14d91c742e1a837a85fcf4fb58c21f05317511d1281b564d216a34760ae54a0df2d0ff5caf49da4aa9d43a8d87fcec0033cc39
 DIST lexical-write-float-0.8.2.crate 100230 BLAKE2B 27249e8c388448521618963e08172be083fa55b13d7c677361ad3b65edfbe076f0545742573ffe356759506286d590d8c7ff2baa03ba15881bb99941a5438c61 SHA512 1f0100cd0d2450cb2cda6ea8d3d2d0bb792346c7e956753f34bb701fabc6865f4dae9ddce18a6a0e03cc3151a36a3080c053be1020e33c31bfa23d4931f9dedc
 DIST lexical-write-float-0.8.3.crate 100573 BLAKE2B ae2c319c5e3e0996641a716df6dc43ce1721ba8841d84193bb74d06486afd9b9749b47d59f396640a4477d397311c4b6df27777200b9262ec5cb0c7d072667e0 SHA512 c3013e53ab2d7ab15c2844f7d02fa0c879086b8c5ab64e80b07c59c6603a145a72d0dbb25b1abd6d0db41032ebe346cb850749ace721e6b820e240ff715200e1
 DIST lexical-write-float-0.8.4.crate 100173 BLAKE2B b776a52d899ec54f62c1ff274377dfd3798bc51ee4b2a84e2abdc21a49c2af918a73c8b8cdcd8a474374f7f7e38ac1b55fbca09246accd9d18b35b76dfab9e0f SHA512 f77e8e23f03442254f9cccd0c463fd114d65121fcad6faf1dbc3285e53464a279c0814b78e451d199a9d789204ff479d6926ba206e96fd0bb4c4691576a43b5d
+DIST lexical-write-float-0.8.5.crate 100281 BLAKE2B d5885d793ddcb8414fc9cd3085f0a0360b683df093b458f09fa4cf1dd670fbca7d9f86a19eca3082b32c4eb224cc9ab24a526350af0f894907391833888ca56f SHA512 35afe75db2fb4664e335349978fb8376a2b6cad48000e06652a3d3ce0b5fdbc422679821389856729724babc6cfe08ac8a1511c06bb743709787a4a47f956fd4
 DIST lexical-write-integer-0.8.0.crate 52070 BLAKE2B 0140f58da5f5dbb2c99a04ef37268d4346bc7d83aa13030869577b59b22b2bab2603af76af584c95024ededa892f87298053ef027a4a25b93471b9cab352363c SHA512 c7e2ea5e70b7274ee61d921dadd09cfedd21fdb312fa65eef4f87cc3ac79ad912c1e12fd2ff2a53c686f1d7d861a1abc427ba1b2a99663eb34171c60b68e6ea7
 DIST lexical-write-integer-0.8.3.crate 55266 BLAKE2B 8291a0c7633e011c34a9333726d084a2e691848d0d6961ea0aea32b10da0ba13733b87fae113e0e4f93c0598a7efd2678720b7dc4506f7dff287206d6606bfee SHA512 055be9efecba5e45d4c1fc3731f200727277c52d6dec703e2426142eaecf3530445408d479bbc0f6118b8e96ef4d0959f542e6437575b73c87be0f8a0ebe5ca8
+DIST lexical-write-integer-0.8.5.crate 55427 BLAKE2B 54bb11be6c9377518384ad843d90d3bd344edadb889e1049ca8b58e34862e6d2a6730cd772c38859372d1068e110fd67db147c2d4c90bdd9bdb232ced7be4710 SHA512 a749846f8beb9b01ce61473f6ce123afb1b9f6efd91428cfff1fbbdd77422867e6eed4cd04c3ef25cd2d5be59864fa0e213ce296735e4021ac4632634b345838
 DIST libc-0.2.112.crate 571445 BLAKE2B 3936f4fd08cda0ad5be7b1ff417b6dfc9abad14ea5cf647425d8a2e7306275e958fb5cab4de9eeaab95065176bc295065bafec3846ebadb6e15cba20de495280 SHA512 6c1a027eff21d3ef8078ad19b90b06d90790919a848e95a4c878e8c8b850d2e9be3fca36d8db39b24e472f15e5352ead1182d5491a0b382e06f8c3ead379c45f
 DIST libc-0.2.119.crate 575749 BLAKE2B 5fa2bf66a4d642e1380335fde0fd190d5168dca58376379caeb52171a3382e5342c727eb4d92f1e27adde58a24d00352896a73c45309d947f56787a99f2753f8 SHA512 a43f8d1cac7a0d8c1bf6f2125695c03d91243498d2dea19a3a674ccb2c64fd00bac4040c42130a1a096b2148451f62e1292c5c71f424f51f888d6a37c7db0bcd
 DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
 DIST libc-0.2.123.crate 577487 BLAKE2B 57ee1f6ec9e35cb3c48e54a90dc0d9ac0cfccb1e18e0360b5d2a54bfdd9f47f70bead04b02a1419cb1d1ca72ddbaf5cc008f21ddf0d5bd9063dc1c394fc62a58 SHA512 527c89b84d9839a240653fd2e66941f8fdd82f01ed70aa5451073d3480a56e6daf53e3ddc077a9884bfbbbc69510cea672c74c9c818e914d4414cbc7ec0e3f9c
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libgit2-sys-0.12.26+1.3.0.crate 1476836 BLAKE2B 953756b4ed1e6f90d9eabf03dd9f3db50a085ecee4018c6f5e598b2b030e3332a6281f5e033810134356a48b92a4b910fd534813f2111cefc6de3bbf2954e1c8 SHA512 de30865b3d4ab0288e090381e5646e3e8028c341fac93014168fcfa5f166f7fbad9fc4ebd285919247cc6bac178658eb936ea1fdf168068248be07ad34ecc54d
 DIST libgit2-sys-0.13.2+1.4.2.crate 1492799 BLAKE2B 9ac165dff195d4ed18677f9cc9f85e79a219c60c3477880a35340d5bcd0308c7aca4015fa3c213ce56fc20a237c5f1d506ae936335db4eddf06617c6072146ab SHA512 54d7c11d930554dd10b112d878dc7ea473c7d45e74d394e21e99f5d4632741f49aa31746bf2594705d337b5b64e6b877e510938ceb2117837c9a6f685ef8824f
+DIST libgit2-sys-0.13.4+1.4.2.crate 1506315 BLAKE2B 87199812e8dd5475c3c659e11bde4a294951685880e9fc8771b3a075d351d02a1eecb5d4ea039466af6b9d90b5374d3d1369195a442ba60c596669aa2e25af59 SHA512 71e3f4ed8a123109ae1f0cfaad90092bbea25658356e6eaee3135d4576ffcfadd83ada28367459dd70903ddce716bed6278388e294e13712dcbcf8202e884548
 DIST libm-0.2.1.crate 111906 BLAKE2B aedb58515c1f63a1731231cc3415b2269a1dedd8c56e614ec08b9075c80a0edec5480efd984b320c38a256ab97d9590851f8880e846ce7dd03fb5dd7711f798d SHA512 a037ce773e4c4b0a9c20a23a9c04a34bc468753a1ccafb42199ae1793adc100148b77b08533c4bcc0f269d7de421c0657b6ea62f132ae808cc3b998f55e713a9
 DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
 DIST libproc-0.10.0.crate 23128 BLAKE2B 1e0f2150289c81151efd7b6adf2e28d0d37bcd0123f31140fc1f60f3555a2abbc3b2243c23d15663e2336766f1ea273e15d73e90b3980e7de9a99a11396c7629 SHA512 c7931cf0a187b40f7669511ac18bb7fe8a7f20c67055a1ec6031e587ca9d3a25484234314fcfc7cba8d60aa98f9eefec5bae3ecf0e014a03e9814c8a33dd4315
@@ -347,14 +382,17 @@ DIST libsqlite3-sys-0.24.2.crate 4771096 BLAKE2B 0c9d4f13f94995104ca0b205fc880ff
 DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
 DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST libz-sys-1.1.5.crate 1494933 BLAKE2B b53e39d2a1f0db29edde3f03cab97e1970f9903222777e2a5c55b265a5873a0fae3927724d592fe754e04861aa999e0b9b22122ee09f836ece8d7a0fcfe20e3f SHA512 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac
+DIST libz-sys-1.1.6.crate 1508051 BLAKE2B 4cb522640d27d8e2a31050bb5c44a2c4fa0bb01a467f18e1e89e5fdba594b3c14e14ec4c47ed93f09e5374757c3f73e2f2394b6321ad72ef3fba6e35abb02399 SHA512 18fd3800c38444aef381f7b360b9cd46678c560b46e7c5a286989fb9e689f2447e84f29e4ce195c1b8c2a89584eaee838c175821335accd13bd8d4483c3b099e
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
 DIST linux-raw-sys-0.0.42.crate 756837 BLAKE2B c4bcdce9053224d8ffa0cd0f4edae88cddfc35cca0565842d912ab5e8dfa0e14f3ca430d800fc5bd01367606b2af929e40d87f3e5f456d40e3d61b7612c75c4b SHA512 69f3e8894c01b0da58459b06e1d6b2dd73fa927eda1cddb339645cf35202c21e971082620ecb7fc0d6427cf1aa89c1ec859bb6bf2ce76a3cac727c3e4fccae6d
+DIST linux-raw-sys-0.0.46.crate 807633 BLAKE2B 58a63a6ee202e53892d78f2142d6ef98f8bb21109962273689b284cb4d6756e6399010983da813f6f58664d6191b392b70ecd161518e8ca0fb46992bc3d23adf SHA512 b821ab53d9a885b9dfef6eb3d36a422525cf35d797fe32fee3abf9bb5463712af57febf684c9ab41b5de40c9b0e73d9e369599497f7a7f1314ff455795d32b39
 DIST lock_api-0.4.5.crate 25199 BLAKE2B c91adefaa0dc3efa786957794b67cf219f5159909179282c13c7e3b68d73a0acebac29438cfcb39b75cbe87bc181e981ab4ff2776134621d8ea92e7a6aaf966a SHA512 d6cd948a4183a73e8b91b9167d551e72dd75820c76123fb0839f8389c7872d2c46dbcf5785d7600ecc4e27f3d214f476585b9c39e85f70500eb8d012e5ff9535
 DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
+DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lscolors-0.9.0.crate 20899 BLAKE2B 9791326ac62a80bcf221b739677494c8cb0d44acdad12e9e9f02de9a4e6a6331740cd67256496050a7d305576c8531bd12564b5c587770f4ab81b2e498977303 SHA512 eafca6524657ffd16a77d05c7bf4a2e6eb842618767be39c516ad1b14ea181c9dff4d02b78e246194a2088798ebd6e22b1aa6ff1498df7de1f43cb3920a47d7f
 DIST lz4-1.23.2.crate 13190 BLAKE2B bbc8510df4c3351c7b07f739e8a59eeaa21b81b570927214964c94166df9e12ef11f15e8939a96bf9033743f530ed21aff50d6c34d5adee3aa564f8c002f05a6 SHA512 78e4b1a85eb535d7dd55d974b3580ad8982c5a6793836dae7cf7e56699c4e7f1114ee2f74a3d7d290cf9abbc703ae3fb4feb27d994949ab00292433e7c32fe45
 DIST lz4-1.23.3.crate 13265 BLAKE2B bdf3f1e78d68968cdb7edb67e5d19f285d728a112189b77f254c51883c75e37347b664de4a6c5d8ce44ad69b3894dddbf7f39ae8ea9649c210be05d3121cbaf3 SHA512 ce68a7aeeb3dc9d06e1ac52600cfa2766170ae77f2927d2b05d14b3100198b562da1fa0a0189f598b4e4ea36165d938dba9abb9cd853b5f8808f744ae33711b3
@@ -368,6 +406,7 @@ DIST md-5-0.10.1.crate 14184 BLAKE2B c9eb7b25ec8f0d334555e52ca8febfbd08850aa6d87
 DIST md-5-0.9.1.crate 15494 BLAKE2B 25218518792be16223f78ab0bd81284005b4a65defc538fba79dd3dc99c7d80dbc8b8ceeda51dbea4851bf1da86d3f66fb64dcaea86b5486a235c43719a3dc3b SHA512 300723a785c7edad2a9abf18fd9f8f9a40ba54676b394cb5712894d1170cc48199a0ca9ccd3b525f82832d5b33413c2565a0c079b6dd08c63d782f1a91fc3e0b
 DIST md5-0.7.0.crate 6671 BLAKE2B a1c8132cb4d7497ab3f4550e6fffdea6b118ad99a31128c068ea3243b5f76c4b059042da376a0be32fb74e866571348a581c2ca727d6acf855d823ce15f593b5 SHA512 569c992eafe25986a1328666a428b2335ecc5cb7a5ba142c34d7abb1247f6768c0bb3dce790121686d4ebf1b4a1832d65315136552163dfba5f799f99551544a
 DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
+DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memmap2-0.5.0.crate 20760 BLAKE2B 5723352d203e97b8b9e6e898e1e93f2838a820ca4773c430264f6b44887daffd007fcc499931bb21f764d4a402cdf7edaf53e855094c5ca08c6b5dde17da2817 SHA512 cbb1a74f3a8a0671e4e5153633fb0284c7badfc9711569b48ac899c70ea9e2de3cf4b89fb3c959e844b6270206cb8db3f69998d7f09a20cc929ec496106290f0
 DIST memmap2-0.5.3.crate 24967 BLAKE2B 743b61983108eeb82e547b216c71039ad8606d2fe533694415233d73accc14388cfbdaf9048fcf13448abfb4a49ecc3f3c961a8ea8a364a428626fed499eadce SHA512 b570f0ea37ba18a8eb22c9207dc952456864fdabf0296bac63c4741e0aec424ac7932fc0dbbd0292ad94406b1e6911826406fa00d11b7590c54816fb7898df5d
 DIST memoffset-0.6.4.crate 7664 BLAKE2B 098783d0fde7268b16fc5c9f5df005b93daac18092f04d981559b9f0fa310344c6fbbb93d42587ec7107a5c4e8d757508377dadf03471dbd7022f3bdb5b3da4b SHA512 bf8d05b72571ccdef32a93cc4489ab4cb7abd41415d55572d1dfb983053afe3eb2615e968d87a326af90c5702b9959150f985a4186acfd61df9b69a74e99713d
@@ -377,10 +416,12 @@ DIST miette-3.3.0.crate 67266 BLAKE2B 5f2c6892e007c30821654f74ce9454d43353485396
 DIST miette-4.2.1.crate 75535 BLAKE2B 82775759cd1edf6a4a426bfff194764c945a5bdde7ab170a69fbb51e9fc4ede360be8ee58fdbe9fd1ac58b36372c6354a8b48dfb2e84efaf0b14525c0b430398 SHA512 53c0e64b05820e7bae3fe1486767dacf7ae76fe3a4b11ad5897e01f20944394044871c55cc9e09f14154614f5145a812509bcb1053b00e8d5ea0f220f2dec325
 DIST miette-4.4.0.crate 75859 BLAKE2B b11e97318ef9144d7f6c907ccd800cce5b848e7a9c87c0ea528079b9c9686c2a8c572ce412740e482ac3f05fa1e10bfba66b6c57a3db147a2d6acc6ea4ba321f SHA512 0545cec79671ac6dfb1dc158155953a7f49513e843eecd4ea02a10d755eecd351308a9ad25c74c436ca139b3fe732188becc28ae4c45661d5e6e646404466994
 DIST miette-4.5.0.crate 76938 BLAKE2B 64485b87178c9de257a4bfb3acb08b0c2661e8cdc1ecd72d8f05b1b9af117715c07a679881c9a23ce49ab3ded5cf1c401c2a5759072224898e0b4ec3750d4033 SHA512 9f95687e00b25eafeaff9d29299672170d17a643ca304a80fdeade0e40e45a00b995c32d01593080ee9566ff183f572430a29206e469c42a4e6a8b1364834c07
+DIST miette-4.7.1.crate 77764 BLAKE2B a09c1058c5f3a9652a2872eec4364f1bf4cc9cee2b92a507fc6962db4818150e3d96612a18c5ff3ad7bb684b8bf321d346ed308cebbcb234ad7182cb56e0b8a0 SHA512 f1b6d9a53fa0fddaf546fe76feb1bbfe08bcc43754479be6eff3da6d850f424044532d6d6d660d612cb25163734330611241d971c51055133d4f31ad7514f1e8
 DIST miette-derive-3.3.0.crate 14814 BLAKE2B 04a812ecb1b8e88798ddc7000e9cc7cabc31b0d388ebe56a70b11268007e9b19dbe7b97241a484573eb2fed88bdcca27230c036ecf7d4de10efd3befdfc53acf SHA512 325c501de811167de1f41ab718a4af434ab6e92f4753fb96c5baab22abfe64996179973ed8dcb962d9f98aaecc90e1d26677abe47a6e2d33da29232a0f49bf2c
 DIST miette-derive-4.2.1.crate 15482 BLAKE2B dd5c806c352ade92a15036d2c550111c36a1b63b2b806a49e2e86f1945c931abd02607f22f4cc61ce6c016cf7792e9ad6ef5ee0614f30a385fd750d138183c0e SHA512 bed051dbea45b1db7ead871371ef6efc96a31ae5b46d838b3a8572335f77dac0091c3baa7506fbcc112b5aabd290f8b82134225c2e2f818109cf228587f87f31
 DIST miette-derive-4.4.0.crate 15582 BLAKE2B c3e82f1c04ad7d937e57242a676c82c1ac4f650436838f3749d800ad77d61147b7a2e23d2bb55e68315f7e11674edb8b68f574bfded359e572ef38d13103ae27 SHA512 b819584047f8996757f0fc0c74293588274bd6cf27f3c21eff4aa3a23fb3533e16e60543b58c0a51ee9dc173cd3c39bba2761723e3c064ac8fb2dabda29716d4
 DIST miette-derive-4.5.0.crate 15882 BLAKE2B 3b64cc9c4baf5864b11894dcb666c29ad32b343fe1a25f6c1eacde6a28258e72fa39ffd6610d232a5c2b111721061a81f53a187ac977f50932db57b8dd37a7a7 SHA512 6f250c6f019a2418b481f974f2e1223d5204df9b6e407e3c43f38350cdb12a7fc98a1ab15a70371ea746c447c3001a9b9ab5e80ff86d67291900fb652987554f
+DIST miette-derive-4.7.1.crate 16226 BLAKE2B d1eda734a07be8aee8d8ce1aa37a00e736bb0a70e1e98fe07002b74002edb0597ede07e17bcc3f8d1231054eaa1a0007ac60c62ae3cb06d845f7f8d25a0fe910 SHA512 37ee6e4fab6a958baa3906767b6f56447b4a777fb48b4658b3e0ff2bde5e4962ad3541888d06e86963cff7c4fac14339852c06ec076612a8afce21e4003971bf
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
 DIST mime_guess-2.0.3.crate 27437 BLAKE2B 6f9176749241dc9b8c08eea3285ac1aeb40ab079f8184d93c436c00b205ab754d9c2b5c481774837bd1c4522b33338fb7ecabe88ee2da471478cdc1391d9281c SHA512 b08013ce235e66eaf49a88ab4c5cf4d1f1b95846c1bbdc1a73efea9052058860c7dbe2b028fe1b33c713621862fe9af2ed097558cbf5e08903ee406a44af162d
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
@@ -391,6 +432,7 @@ DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e
 DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca541ea927b1ea3c61667beb4f63064a9828cf347ed55678842aab2a608af359b3ec92b595995a6544dc371 SHA512 2349691ea87a086f9bd8df5738705e9d7b59399089948f810b6a7124beffd44dee348703c89b4b1af8d84821dcb932960dc4bd9ec9543558f59a40c4806fbfd9
 DIST mio-0.8.0.crate 82954 BLAKE2B c88da4c6681cfc518707e421251ccca176b12762e8d5d8fe2e71a89746eae94f3b3d1ccba3e7a32ac68928b81718552f6faec267e79a889d858e0c215cd1b2a7 SHA512 b7db8f400c46937302a091a90ef05b501aaaf8cbd9b5d8a4415e140e5ad54fe745ac3248b49a6ab42399d145c01fbbdf0a69defc379caaa67f64e8b7cf160b07
 DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
+DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST mio-extras-2.0.6.crate 16292 BLAKE2B 08b9fc0d594e8ac8a04c70be88e34e390a24d90b9640907ac7900c26bfc1f982502e70c19172d57a0b697ed4701493ebc03ae4959284b74babedb8059e9faf10 SHA512 2d92e5afb34ef4c7d00c78d6ed15d4e786aaa9b57ea6e2743b996b8377389c9ae058a6aa227c5c66c39a2f86a7bb0b22a13c73a3e35c4b7c65b7b01fcf7fa232
 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
@@ -399,12 +441,15 @@ DIST multiversion-0.6.1.crate 13191 BLAKE2B d14aab5f41d26b26db7937c35f798ca91d7b
 DIST multiversion-macros-0.6.1.crate 14449 BLAKE2B 5e7db99a0a8794dd738f1ff6110d3272260b4a151e78b37c5cd46955010b5968fd3fdc2d76ce91ed07afd890982b253684185bc28a42c7c859812f12d030c6f7 SHA512 c56faa88160a692125ecb7d101697902445ddd0668d5351f5d3298b5fe6a50e9eb42a30c9349898560dd20ee9b6896a89559662df31f93abf19b5a5a802690b0
 DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
 DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
+DIST nb-0.1.3.crate 10112 BLAKE2B a5f1a72751bb2e3bed27f6ca18eb7f4060c15b863f34d8a86069e0359656d77c41e6f93e87a90e2e8e2ab23809ebf41d45a53a360f395a6d01bcc88ed3f76df1 SHA512 5369e46eefae33b397c1dec374214e6053e27f0da3cdd2e604deeb442604f1b5238272c8e49e047b0cb2ef2a4f934dbb101cd98c07db27f4b695f80f4dc71132
+DIST nb-1.0.0.crate 11523 BLAKE2B 8fff18e0c7851bd3057344c3ef62aab7e8bb7abca62d497b089c4a058beafc6d114e99df6e3b20986265338712fb4bd4d56cb205605ca37f21bdd18c4c77c0b8 SHA512 ad8a57c32f28a1ca13ed51ebface15f661a5857cc4470d4140b41c417793730007cb2e1d70dfed8df427d90d1434838b7ca36ff4da8d93555b0f2eca65b084f8
 DIST neso-0.5.0.crate 26756 BLAKE2B 582551de4cd65a4899f900041a890e9a0eb928711d65441e2f6e2ca19e4e6c5713289729974e12574ba660df51e25da9b28ffc023475aa374c800a6b2e57bcaa SHA512 9f2da7d982f5b58636a2763727d881238a9558c49fee74e9de51f3d8a5bd9bec152dabe3f1542e852bd0118c508b5864fd16943aba5218da93715e5a6cb5f66b
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nibble_vec-0.1.0.crate 11796 BLAKE2B 2e80648e4e18d17fdd41671acc1e166a8337fe1ec1765e5a7f08c19fbcb23ce43b11d1cb396b867b9a2c0ae58e30225d9b13fa337793d8c32abf99969e7c11af SHA512 21bc50bfa5f11f50b19a20691346f098db083ceb6891faed72fb91d2e911cee060ad4d19ee1c98792c5809cb6ab2bd65061bc051a1dea75d9096060b87497f67
 DIST nix-0.22.2.crate 227371 BLAKE2B 614f863ba54c57e247d26df2c0673270fb2ee19dc729f8b2340139556fae943cf3b0499532d3f42a02dc26f98b62558921568c46a99f2ebc348b37dce0f14b30 SHA512 860c6cfe77117c28ea54fc5587a125e8ab14acec2dcf77f70d3e43ea574f5272ebb05999b266142616bd92aa613f8c2f60b026b95e758975601df9345a2dbf71
 DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
+DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
 DIST nom-1.2.4.crate 68547 BLAKE2B 87ed1c1770772beed7e2b5faf9a63ce4ab506913ee104a7e36bd64a69ebd47b7a7bea2ebfe1cd14a54e87cc671340b6768cdd47de68f163e48253f02283a13ed SHA512 4a1000f56dedfd71b1f91d44c27c07519f81629f5fc24b469d179d59e8b3305c8ae1a418fa60193be1cb4289887af2ad9b9791dcbf1f6e7a5eda36171a314539
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
@@ -459,45 +504,60 @@ DIST num-bigint-0.3.3.crate 89493 BLAKE2B 015b680a0311e0c4fc248e51872bb69999e70c
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4 SHA512 53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
 DIST num-complex-0.4.0.crate 24805 BLAKE2B c9ca4c01f59bea06e68de80aae5fb68362eeadab92f8f2cdf0474d46339b606d4921b80b4ce377771a1c08ea4e38a335e6fe2ddb412dd2842966b824c1252f3d SHA512 ececfb4ecd82acdb038322ffcb431a09c271b33d3f028f90577f585289251c38ba425d67413815442cd5c2daba821ac9b3b45b09122b1ca2cb7d35f45dd9d2d8
+DIST num-complex-0.4.1.crate 25872 BLAKE2B f9d231f791de65dcb84a7ff52a19223e424dc887bdcdeca2820f648d521f275d86fbe5d5ae2e97e08874672674caf59629df64e09e55f09b2b0e469779b1b1b3 SHA512 7d6a5b5d70c0558d7dc305b20dbdccb48351935c73832c8de96b48a7843e9cf55da1a036ddadafc072c43ddcd3f4dcfca38e1660c1e3178d9835310ab6e8d40f
 DIST num-format-0.4.0.crate 59791 BLAKE2B bf3a1016876fa2459fddf4c0d9270b22ab9e1de8997f8db562e79de386b0284a06c54afb0334b6603e7533f3dba9e9d46588fb386ab17df84e459f1f138e2846 SHA512 20f6a02dff0759f5e4cf7aea7e877a6ccb088b81f4c30dcee2b565ee91f8f2d25d9c1c65f5e823f5c7f2d9a36851396865ee1a6ec9264352b8ab3481783dbd4c
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
+DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
 DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
+DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395b29c3e620b74cf4a843cfedfa71dc690e787b291a2b08750cd8386f1dad768e1b506ce088df33cf9e51b90a8e SHA512 97ac20f16d4518c8cbe944e5c80089fa6bb75d4632fb9f3c9d9891aaddb0e0f2209f6e854317f3d3b41bfb330c9d3ed830f3797f0120d4b1863b1d6fa3b9c07b
 DIST num-rational-0.2.4.crate 21694 BLAKE2B 6e8dbb873b1c62046c3fc45eeea0533a8375224fee6537e369a6042a42f98865c010635f3723c8116c32b365f8dd553831efeac4a1fb2bd0cbb169c90d7035cd SHA512 06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93
 DIST num-rational-0.3.2.crate 26359 BLAKE2B 18b58869b55f32396cf3f024f19c1dd1dd7594e0a398f448930c60c338cc5b42f73e92dbca51a71d9017eedab20e6f564504cefc7a21018d1ff029846498e3af SHA512 31141c147ace16505cf63023d399ec7d6824b1cf3a31160419cc8ed8c9e4392993910419ac113b23913f710eff13f730d04328e66328375c61c28010718fb837
 DIST num-rational-0.4.0.crate 26428 BLAKE2B db676676735ca603df8e35707d2068e89245e2a0c9f80b0baf519312622c1611738e8a02f8cc8040f3599ea0777ae2193d177a61aeb9a9f1d56612b9951bbca5 SHA512 96b5fd3d407210e6e81aac72b542be5c5acf0f1132097e4b82a65042fb2bd98591e12e5153b96b38c71f69e613e295542d23dc73a98b08ffd49d9ef2a062eded
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
+DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
 DIST nushell-0.43.0.tar.gz 6296775 BLAKE2B 4160391de455611845339f555e311e94ed92a00c8a72ecdce59053daff34b21158fb592d623a6650a086030217d11689b107ca1c3369a808560161362ee098fc SHA512 6b929c35f02e80b8c1a9b64bd250663d41702629c3857b5cbef8e60a2b9682d9f9728b3afa6a65a632995e8835cbad86899219d28b170a04206b4ea29f51e0c2
 DIST nushell-0.60.0.tar.gz 8214977 BLAKE2B 289353cb6715901bd64123e920fa6db28349c649f70c6ea1ff0747426d7a3d7fb096ffae693617d82a7e6e1eebdef03d1ce5235aab9484417b088fe11bc23600 SHA512 19d8690cc427989e9e7637465ee27a7a85afe0b2e83ec6e6cf6b0a7174d100c8f26a817ff16646d377b75d794f69126daa23a0d33ec065f77e26b5a29fcda4c3
 DIST nushell-0.61.0.tar.gz 8248386 BLAKE2B 9819739062f996598843cca71898b5f19e5ebd39ac22aa17d6451e33dcd9e1521ac1539d53b10e10175fcdb2d7ebdc01fd1d5d0e93c503cca9e4bdcd097c09e4 SHA512 32586811dd404d5905f0c2e401d254424325146a4769499b6da24aea3eb87fd4537fd5760f8d31378aea04e6a1c6c472c646e6cba868dba532561e6bbec07ac7
 DIST nushell-0.62.0.tar.gz 8279594 BLAKE2B ef8e41aa5b7a5b220e853906b264bbfe9bb1db6181bc5fbc4be33ea7c21e48ea195af940961d7dd06f58dc620c46469ba52e460165475b275beef227fdd0ba8d SHA512 f463c7f3bd6d0a8497530140df1fa0a499193415e16feb22c1d087f3263988fe5c3e6a161bb6fb33c6e4d8221bd704043488172361c85a7e68a2a6f2439635eb
+DIST nushell-0.63.1.tar.gz 2286307 BLAKE2B 87eef8908464fc72f8dd9557771c4431a87c194cca6a8d04afd62101cf4f052173cbae3e327f0f737cf5753c0b7128c65beedd94493b71fda56b2f4b1269d9bd SHA512 23be244b6b33ea1977fd690def7ec22e0971bdc1bc7e5d5537a3fc5af7b7ba0324ed7a016f9664f8ebaeaa94fdaa04d2d1053b5733342878095f3b803f2b6d58
 DIST objc-0.2.7.crate 22036 BLAKE2B 14a41a5ed6beb100d68601af12914dfef67a9f580f80d70c4578ad9df98a6b4496bc3a1003dec762a27f0ae71afe2c9e8fd41ad715bdb310722c8fc092563599 SHA512 7178870c8e4e9154b4c7b4953b3164946b7ce72c956a02b9ba18889353c72be735824bd73e44a485e42ad5f97994820d9153ac684629342755a6a63711ab5988
 DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
+DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST onig-6.3.1.crate 30879 BLAKE2B e371f003ee19bdbb9cf9fa0e5f18ef14841cbae40f66bfbb367401c15b1eb50b3661accc0609a43dce41f8272ffad8a4b41f75ea23267ab8c7cdf4556d67a7cd SHA512 5c487063b669532e31acce0788b690c53a8d95eb628cea970dd335bb721fa99e67bb6c531b0a9a388354b7e1a6e1621cc953e029f1791dde43736a577002d955
 DIST onig_sys-69.7.1.crate 631301 BLAKE2B 4c593f3b7a83d32edc92db67d6f2f0460e43bf34611751f8a5941ad3cded459cdd582e9067291d1fa1e2dfc316b276080b99f85f0a98dc9bfcc531af2f289b7e SHA512 5be8c31049ad741fa06247bd22813374f71397481cea22be3d83bed720b512b9cb10d6028072fd92cc09ac0e9ca8fb977ca49fb59d934dd61f84c4634d28ffb3
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST open-1.7.1.crate 6129 BLAKE2B 024657c1e17e73f1aa24921e0b6bcd11b94754cb9032dfb1aafd6e3f58e484d0f5a1b4e504febfc514dd15e947791095465d2090ac4bd7b6dc43cb38b1e63ac3 SHA512 97c064ade1c9e1329aef03cffc6dbf565a7a3c0acf41845236202b0003d4d709b769e22cef0190624c32b5b6e1506964028a4649e4bb79f1ced5ae9f954508b3
 DIST openssl-0.10.38.crate 207436 BLAKE2B e2c999f1f04f7646e765fd0c1b51058136043d84c052812c4fcb0dc3cd3605768a8104d9b3ab9ada3d7d57ac057cc6ee0e7addb6e4f5897cda9236de3402a3ff SHA512 3cdd25b722b036779187a8906c11abefe69ead198204ecb8cd71aab549c910c3992761439336baf82c61dd6eb3258a365fad7eae4e4b7bd1959a979ac6c3faaa
+DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
+DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
+DIST openssl-src-111.20.0+1.1.1o.crate 5102014 BLAKE2B 3328b4c0c5d76c9176ebf31805380b7170a3eb5b0673631c5130bbb11da39b448438645247408aa7f804092a01ca1a682ac244710973bbb327a3920da0dd2722 SHA512 8c937c1f739411ca1ae6de864fc2c41b7342a788f076e8d83f27d9e8c93d9d0e1994f85d0f6d62d288fa42d1773b7c4bdad6b71f69e3595baf39a3017287c70e
 DIST openssl-sys-0.9.71.crate 55893 BLAKE2B 910abc01809da873ef97ca63d00ae91dad8e0c6607f5572460b6a9229baab685555dd5b4e9ba1c5e9a12ba50e47ee3bb6c584491aa3de53b0a55355699e246bd SHA512 d552eb0591f0c2783e0cdb2f4da41aa39dae6dc9d613d1ffa1228bc714b06695400456685ad8445366d4ff87b4511c2c9dc4e579ab8d1fc4f368f46e5d85fdc9
 DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
+DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
 DIST ordered-float-1.1.1.crate 9983 BLAKE2B c6c2f5c33676fc88ca85c5a986b5f547e798dc93f35d6fcf4f3c71feb0c05d40965936c509c269d1b4ecc737bc425f479c78821572e646c96aeab09bc213faaf SHA512 defec68f53e35793f579dedbfba46443df91a78332fb755ab6ab90831e09b02519c88c61f9270e9093f6843a19ebae516fac0a06e1080421eb038bf4944e3f96
 DIST output_vt100-0.1.3.crate 4473 BLAKE2B 8c75dbcd413e1273ddf077f3b57996953d70376be6e438ee1a4de83a8c3c535d4cc866849aed91df74aa9b22d41d428b1142cefe035dab7404ec89af9efaa832 SHA512 ccca3b4c582e860b0643dea78302fbcb96f8f86b356041ae9c685e7c48f1721fd3366dd1bea39afc1bcef03b298d0f6c87918a1ba92a56e6b06bc8b4123c0d89
 DIST overload-0.1.1.crate 24439 BLAKE2B acb2dfa6c6c22ea95cf58079f6ec56a2bb5e297a055ce717d40633b789b0d005be2bfd6616448cac61bd032e74aa6eed212f1677461907cea2f7f7cf536c157f SHA512 f79bc3321f45df5e3d0e5fa9c4e60524e4e28dd3729a09956766738adcf99ca42c187a01d48701ebe23d39aee00a19d4a07da798edc781b942e866b339613532
 DIST owo-colors-3.2.0.crate 26928 BLAKE2B 7a415f1acc6adbfcfed53613de62e4e927fe3c09274130d2e1d192cc9890e5d3f1352cfc2614608ac7604a3b575eb927908312f1d0fcc32346adf798b65090e4 SHA512 bac9c5f653447d98a9c324c217b47d40e9df4990593f17a973ae8cf998290cf1ec078221b9608ae548a1ed9c8d2e88feba765a60e118ced946dc48ef6c9edcb1
 DIST owo-colors-3.3.0.crate 27287 BLAKE2B 7b557c7bf358797bf259d520f6bde27b9fc1322e5dcea2934e4c71c89e549509f295aee9c8704f32bb6375fc70311a1dbd887426c8a6dca3cfaa4116e35e9359 SHA512 177b23fe7c665da52b489f274d013b3d52cf126af6cf185cd842658ac3dbf1bcbe9a9b341870e3f7ad978270fb78cb302f7e7a28e83be84105e76b6d357234fe
+DIST owo-colors-3.4.0.crate 30305 BLAKE2B 5e8605592f91e081ffa883b8373d0dbcb4651ab2284e9507bf55ed97860e472916cc1f9bab7edf5198c08935df253d858b9662cc19908325929626bd7e9de6ba SHA512 7c8720a6f142f9f728f98e3a7415b980b4fda7ce3c225e07569b3c9547bd7109c2cbf68659813bdd58a4b7063cd422b2476f8cb485bb2348e37fb705a009d199
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
 DIST parking_lot_core-0.9.1.crate 32234 BLAKE2B d9f829350c9b17d9fb68c4efc2112fecf0e4b7b8b5e4b5efeee694c68759ae6a59b7678c00b63118c8a464c22ae970acae4928982aae70c75f06e7b381729265 SHA512 c084dc175c3d91ab19b897d0bafb736a9c2ae89242ac4e2ed87e6f73ae61862c641fa29fe6beec27602686f36a52bf5eff7a3c2138a4a8edbcaf1338e62d4df2
 DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
+DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST parquet-format-async-temp-0.2.0.crate 57798 BLAKE2B 3f58fe07a0053728c9419b1663fb3c2c721727918fbea4507e2f97ca1ae044b35c29c00d57188251ac799709f29657a4d7267a2b97f0f135bff18e5da35110f2 SHA512 7747f58fa298f9e1846d399d29c5edb654596140e28cc6d1355c46e2a72f0d3097e1ca8dcc917a71d80787002a666fe24d1a7cb176a8f8e353843acadb7c00e6
+DIST parquet-format-async-temp-0.3.0.crate 57911 BLAKE2B bb52764553c5f78a46d21d4dd542415189f3d61cc64f73293c017560117ad37001389edc04252a306e7d8ff09b65bd861bf262f785797e87253a8f9315762648 SHA512 0077cb041989fd71f095ea31759352f0f67a1ab68d57106fa1eebace6cb3ce8f4762716ab22291fe22c2eb92702ab75ac4fb383a7d0d500aa3f37c1c4c9b11fa
 DIST parquet2-0.10.3.crate 376141 BLAKE2B 857946c0fe9f9f86b1520ffcb1134144d256792064b044300077d2e4abd0b6101ca7686ad66710f3282e5f9731fbd0c21493f8886cec4908bed44e30865bd4b5 SHA512 554971ae85ebcd62143962b6c0e88dc4bf31de72c83c972f87aa97e44f314a74beb8231a4929ec6fa517d17be2f1f2719b9393695d8aabfbfbb08930efb9a6ee
+DIST parquet2-0.12.1.crate 414558 BLAKE2B 4e1c3eb11aa38546ca59e84fb7d4e74bcead9625457925d5c3322295a2336fd923f79cb0dd14e14be0f5e498b5ca640293d6e4d82152f51d7144717af6c0650d SHA512 43de985626abbb12cfd41d8df869ad96078db3caee0487d5ce244a531cc9009ea595b7ee308f8bf9d1771d8fe9eef0d87da21a0a7bd5d7d2e6caa01319ceda76
 DIST parquet2-0.6.0.crate 371327 BLAKE2B 24b40f879640dd52bd723aecce30dfd9c3175d95be7028e574840d6dfc80345514a4f8462534f8b9c575a102b8955ac71e0002e0d1b1385d45b7ca9c6f280eea SHA512 983069877528cfbf1239745c2d3154c80a848ab086854e9eabb616301da083f55f2f99797a4ac469f483536ac5f990c57ee33f532af6451e664d508388a6a68b
 DIST parse-zoneinfo-0.3.0.crate 76590 BLAKE2B 441e96b120e9bb4f666ace28f2999974e3bc6786a8b834b07601b4a13506505a93d2647e446f1871bb072b8a1d1c2075de259319c7c1699244dc4e0b89392017 SHA512 e87eb0feca1feda438bb44d92268779053feec9b0823a336ffc593f508fb6e918add1023d4abcb23fa334efe8a07ab41143f5fe841b4f62ac000feb23c6d840e
 DIST path_abs-0.5.1.crate 31072 BLAKE2B 5f7041fc98db906183a42523ff6ed3ae23c1a8119c61860f71dc3b496845a9a0cd172151ba21c2cbb9933b0e2fa3e08ddf467700f4d2aef934d101e090b50fb9 SHA512 fd382fb0233b4029b9c6208b0b574c619cba8c3e6b6ffe39f63ff9e1cfd55240acd061d1aa82180987d72c8499802171f074eb35b9b0c60bc11cb48e248ee0ca
@@ -516,6 +576,7 @@ DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b1
 DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
 DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
+DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.22.crate 16145 BLAKE2B 346b67a2000eb91ea8867e5a861c87a7728909d6b20dd00c9b4571d89e5308a108906fc80fe3a2d014fff0411d9bb30fcde224abf8f4aaf37164107861083bdc SHA512 435b9d99a1975692db3efb3bd0e92899c43ba4003aecc4859dc71cd2175521973d5cbe1be06fc3b40af2a7bbe1b0a845be73586c0cd96dc218bc4fc7dce11107
 DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
@@ -525,17 +586,26 @@ DIST plist-1.3.1.crate 44772 BLAKE2B 2e2b869b4543d06830b54a873d6d5da572502ff0409
 DIST png-0.16.8.crate 52598 BLAKE2B 03f706591182a89b0566f8a793163372a4db3e7a742f3aadf06fda93068c42a4351722796ddbbb013fdc1be5a88dc02debae50ab1cc3ac81d72d07a814b456ce SHA512 df96f8580d8cc11df54788ff64ab3269b14369a467d7c29964a5b19add5e7a82258e6bfda40eedf135bffa98a2a86afbb725cd085cf37f6c433abf9a7485edee
 DIST polars-0.17.0.crate 16837 BLAKE2B 213259a94d12ca5e6955b51f28f854f558261981284915270d865b55f23479be09cd71350888fbef6be364df94317f5fb08d526e9ccabf43dd829d2273cca6c4 SHA512 a04397a7d0cc30d06062d3a3cdd6d1ce246fb1819fd4eebcf160e2b30908db938734eff17dd6fa99634f3b255cd5ad266632d8df690bb9dd8e4606bad408bbfd
 DIST polars-0.20.0.crate 28498 BLAKE2B b57abbfc906c6c95140b43b0fd0530fa50e9b863c0cd381282ee4ad186cd758cfdaad61a0ea363ac02049fa64bc320330f7b646d7b7a0bd39ccab43c22732b78 SHA512 a0ad1ea1bc01aa5220476c5e2b5d81796b376ce4c62666209bdba9416371524b3f1d103364792c404996661a24f9a3ae3580c038c1b1a54dc96730fdca795d0d
+DIST polars-0.21.1.crate 33610 BLAKE2B a491003dcb64f608bcb3ba229b9ac601158ae7648c26a7be5cf437e0071a77b5002a9a37b56b8b9f048dfa5b3d8d2c86e767c7f5b05547a4a1cbf8eda1f01d63 SHA512 13702f47032beca839c1589a1fdc1ecae4728ac9ebe0f652da4168e92247bde8b7124ea66f316d2503d929aba8658db3f324edd2b6bfebc92b13afd922a8dcbe
 DIST polars-arrow-0.17.0.crate 14341 BLAKE2B 74804f21e6ffa5d06869c2f5fa4989343cafc948e02d259925dc789f19055a20ef6814e82320444893d7c23f1acc1228376c1f96a09ed42348f985f9a30dd82b SHA512 11ee2b594f8d95c860daade0f1daf1af531cec074bc15879a530c45a19c758236f9acd1dc70909647e400239aa54e8c9451c899adf472a1f6923e7369352b8e1
 DIST polars-arrow-0.20.0.crate 21478 BLAKE2B a85d85108f67f21fa8cf661247861aef0c44fd5f7e1f28381572a220a13c81345a3aebf713e2935688a59fc77f1db864ddbf66e94018d393acef4c77cfaf6f67 SHA512 946e60acccc44d12845bb05e9b8fe66f67498b2492693798ebc12ea5017ea0053411b1f9d0b04d30b60e0ebd57997a9d95b2f4eb6ce42cfaf3ac2c72a6eab4b4
+DIST polars-arrow-0.21.1.crate 22916 BLAKE2B 7daf0efdf7bd0d063373ecbf206c68480f0a102c97d4518fd0b574f45ed1f1db1762a83f25b12f0df5fb55575b312f6f5f205a6fa92d749db8ab38d6b574e5d5 SHA512 dd94f908006947a506883a6b0ba06513c4b6597441ab3fddd708177fc10159a238458c3d421a6455063dfc8a11093cbf182cd996ec8075234b64080124c12a6d
 DIST polars-core-0.17.0.crate 217417 BLAKE2B 5218c2f25879fdfbc1d437d0ad93136c9e5bb958c69962ba1d382fa696ef16f3850ca1f8808adb4660d06209483c03c65f81ae60f1e3431f243c56c75cf71376 SHA512 a9e250514ff8f470fc7f988847bf3e1b6748afaf0bf9753df5f988c12ced038270d2bfc19c9e013d5ce6f59b232f0f563b4938a6305ad3243ef33e50d1e292c8
 DIST polars-core-0.20.0.crate 279493 BLAKE2B 090046acacc26286cb880d3f35ebf918c2ff3d160ef84dbb1c22347386ed275cf6a885bfdc0364b96b07975fb0634f3b859a1c86a03705adb6d603b5cb7c6166 SHA512 1abbf09d8955e6c4bbc9e4e07a89157739b0000536b403e9451b59707f720df46d2f0cfa86103f4b046562f25be21a5989feac3479e9c057282a96d4a04ddf05
+DIST polars-core-0.21.1.crate 276720 BLAKE2B 435ead1423d762e9c2fec54d1485a788fae53c7ec074eaf568195379ab8244000725b027b8e41b38dab4bb54ab99b4a692c1f8a6e42dfe9b03c19ad6eb626b52 SHA512 8f2e11d129731fc27416f865d94824a188c2b213671ff9ad6384304863f3a394cca4d9eef8af55595825bb50f85eb925b0f53a44b0255a98c2ca561b816e2258
 DIST polars-io-0.17.0.crate 32549 BLAKE2B 2481534139499a60c33fdec489d183ed0dc3c73d60b3c4ebd3d0193708fedc49184936efd8d4c821db618e3dbd52106331c0ab2b01348b3bce403abc760884d2 SHA512 8cbbcec8dcc82d0902e2a0d92e71325ec5e66a5b6038ab5231dc92285b3e852cafa46dace5b057a7b15a4d2caf95d6644c1b20b034579dbd0381d56f9d76f099
 DIST polars-io-0.20.0.crate 36919 BLAKE2B 03144b992d65a23c1bed9261abb80ff7b819d2f6b4b85ac6c037478712a112d2b0caf85ae9b88b3269f650944d1a4e4e8eee4e79819d818b171846d7ce130512 SHA512 aa3e4c046a5f4970d7f82a1068f2a642c2541a2d1c58f61582417031c67ee047578c7c9b01391a7f51efec5a8f46244f8986648f164e0e2b2643fc1d25d53967
+DIST polars-io-0.21.1.crate 38647 BLAKE2B 1e9496cb05643093432dc7b3ee1463e6939aeefb3e80315f4c1515f858bdb561d258a22183928b6aa4328f0db831a848e1dd2dee691372ddec578d0f4c22cf65 SHA512 96c376e2505a3203e358eb8cef5eb3c3b4adff7cb6986990288008df6298c74d1ee75d0680c8f64808ec7a915be46996c0a885a1a4600eaf249903cd8b614752
 DIST polars-lazy-0.17.0.crate 105965 BLAKE2B 04536e584bedba0a96649a32e75192512a53596771a2c3a5c4ae8424c00e54db4ee3c7965e3f07b94900fd0821dc455b6eb100378c5b2e423920749e4e63b1e0 SHA512 be01c7af99ed27796650f21e3de5ec88e62e7387500950c1d39bd760bab546e2f94678db98e13ed09b5df8fd5a75e6367503171c5dc0db0befd67ed62dd9a3f4
 DIST polars-lazy-0.20.0.crate 145873 BLAKE2B 0ec033645b4b98a57669693df6371756cce8edf72e32afefe2f74fae1bf3ec3bede2b1ada0f189cbcc142bdffe055a6b2b65c64fbc9032959530d3b1c17e8126 SHA512 c561fa966d67f93cacaf1f669f55f534cdd315a3a0782dce780b06a5e6a733fd11b2705d79b9d63c1e7bd905d0ac1d09e47a86751ae24afa51a1c93f9a233d10
+DIST polars-lazy-0.21.1.crate 151041 BLAKE2B 20f446bfef76a0e8ba1367f23bd92a31e008ec17326607e1fa6c80d918ec2d25eeed263da6737b1eabbb262d57f9dfd2e001dae1a6f6469bc540005d69db2d28 SHA512 abe3bd00067ef9de2bf5662ed2b0750087a1ba0e35b0167495d1bc251da4adf144600c16a0ebe6b1dc5e7cfdf752e1615ae4493ee3f3bbf7580e08f90ed72a3b
+DIST polars-ops-0.21.1.crate 3955 BLAKE2B 993647f151d8824a1cba65eac537a0a8f16c0f6672b762e355294b7d2511edbe8b2122fa3ce7b63c85ce5b28ddf4ce5b52524c7a7f0379c8ba2e4ae9bdecf119 SHA512 78be89175ce0b82f638bba303b2afd88ecba8b661b99de274690eede689c09d30bd934d98811c5ee11b8a6e825f30c5cd9c5e0fdef4e01d345c4e740abb87999
 DIST polars-time-0.20.0.crate 14750 BLAKE2B d7c05b547dc22524ad8dd819d1e39c708ad1a3205a5af675c5054054f971056d65b8edbe11b74366b5f63e078b8247c5336fd2991e80aa8e39b2029f8604e6ec SHA512 fcd72b64e047ae8e4ad634d7ac06343ea2c5a69c5a581681ea62d3bb0be0b60281c2e7bdeed28b9744f4f7b3ec15475cc3d5de58875ac1f5fe73c06b90370188
+DIST polars-time-0.21.1.crate 24614 BLAKE2B dc7352e03ec2838886d7d4ccc45fc4b5505e4c9b55b99f42a09a0dede327b7c2c63c1a99411b0b4686eebbcab5ab06a0df59e45dbca70927345c788d9a50c765 SHA512 82443e424248c8a3243cc04e424acec407276eeb7bb1f762b7d56e5eded5b1c23682a75f249c7bb1bf9b9e0fd072ed40205ef4aaa46892acadba869bd050dcb0
 DIST polars-utils-0.20.0.crate 2990 BLAKE2B 7b346e334db560e02da212aab83174d9537a3b2e8a41c2d6aa842fc25a720d0b8b046f4fb1cc1b8e509b17a882ada4008ccf181c58550c37324a474ac49b9365 SHA512 589755deb3544cc72b015b413d912453fd8f4386bc6d5e53effb6d8d7d60926df37732eef3cd797e72598ceac62f674c38650609aa5465d8cedc1ad03beeac48
+DIST polars-utils-0.21.1.crate 3173 BLAKE2B a7b2ff00d39bf5fc412e6a0ceb5dfe56a15f7e5cd619f076865bc70e780bca3850b4bb90a56a0824c5f8819045345d0d2d4b272c9f373d503ee583ed4ce8efa9 SHA512 802bc2accfd15740b046d4569f440a480eaf1bf03b90e7c26569809df731127e805a5f01adcd9aaaa37967b163c3b1b625b020b5b039568814ff1e99e73d50b0
 DIST pori-0.0.0.crate 4839 BLAKE2B 5889cd5b51dae18b5159637bd95ad205aa5fa3e40dd1542a4bdd90a0b3bbd5584f6c019b9b22f2fbe3cb30d87725fcc3cc09962fa8a76ded464937b5a5e06ba8 SHA512 6fbc9e74fde5229f57a91ca48799cc0de8febb47a5c636ed54ddb64c71d793518692a664ace776f9407004809e69c11fe2f5fa68aa98332885febb715b34a5a3
+DIST powierza-coefficient-1.0.0.crate 4297 BLAKE2B 06850f714973bd90a7124e63309244ba942c8a6ce388b30e326c73018b395b4c65853417cd439a05b39997f36d5348eb2a644e9874924f12d5d91c752b7a97ab SHA512 47a274ed16d09d5524ee09526c895edeb5b6ca2eb84971567d45d0f9826e698b6f777922479e7c2c905185d7ae7835cd02e47f5e1a81dccddca17f5643ab0d00
 DIST ppv-lite86-0.2.15.crate 22002 BLAKE2B 3f967f112ba799f18a3f897c944ea656994abdc7c912868023de90d3885a87d9544159c44b6aeeffd83c1fe0172e326bed4044c2d199ca899da4f8420629736c SHA512 6dac73153d244cca97ea00e429f783a7d03b48f10ee450cf6f8d77581010b28be5048f53322b0c888b425b5085f440b6ea90599ea00c55c641de6e29da42f0b3
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19bc9b8c844156c831d2b550692c7e2e36bce44ecf18dd9f2d0f0511346eaf0d2a0ebe792fc288ca0e94a93933f2051846 SHA512 a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05
@@ -553,6 +623,7 @@ DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffc
 DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf
 DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.37.crate 41378 BLAKE2B 330ba71c59bb7a6718fe650fc10a37bc690fb0ba4871c198bded83d13a12cdd7b1334a2e2c8fa7a48104b26625c1b07d65b0ecf91f9c2f13b8e898e80baae286 SHA512 cedb3433c6dfff39b404f8939c67e98303bb89a47e2cfb9659eeda1ca3e3d167800dca482374501632ab6d2283105dbd7560a157b48a351b2d3da059f946be55
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST procfs-0.12.0.crate 103531 BLAKE2B e31fc6cb5f8866345fad9adbea6e0cec90938ea653ff0093abb3e76e023c22d6a0cbaebb0295460539794eb3c276a73f204c078ef1d0c9b1e6182179dc3eb234 SHA512 48bdd24c0514dd9a4a16be492085d9b6be41b81333b5dfc99cf0f04e337a532dee5d50b4317ae450f396924364f00b01fcd3b63e655ad50e53eb222f29a90499
 DIST ptree-0.4.0.crate 84829 BLAKE2B f54dbf3de98372873e6f969073487069a8e1205e6a267d280e26d73ab034017c5efc89bdef0bc812fdb70990355c41d84fe5549183957831437b4eac09bfb806 SHA512 23205b431f49e745852356f79d65fe2e54d416b880bb44155ad4e5d1148136233844a91771a2c614b35656fb14e32506fc987667b5baee1e933207fa36649d07
 DIST pwd-1.3.1.crate 4779 BLAKE2B f6fbd4268b88e444e6d6033bf135b24e61425de720d3ceb4fc60828d304a3771ad5402a98e19ad0fa2dc53b54bb972cf50896995eb3ada7ed134ea7982739bef SHA512 4c5f55fe470f04a7b0c2f33941b90eff015674a0a257f24fb12a83553c99d1f4b8ff6974b0020bb934059c8043cca0c2376af8f089db72e98cf9a5d3221a7e79
@@ -585,8 +656,10 @@ DIST rand_xoshiro-0.4.0.crate 17029 BLAKE2B efee418e99b15aba76385a4320da667554ef
 DIST rawkey-0.1.3.crate 4340 BLAKE2B 684a25ebb326a3e8cc2ec3baab594a5ba323e6933b51e331449a3da1f123de2a0489c0a2b64816782178fd5db8ef354b3dc6f242fe82fc8b5344eefb3a80dd15 SHA512 1823f1312a3c4c375f4c24b3c5db47e37ad5f692e7bfef9a134b80d2c91c883d95e1d56a92722f081534db27696454cf20691af575e4540ae2339f7c07099322
 DIST rayon-1.5.1.crate 160424 BLAKE2B 1c31c8e3290f76d02347271cb020e50e8f915b7a064f133a196c12e07ae1551c0e7c31883a31ec419a05198d6c71f0057be1b8ddb21f451db9ba40da511a0e1a SHA512 a68e65aae7040a6f6b0cc33b53b4c22929c15504ed4fdf54f5eb5fcaeab137c220b00c716aed96246b6a762c4f1e8be920356231d6c4a0b3e01132b9ab96ffc9
 DIST rayon-1.5.2.crate 165456 BLAKE2B 0a08064df966422d32f582f44570504bb405c59f35f20fcd792f4aa980b62fbd8797e8e01f01a9c3ec4f87eb3a1557f485a16ca2191749759beb31f4d704f082 SHA512 3c11bd89692af7e245be2c0b26d96e864a6353eb901706fe6394e3ff8bba13a829609d2a086aa69fbf716ca4286a1977123a950080d673814edf6bd55d29d459
+DIST rayon-1.5.3.crate 167246 BLAKE2B bb312c9879fea3cedecb70bff78616eb7fc761e2201d5576d86074f4926dee6266ff6f917cc97a63b6e6daffc33f5d693a5c73daa49724643b93f3b9ac77d8dd SHA512 47909226951c4d6b774880dd308e2633b1582e41e7730ac8af902895578e6f29a9b1bc47debbd9618c5a45f317b4f264480392c8982aa33576deeb9d5f8ffb82
 DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7de576b826a9c28603dc44f1b5de46d277b791a741413c85facb4f4a552bfd55989a190f6f5ea3df4bbd32042f66 SHA512 c24c34dc488171ce476df145e8c6953d35fea93412805f6c411ba8b8e9dbbd733610b291203ee91bd265b766b78e14ba15a7b587e8f0ae8bde53f60e0644ef78
 DIST rayon-core-1.9.2.crate 65221 BLAKE2B 44b1bcf748e0bf19e7341c032eed6ea348f284ff9f834af628baa2484d3b468d6c8c31ed0309e226def441ee7a94e2ad0b9a2adf107493bef1ae27882d93a7ed SHA512 83c17e71e3da636d97ad77b64d988bfaa78addfd0c512f0fc09b1755614dab2a35532a4dcb126fa15da4e62461e59f5683b922a1fb4a5381a629992617d0383f
+DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28ba4d98e95d7ae964c32f13967b4ca160d219b53394985ff4557a11a6ab3c242333e2a6d3790801bdffef3f9153 SHA512 4b852f083766e7e414132840cc8dfef148e15db47967eeedc2ddbff9a4372521c296dd4f66e0b6990f49a8ce88ebed9d44e7ad674df42f96b99b24469b1852a5
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST readkey-0.1.7.crate 3040 BLAKE2B 59245cba892a05d2393070dd17590d22d405592e6e6c55f53d28cf0236fa83451386680379aecd459a500528799e020163d729d77d5c396a764821c56956ef1f SHA512 37aaca7d348f54e6b58e54059adfe18caf2e3215660cc6692a6cf6f84832a8b5a3b99935ccb8a4c234440a02199fcf045ed436d1a26e2094be67b5aaf45b5eab
 DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
@@ -599,15 +672,20 @@ DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366dd
 DIST reedline-0.3.0.crate 75199 BLAKE2B d8b181c78a5b2f5035396415c3dfadf23ddcd1f269d7e176ca28bffd46c66ef21da1c7fab1f071dacf5760c946a4ff23ba01aa84d8e122633a2042b1db9fcbf1 SHA512 534813924fac3144c2f8a3865233a727cc0c7c44060125ccee4b9d71b62590519b7df77ff1f1fefc6acdc04d31208ee784c93dd7107e91db9edca1b218a4de70
 DIST reedline-0.4.0.crate 81239 BLAKE2B d8843aa021b2605198b783422ba09f8ba825d8df55a14ca485b844f02d873153b57292d38dbe646226b122b6ed2445e731a877de91d0c6658c403d1a62659b45 SHA512 86da3a3fe34384241419ef1065167d2e3cc53fbd76749169a2b03b6932476a89ec0cc605b6e905e44b69b7cb076ddb7807f0548a6aabafbbc30fb3f516cfd595
 DIST reedline-0.5.0.crate 83592 BLAKE2B a152768924a4292b8e3673b241bc44088c26efd6e137f2ce0efb07e3e54d0ac79fa989990d7c154764f113eec37e7024fced33c26791de756a7ae7f57da28879 SHA512 3cfb8f2c8e73969a053482f64bbcad96e671dcc86814d5fedac96f91d97365fbf4bf1bcd846b1b075aea424e02a287849608053711bef43853044ce6f316e98e
+DIST reedline-0.6.0.crate 86764 BLAKE2B 49c1723f77641972df7218f7774bec086ebcd262c514901bbe2cee9dfef761dba5c94ad9e2e34c43332661d4a0d0dbb4a359608cf45d775b5158a8666bdb7327 SHA512 afbf230d77905e7f98cb9c12982bbb43a6273974f1ee6d3a6cf5630352eae050c0f6d624f32bc014a5657b14a0fedba92617339daf2f5cf5fe1684da78884c04
 DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST reqwest-0.11.10.crate 140434 BLAKE2B 820a449f4ac844b3c2f402966e1693ec493bdc0f7a73b69c243879018d983d5393c7d2cc91713efeccc1177696a7b47b40d62c9096b7802492efe968ef5e52e8 SHA512 17727bd585b244c65ec5857899e2cddab7a4284cd17f8fe0066f203bc2f57a2aedc33bf734e02d06a059983e1eecf7c689f2b0a40b7ffd0225302b7ef72a8daa
 DIST reqwest-0.11.7.crate 139871 BLAKE2B 6120cf1c7419d373a6efe6f4b12714ca5eeb06b27c561c4d4420825ed4f839effb934aed0cce0f6361ed135662e1cea02944cb0d727d2102206a149d964ac38c SHA512 fee86d3ebc2d954e24faec1e7f42514395b106fbca689e5e5f3a9f9689e8f0024a5bc602095483353fba9b4c50b5e85a9141b59e1fd189bd8badc0ce2a31d0b2
 DIST reqwest-0.11.9.crate 139175 BLAKE2B 7975a4d81f1e3e8785afafbdd2f6af6e148514f79e358e7ac9823d7f7fce8c76003cf1c3582458b2dc120a6943140a36239e3eddcb97f3465d4efd3b8a171b88 SHA512 32ded6af5b775650de573cf0e3ca1b315b65d5c2710eec2499674c6c4500802d0f4aa7b6ba7a02123b65902e79b990ffed62bb561347c57c02c54637b91afa3a
 DIST result-1.0.0.crate 4156 BLAKE2B eddbbd153eb243b2801443d8f074c40e352694b3d369c3d868ee9cd53697cad983b0fa9575fb04ebc9e566aba0ff8c3fc5312b2c18aa6655fcfdf46fb8045885 SHA512 75354aca4a29fe544d2284039a22cfca3e386923477175984d589c90e828117a9d953631d57794f7070243eab3d8ba3c6c72c35e3147413fff29b04928dc67ef
+DIST riscv-0.7.0.crate 149655 BLAKE2B 312a344665116dd719d9b0ac37eb31dba2211e463084438d16e52c20b73fe01b8abfe4d300d84d67e6036434f3abb0d2979a2c042573fc5e027e0d47e78478ea SHA512 2d7632ce04742bd852d8a0159eb3bdcd000f23595726bfed2e9f91da5cb2b0d251613338164950fc9cf1c547de33d1a07744a3c5729ed2d4328002648f6e43a9
+DIST riscv-target-0.1.2.crate 7729 BLAKE2B 56425882a7538a1a6b1a4880268cda0e9246fd420ec4d60f181588e6a128cfc1d372da8e000f67ef192653848453f6fd1619df15349ff2f522d0ce58c70d76af SHA512 0ef77e4882fdbff20bc1c47d744f8d7f2d91c3c04f3519fe218d645a1df6074e08dcac643359d338adf1e7d351f30b61e820e58444eb0a81988ed2b91e74297e
 DIST roxmltree-0.14.1.crate 39163 BLAKE2B 9ae8ff27da1cbdbb48400a40ecb4435d687bae16596fba037588320750f70e90a7d5f4c5b59f6bd91251dc42c6ac655933a6480ac1f7eb33511d3c2bb03a681b SHA512 6ddf07cf54604d5e5feff2ba9c4ba3aeddb3e43f9630e7a66bd01cae7f96255eb678a9d3b7d408bf6677bbbf8243c30c057fb5634e6cef99b445d0022834a6f7
 DIST rstest-0.10.0.crate 887979 BLAKE2B 87bf456dc4d95b94fc1c2a12cc322fe845d4280b009699fcd1523488733a7b5729f3c3444a97a8ef66746e69504be559480a748a8f2719a1e149780ff7c1431b SHA512 0026f4ac37c47f182e59ee8a037df9910d408c2366d639ec06adbd774ac75835e0fd475bfc90b8720b0675054a14ea90ed8e1bd5f3d3c481898f6da7a33f98f1
 DIST rstest-0.12.0.crate 919939 BLAKE2B 4af2a7b379448393134bd759e46be9effb32d8c8a4b8d0360d85146df6ac60de84a84686d4131ac78de5be85a30ded224c0c15fbb55e7f54c546de4898bf7595 SHA512 de633d8dfcae3f20b6ade6b503331f15fdda40d01c470ad9baedcd6837b034d620ef668d1893ad8413a1402570f203769f3bfdd931e2bfd53fc1e8133cd55750
@@ -624,20 +702,24 @@ DIST rust-embed-utils-7.2.0.crate 3034 BLAKE2B 0109362f2a96ff5da6126ba4cea1c06a5
 DIST rust_decimal-0.10.2.crate 37608 BLAKE2B 2f2dcd3fc9eae6a648d0b091e7af6e92bc6383acc2166b0bd4ee4c3d62237c8a54ae8d85899d7a8eafc73417696ae61c72c35a7fac40eb0a4d44c88b20f5980a SHA512 419e3da442b35041caad93a9328d884262851a72c914282d261252f577bf8662a9d19f3957b62f4e684ac8a854c69e4b4ba95a9a6bce7471053f4a0877882fda
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustc_version-0.3.3.crate 12119 BLAKE2B a8cfe3dcbaf436b74e9798ee1296ea7aa372cfa26788b7a84c9ce7ab3de5c5e00c6962e4310aed9bef8584e3c30298bf1bec1ac23c3b70c6aea32394359712e8 SHA512 37732b3b28eca41de205db34479c75b31af4ddd811f0f1606933eb31e25e5ed3966a41a8b7d338be20fcf47540629824c41a267436c185a98f8acfdce608b5cf
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustix-0.33.4.crate 263693 BLAKE2B d958f084215327104787939383a7b1f8e7a26ba74076de77a70b05c8688289c0cea00ce3e40220329095b609cd99c7ad1d8ac675fff1e863190f3ebff31b063b SHA512 e34b3a37ab944787f1118d3e9afe2562812863d64fc3dafabeac788f85700c2ba7c7bc66fd13e597d3a7501f32bc813b957cc655bc01ddd986153bd90537fe35
 DIST rustix-0.34.1.crate 264362 BLAKE2B 9f4b3bb21df6190fc54a20792d24705709c5cfcaac4a7df48167047168a17b338c908b38ef5af1327e00eff52e792b32d79fb142a3ebf6fa12563a45e12bd919 SHA512 7f879363bb38a323ae56c94da5dcb354c8fa25095b479bceb5a709a0dd1db875627ce7b2d24488fc5609c2179765ca2583303ea78889deb00acb044f984420bc
 DIST rustix-0.34.3.crate 274220 BLAKE2B 9537c09bc8fbb3fb0e667c98534cd9041fcce6390d981e81b72b72c41892d09fd67016062e076f8a62063e8939fec1e7fa75b7476373b9ebabd5982e646411f6 SHA512 364d3acbe247ef2546e41af1802a1d692a47e366c5b80b131dd5f749e349fc7b8c13345278f506f52ba8bacf6dbb921f03c14a5030d736642d9b009054499b28
+DIST rustix-0.34.7.crate 281795 BLAKE2B 3168a912f947cb039f8de7017598c998b0e12df8e00e23d70d48f71d9de1d18257bc926ebdc9b4a6c90942d6c2e021a28776f764cce29748a52d50dae815efab SHA512 85aee75de0c66cca94f7ec8d45d35430401af5b3af9a82446731ac1977be640e8478ae4cab0b61c35f29171ee76ad7ef1efcc4cdede5899d5ac6fb1fbfb57579
 DIST rustversion-1.0.5.crate 16984 BLAKE2B 314d4a7b78a91fe6a0f35d850ef7a4dda72859fec7f603307154d2b25722ef6be71d5986991b4958009ba066d3078a53131691b0d375677985b9e351876dcd15 SHA512 43f3ed12e007e0a7bf0ecbe44edec5ff092c88973903ad8032b12d678d98d8827a9e51040fa157b0d5b07d26a5b6cd314b410553fec46689b3a31b392c24770a
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
 DIST rustyline-9.0.0.crate 98953 BLAKE2B ed5a6c8ac956c77b0455da528c359c100749391ee01e3947ee97f19317d161737ca6dcef1640d6e2c7a66fd6bdcb8599317c57520ec7f9b296c0499552696c78 SHA512 ebef22645dd28eff265f2ba79203ca4cffdc3ea0ac4475c3dc1770cf6f60da6e3d2b0d0f5822cb7ee85445d0fe6a3d3783aa1d96f9fb04acff7322dea3e93577
+DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST ryu-1.0.6.crate 50032 BLAKE2B 13e805124f80de0d8175fe8b315b20b06f0ef188049e835843b91ffb90322bbfa54ddd0fe1617af851e8f5b59c1f076252b705394ed3408b5fb577059a46273f SHA512 175da99ee31a942800eb33ab5addcdf89b2bba95b6289be1560746d030acda547a5bc3e8cba714c252230a93bcd991b9593a7c94421222833bf089694ccf1655
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST s3handler-0.7.5.crate 33310 BLAKE2B 3f557ac44638d6d22eeea61ee4f54fa36609b8c4a38976ca54cc2cb3299bc238407ffcce319ff621b4eb2b30fef0cbcfdb3997612df3b9f3e75bf49154d042fd SHA512 69ae9177aefb410647db5722d2d88171515c6197c13aa72c97046585b9819058be5756be79aaa252736eb6cb635c08be71439497ff0e28ab4502270f46776c80
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST scraper-0.12.0.crate 18308 BLAKE2B dfdf36cda943556c42b7fd7767c6596e16baff65f3d84bc054b63d0f82807fc08e766bb4432671465a719ef3cdad887e18e83dfde2756cb4d956ac2ec72f0a14 SHA512 90347acbd2cc63d2604b94afee6b21d57f1104c1a8cb9b396b99744e44bf702ba67c166be5a4a80734432a76d991cc846c0fdfa81550e3bf7d0103bae2ddb617
 DIST security-framework-2.3.1.crate 61581 BLAKE2B cd6baf84a2d93261050e6f4d292fa32b9c1a9f4b397e209f03277dfa9186e031fd641091406f65acad1046a57bc34b66d95f2021456c7dc6321292087b776728 SHA512 732a575f36d1bccefa71ad051e07b636e683a53fc4e78517cf6c7a60cc819492e8a430893b592cffd5383f6cdbdee496722cd5fe274cc7726d668ed1a8d36238
@@ -646,24 +728,32 @@ DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
 DIST selectors-0.22.0.crate 44199 BLAKE2B f749e0e53476b695b4937bc0cbf1add4f3f7d4c64f59f71cd0095d87a20bb13c69b6a5271ff7951f9a67934ced5ca0d3fda684c99727ab90b637c0af170e012e SHA512 af2f4ba87c7a52291bc7f5276c4ebcc7689724d95972ac8d162e0f4007a6f0a47ee1aa6095b3b80441924f990b2d147bc4e3e65a7dec164d95742977ca792b04
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
 DIST semver-1.0.4.crate 29375 BLAKE2B 534a89125c4483fc99c44f7b104870be1471d478ba4f709819ae700767f4d6d0bdc98955897e33566651cbecadb4d4dc223204e4504ba4820c2d3919ef4fa775 SHA512 82ef2b4a3533360de1c645dba02b57a2670fdc51709a07be4a63b94055335225764d42d70f9617ed3aeb4c4de121da24e73b0e2c5c781501e9ee32dff756ebd9
 DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
 DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
+DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
 DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
+DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
 DIST serde_bytes-0.11.5.crate 11067 BLAKE2B eeb75e1346aeb8b49458cce8c71437809b346550c2c543ef89b30bf7b14af071876002581728122621ab71aa4e7c4897edf55e96eefd8da3e2802c17be0fa81f SHA512 f2941fa96c777732dec9fa9c2b0e59571984b89a14b868aa4817805e32525cf3818d6aab943120cfd9d6e3fb6d91ca92bd7418dd6c9ace8fc235d8999c42ecff
 DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
+DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
 DIST serde_ini-0.2.0.crate 10691 BLAKE2B 40497c532b7c215cb5fe50635d7a3798dc6fcd02ad8ec842aae2a822ef6c55e4d736ec676a10ce71c1a3c72a6fad43d0b2e8e1f3c1cfb2f4fbc4177faceea238 SHA512 f1889fffb743b97da434633ad7af4d24ef9e22005bcdb5051e00802ddcd2be92567050123be2059a6986ae65bfca4090dc2b157d87c26ebc67c4ff785db8b347
 DIST serde_json-1.0.72.crate 115888 BLAKE2B 0770707160014ef19f54ab6acb6bf8cad8ae65ab47c184912aa534b927c0743e66273e93c7e3190102428bc71914ab4648bfe0c2cae9416afe6ea1d7da217996 SHA512 e48129cb5c36b4999751302fcee811b80f2113780c12e122b13d9fc7a31af7452183ff89de1793994edfdcae61a80db37aa492250a0d69e9180659418a10063b
 DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
+DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
 DIST serde_test-1.0.130.crate 19234 BLAKE2B d9c8e86b660693232978670b9d18ee3d829daa3249bd1d99bff1f51f6bf42483be8b9f9b77aeff3c68bc209cf29338e8ae74100c8b7f974accc3917a1e6c9637 SHA512 d6537464bee6760f674941cb3ba34ee804b641db1a5495c01d29e29380b8ecd14e9fa799356b3bef371e16c19092047c8d348884496e784195c323f9f4559910
 DIST serde_test-1.0.136.crate 19796 BLAKE2B 17f1b20127f198a6a2b3a2598c62726d5c01ed30ded872e51068e6d8e21a133dfdf5e9b4e0930927ebbaeedb40faba6c2de5658b3d8c2f218cc5b95a9b9339ca SHA512 fffdfc426000328aa05794b0d89e70261748c27942139b064dcae404f83be2a2c2609a472493a3f0782165576334d8f5e8673b1198506963e7eaa991e850773c
+DIST serde_test-1.0.137.crate 19864 BLAKE2B 377df62aed99eb85863b34900c249e0924c2ea615c3cec5b330ec174c11268bf8cced84f2dc3d3fb25ee2a01f10119092db0278c8fd42c98a6fbe3c794246da3 SHA512 511a67f8847827688f1c8e0085365298d0a1a147bf5c1981163c09bb6621b1e99c861dac8c9eeb379f0c78c745ee3523595d011d80f057b099fac0b6e3b509f3
 DIST serde_urlencoded-0.7.0.crate 12489 BLAKE2B ef64d92d79b80521ffe90f18534d0a0f20834e692c708e3126d3486b1585aa228e3140be81984256f0adc71c764d5c2bb66b755b9475eebefcff67c952d42372 SHA512 2e49d1113a863a45235e4c5df3de1221398091c33b9eb5a806ea496902090f82d6dcf4f478f897ea54eea44f553fc20aeb2c1c124b81806b0704dd33d5650a13
 DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60
 DIST serde_yaml-0.8.21.crate 42603 BLAKE2B 4556a2cb4f81a1cc3ce7487caed863eb6403c966f38d505fef6ddad0586813612b0b1d5d6c32ddfb3a7d8dab8a870bf4d2bd6b06321e28165ee0b14293ec2203 SHA512 82e5a6663392b2a3e049f735b88b35023bb9255167b0e396c2cc5982b014ad2e6804433d15ffd19fe2ffd6e423a6e04e9a32b4b3d2b012adaa1f4f44996a81ea
 DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
+DIST serde_yaml-0.8.24.crate 42102 BLAKE2B cf389f5438636ba60eb2525113f785859d4124efc23604a015ba52363a5c784d4ec552e46f5231e53d703042c96ac7902863902f96db121dc58391c16b979b8e SHA512 f32d3138a7879b6ec9329c48e691cd2d8e152058220402788309dbe830d90e37bcdf9d3538d79b845547b2135706b3060ff40a943d357f9d3b6dec478af400c9
 DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
 DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
@@ -677,6 +767,7 @@ DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
+DIST signal-hook-0.3.14.crate 49446 BLAKE2B 927363305748118e235fc4add923678cce406d6c5041cced17bf2a0602cf5a912d31143a4479672eb12ef86bcb682f54bef8489407aa1c1067542da295fc788f SHA512 32ecf012e46b94d3a87f2e56cd4c03a97886013309a4e52ef3e7769ed14b49ae2814bb6346cfc9766525dcf15db4182d260d3c9311134e3e6f5301c58729442a
 DIST signal-hook-mio-0.2.1.crate 8893 BLAKE2B d3dad6a9bdaa52c3a45b9839608fed8e79f44916a07ea36e342a7a29d2ff81c0c1928fbd8628130203f00d2562bdf7e191277d6ba2c3bc51f94edc15da455809 SHA512 ca95684574e2934e138fcc2bdd023960cb4207095916650710e76b6fa32f8bfbfc8c5119d3bc92e31a55a2edd6e63b47a2119ff31cef5ba63719b9bec0b438e8
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
@@ -696,6 +787,7 @@ DIST snap-1.0.5.crate 33022 BLAKE2B 0ce3c4379f4ab122e7785c23b42d463c657cee3179d2
 DIST socket2-0.4.2.crate 41721 BLAKE2B 453dd4071889bb0f27b8f99cc00230214a51c6855832401e85fefcc66cb6e4599d22fb64e50c805622d438271e80b7c90c349396721a49aca60c927fa9c2d4d8 SHA512 af4641d98737bbc4d14e82d91791af4705f9dbbec4d8b3a25e7e990a5c7ac25b48eea6c4a743b09db52a037c67a7b676147087688f4e29d6541dd1ad7ff9688b
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
 DIST spin-0.9.2.crate 28755 BLAKE2B 0ae0cc2fa0bd2ea93ab4041fdc76e9a80fae804f855b2d8d0b7167c105ae4697f3c4e9150c4ce1f2c6c2af0c3ef76202d7f3281d1dd12e3c0033bf282a0b75f4 SHA512 f6d112567df533063b1571e140929505f5c519479ac27fc8c1d02e3fe36176af86d12db15dcf1ff9376b251a20d4e991ea57d6cbe8533c62810c9f67d7471fd7
+DIST spin-0.9.3.crate 29427 BLAKE2B ca6043c590ab002b0c252c9218290e34c2cedc5012052afe3e0392922919c866c7de400cc268ecef455708d6dbbddd1e12b7432233a2f0af7086b8c0388eb390 SHA512 2779ff3a94865e4b7cdfe8f0c22c7460095bfb2c4dcaac3f879e740799a2e6835d8acaeb6b70db4351209ba33d20c7c1dc2ec203e33844c619d3c54ee462bf70
 DIST sqlparser-0.16.0.crate 74073 BLAKE2B 468850d1ba7110a1426de3faa787a12182308e6cd3e858a8ccb2177b9d75677f5e26c3177321a5cf0387341bb6367e5c96a52ecaa73e60dbd244b53bc6736571 SHA512 b38642e7f1c1cc0ca9c3283235d5641a2c326841d59c24936619806c9311cf5d740bdb314bb8622acce97502f0015bbf64bd52d484ced4003d9b41a25ca941ca
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
@@ -726,6 +818,7 @@ DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf04
 DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
 DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
 DIST syn-1.0.91.crate 235996 BLAKE2B b7b555b2dbfc837417ed69c358338819500f1e8ba11c2183a4d216efe2c2d7eddd165415516d50ffb5413b97452f186263e13299b01bccd6ad6e405f6d2a3f4f SHA512 28fe28a9d4e9ab3610850c1704be6f384e9fff191b1a5e11f9766bdada81a3e7426cbc776bbd63ea6710320c7416a622506d4a8d607d978af506d381658d4bff
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
 DIST syntect-4.6.0.crate 750938 BLAKE2B 9c53e142093f6d9fb703f4fe3f56db15c0bb7eba92cba9f31e567e9de2bcb129b7b415cbaf692c1e1021b12184bb3b064ed1996654581aab3d5f09e992c0eb5d SHA512 9e320afaf4c2adf41dd7e20c5d95e3063fe8d2774d8deec7e0df3debab050e96a1a5c85d1732c661ee4022dc5bf1abfed2982f13269689b527f35efb2c82beba
 DIST sys-info-0.9.1.crate 20589 BLAKE2B fb3c43a1368c9206393b28064b38a1560aeb863b9b0bc89c9bf6ccc344a46a590296df3596f421218d78c26ae90d3f869ef0457c8c34e8e8dcb9bbd92fee0450 SHA512 52e23efd5bba1ce07d7fffb8c2d6864a8056b1e8ce1b85c4d2d4b37b9d57dfa5a6c0eae9e2018e07af47469c3f7812ccbd27351cbd6c95a7b788ec87cd544b2e
@@ -733,6 +826,7 @@ DIST sys-locale-0.1.0.crate 12311 BLAKE2B 6a95e54753905c6676682e85bd029a560fa0d0
 DIST sys-locale-0.2.0.crate 12452 BLAKE2B ff0214595195d47a5de274ee344c44a7d458c76ca1a5bc7fac4b996676b9aaf5735da055660147c62848e8198d43fd18c7e721011598a49016428728d655c326 SHA512 f3b7fad804090511e55d16fed6415894ce5e76a68196d2e7920a7567a00f0108127c2eb91e7a2fd992e2ae63516b39a4b3ae71f80226c4c60db7c32797e15886
 DIST sysinfo-0.23.0.crate 118866 BLAKE2B efb09381becc0e13ec993d79635ba58252915e8044dcc28179b692f99bd96326a87368f98d34d670a4dbda2717567b165ef86f5cdeb9cfe8fd65eee6f382bc14 SHA512 e5dc81ab1d0cf37797a3c50da99ccd21b2e1f28ca8cd76fb1f4983ec16bd231fead8ba99a00b6ccf25e5b2f871a07116b6ba37c3c98ad8e3bcd3ab88ead7a002
 DIST sysinfo-0.23.10.crate 119501 BLAKE2B 38cec91f5a2db211e93196af6f94b3ff60be3b02d135f10433ed0d733ebe5159c4e491d8a02df91794972b758ec00609053318e75964f760dd202437e83ab8f0 SHA512 153a58298d27d9e3a0b03776402af1d9a23c1ba141078020bd3150018dcd7d9eca2a6fc43c006f4543bdb5372b0bb241e274b7aa423ef5e490f48fb3d482aaf5
+DIST sysinfo-0.23.13.crate 119069 BLAKE2B fe85ec69c96000991f9870ef3e25a833b50ab413c658346d39a9980ea8ee15ec001403ef0e6f4489b9dded05e1ff13ad3a046d314f9eab3d29bfc0b78ede7aa8 SHA512 9aab3bccb6dab2a2b82dc0abe23924d0993c67c06b8c2748fff61825f78c4e783f821d7f0a4b1bb8ac82f816e3542caf20f59868e5122b03086b958ed68e6cb6
 DIST sysinfo-0.23.5.crate 119230 BLAKE2B 27c714d37ca235658f1edb31c06f063eacb8b8d8dc25fb6e4a2f5ac91120ddcee09fa498a40b07aa47926afa16e0cac0ba783957ac48a7eaebe6a23c6bb863b9 SHA512 824ec3e0f8c531484500b1caf979ab6da11e9dc5d0c26e322d826859575d518b7e0df53d6c4700b1d3c75ba0cd0469207c7203c7d378383d1e95a1c7319e1c10
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
@@ -749,20 +843,25 @@ DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3
 DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
 DIST thin-slice-0.1.1.crate 4484 BLAKE2B 7efcd3c30dd24c22641139288b0c530ffe56dd82f26c2c31f557f1fa09ced695cf12b645fa6bc4c12324af0b9b05792a9cff422b6deee3bbb06b57a7cec06f47 SHA512 27b9e6b2a8485b3f89f659d80d67ccb96370f3371996e39f97784c40bdd7fef5429fb96f48d9c045eec5906051708f169fe4ca8f5f546a25e5f6859cafa42925
 DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
+DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
 DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
+DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
 DIST time-0.1.44.crate 28885 BLAKE2B 5e2ca11af9da0847239a086330d0cd00fcb5b63862f9dfec46f72a065bb35ec2236a21ee1c56bf65e3117105e7815cafe67e3725b8575373e875dfcea401d967 SHA512 736a38637be0193a06fa35d42b4873b04a0a35d84cd2af85b7f653a1b67b95078577134bb187b777730e73cce67f437b45ff5c72b8e3f1f8e2ed3420ea0324cf
 DIST time-0.3.5.crate 72732 BLAKE2B 7e7e90cdaca05f60e79b0858826fc59ea6a6e3113051c0a2cb7e0b7e7963e6c410595c8c524a97281f754008f5ad3090c7cb2a5098b00b922c0e898441f02171 SHA512 751afd33abf9879b7bc524b50c63ca4722aa39d5bef3ddb371ec4d6efc9acbee9033c5813ec7d31e5e627e3c7fcd491ad4e7016130b7b09f931023e2bf395574
 DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
+DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST titlecase-1.1.0.crate 7466 BLAKE2B f93bc7c751a6db351c60e045b1ea9293e91d06dee31be1bcaa4e89fc2a97f15a0f34f49fe3d2c812893837aedf7892b67e7fd1a55979bcec8d15fa6477522201 SHA512 04656c48b22934f40e90c5e2538ded9a71cbc034b9ba25fa711533716a77db43f11ea7a10f8599bc2ceb16944a71c10472037a38db9fc5d35bdfc2badad0b72a
 DIST tokio-1.14.0.crate 534070 BLAKE2B 5e15babc9a2ff9c74e71174bcaee4f34fc88038983a870aba7cb4beffa79eb5ac1a4bd54718971cf193bd85f2664c274395090105b4ae74f86e81c23aceee9fa SHA512 b9961d0be60b0ff6d5b11dc74b69ae8406e748201de74d3789d1c8b2c996d8db6359a7089123ef24c5b1a1e86f3e282b6e031a5b99a73b6ee9e8b24a6fa1c7fc
 DIST tokio-1.17.0.crate 562425 BLAKE2B 988f9b8f4710c37be84b883646dd88807a1aedcaa62b9d8bb5fe1007fae8b994765535492f51a0369e033e1c7ae417c194c559f1444a2fb9fd91ff456a183143 SHA512 7024d06c718261f5a992e1e5fc09e85ccd59009a462ce8d2707214f5117c991f70d823995b19ab453d2863b3a469f8228a3bdbf2ed51f25728061ecd706fe0c1
+DIST tokio-1.18.2.crate 572381 BLAKE2B be787bec9f8249a3a741440fe3f8086257f410c66c5d0fbfad3b415bdce77497dd9163f0fb690ac664496cbe2a2503d559b044e83998569a6541d1dc791f8969 SHA512 4fcadd729aa38eebc4a3e69cee10236a0867423035715a80595f43bfb21d0687fe6aa49752820d05f7885019e65cf78ca2bc34d01b248e6c067a7b781b4c636a
 DIST tokio-io-0.1.13.crate 33665 BLAKE2B 4e9c6bda0d391ae685dfc89cc0137fc44b31a4a788f730ab632b73d92ab55dad871d68b03ae0899cba9f96e402f88a60d4b8be5d484947b8982a39e473e5b8ae SHA512 608341311f4bda9617634a2623033900bde1d6b9fc89ae52131838f033bdbdf8704114193d8409ea0e10bd53d6f7ab63d47e17b7abb41d3f8865ab36fd0532ef
 DIST tokio-macros-1.6.0.crate 9225 BLAKE2B 0fd8eead025eb5789d57af750414ddcbc05597a5e06ab953611201db3b34ef4bbfe182c25463f63b9012e5c4916c4dd239679934c2f7cfd6114fa7780104c4c2 SHA512 f39958e210300341d1fcc2cc5f44f0a41d493727e9b50216d4cadc574cff46a7d29999a72dc1a39b29c85cb3044fcb941847198d1ac6557e7aaed10be829931a
 DIST tokio-native-tls-0.3.0.crate 20759 BLAKE2B 5073c5d93f5fa08170ffc76e21404b67100df5d944daa9cfe73420d4cb2409ca2617a0b1c25058a8b356b51fc4815972692aed7baa47ee3a11574a3109ce1691 SHA512 a8aa7586f15a3347ba9152497db84a098e751797c06df1a75d9b108689e14d6692b4efc6e5b49b5bf8f8fdb3bfc4f1157f56b3b0c9d9e753a8b31a61e65dfc4d
 DIST tokio-util-0.6.9.crate 76480 BLAKE2B a16fec47a50cef0ada375715c391cfe8239a92a89dbe174ec0afa20281ae28dbbe6fb62029a678765d885aa8dd7613138666be5fb00c660756237bede980b82a SHA512 95b1bf648106c73bc9a3e63cf438a5fca2969cd9425dcb54aa31f5471a6d68cfd9fd99da0b8c86a3b268e618be77f3957d7c88fa072c970dababa4d8965f916a
 DIST tokio-util-0.7.1.crate 87364 BLAKE2B 8c6b5efb9a5a693330867710458cc1dad797ae951105a0882f73662634879300412f4e097aef22bd2ed43214487589a21fbdada95458fce9ccd0b6100b2218a6 SHA512 738e206a107d721dbbaa6cebbf24153af317338416a7fee632e3a895f7702df9538629d2016cb0e7cd28338e7e38e9d6ac5e289dedce2d0230f3d852b4814f20
+DIST tokio-util-0.7.2.crate 82006 BLAKE2B 374b8f9865f63395ac6cc75d24ce6130932c1887b134401f6ce0ab03b3a42fcd51d7b0b041bbcdb9997cbffae288a2835e445c4219eb45912d6b94debfd3373b SHA512 c67c0ef7fa90a07503f932c2d11e27077570681abf6ad82773e0408c2f7751feda4208dcf86ea1ceef721591541a25328ba1b38a34653f4196433f2314549d87
 DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
@@ -770,11 +869,13 @@ DIST tracing-0.1.29.crate 72444 BLAKE2B 637f52a1890ee8b2ce20eabb8491b100de680088
 DIST tracing-0.1.32.crate 77985 BLAKE2B bc48fa82223ed423ab46269de0d78c1a20d463054e8b1d54605bebd3ae18551f64284c16b2daba9d891b94c6b33d099e89ce880e03be8f5c7c54fd05b2635138 SHA512 9633647e7545817c685054bf9fa6decad2e9b42c35367221cc60fc95fff83446c9c624f96c32e2fc5d2e7e2a543a26d5e341d4ad2399c5066d5d84bd53f9dc83
 DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
 DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
+DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
 DIST tracing-core-0.1.21.crate 50683 BLAKE2B dc48e0fd6586b8ac0059469a26049c6746b44a06a4e7768d129822bbd2f6ce719c63964ee3e4f9543ce278566efda8fd957c8b4be8b696ef12724f899b2830dc SHA512 2c3e00674c02023ee3e9a114878ad8941253a9489312082b2cf9a163b04fb8d23767f00892874645f59f30b6f620dfb83dab8680c64db5510208678b52f2db9c
 DIST tracing-core-0.1.23.crate 53204 BLAKE2B d11cf54f0572e4b9521ca948853bbd3df3c3a6421912d30c253e331a74e0356ae75db67f062be6e944e638110e14bd31103fd65502948604bbaf3b2492cf8a79 SHA512 c01d58dd814d0d9d71a631284c6e8fd5881e8728d79d3715f246530d474900f3b0d396b88f9358f3521e5b171ad577003ae5dd3994d66fa3e016970f6df5184f
 DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
 DIST trash-2.0.2.crate 30119 BLAKE2B 2fb224e0984d327bbee5a318e4007489d232a189a04712676c0dd184ce74e145e2dcad5840cdce5c047f1e03d2e0adbb74cc4cb1928650a471434714155e57d5 SHA512 88d512a7caa8b9163908bc2dc9240134b642d1b7a94ad15715ce391f250c8b14d2df4010c7c3213af219b433185e20bfdfef2545ae030053901faa6a1926f1bc
 DIST trash-2.0.4.crate 39037 BLAKE2B 47eb1ab1bd15c640c0bb7e49bc0098cce8760e4bf6753c603f072cf01710cdf5d6a87480bf4133be45fff68ad0c551a7238c0a7643c60cf16075f049abc1f718 SHA512 17746b98f43045ff105d38a049e6d60a878b25686e6ecb3cc22c9b1ca876ec608e1fa7f0b4af9df68635b71ea00d0cac5d07606662c9bd2b6295ddc2c4972b61
+DIST trash-2.1.4.crate 39394 BLAKE2B 78b495ad2ca0d78426c32fcaf8d9b5f62e94e4180f1e88b589f02df5dcd19f9d261fc46d1b59313a0584df24aab9449ab0b20be5319cfbd79d2e54a7bc653d20 SHA512 cc69f576b998b621e206a55abc475757318504b659c8bbf11a882f219d01561fdb9c50be694002922fdaa28de5679bfbcb10fe593edc2a15ce5efebb67310c1a
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST tui-0.15.0.crate 139975 BLAKE2B 889ea1a56c797e862cd2af85dc6d3f85e253b02d40fe5ea29008b2083f63c5d078dc614401d98461d7c9daa3367283c3a91274a023a3f220361ee6cd73b06277 SHA512 2df5234f369d0ebb9724d63399a8c88a26dff878e7b618bd7697cc1e60a61098119c7f8845ed469486156c25998d8211d93fab8d9b5c10292cb637604adfd3b6
 DIST typed-arena-1.7.0.crate 9927 BLAKE2B ff8fd0f87e69634d53b87b070499d3d119d9f153e0f06e27afbd3f96da6918136a83162f4e9374061ddd215845f75844251e3fb079d57266ea8502cf321eaf9e SHA512 506a90a11576e5a4135b46c5c4705db461a8ec1bba980c9ea65e8c4399bcc85898b7f81312acf4bc0b24a29d1b940d8dfe0352ad59985153743948616da5ed8e
@@ -785,15 +886,20 @@ DIST typetag-impl-0.1.8.crate 8875 BLAKE2B 2c85466f2b057b2bc388770faf59c36de8a13
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST umask-1.0.0.crate 4380 BLAKE2B 3e1adf758039cf60d27d62417bdfd6b6fccc5fc4c2db483c81698e83d2689a7a6c89a9c45e68a8808d50f2481b0bdcb1a224d18eaed7ad9aafaecb5c2f199a1d SHA512 096b11f02ba12e0bc112481920d600d3e782ad296f6a287c4d2a36d78e35f0b4d38d13d32d73ccc58830711521f27e3d22f204d1e4474596973dc8fd8ef3c4b4
 DIST umask-1.0.1.crate 4359 BLAKE2B ea20021b4fb2f384b9928c5c95f6ce1e8874128719aabaa0cc72d8e2d330bb80ead8438f0ef838e12e22449e8ab4b58d2a7064a2cc133437ae501ccfc39b45a9 SHA512 30eab4d1eee571b4f8210740dc7f1f24c17e564e359254ce9f078eb1e6164005c9ca3407d748ae379d3e90b8f40deae5e7d81055f4a6e513d62330347a6422ef
+DIST umask-2.0.0.crate 5496 BLAKE2B 7d89830b80eb72af1c10f6ab7ddd5623790b6476e9a39d05189457b8e3cb7355a9e335fe77e7a1cd3e39e8335fd16bdaf7d5e6403992b8804b6e83bcb8f6805c SHA512 819fc76df67f58bed7e8508405484c703e1961f04d9c37eefea0657957f1944f068972f209df506c7426bd5135956182517c8cc105a8206af2c8a89bb6faa1a3
 DIST uncased-0.9.6.crate 10413 BLAKE2B 67c9c7da6c706e6e51831453b5c8140568efd046588ec4d972bbf895c191da95ed8d7e5ebd65f6b1ce83544bcaed4dd4f631c002daf7495e2b47eb1a7e8df254 SHA512 8d0f29b60cf800afc92d08fc4d4b92f5ca80c6ad4f38c64c2cff88b959cdb7e59952eda1200c65eae1c379e3e3d55b946a8588c393e60938a776538492af9989
+DIST uncased-0.9.7.crate 10525 BLAKE2B 9672ab9d97e170e4439c8e1ab57039482e2f761b6495bcd082c8416a6d41599b425a0d3c08eb0354bd9d42da8963c20374a42160e8000c0fc4ead4332dec7260 SHA512 8df20e140570253cef0bc0144dfd3674d26a555faf00435baf1bbc86e9badc46fcab944fff1aa502854f269f9d5d4a0573155386bf49ff24488a33e060e77e21
 DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188
 DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
+DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-segmentation-1.8.0.crate 94011 BLAKE2B 33440cedd5b51bd6075c9c75541bb8dcc16037b1c937ca72962f6c46be71a30850ab8e8a144d8b7548e5a91c78d551e7bbab5f26a713f1df0311d15f11299af9 SHA512 f0779ec42907b665df53f38ea370e661f10e7c72a75917f4cbd055868428c0eac1c7fc194d4bbf048e00f0f3d3e2b3602ae88d7820ad0c73e94a5228b61f6495
 DIST unicode-segmentation-1.9.0.crate 93241 BLAKE2B 359904bcaadfd161128d40a896a2d10e5dfdb4098de245c949ae3fffecce9b4b6b999bbc2c6ca522944733ab0074e50fe829690183639c312bba8f8d0ad24456 SHA512 7d0ea37bfb24a1a803b1cd40b7b0c0e6e44ebf9a474fdedf0dcca1ead25662e19f44af29b87de1b000c3cc75fec93320938bb3ab9d9e82298eda324bb97e7294
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
+DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST unsafe_unwrap-0.1.0.crate 7365 BLAKE2B 94d8f4a5ed88d7031d1b0a87c540dc2135cc3ec2c0f536cf5263417388ddd81535a90127892c7d64b7cab6ccfa6015784f08296925dae65c474669fa2f870343 SHA512 679d9b7744e9b0fcaa4e86475e0381d6dedec497d8c77924cd6c481422043e73bdddc81127f0362d372312f2e4e5f36d9932c3326a8b1ae825c91a1b721f138a
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST user32-sys-0.2.0.crate 10624 BLAKE2B 76e57ff5dcaf533f7087073d85b3ac9a5825ca5c7251c1e8729cd35c9c3bc3c0cfb6a4d7586c3490fccf1aa581a6ce7c58696b161073bb23e524a20ca5c30be3 SHA512 75fa43621acff70425ca40a132a25fc67923526c895c51edb6b49ef507d1d461383e1d92b5dbb5c5aee9207cc76b9a9e43d27efa0b65476bc5ae0c122a2dcc19
@@ -803,12 +909,14 @@ DIST utf8-width-0.1.5.crate 2941 BLAKE2B 3203d11eda41fc8f4eb4f7ccce6ff3cdc8fde5c
 DIST utf8-width-0.1.6.crate 2935 BLAKE2B 819dffbf5203508fa3c30d8904295cc550cb7569d11346d8066061763982c7c78f3a0a7d6733c8e9ed38f943625b3c50f84da87b6f7a1d042db9a34cb57ebdd3 SHA512 2c51e38c7fa2a2c113ff74164067e49e2e615048144f3065c228a965804029447f7a1e65d926facccb8332a2ab2be02fffb7413d8eee6f883d941909b350844c
 DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
+DIST vcell-0.1.3.crate 6377 BLAKE2B fc37ce9f61e45cd17a9e4b10e5eb45fd335553636fc9e9ef3312aeb4bfe6ec6b6fc8bbc521b2b6ee957c606b503097da7846cbb2387ec4e3694a9b7df8cfc8a8 SHA512 bb195b9c3499e9c5595436eff72d38cea3e42c54ca7f00b775e9c64f19bbe8743118e0972022e03df3d7a5be90754649432a1cfad5aba7c64c461f75825c139d
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec1-1.8.0.crate 27196 BLAKE2B ff58a19668852b9ffb02296585700ff7b628f039cefd520bc9cd2cbb869a9083e704bc5882b56e028b89556cb1486cfd5f863b966e29b0079ab959853e771d7e SHA512 9f915d620abc17e14a20e11ff6663ee9ac17ba6df52c79cbd86817c4509c0da64efe6575a930aea10006a3d408c68eee37110bda7c0f34c70fd8b7ef67127f0f
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
+DIST volatile-register-0.2.1.crate 7541 BLAKE2B 7b8a177460578ed8760e89d23e2d6196c2acccb70914a2261a01347ef386202d4ff368e4973175bb0953e23dba7736ad51e1d87e396952fec23674abd24317a1 SHA512 3a26ab52cfe634314cdaa7e47a263d0e26f98c459b477077052897358cd3e764e3d07931d59d11d03824ea9c0c4f1778b944ff4bee99bcf6bc2cff03c0ec4651
 DIST vswhom-0.1.0.crate 9420 BLAKE2B ad748822fa9650d011c5f240f5e52ae1e27380fc1b22db2ceaaece4fbc814ac2f2792cf6772079199202efe88fb968618a13d91609e5245639f25b32640fad44 SHA512 0ac192e6a1d296904246d89a08021b55384b48959f26f1f0dca893f8fa1e71a012a0d731d1e48e41ca8e4427da84e50fa43ced621e435b010cbcda4f19c45a58
 DIST vswhom-sys-0.1.1.crate 15804 BLAKE2B 9e453a1e548157a08ef1f2ad5883c3d4dbe2a080a0d1324ea7d238d7c577279a424e7aaae7340406ce0e2f8c244e65be5628e25effddf033df3a28fec7533ae5 SHA512 1a676ebe81833893335101d6dfc4fcef50fbc0fab0bb55aff600eddd0018a7acf5c07c436d43a24d742784a46004606957f1a3c4fab4721f9b7e6610fb43760d
 DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
@@ -852,35 +960,48 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+DIST windows-0.37.0.crate 14060820 BLAKE2B 4993494caf29e403e275964a80ce64469e6ec3a688ba31c7a3d0e261c160f6baf3cd84754bd8661ed38e593f2f8dca80afd0b426104a9249cbdf5cd96391d59e SHA512 d10347d7cbede894f7acdc988e197d76b8b35f09272a1f525f0307b2c5005ea36b106b99efb2f06fa4109fed8c95257c420cc54dcb79f302d1e98438c823e223
 DIST windows-0.9.1.crate 65533 BLAKE2B 3907b0ed8e4ca17796a4cdd7f96da384b9e9978d68300d0b5f4574b5fa5ed15a279ff3d9a7ddc85324bb64be18fe7b6477d22193643fa76a964ab3a0262dcf71 SHA512 a33f93f38a04188bda6b06ef57e99a3be5e2a162fa55bd494ea4ba97ac1e23141a4cdd55b9c39aa0e634d450ab96d9c799811b61fe38d0191c8b0728bf27e508
 DIST windows-sys-0.28.0.crate 3075898 BLAKE2B d62e2d2404026d29989abb8984c1c84819234b2bdcf4bf55979b5c02e1a593525494d4d5276722001752663013a478b96827b0507dc5d839fe48ecaea5a317be SHA512 5af1e8fa0b0f30d4626f17ad72d7d7b7bc62b24b69c9ef37d1e1440676e3306a4ffe0006d8c977162e4d4d1520d3c91aee132043e8e6fd86b260a148aa8ec651
 DIST windows-sys-0.30.0.crate 3256610 BLAKE2B a1a0563b6cacca5202c8ee4dddb9c2a3030935269ea3959949afc7aff747afa7e38de061f3a77978b7d9d90a6245f99e07a283566cdc48602dc21fb2cb4987e9 SHA512 ac71860c93295956f18b6b0f2617443e56e4b8475c042b0e428cd0decbb921cc2c4202298bd9480e090b201df7cb8247ef0269d1902f7350a9df234ab568b1cd
 DIST windows-sys-0.32.0.crate 3361554 BLAKE2B b49573a17d526783ea445e49f6a7abf6080bb6d58b45e52fc977ca23573d737d952550664e3083793e25d5dc51fbc20b15d9ccfbc890c7529d6307bbf655d60b SHA512 a141bf37b6b72d83c46252e2fc4dd9daece02edbe8ddcb9d3262125c7733db1399c0342161a638cbbd3d980e532f785e0e0c77944e80270618ac30b0548b8ab9
 DIST windows-sys-0.34.0.crate 3369228 BLAKE2B 301f89dd2cc7e60980269deeb7f328d8895c80acad9f0056b3c510e339c7eb6963a152d7dd2c69380c802b17a630cd6df269399f18c298aefd8e9cc53e19042b SHA512 e12b2ddac3e1b841630639c6896f1389e6bb69c33da278e6499e0d31fde5d5b197ac636f430a52ccea6c3bc622e4410618d13819ba4d4c272ef2ea599be356d8
+DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
 DIST windows_aarch64_msvc-0.28.0.crate 669636 BLAKE2B 168744354afc6571a79e5fb88878306905ba0686c5a200286c3e24f880aaebbb8be0433a1fb295dae2d8ebbe9e852dfbb06ba13239f668ea8943ae134341b417 SHA512 adeda737d278926d883392a3d177a45d693badfef87a24f9cf02aa6d35b766506d6eee1269ff12613ab3017f29f0ae0edd3209efc6502e702927ddc21b5cd893
 DIST windows_aarch64_msvc-0.30.0.crate 669666 BLAKE2B 8d864958cc1c431429f5433695216606256a08a58dfc0ddb72741cc42472e72560051cad122126593e64cd02ab063cd2461cc8aedab053a9b96890402e708b02 SHA512 323f272a6bcf3d2d9afbc5d4bcf3d43763156828a599b4f30380c43c437c139c0c54fe58752d5d2c88890699e94f49a2486c0d4d3ca5e9fafb11ceee18c93d9a
 DIST windows_aarch64_msvc-0.32.0.crate 673810 BLAKE2B bd32e62f6530a37371b3f4aa67c41a201c47d035ecf4681daa05d5a5ab0bffaa67fb3e6d4b2cc10dc2de5b7ffffc465f66c576ed9fac313a5f96d1e9f28c6289 SHA512 d50661dc66f773edbfd82bdd2ddcc2b2c10216160595c771b61f9a56d0b288714d5f6b37a0a06e9d484395b2c1a228f342caff157bcb6c44534fe60bc1f5f844
 DIST windows_aarch64_msvc-0.34.0.crate 674445 BLAKE2B cba324bb4fdcde12f4d89384450c5adfbd6f728ac47bd162b33a12c5adf0654c8374d4b0f1e9347d48d2e7d014f701fe85763709824f75df21b42d01341b53a2 SHA512 974c6f3c4bdbd217d9deac7e973b00c115e8b9b831f8b9d933455b11b8b6eb59782f7c7a06c9a4d81fdd41729858e303051eb0d56b971fea1025e86d2b702710
+DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
+DIST windows_aarch64_msvc-0.37.0.crate 661960 BLAKE2B ae184d78d8663ac491090210eaddcabc29da3ed2bc9b551bf705196f3323063c1e07f011d77760d0682347843428789a23802fd4889c01c99ad0e7308799abf7 SHA512 3d249b39a2aa329d56965ed56b171fe0996f8078c0fe49537d746b62fddce37e90d68f2a31e51022d9a6b693db7e2e35ada399fc8a125903f4f9d7af7b651d8e
 DIST windows_gen-0.9.1.crate 5881881 BLAKE2B 31d134a1269ad3f6217895983107d111aca4d6af9301d39422ac211a665d59bfb944284d79b709e14a56abaf1b37f6f1e60b1815bc8bcba3eb88829c03978531 SHA512 c5ba8e4c3b637b71833b8bd0a84aa6783a9b24c779ab6f7bc8ccb070a03ced8cff32c8148865d0c9dc976ca88f2ba2837c8a39cd896fb3c10c7e6ac173ba1791
 DIST windows_i686_gnu-0.28.0.crate 774446 BLAKE2B caf58171bd79c6f20671b60349452f50cfef3ba8a6ef7ba86902edd1c827102ff672110ab44c204211289c2be3792c2fd055da487de64cab50ec97aa6c1cd13f SHA512 db154bc62e6541682104ada1a70eaa06bc8f67d2aec2ff011bd3f6a229606a4b0da1af9a61671e3b7e81f7a17bec710a0adfcba5991481550265b49e6b32a81a
 DIST windows_i686_gnu-0.30.0.crate 774464 BLAKE2B 62740a8f355d08d94f453a2727808a328a831955c1996aae923afa748bcecd849f5e2f76c69aa5c4e58cb8d3ddbf30e12f2c459e5ccad77af6dce050de65449a SHA512 a02e9a1e3fbd9b1dfa41aa581f89ae2f87efa6a5ae08438c2556092d490e216f77a45872921c6f2a2b55f957447c38acd5b44e20aa3545e4385d0bad7c88b714
 DIST windows_i686_gnu-0.32.0.crate 772251 BLAKE2B 60a6e4fe3783361fe773aa90aa2696350e67a443976a7dc946d828bf73b793ff6e1b9bb5f2899cb3d66f9869b99a2120f433fc766555f6c897106401c4735d3b SHA512 7dd93d6a8fef58114dd5574deb3d5285b851cf2fe85d5bde466a9ccfe8584f3dcbeb293d4e40bf4b228a5ba4e54306d7e30364cebf7fbe6fe568bda96ab33d44
 DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c912a5286236a6bb8bb3c5eb68013d527dde064c368e1d452e73e26efcb1b832933b2891c2255673824c27045be9edd954d SHA512 e388b214d45ec14182af4c72e7b27f22dc7ac17725ce833e05cef9770b677dc929a20ffc1c28f604d5c8100f68d7bf4427feb2aeaf6edb776dc5bc1b505a94fd
+DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
+DIST windows_i686_gnu-0.37.0.crate 818111 BLAKE2B bba5bfc3e85dc38fef52ae7d00919262a971ecb381e6236056c29586335efc69f4a6e020c91d59f85760191ad7626a3cb2283872b009788046dea6cf7aa38fd9 SHA512 7f3aaf30530d13d9a9c6f20df4abee8ca6ddda25de289551b7223a7092277d5ec4764c048bcf566ce49b085b78d567f3a6e7c62d6d5fbe79b671dbb2d9526aef
 DIST windows_i686_msvc-0.28.0.crate 732280 BLAKE2B fa8fc718fc6ae12d733146a00ef3f024003ae6f3a14028792890b33c7c8a52e6264c1adfa9355c2ec535f6d7f7101fd00d57987ea05e72f56c5a0518def720b4 SHA512 4b33bdf6641b816753156e29c9e48602d8f487ea924165196161bc2f02e3929ce96671ecdaa9d61d5f74f3deca77ccdae9ed6663217d62994cb4849d70ab5a66
 DIST windows_i686_msvc-0.30.0.crate 732295 BLAKE2B 97747c5889375d7bcde1d614b5d20c04d4e5491a6c5257347bba788a0849a8853f8130432589d7a3918e87aab4f8b21b73f7feb86ad1242b3e976568c72beafd SHA512 5bf84371a7fb69da38db95b74d9b2c91e205aa30733e2d72556c656b0c45a26876096646408f72d59b68d104bd73b339b14b361235307df2d049835f0462ad5c
 DIST windows_i686_msvc-0.32.0.crate 733422 BLAKE2B fa1c9c2e5a879797212caff8cbaf17043d4019bb88070eeba39ea64fae46eb4d4c254527a74f21b5604a817859c5a5647b631e743d412e0c3a92bc523f778053 SHA512 3d8b8db6ce629f8a3598b00f4a11f8af81cd8da1b9ed5f14e0b200c0512539118a7206866e9c63bb73528877ce74b33e92bbcc88f036afefe07936298eaff932
 DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
+DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
+DIST windows_i686_msvc-0.37.0.crate 724577 BLAKE2B c83f437526293ae1326f4ed7598c66b0b0ce71ffc85b24807203b732fa9745a12ef1b339c28b0fb51614408503562991bdd611ab3721c1b37d83841121569c4b SHA512 b95650193a0a6f71cc8b66ca380d4e931d1c4a7a1e38a0b8222efc164c0e8c8c3cd21f26cb0e503c64e08d28e2922be5fce05302f2552086585bbb56073f077c
 DIST windows_macros-0.9.1.crate 6501 BLAKE2B 55d8d9a4d557214f2f620f3280ff7cd6ad7732cb36095ad4a912210dd189cb5c0b7cadb28a6208339275ff5852656f93629c4be2b5322f018a9a48ac9e01b7e5 SHA512 9c51f2b2bafe57f4ed01870027d5b4baa128fbe756024fb9c01c4eef71477c7fedd3f44e9dfd0b06516a0e0199915f5588f10ccdc6f286ea44fc87430af1edbc
 DIST windows_x86_64_gnu-0.28.0.crate 743221 BLAKE2B 2d6205ed5adadd4799d7779e1adcaabe5e1cecb90779775f58dc1e571ba8c5b1d8eafd92043b6838e2906f810946c49a7ebc078c249e8c804ed088ac2e6d6b35 SHA512 1aacddb207e6b34ac2123b90e9cde2573b2f18581a8fb1371a828f6c469539327f9e3df115825936d3e4fae7b525718d8cab3f1f0b5b0782dd76c149ce104349
 DIST windows_x86_64_gnu-0.30.0.crate 743236 BLAKE2B 93a67f4c3afb7c2c667dd4b914fa649d0c169ccb7e24a19ff3c0afb7f5358cb3847ca48ecc5f2f968ace3f15d9ffb62bf57f50d031b141c71ca9c71271b2caeb SHA512 e0231935951c916e8accd3977128e943efba26e5c1cf5ea1c128d33324fe1d00c277d96571ac62e1f018aac15bbf0667b9afd8e9f7173beb46fa329c0955a2ff
 DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53b59a9e66977df8a0a4074993b4efded7cf63f88d18ddd0bfae467bf37b47b4f9400bdcd3db9cec31bc8febaabef995f406d6 SHA512 35cf64bf981a16a011b2276dbbb65200834235075d369fe60ca06092e1c0631c114c402eb43db223ec885f0ab07a77aa9f1822d1db44c5e6747645c65a7ac182
 DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
+DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
+DIST windows_x86_64_gnu-0.37.0.crate 790933 BLAKE2B ddf80027c50c150ffb542b864f4c2ce62511195db59956bfd7ced85afaefa3a53a4eb67f5c6a72a1571e8b28848846d2a199e4c9ab2b8714190952d2a8993944 SHA512 c528d0e7fa1a3e600d9adf055fc42bd19e6871feb99cb1fc1631a9a078824a9328439db17e3222c76dc8730951251478939033215a32b240058423a145877fe1
 DIST windows_x86_64_msvc-0.28.0.crate 668950 BLAKE2B 90488fdda855494be0aaf3b4381785ec74c5beae3a4d853835ce320750d7867c1e95067f8f921e2f2f67047b9f84d963f2c765c7c8cd3011841908a7d1c990de SHA512 d8daf7c8cc31d1da53d54ca495dc54b457c5e8a42418348c1fe3b91d4184b3831bffafc56cca1067ecf67c4edf7873e74e505a6e3a7868ce495f2afc759d20c7
 DIST windows_x86_64_msvc-0.30.0.crate 668972 BLAKE2B 46ca7506391d28b3317e730fcd8d994e01191b59a7a08eedc86cfa0a735435fbe0b9d09cef37f318a1dd250103e2f76915456183d2cb25406a209c8086751257 SHA512 25737d7088457e2c3e93ec17af814db6522dd2a9c72a78199bb4035d5ddded3aa364cc96f9a8c2beb1e5f96d2199de0288ca8e61e79ef870a2ff8fea38ea1875
 DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
 DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
+DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
+DIST windows_x86_64_msvc-0.37.0.crate 661993 BLAKE2B ec6509a2e07ae8f94c5cb0cd6eb507b504782702698c93ec86af66c9bf3587d2dcc7b7f5a5da95ce92df42091633378374f101d64685cbdc8ef55d49523c41bc SHA512 ccfb98753311f32a591b94391dc4a8d9ffb5bdbb09e83f082b8dde6077e5ec710dc380a2a6cad90a00da5570eacd74dae810108943801a0615abf53c35ff7da6
 DIST winreg-0.10.1.crate 25725 BLAKE2B db536f2a098e4ff6ae4ff80a19bd2029030d68007c3d6100f5135da1a7c223463fc17640f533bc1d4e8c53e9becb186d98351719b3b6276802c68cc755b9ba4e SHA512 09f2d18f62c3c427ebed40d667b672bb778629502ad3c39541f324b2d5ac41f0822c98b7e5320314144130580da46f1e8e51928941850e7d4af28455a564360c
 DIST winreg-0.7.0.crate 21225 BLAKE2B 5841db683dc0aa8b92de8ec43100403b029c8d3e544adcaab030d998e5af4644ea176ac0bcd97141d137450a7bd761a5291405202c445a326da7d4f240686230 SHA512 a0b7a2d239e30cea89a863b879831bc32b5f2988ef3f0586ddadda48827cafc82d3602d2f8df3c47dc1e80537149a1ca1dc1506f9fbf960d9ba081dff1bac731
+DIST winres-0.1.12.crate 19772 BLAKE2B 645fc16e49061cd98c77217b991cb774151f7f8bd6df44cee622bcba121d2645aaf775d56c3e85de6278b193ea6a36256821799c33ba081f931d87ffa0e038f1 SHA512 9f61edafb4a262b56d130e48ac6bba94f5a432bf0a8c20243e6c8fa98c3f9e0d2ab00a77b35a2e49dd63585a272af597e236e089641b5f488760ac42d22f5a67
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x11-2.19.1.crate 65593 BLAKE2B 5217ba6155b0705320c164e046e9efcad966e875e50cb3e9d20d27857d199d123d0fa5e4f28081f078f24d54fac5f10f2c26eeb011e12ef4d3cbb659dd8a3c1e SHA512 0b500b5a3d6cdb2ff5b2ac60cfca261bf3bb98ed3b36d0a52d85d195c1605550aa9cbe46fbaad94380b50b781002d75b1710f324e5f278ecf9707390c6a622ed
 DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6
@@ -888,16 +1009,21 @@ DIST xmlparser-0.13.3.crate 25732 BLAKE2B 83c3a95c3d39e1f08d2de08082aad2812017c2
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 DIST zeroize-1.5.3.crate 17287 BLAKE2B 3399a8c9d498c1a7c4e09e038c830d1ea83b4d2fdb9c82d8e5efe9e8e52218fc568b35f62600f086673de0da41ce94aa8e740a2518f5d33ec67a41be21bb72f1 SHA512 14cdb8893ccfb1c6f762b0bf16855119a489822b820dcdeeec6ddc6578013bf2447f7ce3fa8de24209aeb58ca543e30c9189bdf037f49512979bb7c59bd6d90f
 DIST zeroize-1.5.4.crate 17586 BLAKE2B 0bcb58b428adcf743f06a01f431aaba0b483f0e00b70e1f9fd3da37350982a8d4511301fcb0016892264deed10e2efbf3b85becde9d74e91538715db63e231fc SHA512 c581d3ab3e7a1d5803c0d1e0d054aec1f47fa0387625fe9367dce7875c2f015d921f70cadc33ac596c96b87461ddf9fd35c5213b61b705aecaf213635a551445
+DIST zeroize-1.5.5.crate 18550 BLAKE2B c55736939d4da7a9e5d89c3d550ad739475013b585c9a0e7be87f03a168b2cf0841b3fa8f2520b009c9f03a4b9f185ea73db6159ddb24fb0745d7732865c8d8c SHA512 2f38a6382968c7d98f232a840b5e75800f8f48df49338196cab3af2c0ec1c3d4c0c8dba89f9ca79597551844f405c63317e72a56597c611eddc405ca5f6daf0c
 DIST zip-0.5.13.crate 48237 BLAKE2B 0ffd9c41535f3e49d091b831925e8b639f3128702deafc75e0ea712b67df6f0900ec79628dd2640eb9b91fba7e828abd8b5c9edad87fbe7b22e042ef9909b07f SHA512 b30950ede91cdb1d4ef4f9d6aee8f62a3aa5a1a6422bd10507dfd76edc02c1bd24d41c7bf2ac416a5ee045562cacda0d17cd04938ec02b8be0a0d64acbaf7e01
 DIST zstd-0.10.0+zstd.1.5.2.crate 28748 BLAKE2B bc9dfd18367faba7920bce5c28cc4ca99a00c11d23ef4d8a88bf657d5ef61dda25f7ebcfa06cf67f27cf447bee483f404662ea1be90524b46232c8201069fd8b SHA512 b6559710b10da68fd0cb242029145c2176d9bcbf5aa04c0d035341a27a6cc10038c0872d0df3a8fb94f0be573dfec65015032f583a93408da20377cef037746c
+DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd
 DIST zstd-0.9.0+zstd.1.5.0.crate 25973 BLAKE2B d12fc714b4712feea71e43e0ca391c6390e16d2f3650653c719110b7cd1599ab4028b907932015a7bd7396a0466dc0a45840dbe7135f88f7bfaa33656c41ea6d SHA512 64e80dbbd1ba00de21b9dd5300ec61ae642d0280cec8039a0d465547aa863744218c2d314073d6480051af37d2a24cb0553286154f4363257d991d65a1c73742
 DIST zstd-safe-4.1.1+zstd.1.5.0.crate 12665 BLAKE2B bc525d967b1266eb7c005dc46af0e2ccf9b77f3ef2bc8f60a2106b50cd64a324851f1022a1128d3223a85c3124230610ce54e2183ece00a386841ca68b6a95cf SHA512 0127fd28342b118b0ddcbab0a68945f11b9c5ce68e3dcf88cca42fee0345a5818fa403cb827cdf4f4d35e17c786321ab8b3667033a1dd5b7ffcb84a11940f1d4
 DIST zstd-safe-4.1.4+zstd.1.5.2.crate 17166 BLAKE2B 9a43efdb808756ab729d0c525229afb62ae9528635c24d071a1befcfc57f251bc496481a67911d256eeb568b952554f9ea5fb132e5c8c9f0739493adda9f8bb7 SHA512 0b9ad154307954b977a990273b11dba3349fffa1a2b3cb89dc233cc20deb6dc0a10bd97d06c3fc5304124320ee8ff607b6d8859ebdaa562365d4baf490fdbcd8
+DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
 DIST zstd-sys-1.6.1+zstd.1.5.0.crate 650935 BLAKE2B 271cff18da805358361c28bc2076c3144923be3a45510fe0e6725839a18937bbcf08b5b46d13363548e57bf4da737c551731999c9894d5f1690901212a472f52 SHA512 79278016fbe30f0b55195c540f31be5e8de961f6b7de7852c6870ba9d21f7be4aef8c4f57871e0a932e830484d6612c1fce808e77991bf1c6aa98d84007eb01a
 DIST zstd-sys-1.6.3+zstd.1.5.2.crate 720054 BLAKE2B 4c0a709afa55eb66bcee82bbd6258ac7eb007cea608be7a981b445f8e0fe75c42007998072d93238ed2b0aee0cef1964ba327506de195e8a912b4c2e1aa468b8 SHA512 a8aaa3ddb7295cdb12623d1b6b06e30a029bce42a825adb427594e030ba0a1e51bf499f462d42bae47cd75178761d0e5071e86b0bcb8d8ff9cc8ebff1406b689
+DIST zstd-sys-2.0.1+zstd.1.5.2.crate 715552 BLAKE2B 497901ccaff7f92aa607797970c6beaaa3fcbeb08a48a2dffdfd465af999291e65024dfb7fc844802e5befa0e67dbe225310f72e6292bdcd22596b2614665d8e SHA512 a54ff4159640d31f898cbd374b9117d1e7ee4b54c5b4a8e1ed6286d9e954341e077088c52161e086ef0f28dfec13e03f64013712fa9bc59d471191cffd8e0e1e
 EBUILD nushell-0.43.0.ebuild 10443 BLAKE2B a23375d960413ef95851ce283ccc9c03feee6e6a9589b6d60e42576e140627c0b6d6b13986be177a95f28bda4dab2cb5c9cc4073fe0d3131ba627be978c6802f SHA512 40109d61f654232db3f76df43b65a0d7ff2d442d2605cad7f6664282143bfffdc84e231d09e5cd5bf0eb2b177a5fa56ab2f888b12bc9626acb9585ae78027d19
 EBUILD nushell-0.60.0.ebuild 10450 BLAKE2B 3404324ffb313c31976d8b40e651a2e778dc3591a3d326be7f7353ce813d1d2291b20cf38a9796c364130318af61190b345d69832fbf5f647cc9d0684ade8554 SHA512 cb6ea66d254d21aac958e83d21af221e3f5ccec1e438fc66fadd3c600887954b51640727ed4bf7b87ab6641d02eab7c5ed901cf890b6819855ef339db77c418a
 EBUILD nushell-0.61.0.ebuild 10651 BLAKE2B 82ba57add1ebd6de0f6bdd4eb61d9160caac89b52c70cb7602867c669dcdba378a802459a9db0b2df271f0f27072fc3ca41313e08559ecd895937ab11f6517d4 SHA512 8f87c489e11024e240bdce8dcea75df034340a05f0af1b1ac5b325727dfe6badd6e4bd1e2db480d8f3821f1c4115ce841a84bb208bd7fdd0cf45e0fc8516da28
 EBUILD nushell-0.62.0-r1.ebuild 10958 BLAKE2B 83e3a9c0b69237cef92c93b0f3e285c49c66a5b058e63c2de27ba88e17a678700ba0168be7522e68f34304601ec387150b94dbc8e6eb0a2271d0fd0b7c6c988a SHA512 246a6664ea9ec310b4e2a31c0989f4303e76d97dd33b94ba6321d94426f9801b1c96244ada3a5ddb76adb836f8dd8c544ef191cf3d8079cffb1659752ea4d4b5
 EBUILD nushell-0.62.0.ebuild 11267 BLAKE2B 3f0104c2cb0a709a66423a907980664604f32ae4321ed3d996f55433ecace6507bbed27ac60c35623e181864c0df9d58279b4ea37f05485eebfd0fe284a4263f SHA512 e3a6136736bf626668627c30a267d6cd153db25d83fa360e80711f473affe82cb534891a18555464a2dcdbd30458c239b26e38a958faa05befbe83946a6daf02
+EBUILD nushell-0.63.1.ebuild 11437 BLAKE2B b7e000c2985e78bb7fb17f5496afc5ae109a50eb900510ad2921104d23a0bbffd3ecb2d0c0624c7a612c96b14723c770d94aa2c88af75c9d063a52a3040dd1b6 SHA512 6c52ab86a179dc8f51cdcf318eeb6b75aa9a2e97d0ed87925e05f9705c14bafe8658e517d8a596087900de3988ba2ec1d098734f63b53d843152d595c1a39c73
 MISC metadata.xml 627 BLAKE2B 317bde74206813d5f2b255c04e6334fef912e3b800911bf927bef42256cf6333be0e90657538e6029d6c8bd2405ab64d2a2a02eaa755a69d73169fea31eb8c21 SHA512 d2fef5d42262505cdfa895783432f79aaa068823e49c8be97a09516d4487edd8bd682b02629bb3ef5f142c37fe23b264ebe45967cebe984057ab4b30fbe34299
diff --git a/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch b/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch
new file mode 100644
index 000000000000..51f1f7705d2e
--- /dev/null
+++ b/app-shells/nushell/files/nushell-0.63.1-reedline-from-crates.io.patch
@@ -0,0 +1,73 @@
+From f17582e6e7ce4fbed13a3b490f06041b56882cf4 Mon Sep 17 00:00:00 2001
+From: Randy Barlow <randy@electronsweatshop.com>
+Date: Mon, 30 May 2022 14:59:44 -0400
+Subject: [PATCH] Use reedline from crates.io instead of git
+
+I believe reedline was left on a git URL for a nushell release by
+mistake. For Gentoo, we need it to use a version from crates.io, so this
+patch makes that adjustment.
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ Cargo.lock                   | 3 ++-
+ Cargo.toml                   | 2 +-
+ crates/nu-cli/Cargo.toml     | 2 +-
+ crates/nu-command/Cargo.toml | 2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index bed0c1c50..578c55b74 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -3794,7 +3794,8 @@ dependencies = [
+ [[package]]
+ name = "reedline"
+ version = "0.6.0"
+-source = "git+https://github.com/nushell/reedline?branch=main#fe795caabc5401d811006b93d5a6d4f220a049ff"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "422f144c06f679da4ab4f082a6d1d43e28bfabb68d009100e6e5520728f99fec"
+ dependencies = [
+  "chrono",
+  "crossterm",
+diff --git a/Cargo.toml b/Cargo.toml
+index 26df23417..cbfb290b8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -54,7 +54,7 @@ nu-term-grid = { path = "./crates/nu-term-grid", version = "0.63.1"  }
+ nu-utils = { path = "./crates/nu-utils", version = "0.63.1"  }
+ pretty_env_logger = "0.4.0"
+ rayon = "1.5.1"
+-reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
++reedline = { version = "0.6.0", features = ["bashisms"]}
+ is_executable = "1.0.1"
+ 
+ [target.'cfg(not(target_os = "windows"))'.dependencies]
+diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
+index 9c5dcb00c..fe4d5c263 100644
+--- a/crates/nu-cli/Cargo.toml
++++ b/crates/nu-cli/Cargo.toml
+@@ -17,7 +17,7 @@ nu-parser = { path = "../nu-parser", version = "0.63.1"  }
+ nu-protocol = { path = "../nu-protocol", version = "0.63.1"  }
+ nu-utils = { path = "../nu-utils", version = "0.63.1"  }
+ nu-ansi-term = "0.45.1"
+-reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
++reedline = { version = "0.6.0", features = ["bashisms"]}
+ nu-color-config = { path = "../nu-color-config", version = "0.63.1"  }
+ crossterm = "0.23.0"
+ miette = { version = "4.5.0", features = ["fancy"] }
+diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
+index 806772156..ac1283ab3 100644
+--- a/crates/nu-command/Cargo.toml
++++ b/crates/nu-command/Cargo.toml
+@@ -82,7 +82,7 @@ unicode-segmentation = "1.8.0"
+ url = "2.2.1"
+ uuid = { version = "0.8.2", features = ["v4"] }
+ which = { version = "4.2.2", optional = true }
+-reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
++reedline = { version = "0.6.0", features = ["bashisms"]}
+ wax = { version =  "0.4.0", features = ["diagnostics"] }
+ rusqlite = { version = "0.27.0", features = ["bundled"], optional = true }
+ sqlparser = { version = "0.16.0", features = ["serde"], optional = true }
+-- 
+2.35.3
+
diff --git a/app-shells/nushell/nushell-0.63.1.ebuild b/app-shells/nushell/nushell-0.63.1.ebuild
new file mode 100644
index 000000000000..053830523fad
--- /dev/null
+++ b/app-shells/nushell/nushell-0.63.1.ebuild
@@ -0,0 +1,617 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	Inflector-0.11.4
+	addr2line-0.17.0
+	adler-1.0.2
+	ahash-0.7.6
+	aho-corasick-0.7.18
+	alloc-no-stdlib-2.0.3
+	alloc-stdlib-0.2.1
+	alphanumeric-sort-1.4.4
+	ansi-parser-0.8.0
+	ansi-str-0.1.1
+	ansi_term-0.12.1
+	anyhow-1.0.57
+	array-init-cursor-0.2.0
+	arrayvec-0.4.12
+	arrayvec-0.5.2
+	arrayvec-0.7.2
+	arrow-format-0.4.0
+	arrow2-0.11.2
+	as-slice-0.1.5
+	assert_cmd-2.0.4
+	async-stream-0.3.3
+	async-stream-impl-0.3.3
+	async-trait-0.1.53
+	atomic-polyfill-0.1.8
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.65
+	bare-metal-0.2.5
+	bare-metal-1.0.0
+	base64-0.13.0
+	bit_field-0.10.1
+	bitfield-0.13.2
+	bitflags-1.3.2
+	bitpacking-0.8.4
+	block-buffer-0.9.0
+	block-buffer-0.10.2
+	brotli-3.3.4
+	brotli-decompressor-2.3.2
+	brownstone-1.1.0
+	bstr-0.2.17
+	bumpalo-3.9.1
+	byte-unit-4.0.14
+	bytemuck-1.9.1
+	bytemuck_derive-1.1.0
+	byteorder-1.4.3
+	bytes-1.1.0
+	bytesize-1.1.0
+	calamine-0.18.0
+	capnp-0.14.6
+	cc-1.0.73
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chrono-humanize-0.2.1
+	chrono-tz-0.5.3
+	chrono-tz-0.6.1
+	chrono-tz-build-0.0.2
+	codepage-0.1.1
+	comfy-table-5.0.1
+	console-0.15.0
+	const_format-0.2.23
+	const_format_proc_macros-0.2.22
+	convert_case-0.4.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cortex-m-0.7.4
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	critical-section-0.2.7
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.23.2
+	crossterm_winapi-0.9.0
+	crunchy-0.2.2
+	crypto-common-0.1.3
+	cssparser-0.27.2
+	cssparser-macros-0.6.0
+	cstr_core-0.2.5
+	csv-1.1.6
+	csv-core-0.1.10
+	ctor-0.1.22
+	ctrlc-3.2.2
+	cty-0.2.2
+	derive_more-0.99.17
+	dialoguer-0.9.0
+	diff-0.1.12
+	difflib-0.4.0
+	digest-0.9.0
+	digest-0.10.3
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.7
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	dtoa-0.4.8
+	dtoa-short-0.3.3
+	dtparse-1.2.0
+	dunce-1.0.2
+	ego-tree-0.6.2
+	either-1.6.1
+	embedded-hal-0.2.7
+	eml-parser-0.1.3
+	encode_unicode-0.3.6
+	encoding_rs-0.8.31
+	env_logger-0.7.1
+	env_logger-0.8.4
+	erased-serde-0.3.20
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	failure-0.1.8
+	failure_derive-0.1.8
+	fallible-iterator-0.2.0
+	fallible-streaming-iterator-0.1.9
+	fastrand-1.7.0
+	fd-lock-3.0.5
+	filesize-0.2.0
+	filetime-0.2.16
+	flate2-1.0.23
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs_extra-1.2.0
+	fsevent-0.4.0
+	fsevent-sys-2.0.1
+	fuchsia-cprng-0.1.1
+	fuchsia-zircon-0.3.3
+	fuchsia-zircon-sys-0.3.3
+	futf-0.1.5
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	fuzzy-matcher-0.3.7
+	fxhash-0.2.1
+	generic-array-0.12.4
+	generic-array-0.13.3
+	generic-array-0.14.5
+	getopts-0.2.21
+	getrandom-0.1.16
+	getrandom-0.2.6
+	getset-0.1.2
+	ghost-0.1.4
+	gimli-0.26.1
+	git2-0.14.4
+	gjson-0.8.1
+	glob-0.3.0
+	h2-0.3.13
+	hamcrest2-0.3.0
+	hash32-0.1.1
+	hash32-0.2.1
+	hash_hasher-2.0.3
+	hashbrown-0.11.2
+	hashbrown-0.12.1
+	hashlink-0.7.0
+	heapless-0.5.6
+	heapless-0.7.13
+	heck-0.3.3
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hex-0.4.3
+	html5ever-0.25.2
+	htmlescape-0.3.1
+	http-0.2.7
+	http-body-0.4.5
+	httparse-1.7.1
+	httpdate-1.0.2
+	humantime-1.3.0
+	hyper-0.14.18
+	hyper-tls-0.5.0
+	ical-0.7.0
+	idna-0.2.3
+	indent_write-2.2.0
+	indexmap-1.8.1
+	inotify-0.7.1
+	inotify-sys-0.1.5
+	instant-0.1.12
+	integer-encoding-3.0.3
+	inventory-0.2.3
+	io-lifetimes-0.6.1
+	iovec-0.1.4
+	ipnet-2.5.0
+	is_ci-1.1.1
+	is_debug-1.0.1
+	is_executable-1.0.1
+	itertools-0.10.3
+	itoa-0.4.8
+	itoa-1.0.2
+	jobserver-0.1.24
+	joinery-2.1.0
+	js-sys-0.3.57
+	kernel32-sys-0.2.2
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	lexical-6.1.1
+	lexical-core-0.8.5
+	lexical-parse-float-0.8.5
+	lexical-parse-integer-0.8.5
+	lexical-util-0.8.5
+	lexical-write-float-0.8.5
+	lexical-write-integer-0.8.5
+	libc-0.2.126
+	libgit2-sys-0.13.4+1.4.2
+	libm-0.2.2
+	libproc-0.10.0
+	libsqlite3-sys-0.24.2
+	libssh2-sys-0.2.23
+	libz-sys-1.1.6
+	linked-hash-map-0.5.4
+	linux-raw-sys-0.0.46
+	lock_api-0.4.7
+	log-0.4.17
+	lscolors-0.9.0
+	lz4-1.23.3
+	lz4-sys-1.9.3
+	mac-0.1.1
+	malloc_buf-0.0.6
+	markup5ever-0.10.1
+	matches-0.1.9
+	md-5-0.10.1
+	memchr-2.5.0
+	memmap2-0.5.3
+	memoffset-0.6.5
+	meval-0.2.0
+	miette-3.3.0
+	miette-4.7.1
+	miette-derive-3.3.0
+	miette-derive-4.7.1
+	mime-0.3.16
+	minimal-lexical-0.2.1
+	miniz_oxide-0.5.1
+	mio-0.6.23
+	mio-0.8.3
+	mio-extras-2.0.6
+	miow-0.2.2
+	multiversion-0.6.1
+	multiversion-macros-0.6.1
+	native-tls-0.2.10
+	nb-0.1.3
+	nb-1.0.0
+	net2-0.2.37
+	new_debug_unreachable-1.0.4
+	nix-0.24.1
+	nodrop-0.1.14
+	nom-1.2.4
+	nom-4.2.3
+	nom-7.1.1
+	nom-supreme-0.6.0
+	notify-4.0.17
+	ntapi-0.3.7
+	nu-ansi-term-0.45.1
+	num-0.2.1
+	num-0.4.0
+	num-bigint-0.2.6
+	num-bigint-0.4.3
+	num-complex-0.2.4
+	num-complex-0.4.1
+	num-format-0.4.0
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-rational-0.2.4
+	num-rational-0.4.0
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	objc-0.2.7
+	object-0.28.4
+	once_cell-1.12.0
+	opaque-debug-0.3.0
+	openssl-0.10.40
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.20.0+1.1.1o
+	openssl-sys-0.9.73
+	output_vt100-0.1.3
+	overload-0.1.1
+	owo-colors-3.4.0
+	parking_lot-0.11.2
+	parking_lot-0.12.0
+	parking_lot_core-0.8.5
+	parking_lot_core-0.9.3
+	parquet-format-async-temp-0.3.0
+	parquet2-0.12.1
+	parse-zoneinfo-0.3.0
+	pathdiff-0.2.1
+	percent-encoding-2.1.0
+	peresil-0.3.0
+	pest-2.1.3
+	phf-0.8.0
+	phf-0.10.1
+	phf_codegen-0.8.0
+	phf_codegen-0.10.0
+	phf_generator-0.8.0
+	phf_generator-0.10.0
+	phf_macros-0.8.0
+	phf_shared-0.8.0
+	phf_shared-0.10.0
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	planus-0.2.0
+	polars-0.21.1
+	polars-arrow-0.21.1
+	polars-core-0.21.1
+	polars-io-0.21.1
+	polars-lazy-0.21.1
+	polars-ops-0.21.1
+	polars-time-0.21.1
+	polars-utils-0.21.1
+	pori-0.0.0
+	powierza-coefficient-1.0.0
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	predicates-2.1.1
+	predicates-core-1.0.3
+	predicates-tree-1.0.5
+	pretty_assertions-1.2.1
+	pretty_env_logger-0.4.0
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.39
+	procfs-0.12.0
+	pwd-1.3.1
+	quick-error-1.2.3
+	quick-xml-0.19.0
+	quick-xml-0.22.0
+	quickcheck-1.0.3
+	quickcheck_macros-1.0.0
+	quote-1.0.18
+	rand-0.4.6
+	rand-0.7.3
+	rand-0.8.5
+	rand_chacha-0.2.2
+	rand_chacha-0.3.1
+	rand_core-0.3.1
+	rand_core-0.4.2
+	rand_core-0.5.1
+	rand_core-0.6.3
+	rand_distr-0.4.3
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	rayon-1.5.3
+	rayon-core-1.9.3
+	rdrand-0.4.0
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	reedline-0.6.0
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	remove_dir_all-0.5.3
+	reqwest-0.11.10
+	result-1.0.0
+	riscv-0.7.0
+	riscv-target-0.1.2
+	roxmltree-0.14.1
+	rstest-0.12.0
+	rusqlite-0.27.0
+	rust-embed-6.4.0
+	rust-embed-impl-6.2.0
+	rust-embed-utils-7.2.0
+	rust_decimal-0.10.2
+	rustc-demangle-0.1.21
+	rustc_version-0.2.3
+	rustc_version-0.4.0
+	rustix-0.34.7
+	rustversion-1.0.6
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	scopeguard-1.1.0
+	scraper-0.12.0
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	selectors-0.22.0
+	semver-0.9.0
+	semver-0.11.0
+	semver-1.0.9
+	semver-parser-0.7.0
+	semver-parser-0.10.2
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_ini-0.2.0
+	serde_json-1.0.81
+	serde_test-1.0.137
+	serde_urlencoded-0.7.1
+	serde_yaml-0.8.24
+	serial_test-0.5.1
+	serial_test_derive-0.5.1
+	servo_arc-0.1.1
+	sha2-0.9.9
+	sha2-0.10.2
+	shadow-rs-0.11.0
+	signal-hook-0.3.14
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	simdutf8-0.1.4
+	siphasher-0.3.10
+	slab-0.4.6
+	smallvec-1.8.0
+	smawk-0.3.1
+	snap-1.0.5
+	socket2-0.4.4
+	spin-0.9.3
+	sqlparser-0.16.0
+	stable_deref_trait-1.2.0
+	static_assertions-1.1.0
+	streaming-decompression-0.1.0
+	streaming-iterator-0.1.5
+	strength_reduce-0.2.3
+	string_cache-0.8.4
+	string_cache_codegen-0.5.2
+	strip-ansi-escapes-0.1.1
+	strum-0.23.0
+	strum-0.24.0
+	strum_macros-0.23.1
+	strum_macros-0.24.0
+	supports-color-1.3.0
+	supports-hyperlinks-1.2.0
+	supports-unicode-1.0.2
+	sxd-document-0.3.2
+	sxd-xpath-0.4.2
+	syn-1.0.95
+	synstructure-0.12.6
+	sys-locale-0.2.0
+	sysinfo-0.23.13
+	tempdir-0.3.7
+	tempfile-3.3.0
+	tendril-0.4.3
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	termtree-0.2.4
+	textwrap-0.15.0
+	thin-slice-0.1.1
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	thread_local-1.1.4
+	time-0.1.44
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	titlecase-1.1.0
+	tokio-1.18.2
+	tokio-native-tls-0.3.0
+	tokio-util-0.7.2
+	toml-0.5.9
+	tower-service-0.3.1
+	tracing-0.1.34
+	tracing-attributes-0.1.21
+	tracing-core-0.1.26
+	trash-2.1.4
+	try-lock-0.2.3
+	typed-arena-1.7.0
+	typenum-1.15.0
+	typetag-0.1.8
+	typetag-impl-0.1.8
+	ucd-trie-0.1.3
+	umask-2.0.0
+	uncased-0.9.7
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.0
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	url-2.2.2
+	users-0.11.0
+	utf-8-0.7.6
+	utf8-width-0.1.6
+	utf8parse-0.2.0
+	uuid-0.8.2
+	vcell-0.1.3
+	vcpkg-0.2.15
+	vec1-1.8.0
+	version_check-0.1.5
+	version_check-0.9.4
+	void-1.0.2
+	volatile-register-0.2.1
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	want-0.3.0
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-futures-0.4.30
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	wax-0.4.0
+	web-sys-0.3.57
+	which-4.2.5
+	winapi-0.2.8
+	winapi-0.3.9
+	winapi-build-0.1.1
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-0.37.0
+	windows-sys-0.30.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.30.0
+	windows_aarch64_msvc-0.36.1
+	windows_aarch64_msvc-0.37.0
+	windows_i686_gnu-0.30.0
+	windows_i686_gnu-0.36.1
+	windows_i686_gnu-0.37.0
+	windows_i686_msvc-0.30.0
+	windows_i686_msvc-0.36.1
+	windows_i686_msvc-0.37.0
+	windows_x86_64_gnu-0.30.0
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_gnu-0.37.0
+	windows_x86_64_msvc-0.30.0
+	windows_x86_64_msvc-0.36.1
+	windows_x86_64_msvc-0.37.0
+	winreg-0.10.1
+	winres-0.1.12
+	ws2_32-sys-0.2.1
+	xmlparser-0.13.3
+	yaml-rust-0.4.5
+	zeroize-1.5.5
+	zip-0.5.13
+	zstd-0.11.2+zstd.1.5.2
+	zstd-safe-5.0.2+zstd.1.5.2
+	zstd-sys-2.0.1+zstd.1.5.2
+"
+
+inherit cargo
+
+DESCRIPTION="A new type of shell, written in Rust"
+HOMEPAGE="https://www.nushell.sh"
+SRC_URI="https://github.com/nushell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)"
+
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
+IUSE="+extra"
+
+DEPEND="
+	>=dev-libs/libgit2-0.99:=
+	dev-libs/oniguruma:=
+	dev-libs/openssl:0=
+	net-libs/libssh2:=
+	net-libs/nghttp2:=
+	net-misc/curl
+	extra? (
+		dev-db/sqlite:3=
+		x11-libs/libX11
+		x11-libs/libxcb
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	>=virtual/rust-1.60
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# nushell-0.63.1 uses reedline from git. This patches it to use it from crates.io
+	"${FILESDIR}"/${PN}-0.63.1-reedline-from-crates.io.patch
+)
+
+QA_FLAGS_IGNORED="usr/bin/nu.*"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	# high magic to allow system-libs
+	export OPENSSL_NO_VENDOR=true
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export LIBSSH2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+
+	local myfeatures=(
+		stable
+		$(usev extra)
+	)
+
+	cargo_src_configure
+}
+
+src_compile() {
+	cargo_src_compile --workspace
+}
+
+src_test() {
+	cargo_src_test
+}
+
+src_install() {
+	cargo_src_install
+	local DOCS=( README.md docs/. )
+	einstalldocs
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 3f2e45845760..c565e0f2ebb5 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9c16adb0600a..34304134f66b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -8,6 +8,8 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
 DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.42.0.tar.xz 38523536 BLAKE2B 81d8477fbbaeedbf589c3c25b16925f6fe383c74d9ad17d0036f886304c9ce1f807fea6463ef0dc345a07de69438785faca6ef7337e5ff1e7d5684b4d0ed7cdd SHA512 dac197d0a6f36f8ebb56720214df355bfc2625ecf55992b824e3409e7273db12fabfd54d2f602f950761efc717e52f872f5f2c2078770abbc887ef30cc64bbe8
+DIST calibre-5.43.0.tar.xz 38641220 BLAKE2B dddf9e5f7303845f8d86826d38d08dfbf05f144c4fb80d215197f51dc6685f09d848148f00f9795c441f8cd8c541ed9d4988b0a5d2020ce98eb8f8bcd4853dac SHA512 1a5b95c621e47b660841d989445ab56244b9c805aa5d01efc4d95d8c37c5290e93523cedec92a6ca12d16e5f74b63743d6e682bf4084f400d080678ff540a190
 EBUILD calibre-5.16.1-r1.ebuild 8236 BLAKE2B cf912f26258d5637807dcb51f3b14e2a871dcf4270048ca317eede91a3ec3a7e637f30c245bfbe5b5d7d03ceec9ec8736b805f4fdcbd71566a1ab112aace6712 SHA512 30d7bcab56ee9e45cf3237104afff8f4731a12c8867cd58b56d88e1e6c55d8fffae2af0d95247949652676add6978e1ee6bcfbc193a645f9027fb55024ac6cc7
 EBUILD calibre-5.42.0-r1.ebuild 10140 BLAKE2B 81bda1adce186b12c2153514f363817721896e675a4889a87dec703c9391122217c4b43f31f2f4ac00fb0869c4ba8f1694200e379cca46d2b8aebf05ea44f042 SHA512 45cc8fe31d08e07bcff3591bc880255efa99cd660be87bff3ea695094206f4dd570adeeddd0f2bc5a6860ff465dbe07fb24424bc53aecc07ddea4e628e2c3ff7
+EBUILD calibre-5.43.0.ebuild 10140 BLAKE2B 81bda1adce186b12c2153514f363817721896e675a4889a87dec703c9391122217c4b43f31f2f4ac00fb0869c4ba8f1694200e379cca46d2b8aebf05ea44f042 SHA512 45cc8fe31d08e07bcff3591bc880255efa99cd660be87bff3ea695094206f4dd570adeeddd0f2bc5a6860ff465dbe07fb24424bc53aecc07ddea4e628e2c3ff7
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
diff --git a/app-text/calibre/calibre-5.43.0.ebuild b/app-text/calibre/calibre-5.43.0.ebuild
new file mode 100644
index 000000000000..f3484c057923
--- /dev/null
+++ b/app-text/calibre/calibre-5.43.0.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ipv6(+),sqlite,ssl"
+
+inherit toolchain-funcs python-single-r1 qmake-utils xdg-utils
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="https://calibre-ebook.com/"
+SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	dev-libs/openssl:=
+	dev-libs/snowball-stemmer:=
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		app-accessibility/speech-dispatcher[python,${PYTHON_USEDEP}]
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/cchardet[${PYTHON_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+		dev-python/dnspython[${PYTHON_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
+		dev-python/jeepney[${PYTHON_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
+		>=dev-python/PyQt-builder-1.10.3[${PYTHON_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/zeroconf[${PYTHON_USEDEP}]
+	')
+	dev-qt/qtcore:5=
+	dev-qt/qtdbus:5=
+	dev-qt/qtgui:5=[jpeg]
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+		>=dev-python/sip-5[${PYTHON_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+PATCHES=(
+	# Don't prompt the user for updates - they've installed via
+	# an ebuild.
+	"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch"
+
+	# Skip calling a binary (JxrDecApp) from libjxr which is used for tests
+	# We don't (yet?) package libjxr and it seems to be dead upstream
+	# (last commit in 2017)
+	"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
+
+	# TODO:
+	# test_qt tries to load a bunch of images using Qt and it currently fails
+	# due to some presumably missing dependencies. This is important and
+	# we need to look into it, but at time of writing, none of the tests
+	# are even bring run, so I'd like to return to this later.
+	# We don't want to skip test_qt entirely, so just skip this particular
+	# assert for now.
+	"${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
+)
+
+src_prepare() {
+	default
+
+	# Warning:
+	#
+	# While it might be rather tempting to add yet another sed here,
+	# please don't. There have been several bugs in Gentoo's packaging
+	# of calibre from seds-which-become-stale. Please consider
+	# creating a patch instead, but in any case, run the test suite
+	# and ensure it passes.
+	#
+	# If in doubt about a problem, checking Fedora or Arch Linux's packaging
+	# is recommended, as Arch Linux's PKGBUILD is maintained by a Calibre
+	# contributor. Or just ask them.
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+	sed -e "/^            os.chdir(os.path.join(src_dir, 'build'))$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', os.path.join(os.path.basename(src_dir), 'Makefile')])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
+		-i setup/build.py || die "sed failed to patch build.py"
+}
+
+src_compile() {
+	# TODO: get qmake called by setup.py to respect CC and CXX too
+	tc-export CC CXX
+
+	# bug 821871
+	local MY_LIBDIR="${ESYSROOT}/usr/$(get_libdir)"
+	export FT_LIB_DIR="${MY_LIBDIR}" HUNSPELL_LIB_DIR="${MY_LIBDIR}" PODOFO_LIB_DIR="${MY_LIBDIR}"
+
+	PATH="${T}/bin:$(qt5_get_bindir):${PATH}" ${EPYTHON} setup.py build || die
+}
+
+src_test() {
+	# Skipped tests:
+	# - 7z (unpackaged Python dependency: py7zr)
+	# - test_unrar (unpackaged Python dependency: unrardll)
+	#
+	# Note that we currently have a hack to skip one part of test_qt!
+	# See PATCHES for more.
+	CALIBRE_PY3_PORT=1 ${PYTHON} setup.py test \
+			--exclude-test-name 7z \
+			--exclude-test-name test_mem_leaks \
+			--exclude-test-name test_searching \
+			--exclude-test-name test_unrar || die
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="$(qt5_get_bindir)/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+		"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 17fdf894c646..a8bc55c01040 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,4 +1,3 @@
-AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
-DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
-EBUILD discount-2.2.7-r2.ebuild 1697 BLAKE2B f6a68291682e44d6adfa9fdb40fe7e1c1bbac2c0981fd86f223344053c6510b27b4c734613c0acc4f29b31f5ffc862924ceaeda442fc7a52f27f111d6ce7e882 SHA512 cd1653e485b7785f630017210eb5268ac7c42c362cd95e2bea38f977f99c79cfd3aef8c35aa292d6764868f404bb74f77b068596a3b17c7001488c7a0c761308
+DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
+EBUILD discount-2.2.7b.ebuild 1646 BLAKE2B 8899290dcd57c89c75f9b0f43f05d78ff4a118170b276336121d33a135bbad9d442efec9a5638ee89aeb2310b50fd560bf4f5983d23cdca64b8129e7a1aaa9cd SHA512 dad24beffca897253cba4be15436e2637666843ff88742009fc7d521b54234c771a53bf12fe1948ad3e12c1a4e52acf676e9d6f3ccd6c84347982402b2072f65
 MISC metadata.xml 245 BLAKE2B 4988fa1366a9b8a3769e503545339cdd493a0bdc362ca9237b158b94549de1f061477546b00fd3b21dc9325812423f7207071e22e3234d5c0b88c755197557d2 SHA512 e00be68ab9ad3acfce3d2d48721c47cf50e2c6358c9ceb45a2a23fc5303826ea26b9205ce4f230121c2e40c9c467367f2dc57863680899b21e8005034aa9118c
diff --git a/app-text/discount/discount-2.2.7-r2.ebuild b/app-text/discount/discount-2.2.7b.ebuild
similarity index 94%
rename from app-text/discount/discount-2.2.7-r2.ebuild
rename to app-text/discount/discount-2.2.7b.ebuild
index 10730afd7a96..e53c8e7547af 100644
--- a/app-text/discount/discount-2.2.7-r2.ebuild
+++ b/app-text/discount/discount-2.2.7b.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=8
@@ -15,8 +15,6 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
-
 src_prepare() {
 	default
 
diff --git a/app-text/discount/files/gethopt-undefined.patch b/app-text/discount/files/gethopt-undefined.patch
deleted file mode 100644
index b74e2e79bc1a..000000000000
--- a/app-text/discount/files/gethopt-undefined.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -139,7 +139,7 @@
- 
- pandoc_headers.o: tools/pandoc_headers.c config.h
- 	$(BUILD) -c -o pandoc_headers.o tools/pandoc_headers.c
--pandoc_headers: pandoc_headers.o
-+pandoc_headers: pandoc_headers.o $(MKDLIB) $(COMMON)
- 	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
- 
- branch.o: tools/branch.c config.h
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 196ce1ab7265..7bdf953bcf9e 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -3,7 +3,7 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.3.2.tar.gz 991782 BLAKE2B ece8c4cbac2c242c23b4b8c5ab2daf1037705dbf58ad29b4863dd01cb30b2d98e11828f2b9d1ce3823aec419c871cc3dd1092e4659e10ef3e3cd2df867255be4 SHA512 886635bb55c5f0c774445e4a0f14d39e2d08eeb964257037062c2e97c2cf3348be8c631ff5e7a13144936127761964bdc60ff1e0dd6f63b292a655626f91ef62
 DIST enchant-2.3.3.tar.gz 990877 BLAKE2B 310b66931e803ccb643a47c1476122a558de7a192b50f532d4cdababe55d398268bf5bfcc0ed556d665af88f6c183c1871147d302ad39a7ebd4fc29e1ab16967 SHA512 c97764a8f219033b440cbfb820624f54993b19ba1f38b56f20336889304f753c7c513008bb92cd1424bfbf528c2d473f35bef93d9140063612e3a270fd000deb
 EBUILD enchant-1.6.1-r1.ebuild 1625 BLAKE2B 8f42b0410fa9b7565c5eebb849fa32c8850e8d77d65d34cc5f69a6ae553acf3bbf702e85d134387e8b2a75ad22f43426021d65b5ef4ac4f8e92cd6b3236c0d9c SHA512 fb0da3b82a95b9af44b7f35c05c204f6eaf2529fe72dcfe00b2e9a0ba6edfccdacda4f87e0e167548d66b2256beef4177bf4ee7fbad9a4817ed5688270531de3
-EBUILD enchant-1.6.1-r2.ebuild 1409 BLAKE2B a97738ba4d5106c8ac058fc8c184fe6e43f010d6bc68451710060eea06253a0c959691c6a5bfce6054a739c7af0ee5e150dba302988711e4aba93f435a98bf37 SHA512 32cdc506270fd6a5fa957a59410472b884c203b62c53b06e8ebf9c2489e4dd889cb84005ccb92795047459b6968cc68dab243e0f387d007ebe9a65447727e10c
+EBUILD enchant-1.6.1-r2.ebuild 1402 BLAKE2B 82313fac47e2aa83cba94e715ea231ae1f2185c534a47efb591ad0c4f03a87b5439bb35343e2c25dc2d5713e77831e74746e46c3a159d3683321a728f8a1d94e SHA512 b91a1745d398a453cbe34d320079e9f17a29c4ebf23eab5dd69006f433593acc4cfe0c184d3b6ffa1211e36851a0e17ea98e2c0cfbcf4df3d5d41a9d6b4e013e
 EBUILD enchant-2.3.2.ebuild 1234 BLAKE2B db4fc98f82f8dc5a139a01c61836629e128138482e78bdd7ad3b99b0b1a1a0a52f5c7c352fa6094fccc0ab42f3adcff8bc4e730aaa3cfeb13560e5a0f64967e4 SHA512 4e55587f310f6970002bed29142c20ae42afa67995624f6785aa102534b2ae837dde841bd1db201a1b302cd0bcce78fb068d75debe1435d696791d3f6e552bc5
-EBUILD enchant-2.3.3-r1.ebuild 1313 BLAKE2B 6311e31b2d8ace612ac0478c24ef49ea4a2e1e3db4192cd37e6dd90317b64f8f5122ef87effd4f574715deacf7f813952b94db0c653bcc6c75dcba6e1689ac35 SHA512 7fc30e3f143bc150b0c06165ade0d74a45dcbf3e69d83c9cd25d8d69fc226b43379df7cfc67da1a36e5420b8df2ce41baf60adb6f95f656abb31ca5260cb5c06
+EBUILD enchant-2.3.3-r1.ebuild 1307 BLAKE2B 8b743def4211ad6b85868bcecae94b6538a2384f548b9c91a22652880a2014d21cd38bb89c42286b40c96aaad2e9bacd5e0389825869794ca442faa15e32b2cc SHA512 3f369d1fab76861faf2158c8f379784a3ce92ae42d9f67a3b285ac71249f4a8d2b1c7c4d048502e17c64ab3019814869176c2857d8db1e0882123ceeb94e6840
 MISC metadata.xml 626 BLAKE2B 292276574828700f2688f2a5b1fc09a1c57a0e39ea89067bb728ac773654ab7ae073be8d2af1cd68f8d4f28f7fcf9fb2f7782db63c0ab7f457d389ab66c95c18 SHA512 894afee900f5a285cbd7715b7fd689e645013c134dbf5a8b5bd8aee9dd886793010a907ed6164d393896648a1932721bc404a7a96e38fe1705705dbd5848bbff
diff --git a/app-text/enchant/enchant-1.6.1-r2.ebuild b/app-text/enchant/enchant-1.6.1-r2.ebuild
index d4302d6ca527..25628fd99c79 100644
--- a/app-text/enchant/enchant-1.6.1-r2.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.3.3-r1.ebuild b/app-text/enchant/enchant-2.3.3-r1.ebuild
index 8e298e6d2d4f..e749a7903c56 100644
--- a/app-text/enchant/enchant-2.3.3-r1.ebuild
+++ b/app-text/enchant/enchant-2.3.3-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell nuspell test voikko"
 RESTRICT="!test? ( test )"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 24bf8c27f3bc..1e34bc64dd2a 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -5,6 +5,6 @@ DIST evince-42.2.tar.xz 2854836 BLAKE2B ed8b9e6117d2d456e59d5fd4aac664b73fb45058
 DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
 EBUILD evince-41.3.ebuild 3094 BLAKE2B fe2c2043c253f814971a5b969362ee476888cf84d77aa3c2c3fbe9739f5c0bbca71fa4e299443b37b3cd50a915a0cb23dc515ab9f589f36c3669283d810250e5 SHA512 8e433656bb0a3a0906a70e76face51562382024dabb7354114010517e6134cd25fe46f1a0def22d748445730273c58db2ba22f8c57731cb12a95cdb264cc7950
 EBUILD evince-42.1.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
-EBUILD evince-42.2.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
+EBUILD evince-42.2.ebuild 2982 BLAKE2B e5c9636f07a3753ee22b51a7cc93c62d18f85358b659a03695956e1de463af926103b638734757d7312ab774a369e8006936e9692594d274366ee52354cedd05 SHA512 d513cd58ac2215971eabf20012122c6c16a85340f5e2990120913deab38342de25c5ff3ba44ecf6f0908cad97ba4a9b528a5fdf74bc222207bb5afcd760be79f
 EBUILD evince-42.3.ebuild 2985 BLAKE2B 87fee16941d147f814ec070aafbe49511543d52a2e7002f18b81e6808603f2af6762567a53e3094fb5ea8094b2042dbf5b1a95a364e613b4027351ff9b895def SHA512 f0f2767ed97610288c524e6724c070ca386d6261138660eba4778676c7b124c2781f73591d41b63954ec25c56018d067e664e20ea097d2af23ff5b97bc179c58
 MISC metadata.xml 882 BLAKE2B 5a52fc8a3986b5a07774f6b157e0c13b3c29a6f5d9bbbedba6367a0dce8a057c6c43ac9b2864a98ec4413e66365971935e4f111ae2be0d2430769f3fcb2b5047 SHA512 73a18d8f42a94322d8292b4ace3bc256dd170af87f160f9e33c12c3b5c76c2032beebbb7eaf9facd2f9d9ee8d669f0f5f805dfeef5c406f75f13f90105521f9f
diff --git a/app-text/evince/evince-42.2.ebuild b/app-text/evince/evince-42.2.ebuild
index c8e4f7b17473..b299f33dce27 100644
--- a/app-text/evince/evince-42.2.ebuild
+++ b/app-text/evince/evince-42.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 98cb4b648358..94d34a0a1530 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.10.0.tar.xz 432484 BLAKE2B aee73d1745720d7c5bef1264ca717866321696953a8c0f2a538e7c8ea2133b8c666b1521280fd6c4f1a9333f178b2559bc21e462f94f7e217480bd3cb5068068 SHA512 8c776f2ea388ab145bc53de112ddc8e737c65ce7be0518edfe695f3e677a89c57a4826eb0fcdc39c5023bd1839ebd60a6a25eb8ac8e3363d0c406994828b743f
 DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
-EBUILD gspell-1.10.0.ebuild 1525 BLAKE2B 0adbf3faf4893c8d279a848111d68ac5aefd8d48f2ee0ba5f9135b33ae3d1866d37848d80daed35b0ee0a2db2dfeaeec386a5ea74ef8d4c9546d4679217eb948 SHA512 b2a1da5cad0bf01eb03d90398a5f8a56f1a1e7b7b2ac0f9947bc58045ad4af26411b9a784e55b61234b38257174c91cebc9742d84f829067ff9e91bf803a74ad
+EBUILD gspell-1.10.0.ebuild 1520 BLAKE2B c6df5d6053d5d53a0de4cc3a18e034cac8a09ed97ae488cc7b2db8827b1fc1c4f42d4ddecdbcc2b39898af2e54ea5ae80ec829ba9d86e7452f3495f32e6090ee SHA512 80093a05324dce95b86c79b3197201a3cf1a120ae5dc7b012ff171d521e59056daf3978431bcc8566bea65df96733ece84891b5f703bbfcac00987af6eeb1947
 EBUILD gspell-1.9.1.ebuild 1508 BLAKE2B 3bc7ce7b37f35fc7d8916421d73bbb7c0af3de238e7308270664172737dde15e5d56010077c41734d78b0903efdedc6bff97d41c68f9d728875724d392e029c2 SHA512 b5fe49ebbd959c5a3860e1c9eaa0412b93bfe3e48a640665a8795a7890232b91890c99a82b6688222206e2bb37793e2fe66400dc98fe36c36b3e1f756c9f2a76
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/gspell/gspell-1.10.0.ebuild b/app-text/gspell/gspell-1.10.0.ebuild
index 4fc667187f18..43f8285f7883 100644
--- a/app-text/gspell/gspell-1.10.0.ebuild
+++ b/app-text/gspell/gspell-1.10.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
deleted file mode 100644
index 25eb0b45eddb..000000000000
--- a/app-text/jabref/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX jabref-2.10-javax.swing-java-9+.patch 14266 BLAKE2B cfd504d6258b3318865996fdeb2e19fe1712b713d80e73af2f813b2854e26e769e18a8e7ee70d28ac47f889c1c84ddd27c7a40dcf01bcfa219ed310130230b3f SHA512 e01ddaaf8ca0d4d6cf78f1a4a367164173decb345e400f16f2ea5eef78f80970ddaa75a8c23f2552b48d33c3989d21ff6701c0631c72d3000a28716257eca40d
-AUX jabref-2.10-skip-failing-tests.patch 14972 BLAKE2B bbe4e6b4b94890cfe0db1c03ce6823a782ad93ffd0ccb9b1f23f218152ad556db92db25a9ab96c46d0cb47e2d288fe854d72932675ced23c7add01a25c448801 SHA512 d3669dd6520c6ac18e1d8be7966acdccd429de00f814ba71623f7abb183ccc933dc46c39ba90744ad301918140eafaf5adc17ae78281dcccc96dea2e1b8697dd
-AUX jabref-2.10-test-jvm-props-args.patch 1846 BLAKE2B 1d278c20ecfea4923d4e28bb8ceb1af35b23b8ca7324d68a1852f289bc29ecf8bed44a483b13d87e9e9d48162ac56d6d09f5cdb42e41b25d7ddedfa20b0cf3fc SHA512 b81aa6b7e2c65409180dedcf4e0e1bdd65f32b64a72ec2588b9fcda1caa31d3dfd82690c975ef1ca39a2040f549b97267643a5b1633812bcddc0a428f9330429
-AUX jabref-2.10-test-prefs.xml 935 BLAKE2B 6429d261893c8388d4f2f5ee8328a649ded5d9756f48187d77a317a97bf20ef4d3c9da5c29a754e40548a774ab59bb9dfc2ef3e2e0d1708f1b9fbd7b3d15fd90 SHA512 e9ab3bb2faa4eda9e2fe8f282c9b669934d94d0461baa0cfbfddfffd3a7abf5c75f7d164ef6d5ad46f54aa7783c560c87ccfba82ec8cc98dc6dc0c6aded029f9
-DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
-EBUILD jabref-2.10-r7.ebuild 3934 BLAKE2B 8cf3addb28717913e11c301cd60a8898e1fdddde3b6e5fa4620c60704c225fa5721bc9a669f1b5717aa476898c61d4f723bf423d6fa42a7236bb7ea0019f63ba SHA512 982e684fb4c89045fed2e06fea786e4f691f7b4a7aeb0e4a2c6fce505a3f20825974ee29033782ec3f6d8cd28a650d0438149542c5bbc3834ae9744f50e571f4
-MISC metadata.xml 538 BLAKE2B 42838a006f22851a46a0327962db710293807bf0a88ada771d14a55109d4b304a3c128547d9e9fcbf98c7d7f4807ce40310f32040109d7531f22c5f2cf93e050 SHA512 6023ce4d2b7ce8165511cc356dc99fcfb2b6f6c16064ea64558c96d83973ae8dd826b8b4a0fedac134f4609739d15fa981a444900b4b281d2f4c85affc5a8087
diff --git a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch b/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
deleted file mode 100644
index 30dbe53e9725..000000000000
--- a/app-text/jabref/files/jabref-2.10-javax.swing-java-9+.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-From bd03f07b5bcc5feb558caec4fbfd556947630fb9 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 08:25:21 -0800
-Subject: [PATCH] Update uses of javax.swing API members for Java 9+
-
-These changes are backward compatible with Java 8.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../sf/jabref/FindUnlinkedFilesDialog.java    |  9 ++++-----
- .../net/sf/jabref/collab/EntryChange.java     |  6 +++---
- .../sf/jabref/groups/AddToGroupAction.java    |  5 +++--
- .../net/sf/jabref/groups/GroupSelector.java   |  9 +++++----
- .../net/sf/jabref/groups/GroupTreeNode.java   | 20 ++++++++-----------
- src/java/net/sf/jabref/groups/GroupsTree.java | 17 ++++++++--------
- .../jabref/imports/AppendDatabaseAction.java  |  5 +++--
- .../sf/jabref/sql/exporter/DBExporter.java    |  9 +++++----
- 8 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-index 4bcbd73..5f7473d 100644
---- a/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-+++ b/src/java/net/sf/jabref/FindUnlinkedFilesDialog.java
-@@ -669,13 +669,12 @@ public class FindUnlinkedFilesDialog extends JDialog {
- 	 *            The root node representing a tree structure.
- 	 * @return A list of files of all checked leaf nodes.
- 	 */
--	@SuppressWarnings("unchecked")
- 	private List<File> getFileListFromNode(CheckableTreeNode node) {
- 		List<File> filesList = new ArrayList<File>();
--		Enumeration<CheckableTreeNode> childs = node.depthFirstEnumeration();
-+		Enumeration<TreeNode> childs = node.depthFirstEnumeration();
- 		ArrayList<CheckableTreeNode> nodesToRemove = new ArrayList<FindUnlinkedFilesDialog.CheckableTreeNode>();
- 		while (childs.hasMoreElements()) {
--			CheckableTreeNode child = childs.nextElement();
-+			CheckableTreeNode child = (CheckableTreeNode) childs.nextElement();
- 			if (child.isLeaf() && child.getSelected()) {
- 				File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
- 				if (nodeFile != null && nodeFile.isFile()) {
-@@ -1105,9 +1104,9 @@ public class FindUnlinkedFilesDialog extends JDialog {
- 		@SuppressWarnings("unchecked")
- 		public void setSelected(boolean bSelected) {
- 			isSelected = bSelected;
--			Enumeration<CheckableTreeNode> children = this.children();
-+			Enumeration<TreeNode> children = this.children();
- 			while (children.hasMoreElements()) {
--				CheckableTreeNode child = children.nextElement();
-+				CheckableTreeNode child = (CheckableTreeNode) children.nextElement();
- 				child.setSelected(bSelected);
- 			}
- 
-diff --git a/src/java/net/sf/jabref/collab/EntryChange.java b/src/java/net/sf/jabref/collab/EntryChange.java
-index 924fd25..d479995 100644
---- a/src/java/net/sf/jabref/collab/EntryChange.java
-+++ b/src/java/net/sf/jabref/collab/EntryChange.java
-@@ -21,6 +21,7 @@ import java.util.TreeSet;
- import javax.swing.JComponent;
- import javax.swing.JLabel;
- import javax.swing.JScrollPane;
-+import javax.swing.tree.TreeNode;
- 
- import net.sf.jabref.*;
- import net.sf.jabref.undo.NamedCompound;
-@@ -83,11 +84,10 @@ public class EntryChange extends Change {
- 
-   
- public boolean makeChange(BasePanel panel, BibtexDatabase secondary, NamedCompound undoEdit) {
--    @SuppressWarnings("unchecked")
-     boolean allAccepted = true;
--    Enumeration<Change> e = children();
-+    Enumeration<TreeNode> e = children();
-     for (; e.hasMoreElements();) {
--        Change c = e.nextElement();
-+        Change c = (Change) e.nextElement();
-         if (c.isAcceptable() && c.isAccepted())
-             c.makeChange(panel, secondary, undoEdit);
-         else allAccepted = false;
-diff --git a/src/java/net/sf/jabref/groups/AddToGroupAction.java b/src/java/net/sf/jabref/groups/AddToGroupAction.java
-index 30d57c8..1840e32 100644
---- a/src/java/net/sf/jabref/groups/AddToGroupAction.java
-+++ b/src/java/net/sf/jabref/groups/AddToGroupAction.java
-@@ -20,6 +20,7 @@ import java.util.Enumeration;
- import java.util.Vector;
- 
- import javax.swing.AbstractAction;
-+import javax.swing.tree.TreeNode;
- import javax.swing.undo.AbstractUndoableEdit;
- 
- import net.sf.jabref.BasePanel;
-@@ -59,10 +60,10 @@ public class AddToGroupAction extends AbstractAction {
-         
-         if (m_move) {
-             // collect warnings for removal
--            Enumeration<GroupTreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
-+            Enumeration<TreeNode> e = ((GroupTreeNode) m_node.getRoot()).preorderEnumeration();
-             GroupTreeNode node;
-             while (e.hasMoreElements()) {
--                node = e.nextElement();
-+                node = (GroupTreeNode) e.nextElement();
-                 if (!node.getGroup().supportsRemove())
-                     continue;
-                 for (int i = 0; i < entries.length; ++i) {
-diff --git a/src/java/net/sf/jabref/groups/GroupSelector.java b/src/java/net/sf/jabref/groups/GroupSelector.java
-index 4700d13..4813f12 100644
---- a/src/java/net/sf/jabref/groups/GroupSelector.java
-+++ b/src/java/net/sf/jabref/groups/GroupSelector.java
-@@ -60,6 +60,7 @@ import javax.swing.event.PopupMenuListener;
- import javax.swing.event.TreeSelectionEvent;
- import javax.swing.event.TreeSelectionListener;
- import javax.swing.tree.DefaultTreeModel;
-+import javax.swing.tree.TreeNode;
- import javax.swing.tree.TreePath;
- import javax.swing.undo.AbstractUndoableEdit;
- import javax.swing.undo.CompoundEdit;
-@@ -1498,8 +1499,8 @@ public class GroupSelector extends SidePaneComponent implements
-         GroupTreeNode node;
-         AbstractGroup group;
-         Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
--        for (Enumeration<GroupTreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
--            node = e.nextElement();
-+        for (Enumeration<TreeNode> e = groupsRoot.preorderEnumeration(); e.hasMoreElements();) {
-+            node = (GroupTreeNode) e.nextElement();
-             group = node.getGroup();
-             int i;
-             for (i = 0; i < entries.length; ++i) {
-@@ -1537,8 +1538,8 @@ public class GroupSelector extends SidePaneComponent implements
-       BibtexEntry entry;
-       Vector<GroupTreeNode> vec = new Vector<GroupTreeNode>();
-       Map<String, String> dummyMap = new HashMap<String, String>(); // just because I don't want to use null...
--        for (Enumeration<GroupTreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
--          node = e.nextElement();
-+        for (Enumeration<TreeNode> e = groupsRoot.depthFirstEnumeration(); e.hasMoreElements();) {
-+          node = (GroupTreeNode) e.nextElement();
-           rule = node.getSearchRule();
-             for (Iterator<BibtexEntry> it = matches.iterator(); it.hasNext();) {
-               entry = it.next();
-diff --git a/src/java/net/sf/jabref/groups/GroupTreeNode.java b/src/java/net/sf/jabref/groups/GroupTreeNode.java
-index 9013af4..c55c7cf 100644
---- a/src/java/net/sf/jabref/groups/GroupTreeNode.java
-+++ b/src/java/net/sf/jabref/groups/GroupTreeNode.java
-@@ -81,10 +81,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- 	 */
- 	public String getTreeAsString() {
- 		StringBuffer sb = new StringBuffer();
--		Enumeration<GroupTreeNode> e = preorderEnumeration();
-+		Enumeration<TreeNode> e = preorderEnumeration();
- 		GroupTreeNode cursor;
- 		while (e.hasMoreElements()) {
--			cursor = e.nextElement();
-+			cursor = (GroupTreeNode) e.nextElement();
-             sb.append(cursor.getLevel()).append(" ").append(cursor.getGroup().toString()).append("\n");
- 		}
- 		return sb.toString();
-@@ -194,26 +194,22 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- 	}
- 
- 	@Override
--	@SuppressWarnings("unchecked")
--	public Enumeration<GroupTreeNode> preorderEnumeration(){
-+	public Enumeration<TreeNode> preorderEnumeration(){
- 		return super.preorderEnumeration();
- 	}
- 	
- 	@Override
--	@SuppressWarnings("unchecked")
--	public Enumeration<GroupTreeNode> depthFirstEnumeration(){
-+	public Enumeration<TreeNode> depthFirstEnumeration(){
- 		return super.depthFirstEnumeration();
- 	}
- 	
- 	@Override
--	@SuppressWarnings("unchecked")
--	public Enumeration<GroupTreeNode> breadthFirstEnumeration(){
-+	public Enumeration<TreeNode> breadthFirstEnumeration(){
- 		return super.breadthFirstEnumeration();
- 	}
- 	
- 	@Override
--	@SuppressWarnings("unchecked")
--	public Enumeration<GroupTreeNode> children(){
-+	public Enumeration<TreeNode> children(){
- 		return super.children();
- 	}
- 	
-@@ -224,10 +220,10 @@ public class GroupTreeNode extends DefaultMutableTreeNode implements
- 	 */
- 	public AbstractGroup[] getMatchingGroups(BibtexEntry entry) {
- 		Vector<AbstractGroup> matchingGroups = new Vector<AbstractGroup>();
--		Enumeration<GroupTreeNode> e = preorderEnumeration();
-+		Enumeration<TreeNode> e = preorderEnumeration();
- 		AbstractGroup group;
- 		while (e.hasMoreElements()) {
--			group = (e.nextElement()).getGroup();
-+			group = ((GroupTreeNode) e.nextElement()).getGroup();
- 			if (group.contains(null, entry)) // first argument is never used
- 				matchingGroups.add(group);
- 		}
-diff --git a/src/java/net/sf/jabref/groups/GroupsTree.java b/src/java/net/sf/jabref/groups/GroupsTree.java
-index e58a567..c3daf94 100644
---- a/src/java/net/sf/jabref/groups/GroupsTree.java
-+++ b/src/java/net/sf/jabref/groups/GroupsTree.java
-@@ -31,6 +31,7 @@ import javax.swing.JTree;
- import javax.swing.SwingUtilities;
- import javax.swing.ToolTipManager;
- import javax.swing.tree.DefaultMutableTreeNode;
-+import javax.swing.tree.TreeNode;
- import javax.swing.tree.TreePath;
- import javax.swing.tree.TreeSelectionModel;
- import javax.swing.undo.AbstractUndoableEdit;
-@@ -415,14 +416,14 @@ public class GroupsTree extends JTree implements DragSourceListener,
- 
- 	/** Expand this node and all its children. */
- 	public void expandSubtree(GroupTreeNode node) {
--		for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
--			expandPath(new TreePath(e.nextElement().getPath()));
-+		for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-+			expandPath(new TreePath(((GroupTreeNode) e.nextElement()).getPath()));
- 	}
- 
- 	/** Collapse this node and all its children. */
- 	public void collapseSubtree(GroupTreeNode node) {
--		for (Enumeration<GroupTreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
--			collapsePath(new TreePath((e.nextElement())
-+		for (Enumeration<TreeNode> e = node.depthFirstEnumeration(); e.hasMoreElements();)
-+			collapsePath(new TreePath(((GroupTreeNode) e.nextElement())
- 					.getPath()));
- 	}
- 
-@@ -432,8 +433,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
- 	 */
- 	public boolean hasExpandedDescendant(TreePath path) {
- 		GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
--		for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
--			GroupTreeNode child = e.nextElement();
-+		for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
-+			GroupTreeNode child = (GroupTreeNode) e.nextElement();
- 			if (child.isLeaf())
- 				continue; // don't care about this case
- 			TreePath pathToChild = path.pathByAddingChild(child);
-@@ -449,8 +450,8 @@ public class GroupsTree extends JTree implements DragSourceListener,
- 	 */
- 	public boolean hasCollapsedDescendant(TreePath path) {
- 		GroupTreeNode node = (GroupTreeNode) path.getLastPathComponent();
--		for (Enumeration<GroupTreeNode> e = node.children(); e.hasMoreElements();) {
--			GroupTreeNode child = e.nextElement();
-+		for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
-+			GroupTreeNode child = (GroupTreeNode) e.nextElement();
- 			if (child.isLeaf())
- 				continue; // don't care about this case
- 			TreePath pathToChild = path.pathByAddingChild(child);
-diff --git a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-index ad84bbc..5fdce20 100644
---- a/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-+++ b/src/java/net/sf/jabref/imports/AppendDatabaseAction.java
-@@ -22,6 +22,7 @@ import java.util.Iterator;
- import java.util.List;
- 
- import javax.swing.JOptionPane;
-+import javax.swing.tree.TreeNode;
- 
- import net.sf.jabref.BaseAction;
- import net.sf.jabref.BasePanel;
-@@ -175,9 +176,9 @@ public class AppendDatabaseAction extends BaseAction {
-                   ExplicitGroup group;
-                   BibtexEntry entry;
-                   
--                  for (Enumeration<GroupTreeNode> e = newGroups
-+                  for (Enumeration<TreeNode> e = newGroups
- 					.preorderEnumeration(); e.hasMoreElements();) {
--					node = e.nextElement();
-+					node = (GroupTreeNode) e.nextElement();
- 					if (!(node.getGroup() instanceof ExplicitGroup))
- 						continue;
- 					group = (ExplicitGroup) node.getGroup();
-diff --git a/src/java/net/sf/jabref/sql/exporter/DBExporter.java b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-index deb9126..1518e0b 100644
---- a/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-+++ b/src/java/net/sf/jabref/sql/exporter/DBExporter.java
-@@ -32,6 +32,7 @@ import java.util.Set;
- import java.util.Vector;
- 
- import javax.swing.JOptionPane;
-+import javax.swing.tree.TreeNode;
- 
- import net.sf.jabref.BibtexDatabase;
- import net.sf.jabref.BibtexEntry;
-@@ -201,9 +202,9 @@ public abstract class DBExporter extends DBImporterExporter{
- 			rs.next();
- 			myID = rs.getInt("groups_id");
- 		}
--		for (Enumeration<GroupTreeNode> e = cursor.children(); e
-+		for (Enumeration<TreeNode> e = cursor.children(); e
- 				.hasMoreElements();)
--			currentID = populateEntryGroupsTable(e.nextElement(), myID,
-+			currentID = populateEntryGroupsTable((GroupTreeNode) e.nextElement(), myID,
- 					currentID, out, database_id);
- 		return currentID;
- 	}
-@@ -338,9 +339,9 @@ public abstract class DBExporter extends DBImporterExporter{
- 			rs.next();
- 			myID = rs.getInt("groups_id");
- 		}
--		for (Enumeration<GroupTreeNode> e = cursor.children(); e
-+		for (Enumeration<TreeNode> e = cursor.children(); e
- 				.hasMoreElements();)
--			currentID = populateGroupsTable(e.nextElement(), myID, ++currentID,
-+			currentID = populateGroupsTable((GroupTreeNode) e.nextElement(), myID, ++currentID,
- 					out, database_id);
- 		return currentID;
- 	}
--- 
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch b/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
deleted file mode 100644
index 95a2e7310fe6..000000000000
--- a/app-text/jabref/files/jabref-2.10-skip-failing-tests.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-From 0791be415c4104a4c7ff79487823a9f0a7a1d2ec Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 10:47:42 -0800
-Subject: [PATCH] Skip tests that fail when run directly outside Portage
-
-Because the tests are JUnit 3 tests, to skip them, each test's method
-name needs to be changed to something that does not start with 'test'.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- .../tests/net/sf/jabref/UtilFindFileTest.java |  4 ++--
- src/java/tests/net/sf/jabref/UtilTest.java    | 10 +++++-----
- .../jabref/export/layout/LayoutEntryTest.java | 19 ++++++++++++++-----
- .../sf/jabref/export/layout/LayoutTest.java   |  4 ++--
- .../sf/jabref/export/layout/RTFCharsTest.java |  4 ++--
- .../AuthorLastFirstAbbreviatorTester.java     |  2 +-
- .../export/layout/format/DOICheckTest.java    | 10 +++++++++-
- .../sf/jabref/imports/BibtexParserTest.java   |  4 ++--
- .../sf/jabref/imports/CopacImporterTest.java  |  4 ++--
- .../sf/jabref/imports/IsiImporterTest.java    |  4 ++--
- .../net/sf/jabref/imports/OAI2ImportTest.java |  2 +-
- .../tests/net/sf/jabref/util/XMPUtilTest.java |  6 +++---
- 12 files changed, 45 insertions(+), 28 deletions(-)
-
-diff --git a/src/java/tests/net/sf/jabref/UtilFindFileTest.java b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-index 7718c2c..b82360b 100644
---- a/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-+++ b/src/java/tests/net/sf/jabref/UtilFindFileTest.java
-@@ -27,7 +27,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
- 	 * 
- 	 * @throws IOException
- 	 */
--	public void testFindFileRelative() throws IOException {
-+	public void skipTestFindFileRelative() throws IOException {
- 
- 		// Most basic case
- 		assertEqualPaths("HipKro03.pdf", findFile(root.getAbsolutePath() + "/test/",
-@@ -144,7 +144,7 @@ public class UtilFindFileTest extends FileBasedTestCase {
- 
- 	}
- 
--	public void testFindFile() throws IOException {
-+	public void skipTestFindFile() throws IOException {
- 
- 		// Simple case
- 		assertEqualPaths("HipKro03.pdf", Util.findFile(entry, database, root.getAbsolutePath()
-diff --git a/src/java/tests/net/sf/jabref/UtilTest.java b/src/java/tests/net/sf/jabref/UtilTest.java
-index a2e4ac6..50a6cad 100644
---- a/src/java/tests/net/sf/jabref/UtilTest.java
-+++ b/src/java/tests/net/sf/jabref/UtilTest.java
-@@ -65,7 +65,7 @@ public class UtilTest extends TestCase {
- 
- 	}
- 
--	public void testPlaceDialog() {
-+	public void skipTestPlaceDialog() {
- 		Dialog d = new JDialog();
- 		d.setSize(50, 50);
- 		Container c = new JWindow();
-@@ -111,7 +111,7 @@ public class UtilTest extends TestCase {
- 		assertEquals("\"{a\"}", Util.shaveString("  \"{a\"}    "));
- 	}
- 
--	public void testCheckLegalKey() {
-+	public void skipTestCheckLegalKey() {
- 
- 		assertEquals("AAAA", Util.checkLegalKey("AA AA"));
- 		assertEquals("SPECIALCHARS", Util.checkLegalKey("SPECIAL CHARS#{\\\"}~,^"));
-@@ -119,7 +119,7 @@ public class UtilTest extends TestCase {
- 		assertEquals("", Util.checkLegalKey("\n\t\r"));
- 	}
- 
--	public void testReplaceSpecialCharacters() {
-+	public void skipTestReplaceSpecialCharacters() {
- 		// Shouldn't German � be resolved to Ae
- 		assertEquals("AeaeaAAA", Util.replaceSpecialCharacters("������"));
- 		assertEquals("Hallo Arger", Util.replaceSpecialCharacters("Hallo Arger"));
-@@ -221,7 +221,7 @@ public class UtilTest extends TestCase {
- 	}
- 
- 
--	public void testFieldAndFormat(){
-+	public void skipTestFieldAndFormat(){
- 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("[author]", entry, database));
- 
- 		assertEquals("Eric von Hippel and Georg von Krogh", Util.getFieldAndFormat("author", entry, database));
-@@ -239,7 +239,7 @@ public class UtilTest extends TestCase {
- 		assertEquals("HipKro03", Util.getFieldAndFormat("[bibtexkey:]", entry, database));
- 	}
- 
--	public void testUserFieldAndFormat(){
-+	public void skipTestUserFieldAndFormat(){
- 
- 		String[] names = Globals.prefs.getStringArray(NameFormatterTab.NAME_FORMATER_KEY);
- 		if (names == null)
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-index 8d6cea9..3197bf0 100644
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutEntryTest.java
-@@ -92,11 +92,20 @@ public class LayoutEntryTest extends TestCase
- 	/*************************/
- 	/****** tests Cases ******/
- 	/*************************/
-+
-+	/*
-+	 * An empty test case to avoid "No tests found" failure:
-+	 *
-+	 * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
-+	 * No tests found in tests.net.sf.jabref.export.layout.LayoutEntryTest
-+	 */
-+	public void testDummy() {
-+	}
- 	
- 	/**
- 	 * @throws Exception
- 	 */
--	public void testNoHighlighting() throws Exception
-+	public void skipTestNoHighlighting() throws Exception
- 	{
- 		// say that this bibtex object was found
- 		mBTE.setSearchHit(true);
-@@ -113,7 +122,7 @@ public class LayoutEntryTest extends TestCase
- 	/**
- 	 * @throws Exception
- 	 */
--	public void testHighlightingOneWordCaseInsesitive() throws Exception
-+	public void skipTestHighlightingOneWordCaseInsesitive() throws Exception
- 	{
- 		// say that this bibtex object was found
- 		mBTE.setSearchHit(true);
-@@ -135,7 +144,7 @@ public class LayoutEntryTest extends TestCase
- 	/**
- 	 * @throws Exception
- 	 */
--	public void testHighlightingTwoWordsCaseInsesitive() throws Exception
-+	public void skipTestHighlightingTwoWordsCaseInsesitive() throws Exception
- 	{
- 		// say that this bibtex object was found
- 		mBTE.setSearchHit(true);
-@@ -162,7 +171,7 @@ public class LayoutEntryTest extends TestCase
- 	/**
- 	 * @throws Exception
- 	 */
--	public void testHighlightingOneWordCaseSesitive() throws Exception
-+	public void skipTestHighlightingOneWordCaseSesitive() throws Exception
- 	{
- 		// say that this bibtex object was found
- 		mBTE.setSearchHit(true);
-@@ -184,7 +193,7 @@ public class LayoutEntryTest extends TestCase
- 	/**
- 	 * @throws Exception
- 	 */
--	public void testHighlightingMoreWordsCaseSesitive() throws Exception
-+	public void skipTestHighlightingMoreWordsCaseSesitive() throws Exception
- 	{
- 		// say that this bibtex object was found
- 		mBTE.setSearchHit(true);
-diff --git a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-index cb98fe3..e54a9b8 100644
---- a/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/LayoutTest.java
-@@ -66,7 +66,7 @@ public class LayoutTest extends TestCase {
- 		assertEquals("Misc", layout("\\bibtextype", "@misc{bla, author={This\nis\na\ntext}}"));
- 	}
- 
--	public void testHTMLChar() throws Exception {
-+	public void skipTestHTMLChar() throws Exception {
- 		String layoutText = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author} ",
- 			"@other{bla, author={This\nis\na\ntext}}");
- 
-@@ -95,7 +95,7 @@ public class LayoutTest extends TestCase {
- 	 * 
- 	 * @throws Exception
- 	 */
--	public void testLayout() throws Exception {
-+	public void skipTestLayout() throws Exception {
- 
- 		String layoutText = layout(
- 			"<font face=\"arial\">\\begin{abstract}<BR><BR><b>Abstract: </b> \\format[HTMLChars]{\\abstract}\\end{abstract}</font>",
-diff --git a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-index 43627ba..e977614 100644
---- a/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/RTFCharsTest.java
-@@ -35,7 +35,7 @@ public class RTFCharsTest extends TestCase {
- 		assertEquals("{\\b hallo}", layout.format("{\\textbf hallo}"));
- 	}
- 	
--	public void testComplicated() {
-+	public void skipTestComplicated() {
- 		LayoutFormatter layout = new RTFChars();
- 
- 		assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e \\u230ae should be \\u230ae", layout.format("Réflexions sur le timing de la quantité \\ae should be æ"));
-@@ -43,7 +43,7 @@ public class RTFCharsTest extends TestCase {
- 		assertEquals("h\\u225all{\\uc2\\u339oe}", layout.format("h\\'all\\oe "));
- 	}
- 
--	public void testSpecialCharacters() {
-+	public void skipTestSpecialCharacters() {
- 
- 		LayoutFormatter layout = new RTFChars();
- 
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-index 446a89c..496f18b 100644
---- a/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/AuthorLastFirstAbbreviatorTester.java
-@@ -76,7 +76,7 @@ public class AuthorLastFirstAbbreviatorTester extends TestCase {
- 	 * Testcase for 
- 	 * http://sourceforge.net/tracker/index.php?func=detail&aid=1466924&group_id=92314&atid=600306
- 	 */
--	public void testJrAuthor(){
-+	public void skipTestJrAuthor(){
- 		String name = "Other, Jr., Anthony N.";
- 		assertEquals("Other, A. N.", abbreviate(name));
- 	}
-diff --git a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-index dceb88c..d0680e3 100644
---- a/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-+++ b/src/java/tests/net/sf/jabref/export/layout/format/DOICheckTest.java
-@@ -5,8 +5,16 @@ import net.sf.jabref.export.layout.LayoutFormatter;
- import net.sf.jabref.export.layout.format.DOICheck;
- 
- public class DOICheckTest extends TestCase {
-+	/*
-+	 * An empty test case to avoid "No tests found" failure:
-+	 *
-+	 * warning(junit.framework.TestSuite$1)junit.framework.AssertionFailedError:
-+	 * No tests found in tests.net.sf.jabref.export.layout.format.DOICheckTest
-+	 */
-+	public void testDummy() {
-+	}
- 
--	public void testFormat() {
-+	public void skipTestFormat() {
- 		LayoutFormatter lf = new DOICheck();
- 
- 		assertEquals("", lf.format(""));
-diff --git a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-index f8bc3dc..ad4899b 100644
---- a/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/BibtexParserTest.java
-@@ -257,7 +257,7 @@ public class BibtexParserTest extends TestCase {
- 		assertEquals("2002", e.getField("year"));
- 	}
- 
--	public void testNewlineHandling() throws IOException {
-+	public void skipTestNewlineHandling() throws IOException {
- 
- 		BibtexEntry e = BibtexParser.singleFromString("@article{canh05," +
- 				"a = {a\nb}," +
-@@ -320,7 +320,7 @@ public class BibtexParserTest extends TestCase {
- 	 * @author Uwe Kuehn
- 	 * @author Andrei Haralevich
- 	 */
--	public void testFileNaming3(){
-+	public void skipTestFileNaming3(){
- 		BibtexEntry e = BibtexParser.singleFromString("@article{canh05," 
- 			+ "title = {\nHallo \nWorld \nthis \n is\n\nnot \n\nan \n\n exercise \n \n.\n \n\n},\n"
- 			+ "tabs = {\nHallo \tWorld \tthis \t is\t\tnot \t\tan \t\n exercise \t \n.\t \n\t},\n"
-diff --git a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-index 558ebb7..20f6c02 100644
---- a/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/CopacImporterTest.java
-@@ -24,7 +24,7 @@ public class CopacImporterTest extends TestCase {
- 		super.tearDown();
- 	}
- 
--	public void testIsRecognizedFormat() throws IOException {
-+	public void skipTestIsRecognizedFormat() throws IOException {
- 
-         CopacImporter importer = new CopacImporter();
- 		assertTrue(importer.isRecognizedFormat(CopacImporterTest.class
-@@ -46,7 +46,7 @@ public class CopacImporterTest extends TestCase {
- 			.getResourceAsStream("IsiImporterTestMedline.isi")));
- 	}
- 
--	public void testImportEntries() throws IOException {
-+	public void skipTestImportEntries() throws IOException {
- 		CopacImporter importer = new CopacImporter();
- 
- 		List<BibtexEntry> entries = importer.importEntries(CopacImporterTest.class
-diff --git a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-index 041a31e..ee89a2b 100644
---- a/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/IsiImporterTest.java
-@@ -33,7 +33,7 @@ public class IsiImporterTest extends TestCase {
- 		super.tearDown();
- 	}
- 
--	public void testIsRecognizedFormat() throws IOException {
-+	public void skipTestIsRecognizedFormat() throws IOException {
- 
-         IsiImporter importer = new IsiImporter();
- 		assertTrue(importer.isRecognizedFormat(IsiImporterTest.class
-@@ -201,7 +201,7 @@ public class IsiImporterTest extends TestCase {
- 		assertEquals(BibtexEntryType.ARTICLE, b.getType());
- 	}
- 
--	public void testImportEntriesWOS() throws IOException {
-+	public void skipTestImportEntriesWOS() throws IOException {
- 		IsiImporter importer = new IsiImporter();
- 
- 		List<BibtexEntry> entries = importer.importEntries(IsiImporterTest.class
-diff --git a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-index 9e7e73f..e0bfdf5 100644
---- a/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-+++ b/src/java/tests/net/sf/jabref/imports/OAI2ImportTest.java
-@@ -112,7 +112,7 @@ public class OAI2ImportTest extends TestCase {
- 		assertEquals("", OAI2Fetcher.fixKey("arXiv:"));
- 	}
- 
--	public void testOnline() throws InterruptedException {
-+	public void skipTestOnline() throws InterruptedException {
- 
- 		{
- 			OAI2Fetcher fetcher = new OAI2Fetcher();
-diff --git a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-index 74571f5..5b74057 100644
---- a/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-+++ b/src/java/tests/net/sf/jabref/util/XMPUtilTest.java
-@@ -345,7 +345,7 @@ public class XMPUtilTest extends TestCase {
- 	 * @throws TransformerException
- 	 *             Should not happen.
- 	 */
--	public void testPrivacyFilter() throws IOException, TransformerException {
-+	public void skipTestPrivacyFilter() throws IOException, TransformerException {
- 
- 		{ // First set:
- 			prefs.putBoolean("useXmpPrivacyFilter", true);
-@@ -1023,7 +1023,7 @@ public class XMPUtilTest extends TestCase {
- 		assertEquals(t3BibtexEntry(), b);
- 	}
- 
--	public void testReadWriteDC() throws IOException, TransformerException {
-+	public void skipTestReadWriteDC() throws IOException, TransformerException {
- 		List<BibtexEntry> l = new LinkedList<BibtexEntry>();
- 		l.add(t3BibtexEntry());
- 
-@@ -1103,7 +1103,7 @@ public class XMPUtilTest extends TestCase {
- 
- 	}
- 
--	public void testWriteSingleUpdatesDCAndInfo() throws IOException,
-+	public void skipTestWriteSingleUpdatesDCAndInfo() throws IOException,
- 			TransformerException {
- 		List<BibtexEntry> l = new LinkedList<BibtexEntry>();
- 		l.add(t3BibtexEntry());
--- 
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch b/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
deleted file mode 100644
index d3e413e9b0fd..000000000000
--- a/app-text/jabref/files/jabref-2.10-test-jvm-props-args.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f24492bff17f728bcf2b5a50069669ae08b8b372 Mon Sep 17 00:00:00 2001
-From: Yuan Liao <liaoyuan@gmail.com>
-Date: Sat, 19 Feb 2022 10:21:04 -0800
-Subject: [PATCH] Add JVM system properties and argument for tests
-
-The changes to system properties ensure that all paths the application
-may write to during the tests are not protected by the Portage sandbox.
-
-The extra argument added is required on Java 17+, but it should also be
-compatible with all Java versions that support the Java Platform Module
-System (JPMS), namely Java 9+.  On older Java versions, it is optional.
-On Java 8, however, including it in JVM arguments would cause an error.
-
-Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
----
- build.xml | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index d13a9f3..788a4d1 100644
---- a/build.xml
-+++ b/build.xml
-@@ -28,7 +28,7 @@
- 
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-->
- 
--<project name="JabRef" default="jars" basedir=".">
-+<project name="JabRef" default="jars" basedir="." xmlns:if="ant:if">
- 
- 	<!--++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-         PROPERTY SETUP
-@@ -596,7 +596,14 @@ version=${jabref.version}</echo>
- 	</target>
- 
- 	<target name="test" depends="buildtest" description="Runs all unit tests">
-+		<condition property="shouldAddOpens">
-+			<javaversion atleast="9" />
-+		</condition>
- 		<java fork="yes" classname="junit.textui.TestRunner" failonerror="true">
-+			<sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}" />
-+			<sysproperty key="user.home" value="${user.home}" />
-+			<jvmarg if:set="shouldAddOpens"
-+				value="--add-opens=java.desktop/java.awt=ALL-UNNAMED" />
- 			<arg value="tests.net.sf.jabref.AllTests" />
- 			<classpath refid="classpathTest" />
- 		</java>
--- 
-2.34.1
-
diff --git a/app-text/jabref/files/jabref-2.10-test-prefs.xml b/app-text/jabref/files/jabref-2.10-test-prefs.xml
deleted file mode 100644
index aea6c9f32bbd..000000000000
--- a/app-text/jabref/files/jabref-2.10-test-prefs.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE map SYSTEM "http://java.sun.com/dtd/preferences.dtd">
-<map MAP_XML_VERSION="1.0">
-  <entry key="autoAssignGroup" value="true"/>
-  <entry key="autoCompFF" value="false"/>
-  <entry key="autoCompFirstNameMode" value="both"/>
-  <entry key="autoCompLF" value="false"/>
-  <entry key="autoComplete" value="true"/>
-  <entry key="autolinkExactKeyOnly" value="true"/>
-  <entry key="caseSensitiveSearch" value="false"/>
-  <entry key="nameFormatterFormats" value=""/>
-  <entry key="nameFormatterNames" value=""/>
-  <entry key="pdfDirectory" value=""/>
-  <entry key="pushToApplication" value="Insert selected citations into LyX/Kile"/>
-  <entry key="showFileLinksUpgradeWarning" value="false"/>
-  <entry key="useRegExpSearch" value="false"/>
-  <entry key="useXmpPrivacyFilter" value="false"/>
-  <entry key="xmpPrivacyFilter" value="pdf;timestamp;keywords;owner;note;review"/>
-</map>
diff --git a/app-text/jabref/jabref-2.10-r7.ebuild b/app-text/jabref/jabref-2.10-r7.ebuild
deleted file mode 100644
index 2dfca56aca17..000000000000
--- a/app-text/jabref/jabref-2.10-r7.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc test"
-
-inherit desktop java-pkg-2 java-ant-2 virtualx xdg-utils
-
-MY_PV="${PV/_beta/b}"
-
-DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
-HOMEPAGE="https://www.jabref.org/"
-SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-CP_DEPEND="
-	dev-java/antlr:0
-	dev-java/antlr:3
-	dev-java/commons-logging:0
-	dev-java/fontbox:1.7
-	dev-java/jaxb-api:2
-	dev-java/jempbox:1.7
-	dev-java/log4j-12-api:2
-	dev-java/log4j-api:2
-	dev-java/spin:0
-	dev-java/microba:0
-	>=dev-java/glazedlists-1.8.0:0"
-
-TEST_DEPEND="dev-java/junit:0"
-
-# Since Java 9, all dependencies ever imported by the source files need to be
-# present in the classpath for Javadoc generation; in particular, for this
-# package, the test sources will be passed to 'javadoc' as well as the non-test
-# sources, so all test dependencies are required for Javadoc generation too.
-DEPEND="
-	>=virtual/jdk-1.8:*
-	doc? ( ${TEST_DEPEND} )
-	test? ( ${TEST_DEPEND} )
-	${CP_DEPEND}"
-
-# Java 17+ requires "--add-opens=java.desktop/java.awt=ALL-UNNAMED" in
-# arguments to the JVM that runs this application; Java 8 and 11 are OK,
-# but dev-java/java-config currently does not support declaration like
-# RDEPEND="|| ( virtual/jre:1.8 virtual/jre:11 )" yet, so only one JRE
-# version can be chosen to run this application at the moment.
-RDEPEND="
-	virtual/jre:1.8
-	${CP_DEPEND}"
-
-IDEPEND="dev-util/desktop-file-utils"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-javax.swing-java-9+.patch"
-	"${FILESDIR}/${P}-skip-failing-tests.patch"
-	"${FILESDIR}/${P}-test-jvm-props-args.patch"
-)
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_DOC_TARGET="docs"
-
-# Some dependencies that are also used by the tests need to be explicitly
-# listed to avoid "package does not exist" compiler errors.
-EANT_TEST_GENTOO_CLASSPATH="junit"
-EANT_TEST_GENTOO_CLASSPATH+=",antlr-3,commons-logging,glazedlists"
-EANT_TEST_GENTOO_CLASSPATH+=",jempbox-1.7,microba,spin"
-EANT_TEST_EXTRA_ARGS="-Djava.io.tmpdir=${T} -Duser.home=${HOME}"
-
-src_prepare() {
-	default
-
-	# If we cleanup it complains about missing jarbundler
-	# BUILD FAILED
-	# taskdef class net.sourceforge.jarbundler.JarBundler cannot be found
-#	java-pkg_clean
-
-	# Remove bundled dependencies.
-	rm lib/antlr*.jar || die
-	rm lib/fontbox*.jar || die
-	rm lib/glazedlists*.jar || die
-	rm lib/jempbox*.jar || die
-	rm lib/microba.jar || die
-	rm lib/spin.jar || die
-	rm lib/plugin/commons-logging.jar || die
-
-	# Remove unjarlib target (do this only once we have removed all
-	# bundled dependencies in lib).
-	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
-
-	# Fix license file copy operation for microba bundled lib.
-	sed -i -e 's:^.*microba-license.*::' build.xml
-
-	use doc && EANT_GENTOO_CLASSPATH_EXTRA="$(\
-		java-pkg_getjars --build-only junit)"
-}
-
-src_test() {
-	# Tests will launch the application, which requires an X environment.
-	# An existing application preference file is needed to make the tests
-	# non-interactive; otherwise, the application will hang for user input.
-	local prefs_dir="${HOME}/.java/.userPrefs/net/sf/jabref"
-	mkdir -p "${prefs_dir}" ||
-		die "Failed to create application preference directory for tests"
-	cp "${FILESDIR}/${P}-test-prefs.xml" "${prefs_dir}/prefs.xml" ||
-		die "Failed to copy application preference file for tests"
-	virtx java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
-
-	dodoc src/txt/README
-	use doc && java-pkg_dojavadoc build/docs/API
-
-	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
-	newicon src/images/JabRef-icon-48.png JabRef-icon.png
-	make_desktop_entry ${PN} JabRef JabRef-icon Office
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
deleted file mode 100644
index 8117e0980392..000000000000
--- a/app-text/jabref/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>nicolasbock@gentoo.org</email>
-		<name>Nicolas Bock</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jabref</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 62c61c5d0bb0..d2265f6f6eb2 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,6 +1,6 @@
 DIST pelican-4.5.3.tar.gz 1397896 BLAKE2B 86651f627af67c571ea65a7ddfe7b62747fd2798575d6c4f29455da9b2371ce22ff42d715f148925724764e0a9fbb8aeba1dea401226856d3681b520dbb0a7af SHA512 b1ef5f145b448f6af2e25a1adb399521d4c5f7eef3ee2aa5ab9e50c223623b5c9961622e5cd835a3cb72dbbe905da6ac9217128f2459a35892bbac9b9cb6d26a
 DIST pelican-4.7.2.tar.gz 1401737 BLAKE2B c277844c0c153f71aae051dd8897e9abf8fd1ddc7c49251aaa7b85b7324a85da0ded74e8328a4b64ec79b8e6b4e143d5496b8535900c8a88bfa6198489c0a80c SHA512 9fbf2ecb3c193e976e01a4d095095ac55d56fe45aa24467d91635bbecb9df933ccabd6a456e14c6ee14ce0a845820be8d887917af314e13c7a3eb830cb0ce7e6
 EBUILD pelican-4.5.3.ebuild 1427 BLAKE2B 6ad0b6a55dd7c7f8c0773d3fc4145ad435238d70e7539c405b485564200b40e21e9de1a4d6b546811a744ffa66ed9fc5066c6e18d7377af237c8692f7a31c666 SHA512 d5e598875ab2b68150ecceda3cd0235b139b38d3cb4c638b53d12951b698603af6ede5156b55d3edce3737b712a8ef990b59c577a981ee9417a2cbe0ef10d500
-EBUILD pelican-4.7.2-r1.ebuild 1492 BLAKE2B 0e46cbb8718b3c407c0187dc67526a1857cac3a26ac6b53431b8d27e3153871e5466a07154665b7037c5d6f06a137d53b6008143d6bcd04d1a65ca19ea135e32 SHA512 e6e274b05d0ae893c6d7764eafcd4fc1f18a840d28a5591610f774846065a941c52ee622d4aacf49f3e80bab3300d59eca97c68c1bcbb1e3ca6a2ae395490fa9
+EBUILD pelican-4.7.2-r1.ebuild 1491 BLAKE2B 5fb86dcad81f9375a99a062a855f09e475163f02ed5490a67d01244babbec2b4609139e3427a97d62117d6e4478252550d89ed3060e3c8b368e08f14b4b5a26f SHA512 98a2b837c61c02411562aae68361329dda4df3a7db49145097bdb8c805a27c96cfd4aa9d1debcb43291502f0502e733c945efa458f3708f9fdd6750980d674a0
 EBUILD pelican-9999.ebuild 1479 BLAKE2B e59c32738a088a5cff6f2d94c6b5c7d3d65533e30f6207e4ca6c2d1f2bb32ec9ac9b8b3cfb9e7241f35de6cb992fe0e0f7f249ea3925219ac437d204440f6204 SHA512 d42118d548e2f7f8dd73bbceb2af56062cf48adb26321e276652cee657812a3e7764b126b5f0a785ea6a508f94341d603bfacd7553ab78bcc05010e4854b074b
 MISC metadata.xml 438 BLAKE2B 4b720595a6a1fde51470943c2ff8c070e6c5cc54f46edef595d918f8fda032772091ab15c42f49137f09f996cda3e30d1c9dfd0442ffc5782550b5c7372696f2 SHA512 9831ed0ef638b572fc548cd3d57020454af4964bff9481a10e7ff0cde5f2d68959216d0dee0497ba6ec448b150f339fccad1f9eee8bfed1ea092dfc27cac0f0d
diff --git a/app-text/pelican/pelican-4.7.2-r1.ebuild b/app-text/pelican/pelican-4.7.2-r1.ebuild
index 368acba99bd1..6c0fa3709909 100644
--- a/app-text/pelican/pelican-4.7.2-r1.ebuild
+++ b/app-text/pelican/pelican-4.7.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv ~x86"
 IUSE="doc examples markdown"
 
 RESTRICT="test"
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 2de76295d0f3..92664526daba 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,7 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
 AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3
+DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
 DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
+EBUILD xiphos-4.2.1-r1.ebuild 1682 BLAKE2B 4136fd1c7010e96030296e471a71184efd9505f189e983e7df25f0151794018cc6332d6b50e26aecfa85a2de75647d12eb272e67abaa547d1ed33dff37894f60 SHA512 273d988a3ce76216d9ecb557e7a5cbff227c7da10ea0ba871084e6eb08dbc721ed7f0b7a4f5cc24ddd560d23e7e40793b7267b96dc6dce078160fe3558eeeef4
 EBUILD xiphos-4.2.1.ebuild 1393 BLAKE2B 6e59124485b686c670c090ef6f7386a5333d0c5c8f0ae3464b7e4cd6634d82e20e23cf5a2f0168f4478d677d37d9e8b1ce80fb6f23b0cd902f4a789c64df31e6 SHA512 14bef0d296789b79dc19f76991b74e4aedd4bb6a313cf87061236b822d3d6ecd9996ec215d38542db671787d933c88a1d1bf76f4f0b1229e1c9e322f7430a173
 MISC metadata.xml 326 BLAKE2B 6e99d7d8c95e9bfa87837796634393c1ebf086accebfaa22345c6c262c66ab90761576acec3f90424285b9109b80a46d45b80e877a0159331a52676501eb1882 SHA512 bfafd9d630dc1419404e6fddef05f8de268b3130bb6cc34dc77233e7d05e292b7ab50eab1727d1815ece71cef6aaec881e03e30a0345b38e9252a433092efd7c
diff --git a/app-text/xiphos/xiphos-4.2.1-r1.ebuild b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..599d16c4ff3f
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+	>=app-text/sword-1.8.1
+	dev-libs/glib:2
+	dev-libs/icu
+	>=net-libs/biblesync-1.2.0
+	net-libs/webkit-gtk:4
+	sys-libs/zlib[minizip]
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+	app-arch/zip
+	app-text/yelp-tools
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	dev-util/itstool
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
+	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DDBUS=$(usex dbus)
+		-DDEBUG=$(usex debug)
+		-DPOSTINST=off
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local rver
+		for rver in ${REPLACING_VERSIONS}; do
+			if ver_test "${rver}" -le "4.2.1"; then
+				ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+				ewarn "Studypad and the personal commentary will no longer work."
+				break
+			fi
+		done
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 1ad30fa8a2c0..0317b215770e 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-tools-41.0.tar.xz 38696 BLAKE2B 6e742e0a5c05c07fb3eb80fc10201650597fb36702edb1d9fc022895daf2837daed15a2b69b8bed7aaf0106139c7138e8f13b65b63cf18971e14eaeb0068b061 SHA512 76b8f9568942426698716d655bc2e7a614a26e40a820d1f4ce5021a54c6baa081d494bda06657cfc1c11999e14a8601c97ae51bb3519555b8ee1111489c0e10e
 DIST yelp-tools-42.0.tar.xz 38788 BLAKE2B 9dc34f4b32c9e705f427bccad5ff3c2cd222a1391a780dde145ea894e1065fc873fd4ef020d1b7809b653c8237fbedb7f0b07d684d8d906b7af7a0fd8ebf79e4 SHA512 ff6168a33b2dedd12f7fb5d5aa6394a554b7ad8956cc7121e5f1a520f9fb20bd4cad93e22b5e8b2f8aa82ca5a1711a0634d8619c731e46730084e28f29725786
 EBUILD yelp-tools-41.0.ebuild 938 BLAKE2B fcf0fe7e317d01bebcb1367f6b4fc2a6634031bf699b6f1b3f1dd4466904214f026e12a81cf5090c72ce0593715f1ba8dea4ee597161258c38f1cd46cde3dbb5 SHA512 b510ec02125d500cd606cab89f52230ecbb1339d71c97d4287f66e0583ad7584034cc39af7d987a8d01bb5357819f3dee918ef11f0a303853852f47369d72d8a
-EBUILD yelp-tools-42.0.ebuild 942 BLAKE2B 9c603b683ff08aa4bbe6843fb253e28cb217759a1e285bc617df00da9ea4edab1412c51e86ff841a352b5da449532db5d9dee0dd0ecf2b08f9a0d348d8599a2c SHA512 1ab63b8274adf359b1bd87740b78ec0077b998be4a684ac90945c238210a1ea698ffe2204600affdf7b2cc3e73407ded3e781d5ec933de3e43e789991ca47291
+EBUILD yelp-tools-42.0.ebuild 936 BLAKE2B a2f7ac94e4e755cd87868c1f11c74d9b211f5b12cb0bc69236203cab320efe30ca31c837078cb46cea53f957e3320af92998ce226cdbcbfce972feb6f5a62d30 SHA512 bfa75defe85fcdb1623ef066a15ce61b01b10f5d201086132db820f7a12233164c787e8b42ebd70b662c257a06909c13c277c2af2cc28a3312941dc0590f35b1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-text/yelp-tools/yelp-tools-42.0.ebuild b/app-text/yelp-tools/yelp-tools-42.0.ebuild
index 24a0d5b029d9..3ec172ca54cd 100644
--- a/app-text/yelp-tools/yelp-tools-42.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 2072109206ed..449b4342cecd 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 13ebfe8c56f4..ac4dc7c244eb 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -4,8 +4,8 @@ DIST glibmm-2.70.0.tar.xz 7874312 BLAKE2B 5d0fb24444b8764e3f972f342a540164debb84
 DIST glibmm-2.72.0.tar.xz 7921092 BLAKE2B 5f4fc6df527c6aa99886d5afe3233e15a37319b1c9f7814c9edfb574abb9b0f1b04b887d2a275c113382b0b301df7d3a22fc4398bc61746bd353e73015ec8770 SHA512 73b8a7a3848e6c5c9b532547002e44dd77ffc1ff80a849772cf48ad5aa14965bd6d50e01b2597320a578c3655bc1ef42804c0f2fed3ac632fe0218f8ae4788ff
 DIST glibmm-2.72.1.tar.xz 7921260 BLAKE2B 4078c2a6a12257a84844d3fa70c8b6a1a28b7c184f7bfbbf2adc882806099f7211378d6f7a23b1bbd18514ced9ada56642eb4ff877ee23cd70b4ee6b1a270510 SHA512 aa52c7b73e8f3437c2da9e8da74f84b9f07c7aa40a5fa232a7418b4af19575cbde01f6cbe9fb3fc3227bd9281a9439156a51d10a0c2c1a1beca226c7c93fe660
 EBUILD glibmm-2.66.2.ebuild 1256 BLAKE2B e850bb1ec055ec7e830b4aceb303b8b8fedb24c1acd9de5bd5932fa8d61760fefcadea24b95c0a4a24c1f0d211b8921202060796d7e63c1b4075264fb9d6e6cb SHA512 ff78e19e8bb53abac62e36fdfda170a063d966f1a49af1aab43148cde9a304122b6e3be5b6b052fef3d518c312402e1b312fdedddd3dea6b13c5b2db92ca526b
-EBUILD glibmm-2.66.4.ebuild 1308 BLAKE2B 9fec3e986291079020a6aab366d3ac88a8ff98a2b8ace39367295f6a6888e5d3f7c21086bc52ff7ba89ac87afb32b3fee4fc3849c00dab2fb3745e555a20e877 SHA512 1ef69455442edb9feff8250fd69c0b1773c39f4477e093ef4cb191174368a196393826c8cb054186fb1e35248009cd11139511834f02bdd479bdf6d85b5cf331
+EBUILD glibmm-2.66.4.ebuild 1302 BLAKE2B e3a3a04c2b501bd14bf9884354f1c86462e048b0e6ae55e20492244af18aee010c6d19eb3efc63ec9abb476430d9de1cc044d8f528721520e0fdef58acf1006a SHA512 124fd8939c7301a4a153e8bc7630ea8f69d52fba859c458430eaed0d9ebe4238fe515b2b3e35d773cd97e1543670ea4d3ab0d0d874cebf5927727f3214c9d27a
 EBUILD glibmm-2.70.0.ebuild 1212 BLAKE2B 58cd0a0cbb861d29153f8dfb1e28a15531cdf1fb1c75e46281d48a742f1a1c1bb051268a69f810d24b4f7fb2b71f40526b50407641ca387e033cc4fad6826042 SHA512 094d370ff18425a9cd353eac2193bab1722145a79a087d475487b3b158e6a715257435f7a8862dbe2489d3fc07a66b0ebd3bfdb936c989d0fa09301a6cd8159d
 EBUILD glibmm-2.72.0.ebuild 1220 BLAKE2B 0f0a6c63302ff1ec8575b7ab4b05f9f0e19dce3794c6ee6050123231a2b9634375da2fa0e557363ef1412096d9566d04b500040620d07e9ab4870daf2f53c197 SHA512 7274568100b5ce24189ad54fd5bd5c8ac51950d7030d76657394cf5c17408f439faec1fbb5b1bf94d1851e27bc93203da0406619f9b7e01c51fb10478146f91e
-EBUILD glibmm-2.72.1.ebuild 1220 BLAKE2B 0f0a6c63302ff1ec8575b7ab4b05f9f0e19dce3794c6ee6050123231a2b9634375da2fa0e557363ef1412096d9566d04b500040620d07e9ab4870daf2f53c197 SHA512 7274568100b5ce24189ad54fd5bd5c8ac51950d7030d76657394cf5c17408f439faec1fbb5b1bf94d1851e27bc93203da0406619f9b7e01c51fb10478146f91e
+EBUILD glibmm-2.72.1.ebuild 1214 BLAKE2B 826b50f2e8812a3ec60e66a3bf3755b8feb373beed77ca733e50a98434d7963b98e173915a110be59f5e53855d1fcaf9c76df99f4f1970ea6d7ad5a92065164f SHA512 66cf0e8fea99c210a3dcb13c16e8942704ea984ce8834200a44f33e9672078e1ad97a9f2d66591aaac7ef0103f4da81a2212c6976e5086a293cfaa9aa26f40d6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/glibmm/glibmm-2.66.4.ebuild b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
index c31432d315ca..53edd6af31b3 100644
--- a/dev-cpp/glibmm/glibmm-2.66.4.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.66.4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/glibmm/glibmm-2.72.1.ebuild b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
index f40448c218b4..dc0b61fc952a 100644
--- a/dev-cpp/glibmm/glibmm-2.72.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.72.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.68"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest
index ac0fce6d2023..3bd05d34d1de 100644
--- a/dev-cpp/gtkmm/Manifest
+++ b/dev-cpp/gtkmm/Manifest
@@ -5,7 +5,7 @@ DIST gtkmm-4.6.0.tar.xz 13910344 BLAKE2B fd46c2e0fbda32daf472cae00591ab2cff6027d
 DIST gtkmm-4.6.1.tar.xz 13911284 BLAKE2B a456d19a7a5146f6a4ba93a77a053318353f14152488703c77c5a5d8532b1caa074954af875559bea8739022e4ca2cda49ed6a424946362bf39c0acd94a3a69c SHA512 87867deb2b4b0e50841e42d5957f9030c31c4ec1178b71a884a84c3c3aca178100ceb011729559f8f8f761dbe241c3cf4d420cc16c5b5aedcdd1d78f582d006d
 EBUILD gtkmm-2.24.5-r1.ebuild 1536 BLAKE2B a2e3b097ac226e72ca62ee4f66cb6cab334de7422a4c61f45a30898df261d0ee7b7cdce4267ad1e2e1e1410e2eba6773d5c42a7374ba16f43a2bac27607b48a2 SHA512 552d38fbb89a06580a2f1ea7305357198e5d8b329aec1d0b38352f443442d489688d00c702181c30aba2708826a926092604cda8d5200065a792be623920cdf9
 EBUILD gtkmm-3.24.5.ebuild 1372 BLAKE2B fad17eb7a7aa67b1fdba65d42558bc5facef1a28b036635bcb2ec2813114ce259f3200d9b6aa06f0fc78353b1abbd8ed0fe9bee2668786b90b06e3e818d9db49 SHA512 8b8d26eb6b3d15c159ba466ee12cf28dff55d5c95622c31647b8a85cf65c4caf820a8e135019fc97cce7ef2ba10710b8ebdc0450568e8bc3f54299549a3df89c
-EBUILD gtkmm-3.24.6.ebuild 1415 BLAKE2B 175a528429867bc8753e7026a16e4d63ec1e2ab887e8bdb8205c8d35ed8262e11d48862a234b9945df03b6a4c3f087faa565c9b99df22c55c96f644256c87a1d SHA512 f8e159b266e669d4c83c57e7c7b41e7a21ef473e15c23c6bf65df1d62c0ab9fb554072497655e5cb53c790c6b080e762102abf7404392710b4b331b6a438f33f
+EBUILD gtkmm-3.24.6.ebuild 1409 BLAKE2B 036d2d26fab6f904a7e4db8f7452fbeb59e669be168833400d5c20485edbbd91490f774734ca0b180d0468de211ccb874a02247981d146d0db5fa0c9910b48ba SHA512 1c9d005006157b88209001215ce8dbdc6d060725ce9618eca92038765b67b516497fbdd990f2c0bc924553e7743dfa0c2211f00ef90bef7f5c4304daf29e108c
 EBUILD gtkmm-4.6.0.ebuild 991 BLAKE2B 7299f8bfdc1dcc8e9ddc75d251540368555f09c9c32112dee19d4f0c4151b9f655cde42b8bee58748225743369d58754252cb96b1041c3801d9a6fab684f0027 SHA512 516c52e0839d3ca3349358f32b167ee5e6bc9dd8cf59da58e42f6eaa1a542b6a5e75c2f3d649dd99e29717d0a1b2327995d7a682905e1d1c6339fc91242ae3bf
 EBUILD gtkmm-4.6.1.ebuild 1017 BLAKE2B e55a5951619c58f52bb77ab9358672155067568832d32f19f0d8e7808884dde78762b434b6c43cb72cc0efa267d5b3a77b54fd4a6ee7fdcf2f69a1a638f9d7c9 SHA512 2587c3992107cc479870c4ef343359832ae21bd6959921b3f73529266a20d6e39102577cb04935ba2cb326ae3f12cef2a544f3a287a53d9dc2f52635d80d0a4e
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
index 8abb75354caa..c0cd29977231 100644
--- a/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm"
 
 LICENSE="LGPL-2.1+"
 SLOT="3.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 IUSE="aqua doc test wayland X"
 REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/prometheus-cpp/Manifest b/dev-cpp/prometheus-cpp/Manifest
index 988746aa078b..2f0765327695 100644
--- a/dev-cpp/prometheus-cpp/Manifest
+++ b/dev-cpp/prometheus-cpp/Manifest
@@ -1,3 +1,5 @@
 DIST prometheus-cpp-1.0.0.tar.gz 56244 BLAKE2B 51ff199c0cd09367de873310a835b7a4a5893de11a6115b3de8ef142eb12b326ea7498a8adc155f3bbea6389da41eef91b5ef23cb0227ef1d1ceb64e4d7eac2e SHA512 baeb12725dd47b170e1ac94c23b2b18ba8aa11dedd95af7adee8fdf9ddebaddfca1ef75c30b1d65c94e1cfbcba2c41e0f4686f1a1de66beaba7dcd70ab190164
+DIST prometheus-cpp-1.0.1.tar.gz 56673 BLAKE2B 2f2396de0c3c544e92ecdf9f973941f7b61784db690bf3811841a522d3c40cb885e273ce62e66721674f8911fea7b58dc6ae5f0dc10cfdca803054445ca18250 SHA512 eb81b92de986853401f8900d19dfc58d68227d49c74be294b408adc0374292fb462b1f7f7aee522fb03d6fc2ea56f3187fa6ec182aeea169b8bdce38054ee805
 EBUILD prometheus-cpp-1.0.0.ebuild 827 BLAKE2B db34157d5a96e09bac17e977bf16d678d7e6045baf521efb1270b246744d11bf563d4ee338669dadf09249f5bcf122835963d1118deeb74196b4f861346af611 SHA512 4f02623e6d3b1f2bc90b550cc40c9e424547b7afe7d6f72fe3fe1e0768b82ebe0d15171c07349e3d7bdefbbf29c38efbdf56ec74d8a4a6ec36dc007777d7bb4e
+EBUILD prometheus-cpp-1.0.1.ebuild 827 BLAKE2B 8f3e24ea6980ca9cb40c0aa12d16e233090ac255c439ff1db0e747b17276a2c30a1e913bd9a2593b7fb1cf68d6d40eb01d6c25670cd4a5225d8f8998905949e9 SHA512 f9fcf730f91205c19194aed4979f63d03468f55e9f40b0522be4e1ab69fedbaea3276172d47980c34b7514c1884bfb1f494225355c87f6b54aa17abde2270636
 MISC metadata.xml 826 BLAKE2B 309447cc55a501661cb9bfa636bc54f7ba6c2ee2aec545b5a1a38fbbeaf7180fdda0c768ff941844a1cb83ce9b5d89520a0a143e5e0f87b86f57ca8aea82bd2f SHA512 7e2fe05bc17e6b40fffe6b75849953ca8dd6970adb38d5e5fa38bd03f9aea38df14ddb675dee70b8930cca4a9ec3c01c2bdf4ed36f4db2c4d5e4152e13ed09f4
diff --git a/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.1.ebuild b/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.1.ebuild
new file mode 100644
index 000000000000..6239a46b04df
--- /dev/null
+++ b/dev-cpp/prometheus-cpp/prometheus-cpp-1.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Prometheus Client Library for Modern C++"
+HOMEPAGE="https://github.com/jupp0r/prometheus-cpp"
+SRC_URI="https://github.com/jupp0r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test zlib"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-misc/curl
+	sys-libs/zlib
+	www-servers/civetweb[cxx]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/gtest
+	)"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PULL=yes
+		-DENABLE_PUSH=yes
+		-DENABLE_COMPRESSION=$(usex zlib)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_THIRDPARTY_LIBRARIES=OFF
+		-DGENERATE_PKGCONFIG=ON
+		-DRUN_IWYU=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-cpp/robin-hood-hashing/Manifest b/dev-cpp/robin-hood-hashing/Manifest
index 63e7ec44e0bb..cb9a16c43216 100644
--- a/dev-cpp/robin-hood-hashing/Manifest
+++ b/dev-cpp/robin-hood-hashing/Manifest
@@ -1,6 +1,3 @@
-DIST robin-hood-hashing-3.11.2.tar.gz 170488 BLAKE2B 5fb688f5e21f989456e139b64447393816593ad2a1c3537d067d8ea1717aceaa879e27616657354f62e1466ca491f9d302448a73cddb53c7156a623eb375016b SHA512 5d55f054e29ae34d410eb0103f9f0aa1faf47e313b9f089c73b9c26fd9bedf132f6bb13b4bcd2664309c32fe7e859e346d0a6e7ab7f46b294f9b8db207577795
 DIST robin-hood-hashing-3.11.5.tar.gz 177134 BLAKE2B b114c1d68ff2eae4cdb526e67def750a11056c2b5c400eab0870fda7c81dde5cf3bb168ea13ed3d34f2e57edffea5c58cb79ffb5328ecf839c723c71f54676d3 SHA512 5f73e089b1e8ec41a9bedded22bc64a789d3a3d04873a2ad9f8cc2970797a473b0f4d3436c2324b3ced85a0d983998a75b1dfaf2b7f3b77235b29806ff2fd489
-EBUILD robin-hood-hashing-3.11.2.ebuild 492 BLAKE2B 18958ad16e59d345e69cdd24f4fa2c31a870b90a16241ae252dd9b8973f668b0db46e139ebcaff5be559b524a504267a99b3ea1e202d80c9fc8f99e036b70bd4 SHA512 54c7c9921bb594cfb46c4b5bb7b5233ede6438f0734678f753236faf98e040d3a1a68e4e87c0da2f1ad473d975195f0efefeb34c4d17c24112cc4c67051723bd
 EBUILD robin-hood-hashing-3.11.5-r1.ebuild 586 BLAKE2B d4daa6220cb51afe1bd31ceaf0eb0dc4c622016bbf642dd7099f2de583098d0477643e33e0d80d7c4cb8adfad490449a4a047aba305d843af754187c1b819927 SHA512 9caff99a89320cfd3ee7edb230829811c75e4573bbdeaf21ae892e29c935556924c3cb09c6cf7410b4483cb03f113ab333ea231549b059223e5deb49aca0e592
-EBUILD robin-hood-hashing-3.11.5.ebuild 586 BLAKE2B 64a47f110761d6b0f0a31c45846463bbf4f3650b15a50069372247bb3386e5bad6b52466fe1869d8e32884bfa5895d9d70807071f3a627cbbc49dbf763d45a25 SHA512 6ac86bb1f27fc69dd6ba21c71d451138aac2dfa4543fd46567e4f37bcaf73ddf957d84efe81c4c98df825376eac7dad9b6f9d85b7462fa83b2f09a5f3ea22d02
 MISC metadata.xml 432 BLAKE2B 13444b194ca3577792724af24a8cab24ccb905027261334a26115b099ee36f3cd5b5ecd4d1dc71f03ef33962ab3c068d627c7c85baa8e212007339c27c2a97f1 SHA512 0a915db4e5e7b6ef284e8c798fba99b351c725fc8e18158f4176d0a8211af2215058ad59124780c11cdd3bd9d7a2a2a084131aa92a9921e50aaca76c7c86a154
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
deleted file mode 100644
index 1a32ac192607..000000000000
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
-HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
-
-LICENSE="MIT"
-SLOT="0"
-
-src_install() {
-	insinto /usr/include
-	doins src/include/robin_hood.h
-}
diff --git a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild b/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
deleted file mode 100644
index 6e42350ec553..000000000000
--- a/dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-SRC_URI="https://github.com/martinus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-DESCRIPTION="Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20"
-HOMEPAGE="https://github.com/martinus/robin-hood-hashing"
-
-LICENSE="MIT"
-SLOT="0"
-
-src_configure() {
-	local mycmakeargs=(
-		-DRH_STANDALONE_PROJECT=OFF
-		-DCMAKE_INSTALL_LIBDIR="${ESYSROOT}/usr/share/"
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest
index eabbe4007414..18f3a388fa20 100644
--- a/dev-cpp/sdbus-c++/Manifest
+++ b/dev-cpp/sdbus-c++/Manifest
@@ -2,8 +2,8 @@ AUX sdbus-c++-gtest-1.11.patch 2164 BLAKE2B 26bcf5be0de9bc9240123a1c7b6f676e069e
 AUX sdbus-c++-static-libsystemd.patch 417 BLAKE2B ec6120631ad48d70820c1070a47a224c837c838e0ff24c031b02fb4b9ef900da7b3a2c0b0e696066665a9004b9fcb68851c6971a220b2446da03dbbf42138ac5 SHA512 e42a080f580597aa7c3cddb71f6e6368addfe4a36b08b2944baf111dd70029c3d0d79868dabeaf78b91836c2a84939163ce10c3ffe4b36e53424be06c1fe1a0e
 DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5
 DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883
-DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
-DIST systemd-stable-249.11.tar.gz 10622702 BLAKE2B aa3a327ba8de73dd2ac5ecbd9065f2ca4ed56702d6bbd19de43580e6d56211be58ec7678c1609d843f7e960b71b251e0b7080c49338942cd3071076fa02f7acb SHA512 fed7f81933648945a4bfac9fb12150ecd84d32181f79be0e14e0b3a789343a87569f868670e0b8dfc2801fab39f7490f95ee8c29ba831d7611f78c14ace5ddd8
-EBUILD sdbus-c++-0.9.0-r2.ebuild 3469 BLAKE2B 1abd4ff6a344b55e79510e5506df4b01232c64fdecb265f5b7afdcd767294df666eabd62ea6bce87b4d33c594d8b92ce0ea8581ffdd258fc471576f2818f089c SHA512 d537ed59a00e831288492a5d4c8e4e457cfc777d7f8962cfa2cd16ddfc9f71e7f95edd47753cff78aada05784d0805b96063144273d443091ea63aa8218883be
-EBUILD sdbus-c++-1.1.0-r2.ebuild 3520 BLAKE2B 5adfd61f3debf7679caf87cfaa7166acd268a6524570e8e1ea682b4c3dddc99f017511f75eb25f15c82c59949d0da34db8543f566bdbfef4ee886740886bd47a SHA512 3a67d68f49109a85fffdf978867252b7cd5229a4e37fa0143fc35113e11b041f5cb0cf9528dc7c6d0e0f11459d24859ab10c83f89cc6e7425048042e262ac275
+DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
+EBUILD sdbus-c++-0.9.0-r3.ebuild 3555 BLAKE2B 28f0c7886f98a00288ab6bb5472ec06c30ed0dd72b8f0d6daf16fe8c410840604f2b47f45745abbe81e5a9fb55cc5d929298c87b1e724262eba9ccb3fe0b5134 SHA512 a72e2c393f8979d00d40dae23d30ea212ed1f9b7aa3ad02a2304e0902525d19838dca870567bc65e5dc201679ae51626355e1c1c6c5ce8e150a6364ceb9311bb
+EBUILD sdbus-c++-1.1.0-r3.ebuild 3606 BLAKE2B aa1ddb0cc15d0e9b97fd8001bc079e8e4537d07eca5926064daa1f13900e48310ddc06cd40f818873408a7b73529528758c2f1af45182d4e80c05752f6536836 SHA512 159b4292abf46b7353bb0c172ad20e94325397422f3fbdd65eb54b0985401836527cda1d5120b2103e1fa7bcaeb1efb0cca5ddcb00c14870ec1b9d7687e12f41
 MISC metadata.xml 418 BLAKE2B d05d643aa8ee2b37ffb36fd99116e85e714e0e64ef830cbee4f24e2e09315a24c439e0fcc8f0b4c5516860e4dd13730682c3d50a1f65dd1c2954628793791ee9 SHA512 b75a5467a9b29405732dbac6c9e18567f7b37319a4fbffc2b65098ea2d1c3fdcc903834080e6751ef41737290352fd7ab2d0d68296675fb19f5520b81625fcbf
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
similarity index 94%
rename from dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
index c5d7db3dcb17..29193a2602d6 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-249.11"
-MUSL_PATCHSET="249.5-r1"
+SDP="systemd-stable-250.6"
+MUSL_PATCHSET="250.4"
 
 DESCRIPTION="High-level C++ D-Bus library"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,8 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
 	!systemd? (
 		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
 		elibc_musl? (
-			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
 		)
 	)"
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
similarity index 94%
rename from dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
rename to dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
index 17152a67a98c..29fe7c8f37f6 100644
--- a/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
+++ b/dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
@@ -6,8 +6,8 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 inherit python-any-r1 meson cmake
 
-SDP="systemd-stable-249.11"
-MUSL_PATCHSET="249.5-r1"
+SDP="systemd-stable-250.6"
+MUSL_PATCHSET="250.4"
 
 DESCRIPTION="High-level C++ D-Bus library"
 HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp"
@@ -15,8 +15,9 @@ SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar
 	!systemd? (
 		https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz
 		elibc_musl? (
-			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
-			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+			https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
+			https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.gz
 		)
 	)"
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index b5d339f655d4..2b1c431fbfcb 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/mavlink_c/Manifest b/dev-embedded/mavlink_c/Manifest
new file mode 100644
index 000000000000..46fd08e87c1b
--- /dev/null
+++ b/dev-embedded/mavlink_c/Manifest
@@ -0,0 +1,3 @@
+DIST mavlink_c-20220518.tar.gz 875511 BLAKE2B d7776e8200b00802d77a07fac68625a9c72c9c6bec4d35be309235d31731581f7f5faf4b94792cc6158cc69ab56607ab4abb40ffd9879f24c861145fe5aded33 SHA512 9dd29cc6d8efb0d3e18a5d992741fa29ff986c328fb56f73f4e49d31787ced4185d76da98e6efecb9ad25e3e620683bba139f9d30e94c2ef457f9d3f22e5dc62
+EBUILD mavlink_c-20220518.ebuild 900 BLAKE2B 1defbb6f37c5d1c756064bc9055fd1cebea5c6a3fa10b27e4a7852d8b27d095399d416b76b95f91a484ea4fb2898b8d33188a194777f58531b4075f793b8d6d6 SHA512 8041ae4cd97cc8c47d13e894a288824744d947ec79ee42cb40de79ea40a16325441d5e8279ce0e5d4c1301a712b2bcbdbbdb1e753730bad1990d7a7d6fb07466
+MISC metadata.xml 441 BLAKE2B b92fdf8a5782f9594104cd66b6da6022d65984e8ea13472bb1fbb696d5ff776c08e810efc21aafc5cd04479dbf6cb015d62389996b08a0305ed65b31bbd9b1de SHA512 999cf9b3ebd1af6d8c470751b5ed1be49fc4c8a8d8ac92f97c32c13b4ab70ced7a0ddf03b7505b668fd073457405fd1210381c4efafe6cccc2ea12a3dedb340f
diff --git a/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild b/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild
new file mode 100644
index 000000000000..5e9873b2d6a0
--- /dev/null
+++ b/dev-embedded/mavlink_c/mavlink_c-20220518.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="c_library_v2"
+MY_P="${MY_PN}-${PV}"
+
+# sadly no upstream tags or releases from gh for ref snapshots
+GIT_COMMIT="241907e288b43513b28f83595d0de3b2088bce0f"
+SRC_URI="https://github.com/mavlink/${MY_PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+S="${WORKDIR}"
+
+DESCRIPTION="Official reference C library for the v2 protocol"
+HOMEPAGE="https://github.com/mavlink/c_library_v2"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="test"
+
+src_install() {
+	einfo "Installing base headers required for v2 reference library"
+	mkdir -p "${MY_PN}-${GIT_COMMIT}"/message_definitions/v1.0
+	mv "${MY_PN}-${GIT_COMMIT}"/message_definitions/*.xml \
+		 "${MY_PN}-${GIT_COMMIT}"/message_definitions/v1.0/
+	mv "${MY_PN}-${GIT_COMMIT}" mavlink
+
+	doheader -r mavlink
+}
diff --git a/dev-embedded/mavlink_c/metadata.xml b/dev-embedded/mavlink_c/metadata.xml
new file mode 100644
index 000000000000..142eb38b7019
--- /dev/null
+++ b/dev-embedded/mavlink_c/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/mavlink/mavlink/issues</bugs-to>
+		<doc lang="en">https://mavlink.io/en/</doc>
+		<remote-id type="github">mavlink/mavlink</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index 95cdd16e132a..73e5fb28f2ad 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -1,5 +1,3 @@
-DIST u-boot-2022.01.tar.bz2 17449627 BLAKE2B 574f9d248a8c19aa20b1b16cb55bb201d6c1ab2162da3f8789d39286a4f4a5a76b772d4a49c17e5572ff69f489d1d6fdc02d6e8f67a8bf6c50159b1a41e7c81d SHA512 d83c62bd8f0f51664d2aca329a3ce1379cfd1dfff439dccd6cfc2cb33cfef89a2b01855c97716f591b5550bfdf99e2f3aef7efa33f2e7834c820648f9eef3825
 DIST u-boot-2022.04.tar.bz2 17772787 BLAKE2B 5d2035130c0631f8f1b7f7963bedf71578a66994e3950eb103a404a08e85686cd971ba51e8172093ccb75d975101024bf2a94d4064763ad57ad8950c11092319 SHA512 113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64
-EBUILD u-boot-tools-2022.01.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
-EBUILD u-boot-tools-2022.04.ebuild 1512 BLAKE2B 5019bf622e60b1eb1334ad0d0d2da99941c5f215114d68d63d5872fac5b2c60f3281bde3951bd74e0a3ab5f2f4c5d1d369b8fce6780f18712a46d8f743bd211e SHA512 14443876e7eb6fab8d7ef777eacac8183aa3aea394855894a2884306271f7529f88fec0a61845ff6c7891b5cbc349844ef0b6dee77068148ebc554ab2fc4ddc0
+EBUILD u-boot-tools-2022.04.ebuild 1507 BLAKE2B d37b4028142f0adc3289080fd615ace265e0117a85a77dd20008ed2621b7e4bf864cd0e77eea76400d04126f9ec3f8c54eaad6c470d5fab04c9295877eaa3c71 SHA512 78d7da025a69ac1e788788e988605181c87b0b9854d076536726dc5cad052bbe23f1efdb00a879c31750cdaf5c03f0a54d664f14050ab50563e9efbb798756c7
 MISC metadata.xml 451 BLAKE2B 8634c7b8cd333dadddeb3622fbe298d19b5a470b85743717fb972e310869ee2a897110a9fd7b5781de016ba9a8c9baf7c6b5ed89279e98f086a4d326cdcce807 SHA512 981503c1d3a7dd42ca141b00a29fac43eb379603140767f0e0de94f54fd4180b498cebea56692c017ab7dbf9a2afdfb222edc5942c58429490456c064b5fa41d
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
deleted file mode 100644
index 92b7d18e73fb..000000000000
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-MY_P="u-boot-${PV/_/-}"
-DESCRIPTION="utilities for working with Das U-Boot"
-HOMEPAGE="https://www.denx.de/wiki/U-Boot/WebHome"
-SRC_URI="https://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
-IUSE="envtools"
-
-RDEPEND="dev-libs/openssl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i 's:\bpkg-config\b:${PKG_CONFIG}:g' \
-		scripts/kconfig/{g,m,n,q}conf-cfg.sh \
-		scripts/kconfig/Makefile \
-		tools/Makefile || die
-}
-
-src_configure() {
-	tc-export AR BUILD_CC CC PKG_CONFIG
-}
-
-src_compile() {
-	# Unset a few KBUILD variables. Bug #540476
-	unset KBUILD_OUTPUT KBUILD_SRC
-
-	local myemakeargs=(
-		V=1
-		AR="${AR}"
-		CC="${CC}"
-		HOSTCC="${BUILD_CC}"
-		HOSTCFLAGS="${CFLAGS} ${CPPFLAGS}"' $(HOSTCPPFLAGS)'
-		HOSTLDFLAGS="${LDFLAGS}"
-	)
-
-	emake "${myemakeargs[@]}" tools-only_defconfig
-
-	emake "${myemakeargs[@]}" \
-		NO_SDL=1 \
-		HOSTSTRIP=: \
-		STRIP=: \
-		CONFIG_ENV_OVERWRITE=y \
-		$(usex envtools envtools tools-all)
-}
-
-src_test() { :; }
-
-src_install() {
-	cd tools || die
-
-	if ! use envtools; then
-		dobin bmp_logo dumpimage fdtgrep gen_eth_addr img2srec mkenvimage mkimage
-	fi
-
-	dobin env/fw_printenv
-
-	dosym fw_printenv /usr/bin/fw_setenv
-
-	insinto /etc
-	doins env/fw_env.config
-
-	doman ../doc/mkimage.1
-}
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
index 2c89fa57625c..92b7d18e73fb 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86"
 IUSE="envtools"
 
 RDEPEND="dev-libs/openssl:="
diff --git a/dev-embedded/xa/Manifest b/dev-embedded/xa/Manifest
index b3de54ea9325..2c8dc94a23b9 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,5 +1,4 @@
 AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
-AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
 DIST xa-2.3.13.tar.gz 155606 BLAKE2B 8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe SHA512 b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
 EBUILD xa-2.3.13.ebuild 558 BLAKE2B 0d744811be2358e430b40ec04ee766c8a531b417bd7691026286d05f6cec9f715baea2aa60056e73d10a88cabc567136a204540ebf97482a44b933e0ce93b720 SHA512 5f499f12b24f67baf9db24f19ff2fdac2e0c4bd3455974530c1438f1a96c05ace39a82d08eab8ca43d887ac1d2b4b5baf4c607e6b992cf68f1879a54d6706bca
 MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d
diff --git a/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch b/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
deleted file mode 100644
index 5b3486433885..000000000000
--- a/dev-embedded/xa/files/xa-2.3.10-fix-gcc10-fno-common.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/xap.h
-+++ b/src/xap.h
-@@ -35,7 +35,7 @@
- long gm_ppm(void);
- long ga_ppm(void);
- 
--Datei *filep;
--char s[MAXLINE];
-+extern Datei *filep;
-+extern char s[MAXLINE];
- 
- #endif /* __XA65_XAP_H__ */
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 4ee6dc9167ec..fdedc9aa35cb 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 682eed797391..d453952056a6 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,10 +1,12 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.22 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
+AUX ecj-4.22-r1 378 BLAKE2B d0d01286ef045eabeb70a82c9839a12758a5b942208262a1eae1abf49dc2b9a8397de773a75fafb821cfc5e65d16203d7969982275b8cd0b8941be9ccca5d200 SHA512 f687c6105029f6b46191277e88a6d16b9d814bca5dfb9ddc6dcc306db49a97052e04be8aeb52b82a9e512645b4eb47614ec046f53b398de19e0e27405314baa2
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
+EBUILD ant-eclipse-ecj-4.22-r1.ebuild 1424 BLAKE2B d67bb537096dec426f442093b300cb28f8fad4bf55b729eac135c3887eeb7989dc5583557c2c8011faccc01a343cf4436979e90017442de170655258c5e25be9 SHA512 6e3a687ed637d80e27a02b81cb69a04e015823668d6cc36fcd1832dc7504966ff1ad142da9aa9289e69c066eee0865262da69ef1871538f75a974a8a446c1a70
 EBUILD ant-eclipse-ecj-4.22.ebuild 1424 BLAKE2B 88ac2787bd6de2231fba225e8874ea615c705fa5aa0fa51fe8c251ab6f7069e9df4e72ef6bb9a16733de7850dac70c80497caba87f5fd70743a9b720bf90488c SHA512 a258c8f8451235cc21106e8617528d3503415dd3305a6b358cc6a286b62b24d5dfd46ea5d25d0fc4bed46c0907795f84e1df3a45e9b0c16b84c7cca522d9a3a6
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1247 BLAKE2B 43d30d904d98149ab9d91ea66c3c0a53837010572de25c7b0e0bfdd8b0f4c230c4385c8b156a1a2cf3b77b1e9282c813a448934515953a300da76c4a20788880 SHA512 39e4e0870c2fa5151c77cac1b60a929f4959d68012219d584e8aa395a1983140f86775328f872694addd69ef6a25283265a4dec526bb224eb5335a5f5d6292e8
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
new file mode 100644
index 000000000000..786880f955b6
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202111241800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.22"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1 b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
new file mode 100644
index 000000000000..5bbcc318d9ba
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.22-r1
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.22"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.21*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.22,ant-eclipse-ecj-4.22"
+GENERATION="2"
diff --git a/dev-java/commons-daemon/Manifest b/dev-java/commons-daemon/Manifest
index e1eff5398b62..bd46167a865a 100644
--- a/dev-java/commons-daemon/Manifest
+++ b/dev-java/commons-daemon/Manifest
@@ -1,3 +1,5 @@
 DIST commons-daemon-1.2.4-src.tar.gz 281929 BLAKE2B 877f1c31024a2f3e4796abdd11059bd636444f5c856b998a39761fb0b221467e986586fef43463a4d01b4d4f7a562f9f8c658b94a124cd356b0a70cc185c0030 SHA512 36e9cb3153ca763bfaaa71575a1584610254f1ce4c0f666ff7bbc628311405430536413525c9c777e4364eea62a247fb084750d837e84a62d9fce92a61909d56
+DIST commons-daemon-1.3.1-src.tar.gz 287642 BLAKE2B 02e85a5534af7f804a0374789506ee25ee8313987c68153974aa938b983745ae44d579f17deb362764d1a03b04bc552115bd69ef28b4f7d3bbb06f3bb4199814 SHA512 b810ac152f8296d980a4fb3786eff9d147b234dc2377df5fe1bded0824c694c9e82a7ef50b0a63c3e6432dfc4684a3aa2ce8d583aacb740bd4664c3dfb8b8f16
 EBUILD commons-daemon-1.2.4.ebuild 1457 BLAKE2B 23a03bb678cbdf4f897f56e4058241bd7e97228fffc152f568dd7f96e889d1cfe032d06be13ed97d74b345f3c6412d18cf1a322d7c8a31cc0581cf86e9dd0338 SHA512 64b4f7eb81eb75719138513dfa8ab2e26623443bf264201bff0b1c4d81ee764ce79e267515e54ba6767650f5818b68cbbd0678d99037042e5941f7c5d652d8f4
+EBUILD commons-daemon-1.3.1.ebuild 1452 BLAKE2B f44527b90fa682f98451ebded5380e714c1e6eb46a346f476049dfd1dc4f84e16eaf2682316e3560634cfb0e63959a04b90d74b7540573c41580a11b75583a1d SHA512 fa60cfb8d970797d9348f4f076ff99e243cfe84ee198ebcde8b06e80016c0756d21eb8c94a14b807e22df367578bfd86f8c6a196acb1af8020a1916344efbdf4
 MISC metadata.xml 530 BLAKE2B 313ae727a7149cfaa5e962b1daa4831e77b5f168d8f8d7f2b1242b8fa36f9d2f0460541ec53b8e81cbfae209e3c5e57f5dc5895e881acb61ce9118110aace98b SHA512 738ded66dfc479b30f4c1b6aae4052a4a2de5bf68aa9001a6a1f8fb29203a17b3fe10e52c7f5d26b1de313a74b3713cd22db259a584875f8f91391437cea53e0
diff --git a/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
new file mode 100644
index 000000000000..7822d682f36a
--- /dev/null
+++ b/dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/daemon/source/commons-daemon-1.2.4-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-daemon-1.2.4.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="commons-daemon:commons-daemon:1.3.1"
+# JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple toolchain-funcs
+
+DESCRIPTION="Tools to allow Java programs to run as UNIX daemons"
+HOMEPAGE="https://commons.apache.org/proper/commons-daemon/"
+SRC_URI="mirror://apache/commons/daemon/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( {CONTRIBUTING,README}.md {HOWTO-RELEASE,NOTICE,RELEASE-NOTES}.txt )
+HTML_DOCS=( PROPOSAL.html )
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_ENCODING="iso-8859-1"
+
+JAVA_SRC_DIR="src/main/java"
+
+# There is only org/apache/commons/daemon/SimpleDaemon.java
+# which is not even run upstream ( mvn test ).
+# JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+# JAVA_TEST_SRC_DIR="src/test/java"
+
+src_compile() {
+	java-pkg-simple_src_compile
+
+	pushd src/native/unix || die
+		./configure
+		emake AR="$(tc-getAR)"
+	popd
+}
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+
+	dobin src/native/unix/jsvc
+}
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index a16a8e359205..b25b755071df 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,6 +2,7 @@ DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
+EBUILD eclipse-ecj-4.22-r1.ebuild 1695 BLAKE2B b2b32ae1ab916157ace35130eb2819272804c3473c9f9d422000591febc82a96579e0724b8f74901af6eb6a26945c7365edc20d73ddb398ccea63f90a0a47b6c SHA512 93ccf992f4e343964e1fd7f41079616217720e949922494c91de55547f10eef41589fe283e428ecacb78c4fb85ac56a409cf2afea016abeb0d2fbd4a4e4dadc7
 EBUILD eclipse-ecj-4.22.ebuild 1695 BLAKE2B 2628143984d6915cf4ebad4b5194909d4f5ab742bbfb5beeec03741b9ad4654762fd5e7b8429be2bf082dc5978dae0d85c2a8e902566c8bb98da956793015721 SHA512 a613f6cb111f2ed21aa66d91ca93cb3c21f28daf3ac93208701749cce4d7445603b53c872b920ae0350fb7cf396f93e0dc0f20aedf979ad319ad1705f44e1bf6
 EBUILD eclipse-ecj-4.5.1.ebuild 1629 BLAKE2B bfeed649e040db43497aa5e204d5eefcf997bcf57cfbad18745bf43b8196ac60e8e13b8641841935b85b6417790f404c85044fc66e36f83ed5cb7e528065faab SHA512 37a7ff7eb2ee2e072a1315285a2a5f3ea60637afd69ac6636904d5fe76353300ac2f4d94b06d43ba56e41547a6e99585f881e2c3b22e423f849151e109adbef4
 MISC metadata.xml 646 BLAKE2B 644ff172a0719eb9a8669ea6c472adeace597f2c9baef893707c366d1aa86d04a92c4873abe2894e8405c0198c7588f4f7110df11b520f22afd20cb0a018d9f3 SHA512 c611a29d9e2f37b25cbfb631e1292832aab4c78122b26fca2b5689b4aa7337ed87b3dd17a95ee5aacfeae6d57f9400c6ef79479b190df072eadcdcbefc38edf7
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
new file mode 100644
index 000000000000..82bd5d06ebf2
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-202111241800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.22"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+	default
+
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/glazedlists/Manifest b/dev-java/glazedlists/Manifest
deleted file mode 100644
index 89011f85660e..000000000000
--- a/dev-java/glazedlists/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glazedlists-1.8.0.zip 1169436 BLAKE2B 3784881079165832a321616e51a344a1c9a7378b8f903e883367739b559b5e3b9e7871d3bee4c6979eb7ce5ded9606fb45bf25310b7314f8dbbb500a8bf9ff93 SHA512 3fc3f339a248a8aad897409d752464d60b504474ae1e4d99fa7fbb41d767928137711d5d9979154b53d677e42746e2df2dfefdc71fa4a8017ec70ab23dc4b6a5
-EBUILD glazedlists-1.8.0-r2.ebuild 563 BLAKE2B fc0a5b10d98f364476bdfd52cbd9b7dd98a5218ab8287ff569d05b6dbf4e7ae492678eb54d68dbd78724303f5a7e5a8ddb94c6c1d6c61786d05cd243b4d1c41d SHA512 40ec986e403883279236e31e3aa680585e1f4a561fdac61fcf4c9438ad556881f5f2b420c0694e53f9747e74be4b8e63dc52e94e7e9dc19f6a7d886ce10b8a62
-MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild b/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
deleted file mode 100644
index 57554793d894..000000000000
--- a/dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A toolkit for list transformations"
-HOMEPAGE="http://www.glazedlists.com/"
-SRC_URI="http://java.net/downloads/${PN}/${P}/${P}-source_java15.zip -> ${P}.zip"
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*"
-
-BDEPEND="
-	app-arch/unzip"
-
-JAVA_SRC_DIR="source"
-
-JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/glazedlists/metadata.xml b/dev-java/glazedlists/metadata.xml
deleted file mode 100644
index 6021501589e0..000000000000
--- a/dev-java/glazedlists/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>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-java/jackson-dataformat-yaml/Manifest b/dev-java/jackson-dataformat-yaml/Manifest
index 4d4c02cac3a8..b4314d610020 100644
--- a/dev-java/jackson-dataformat-yaml/Manifest
+++ b/dev-java/jackson-dataformat-yaml/Manifest
@@ -3,4 +3,4 @@ DIST jackson-dataformats-text-2.13.3.tar.gz 3528981 BLAKE2B 98593f45e663905c15ab
 EBUILD jackson-dataformat-yaml-2.13.2-r1.ebuild 2668 BLAKE2B f4cffdc70c4a401f57fe2b46c10c8de15440508eff222ff9979354ff93a7fb4753941cad626efd14478f94a70ab467fa814102a98dd8f08f25908a02c47d9820 SHA512 819c502af6462c4012e3d6d6309e6e0188ceb822d03fa32446a2b65e3a897b1639931e1a4e26d174cdd39146c633649abb63af4f4354553cdb2a8e956273075d
 EBUILD jackson-dataformat-yaml-2.13.2.ebuild 2663 BLAKE2B d1efad7633939422a69e409d9c36f360a9b20122d744ac21a0c7cafb189857f465f85d9757a9be0c0583cb5c4aadb878d581c05bf62e25634998124a956afa52 SHA512 d76652d58f9192458cf5684801cb34d3dacc124a233184d81d9c3170e74c29f4a058dc246c6cf7703640d19ceb8344834ba057659c6c6ad89417b9b3d41d946b
 EBUILD jackson-dataformat-yaml-2.13.3.ebuild 2666 BLAKE2B d68d44a6617b8c477c34920a1b86f56b8e2a64c107f9dc8947df51e7897d7bab9df22783b1845dbf7d7cee510ac85aab04ec7039b54d6e5db7303d1c09fa6590 SHA512 397585863e682ead80b44ca2a0b3b0206c6fd92429c56476b8ad610b02a48fc2e49d5a59d8144ffa49b63ea14475938401402cd477a0d27536b7da88741d5062
-MISC metadata.xml 342 BLAKE2B 4d57f5b5bc0e926e2c359501044c45f3c8223639349286adf9e979cc0cf2bc02070999b1fae29b1da8e14b0348a0aa95dac24006b138f7a60fb7d2d9127fea1f SHA512 7ec10474b90f26e90dfd0d4039901582620a8f84d1a859283522c14aac5a11677d624a3cb773245add8d9fb5704ae94f8a825e68cd4299bf93d4678894561742
+MISC metadata.xml 398 BLAKE2B 35f92ae137b3d4f6528c3987d1f9a4e8a1492688a687b4fb133b9ac5c02e6dcbde37807569463d8eebf26c078f55199e5848efcd6e11104599e5895044b61d8d SHA512 621d9b0635a22bed22305b4a7724e96beefdb57ff6b2553612f3e4feeeef080d02bc48dd0fcf3cbb3a2f4723c89bf8824f18adff1501fd3876c73e4e85fa20f1
diff --git a/dev-java/jackson-dataformat-yaml/metadata.xml b/dev-java/jackson-dataformat-yaml/metadata.xml
index ff11baa0e7b6..bc9ae704cd03 100644
--- a/dev-java/jackson-dataformat-yaml/metadata.xml
+++ b/dev-java/jackson-dataformat-yaml/metadata.xml
@@ -5,6 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">https://github.com/FasterXML/jackson-dataformats-text/issues</remote-id>
+		<remote-id type="github">FasterXML/jackson-dataformats-text</remote-id>
+		<bugs-to>https://github.com/FasterXML/jackson-dataformats-text/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
deleted file mode 100644
index 85e5cfb0e29a..000000000000
--- a/dev-java/jempbox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jempbox-1.7.1_maven-build.xml 10502 BLAKE2B 041be81aaf3b81969ad26926a3f2eac7b4655c17b3ba925b6ec2b16ddf49bcf7d87fc32655e3e357f274acc16a052afbc8010c6e0fc06f8e51770d68478e2efd SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269
-DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
-EBUILD jempbox-1.7.1-r1.ebuild 879 BLAKE2B cc8af982e8a9870cc9c5dd18be0d497caefbdc99b65eeeffbfe767f4dfd210eb2708e2a23059c8b9da1762a5fc0dba30de5e7cf410c22ce1f3fe50514531c596 SHA512 de17be28ded6bec6b87500a3a67be02787261208330d7e08548b420ea5e6d0b43177102b54bfacbcb47d0adf599ed38fa03e2070dc2fcc88668f8fd8749150c9
-MISC metadata.xml 315 BLAKE2B de9e830a0b7df749781680b1bb238926c941bb74735bca87e3c7f86c3df770a2cf07ca5c02a2f67aabe08d3cd5c63d1dd0cbdd7cbd3ea88af4931dd642f2203f SHA512 35509d678d085949efe654ecd2c3c6f725dee0fe49d2ef0de0ce51bc9720f46c7d79f4440b8f6b677dbdcfe8c98ee37bf2ffe463a78218c7a0af2d0b218afd2a
diff --git a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml b/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
deleted file mode 100644
index 453f9f69f665..000000000000
--- a/dev-java/jempbox/files/jempbox-1.7.1_maven-build.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
-<!-- ====================================================================== -->
-
-<!-- ====================================================================== -->
-<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
-<!-- ====================================================================== -->
-<!--                                                                        -->
-<!-- Any modifications will be overwritten.                                 -->
-<!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 8/2/12 4:32 PM                        -->
-<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
-<!--                                                                        -->
-<!-- ====================================================================== -->
-
-<project name="jempbox-from-maven" default="package" basedir=".">
-
-  <!-- ====================================================================== -->
-  <!-- Build environment properties                                           -->
-  <!-- ====================================================================== -->
-
-  <property file="${user.home}/.m2/maven.properties"/>
-  <property file="maven-build.properties"/>
-
-  <property name="maven.build.finalName" value="jempbox-1.7.1"/>
-  <property name="maven.build.dir" value="target"/>
-  <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
-  <property name="maven.build.srcDir.0" value="src/main/java"/>
-  <property name="maven.build.resourceDir.0" value="src/main/resources"/>
-  <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
-  <property name="maven.build.testDir.0" value="src/test/java"/>
-  <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
-  <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
-  <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
-
-  <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
-  <property name="maven.settings.offline" value="false"/>
-  <property name="maven.settings.interactiveMode" value="true"/>
-
-  <!-- ====================================================================== -->
-  <!-- Defining classpaths                                                    -->
-  <!-- ====================================================================== -->
-
-  <path id="build.classpath"/>
-  <path id="build.test.classpath">
-    <pathelement location="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar"/>
-  </path>
-
-  <!-- ====================================================================== -->
-  <!-- Cleaning up target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="clean" description="Clean the output directory">
-    <delete dir="${maven.build.dir}"/>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Compilation target                                                     -->
-  <!-- ====================================================================== -->
-
-  <target name="compile" depends="get-deps" description="Compile the code">
-    <mkdir dir="${maven.build.outputDir}"/>
-    <javac destdir="${maven.build.outputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.srcDir.0}"/>
-      </src>
-      <classpath refid="build.classpath"/>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Test-compilation target                                                -->
-  <!-- ====================================================================== -->
-
-  <target name="compile-tests" 
-          depends="compile" 
-          description="Compile the test code" 
-          unless="maven.test.skip">
-    <mkdir dir="${maven.build.testOutputDir}"/>
-    <javac destdir="${maven.build.testOutputDir}" 
-           nowarn="false" 
-           debug="true" 
-           optimize="false" 
-           deprecation="true" 
-           target="1.5" 
-           verbose="false" 
-           fork="false" 
-           source="1.5">
-      <src>
-        <pathelement location="${maven.build.testDir.0}"/>
-      </src>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Run all tests                                                          -->
-  <!-- ====================================================================== -->
-
-  <target name="test" 
-          depends="compile-tests, junit-missing" 
-          unless="junit.skipped" 
-          description="Run the test cases">
-    <mkdir dir="${maven.test.reports}"/>
-    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
-      <sysproperty key="basedir" value="."/>
-      <formatter type="xml"/>
-      <formatter type="plain" usefile="false"/>
-      <classpath>
-        <path refid="build.test.classpath"/>
-        <pathelement location="${maven.build.outputDir}"/>
-        <pathelement location="${maven.build.testOutputDir}"/>
-      </classpath>
-      <batchtest todir="${maven.test.reports}" unless="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/Test*.java"/>
-          <include name="**/*Test.java"/>
-          <include name="**/*TestCase.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-      <batchtest todir="${maven.test.reports}" if="test">
-        <fileset dir="${maven.build.testDir.0}">
-          <include name="**/${test}.java"/>
-          <exclude name="**/*Abstract*Test.java"/>
-        </fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="test-junit-present">
-    <available classname="junit.framework.Test" property="junit.present"/>
-  </target>
-
-  <target name="test-junit-status" 
-          depends="test-junit-present">
-    <condition property="junit.missing">
-      <and>
-        <isfalse value="${junit.present}"/>
-        <isfalse value="${maven.test.skip}"/>
-      </and>
-    </condition>
-    <condition property="junit.skipped">
-      <or>
-        <isfalse value="${junit.present}"/>
-        <istrue value="${maven.test.skip}"/>
-      </or>
-    </condition>
-  </target>
-
-  <target name="junit-missing" 
-          depends="test-junit-status" 
-          if="junit.missing">
-    <echo>=================================== WARNING ===================================</echo>
-    <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo>
-    <echo>===============================================================================</echo>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Javadoc target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${maven.build.srcDir.0}" 
-             packagenames="*" 
-             destdir="${maven.reporting.outputDirectory}/apidocs" 
-             access="protected" 
-             old="false" 
-             verbose="false" 
-             version="true" 
-             use="true" 
-             author="true" 
-             splitindex="false" 
-             nodeprecated="false" 
-             nodeprecatedlist="false" 
-             notree="false" 
-             noindex="false" 
-             nohelp="false" 
-             nonavbar="false" 
-             serialwarn="false" 
-             charset="ISO-8859-1" 
-             source="1.5" 
-             linksource="false" 
-             breakiterator="false">
-      <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
-    </javadoc>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- Package target                                                         -->
-  <!-- ====================================================================== -->
-
-  <target name="package" depends="compile,test" description="Package the application">
-    <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" 
-         compress="true" 
-         index="false" 
-         basedir="${maven.build.outputDir}" 
-         excludes="**/package.html">
-    </jar>
-  </target>
-
-  <!-- ====================================================================== -->
-  <!-- A dummy target for the package named after the type it creates         -->
-  <!-- ====================================================================== -->
-
-  <target name="jar" depends="package" description="Builds the jar for the application"/>
-
-  <!-- ====================================================================== -->
-  <!-- Download dependencies target                                           -->
-  <!-- ====================================================================== -->
-
-  <target name="test-offline">
-    <condition property="maven.mode.offline">
-      <equals arg1="${maven.settings.offline}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target name="get-deps" 
-          depends="test-offline" 
-          description="Download all dependencies" 
-          unless="maven.mode.offline">
-    <mkdir dir="${maven.repo.local}"/>
-    <mkdir dir="${maven.repo.local}/junit/junit/4.8.1"/>
-    <get src="http://repository.apache.org/snapshots/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-    <get src="http://repo.maven.apache.org/maven2/junit/junit/4.8.1/junit-4.8.1.jar" 
-         dest="${maven.repo.local}/junit/junit/4.8.1/junit-4.8.1.jar" 
-         usetimestamp="false" 
-         ignoreerrors="true"/>
-  </target>
-
-</project>
diff --git a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
deleted file mode 100644
index 12e0360d573b..000000000000
--- a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=pdfbox
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8"
-DEPEND="
-	>=virtual/jdk-1.8
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-src_prepare() {
-	default
-
-	cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jempbox/metadata.xml b/dev-java/jempbox/metadata.xml
deleted file mode 100644
index 006ce0bbb200..000000000000
--- a/dev-java/jempbox/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>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">apache/pdfbox</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-java/jgraph/Manifest b/dev-java/jgraph/Manifest
deleted file mode 100644
index 094d714a87d7..000000000000
--- a/dev-java/jgraph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jgraph-5.12.0.4.jar 3460750 BLAKE2B 0d2c50673eb652e4335a2d4fe9edcd93745595302c9ce674e8bb05ceab5edcb6b4a190e4d4da14bdb552ca7d35421473d0931addb02c2d1326d81eb442c372d1 SHA512 0832afeb28c4d5abb9288de4e1b74eefc432bb98f622e71f0d192bf9f01741feb406ba0473b923e0cb93401120c1456a00eec4653355c37bff7e9e1863e81b5d
-EBUILD jgraph-5.12.0.4-r1.ebuild 560 BLAKE2B 9c7a70b78d4aa9272c4436437907958bc372b7d0d2f607d1c5a514fc5ec4b05846b835d0797661ce8f82c8f23844162e72f9ba498a2c73a13382803c0f1428e1 SHA512 307f806e3b697dd8c5d90d62da09a9a1b49fb1ee573cad8f973894ae3f145d8ad26e7fa139cfae9d1f3920b272fba695b5e5bb117c3becbae4c2366820f5e999
-MISC metadata.xml 313 BLAKE2B d0edccd8783f91c67c743d45713b38b66affd63d9ea8a4e80b80109416c67ee4a7a04bcfac5e9d3b11a023c1a9d299d374faad2c06957a908d647275f23295db SHA512 bb4fc36cc6709fd20efce32997dd1074f3657a84ff5a79057a5a7753b0deaba20fb11b28ae76e5fa0cd0d5b8bcae335ad3ea70444d766939e5482d4b9ea346cc
diff --git a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild b/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
deleted file mode 100644
index 1681ab0b8efb..000000000000
--- a/dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Open-source graph component for Java"
-SRC_URI="mirror://gentoo/${P}.jar"
-HOMEPAGE="https://www.jgraph.com"
-IUSE="doc examples source"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DOCS=( README WHATSNEW LICENSE ChangeLog )
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-
-src_prepare() {
-	default
-
-	java-pkg_clean
-}
diff --git a/dev-java/jopt-simple/Manifest b/dev-java/jopt-simple/Manifest
index 430c5ef2866d..dd06e7d94986 100644
--- a/dev-java/jopt-simple/Manifest
+++ b/dev-java/jopt-simple/Manifest
@@ -1,6 +1,8 @@
 DIST jopt-simple-4.6.tar.gz 107082 BLAKE2B 622144647b24049861398cc99ca3cc268baae045f8ca23cdd5bddb2e656bc97d17397ae752ca9a6edc91b8486e1e55ce19ba335d2afadf6c6df4f858faf43a1e SHA512 c2f467521f6419f91206f6036d420671b02106beadff3fc51d1893e6f3f6302b8fcbb31957327b9e40cbfd7a7d55030e0c999d9570d7e29fe7a4375bab10ed76
+DIST jopt-simple-5.0.4.tar.gz 120388 BLAKE2B b9eec360f9399a40fa8fe33f14708c14a45689eb78efcdf99f27d666168d67f2670b4aa5bd6e7f26ddff72565107f1359214c808281918947d66874bde237b86 SHA512 ae4274bb4b3e2584dc6fb4370c4d63f9b95e63ff2cd124f92f8ad6e3a4a3dd91cd9e9b70ac423a560d52039508549a5319bb23035215b4a191c4fdc0f0e082d5
 DIST jopt-simple-5.0.tar.gz 119502 BLAKE2B 975a0d338fa3154963954fd3b218c944dded023b3a2da59ee2671c73450a578dbf1aee8e52b9f715839e15c1937e0a493c4b37518b73038aa017e1d0ec1ca06a SHA512 f440c62cb307aad7cab64f091c82f78e11a117e60aaadf71883c149a622576531272de3d67859f6df093df658bb0bfb435d9bb33bc729bcda24dcc99d27369ff
 EBUILD jopt-simple-4.6-r1.ebuild 579 BLAKE2B 1c988774f4fb47b0f4e1b57aaf58820280dc7b819dbefa916b4f198e1861ccd0f01bbd0e17aeb850499bd0a26fa59350b44085840c9c39c314a367eb5471a9fb SHA512 c0714503fdfe7011347a08395769ba6261cc3d46a11a403fa1b08f3cabc4c508f829655951bedd8c1ad8aa2d15a484d7db381a89ebd8265c82f235d8e89ff7f6
 EBUILD jopt-simple-5.0-r1.ebuild 674 BLAKE2B df5e7739f16c175151f997de4f07fa9c1f87fb9a6b58d0ff4b4dfef7810f5060e5d05c0730ae67550b21bad0f58fd69736963f645232f5f6d6722a827585d75c SHA512 ece300b9f349bc08eb5901ef5b65e7c700e0eff7b78a2d54c2c215874a0586d48150ec24a6788b0df4b2a6ed1ce431b69919d6a2d191c59ad2ee2728294e7300
+EBUILD jopt-simple-5.0.4.ebuild 665 BLAKE2B cc79f672c7b3516da09dacd7590f2b2bf98237ed379aef54f2dcbdc13ec781d0cde92b901d3ced9b4232a41da1aa26c634a0f0f5981279d3e3b42da27a7fe47b SHA512 3ae65a4f809c4034477ed826ba1281acce209fd40482ee794b53c02dfa09c461aec24b63e106819ed4d9d38985c3e49dee7f0cb82f1516781404fabe63721d15
 EBUILD jopt-simple-5.0.ebuild 648 BLAKE2B 137db3a025327e0e9cc2c57c465f9f8734f523e350ad91263f33ffb3edb761ac99c9f84a897a60387694a61d5cb46c67dd12579dd68dca8321b5e70428ac1934 SHA512 3c2863dbcc4613fe33bdf4e3afac16d8f006e0c958315ad35cfbfb4428a519cf743a2532f8a831c37fc0a5bad7608daecd2aac27fc23588e4d8a95bdcf51903a
-MISC metadata.xml 321 BLAKE2B 1165369ebb01fa6f8d30370de45e8b6dbfb6bd57687593395213e2772bdd379a0f4adefa0901f23e79262c6803ea3544b0127fc1e5f5f2a00e3523ef26ad2ce9 SHA512 9306c4766bac17556a01b019139fcdbebdb08ee1f0b56adcf4ffb25805075ae2d5d5007659e897418da012ee05157cec8cdc119715bf88abd8a00a6a7661b89e
+MISC metadata.xml 325 BLAKE2B 361e959a1e7ec6eaa2473534dfcfee9d2372b74fa7573ccceac813d161fff0117020c340f67f86af9387bf874878376b5fc10262c78efc382e8d558e5cf80f65 SHA512 e786dcf5cd44b2472a2e68baf7a077cf65a4bfe003ce959ed50262a47a1a02e1b929fcf690f968ab22b88e8032ff50c391df61b6b45c84c0b738918f7a139a52
diff --git a/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
new file mode 100644
index 000000000000..f6331ef9f35c
--- /dev/null
+++ b/dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A Java library for parsing command line options"
+HOMEPAGE="https://jopt-simple.github.io/jopt-simple/"
+SRC_URI="https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+S="${WORKDIR}/${PN}-${P}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	einstalldocs
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index 40ac5a240070..eede771ba474 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Java</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">pholser/jopt-simple</remote-id>
+		<remote-id type="github">jopt-simple/jopt-simple</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-java/junitparams/Manifest b/dev-java/junitparams/Manifest
index 9d64e80d9f61..9bee21aab251 100644
--- a/dev-java/junitparams/Manifest
+++ b/dev-java/junitparams/Manifest
@@ -1,4 +1,4 @@
 AUX junitparams-1.1.1-test.patch 1894 BLAKE2B 8c2aacc726a9d5ac733971f20aa06ab21e1ac31cfa14cf23e11b0541777f22291417710f944fd3f6554791ea8deae022e42ea0af5177f6d97a542d55f510b8d4 SHA512 cae119b7c22b65e42a252d70bc92ad05cae568b2257d9640a498bc7cb15e3917f32c9fafd6b06ded8f739b4825c1662a8c4625114aab1252f4adf58cf52f1f34
 DIST junitparams-1.1.1.tar.gz 96180 BLAKE2B 0b12d61841d13c893d90f1a28e6b881930a66a9359b368b601a9ee9ced1fa82ff17c9142610e1ed122684e454b86a46d9d2cf451544a900b0a86399484df141c SHA512 77e25bff2f821e8be4f3747c58e550b728aace1dac4ac98f0cd8f99235d6a2b0129e61d7f90063d5f85dd3dd4b0e5d0614e3591633bdcf5dfa452c62a114acae
 EBUILD junitparams-1.1.1.ebuild 1655 BLAKE2B 37bd6c3c987ed19e92df2df16e4d60b1e54eeac60a2344672a8baf93c414e1e877f38a4f9a42a43b5b91b0f50340ee5d138c94b0bad8186dcfc8a43cebc61371 SHA512 6b4f66f8203a55aa81fd033e56df032dd985394cbd9774f4f9067f9b05fa868ff5ef4bfd8a9f65f56e4e6b891badf25ab98c5c44e0d693c3f72ce7261ac61a2d
-MISC metadata.xml 442 BLAKE2B 7a6a750afa6b576a816badcc1c2f8df3e8066676e72d0458c7c8b4e9b58efb7d57e0eaf2f8a790c50ad0c842cb2687264111976fc92cf43cea4d25f8ec8e0a03 SHA512 818d6c35bfe1dfca311b337511b143e54adf567d5e547906489662930edb51e70eda67bcc55a0d7a98b39cff7e6fa1320a0e2096116510f59380ca198c25ea41
+MISC metadata.xml 437 BLAKE2B 67db2ff59007450448d4de713df69f7999909a2070c093bd65f994d98fedcb92aa7b262d1da757e19c401fd8380acd234469a3b8abc9a70d412aaf1059699efa SHA512 02fcfa155548a74dbf633c5ac5fd69a3bf6303b202e16dd96948c58d22bd05cc2575cd8a82b51b961b20c4f0b65ba41cda63d5981ff652c1000c5d6912de5f31
diff --git a/dev-java/junitparams/metadata.xml b/dev-java/junitparams/metadata.xml
index e2f1912e2a31..8d7346cf8e03 100644
--- a/dev-java/junitparams/metadata.xml
+++ b/dev-java/junitparams/metadata.xml
@@ -5,7 +5,7 @@
 		<email>java@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Pragmatists/JUnitParams/tags</remote-id>
+		<remote-id type="github">Pragmatists/JUnitParams</remote-id>
 		<doc>https://github.com/Pragmatists/JUnitParams/wiki</doc>
 		<bugs-to>https://github.com/Pragmatists/JUnitParams/issues</bugs-to>
 	</upstream>
diff --git a/dev-java/microba/Manifest b/dev-java/microba/Manifest
deleted file mode 100644
index e216c45bc865..000000000000
--- a/dev-java/microba/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST microba-0.4.4.3.tar.gz 50106 BLAKE2B 15b7fe422f7d6aa92929a697ee2c12b2325c9cfcef6d43cc2f135b57a14d8a2a7c1a7b5b3de6bf8a7e1ed07ac275c26017430f776c435295e36109914aca090d SHA512 0191213d00fd0a6bd59a623fb0762eb589a5ac42c5c988a612c01781b30bcb6d86ce431f76687f5647889d54ad13b7f3fa2eec02ca81038f692d2cf25fa1aad1
-EBUILD microba-0.4.4.3-r2.ebuild 785 BLAKE2B 8bc33ec97e54573ad38f34aea29bea66de680e23cdf43ce33cceed13cf1d321fb6a681518078099570312d51917eac4c8e7fd5e8de94407efa749338161faac4 SHA512 f7b9acaef0b36fbd27ea4d02d5bc75a3c1fe1deddf901aaef32b5ad9931823920083de1eafdfec28b140cae2cfb5d893ec4c9b578aaf70af91011e2359a06b6c
-MISC metadata.xml 368 BLAKE2B 2b63a4d825225df05883aa88d19cfa39372812f28f8780870170b4121417b3f1d0d3b03ed2dfa2797154a6e96b4ae875029bbc8e7e862796d1e76799a1aa8214 SHA512 d5d5fe4b61a9b2f1e1cad3a8ccd658e96afbf8ff2b7aa9c962d2dc1d8106929d162f7dc4c52cea0ca64339aa212ac0a2b07b80b36bf94a34d1394360ed958e07
diff --git a/dev-java/microba/microba-0.4.4.3-r2.ebuild b/dev-java/microba/microba-0.4.4.3-r2.ebuild
deleted file mode 100644
index 8692c84f479a..000000000000
--- a/dev-java/microba/microba-0.4.4.3-r2.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
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Swing components for date operations and palettes"
-HOMEPAGE="https://github.com/tdbear/microba"
-SRC_URI="https://github.com/tdbear/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CP_DEPEND="dev-java/jgraph:0"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-DOCS=(
-	change.log.txt
-	readme.txt
-	README.md
-)
-
-src_compile() {
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar ${JAVA_SRC_DIR}
-}
-
-src_install() {
-	default
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/spin/Manifest b/dev-java/spin/Manifest
deleted file mode 100644
index 73e38c6b7e0a..000000000000
--- a/dev-java/spin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spin-1.5-all.zip 482286 BLAKE2B d1b1de891290ed465f2886bea046d9aa106626be91e5ac37dcd795bb0ef5e558b3d81b1e86cfb168d660f4c2884d321d560bece50645822a0334848225c6638b SHA512 ce1fad3b138781359d472727b186722d6f1f23b7002dd1ada294efd80b3a9caf5de15207cdd682fcbfcafa85c63895c7dd9683fefb5ce5b09cc4115ae3733466
-EBUILD spin-1.5-r2.ebuild 3049 BLAKE2B c93e50ea27af69cea44a6b34ef6afc72eee4b49eabb5a85f0d966828c760e4e354cb6aa8e71c7d7a71ace9e23cab2ad4815031e7a0d5fdbbf04677ee308c9e58 SHA512 496cc013453570add3ffbe23ea5800fe8e43416a31007034ed9c2b401b4f0062aee915cbb98c3e65ac954fc8f35569a889b6d5cd5a6f41420edce80e09a4faa4
-MISC metadata.xml 311 BLAKE2B 4b74521bd09bf6dc5cc23756c20b979e6bd0def2976e74cc5ed62dca4482e460bbd43c98517828a0396abce3623cf16cffff230c8a92015a9d9894196f9480ef SHA512 fa0bd5bc4452ece5f45815567016bb38b79c420ea5050f66aca8062839360d0c4e563f56316ff1f98e02e088b3a7e15d8bfd583c94fb494df643d24ba3b7fb90
diff --git a/dev-java/spin/spin-1.5-r2.ebuild b/dev-java/spin/spin-1.5-r2.ebuild
deleted file mode 100644
index a8557a83ef98..000000000000
--- a/dev-java/spin/spin-1.5-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip --slot 0 --keywords "~amd64 ~x86" --ebuild spin-1.5-r2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="spin:spin:1.5"
-JAVA_TESTING_FRAMEWORKS="junit"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Transparent threading solution for non-freezing Swing applications."
-HOMEPAGE="http://spin.sourceforge.net"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}/v${PV}/${P}-all.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Common dependencies
-# POM: pom.xml
-# cglib:cglib-nodep:2.1_3 -> !!!artifactId-not-found!!!
-
-CP_DEPEND="
-	dev-java/cglib:3
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( license.txt )
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/java"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/java"
-
-src_test() {
-	# 1) testEDTNotBlockedDuringInvocation(spin.off.SpinOffTest)java.lang.Error:
-	# Unable to make void java.awt.EventDispatchThread.pumpEvents(java.awt.Conditional) accessible:
-	# module java.desktop does not "opens java.awt" to unnamed module @42bb2aee
-
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if ver_test "${vm_version}" -ge "17" ; then
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.desktop/java.awt=ALL-UNNAMED )
-		JAVA_TEST_EXTRA_ARGS+=( --add-opens=java.base/java.lang=ALL-UNNAMED )
-	fi
-
-	# There was 1 error:
-	# 1) testNonAccessibleInterface(spin.JDKProxyFactoryTest)java.awt.HeadlessException
-	#         at java.desktop/java.awt.GraphicsEnvironment.checkHeadless(GraphicsEnvironment.java:166)
-	#         at java.desktop/java.awt.Window.<init>(Window.java:553)
-	#         at java.desktop/java.awt.Frame.<init>(Frame.java:428)
-	#         at java.desktop/java.awt.Frame.<init>(Frame.java:393)
-	#         at java.desktop/javax.swing.JFrame.<init>(JFrame.java:180)
-	#         at spin.JDKProxyFactoryTest$1.<init>(JDKProxyFactoryTest.java:44)
-	#         at spin.JDKProxyFactoryTest.testNonAccessibleInterface(JDKProxyFactoryTest.java:44)
-	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	#         at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
-	#         at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-
-	# JAVA_TEST_RUN_ONLY="spin.JDKProxyFactoryTest"
-	# java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.CGLibProxyFactoryTest"
-	java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.off.AWTReflectDispatcherTest"
-	java-pkg-simple_src_test
-
-	JAVA_TEST_RUN_ONLY="spin.off.SpinOffTest"
-	java-pkg-simple_src_test
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 99822672c883..925a5fab5cef 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/interprolog/Manifest b/dev-lang/interprolog/Manifest
index 454aeda15ef3..fc3058129a3d 100644
--- a/dev-lang/interprolog/Manifest
+++ b/dev-lang/interprolog/Manifest
@@ -1,5 +1,6 @@
 AUX build.xml 1461 BLAKE2B 97f817f1c8a5594c5b9a0f449046c1c91d6789d27592f421fb0d92d0d21cb30f009d90c99b037900e109d791159ad49d78cd3f5bb99464d35cae0508128c648c SHA512 0e469d954d69db940fdf1893257f20d15d1009148d3979755edd448bc1cda9425df5169f6ddba3e37b8eaccd25f3fbb7bfeb3c58a572111be2474e1850a32cb6
 AUX interprolog-2.1.2-java1.4.patch 1341 BLAKE2B b1c02e38f990d8f693a274cb258b18151e5b5d93a8670ae40d2d0b29b25c8ee86c749463b880166d759509331c9bd58d57286f9c62b36ba53673291129d27a09 SHA512 cfd4a637e4d86172547448801c92decfa3f10fa7d02e007c42d8415901d742ecbdf1fca1e4034c7069885a06824f1577bc64f2454a2c31877af68e74ad3aa0d2
+AUX interprolog-2.1.2-java17.patch 793 BLAKE2B d1f501918b153ce840887c4b697783a2a5ddd4fece70148c88d761d04891aa5710c3a33c5c14eb22b787ddedb52e852991bac80f3dd9fbe1a3764521d5336cba SHA512 26dc6ebaf903374da09af41b452a7a47af5fbf17d763d837603d5bdd628408b3d7adfddbad375a22f37ffddf66626336c3eac82c36acc0eb2942f07836291d0c
 DIST interprolog212.zip 1066931 BLAKE2B ea2666ff756c30db35262137938c32ee98d8a145ce59ea3b8694328771b8925395f7643ecabf9e0c010515176fdbbedcd333a81003a09c0ae1d9c1a94215e095 SHA512 e3d8b216f7e76d5d95ad9d27a96720075575fd717c89ddf9403376a72e18d56fd68afa2b1e6e70da55b99cd84043a16695ff37a59ec3366115cd4c36ed1ff50c
-EBUILD interprolog-2.1.2.ebuild 1085 BLAKE2B e08b1944cae17e955c4cee0183081cf6c42a7938d40950c6fed0df33d96a71ffb575bfd6585f5bb5b05304656ef8d4952d05e0b5956a2247c51f8c0f35940500 SHA512 f977828bd9cb9941146df318248c48da98527728b0bd60d0ed26379b7e8096fcab1a581194f4516288ccefe07945fc1636bf1d05dab22b58137c4b06ba06aaa7
+EBUILD interprolog-2.1.2.ebuild 1125 BLAKE2B e0500986db07c9976b2727393dc36fcc8575a707d6e7e8c0cab5080aa3d15825eeeb619d544ce666aced93bd8935f0ef5004979f4e4b43574fd4c1ab30f53526 SHA512 25a3f50abcf9df340626806205b86b36c6e80756ac01701ba969a2bd8df9969a0d765bdcd983cd76d8b5def483201eaeefafb1b7b999593e608790e86f1d47b7
 MISC metadata.xml 237 BLAKE2B d4347f2b84f6246e0bf64c19548b9bf8ad5094bf392fabb2b5add3bdb2af1e866aa34f67d4dad5fd6595daa79233456e962684b4d062bdc7be1f4ee1ef92d3ee SHA512 525172b6046cff15248158e173c764b9294cf0a8220914ef6b46ca4f15fdb79caca8089cb04ac0b1ca56e2496dc84d1f933b2d56e806007883cbc914a1a4eca5
diff --git a/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch
new file mode 100644
index 000000000000..5c0ad07b8daa
--- /dev/null
+++ b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch
@@ -0,0 +1,13 @@
+--- interprolog212.orig/com/declarativa/interprolog/AbstractPrologEngine.java	2005-09-30 19:26:22.000000000 +0200
++++ interprolog212/com/declarativa/interprolog/AbstractPrologEngine.java	2022-05-27 19:26:35.059409877 +0200
+@@ -389,9 +389,7 @@
+     	progressMessage("Cleaning path "+p);
+         if (System.getProperty("java.version").compareTo("1.4")>=0) {
+             try{
+-                Method decode = URLDecoder.class.getMethod("decode", new
+-                Class[]{String.class, String.class});
+-                return (String)decode.invoke(new URLDecoder(),new Object[]{p,"UTF-8"});
++                return URLDecoder.decode(p,"UTF-8");
+             } catch (Exception e){
+                 throw new IPException("Inconsistency in PrologEngine.cleanPath"+e);
+             }
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index af273a150564..dc9d77efd441 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.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
@@ -33,6 +33,7 @@ EANT_GENTOO_CLASSPATH="junit"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-java1.4.patch
+	eapply "${FILESDIR}"/${P}-java17.patch
 	eapply_user
 
 	cp "${FILESDIR}"/build.xml "${S}" || die
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 65aa6d406c1b..9a913699b41b 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -6,8 +6,8 @@ DIST perl-5.34.0.tar.xz 12881416 BLAKE2B 4139e77fbb38b2b72671c0b130233cf5ed35112
 DIST perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin 207 BLAKE2B b52e1322930d5f7b8d6e3a319d24322b5dffb2313bdc757c0c8eb8713fd03adace199c8449ccc306e49b5b71e3c1b9786b2acb0ab8780a09d718a1c54f653226 SHA512 5a7e0950f0f94bd961fa9cf3e4ab5dd30006bee0f4553da755688a32d0411a4a850a28d4f998b36e7177dcf3aba192b899ca4138e84452baffef1a0b2ed1fb7b
 DIST perl-5.34.1-zlib-1.2.12.patch.xz 180480 BLAKE2B 39da5c1ef406d018f73e641d86ff81d5257cf1f7d6c1b0caac9651a546d70a2e0fff53bf0fc584907e792cb681a961c8442ab355f8f0c2cfffbb26c997cdbac0 SHA512 b32b57721b10943e21003429b42c535f7833e450f097855162241775a161a557fe0ea86ce615d6a9c885f165f45438cabba5580f9b299796d3a3da5ea720f1ff
 DIST perl-5.34.1.tar.xz 12760168 BLAKE2B 3768e55f66551c83295153e91d25d568b7b8638789141f7fcd5a304509cb391cb9ad0232ba6ac70113bb0881ddb00ca5b19c53aa01e1e206c44401dad60d8942 SHA512 9261958291b49eea30c120a89e5ee32dc6a5fd46de4869c89c3d6a4c1162d6cf192ebe429d01a293eda93d8680ce15294af27717fd4ec4c75f511c1fa820fdac
-DIST perl-5.36.0-RC3.tar.xz 13059260 BLAKE2B 35e079c139c09e0b47117400917afe30ab738cf11af32651d0191e68089aac8d9d9c0159970b564727e9abda55d415d0d36863d53dea5fc5719db3dc0cb91e49 SHA512 b00721d15042519902483951801601c5cac9576f2e78f0d3b1fb6467c473314dbba415a92530f70bcbc6eb796c0b5c5fae9d1b2b8163596f2c672562f4375041
 DIST perl-5.36.0-patches-1.tar.xz 20352 BLAKE2B f5413c75c5bbced230ad7fa692998caef8e4041f3394ae5212dc2aaee465de619b56cf07551be1bb36f2e06b9ed7d0ddda31ad4a7ec81d5c0c64b698ddd80379 SHA512 ab24577b6d71a13d9ccf272efa0881b29933b6a39532ca0d71d4c9a134f451bbe5f3d87c6c851f26114702ac3f92af5c5a72129a458ebee31e372106955eb157
+DIST perl-5.36.0.tar.xz 13051500 BLAKE2B e4864a4c21e5242df4164c73db8af10f7b9c36b075e0c05777abec79716db7778ccbf2c0c9e7e749518ad310019d2a6b32bd8b5ab2af5a8b16b5d920f83d034f SHA512 6dd6ac2a77566c173c5ab9c238cf555f2c3e592e89abb5600bc23ce1cbd0c349e0233f6417cbbf1f6d0aefc6a734ba491285af0d3dc68a605b658b65c89f1dab
 DIST perl-cross-1.3.6.tar.gz 110210 BLAKE2B 39074d6f4a526f59de2b1c40432936552e625a5a4e44fbb7ce3c1c3828b12c5298d1ab49b7d34ea92e2a4c8c88f8bbef8cc0c582a3fbbed975cf46d331e89c08 SHA512 d394fbd75d890442aa599eae8893a26540c8b7af966583ad1c3213c3fe0e074415cfed8814de8f397830833fd78267bdc55adc5267168198f269634c2ef3b982
 DIST perl-cross-1.3.7.tar.gz 118291 BLAKE2B dc9c060857d6905c817e91c3f5b1f546b76e02c6de02dc260185e0de8628a5ead3a557501da75549e2585cd30879190558740e697b1c78a69fa08ccb5649efcd SHA512 1111274f34f8b46e9f418883e9b1652ba4a5a9b4a5880a9a5b38bc8aeb5d75a9f4943233870f5ebf5fbcdc0c30b2983ace11ad051b55d3283327d8f2c15e172c
 EBUILD perl-5.34.0-r10.ebuild 25937 BLAKE2B bb47ec2a7285786444059b4bdbe0d042edc43a5060aeed47e924c94d7c1ecdd36c7428b5209530266239e6f2f81aa5228c3699a16916fc8e92dc489265fc1c82 SHA512 cdaed792f1eb988a38fe2f17f99e1cb5c8f5414374619f690832c7980ce412ad6e7276e1ca4285201c3c728e00ae631a5ce0657eba4e4b217b260c7d2acaf0ab
@@ -15,5 +15,5 @@ EBUILD perl-5.34.0-r11.ebuild 25943 BLAKE2B 4608ec616c9109d4b7489ef51279b7b02cd8
 EBUILD perl-5.34.0-r9.ebuild 25681 BLAKE2B 40f1b6ac52be6e8df0b387a6024110a4c52c75e06ba3b8281ad1864b0c42bb7eb7ca98ff3fcbf6897d0fca79e90513d4fc2eea3015669ba67878155ea5ce986d SHA512 8ebea7faa3ae639845b44b64266eb643c5cdeb9df41a6ba529f7f5fabcc3944570a9c132bc1a186abf2d46e9436c55e4deca7f76a2bcdd8a945d3f469c317be9
 EBUILD perl-5.34.1-r2.ebuild 25771 BLAKE2B 3875ad6fa3de0ff25f96a2e76bc0e56a5760c169abbd6f44a0c85f36c22a32dd02dbc8b75903353404fa7d11e10c9049a2d98896477728047bdc847f7641544f SHA512 ae09f9195ce3cdecc9aa43759527f62bc4d0002ea21c659f29186ec1e2dd7eeccb58d947567a225ac8961a84fea590c7ec49bc1b51401651c9580613351b9aae
 EBUILD perl-5.34.1-r3.ebuild 26317 BLAKE2B 431d46ccefde7a16584dffe19ab59520ec8d45bf4b5bb417ccf495f45efc405c37642d89fcefc651c6eb03f00d934de46bd1cd1da3fbee60ec399dd8f54f1742 SHA512 58ec9eee61bc5e0b753b73eec69b2ace717f38fa5cbf950d2f57ff4efcfb563925465a17c22c75a65d6509aab2e271e269cc5e44f43a91352f7feb0cc9c644ac
-EBUILD perl-5.36.0_rc3.ebuild 25783 BLAKE2B 8728d654dd1e9a91372ab1de8aa9f4aa9e363a25c3452e53d059dedeeb78a8456e01c5e936cea7b7c58a24129a581b81a10299e62bf5aba7e8f899c6796f5394 SHA512 a4c87ed9a80988b1158a1df56ec2a4e0775ccb2260097eeda34cfd64841ee9d8d6d1f2a24e7d0344238cf9173c80e90c927bba96a6d962df7069a577af21cf15
+EBUILD perl-5.36.0.ebuild 25783 BLAKE2B 8728d654dd1e9a91372ab1de8aa9f4aa9e363a25c3452e53d059dedeeb78a8456e01c5e936cea7b7c58a24129a581b81a10299e62bf5aba7e8f899c6796f5394 SHA512 a4c87ed9a80988b1158a1df56ec2a4e0775ccb2260097eeda34cfd64841ee9d8d6d1f2a24e7d0344238cf9173c80e90c927bba96a6d962df7069a577af21cf15
 MISC metadata.xml 518 BLAKE2B 5c47c68840fa1444118ba11372d74675a68d178e30ee2b2ba179f1bee8fb97bc7178b34015c29b0688f88391ca9ee2c2f229cfa7b7bc812d2ece9721f8b84d6f SHA512 03980f6925a60032872acea0fb2693a2651b81b8656ad3a7b4adfb129bcd925cc6470e2dab293ba9618e8dd45f0ba76c2d8f4c908182747b0266fa02a268b734
diff --git a/dev-lang/perl/perl-5.36.0_rc3.ebuild b/dev-lang/perl/perl-5.36.0.ebuild
similarity index 100%
rename from dev-lang/perl/perl-5.36.0_rc3.ebuild
rename to dev-lang/perl/perl-5.36.0.ebuild
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 7c89c3e815fd..ab2b4d0cfde9 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -5,7 +5,7 @@ DIST vala-0.56.0.tar.xz 3958820 BLAKE2B dc4ac5ad65fd2650eb2ecf1cc8e7ed177a64ae7d
 DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b19608651843c32c84ca6901a22971a2128a85a1e1e110d0b7d14cb89d4164688c289090a4299bb11540180548cf7 SHA512 83c34ab0497a9b7a627db8c1dbfea9e76c94b902e298afb2c30ba9824717f2fe3b0e26b987feb93cd4ff0ce211d0ecd9a746cc18c00e41c4c6fd01d05947902f
 EBUILD vala-0.50.10.ebuild 1325 BLAKE2B 552a3cfd64d5f1b465575d1fcb410145d8ec0f8ff7ec0e8aabcc4f3106067d13fe63c9965f9cb50150767992712fe3b0f4273eca14f127737ddc841363386b01 SHA512 d52af86db73e7ebaaf221ad9fd7c669342fded7ef840db5a6dd0dd2fd80067b9906fe48667556ecd0a9aee5b6879ba8f2cdc1b5e6ffa9c4bb95845a27b2d74f3
 EBUILD vala-0.52.10.ebuild 1325 BLAKE2B 7a86df69fc88acb215accc50b924f15f9135d7675a24217c49138aafd6a46fcb4687c49969318590ae132571b43583ceeb0f2dfe1ba9c7d5a4e1495567658e61 SHA512 31fa5ee98de090a4c84ea2e409b23b87a473323dcb067b4cde46b73078fb1c9990c1cf9df34668eacd3970210800bb4041fc4a4cd8b7c0dfd22466f15560c932
-EBUILD vala-0.54.7.ebuild 1332 BLAKE2B 26fa5f5a6e81a64509e67f99906a311a3c7864a049016b22881faf170bc232b5a50efe6bb048edbfb47e3c4b26f6df0b65123c666c0165be7c8f9e3f36fca614 SHA512 3771444445b32d1840cca46d8d0cd4d93969ac48493379df0b418580608192262f7c97d6c23c6761cb07c413dbd50c993d3abd1c4998bd80d9f46b09760e734d
+EBUILD vala-0.54.7.ebuild 1326 BLAKE2B c75fc6afc7e9d1f4f7220531683da9124db02a689c115456aef3b187abbd64f0543d9859165117089b58cad56d3bba6dde637df7506fdd242e58c2065429bdde SHA512 7e24f537d605407420e1b899fe87710ce3d0e50d5777acbd3a3ca460763bc3a3be571a1142d9d84da81ff22ee6bf0cc628cfef390af20d304ef196cf8df2bf35
 EBUILD vala-0.56.0.ebuild 1332 BLAKE2B be25d2413d255c9b1eb29120414d4523f40f4b017fd898542591f704aa9c5142caf728eeca37a82a36dfce62cf611fd5e007fe6474769823a5c0660430e34403 SHA512 9eba7b86d2af63dce9baa88383e9fe352290a6da13f827ceca0da482770463bddf3a57d4345ca4b013eef1c1fc42a172ac8af1ae433446a6c1fa904a6c55b8ad
-EBUILD vala-0.56.1.ebuild 1339 BLAKE2B e8cc2225e305a760f64623116d749ebc1bb3a4899e9c44bab49d9fec61c661e4632dbc6641b72bfdd46efdfb1e6ebf24e83dde20c11f502c1fb3bef942038651 SHA512 db50352b35882ba02c3339e3695eb98fccc3db9a2718f106bd9b5e9abadd6b6f8dbd679402ba521ce2f007f5b877701ae8011983912f583d16c1ea00eb1f2955
+EBUILD vala-0.56.1.ebuild 1333 BLAKE2B 635384f48f3cd28176df3499c72bebb493b253b8b7f638e46fe0205ed957ff04f3138218415ab53bd5ffbe6aaeb408161ca8e7075357f2a72f44330c5596622b SHA512 c22ee62e54f2ccb6990444a19d54a18d5c2140915cbb00d910bd14b54d13acc681b699840a0e81d990bebcd9de7821555e2feaf144f8d6c2de29902407dd0ff0
 MISC metadata.xml 346 BLAKE2B 277f10c368556c7d571d77958bde8a421a85f772ccdb5e9abebf2c7c86cc26c33a79a7e552aa76016c7cb8c32cd4435d8779befd42b1e9c8f904e28a0dac5be1 SHA512 a4092a8421609b743fbca75c329df84030f0debef4f6614a399af9a7b331c758a130a91e5eeb2815e56b9b3af6ba7509a3f39e8168bb4c482ef9158a58b69cb8
diff --git a/dev-lang/vala/vala-0.54.7.ebuild b/dev-lang/vala/vala-0.54.7.ebuild
index 73d616e5874c..8cbe8fbb3a1a 100644
--- a/dev-lang/vala/vala-0.54.7.ebuild
+++ b/dev-lang/vala/vala-0.54.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.54"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/vala/vala-0.56.1.ebuild b/dev-lang/vala/vala-0.56.1.ebuild
index c46df3dd37e3..a6e4d338ac25 100644
--- a/dev-lang/vala/vala-0.56.1.ebuild
+++ b/dev-lang/vala/vala-0.56.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.56"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index b6af53e593ae..9463667ec23b 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -3,5 +3,5 @@ DIST yap-7.0.1-gentoo-patchset-0.tar.gz 2390 BLAKE2B 2e7dbfe6dc8ea60c8a7ee056707
 DIST yap-7.1.0-gentoo-patchset-3.tar.gz 4353 BLAKE2B 90c4750517189b3492fde0afde3da587a60f5aa98138a9b0626789dd79ce76981a9278706c510f0870595613e51c7c7be296fc9195618ef7ed6d3c4977191be9 SHA512 2effb29eebdf25996b10dacb625497159c880dc3c5e58e99cdd215bf3df744e3c504262b4fe4fe3e1eea7ec2e132c68b8dbe4633ac3c625efb6343f3fe5b87c4
 DIST yap-77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz 15121857 BLAKE2B 0a38a1f302108a93cdc7b31fadb44823f1660e65bf3bb1910988afe81e313e6690094550c9eb4a6cfba322cd40b0cfb5ec853b350988ca123507fda362de118d SHA512 56da8cb9e56cb23d2592ba92b0b4cbd323e491767a121ca88896d2744737bef9d4a63f3b80b36fd52b1ead84a075d270060777fef85dff3ef36403a84c96b9fb
 EBUILD yap-7.0.1.ebuild 2443 BLAKE2B cb4e37406bdd81ac1b2a290764415c79f994f63672fd2cf753d57966e5038b68c253f49e8f73b3154ed7adbf7a7bf47705d231e830e8293dde3db5de68eb8d23 SHA512 02e40b59cc3654107c063e615be266ce1c9ea8c617f6617e61d252b4b1fd896e459d9ba3edef5e0c5b39398817494b05df55318e85852ca0a051f7c9a45064c8
-EBUILD yap-7.1.0.ebuild 2454 BLAKE2B 1b53f0c3d05ec4f9087c969943bf756dcbad91efb55f6784a82bb1ee2e216374b6c80780053f00047ab42a96f932211f46d4101da65294a3a8c00d85bfad854a SHA512 a25123e552ab3a4c8eaab918886879bc1c7a30f75f1baa1dbb4b83b56d0b4c107dc9a521f95b437e8ab622b1025e4f0acc997c67e3985feb2372c4641ae0eccb
+EBUILD yap-7.1.0.ebuild 2459 BLAKE2B 9cadcae2d3fe83de3484ec5e4ec6cafe38f902f7b50bf92d585f2aad9e108dc34f4d23aa173494f0a5d6c4843d38e8ddbb186c4a7724537701d7c491c7147c4b SHA512 d295f4463c6126a64aabe19dbd765ae4dfc5ce83ce28147b767817d2bda1b72c23033e50496af91d40c509bfac1a36a865acecb311874ab146786b6cf605d522
 MISC metadata.xml 389 BLAKE2B ac9f98ed97d411c1dadc014176d7514d6c4226d80340f2a0f801832f574eb78a319f7444eb2a815f5d74b6435596f5eaf2cbc3e94159d1ab4e5373f7857f2222 SHA512 6b40c043d0a685349a6cf865e6ddf4c5ad16b5a8fbe56332f5547784538d54e4df35eadf9d745710c5664bbe41365415784143c422605e8aaddeb3dd6fab163b
diff --git a/dev-lang/yap/yap-7.1.0.ebuild b/dev-lang/yap/yap-7.1.0.ebuild
index d0e15c3e0bc1..918c059d79ea 100644
--- a/dev-lang/yap/yap-7.1.0.ebuild
+++ b/dev-lang/yap/yap-7.1.0.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="dev-libs/libutf8proc
 	sys-libs/zlib
-	dev-libs/gmp:0
+	dev-libs/gmp:0[cxx]
 	java? ( >=virtual/jdk-1.8:* )
 	mpi? ( virtual/mpi )
 	mysql? ( dev-db/mysql-connector-c:0= )
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 30df1eee1f68..f35d6c815a21 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index 171bc83c71df..83c4e74f2398 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.36.0.tar.xz 299100 BLAKE2B 46f0cc10052788643c09e27e36a3f74439864cf5c8fdfcf5850e3e7df596ac8a2a3dd8a01856503d43995ff1cc36ec0ca63884133f2c5f4a3634aad2c5119997 SHA512 d0f18204eaf96511e8448e3dfbc4b6953a7cf8b816151fb7caf5592cf578572b1cdb16836fe2157b11e3ad018ef171f1ca1bfdf255bb31bb455716d7519fd634
 DIST atk-2.38.0.tar.xz 303952 BLAKE2B c89e13e413ea46667d94a3555a1764ee22be353b90b0940735fceaad823403026503c463b3ad200fa176ee4faee6dd3cf421542bf1e1a9dbc9a4844ae2963874 SHA512 dffd0a0814a9183027c38a985d86cb6544858e9e7d655843e153440467957d6bc1abd9c9479a57078aea018053410438a30a9befb7414dc79020b223cd2c774b
 EBUILD atk-2.36.0.ebuild 951 BLAKE2B 77085bb69eceb75d2a26db9cb6c74f90e4941f67d28e0b24f6e8ee5d08bfe2b026510cc71b63ebc34e404098db1e2eeed1792e5799ec64ece2b255e68c6df5ac SHA512 7f9ae82551d386b4b8b71c45eaa9749f369c767478a14e798a028be47897ac18ace5ed90f4d3d0c4d5279835d3f8129d0a97b374f7c840b9532ab87fc9bf80ce
-EBUILD atk-2.38.0.ebuild 966 BLAKE2B ec0bb6c970a1c0719d78c875e869bf6f11a258527667ce50dbf990aee828e2d2db7dbd4c64a52ccace2a8d62f8d08dff27c91f5d7042156d364a5ce40fbdfee4 SHA512 dfcb4cb238c7002823dd8296cfbafa2af094258b22a5bbb3b1b1b446d65725859ffca949b781e37258c275dce5f23d784cfd0ed4b99987a1ac6e16f0f086d788
+EBUILD atk-2.38.0.ebuild 959 BLAKE2B 98f4375d4b055804c302f5c2b96837b31d6ddb508690665bbda8f72719c6d2791b8bb43bf3e0116ee25b664690f7f2ab808d002e6a7470b65b96afd9481fc1ef SHA512 f2193a19ca3a5845bba04fbfe7e5dfe970c05f5e2174ba7ea8896632594753add5790b06951f359a281459d826f66d2bc68c495c17208036cdcf436eb4436b06
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/atk/atk-2.38.0.ebuild b/dev-libs/atk/atk-2.38.0.ebuild
index 02202396d776..840f41e2d198 100644
--- a/dev-libs/atk/atk-2.38.0.ebuild
+++ b/dev-libs/atk/atk-2.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="gtk-doc +introspection"
 
 RDEPEND="
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 6a5cf2940651..69a1a407a35b 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -2,5 +2,5 @@ AUX efl-1.25.1-libavif-fix.patch 2477 BLAKE2B 36ad24c7ba88a34e4da0d69cfda74b3a7a
 DIST efl-1.25.1.tar.xz 72306872 BLAKE2B 060d729380ba62677307c5346da1786e879c14c4e40f0a3288c8cb81ece08f4ac501d989495b1c3dcbfeb19a86d23130892ae874861de5684c867aef60cb07d6 SHA512 cd281c2299aa6f74f0204e59a13dc254135e6dc40641e0a437c6f5025efe517d415f0915f69e123123319a9bbddb748aec1948ed0b5eb386e028cf45b244bed8
 DIST efl-1.26.2.tar.xz 168537016 BLAKE2B b7ca59dbcd483edf31e68aae4df512a195a8239935febf8497ce039eb18696ca84e4f6d0206818c84f6e1f625abf3e730fc812304459e5615feca2c3fa07092c SHA512 d8478b6f197600c5abb7e2fcc030f8938e6726dde5e1947df4b042e6e9c77b0f31770b6b86a76ee2be52bf5354e02716bd7e5daf0771d149004d9447e432dc32
 EBUILD efl-1.25.1-r13.ebuild 8244 BLAKE2B 33ed2bf2ffc2954ff3d485c0da4580b41c8df9847b4dd95ec886f491324239de06f97b6d123b2c38d33be28031d073721b90667be88ce3bc8de8ac32b2790867 SHA512 de0a9aea7d4e66c4b4fc11f2b0951b2f3296e9b84cb4bf0df5d6c5a723b21e325b8fc5d6258b76e4504b7759208bf8e52907b51113d86b3304f8d0938a90edaf
-EBUILD efl-1.26.2.ebuild 8227 BLAKE2B 5aa82c221486d054cb831e2f9b4fae5a5b27906612d63d9ddbd7f05976cf6e1a91698999756d5ea46566b0f0c571f3d3d9c6be8ebab97c27bf659fea5e977518 SHA512 a70429f35861d4f7fcc3cd384a270c0572c95273e86d2a160c9873cccf02181b0d6c00c246b29d55f15f09540dea20fdd51297d60d1e06354dc89128aefdf4c6
+EBUILD efl-1.26.2.ebuild 8268 BLAKE2B d2db5e91da67d2e30ea278819259b3d4100d7fc860c2264970b1f29a766fbdf27d07546db8bbb9c14ab3a2825e6f854d09bbe008e85fd478f4a417dca43ceb1f SHA512 e56acedc1a3f0c37984c6a48182ac61c9ee883cf7c05cb960eca64dbb01f09757cb2608c6d3dd4192b78574bb67e0c059fc24797296b110ea89932fb6a301296
 MISC metadata.xml 1943 BLAKE2B 192127f421b9e9216ac8b9b2b161dd99bff9ae0286e1051bd541e4102046ebd23d835d2a0745d5ec82e9ce2b56e37569b2b3e0532f7d2daa485c17eda17bebd8 SHA512 c7a8d0dcfddfa4e1b2f0fce817e9daf3f07c014eeeeb3a7cf4d43df89b35aab24872e5fad1dcf3bf00213dbbb309436a49e005d8ce94095b1810067e5b68b250
diff --git a/dev-libs/efl/efl-1.26.2.ebuild b/dev-libs/efl/efl-1.26.2.ebuild
index 76cabd758589..45cdae3ff73a 100644
--- a/dev-libs/efl/efl-1.26.2.ebuild
+++ b/dev-libs/efl/efl-1.26.2.ebuild
@@ -123,7 +123,8 @@ RDEPEND="${LUA_DEPS}
 	xpm? ( x11-libs/libXpm )
 	xpresent? ( x11-libs/libXpresent )
 	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	wayland? ( dev-libs/wayland-protocols )"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
diff --git a/dev-libs/expat/Manifest b/dev-libs/expat/Manifest
index f118a9435cea..6af8162f8a9c 100644
--- a/dev-libs/expat/Manifest
+++ b/dev-libs/expat/Manifest
@@ -3,5 +3,5 @@ DIST expat-2.4.7.tar.xz 454136 BLAKE2B 441616f44ce585f75a67a3ebc2264e5723df55975
 DIST expat-2.4.8.tar.xz 454428 BLAKE2B 25da91fdcdefe81740cc8129fa52bf4ceb0bbbee11f0d750485424dbc638f5fba8c30007d0f0b0e3ff5c84fe197b9b220852976272dfe5d6cc451d114297c2d7 SHA512 d19b0d6469537aed20c54bd9cfa4089d39e4acaaddde57809de7c6aec55dc870677c02480e7f65dac5620bd5454b889370453613518f9da647c74a831a2a1b7b
 EBUILD expat-2.4.6.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
 EBUILD expat-2.4.7.ebuild 2277 BLAKE2B 5e2039ed2e5604aafde9f4ae1b61a931c3c8e7bade01349eb804e62efc12650ae0ead3531672df8064c7dcb9a257cf00314ed7c6a591b10731a465cc9279697d SHA512 e69a6ec9a906245e8d884cb5019b68644f0e86a48fb5d30d012c588442db761b3bdb115f5ab4c7e50e36251a0edf22389ead0f36823db59a6a9d873dbc10ca82
-EBUILD expat-2.4.8.ebuild 2285 BLAKE2B a76e224ec3ebb6bb269ba1c589c199e2364067c751b896d2ffe69e1de38403eda10352ea9e529b10b61e959c5e0e3d9d33290fa49f3a9b616c54ef924fcb66d6 SHA512 8d2ac4ab4143405bdb68780986dbece958074076bca4238c1fac72e83a76e5e1d64cf5cc55bf519b34ce7cbf60d227e3d060c99048a0bd2553bdd93915bc15be
+EBUILD expat-2.4.8.ebuild 2284 BLAKE2B 814372a31968e1f5c6109dfb456549c53e1795964e853ef1e7cfa4aac56800fc6c8a74f2decda30f8627e2f94c469fdf7d43df0a82465b6c512fe2beda1e0f4e SHA512 9794fb4ba34a5cb4ff6420fc5ba9c091e5b8314d13149e56a37a1b98cb2c91006b34b1819a0ff1f10ffad9663e169e63f6d330787087a2cf0cac1fe7d1592f6b
 MISC metadata.xml 514 BLAKE2B e38c182f42192e0f3b567423b148733b59ed885cca58d36829dfd57bad88565baca743024aa5fc701f368fcfc8886a92ae20a94f549e190a3d31e2ca5c0e28af SHA512 6248f12ed1f3e2bc10d7f11117ad18dc86ccb5ecc1fc48aac32032a062d1273e956cd22e712a1b14cc670642047f9dcaf63606dbad08895e1e3b94b0573bd74c
diff --git a/dev-libs/expat/expat-2.4.8.ebuild b/dev-libs/expat/expat-2.4.8.ebuild
index e255b4d5ce1a..28bf1c806325 100644
--- a/dev-libs/expat/expat-2.4.8.ebuild
+++ b/dev-libs/expat/expat-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 SLOT="0"
-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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 43df6db2a94b..63a8e7ac08ea 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,5 @@
 DIST folks-0.15.4.tar.xz 493004 BLAKE2B 0e067a39b4e89e8fa41b20f37c774e56fcb1e0c8de23798ced647177b0d9329509ae3c03ff85a00464887deb4ce275c96b2fcf50aa2dd44af02e20b6ee45fe65 SHA512 4dbd0bb82d56a8cb179ab8148ce531817ccd55bd40f8b562eb0d77555b264e5190669b356ff009c81a963fdcacaabc02fe871bf0c3c668a648f2c820da76f25c
 DIST folks-0.15.5.tar.xz 492976 BLAKE2B bb831a637dec44ba0e9bb815c2559e3b7f484734fc297293c392bb2c72dea77c5e8aec3e7c76a096288f84f463041fb0b52a3cb50a83c5d84bed818c6af72a27 SHA512 696d158234cc5b4c504491c6e01dc45ed53c4ac02e3e62e637d229207dde396a82a850d143d8615dc838d99c756edfce145405ea3972c556951d6408fb8487ea
 EBUILD folks-0.15.4.ebuild 2348 BLAKE2B 2a6b299326aa74168affff44885f41d61895e91b6c9785a89973abd6c17cd458248cf7e5a956be272bc8181cc68dca44984fd6a2534b402b52356ee85825c7ab SHA512 e0b5a04ee0215820366a79dac1acac2003c17241f0880dbbbc25c6731d065168783812bbd9feea2a1268c462910d367eccdf6671760a6aa7af7298eb78077f73
-EBUILD folks-0.15.5.ebuild 2341 BLAKE2B c4fb6b3a4df8108e1f965e9209b573abf6f0957e82a071c8e202c4d4b221c8d0b212c4d2a57f6c6e492ac70696434e632b97cf19a591d8d75219be90e387d2d5 SHA512 f8c5c669b91e0fda9c740090a245126327864cef1bd024800714f66a4c0ff70e22e54b5a23c8128914b60c8e616e9c25d6d1f9eb6cd2f628eb284a77bfdff840
+EBUILD folks-0.15.5.ebuild 2338 BLAKE2B 4c90546c23eb83b4fb3aeca7a3c8642fb130c36bc5dbed9272ba328076afe73b6870c5e0ae9bf9332c19523790082aa81c3361b5b07d226451a1411d19e99610 SHA512 16d5a0aab5120db03e49492865d26d505285bf735404c9f2419de85e27acf7e3d5e9f6ce5305cc0f6ba5ced340d317e9ebc5d7dfb4edcf866bf1ad9e1b2fbbd9
 MISC metadata.xml 396 BLAKE2B f4e55d5af852a227b66080749510b9915ac9c3f7081c88051f06be73465235ccc326db015238366e62c40d6e8027eac233644ad8421eb0b59f881e2ec215a1e2 SHA512 4a6a15a7ecee35f43c7f82d24e82c32ca3811058f5135e473e15bcae21fc3023d61a6c9f638c9d97336baef3fa8126ab31a49eb036545f521dab2bf93c2a0f0a
diff --git a/dev-libs/folks/folks-0.15.5.ebuild b/dev-libs/folks/folks-0.15.5.ebuild
index 9ee2c090d991..88f15256eeaf 100644
--- a/dev-libs/folks/folks-0.15.5.ebuild
+++ b/dev-libs/folks/folks-0.15.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/f
 
 LICENSE="LGPL-2.1+"
 SLOT="0/26" # subslot = libfolks soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux"
 
 IUSE="bluetooth eds +telepathy test utils"
 REQUIRED_USE="bluetooth? ( eds )"
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 52552349bab2..7aed047491f9 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,5 @@
 DIST fribidi-1.0.11.tar.xz 1077004 BLAKE2B 9de3e170e2b6cf90623c711e16f6595f6ca91e14707cbfd36dda7df92689ea79ec36c4b658199e9046eedd07c9ebfde18617525c83cf4b0e9e2ccb4d9f82ed84 SHA512 6afde86784de06759f18235ccb44f23261a975f7cce0021b16755065a6a8ed84d7d5fb7fdcaadd691b48011efb4bfc2ee67555e5133a294a418cca1a0c85476c
 DIST fribidi-1.0.12.tar.xz 1154912 BLAKE2B f76f9d28f738f0cc9790ccdf0fe419cb0e7d70b24aa825844d23c4b31ad51c33f09c88ad4876fa6a52523f2a52d5eb7a4b50deeb70f9db750c69ac236ecfa8f5 SHA512 cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49
 EBUILD fribidi-1.0.11.ebuild 792 BLAKE2B 67389241050d716c43ecd68978ac9047176f67554beb51342ad0e6c49fb279d8d1c55a323e92308705503b176dc7f66dd2362badadefe57400691d5ab9bf6c1d SHA512 2c405435b8603031f8111811e2ae72cb439ca74b04efd1e4535f3c51d24c83117ffb45de784066059dbf62793cfdbd022fa0e65257f94bd812729ce7df21442b
-EBUILD fribidi-1.0.12.ebuild 807 BLAKE2B e04ee9fd9399b8e07187bb21b1f13f079cae8ca32e1436aea3d8fe507ef9c1b511898e5466f85c005c937ed98f419dcb4bcadb5a8f10c5486e647e39664cfc3f SHA512 877debb85f05323c52ed9893f27fe6f5d8ab6afdc5c482014db84c83331b80d17b339bf7e02dd778fb37fa99e8edaf1de8e325cc5c51c489c8bfca927f03ec10
+EBUILD fribidi-1.0.12.ebuild 800 BLAKE2B f6d86d2c5938e43f9084dcaaa18595466f444c7b02f6746eed8fe502e4d068f4ff494581021c93d9ae53448c55556078343c977000ccdf646001050e30addd51 SHA512 7d9ca1916629c50ccae0d4521da3b81d8d2f41efb2a1d0311d60e8d4526160fcac247cee3a71bf037daa2204a2b2eaa4400e83dc16c7581f35dcd11328756752
 MISC metadata.xml 342 BLAKE2B 71ad2adf0909be22d8d55ed37c2ea05e7e2fdbdb14e2eee4bff83447d400b89996403a2c4875d30330e56fd857d3672574006c36ba8b23b91ae0de3e801609f9 SHA512 a4b5a69dea823758640fd15374ddb4e5840bec92cbdaff8f8b62554b472a9b7006f77f0771d8410fc076e67da005a4e153fde7443059ccf9d7d85244c8cf2912
diff --git a/dev-libs/fribidi/fribidi-1.0.12.ebuild b/dev-libs/fribidi/fribidi-1.0.12.ebuild
index 6d995358972b..93df6c63424d 100644
--- a/dev-libs/fribidi/fribidi-1.0.12.ebuild
+++ b/dev-libs/fribidi/fribidi-1.0.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.xz
 
 LICENSE="LGPL-2.1+"
 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"
+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"
 
 IUSE="doc test"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/gjs/Manifest b/dev-libs/gjs/Manifest
index 9bb10acc5114..986fa14038d1 100644
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@@ -1,9 +1,10 @@
+AUX gjs-1.64.5-gcc-11-support.patch 5254 BLAKE2B 77ca0c06f8214bc4a61d4e6df2371776c086738d19164d94913b0c55f795078d29c83a1f61ebd435f8977e853f2f7bbd9d442888f9ebef4e6a4fc11575734e16 SHA512 291bd7c518286af2018602a3794b2cdc4b39ea169c527af4e2ee97f9021fad56b361fc5aa65e0d4cac0d33921a97330ef50fbf03ec1d2fe04896c881c4b080ce
 DIST gjs-1.64.4.tar.xz 422496 BLAKE2B a96211f7240336dbb30c6965e405f59ee72e4288842837da8da8c6d3c59b7e04ebb6c7a8b0b02d38601c162ffdf1a1fef9f13e4db720c4c483f4a39dffd5dbb4 SHA512 21a15d7106ad6584fb1f02cb0a0a4cab211a3540adb8f2c03d35c211e3946b81935000a52351fedd95a18a7ff6b7f96e665fcafa3c411ff79f2b6cb332c82b42
 DIST gjs-1.64.5.tar.xz 422548 BLAKE2B dcc0b7327cbc6a1108be031c8807e61ebd3c8392916750078aaa0d82cb3bf9f7ff0e1876c250e5ddf6e9d7bb6a17d9d1fe34c1c77ff534b7ec1dd54fa05a2d1b SHA512 41a3c79888792674b2bccbf254507ed02497eb571c8ca7f47aab406d2ee29b73c98b1c7d59c33ed33bad90c6989df944d78b86d2f7e9824d598b62e29769b6dc
 DIST gjs-1.70.1.tar.xz 598444 BLAKE2B 7d5f1b82e9edd20b9b3d3b03511d3cb8e19715d5dcaaa5375867c1c8754895db33089c41e17f28b732183ce510fff868399cd2174062684e0b3072cd599bc12b SHA512 194d8efeb37ecf7f3ea65c0bf0bbe2120524a11448423888d0785868297ebdea12b0ea4b28cb49d2596c7a3d73f13eb216072db8dca5e209193ba3dbbad78b6b
 DIST gjs-1.72.0.tar.xz 620296 BLAKE2B 33665e66d548c6017bdc9ddb7409e1a21b07c9257bfa23ef35b58131037eefcf8ec5c8ffddbb1968db374f22729a6da873b85a022a2f3ed00168cba00acc7923 SHA512 224934eed511052d013cc7c2a29ccf79b14e5ed8c01db8071f07858387d7794b9156abd43ac494a13294248d9b6f2956d21c4e9581a41f5161043dff374f72f9
 EBUILD gjs-1.64.4.ebuild 1121 BLAKE2B 98e74cb7ab03be98f02cd62a684c804ea40dff1df80632b13ef2ce357ecd5cd3030a3816258317977e1fce9021e87650d6128d71f773704b7340b6319c419f5b SHA512 229e77055f686debdebdd32e667ad59e706a77346772c8fa6164425bd3e60cb4947d477af9925aa4da8f90eaf55807ebea6c05c85acc594367bb4745f73a576a
-EBUILD gjs-1.64.5.ebuild 1182 BLAKE2B b9b3ac973aa78bfcf7093fdcd01820094e055b5a52368788521cb9eebecf0ea36fe0deb74bd9bac314303cea3c9f24e1cb1438c20abf035a9e86160560557ae9 SHA512 6a4b489a7bb48db88d22a5c2f847d6c6c469af609fa877f95fc1e62ac6c1db0bf5c2b3782d5c31b13538536dae44da27c106e7b54f6e52652c11b20dd1c80305
+EBUILD gjs-1.64.5.ebuild 1189 BLAKE2B 17ff34e2f520311e2fcdec0b158696674b410eb1b1a78ed0e54b5522b9debfdb36a2cee33cbe96d6d055ed88887871f08be7c788aab9f5f9c2df14d693275d03 SHA512 c16c58c58e2c435558d670491bef49984556c58a481c7d5fe00b7558a91a50913b5528012cbaba5ec8bf3a088e231765f4de3f9ccbdbdb2f976a60a09fb9a736
 EBUILD gjs-1.70.1.ebuild 1189 BLAKE2B f5d195a50c4fb8f270368d87cac25c50ed74fb13ff2f6d9213de4c1ac940a86c9a9a693b539f2a4320e11bd50613c899879fcabbef0a41182b62b8e4a4e194bc SHA512 c3d2524695c7f58d78f3e58f0e7f260b497e6783446bd216a0c1f0abfab91e423f7959d492507abd5b820d7296d5f7d4e235f58c7f7ebe4686a82fef776717be
-EBUILD gjs-1.72.0.ebuild 1194 BLAKE2B ee77ef8ec4e07d76eb007f7d0a798e0cff09cd6d6cab2fe9bb87f31b04fe512307fe8cdcd5a95f36435a34a5d99dc62594b6d55a4304d44e04bc869609520146 SHA512 f712110a9d9c6d0f68b9827390453f8abe6e9ea0c894e040cd3e158f044106bf0e078a64dcc0132fc2e8e6e9f04550424eef80c4d9172d9b11a7c6124cdc3cad
+EBUILD gjs-1.72.0.ebuild 1190 BLAKE2B a827f8a67160c0e796243ba51633c4aa58c2573389543741d2fa645bd446a6638d55b842413d422d917e847081232ed9c3c771d4b9ce4688ce2c3f8f9b27df54 SHA512 795fcc39e80d50a89f70bed15c8439e12a6c98a162d3048acbb6d6f3deeeaf4333f9273d2ebab36e7adc231c459751c37ca25ccba7171d0f81386a1882bcd443
 MISC metadata.xml 389 BLAKE2B 68d318dc917f5072b08e83506e14d0f4b8f25bdb90b95701013466112f8fdd77c2cc193257eee82fbce517e41056eeff61cd20137b697f6d1d688d943bafb8cc SHA512 bc4b0c94d58f3f67cbe481c45fdedb5d601e3ca40b5dcc88ef8c7ad9b214e7cd0d5c47d94599f85c11cd1c21dfd57770fd64d442f4b3f960ebc70a8e16f8e8eb
diff --git a/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch b/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
new file mode 100644
index 000000000000..3808b6d7862b
--- /dev/null
+++ b/dev-libs/gjs/files/gjs-1.64.5-gcc-11-support.patch
@@ -0,0 +1,129 @@
+From 757d42d87e8a3b52a0782bc9cbd33c788ecc34e4 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Mon, 15 Feb 2021 20:40:43 -0800
+Subject: [PATCH 1/2] GjsPrivate: Remove volatile from g_once_init_enter flag
+
+On platforms where g_once_init_enter() is defined to use C11 atomic
+builtins, passing a pointer to a volatile value will generate a warning
+in GCC 11 and later.
+
+More info about the GCC change:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
+https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
+
+More info about changes made in GLib:
+https://gitlab.gnome.org/GNOME/glib/-/issues/600
+
+See: #376
+(cherry picked from commit 989ac9ac723dc1c8b6b8961292f236c558f5c0f0)
+---
+ libgjs-private/gjs-util.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
+index 20a732d5..f7f3189a 100644
+--- a/libgjs-private/gjs-util.c
++++ b/libgjs-private/gjs-util.c
+@@ -57,8 +57,8 @@ gjs_format_int_alternative_output(int n)
+ GType
+ gjs_locale_category_get_type(void)
+ {
+-  static volatile size_t g_define_type_id__volatile = 0;
+-  if (g_once_init_enter(&g_define_type_id__volatile)) {
++    static size_t gjs_locale_category_get_type = 0;
++    if (g_once_init_enter(&gjs_locale_category_get_type)) {
+       static const GEnumValue v[] = {
+           { GJS_LOCALE_CATEGORY_ALL, "GJS_LOCALE_CATEGORY_ALL", "all" },
+           { GJS_LOCALE_CATEGORY_COLLATE, "GJS_LOCALE_CATEGORY_COLLATE", "collate" },
+@@ -72,9 +72,9 @@ gjs_locale_category_get_type(void)
+       GType g_define_type_id =
+         g_enum_register_static(g_intern_static_string("GjsLocaleCategory"), v);
+ 
+-      g_once_init_leave(&g_define_type_id__volatile, g_define_type_id);
++      g_once_init_leave(&gjs_locale_category_get_type, g_define_type_id);
+   }
+-  return g_define_type_id__volatile;
++  return gjs_locale_category_get_type;
+ }
+ 
+ /**
+-- 
+2.35.1
+
+From dade6ee66e07a1865dc380060abe921eaeeae763 Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sun, 14 Feb 2021 12:20:09 -0800
+Subject: [PATCH 2/2] maint: Avoid g_once_init_enter error in GCC 11
+
+On platforms where g_once_init_enter() is defined to use C11 atomic
+builtins, passing a pointer to a volatile value is an error in GCC 11 and
+later, in C++.
+
+More info about the GCC change:
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95378
+https://gcc.gnu.org/pipermail/gcc-patches/2020-June/548283.html
+
+However, it's my understanding that in modern C++ there is no longer a
+need to guard the initialization of these variables. Since C++11, static
+local variables in a function are guaranteed to be initialized only once,
+the first time control passes through that function. So we can just remove
+the g_once_init_enter guard.
+
+More info:
+https://en.cppreference.com/w/cpp/language/storage_duration#Static_local_variables
+
+Stack Overflow answers with quotations from the C++ standard:
+https://stackoverflow.com/a/58804/172999
+https://stackoverflow.com/a/8102145/172999
+
+Closes: #376
+(cherry picked from commit f02eaf3a9d3465915eb849428c2d9615e2184a4c)
+---
+ gjs/error-types.cpp | 32 +++++++++++++-------------------
+ 1 file changed, 13 insertions(+), 19 deletions(-)
+
+diff --git a/gjs/error-types.cpp b/gjs/error-types.cpp
+index 86cb8789..5eba61b2 100644
+--- a/gjs/error-types.cpp
++++ b/gjs/error-types.cpp
+@@ -31,24 +31,18 @@ G_DEFINE_QUARK(gjs-js-error-quark, gjs_js_error)
+ // clang-format on
+ 
+ GType gjs_js_error_get_type(void) {
+-    static volatile GType g_type_id;
+-
+-    if (g_once_init_enter(&g_type_id)) {
+-        static GEnumValue errors[] = {
+-            { GJS_JS_ERROR_ERROR, "Error", "error" },
+-            { GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error" },
+-            { GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error" },
+-            { GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error" },
+-            { GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error" },
+-            { GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration" },
+-            { GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error" },
+-            { GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error" },
+-            { GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error" },
+-            { 0, nullptr, nullptr }
+-        };
+-
+-        g_type_id = g_enum_register_static("GjsJSError", errors);
+-    }
+-
++    static const GEnumValue errors[] = {
++        {GJS_JS_ERROR_ERROR, "Error", "error"},
++        {GJS_JS_ERROR_EVAL_ERROR, "EvalError", "eval-error"},
++        {GJS_JS_ERROR_INTERNAL_ERROR, "InternalError", "internal-error"},
++        {GJS_JS_ERROR_RANGE_ERROR, "RangeError", "range-error"},
++        {GJS_JS_ERROR_REFERENCE_ERROR, "ReferenceError", "reference-error"},
++        {GJS_JS_ERROR_STOP_ITERATION, "StopIteration", "stop-iteration"},
++        {GJS_JS_ERROR_SYNTAX_ERROR, "SyntaxError", "syntax-error"},
++        {GJS_JS_ERROR_TYPE_ERROR, "TypeError", "type-error"},
++        {GJS_JS_ERROR_URI_ERROR, "URIError", "uri-error"},
++        {0, nullptr, nullptr}};
++    // Initialization of static local variable guaranteed only once in C++11
++    static GType g_type_id = g_enum_register_static("GjsJSError", errors);
+     return g_type_id;
+ }
+-- 
+2.35.1
+
diff --git a/dev-libs/gjs/gjs-1.64.5.ebuild b/dev-libs/gjs/gjs-1.64.5.ebuild
index c8a26722b31f..e22e2fec739a 100644
--- a/dev-libs/gjs/gjs-1.64.5.ebuild
+++ b/dev-libs/gjs/gjs-1.64.5.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline +sysprof test"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/gjs/gjs-1.72.0.ebuild b/dev-libs/gjs/gjs-1.72.0.ebuild
index 35fcadb1f5d4..adc4588f4e9d 100644
--- a/dev-libs/gjs/gjs-1.72.0.ebuild
+++ b/dev-libs/gjs/gjs-1.72.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gjs"
 LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
 SLOT="0"
 IUSE="+cairo examples gtk readline sysprof test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 6f3c058ea94a..0f4dd844b774 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,7 +2,9 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
+DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD glib-2.70.4.ebuild 10219 BLAKE2B e48a93dcd8aaa28466d52188718c811d780c1ebc0f48b5736d7dd911c89bb78fab0fe8dda3e0ce0cdaf90c7a4285b33cc94bcd1ec8260f66cdc44383f696c0cd SHA512 87e59328f0056aae0682aa2ea8925f30846ec4356350a839e9c71f15ad38276aff4a0ece1cd15fdd2f3576f946670c4fa88474d232984ad730412f662b7bb484
 EBUILD glib-2.72.0.ebuild 10227 BLAKE2B 674c325e91a62c32ba13f83a5061ab3d7956b86fe9fa6815e2959881a1f89d95b4e3fb6ea44ac8e7bed30e70d6def99cfbeb56eeea8321da460fa13b41a79c29 SHA512 2faf137d976d912599d93f22a3714e0654ce696f6d32e0dd36aafb7e659bb275abb02601e289836367a9823e9a994fac5a353e552a2afeb4cb01693f2a15a76c
-EBUILD glib-2.72.1.ebuild 10234 BLAKE2B 75c732deaf8bb62e64d6a7c26dffd4d1b9ba84c93d18a3e899c256c37bf5fb0eb1c228ec37eba757454cdf4f21868fff028cd66dd73aff0fc5f26925a973d500 SHA512 c5d815b0de2ea27c22f0995fca0da703b833c5788adfa0648eaed6f3f0f986617619f2278f73e0f2d238b6d7e40e83bc3cf1e5c15068b5d20048ebebb86c383e
+EBUILD glib-2.72.1.ebuild 10227 BLAKE2B c7e64a6a97a78863dc2fb81a3d63ad7ff7420ab56778632a8940f517b60b1598ab5a088dde7c1f6c3e012394793facf5898af49c3c11cb71eec324e350571dcd SHA512 547f722d881208b923f60068a98703929378b2a758fe4ebdcb047396e083d32b1d6f66e2658f954852b888aabb999895bfb47b0ea9e2c3eb2ae48416c7e0948e
+EBUILD glib-2.72.2.ebuild 10237 BLAKE2B 0ec427acc268ee0fd9fb184ba9168fe0e06ddb4bbb8596724a8c041b0f699f17768e16f85cb39bd45a3d5af7441d62f906749472f4ce05b5c87aa8ff4909c947 SHA512 d3f07fdb308a8374e8e34ea094efa0d7464d064252f419397942c7df08da037fe5aa27fed5bd42000df6958095ba707569ae8d0ba386a0b455ca10cdeb9a31e1
 MISC metadata.xml 1221 BLAKE2B 517c6f9ee14ccac7192d7c1189773ec6e034bc638a8acd28081a604f8516ee639f43c82ca3233d513dbfd06db714358e396f2c4cd906715bb0950f130974ab9e SHA512 0c4203b3c9d8b91eebe4ee54f34d1aae26e5efa4c791760559b18b58d90b508936ead62ee8df81e6777ad8e0cb0e9c68d504d0f24ecd5903d4e3df89c6cc0bdf
diff --git a/dev-libs/glib/glib-2.72.1.ebuild b/dev-libs/glib/glib-2.72.1.ebuild
index a53ce4868917..85bcb0ce7312 100644
--- a/dev-libs/glib/glib-2.72.1.ebuild
+++ b/dev-libs/glib/glib-2.72.1.ebuild
@@ -16,7 +16,7 @@ IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap te
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/glib/glib-2.72.2.ebuild b/dev-libs/glib/glib-2.72.2.ebuild
new file mode 100644
index 000000000000..269d854fb717
--- /dev/null
+++ b/dev-libs/glib/glib-2.72.2.ebuild
@@ -0,0 +1,287 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use fam)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 063036a3fc2e..d4b786324c11 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -3,7 +3,7 @@ DIST gmime-3.2.11.tar.xz 2230984 BLAKE2B 7a1758d8b7b3e4a3b27819b3cd4002247209b0d
 DIST gmime-3.2.7.tar.xz 2227048 BLAKE2B 7fba57640038f34bd45ecba1067b6db131705310b62a74da1fa3d575993bbc6cc1dce4e3d219dd42033775e0a90f2b2acc86b1094f96f03a7532eae1b69e63ae SHA512 2c8fecd6eb74c9e956c419ce111bef6280916ea3756a534b6b800a273f0fff260717cda7fefd4bd4c6ddb27973112ec6e73fa971fa74bb9aa04cfe587d45f10b
 DIST gmime-3.2.9.tar.xz 2230284 BLAKE2B b6dd81adf939fed8fee70880e2c3f907d9eb8fb33efb90c78d6e6c93754e310f44a1affa8c59ac980805be42bbd5f61353633ac071dfa8fd89b65f2f23cbda24 SHA512 00b92ff5e2001644bfac50d1736203dd478c3a44c8f325a216105c5b354540807df9a6025bd0313d1e60793d8388ed4f5ff72685e116e3f36e6ca8c6b326a19b
 EBUILD gmime-2.6.23-r1.ebuild 1438 BLAKE2B 4308360fa149361b0873b37c1ec5635e8f2ec089b2e6b01d98ffd085e896d8cad936c12adf2c3ac5add7638c00eaa7f253a2aa34a0f6a690382f1487e3d59c40 SHA512 5af6e472477b49f6fcec7bafa259e84af13c84ce1ab9fb1b1a4bbbfaace36fb0c470af2cf9dc9a0e3be7c75d8b9dd27c424c2bcbb95c6d84bd36f93ad60db72a
-EBUILD gmime-3.2.11.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
+EBUILD gmime-3.2.11.ebuild 1592 BLAKE2B a293a7cf17f4e311d51f06c1bb864e87031089f831f2c56609b0652a7555976c2b723ee4419f0a94baf77c6ba9adce2f3194f8ce841bcbb98a1adbb704d24b45 SHA512 ffb59581aa1e585a3c50990bff736dee61679648da34986b491b50ac9d27a1237964e2e06f14ca59c2caa76fcdbded34f55eaa1e6f7dfb1633b3934c380f3c06
 EBUILD gmime-3.2.7.ebuild 1570 BLAKE2B 8d149cceed3227e8c4339af56951feb260facd7c8cbcaddd0d9fc621ebf68aecf46524ebcb27a8ae083cbf7c8dcb996f2cc7783641d221127a4351961da63454 SHA512 67336a0a1eacc742b8fdb6d5071ae168f391ee80a634d516727458722ef1b34b9858f1234e16cd62bb0bfaa53ca4c5f90ccba5350d953e4641cc86dac903afcf
 EBUILD gmime-3.2.9.ebuild 1598 BLAKE2B 3ee609a907a7eb90c94611b3b4226a9523106d552d8ae9b31727a70dbe5bbb53458f44b1f538e5c4de0952e3524fade2d96dd51f379d000a071040065377fc81 SHA512 f81493267cedae518aabe05ac25fb4960151a93102bdbfc9461a0d322f78764c3d71312c6b7fc32ba0385989e1587d1752de0d525a432cf7a11fc25aa7194bb4
 MISC metadata.xml 408 BLAKE2B e340c8e376fb1fe428478c937d8e018f5b8c475cde16e947467434a7f86227d07ec0d1f9d61226e7f88c763a1d292f39cf4886569d218b4107bbe0b8465b35f6 SHA512 b75375be09c0f37a41d0a1f1ef0abde6880fce81e8318c480df27b954e39aa5fbb69826ff9243f029af2eb959d50641330f31f4bbdfaa6531e031326099cfcc0
diff --git a/dev-libs/gmime/gmime-3.2.11.ebuild b/dev-libs/gmime/gmime-3.2.11.ebuild
index a7eed9e822c8..7cfb4bfccdd3 100644
--- a/dev-libs/gmime/gmime-3.2.11.ebuild
+++ b/dev-libs/gmime/gmime-3.2.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jstedfast/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 SLOT="3.0"
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="crypt doc idn test +vala"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index 124eea7e31ae..38ec5c0380ba 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
 DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 EBUILD gobject-introspection-common-1.70.0.ebuild 934 BLAKE2B 3a49082633ebc991738de116d9a584b06165470da627646053bcae261ec625d77dd1dd5ebca2f1221a10c5479d29eec04ce34fcf10ee36ba195c9c124ba3e402 SHA512 06bd2fc8fa63bcbb09834751275355d30c9e63799a09a4af259f3d4fe88491246cf224025ef223d231a16208ff0a7fec45ae9f622d96e00a6acf9ff9d9006d45
-EBUILD gobject-introspection-common-1.72.0.ebuild 949 BLAKE2B bcff3009b7283b51ab979e6ac28617faaae07de2e71a4d7a929c5a003edf40fa1d8a1769faa5f17d68a9f8129a59034d2c966723918109fa2c7087f2a8fc9b2e SHA512 4f83472e0e89c7a19d95d4e3077dfe45881a9eff3a4fc189c4e42c3251aa1a2ebb3d5899f79b528eb8a872fc5ccad4aa64c6370b75fc3d1d6deaa21021071125
+EBUILD gobject-introspection-common-1.72.0.ebuild 942 BLAKE2B dcdfed90b5f6bda5cdb439bc8f8a3336c5494e7a0c6a74950312e2f783709fff2cd58a1f44f0fd96e56db081916622f8c122dedfd41adb0e0d9edd5c25e524d2 SHA512 8813670f6e86ed98f276ea8ac0302626d65df8c31e6aec162ed405c8920585da1c54adbfa2631ec25b22e22a3343789ff820f5051588e404d6488ee423e414b3
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
index 5880728021e3..92659cfa4771 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 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"
+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"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${GNOME_ORG_MODULE}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index 5a6362ed9fb9..4392d23c74d1 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -2,5 +2,5 @@ DIST gobject-introspection-1.70.0-meson-0.61.patch.bz2 4211 BLAKE2B 0453266900df
 DIST gobject-introspection-1.70.0.tar.xz 1029372 BLAKE2B a649ea77b2b7ca392202e21a7f4814aafe57afea7fedb39e78f1df1cd97d0437207c3807a51ece6c9e9bce51fdf961ee7438ccd4efd84b45dbdb57ae19a39272 SHA512 216b376ed423f607e36c723dd6b67975dbfb63c253f2d8bd0b3661e3d69f8c8059cf221db8c5260b0262fad1b7d738f3b2e5fbd51fdbc31e40ccb115c209baf0
 DIST gobject-introspection-1.72.0.tar.xz 1040936 BLAKE2B fd7600a927e57d5a076c203a084afe56a738d3a93109055be7bee22a96d6d5b08892300260288e5b83f883e54ca658cb24ef5c862abe435820c963bbf0cf8496 SHA512 b8fba2bd12e93776c55228acf3487bef36ee40b1abdc7f681b827780ac94a8bfa1f59b0c30d60fa5a1fea2f610de78b9e52029f411128067808f17eb6374cdc5
 EBUILD gobject-introspection-1.70.0.ebuild 2110 BLAKE2B 5a65ca353c979fee0d42fbf192596164bd496c57fd927dc4e20c1857dd6c0e95d8bd1d6911a322d4d833ad06d494d1106564335b03fd78e61e12527c226e658c SHA512 7d901990312e02b23d9cfc895e4082b266eb9f0cc794d5f5bb873080a1b9519d5a43bde87ebae4b098beb704eb448f048dd7eee950edc7ae18453f7c9b693cbc
-EBUILD gobject-introspection-1.72.0.ebuild 1982 BLAKE2B 30d2ce5c57e5a2140ee443ffe31c000f7320a0a52aa3a002da593bd299fdc7558f7bd774b41eb063f008c9aaf02ca4d46e98c75a6b3bf47369515e3be3a6d329 SHA512 2ebb9c2603f71c95af3b55a7b6eaa4ae83cbd1a6cffb8900739ef228aa1018d939ee0e99a9334773b8d1a4ac45335ea2b36202f5918d64d22e35c0274119ca4d
+EBUILD gobject-introspection-1.72.0.ebuild 1975 BLAKE2B f2e6bd96922ff29b528a578b2209997547f98e1ef28c4d263919b395e7df73e84140b53fcc623e5ba610674f86999d0e717756ab4bb4177061577cdc3e34db65 SHA512 70c5421ed24bb405429f5ce432ce44f18434a835e1ec50f6dc34c0191cc0743505e8a33f952bbaeeffb3f5f6d233cfe33b121339422a4094954e77ecb3cac0b2
 MISC metadata.xml 368 BLAKE2B 5734e81d2929cef33ae5a3e57d48717f2079944a26a34206d0c674a607068047e24c17e76435683dd6f9b369ba8abcbd6ff98037ba219e7f4ea8225d3980a3eb SHA512 e8a3b181add420cbfbffa78ba6a8bf7d7b82593ba9a54e89e52a9d0eb3a7c92f577d71080912067c16364e267bb1438ba1c8839ed62af24da39cc9e1b6f7d864
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
index dfbf5796128f..7bfbeb4630bf 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="doctool gtk-doc test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
+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"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 RDEPEND="
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index fa090b454f13..7d656fef334e 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -2,8 +2,10 @@ DIST intel-compute-runtime-22.17.23034.tar.gz 5345890 BLAKE2B 0cd4b9c117978c9127
 DIST intel-compute-runtime-22.18.23063.tar.gz 5355944 BLAKE2B ee4d79370c10f2aa1fcd0209a1403a89da1ff5a21dd8b39fb40ac33416b1adaef08713382ee89ad88e64b74d5edcb02e3877898e2301b5454a14b8910ebde009 SHA512 a94a3a7c331ea8bb059740ffaec6e139c17216be23c86cc9e880d247ff12dcb93357ee90b9863b9ddcea59dc1a3d377b32600675a145c29f12c810c13a9e3a61
 DIST intel-compute-runtime-22.19.23136.tar.gz 5390779 BLAKE2B 376f355802d20ba76f485dcd174bb7dd0fa128495be37718b7eda3a3a2ef34086ef9060911f52866c1d1a4fd13f59115d511b5c6b327ce574ae494506085a91d SHA512 dc0c2f150b06c2a41a0d20c1ebcf38254d7ff976eef4340bcc3d47eab8e2ec0e36d8cc871b97ca4d8b304be53b0aced6b2a6fb66da7e58b0352297e7f28b81bf
 DIST intel-compute-runtime-22.20.23198.tar.gz 5453705 BLAKE2B 85e3ed926522db44c3464da23c6888effc9fbcfb51e9d644cf12e97335f7a14139040ae09ab99ab9e5b2ef27d4f9a9c23e68ee35378c85279b7c800426a2c829 SHA512 85bf87a6c4d387bea4cd75b6e59e7d47ccfee153a50059209644cecd912d2b52c62b398f004148e1dddc1bac069b19bdacafd355499d3b47c157d0a4a7b2d70b
+DIST intel-compute-runtime-22.21.23269.tar.gz 5475347 BLAKE2B dbac36c1720ee2a2475b64c3b61d144501fa4031ceb0eb69a3313cb78b5588926d029ad1916e2229fb8dea8d3450936da5b4e25b47814c854b05ec0bdb940943 SHA512 9ae38956dbff9764d85b5447cc03f7616319de463ddbf0dc5d4c8e8f8869f197b6045e446c81a902d8a5e7681e05cb5ac63e345b6bdcb74366b83619c52eb012
 EBUILD intel-compute-runtime-22.17.23034-r1.ebuild 1777 BLAKE2B 7491834ce3565a551b8faceea2922cc91f9e6a50b97630b5986c5e4b73393697113e045d346ec9b671642c0bef11c06c995b210eaeef46a14c9f3de07c22d2af SHA512 390dea8d71b90a6a178488a3814781b2c07bee656323099cfb4681c4ca0df666aea8a5fd4acc58da12bccfb0b5689578417f8d99d731d42158e416d2b38b6881
 EBUILD intel-compute-runtime-22.18.23063-r1.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 EBUILD intel-compute-runtime-22.19.23136-r1.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 EBUILD intel-compute-runtime-22.20.23198.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
+EBUILD intel-compute-runtime-22.21.23269.ebuild 1905 BLAKE2B 108cec34e7d2a75c6f30aeb2280043eb816755b5b98dff23bd44cd0600f551504ff9a85728e4b0b572c16b785add9c0dee4d9e5d334d9b6b5bbc027408a6beed SHA512 71499bc865d0ddef103eb46434d2ab3d868a6e38c61912b0b5e0fec27438c40fc308ab9e7f2ab53a290e3e97780591918fb4b8f84c755ba82a27f79a3cfadbb7
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
new file mode 100644
index 000000000000..bdc8a84baf08
--- /dev/null
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+MY_PN="${PN/intel-/}"
+MY_P="${MY_PN}-${PV}"
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
+HOMEPAGE="https://github.com/intel/compute-runtime"
+SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+l0 +vaapi"
+
+RDEPEND=">=media-libs/gmmlib-22.0.2:="
+
+DEPEND="
+	${DEPEND}
+	dev-libs/intel-metrics-library:=
+	dev-libs/libnl:3
+	dev-libs/libxml2:2
+	>=dev-util/intel-graphics-compiler-1.0.11061-r1
+	>=dev-util/intel-graphics-system-controller-0.2.4:=
+	media-libs/mesa
+	>=virtual/opencl-3
+	l0? ( >=dev-libs/level-zero-1.7.15 )
+	vaapi? (
+		x11-libs/libdrm[video_cards_intel]
+		x11-libs/libva
+	)
+"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( "README.md" "FAQ.md" )
+
+src_prepare() {
+	default
+
+	# Remove '-Werror' from default
+	set -e '/Werror/d' -i CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# See https://github.com/intel/compute-runtime/issues/531
+	filter-flags -flto=* -flto
+
+	local mycmakeargs=(
+		-DCCACHE_ALLOWED="OFF"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
+		-DBUILD_WITH_L0="$(usex l0)"
+		-DDISABLE_LIBVA="$(usex !vaapi)"
+		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
+		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
+		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
+		-DSUPPORT_DG1="ON"
+		-Wno-dev
+
+		# See https://github.com/intel/intel-graphics-compiler/issues/204
+		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
+
+		# If enabled, tests are automatically run during
+		# the compile phase and we cannot run them because
+		# they require permissions to access the hardware.
+		-DSKIP_UNIT_TESTS="1"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/jemalloc/Manifest b/dev-libs/jemalloc/Manifest
index aa65464680f6..0d292ef1cb0e 100644
--- a/dev-libs/jemalloc/Manifest
+++ b/dev-libs/jemalloc/Manifest
@@ -3,5 +3,5 @@ AUX jemalloc-5.3.0-gentoo-fixups.patch 1233 BLAKE2B 4654d1ecc2846281530b922e942d
 DIST jemalloc-5.2.1.tar.bz2 554279 BLAKE2B 52cb8cd5e5807a750a7e5e9ee005afd61144d821d7f7029a5eca998fd61787a7271338dee3de586ddf93f5fdbddc2c2ca03ba64375a70096f273a6aa173da431 SHA512 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02
 DIST jemalloc-5.3.0.tar.bz2 736023 BLAKE2B 9ff51616c3fb086d7cc021c59b83e5f0304d886993f4b5194a6956ffaf742cc509d08a2cf81ead6966c39a44f35621b57550f4a5c726c4508fd2c86c7c056ab0 SHA512 22907bb052096e2caffb6e4e23548aecc5cc9283dce476896a2b1127eee64170e3562fa2e7db9571298814a7a2c7df6e8d1fbe152bd3f3b0c1abec22a2de34b1
 EBUILD jemalloc-5.2.1-r1.ebuild 1418 BLAKE2B efc1ecdbf966fe0f3fc69f065f51c66946b59b68e59197079d9a1fc2f88da1f736015f9910a5923b0f1f2b476578f2b21d5edfea61337c76ce689326338ebe26 SHA512 745d3534239ac337bef2b6cfb38dbf5cf9b648781bfad50e9e8e3fa037313183c7a5b447e72221db152315e0372ec03edb23b102a368f818b30adbb1d50657d6
-EBUILD jemalloc-5.3.0.ebuild 1448 BLAKE2B e3f9fa8b45b62d14eb5fdc2cfb7d06e1c7f2d64bf710b55acfd994ce8f636f5a32187fb6698c146fb5438113cc029269bed0bab9581a2cb225806e773f8b7c62 SHA512 780b289ac2be8520b9285b1366167cc18f84a1143e3e88f600cba6236d93b7c82d7228772cd0d1e5177c2f84a579ead665648654d98844b7072f905f73aff5bc
+EBUILD jemalloc-5.3.0.ebuild 1455 BLAKE2B 2db90d6558c689c6abed4724caa2433c5823a99b35ec035ceed5ee035cdeb61066602337bd2f1865ccc12375a763b68d30f5dcf128418d051a86e2c71f7c1e4b SHA512 10c55b91764d0392ad0006fcfb4150023b8f9e397765ae77750c23264321350ea145fc64cb9c887b551c1b45e56130eb528d7acc0220b8c6f6244b531d1b931f
 MISC metadata.xml 638 BLAKE2B 5d10d2e2db2f0557f2a0176e8e4ad244aa6b9209519c4b21c68696561b6a2a558f206bbd7de37d1f021231b8c84ec08a6796f0af5e5b32c2ec8c047ee50e8fab SHA512 31f22b88e6fa5252504cba421a730f13a18c213dec487a764c2c05555d45539ee58a0ddfe2212f535bc276934101125a3940c9b4934c7f924e89f85ebe75672c
diff --git a/dev-libs/jemalloc/jemalloc-5.3.0.ebuild b/dev-libs/jemalloc/jemalloc-5.3.0.ebuild
index 0b2ff6ba16d0..5f2c31a7962b 100644
--- a/dev-libs/jemalloc/jemalloc-5.3.0.ebuild
+++ b/dev-libs/jemalloc/jemalloc-5.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jemalloc/jemalloc/releases/download/${PV}/${P}.tar.b
 LICENSE="BSD"
 SLOT="0/2"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-KEYWORDS="~loong"
+KEYWORDS="~loong ~sparc"
 IUSE="debug lazy-lock prof stats xmalloc"
 HTML_DOCS=( doc/jemalloc.html )
 PATCHES=( "${FILESDIR}/${PN}-5.3.0-gentoo-fixups.patch" )
diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest
index 4dec26a6f98c..cacd13fdd386 100644
--- a/dev-libs/json-c/Manifest
+++ b/dev-libs/json-c/Manifest
@@ -1,6 +1,4 @@
-DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34
 DIST json-c-0.16.tar.gz 351916 BLAKE2B 11457fa39330338c85bfdfb0dd38fc703ad6942e730ba090c9fe017dfb81ef905d7b1bb1c768b9b51f6445a8cf3cf4007d7740be3a9878f8062edc62ba554c66 SHA512 255cff99033340b2c2678255d41dae7808f83ed0c102e693d2d9e186bd1f21dd1385fcaa360c0fc087a00965a9567fbda733370e6b518a9be2f1bb0a80439151
-EBUILD json-c-0.15.ebuild 1086 BLAKE2B cc7bdd1a4e2dc8e37e96ce14b0283095d8ab1204419b7c0939b840df2e1d8d7e065bd7ad10862a44c67c78ac181b541f31d8a75ba62fd42060aab981a2c8fa84 SHA512 cbf41b3e50ead7c6c4d7388b024e49e3a67eb6f11bb3414662d1b9887969b65e288c1c4f72a4cca669248b4de45a8c3909ab93900bb2b77f83812f276a02b9f7
-EBUILD json-c-0.16-r1.ebuild 1127 BLAKE2B 9d6b1f7cb7c0f7cea18638cdd5464b7efd9b15593f3d3344d1c56044ca18d01523fbf1c5a55f3fce8f53f685654bc32e3fc3d2bdd5f2aca1330eedb5ba1933fa SHA512 7a41107929c9c02cdbf06dcd0da960cd1f64b6a38b96aed9787e348eb01f2476a0415f9bc6e8a39370ec316ec07de37026a07630d0002b4f37609cd2d7d0e606
+EBUILD json-c-0.16-r1.ebuild 1119 BLAKE2B eae23596311f9f8900fd1f5540da7fcdf4d8ca6237750a1a5d5e765de2ae55efd9ea2fce1e8a7cc24e7f573f546f7007b24b1b036348b4c394a1215360966052 SHA512 4cd3837d0e275240de2cbb3216f75ccc2c8f4c3174505c53615636f1ac86da27b752c4ea21bffc45a3d61fc3dadcd9240461c69b367a7428bbc2467033199855
 EBUILD json-c-9999.ebuild 1039 BLAKE2B 3da4e08a2ba828fada531434ed0062b0320037448260864f5e666a6830c5ee47aa596d6f036f6beaad9f87f2934952fd4d7636c72e9bbfe8ef9bddc17c58a5c6 SHA512 f62462771eaecfbab8cc9790a09c7ea1c848a507f8612f9bc87acdd4a93b0673ece152297071ab47c8877d98ce2b2e3b6bb7a65c9227c9fda838551488b56e88
 MISC metadata.xml 1011 BLAKE2B d9f64f6e06a3b1a5bb315e35590426e9e87d777bf2fe73a7f8c57e6730ce99236d071d7d9ddf190e654e39e91d4134fdd07689afa958d6aec69dc5a787e95bf8 SHA512 731afa46afd8fdd519425c1a58f791f4d999333e726426770a0f37e552d640d4a198f6b2eb859dca3c4aca21f3e1fc8ad147de0e07efcede14b5d791b66e4e72
diff --git a/dev-libs/json-c/json-c-0.15.ebuild b/dev-libs/json-c/json-c-0.15.ebuild
deleted file mode 100644
index 70e366eb88de..000000000000
--- a/dev-libs/json-c/json-c-0.15.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A JSON implementation in C"
-HOMEPAGE="https://github.com/json-c/json-c/wiki"
-SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cpu_flags_x86_rdrand doc static-libs threads"
-
-BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/json-c/config.h
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-		-DDISABLE_WERROR=ON
-		-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-		-DENABLE_THREADING=$(usex threads)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && cmake_src_test
-}
-
-multilib_src_install_all() {
-	use doc && HTML_DOCS=( "${S}"/doc/html/. )
-	einstalldocs
-}
diff --git a/dev-libs/json-c/json-c-0.16-r1.ebuild b/dev-libs/json-c/json-c-0.16-r1.ebuild
index 394bbba72a15..632bded1ad5b 100644
--- a/dev-libs/json-c/json-c-0.16-r1.ebuild
+++ b/dev-libs/json-c/json-c-0.16-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_rdrand doc static-libs threads"
 
 BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 78c836b24c47..dfc5a4d50d34 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,3 +1,3 @@
 DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
-EBUILD jsoncpp-1.9.5.ebuild 1224 BLAKE2B baef6b6ad79ae6d506dc6d8c06df705115830618ce07325eb5ad1eda29f520735fb6dc8f1de3e5fb63ce0b0c6c694c354a03ff104f254ea6f41572ab680d01f6 SHA512 165b3377d923d9bd5d45fc61fe9deb111c35373a111d94fa6e9c99acb7e303fa69a9a9b3fc59c78db5f17ed3c0695016ce416197aab9b52a4f0b8eed5e3ff784
+EBUILD jsoncpp-1.9.5.ebuild 1230 BLAKE2B 9f3b16373714bba34bdd355160070520f6e6e27697ce952ed239a00c270026bdd8fce0b6570201649999ed0814262caf969daf3970a05494c3b8bb716a7cd3b7 SHA512 933184fc1284e0e9cfc140c73aaf5837426d7d9a63dac2efd7474a6718c247d5cbc4c2beeca53fe7fd06973ff9959d5e0bf9f8cdcafa49c5d44c8faa2be2c65c
 MISC metadata.xml 404 BLAKE2B b1439e7ff1121eaaac0eabccea420806b8c059b6cfc43fec2ec47ff5e3a937ace7a1afa4c3a5f18385de22b3979e8648f048cc7a8717b0ea5e282e08a3914bb8 SHA512 700ebcb293411f62c10a69640c5e7d9240f90f513435b54b77e0fa30f1bb732affa0055dcd7c84c858a50d56f0b3a138dfe6410f8a45fd91d1af62ea827c9e8d
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
index 3de8ea37f6f8..56dfa76aeeba 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/jsonrpc-glib/Manifest b/dev-libs/jsonrpc-glib/Manifest
index f3e0fd3d6ec4..915e9f848fd2 100644
--- a/dev-libs/jsonrpc-glib/Manifest
+++ b/dev-libs/jsonrpc-glib/Manifest
@@ -1,5 +1,5 @@
 DIST jsonrpc-glib-3.40.0.tar.xz 42392 BLAKE2B 106d010d5615d6c4a3e1fdc314d1d63be0b76424aca4c6e3771c21e75b79dca5f524e711c99fe1175797644e11d0458317bfa1f363a5abd296dab5b3f95dd708 SHA512 5d4fae86e7eeb029a8daf3eff26107a374ba1b68caa2862563e8d9854913ae306448f4c712be6f0f82961031f1b618aaba7ded154f81b4a023fa366c71f1b887
 DIST jsonrpc-glib-3.42.0.tar.xz 42420 BLAKE2B a60ebebfee652ea694cd2884e057522534826cbca506d04847d29a23dd3035e9a1043912c9a434d4b8b58a6fcb91ba05cc8c76cf380e6205f3d89f9387800bf6 SHA512 615e446dba2b1bbefe1bf8891449de9d39e3486fefda590781f59469ea50e6affa487bcb260bd3e21ca30e696b1dec7a761c8d93ec9c0894d9bb4c3d65f106dc
 EBUILD jsonrpc-glib-3.40.0.ebuild 971 BLAKE2B a5e3b578e16987bc81a66f43a056f9e4f65ae6720f86f2982073780ca9f2dc8b019174528f9bb1d3eeb2ea697a31a48ddc42206e4273177347bff7d025705fcd SHA512 091c0df94cd51b5fcf81e1025778b0ec0cd9666c752fcd97e4405cf392d3a19a46b37ee48557e5a8a384135910540ed24abd4db28e0d96625c149fc563a52785
-EBUILD jsonrpc-glib-3.42.0.ebuild 1175 BLAKE2B 604656fd8d479eceb9d2980955c32e357eb921d225e135e3a424c8a7fd29144c3a530cf9ac554c89cfaf169e968076a6d2e4862f55ab6272b8e6dbbe18f5d795 SHA512 a7f88c394a3f550807da48a278f949440926e3faf0dcefae111fc3afee7cdc93be50c85c59153104041f0e6a1323ad180992ee2598954a9accaeb8ba79792610
+EBUILD jsonrpc-glib-3.42.0.ebuild 1173 BLAKE2B 7f71075c616332e6a86975c3f11c5e72c9ec1c65b13d68fb2708e62470810d1aa9d1deaf0693247b6ed429994423fc50abe3d2c25aa5606b61714de5cfce372a SHA512 34de030d7d2fe8de8fbc2a155a5317038853630a615a31ca321918441f2120c01244eb2bf7ab1654e1eaeccc41d3eb62602fc0cabe93d1dff177f734e7c32bc1
 MISC metadata.xml 506 BLAKE2B 21d02bfa7d40b0c215817396da945211436ee9e021d40696efbe4c091cd0e3d2f4621ba97fcc9aa1c96c3bf0f40707b0af95571ddf8edd16ab01c00f4c76cb6d SHA512 af3d14d9201d2fc7530d661edff7f7b714d8dba4342a4695a8edd540da266b52583d35a6280595b98918b913734a19a07d613b240f673120cbb27f643cb18f45
diff --git a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
index 9285abade7fb..fae8f118dda3 100644
--- a/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
+++ b/dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/jsonrpc-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 8c5bd9c9b2b9..35b852b32946 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -1,8 +1,10 @@
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libclc-13.0.1.ebuild 1431 BLAKE2B d5dc6a4642688b46630bb71983f2a12d221dbac023d838cf075ad777cd9221c4426a53f92bafd60003acc973a712666846446937f5e8820d7428205ea8e9a2a1 SHA512 dbab9cb1ba8f5535932f4dd69d50561763ee61041d727a2d23705f0229d6f9f9699a2e9ef89e0844e8045c184b54cf9d425496bbe75857b555c27bf4dbe3aa75
 EBUILD libclc-14.0.1.ebuild 1454 BLAKE2B 6ab617ff1ac0ce7f190015bbd78a2116bc0d2c92d6ff87b9f5e093ec81cb91abe17da8d2f6bc2e97cbefd6bfc1a45249a082c01e654a4f87f2ea5ad635c2340f SHA512 4dc33086bab44e6e9ba6cbb98a7e985c4f0a776baa0ca4df81065ab4b0a0a26dbf42e516682df995c996f982a930d94311d2bad1c73cea5133c76e06780b21af
 EBUILD libclc-14.0.3.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
+EBUILD libclc-14.0.4.ebuild 1455 BLAKE2B a6a252b3c3d8df2bf45a8e37f9f6168663236b097fdf63f451c35557e4cb4167b3fa104a67b39bc83504e4eba82efd15033a0ef89f05be7d67b6686a67fd83d6 SHA512 22a58deaad2de4836ea9e4d5385597e9f4deb96b0285ee66064f46465a10067423490f9197d78b7d137aa65bc28d1f4c90e6ad2905d3be03e589f807cec89fc9
 EBUILD libclc-15.0.0.9999.ebuild 1465 BLAKE2B 9be755012d8d257f856890aab71593255289ef268cc448ea3de19393397702f0a59c9158ac4e4422333a07c9f224c6ec0e057d197cf6e3a60d84cb3ab5bd70ab SHA512 b9c034a32197ff5a434a8f130afa190f3afbaba5fef1ee3cd0de046815e8b783ab50fbef3c86d661b956fbece1de0da32f5a5db230c27829c3bc9151fd8fa563
 MISC metadata.xml 395 BLAKE2B fe71cab225f1879c7bfcb591a2bf96aaf7c2d454a3b83a8f4730e36c609d7064a9f0a3c9cd105eb11248a80e552a6ddddaaf69db0ec7c955356698a63042f9d9 SHA512 160750cbd7da115c3b9d070a73afac330c6841cb4a0d3102c65f4e9396c008d82431e14f66fae1c7ec83199a97d3749b662cb01d9d769ee20bd6d08666f5565c
diff --git a/dev-libs/libclc/libclc-14.0.4.ebuild b/dev-libs/libclc/libclc-14.0.4.ebuild
new file mode 100644
index 000000000000..340dfa3ea626
--- /dev/null
+++ b/dev-libs/libclc/libclc-14.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenCL C library"
+HOMEPAGE="https://libclc.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_r600 video_cards_radeonsi"
+IUSE="${IUSE_VIDEO_CARDS}"
+REQUIRED_USE="|| ( ${IUSE_VIDEO_CARDS} )"
+
+LLVM_MAX_SLOT=14
+BDEPEND="
+	${PYTHON_DEPS}
+	|| (
+		sys-devel/clang:14
+		sys-devel/clang:13
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+"
+
+LLVM_COMPONENTS=( libclc )
+llvm.org_set_globals
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	# we do not need llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libclc_targets=()
+
+	use video_cards_nvidia && libclc_targets+=(
+		"nvptx--"
+		"nvptx64--"
+		"nvptx--nvidiacl"
+		"nvptx64--nvidiacl"
+	)
+	use video_cards_r600 && libclc_targets+=(
+		"r600--"
+	)
+	use video_cards_radeonsi && libclc_targets+=(
+		"amdgcn--"
+		"amdgcn-mesa-mesa3d"
+		"amdgcn--amdhsa"
+	)
+	# TODO: spirv
+	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
+
+	libclc_targets=${libclc_targets[*]}
+	local mycmakeargs=(
+		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
+		-DLLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 532f5db749a9..2ebee8d10d65 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1,5 +1,5 @@
 DIST libdazzle-3.42.0.tar.xz 450636 BLAKE2B 0a77a9ceeca2af8a001b75dbffa04cd385be89d9fac898e6b90111d240b409a54357d9668ca33e494dbb0ed932f16605f363aa69b92c548981be0db971b67dfe SHA512 db6ac54deba034627726747b8c15472aa2f640617473825698e23ca6527d5b69e9103dd82141e82b7dd7fa8bd57eadf054cdd300d46e1b65ced0fffcbc55a301
 DIST libdazzle-3.44.0.tar.xz 454948 BLAKE2B d42d98e820e7af18fc8c8a75f7b77b5d84f03a367925d16b35fe88fd5a74e69d2f170233dd6986ad47dfc4cdd2f9690323d1053341ecb11e324e758f63a25bba SHA512 eff3f65cbfd4f780afb4bda6137e8d4f1ee2cd0ab21288d07315415944ced1aa2d7ef89c2b7ebb373ac4c46b91d341bed063e9c7d1c21fa083514c8c3c9c518f
 EBUILD libdazzle-3.42.0.ebuild 1701 BLAKE2B 52083fcba3194aad21f21aa6eee9819c4c721be3417be40538db6febcda99ae4451d43bef4da00d3945b06c271dd4a7c9ea13f4b0d55abf0ffd1cd0dedbe5742 SHA512 dcbe89393adb92734e7b22612ad9bb88bf5de8fd4ffcd49c943009e10c6c6dfea6a0e358d904f96303f01522e98308c8a9248867bf293024320c324a4465da73
-EBUILD libdazzle-3.44.0.ebuild 1686 BLAKE2B 959ffcd47783ee28464fac52b01862a7321f3c35b693f7cb23a744303ffb8c758fa111c57cfeb05edb7cceeb0248710628725869e760a82ab556275a94b16fc7 SHA512 d08758411ad0a3605f8d236817ede25176dd97302cf247c6d7170a94474534e5bd55f74045122e6007a13fe83ad977b02298161839efda6c4c00c16a9137c056
+EBUILD libdazzle-3.44.0.ebuild 1683 BLAKE2B 0731e73965e3b190e26348cd6f558bb0fd5ccd13e3429fa873b15535477435d6131135c76ffb36de8fe3c57ac1dd9d42d5da016709b1a9c271aeb44a2ec71792 SHA512 f9d98cf79f96998ffe012f78b2428f7ff15dc3ca8040ac62f07bcae058c1c5d98a635e02d9524e070f1341cc1ac2d1b4a4f94a6e5da7d4b465834bddf53ed06c
 MISC metadata.xml 562 BLAKE2B d07bb8d5805ff6659c6984057084cc5daa294cd33d87ba9f152aeab79b425626673c83e2cd5046914381a8c0432cfd34994fd61aadc1c9263367ba9c9506903f SHA512 be5ed6332538f24044008dcb91b93771ff7afb73e5e7d2351474b6a9d3dca57a790cb27831ca869057ece03989c49d7e49213240cb1c1f0c5c93346a4a157710
diff --git a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
index e2f4a4679d48..bcec09a0e1ad 100644
--- a/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
+++ b/dev-libs/libdazzle/libdazzle-3.44.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 IUSE="gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest
index 0ee4bc0a9fa4..9a41dff44bea 100644
--- a/dev-libs/libevdev/Manifest
+++ b/dev-libs/libevdev/Manifest
@@ -1,6 +1,4 @@
-DIST libevdev-1.12.0.tar.xz 443716 BLAKE2B 1df548cc9bc2472c88308eb2794df7d5636d498631b8873a1957f5cc959097235e64f46f61285a3cbe1abbfe1d968946ae181dfcd8150fecfddf212ed7f4e07e SHA512 6c1c1362d5112cdf3816d1f735c27e625f5463ebf10a83d675cd9364c3fb291ebcb91c051da442f1a36ed28ba7dd99af74546707f61274f7d5715c544a0ed04c
 DIST libevdev-1.12.1.tar.xz 446476 BLAKE2B 3b73c50b5e0bdf6dac001c7e34338ece2ba796af711d8f6f9c2928f93a8f41ee484e067c3cb02878de49d631de87229d4b1a377123e385af5997e11f7c556510 SHA512 eefce287a665e4f89eb2e0437dfefd45ecf8925c7dac35a1bdd46158541f77f2032c6146900a30a01321751d55a9b537bd1d61777cca9cfa02c39a6e31c97be4
-EBUILD libevdev-1.12.0.ebuild 1117 BLAKE2B e583ff529df3a04102e77f9bce314cdb48734981ee081c11f901a143a50ac66d6119aaffa54268600aa9b4596966bb222f6a7892f43e9eebe78df9bc2ca916be SHA512 ca8c62a433bf0ecf21aa13f600c0fbd57a22d40fcde568a23b5328d0dfd0ca37760112c97f0e0ac465c884ae4911d6b27e35b6dedf883e4fdb34ea2060855db2
-EBUILD libevdev-1.12.1.ebuild 1125 BLAKE2B 752d04ffab6da5844ee306b7f6850039090fa81e252343778a1f9d718048f78867c1b43ac12011c7c539358b3fc4b683516172b3ee80b0bf8abfc831430db8b6 SHA512 886dedce61f82c9896e84ba4778e7e7339703e2fabffe631f47401752803ccb21780cfee3ff571b4efe72330bfb97a612076546d215661efa19c22f631cd6517
+EBUILD libevdev-1.12.1.ebuild 1124 BLAKE2B 16e83557d0e0a4f0a8b619ffb2562ddf8198bdba660a00ff63e72dc7ee7c92d7541fb44f80f48c954a13eb7902bc2a64ae8a2717f4c29b626592ceac087043f3 SHA512 278b1fa8c4c44aefede7fb3a3eab51c0c3456befbd6df801abf28013ad2ad90d140c3657dd7b7afeae7e32bff1dc306d9ca3a7694da54c2e0d15bd95744f76fd
 EBUILD libevdev-9999.ebuild 1119 BLAKE2B 7454c31abb9ea204726b25bdf082078716cca0e911e3012121c06cb37663ebf911e48765a5e718db2b65ace23cebcc305e34129576e4bb1ff863829520f21b6d SHA512 805de4364e75326dada41594b727af707f8b1682b990cc4871a475a545b43a4539e29b57b26bde18e72620d38f2dbae0139094e8d00b4c872b0bd174a83fe8b9
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/libevdev/libevdev-1.12.0.ebuild b/dev-libs/libevdev/libevdev-1.12.0.ebuild
deleted file mode 100644
index d44903015d0c..000000000000
--- a/dev-libs/libevdev/libevdev-1.12.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="Handler library for evdev events"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/libevdev/libevdev.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc test"
-
-DEPEND="test? ( dev-libs/check[${MULTILIB_USEDEP}] )"
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-RESTRICT="!test? ( test )"
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_feature doc documentation)
-		$(meson_feature test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	meson_src_test -t 100
-}
-
-multilib_src_install_all() {
-	if use doc; then
-		local HTML_DOCS=( doc/html/. )
-		einstalldocs
-	fi
-}
diff --git a/dev-libs/libevdev/libevdev-1.12.1.ebuild b/dev-libs/libevdev/libevdev-1.12.1.ebuild
index 86ee102982e1..1b3bfadb1175 100644
--- a/dev-libs/libevdev/libevdev-1.12.1.ebuild
+++ b/dev-libs/libevdev/libevdev-1.12.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index beda1e375b57..febdff44cb3f 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,3 +1,4 @@
+AUX libgit2-1.4.3-test.patch 1230 BLAKE2B 155f958aab27ec7d941ac0303e8d65d87ea82b22e592060e4ca67e865aac519901c6509d2f57c36285864b0d15c94bed8357ca616c8e4838cf09e97156ecf541 SHA512 a6fcb8acc119634ad1f1f9290da0c72076233a1af63f4a66346a0bb37beedd079c72be1ca48746bfeb75c2e94b4e48f6b3881adcb2cbf90b186c86ef384da066
 DIST libgit2-1.3.0.tar.gz 5599575 BLAKE2B b701c105bb0a5bdcdd5ed1db180662ad4949c540944664d5d8c2f5d78998f15d15bd3669ae3e3d43bfa1b81207c0a94b7e49fc76e57f4cc8ef791ab26e62fc70 SHA512 842a648a67ff23ba9e6bf14b706ba9081164866e14000ebf3858442b7046925f05e1dbf00a7d740dc4bf32280e260730e23a9492e817094aa90736ae335ee76e
 DIST libgit2-1.3.1.tar.gz 5602265 BLAKE2B ecf1fb30fbc40b09edcd3862d0831bc7d4d1da1aa8e738c78cf77bda5a0bd5d9c6a60fe7ce9827e058c04ac88d89a7d6c05c54c01bd77d1a8b0b091495bbf871 SHA512 012ffda7e8b9557923758fdbe68869875977d419bfa60b61f90adadc056600e2b1cc2db1c2a003315ea0e193c0145c1f431054f7bd960c5e6e14fa541e46cba3
 DIST libgit2-1.4.2.tar.gz 5629585 BLAKE2B 61e269fd08beb9579838a13b661b4270f1e8d2d3d1e67f6b8357e92a5ee4aaccbe637644dc87cc8b04d9c181e37808352077b75fed8753a4b2d8868eaf248b62 SHA512 144bec7f8e66d97b20335d87d1eb68d522f5e59064b0c557505c088d3c486d45704f023d701f51de572efa8e2eb111e3136eb5d23c035e29d16698206b5ec277
@@ -6,5 +7,5 @@ EBUILD libgit2-1.3.0.ebuild 1691 BLAKE2B 60ba697df7bf967756ee9c0d2501e035803f09a
 EBUILD libgit2-1.3.1.ebuild 1704 BLAKE2B 6e01d5495917e853b232f06e34c20d9bda631e706262aeb19d4db991065817f30852290247aa13dbdc581cb007b559bb644b5dd66adfcf758fa940e7a9539a6f SHA512 3eff6e6deebf5f2aea88d1b971a00db1b54fcbea98f722576f66736076255115dd588d8efe9dbb7985ec3b63a6bb680ffa4dc03897013f56fa7f40e436fa4fdb
 EBUILD libgit2-1.4.2-r1.ebuild 1654 BLAKE2B e3f7bd625d0b8b0907419152e36efb41fa741ceb86b0a1054e5f46051e3738e7824d1c256b180b08d46035211b4b9bc17c1c8ff0af81aaaa47e3a5ed1bb5a0c9 SHA512 c37e36aee1b72ddf33bf190b4e7ee39d80b20e5e8d3297185aabe4af1db35a6de97e5eb7c3ac3c79437b493371e1001f798ecbae6fd7da10ee5131e8a482873d
 EBUILD libgit2-1.4.2.ebuild 1646 BLAKE2B 91667e774f00a64aeb4a78cca562eb99f04130ac87320d152f77fd16f345d888eafeabf02515f938dbe66904bd867390065dc72ec51195441d5ec67dc5a5c0c7 SHA512 7da2def0d3ff13b956234d2c2819fbdc1215dca6874c3707c867173137f5b64e2e305ab9ea75034d76a5d4073318e203d74f1f773e1dfb632a8c14e3cf4ae162
-EBUILD libgit2-1.4.3.ebuild 1661 BLAKE2B c96b1c5fe64fefe7cad34acb93e5d782052823687c394785b3b58cc4671839f883ddefced357d29a1f28cc0278ee9b98b0689beee210af43cbd74f2a669e9327 SHA512 73659ea3404950f2e82cb09e9547e97e34d2973f8f2c3fa5a2caf0c268f04758d6f2c0363ed5ad40b2e13d3907a3b1da76629d93ec57479974cd464c2722535d
+EBUILD libgit2-1.4.3.ebuild 1700 BLAKE2B 726729009bf9c9bb2955bc5fddefab4b239b6b21c73af5e6bf44e094e3f70b2aec141e6ed83de400a410f30511cea9eeb434709b7e74130e062cfec053a7326d SHA512 b9eb6870c1b077e242c537a2ca13d17f4df76e5c6c938e86f5d05fe05afc15438884c97ab866aed01c5cc55619f855b6638a4a6674d5b91ac9e69effa0fcf252
 MISC metadata.xml 916 BLAKE2B c5fb3724d2e9ef35c5be3df76c79dfc80a34d238a12d6b16f3f16d919076e216dcb085c4c182102c8fe7338982ab862a749ff9d25d8c0a0561fc133db6e07682 SHA512 78b668f9fef202fb86abc1564c4b240f7084bb3ed6ac0b77a8e26940721be6db5bfff1b927403aaa561f3dc20400bac677cc9b0a0204542b5b304ab8491c08c7
diff --git a/dev-libs/libgit2/files/libgit2-1.4.3-test.patch b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
new file mode 100644
index 000000000000..23349e6307ef
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-1.4.3-test.patch
@@ -0,0 +1,30 @@
+From c013fca6b091e36805659ebb26ccaaffae8806dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= <carlosmn@github.com>
+Date: Tue, 3 May 2022 09:28:43 +0200
+Subject: [PATCH] revparse: adjust reflog test as we move away from the dates
+
+The dates we use in `refs::revparse::date` has just passed the ten years, so
+now everything is beyond ten years, leading to an unexpected commit being
+returned.
+
+Adjust it to 11 years so it all looks fine again.
+---
+ tests/refs/revparse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c
+index 0bd2ae5bc..93d7ce6db 100644
+--- a/tests/refs/revparse.c
++++ b/tests/refs/revparse.c
+@@ -399,7 +399,7 @@ void test_refs_revparse__date(void)
+ 	 * a65fedf HEAD@{1335806603 -0900}: commit:
+ 	 * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour
+ 	 */
+-	test_object("HEAD@{10 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
++	test_object("HEAD@{11 years ago}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
+ 
+ 	test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+ 	test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
+-- 
+2.35.1
+
diff --git a/dev-libs/libgit2/libgit2-1.4.3.ebuild b/dev-libs/libgit2/libgit2-1.4.3.ebuild
index 55dbaa51683d..be42ee8cdc59 100644
--- a/dev-libs/libgit2/libgit2-1.4.3.ebuild
+++ b/dev-libs/libgit2/libgit2-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake python-any-r1
 
 DESCRIPTION="A linkable library for Git"
@@ -15,7 +15,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos"
 IUSE="examples gssapi +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# relying on forked http-parser to support some obscure URI form
diff --git a/dev-libs/libgnome-games-support/Manifest b/dev-libs/libgnome-games-support/Manifest
index 8eb10a49aca3..8a734e126592 100644
--- a/dev-libs/libgnome-games-support/Manifest
+++ b/dev-libs/libgnome-games-support/Manifest
@@ -1,5 +1,5 @@
 DIST libgnome-games-support-1.8.2.tar.xz 45328 BLAKE2B 6df5e49629f65a12a683b6c026afa0629132ef3462d714f751fe75595a74dc3d3ab24c50c4a05e893999271ca66cd8395f36fc56ad01139a16b7f0c610fa2def SHA512 6c622b8a64df02be53b56cf8f2da6c9bc866f30042eb61c621db5ab38c4b88e90151c81a71eeba4f8d182b76d581df31f822409e633b45ee928737001f65f16e
 DIST libgnome-games-support-2.0.0.tar.xz 46204 BLAKE2B 3c3399f3912dd2d0e5fda510fe529894862f1922523622b8294ab0a3bb8c4a2055bcd54ace27b2d11e329b6ea6eccd8652832471a7b6b691b73d4081e05e354a SHA512 56d0bafd7cd9b8000c7b8be6ffd8d74ea4ba5164a60490665163d8f86d6f19a34b549eec21ae3a4feecb8313851c32621d8d48638dfdaeea812c5ba7c9447111
 EBUILD libgnome-games-support-1.8.2.ebuild 645 BLAKE2B 45dccd029189634f514013993789fe18471155ed705c5383b2a5fce01e293a8d25ed2178bc10c8947f8efd925f40a41d9a2b727dec3dc93a77430823574ad73a SHA512 a5a130c36deab9e4237a0834f2309867ae84cfcc35ff7e15038cc528509f718b94936f0b5bf4567a1575656b9c2d4e04d7289621688f63852ddde81d3ad56858
-EBUILD libgnome-games-support-2.0.0.ebuild 645 BLAKE2B 6b2366b427926e618b4a973165723aa8855ce2837f9edd9749e1f47ed041e827652ef825f817c39bc3c8e14b266cb81cddff84593037d965f29df8dc8149a4c6 SHA512 20d50ac8fde9a15fe9b511e5aaa0b3a588768707e67e8419a7b7e5ed32917e45095a6cd1d376373beb3f9b057e692b89645bb531f484d787be75aa09816730b2
+EBUILD libgnome-games-support-2.0.0.ebuild 642 BLAKE2B ef997361faac998c8bd64233beb1a4637b7110b72e182719b64fa98a150858f28dfcd691187e859669d8a43a6f787f5032d885da4be486110668bfbe0efa6ebe SHA512 2372c84bda86749f11fbd261fd357f492be5799e825503ce12442ba457c4cfeb3713ce07115d28ef0b97655a5df0a5e9150dd1e7ec0562ac2a1aa4a66e116326
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
index da8a1d932f7a..6d27b4edade6 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgnome-games-support"
 
 LICENSE="LGPL-3+"
 SLOT="2/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 # glib dep in meson is 2.40, but vala is passed 2.44 target
 RDEPEND="
diff --git a/dev-libs/libgweather/Manifest b/dev-libs/libgweather/Manifest
index f3d9ffd590dc..5dd5921bf4df 100644
--- a/dev-libs/libgweather/Manifest
+++ b/dev-libs/libgweather/Manifest
@@ -5,6 +5,6 @@ AUX 40.0-meson-tweaks.patch 3192 BLAKE2B e30f8f47beaa9683b6709389a0c603b28bbf160
 AUX 40.0-tests-locale.patch 2023 BLAKE2B 97acdc022d38e465bd114dd3411b33752827b77167894386384614a1e0ec19f8abe1a2f52aa785dc768bb3599e20fcf64330dfb220c3519da93b42b38e736c3c SHA512 4e8edc725bccaa30ecf19f428e2e863b2cfabeb209bedd9095b12e149600ec2fce7ac8b385b1e7655d0262c8810a60891272956a829e70b513b16af0c1463435
 DIST libgweather-4.0.0.tar.xz 4722620 BLAKE2B f2500d065fe9607b740c2f6c87378d5fc86c15951b2880f89c3ac22021d085eed601b645dcf1c9864fe1fa47860aa14ed1ab858263a7634c3b7615231d3ee6d1 SHA512 1441b8996a53b277e9453d3fcf32448800c963f40c32542f9055362bc3188dcf2e706466133d53b3f1b6343dc97b15cf5eabe16b950e7c9451cb79eeef87a9c3
 DIST libgweather-40.0.tar.xz 2704404 BLAKE2B 27bc69c350ae91a07307d75b5ea1d03bb251f51bf87d5d54861965b61d7ed825ab708466cbe9d961c4f544b8b17ca6ed37b723c003ce2c1ef020270d6812c61d SHA512 72e295246bf03550039a70bd4bf5b8f06357a6b70e04308c197fba309e406d410a97d128d849d97a29a6a114faa1ef5452e6632870b7ea45223a0c305c228cc1
-EBUILD libgweather-4.0.0.ebuild 1714 BLAKE2B 0649c0a0cd15e507e2cbbc75d2c29c4dd6f85e4b51cb10998140698e8d21053e2eb1df08260700c93bc8e238d841b1975cafa59bf0c540f2920a84fcbb2adfca SHA512 2c36d5b7a30c24d3049c434f4392d757e3f6e9a6492deadaae0a6702ee5854c9e042351eba7023b9ea689ac573471f6a761e38538f5e7f402ad2c14682dfc9f7
+EBUILD libgweather-4.0.0.ebuild 1711 BLAKE2B 2fe9021098d355bbea6827a490bc218a9ac1182890ea71726e45b3bf78825f895d5b4504e4b33e6620851c552586accf26faa5f524caf112f65d11b1b1784cfb SHA512 30ab755dd61ad78acae55beaca4124f6faa42bf422265c50ca4ece0da3960c5fc390d30df146bea493d5862336931f0b8d05ac66c29e9c5732ca09ef941fbe00
 EBUILD libgweather-40.0.ebuild 2116 BLAKE2B 2faac8e29708c643ff2e7086294871bede550d97bea1429af2cc64a1216c2fc9d9a66534bc36227cc5586a5618336fff3bfb25d43350d3e92c53fe123d7e40b6 SHA512 55a446794a6ffafff387f2254b550a5045a3f94bb740443aa33a37db32f02e094915c8e3204d77fa66e10125797215dc06ea34c59d8f1637de8361f8ac47f4c0
 MISC metadata.xml 350 BLAKE2B cba370b67a1b0ecfa341989e9590fe3c5dfb165349c5a874bc968ed5d3f2e42185f2872034dc8d847f878b68f6bef6d40a19883868945834bbab18edc6fe028f SHA512 3f2b10a36dd71f822b9cf2c799832c8725778c918c4a83e80431443b2c4ae3fc8a5d36071e0b02549fcde4f11aa8f38297fa7394363182abf0ab1a06639f92a2
diff --git a/dev-libs/libgweather/libgweather-4.0.0.ebuild b/dev-libs/libgweather/libgweather-4.0.0.ebuild
index daa592786342..1eacd217ee12 100644
--- a/dev-libs/libgweather/libgweather-4.0.0.ebuild
+++ b/dev-libs/libgweather/libgweather-4.0.0.ebuild
@@ -16,7 +16,7 @@ IUSE="gtk-doc +introspection test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.68.0:2
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
index b9655c6bf770..32227b637ec8 100644
--- a/dev-libs/libintl/Manifest
+++ b/dev-libs/libintl/Manifest
@@ -1,4 +1,4 @@
 DIST gettext-0.21.tar.xz 9714352 BLAKE2B e36418323c79f582d13777083b455ae76ccb29e41a8259a2f4d6d9f5d8e2ac7c8ecc4df1b1fa2e9838c819cb27345fe254772398bdb88b3315410866048f755a SHA512 f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
 DIST gettext-0.21.tar.xz.sig 819 BLAKE2B 22a6e5f6e8a6322e24db9c1f575754bccbf6c7cff7cd14cb51ae8f5cf17cd7b677d8ecfc6b876e1b6f8d62077d568cbf57930e1d8accc5306e6869d3c6560bf4 SHA512 67c9515ad5e11773a28599d517dd84131e4afd878d67e97f505cd024e290518ca9cffff7446c62f88b56aea2c7234d11811738e8e2a076b2159f24c2f6809703
-EBUILD libintl-0.21.ebuild 2262 BLAKE2B 4c096f1e4b627f8791d4898dc88296305666c5d58f9d95c9910f29b8f0e9231453556a4e147bad9058ecaa963efa00edefaf426450553fe1c481589e28eb1d9f SHA512 303a646e0737a1ed5af394f344e0d2de8f9af9841db6b30da99e7cb40667f5baab5b28e67be15c5f3ff4672043652a9123df758c73a11e088b75f9868513e4d7
+EBUILD libintl-0.21.ebuild 2306 BLAKE2B 60a9ddab1a16c75d69c68469a519bb15a2da78915584b034e619765f9b8dfd9d566702dff32b9f796860ce69feb58252ed53ee96c44af4740ae5f04d4d36075d SHA512 3e3135769c793b7077c188f1122e15a19cbb1f8d92ab734549dae85e2cb5c52b3457db814674a802f85a9c885aed9fcdc8ee00cb7143bcd3f8d3e09078835be5
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/dev-libs/libintl/libintl-0.21.ebuild b/dev-libs/libintl/libintl-0.21.ebuild
index 54944c9356a9..c0d55f3fb99d 100644
--- a/dev-libs/libintl/libintl-0.21.ebuild
+++ b/dev-libs/libintl/libintl-0.21.ebuild
@@ -38,6 +38,8 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=(
+		--cache-file="${BUILD_DIR}"/config.cache
+
 		# Emacs support is now in a separate package.
 		--without-emacs
 		--without-lispdir
diff --git a/dev-libs/libnop/Manifest b/dev-libs/libnop/Manifest
new file mode 100644
index 000000000000..8f3d89faac2b
--- /dev/null
+++ b/dev-libs/libnop/Manifest
@@ -0,0 +1,3 @@
+DIST libnop-2021.11.03.tar.gz 124143 BLAKE2B 44b1c4c341d2120ff22511176fbf3c6f64328c97ddddae458e09676baae491e9218ea33a5836c7a6647090d3f06ac1d66529707af5e2684a14b409b3b57f3af1 SHA512 27f62710afb41165db5ef54bb2d09f89ed9c0c0cb401bffe2c52590bb28c67ed6ba68922510cdedd6dc7cc75fc267a02a2f9cbcca4bfa85042792a121e27097e
+EBUILD libnop-2021.11.03.ebuild 647 BLAKE2B 0ffced1edf027d99a3f3806097511ffe5a43b821e1e7f52f8f95a883351c774da63623ada9cafb1e3ba421bb5dbf231894b1c79b3f31bdb371c9f240d5ef2da8 SHA512 9e45eda796bd565a258b7db9763fbfbef422dadf9c023c5f6e2500820ceeec95e614c2b885aa49b611c80edc386f984060fb89adcc26441fea727acd4e9314c0
+MISC metadata.xml 326 BLAKE2B 267fcac4709c61daf177b248011fea40b932ae34ed27e75425c54476fa93f1ddca627a7f090476f514ec24ba97cdd6a31513c74b1098b198b9fdf3ea6213430c SHA512 7831679de5573dc2c3492655679ce8477ada2b482d30a3ac598970c1cfeb3005d6587a7a74b2425565e6f2d1e99e2ee5e17836e4525e3ad043cbe69f91d34cf3
diff --git a/dev-libs/libnop/libnop-2021.11.03.ebuild b/dev-libs/libnop/libnop-2021.11.03.ebuild
new file mode 100644
index 000000000000..93f597785e9e
--- /dev/null
+++ b/dev-libs/libnop/libnop-2021.11.03.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CommitId=35e800d81f28c632956c5a592e3cbe8085ecd430
+DESCRIPTION="C++ Native Object Protocols"
+HOMEPAGE="https://github.com/google/libnop"
+SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="test? ( dev-cpp/gtest )"
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}"/${PN}-${CommitId}
+
+src_compile() {
+	use test && default
+}
+
+src_install() {
+	doheader -r include/nop
+	einstalldocs
+}
+
+src_test() {
+	out/test || die
+}
diff --git a/dev-java/jgraph/metadata.xml b/dev-libs/libnop/metadata.xml
similarity index 55%
rename from dev-java/jgraph/metadata.xml
rename to dev-libs/libnop/metadata.xml
index 061fc28567ec..a0bb21b79e82 100644
--- a/dev-java/jgraph/metadata.xml
+++ b/dev-libs/libnop/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">jgraph</remote-id>
+		<remote-id type="github">google/libnop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ba75dbf2942f..775afbc6fa00 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -3,5 +3,5 @@ AUX 1.32.0-meson-Fix-disabling-gtk_doc.patch 862 BLAKE2B c03eba757dd14ec5d4812bc
 DIST libpeas-1.30.0.tar.xz 193108 BLAKE2B 071e24530934605a6364816165d8f47ac9c94887e80eda9175b163d9af64b2624d42df75c7697220e888f2f9150c6e121bd1dc2716de5bcf0d392722938de945 SHA512 10ebcc61c8aa42b5f6892a74d5e02a52dbc8fe4c35280d78f41adc915dd9c08e9756608f8cbdbaf3d63c44074f0b9e9e531dd077ba201b416acfdcfb94b4bc42
 DIST libpeas-1.32.0.tar.xz 193572 BLAKE2B a29be56dd4add53ac11e52e7a9b6f9aaf1634bec0be6efe33d99fbb1a323cdc2f9d81917f160c3d8f4b88068d13a3b6cc732aa147bba1c1e524ed5eb1e238ad9 SHA512 520a5fd8657f75dc0e28a17ccab88a2952d018f81384eaea0fc65779e66b0ebc79b0dc8ce184e49d43406381c75c2028b402c1bb9d650eae2edf35ec8617a897
 EBUILD libpeas-1.30.0.ebuild 1986 BLAKE2B c4e963b3d6103b993a9c1169a876311c462f0202bf86cf8cb6bc9bd33b4db648ae7792f723eb966c16061c89689eeb943d9af4d93a1081c69ee76823b62c0c53 SHA512 82cb94465f47027893c1c9da11562ad4a7be402392d68f3421ce31ed1a9fc916cb24a7b3bab7b74aa8e2a825d6afc901aabe2d6f59bd49b3d9776a3a36bb6df0
-EBUILD libpeas-1.32.0.ebuild 2213 BLAKE2B 9565154e4c57417a5bb7b38a09962eccef5439cfd443843eec250111e25db7faee2f40cc6dc3c6b723da8f120f7c59b257f571bef3ac1ac1ee31110c85199b28 SHA512 455ebe7d9e81461924efe9430becfc5315b0f415c5de0e712e64f4c3308cda0d3b12e57a23afee3a6e246bcba38f7583711e6893213286f5b33a9644c96248f0
+EBUILD libpeas-1.32.0.ebuild 2240 BLAKE2B d364dd8c706c365c6d16a9842b66da351eec6ee5a7c756b869e408c5072ae6fab8511ee9fa7fbf604f1046831e03f49b44e43aacda50566588f639aeb727d50f SHA512 0bc329dcbe657fd1ea63534944aa5518b077fd7ebf3051c5e193d45fd2c5f0f467a4014f92c68d9c0de8265a43e52f09040bb67ffe4c4b39420018e18197cd84
 MISC metadata.xml 416 BLAKE2B 9383d1583b61f2218efb3b8c7bf6855e30ab8ee3f4e0829b78f17832af533a6839e713c702e0dbdcdeb24a516badb446b935e0ee1abc112c2342c2f0ce321d81 SHA512 3fb271973b7b510983e84c2d0188688f04a1f6a1a80aabc15dcbdb14276608ed59ee3ea1f77feade9b08785651ea4f85e400d928a267651c40f0e490c175da62
diff --git a/dev-libs/libpeas/libpeas-1.32.0.ebuild b/dev-libs/libpeas/libpeas-1.32.0.ebuild
index aa4f25fae10e..08b7db6366ad 100644
--- a/dev-libs/libpeas/libpeas-1.32.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.32.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="glade +gtk gtk-doc lua +python vala"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/glib-utils
 	gtk-doc? ( >=dev-util/gtk-doc-1.11
+		>=dev-util/gi-docgen-2021.7
 		app-text/docbook-xml-dtd:4.3 )
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
diff --git a/dev-libs/libportal/Manifest b/dev-libs/libportal/Manifest
index 0933aa988694..398a912dcffe 100644
--- a/dev-libs/libportal/Manifest
+++ b/dev-libs/libportal/Manifest
@@ -1,3 +1,3 @@
 DIST libportal-0.6.tar.xz 63816 BLAKE2B 396659bd1fd00885b49363a3f6fc0ccf5324c87417cfcab48c966ef61ab2fa35d300be84656261fdf4313b77fc13058d7b7c9aadb0591c1ef17b80434f8ec19d SHA512 f5f76a0dd0c66521b745c276e41f298addbbd41dd5fb3df9381ea85c122387878cb0e51ffac1e17f9e82548ab222d2c2fe92ab0d018de8a9ae9b2dfd65e454c4
-EBUILD libportal-0.6.ebuild 1725 BLAKE2B 92fa9f6452e5fdd254fe48ee59f6ed5c999a03cc57cf7135fcb18663af4453fb60e745ffd18d0ce9f8b12513a4e19b27182ff0e335bb0c94e4720336bdde89e4 SHA512 b6d8e3523d38308748cee3253b16565db5252b1a9a5a7b21d757c968d7762d9c65c3445ed5e7eed78da9e617ef8489a02348ccf6d244be095bb01ebbcc60d110
+EBUILD libportal-0.6.ebuild 1722 BLAKE2B 1bc2fa0dfecedebfd369323336ba7668520dc5412ed587e6c85ec4a6a4981136aee3624ce542fa7607d96a310fe3add392865b800836c8e811145edd8ab983e8 SHA512 dc87eddcb8e96f6f135a922d3d57a474bca8853fc2de0ef258b1c1af756de9a0a612dc07e38b1c63a9369e58636cf3b8bbbc07cbe0b2ba0b8778b7fca717f84b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libportal/libportal-0.6.ebuild b/dev-libs/libportal/libportal-0.6.ebuild
index f888be4a20c1..ddca0cfe0cd6 100644
--- a/dev-libs/libportal/libportal-0.6.ebuild
+++ b/dev-libs/libportal/libportal-0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/libportal/releases/download/${PV}/${P}.tar.x
 
 LICENSE="LGPL-3"
 SLOT="0/1-1-1-1" # soname of libportal{,-gtk3,-gtk4,-qt5}.so
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection qt5 test +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/dev-libs/libpwquality/Manifest b/dev-libs/libpwquality/Manifest
index ff4203cf5e90..9a4c86f7bb61 100644
--- a/dev-libs/libpwquality/Manifest
+++ b/dev-libs/libpwquality/Manifest
@@ -1,4 +1,4 @@
 DIST libpwquality-1.4.4.tar.bz2 426923 BLAKE2B 732e349a89b418d0b29d433551cd67e7b5f0daacb50ea73cfa7e45623801f6b559322645b4f4b0d741512964556d7e004d6a1c63b20e395c3c1b96923506e8bb SHA512 2d49b79105361663f009f7183fde9123e6f1e63bd678dfe5418143f611e763af8dd44374b826b3c22a00e721047c539741dc44d99a2289b9ab229791768d6e76
-EBUILD libpwquality-1.4.4-r1.ebuild 2084 BLAKE2B 5b19bf4a4a6de31764fb083bc699b65e5c44ae0b03201148244518fc6ebe71cc0f03b3cb72a1d45eec0173e250de9d08349775d5909ee48c7ddfb41495c0f38a SHA512 bbe01ce500ce8bcbc3f13134632ef3150edc31633fb12b7396c84373f325da9e500b11dbd891a8f94cfe924d163e028aff3f52850f2829acc49cebed8f594971
+EBUILD libpwquality-1.4.4-r1.ebuild 2090 BLAKE2B 07b0a1c7db71a0ffb07afc1a1131dbc6463eb5acccada0b3a153523bfc3a2c6ccd4e1ad7223f6d41c61cd2c3550be1ea0c1a39d5b51882b22a3c78bd44c7bc22 SHA512 5b755a77091ff5320c0186f84a9a02795d5b9d538e080abb1b19acfd27659ced78ae94f8107f0c3e9d267adc51e572da5f5e85ef2b14f515c7e8557ee84f58a0
 EBUILD libpwquality-1.4.4.ebuild 2007 BLAKE2B e535b7ec732f055096b70880bbb86a0f7a1b65072d04d4a7fc5bbc1ba628fdecc65488cc1a7f5f5a60f7988ae6b1dc8e60c83992c927a13faa839d0038c26fa5 SHA512 0666677c35397c9cec0b9cc8ab0c67f1973f98f88f31756626d1cbe28b4124526eaf11041c42ee9f4bd749129fcd822f209b94696747413192f3cb89a4fadd9c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
index 532df48d55ee..8321fd7f1623 100644
--- a/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+++ b/dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 232318abb403..0d9a1c76704a 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -1,5 +1,5 @@
 AUX libuv-1.41.0-darwin.patch 1747 BLAKE2B a5a2d3ac70468515e395f69c9a80748d6db261f8ae7c4979fc3965d32d7d8acd6c6edad4a4e9afc449e36df0f7544ecd1823bceba17ba456f21b221c78341243 SHA512 23be80dedc692cae3dc67d66834c937a890f781a9f73c68ebc3181130a5f33f981f822ef026464f77aa134701505054cbf76cf852429d0b3194d6a48773a0b8d
 DIST libuv-1.44.1.tar.gz 1301786 BLAKE2B 34418fbf8ddffe368b4df8f8b668888ec9f3e369c0d8794efa993ace5c37a3359a020d7868b9287b31abece6d0d3cf839ca412e959a4ee970650755f37247c29 SHA512 050b5f91540d126bef0a35681f8dd347296d3be32671b1c785494e78f5367b4ab064ece3f594523e09b08bcac284377d5fb123ba441fb570d25c5146aa484c8e
-EBUILD libuv-1.44.1.ebuild 1365 BLAKE2B 1ad06e6763bb46f2b3016acc135b308f94aa29dcd0d4879b6ce3280149ba036da9839ff9d579748c2bd127c94e7771ea562743d87f16fe7f36f254fa9197f393 SHA512 ea6b8f040d0c928a116d0b1c6c17e140b75789a47762f43dcb2f2ba389331b54448fc0560f276fc67bf7370c303f7f45d744e6b4cb3be12a0ef14033133d2119
-EBUILD libuv-9999.ebuild 1373 BLAKE2B a4fa4e88d0031b73a00987c6152489d8938dafc9371dde0a8e112aae256c7ad10e4eefb4989c18e0e70b5f7b48a20a63362325b3358b78c8baf583456139d86f SHA512 866bf4b77b09783c6277d08b53881007f46e11d4986e1a751c15bb71657113c4f86b3979066e70742d263b3dad10924de8d5b4f50293c90a0a40907aa4dfcd51
+EBUILD libuv-1.44.1.ebuild 1371 BLAKE2B 01fac1a7a2a09f274b628371ba1aadbc4077a17787eba8f63b92a40f462c0446a70ab5fd829d5bef53df73a78287c31f88c06414210476e84cedce5584624099 SHA512 22b1f916f13eebd76de097934033b5b2a46f9e5fa7a886a15a0fdbde0584e19b132d6c5959ca4fb914de02574a638b834cba9c382a0f6743be312afd27ae4148
+EBUILD libuv-9999.ebuild 1379 BLAKE2B b5d2680ac99a490d6e36d481402b271fe838d4773da9ec52b09f67b62901961648f0cf5388bb720c8df2b9bfb97d3e9d9180f6b1ef38d9db37386fab9c106f09 SHA512 6a4095f50c89fdcb80a1167d0623af7b2c329ca01392fcff49272c609abeac9c278d1a649f0069a59549d0f065caffd899577ff7e4f77c910256f0deb432a2b7
 MISC metadata.xml 1426 BLAKE2B 79a040706bd2e88560fdf7cdd75226c51384f1b27f8f86798f3a694d1d4b02ce309edef4f1921f73e498533e37deff9051ebdaa6ae565defabe9d4546aa33bd4 SHA512 a6fa2c3217de06d7d324b37b00e0cb19e8d0b192cd10736d32f5d459c701c14a6aa296d7d4d292f7c56120953423df0068f3f71495941295c97e86c283b084d3
diff --git a/dev-libs/libuv/libuv-1.44.1.ebuild b/dev-libs/libuv/libuv-1.44.1.ebuild
index b50c3ecd3eac..b71cb1bbda54 100644
--- a/dev-libs/libuv/libuv-1.44.1.ebuild
+++ b/dev-libs/libuv/libuv-1.44.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libuv/libuv-9999.ebuild b/dev-libs/libuv/libuv-9999.ebuild
index 027c9800d212..a20b1b4e4dc1 100644
--- a/dev-libs/libuv/libuv-9999.ebuild
+++ b/dev-libs/libuv/libuv-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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="BSD BSD-2 ISC MIT"
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index e9ba5bbafc20..5797eb730b82 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,5 +1,7 @@
 DIST libwacom-1.11.tar.bz2 519285 BLAKE2B fb26190d752316b5d25659d2ae76681bfff1803463360aa138eab91ed7d7ef2d04dfb6bdd4f8c2effc45a495ef3afc312a817d4fd41cd8167172cafd9f5cee9f SHA512 24e8183502dd2b928d53b3d26d8479210e855c94c225649d63ac33062a30615654ff0ab8666a25503fb3253125539cd845ca467fb228a01c608dc3adbbec73b5
 DIST libwacom-1.12.tar.bz2 543819 BLAKE2B fdbfba23d7b1e047757b0c0ff698a484cadc91c199459e1da49bfd5a5406aeb62d2ca43856f7d8363c3f36c7c05f4d3160e8fb576c3d18f085144dec259d49c5 SHA512 4e0084eda01e78f52336f3f1f1ea3ea86cb9c5fdd6d6c0316662405ebe2a328d6837f8db855e58f5fa95a640a5d456a081a7de339a372bf851bc0d5c69530379
+DIST libwacom-2.2.0.tar.xz 106444 BLAKE2B e47d07b8631f85cbde743cf3fe0f9ab5fc26673e62bf0a018463903e0f81a576ca3dd9bb3da8d0049338a87ca384f217e56dd3bc59ad713e6f7b4c20563d8ba4 SHA512 3bded4a72bec230f3318e72bdfd81fa577d4a86103a89367e01e993319f4dbb9ccc73c834c04d5a63f43a8b94457bf64e567d7e3f8d2a0e08b189300c63782a8
 EBUILD libwacom-1.11.ebuild 1361 BLAKE2B 5d1f2961c5b32db01681d9f2c044e89198130c2b9c18c7eab947a5157694d218ca9c8688491315e31cb1f64e703465bc2590bf4101dcffdfec20f06b1616a90f SHA512 43ba7996cd0926bf9ef34b2946f32db8aeed4263ae14377b5ce9f1107f753c04060a1ca9a802abd7ee7415eb62af7268bbf42ce171040cf4b7bdaaa6bf5cd7e2
 EBUILD libwacom-1.12.ebuild 1394 BLAKE2B 19152e1d6fb3cb580c2763dfd16812eae387eeeaa69b77524a321468c6244b6fa00a1012cd5b6f0f72dcb00ba2ddc6c8fcc3806b1631caf061a0c1865c428679 SHA512 5869d7cb13e8162410558c9d6f6af31c141be5d5469e125e9a451e8785bfce21cda27e6edd7b4b053491d4536adc618ecbc86d042f9c49d05bfb17f5cc0ad436
+EBUILD libwacom-2.2.0.ebuild 1470 BLAKE2B 86b316c963efea8de705cf2a7c5cbcaff26647f23d764aacd87c7875d2f9a9528c1deb527678ccabd69f0a3edf0b8e4eef641b35a2ec41237b362af564d58f91 SHA512 30a9a87bc61af1196501d5e45baa5f24379dd227f3db3b9942c78cbd8d823ae91dfb2a97fa3008b22d0e0676547f5282798182a54a99185d73291fc5527ae1b0
 MISC metadata.xml 309 BLAKE2B 707d30ff0df4fef9c458c658c8d8ae763cc48ded42b7acba94098236fb56bfa486e8be61974113c6234c1831d08939c0c94d65d17abd2bc7a5e092fdcdef2888 SHA512 49b894496ae441153607ef14034c0df9ce6c9582e788cd55afd414a2f8189f1828da1b056142d258f7edb38e8a6ec023994b1d00734010b65ad7b50c2a108837
diff --git a/dev-libs/libwacom/libwacom-2.2.0.ebuild b/dev-libs/libwacom/libwacom-2.2.0.ebuild
new file mode 100644
index 000000000000..53a1e7bfb7a7
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-2.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/9" # libwacom SONAME
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libgudev:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-libevdev[${PYTHON_USEDEP}]
+			dev-python/pyudev[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pyudev[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Don't call systemd daemon-reload in the test suite
+	sed -i -e '/daemon-reload/d' test/test_udev_rules.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature doc documentation)
+		$(meson_feature test tests)
+		-Dudev-dir=$(get_udevdir)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/dev-libs/metee/Manifest b/dev-libs/metee/Manifest
index 7b012c9ce810..7ef7e56be1c7 100644
--- a/dev-libs/metee/Manifest
+++ b/dev-libs/metee/Manifest
@@ -1,3 +1,3 @@
 DIST metee-3.1.3.tar.gz 71887 BLAKE2B 9fa4f126abccea44b0a074d8bdb1e7e8d7f7bb4d3334cc77d6c00ef6d315577860fde3d11e81499824e79e01e373030cf4f8aa299864197dbde7b14c7c80fe08 SHA512 65f12ff244e66dbc84925be5871e507af9284f47c100fcf4a458882f2e65a0128ac33783c0144f9dfea96a5d87641a1059885855d565ca0e5623ec27718c9d5b
-EBUILD metee-3.1.3.ebuild 623 BLAKE2B a88089b58d6a20c0eb5fa2b1a0deea945c3bd5f3ddc74254e72c5d153ac14ce2fe7d36c7632588af35a8d32681835c4865b391dce9dfedbbcbc484317deffb89 SHA512 7a021c0da6766ba112815cfa1bd936028c9234d3352eff1fc3b17c862e0a9d8556bf91720440256e95fdb51cc83dd6f1686eb6e8fbe4931737b0247a8063cf2d
+EBUILD metee-3.1.3.ebuild 772 BLAKE2B 35d47ae5bfe82857b269235db049a6bcf8f96fc22567cc9eadbf0dbddc68c990f9a412f9b986034a7c5158c155c01aa3c3768821e11a563d8b65e6dc1fe72e18 SHA512 04d26018484e7c2b8a8978e1a393bc902bbd00167c7b608e6d1e5621315940ecc9eb2338097e151a47f04f9b61c60d58e37767affdcb3dba3d4da7cac1930f94
 MISC metadata.xml 576 BLAKE2B 9e2b068fa33c961eabea553ea1f9fe539f1429467ea52baefbc7cff84bcd3bc802ba5024ed71ae96ef9e810636aaeb1d711f9bd294215bf6cab5e122eda03d7d SHA512 c529229f880fd0f02881265c26a2e7e2841ec02b719a67887423a874253a9414f68614399dbb0cd433b7e9fe5b7ba6785c8fb789795f3b1a8f6c8597949aede1
diff --git a/dev-libs/metee/metee-3.1.3.ebuild b/dev-libs/metee/metee-3.1.3.ebuild
index 278c94ebb575..21d55479196f 100644
--- a/dev-libs/metee/metee-3.1.3.ebuild
+++ b/dev-libs/metee/metee-3.1.3.ebuild
@@ -16,6 +16,14 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
+src_prepare() {
+	default
+	cmake_src_prepare
+
+	# Respect users CFLAGS
+	sed -e 's/-D_FORTIFY_SOURCE=2 -O2//' -e 's/-Werror//' -i linux.cmake || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"
diff --git a/dev-libs/mimalloc/Manifest b/dev-libs/mimalloc/Manifest
index f4fafbef35f4..c2bcb61975fe 100644
--- a/dev-libs/mimalloc/Manifest
+++ b/dev-libs/mimalloc/Manifest
@@ -1,5 +1,5 @@
 DIST mimalloc-2.0.5.tar.gz 1125567 BLAKE2B 9148ba4af7620eec36e1dde0f6fd2d1e3e9937bd2286ac790a727052402c3286b55387236de3a77e4405983c080bb7acae8deb3334cf9103fcf3f90250080204 SHA512 d164392ace523a3fa0aa00fc58d8a9e8fbe913f07957e19ca977675b389e6d2a2eaf4772e72cae0d87aabb960f3fd6ea3923a066ece4ba4fdaa0c6860cfa414d
 DIST mimalloc-2.0.6.tar.gz 1127052 BLAKE2B bd8a38cc0eab6ad950a63f494f24e6a91c50d2104335e9ce70963a7baadd26c7a2b7440b2fcabe502d9961549222873d017cb525bf5b32da967cf51aa167603c SHA512 f2fc0fbfb6384e85959897f129e5d5d9acc51bda536d5cabcd7d4177dbda9fb735b8a8c239b961f8bea31d37c9ae10f66da23aa91d497f95393253d4ac792bb3
 EBUILD mimalloc-2.0.5-r2.ebuild 691 BLAKE2B 623b98c9393d1ad2c377e95908f962f221f884448cde7a92c139abc98443a3e3d1bccf00e1d9cdb6ca3f94ce9721a60cffe6ebc7355ab2b0e2ba299a48cc2160 SHA512 35824f644c31590359072a350ca33daf11566b33b40d26ff76986ed5860a8fa5762b9018753c8630662d0e6abed4844574c672f9b6b4d9d046e20d2c59837635
-EBUILD mimalloc-2.0.6.ebuild 699 BLAKE2B afea0417ace6e5d833cd0327f480931ce0a374f71e5a051e944e1ed654c85f9e254f3de224091e70456d47d00f9589e9099678f0cd3d83e32cbb871cb349b057 SHA512 d7a7bcb34daa1f15b68c2f1f6110380c83f8da386a7db34d89ff6adf0b0ba63e8f3be9beb0b10cc97c13a72ec2a39cb7d52ef90a4dfcc5c24c2b5ec868aa654e
+EBUILD mimalloc-2.0.6.ebuild 698 BLAKE2B 3eb6400c93be33c1f752156d6e851ae072fcf9029b0d56709e793b84a65d8543c8a6ec729887f10b1d3d0b2982e2a7c789c3279962161725c01c474e91dac547 SHA512 4b6fa39b2283504cf306463614b3d6700ec0170b4c02317911056133c2cef9a7e106c1a874f86d555f0aaeadb01755e0961c905bc3510ad5172dce94c0e33b4d
 MISC metadata.xml 431 BLAKE2B 6b4122d0fc6609b5ee6d4fd345727301fdf1bf0943507240002d4a574aeb84622a1be6af2f095d231c9d3da303de39485234b7136a91a2d819a5434859eeea35 SHA512 9506d3cd5946abbad9a051e8cda535d361040d015e57b3b0f73a7a144e63d88e972aa427d52373ddc96b60868ee5d21e0f74b6001332343f2f57971ee27e5ab4
diff --git a/dev-libs/mimalloc/mimalloc-2.0.6.ebuild b/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
index 0e92bd2a87ab..ecd6cb33f405 100644
--- a/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
+++ b/dev-libs/mimalloc/mimalloc-2.0.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/microsoft/mimalloc/archive/refs/tags/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="0/2"
-KEYWORDS="~amd64 ~loong ~x86"
+KEYWORDS="amd64 ~loong ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index dee072cac473..fda4f4fe1ac2 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -14,7 +14,7 @@ DIST openssl-3.0.3.tar.gz 15058905 BLAKE2B 8141d13dbea2f1febdd4e46aa404e9f3bac51
 DIST openssl-3.0.3.tar.gz.asc 488 BLAKE2B 3f31e3a73706b69683220e05b1b4ddc75dc3e7e12652dca711e4aa0eb3c023ef736aee9ade15172d7f28e1e1af03e86d4854ec6c3d167cad42882f483c5e56d4 SHA512 04afe65c6af1ae43a9967462383a6a4f567f5acff19ec1952cd6fce2dc3c3d4dfb3cb54126562724c148f40dcb66668abf727282d35730bbf36f82b5c6bacace
 EBUILD openssl-1.0.2u-r1.ebuild 9933 BLAKE2B 5ad3b7befdf48c6ddaa7c849b3970730b8b693ba722beb012d89d41bb3af98e4037b811587072ec5dd2b70e5eb3683ce5800907d2ae8cc4e03886da15720a627 SHA512 20aa5cecdaf61e66a126125da6d17696b47891f01939c6932d0b9ecd89a211fded135c0fbfa7eaff5d7cf46433c4b356961baf5fb325c698743b8862c7fef284
 EBUILD openssl-1.1.1n.ebuild 9296 BLAKE2B 49772a36ac8fcb336c1b4b6effa42447c0d2b5d4fcdb018ec852f2a79d7e48e026b4c313b76d2adaefdb38f1277d5d972af1c9bfa9b1ff44ff29df7a23ab4438 SHA512 cfd85bf40c59048231d5a302ebefb1ca9888e6f619c91ac28b4e7c26a1f4cff3e2c3a652bdf8cf8cb113347b0bf49db7ad82e76908fbd4e149f1ed971dba298b
-EBUILD openssl-1.1.1o.ebuild 9757 BLAKE2B 17d6bacca444abd1c4e3afb16101b5ba317aa771c80dd70c20723a09a15634dbd7019db847e533ea56bf47de26bda1fff9147b1d34a30ef88e3e0f0362cc749e SHA512 5a07fefa7a7cb3cbc8de1033283d10b57c5cc3615b9a3e77a45852fb00a10e848b694b8bb0e88c876a42ed0e994a046818e795d499fc9d9e686bde42fbc0403d
+EBUILD openssl-1.1.1o.ebuild 9711 BLAKE2B 0e7d32d3220208e80f1b4739e59f040e92625beedcea58be51d5cb6656303c68cb145b14ebff8eb477667cc8d5cbc30ff99ce2779a331d0b6e75806b2d0f7fd3 SHA512 f7c5f5d22396e03bf4313e84a8b916b3e35e98f55f5e50be061b7e687c4919b7161b4b3a440468944bda7ec9d177ab00434712f58273edf977829ab5d5f52e8a
 EBUILD openssl-3.0.2.ebuild 8461 BLAKE2B da0438ee498a7c718678596c00517bbbd15af8350d7d9fe5c0ca7cf5b0009019022a6aac19ee9ddc77b46089262778098633a2360d52b1d7aec1865da0394844 SHA512 18ca4c6e0944fbe12afa68b21475d947a7145b874c6a7a336e564b18f3688e45af2941ce1008e800eb053f1a7133b748bb6d99ccdee8f0dbf3c839ce1c4aa417
 EBUILD openssl-3.0.3.ebuild 9195 BLAKE2B 056b73f55d89d72960b2406e7c43b5482a1d2cd3673e970c5ac43748d83408787b8ee0db37ba8a1d497c9f5e395f69893172c330d4056f68d187091855030c44 SHA512 1ca2b5e2801ee4d017123b2803d332bece437c64ca0121281c9954cfc62a464df7b13b32af9cadeb4a2e961cf6389ccf2f5e613484bc5a9c2e3f59a5771ccc89
 MISC metadata.xml 1585 BLAKE2B 104cd90ff54c6789edddb7f433252731754cb600ea663c6da66b28ee988541b9fa5f8b3086684841946ca8c4928c8768a1ed11d39419a26c039da840912a66ae SHA512 13cf734d5d1685135e0f1c488af0e4a2f1295eac33c45d65b1dbdd1b04100b1ca5f3d5d1c9938f4100f8df548ba739c9ade56c72176de92cb7f9c2cc2da818cc
diff --git a/dev-libs/openssl/openssl-1.1.1o.ebuild b/dev-libs/openssl/openssl-1.1.1o.ebuild
index d31226dd3168..78897bc1821c 100644
--- a/dev-libs/openssl/openssl-1.1.1o.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1o.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 
 MY_P=${P/_/-}
 
@@ -160,7 +160,6 @@ multilib_src_configure() {
 	tc-export CC AR RANLIB RC
 
 	use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; }
-	echoit() { echo "$@" ; "$@" ; }
 
 	local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal")
 
@@ -182,8 +181,7 @@ multilib_src_configure() {
 	# Don't set it without thorough revdeps testing.
 	# Make sure user flags don't get added *yet* to avoid duplicated
 	# flags.
-	CFLAGS= LDFLAGS= echoit \
-	./${config} \
+	CFLAGS= LDFLAGS= edo ./${config} \
 		${sslout} \
 		$(use cpu_flags_x86_sse2 || echo "no-sse2") \
 		enable-camellia \
@@ -208,8 +206,7 @@ multilib_src_configure() {
 		--prefix="${EPREFIX}"/usr \
 		--openssldir="${EPREFIX}"${SSL_CNF_DIR} \
 		--libdir=$(get_libdir) \
-		shared threads \
-		|| die
+		shared threads
 
 	# Clean out hardcoded flags that openssl uses
 	local DEFAULT_CFLAGS=$(grep ^CFLAGS= Makefile | LC_ALL=C sed \
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index 6a19f282465b..7a8009080111 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,3 +1,5 @@
 DIST serd-0.30.10.tar.bz2 586386 BLAKE2B 7f84b425a9eed36c5b59b22b8fd2cb9139a3de2bd1a47f92fd9888c433d931dcf83f13c2460d821c04f4244a79aa4330ba973017508ecb5f4564e78ae45b9b9a SHA512 ed7b49abfd3dc3a724b047f5f0cd07b811596330c96d91c0ce90540440f03260e05daee76c3ccccc3d4ca39afbbd4f3d07decbb601730e90c133a09c640c0006
+DIST serd-0.30.12.tar.bz2 594475 BLAKE2B acd065613494f05d1b2016c2097c1efbd1ebe3a5b901fac3a60d27140fee5c51ec17314df7ac2d3ad89d852dcb016dcf7255271f506f900445ce275335ed7d01 SHA512 c330648eb2c947a6d220f42d0af63fd2744da496301483e58be3cda387da166711d6acd5cee2df8cbb837ab450e1802b3f9a0a2973e5ad6d976b69b863aecb7f
 EBUILD serd-0.30.10.ebuild 1219 BLAKE2B 0837bb3d8169f3cb341e26d3c174576086883dd84af5e4dd7c3de3ab6e559c2871673febf34a1c3cc7331311ea513cbada5d66b7a562ce7bd0c6614edb5f4a42 SHA512 7d824ed149a697a7b08892d46c04bbc8a3cdaec1b3d7944a6815db2eae684252cbe95288834383331697f03508fd7b5fe71ddb1dc7a00eba4f0cd4d4a5c8fdcf
+EBUILD serd-0.30.12.ebuild 1226 BLAKE2B 30d2843126d0364e2217e6e5306bb6f257836cd1670b937a581425fd0c41b78fb7f16ea521c7286ec3d02642e530e54e0f193c0e560635fe38ad9f4f517b3772 SHA512 da37b8d45f74b8b4a277e9a66eb40b785bf93dd6f881d3ce019b120d05bdf9de11c98cf51b1c6d55da08cf47900a66b223486f960e631a759cb845c1f8f8ccad
 MISC metadata.xml 659 BLAKE2B 7d8a07b42b1ca5f3f178fbd8e465d6e594e1005510ea7aa999b4d4435d33269ad7a45a9fc6b70a663895824379a1ac2c388dffabe3d69e877cd2a92b7375b63f SHA512 0d431ac490c2b20d6da92afd0c2e663926bcaa3e1bb4273a0178e969a619988e25184939bf6424c2ffb7ab90813ffc6941534b9ae72d59793b6ad1f4aa15a034
diff --git a/dev-libs/serd/serd-0.30.12.ebuild b/dev-libs/serd/serd-0.30.12.ebuild
new file mode 100644
index 000000000000..8c6796d5801e
--- /dev/null
+++ b/dev-libs/serd/serd-0.30.12.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
+"
+RDEPEND=""
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 800a912d9dde..48f80ee28cde 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,5 +1,7 @@
 AUX sord-0.16.8-fix-crash-with-optimized-builds-with-gcc-10.1.0.patch 673 BLAKE2B cec32a83d67d5d8157f13dae4ba0d2e59e32aeba233cfc76811cf3f66f1d1c2e76d439be40f2de4ea8901da88a5f547e699aa57bc989360ebc31e5e1a4b1e099 SHA512 f4d310e31b1ad7075ad0ebb6d7d249dcd2c773093f36434518891b5b44d43851c13c2d20d2fc9b96f7e85f4ca30a27f7b248300a8ad2e21724e8e4bd100508d6
+DIST sord-0.16.10.tar.bz2 524630 BLAKE2B 6737d3495846529e6e4d14cbb2ac47ce4e67d04298381a119ba0107144deb56a53de9aa363397c2e302535f998c7c3ad44d340f52f70ac341ad6b635db608cb6 SHA512 715201eaf4a13a3635337cf8fa7c1a1f229f1d589f70cdf8f67183d90df29cd8b4af180650ce9cd0c651c712d11901bfdc6b51f9b8d7c6e70d8d8f30b1861281
 DIST sord-0.16.8.tar.bz2 525038 BLAKE2B 3ba43b2edb69efec64ac68f139a18f23dc1b92290b054f420c400d2907af74fa550b042596374136c53b7cf0db1b775cfc7edd24c771bbf26d25928845787c7b SHA512 24ed50de8e5bb321e557bac6d3e441b2ed49adabf828bf0e1b33a080c89306dde80443dc8b563098fcc184c4d6e53b7e716b523ddccdf56d08301d1b0120f2b2
+EBUILD sord-0.16.10.ebuild 1188 BLAKE2B 351fa442d42a64af7d2914b365fcfbae1335482cf5192af9cb3d17d58ae7c92a759a7242800fb0c43c9a7237c63e15f20036d21232e0d8577504eb1d0f5ab1e9 SHA512 65781c6efebc3df10f58b77c3550803ceac557e198c67fd5851394b437753e4ba8a3933cb76fec4237b7540535246fec640ba1f97e62e5514eabdee75295f63a
 EBUILD sord-0.16.8-r1.ebuild 1269 BLAKE2B 1673da8136415824f6bcaa5fb6774b4ffab40f095dceed0e84ab201322b73e2c3691a116b63e96e2b1f31c646d790a5e83b0a67afe91fe9597fda116b629f9c3 SHA512 1ce5e65487ed5a7780175433f0de3e1eac1f4f598ad648129c1e57c92aef387411d78d8ced54940f67eaeec77c5face5619ad91a19cea6eafea74e09c03cab6e
-EBUILD sord-9999.ebuild 1128 BLAKE2B f3bd1ae3e1dac7eb242e590dbf0961118a93d202c38efc9ca5d921becc740e3ac05d5aec094dab3bb6270b43e7c9703358ccb48d506c66c570550e6a499a4e99 SHA512 fe1fb72b64d1aa2f1274500b271ad117dfb1ddd35fa7087303eed3dc01123ba0ae8a7ef827e8aabbe69833dac5db14743689852e7d59fefdd183f77e13176f7c
+EBUILD sord-9999.ebuild 1128 BLAKE2B 9ba38e9717b8614797ac6920cdc5a5865f039fdcf78b0f0f5f2562b36615a984b17bcb41749c40580e591c592d3c6a7355eafdbff35f253102a48c987ff02d05 SHA512 143642a6558e8bb9cbf5b4c47908764567a27d7e413a413f4c16d5b459c1b3d76ab0b6369c7d6a939b09726fd2937c64f4eab050a100dc06c5d9833d297b17ca
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/dev-libs/sord/sord-0.16.10.ebuild b/dev-libs/sord/sord-0.16.10.ebuild
new file mode 100644
index 000000000000..b534740a2a7d
--- /dev/null
+++ b/dev-libs/sord/sord-0.16.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-libs/libpcre
+	dev-libs/serd
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "AUTHORS" "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/dev-libs/sord/sord-9999.ebuild b/dev-libs/sord/sord-9999.ebuild
index 815103371d51..fbe89d308563 100644
--- a/dev-libs/sord/sord-9999.ebuild
+++ b/dev-libs/sord/sord-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='threads(+)'
 inherit python-any-r1 waf-utils multilib-build multilib-minimal git-r3
 
diff --git a/dev-libs/template-glib/Manifest b/dev-libs/template-glib/Manifest
index 8921d4d9acca..57b4605238b0 100644
--- a/dev-libs/template-glib/Manifest
+++ b/dev-libs/template-glib/Manifest
@@ -1,5 +1,5 @@
 DIST template-glib-3.34.0.tar.xz 55348 BLAKE2B f5aa2b2032dce87a3091a7314012779f789ca6e4b1a8c7406ae92deb8283c9024ef33cf8d657741dbb175816371dd8082b7f0a2fff47b58842573248c12dfd6a SHA512 b89cc9890fd80a6858b34139ce1cd2394a43f598629e59f224f4db798a17457be9a2aa8307828af3591108ed6e9a953936a74df15ed1c8c8af2100306db5a497
 DIST template-glib-3.34.1.tar.xz 57540 BLAKE2B 2ceff1ef04fe846d8b5a7c4b54d0bc572323e607fb72812bcc93152caf1d4e9de36a27705a53a0c1add924d95a92d597256bc5450f1ff598c1fd5b0157a87051 SHA512 9f518fa3331fdef808f219792e1664787150c9e4b1b1a43662badde4ba8cf6d49faf1f97f0f4faab9e31c86a3f65e637f62d752fa6725c052ae099f29f3999fc
 EBUILD template-glib-3.34.0.ebuild 1092 BLAKE2B b21750f52efc3ee82dc1c04edec5f3968fc0d8daafd116cbf9f34cef039c07dd822f4e49cd91b5ce2d14b842c2ac6ab4f8767770e2624e1d4b4215b481d596de SHA512 e3432ce2aa7dd4cae15915ff88fd61fb9705f7da929339b8e027f2f87b617527bee4062ede3216c1784e09e8aee9495060ef45b3744ea7e153469501edff1450
-EBUILD template-glib-3.34.1.ebuild 1076 BLAKE2B 7f88e8bd6a14b525468bbc64655e6458e2c2aab89e965846d9f265ca588472b558ddce886c0dc0d20b25e100bee6c0d6122e93395d327b3ee7ad92151aa6bfe0 SHA512 60fe0fd93c21dabcb64c7491a9cb168a4148901f7c2bb1715b7468381880552e8737b5eb2d16ecc9dcf81e39ad92e130a1fd0dae28f38b872601594f83236bfb
+EBUILD template-glib-3.34.1.ebuild 1074 BLAKE2B 18aa25536e22f1a06ce2befb35da18dcc2d9fa3e331ee7332abb8dd167d9bff25cd27b951c3b8a934f9abc46de06737d7b332ad79dcacb778e8f103061080083 SHA512 aaacbf9fc011aae02efce78b42a4ac5ab11b8ebeae8f2fc9592dda4be8b59d6529f2a5ec8dbef806836ccc0ff3e1d9dfe8fa1f8c4b86f3dc3c51764c4ab4ef9b
 MISC metadata.xml 645 BLAKE2B 805c0245f153163919a831b3921757814594cbfc70e47c6216ebf1f977180ce190e9ff3a0f78661c52f02fd33d7800aa3a5b96a5d281b3ece28a217086259045 SHA512 79eb403fc2f7b952885bfff1d94f0ff265a124e58bc00bdda1e533caf6c9eb1b3f3bf143d9f35ed7f9f1094d7f65fbcef60b516ae7581d6ca4ba4307ba4eab13
diff --git a/dev-libs/template-glib/template-glib-3.34.1.ebuild b/dev-libs/template-glib/template-glib-3.34.1.ebuild
index 830385f79f8a..af4f286dc6d7 100644
--- a/dev-libs/template-glib/template-glib-3.34.1.ebuild
+++ b/dev-libs/template-glib/template-glib-3.34.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/template-glib"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="gtk-doc +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index d735b3053a0e..08245b34dd3f 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -5,5 +5,5 @@ DIST vala-0.56.1.tar.xz 3960476 BLAKE2B a78786c51ce35735aa42e5e22a09bd29f98b1960
 EBUILD vala-common-0.52.10.ebuild 645 BLAKE2B 83357d9b5e013241456d8afa2caa3078a652686f76ececd9d5c7b85f0f7d0da13b7ff48f797db27419811ee15ed94e0e7ff2717587ff8eeb4ed2beafca6832a3 SHA512 ee301c5563e517cb3f194d58418353cb95fbc493c4125c1caede2b7f91beb8b56d31285eed240ef8e27fa5361f8de18540cd775e97c7ef097308ca206e4732f4
 EBUILD vala-common-0.54.7.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
 EBUILD vala-common-0.56.0.ebuild 653 BLAKE2B 01e790e858e3e4f602c15f208309927cda5ef9c2a808ba7c524198e9ded3746017dc2dc37740a413a4dc41873cc2e197736348802099165c11272e64447709fa SHA512 ae5cac34fb4d0f7bbcebe84ab30378cce75749d593848991856aca9990143e5213cfc124b2a4eeeb96d30230efefc6219d17335057d9c5c6d4ab44efb29b4708
-EBUILD vala-common-0.56.1.ebuild 660 BLAKE2B 827860dd4d4fadd7f5ec558554a5241682abc3d68656c2fd955e99d04305c82ab79aa269e3edf7994353a2dbd255ef6404f15da8b4c2666cc66820c5007f7075 SHA512 cecf8ea28e0dbd898864f210198d6e65cf4467971dcb74a33bf1cb384a528eaae4f65e6a427f160fe77feb57a333e34d48e637af05854d24f0551da27cd9a0a6
+EBUILD vala-common-0.56.1.ebuild 653 BLAKE2B 81c060fd838b5f6d9ba81aef113a05c063e16f78fd2a144822f7258ce4b62cecafade37b7bd53e00014e82d530911c948f52ecd0e4dd8974f706f231b040f8dd SHA512 674d4bea6c078a9f0f1bb9649e85b445ac90893aadb6c890e2dbb859babafbca2570794ac89be27ffe2236c026ef71cca6dc4fc215e6ea7c80eb6b1ce03f3cdb
 MISC metadata.xml 326 BLAKE2B cd8c49993b750ebef93c620f819f42b858431d1aab4d2066a124a5118d5d18f4970b9d1eccb77121089264db7cfbe69ca06fb2fc2d2c4db98047629af9878db5 SHA512 52854d43fb74af5402cb1855409ab25d6741ea6fe48ae50416044d7b518745b02752e69cb9680e9c132e3a2f65ae29d92e9e771ac883e2ef01ae91effdf1097f
diff --git a/dev-libs/vala-common/vala-common-0.56.1.ebuild b/dev-libs/vala-common/vala-common-0.56.1.ebuild
index 6e33fdc86430..cf0dfdd9e99d 100644
--- a/dev-libs/vala-common/vala-common-0.56.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.56.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest
index 4aaa66974cc0..cbbebe2c83b7 100644
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@@ -1,6 +1,4 @@
-DIST wayland-protocols-1.24.tar.xz 77120 BLAKE2B 912132cb2b65b99184f25942e02000444ce5d37b60f33363999e8431db5835d3c0dab41dae312f0dbb02d03ab7e4f3f588e7b507e767ec132a82fd816700b09a SHA512 4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
 DIST wayland-protocols-1.25.tar.xz 79784 BLAKE2B 6ca7fdc910bfd70ee5c3bb192bcf1c79c66c4bb713531b2d1d493bd3ec8509e1231176144d75f4e97a4c6ccc4ee1d836a7ac1cfeaaa59e927f10fa4a40cf023a SHA512 8269694a0780e4d32f1982ff4cbb50b1ef85f08157b9486bc6d7e489c64665a9d9f959121d0eede7c7b108a604d974b64d74cfdef8b5f14304465309afb0768f
-EBUILD wayland-protocols-1.24.ebuild 748 BLAKE2B 8b993cf653000a28fb907eca38e142b92a78d91f3e8a57bdf77650b3310b9c8fab3e5445e3daabe6fd11af00d2ced745e00ab0cf4b5a84086a6425107b65d891 SHA512 dc0b169ce9c4ad4fc89f47d0a09cdea9217046d0dc40cf6d79cf1b8f780cf5f9b94ff05d2d278cb53c798cdf265198db836bc4da4367e8d5943c5d26a6802434
 EBUILD wayland-protocols-1.25.ebuild 755 BLAKE2B 3fc5c050521210e255e4f84757d8db55799f8f1f24a29cb80212e7961f73c16e043a64f76dfa3185aa56ed20a3e0759247f87cc41ff9f1adde61b147a276d2f4 SHA512 9ba008e0875dbcc8b3c597eb49073bce8afc3d94c0bf6837a684ef692e202b85eeb162640229199965922625763107080e4bf76388fc31b30d3eac2c758e08b6
 EBUILD wayland-protocols-9999.ebuild 762 BLAKE2B 4f80b6c474c0ea97061ef6fb7703479bb82831a9a25450269356f967855e5b2d255d09a55db9a876ff7789dd8eab5d32c875c3947bf6e64c8eeabeb4c3faed4d SHA512 09dab59db34d5361d9630dc45c7728cf20c5f4491f6022093062b37756b776404964031664dd97efaaa878eb6fc850ce861b32d8e764173ecb28d432452ed719
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
deleted file mode 100644
index 5e506be1a991..000000000000
--- a/dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Wayland protocol files"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/${PN}.git/"
-	inherit git-r3
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( dev-libs/wayland )
-"
-RDEPEND=""
-BDEPEND="
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 17224ad364b4..a49f5b38950f 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -2,6 +2,6 @@ AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f
 AUX weston-10.0.0-backend-default.patch 828 BLAKE2B 2c6712737bc6e2d1a37d89b5ba4ea93fb30d137b8d76b77496f82503892bc295d19e97d8de223377328f8aa32721544f7a67f904c22bd1f1483fa99bf6c5f15e SHA512 e3cf66567ed8878ceeb0cde40f3c3aac8d20a04ce501d4fba8429f9d7552dc53ef4eec0cf103bf7e1e93fc9bdf224b20c628c9dede3e545455735fd95ae5dfea
 AUX weston-10.0.0-test-deps.patch 1052 BLAKE2B eaa6d9950a7a932686d11d9b9efb9ebfc602ac82db14348d4c1701a0420a85469e05c5af76568a6189546f4d8b5f05bac85c64e7168522af4cc0a5a3d31a8050 SHA512 7f59b5da1ec7a885d53bf48c12a13cceed6e7306c018e9921d64ec1856b8d125421f7af0aa227785d794924c6f035bc79a681eb9331adb17fb790f82c28d0f10
 DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
-EBUILD weston-10.0.0.ebuild 3935 BLAKE2B 2e02b6d61b56af7ba61b75eaf97d81562af26574022c2ebc8b47804a6008a77294a454177ff5d93b3e3481156dd380037ca0db4f4d56de4c129fcab8b38423d2 SHA512 98d13f0ffb69379d90e4f531220c0699f2e8c944f969523bd78957b3542db13d100a06606fa8a405c40b1993ff2495a2e6ab041da8c692267ef9543227855f03
+EBUILD weston-10.0.0.ebuild 3934 BLAKE2B fd140a51aeceac3251a2f5f0878cb5f4e37b630c4ad7807873ac041c863f490bb7845d29086dc17d169856dc8e9dd9a1e87c042b94c6e46ef2b5ae0810412ef1 SHA512 f48f41f7fdf96d2b1a9842150d57e1fd394b7e86725318aabb8bc472d7fab2483e1e4654c37271f13dc92efc92139e58c12bf8972d250028d9f7dc7dfd469921
 EBUILD weston-9999.ebuild 3815 BLAKE2B ffd80f511c1e14766f6a8f68ece3392aa1e0a1d2ac6e11732f98914656bd5075a09c55f73e8ff0a0453b481e4c067d9557335755c55ab2376302079372e6b7bc SHA512 b14628f84f9f71e6c0a26c94814bb4c22634a8f80c3bd12cca4916504d0f081eb2863a1f5843ff2456a52af24b5bae85fb3fb2bf0a62157e59202b30abe9c9ee
 MISC metadata.xml 1520 BLAKE2B ac2338fd000b3549fa197f281e439a09974d1bfd13afa766f255727a58a793fc8b4a6bac2237afb59029d11b02fc7d1dfb69072d9db227dd6f7db783fd842fad SHA512 434b1fa93ce9e1b8329301333ea47b73def8377c068735ad12d57bd5fd2ebdb5fc9e778b8df04bc4ac7b71dc7cc004fd8750581a17624d3cb3d2ff6faf81218d
diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
index 596b3ed338ba..d5a772f0976e 100644
--- a/dev-libs/weston/weston-10.0.0.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 371526090d9b..81999ee02eeb 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 5a1a6033625e..883caae2871a 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-ocaml-12.0.1.ebuild 3060 BLAKE2B ed1223c503df5487c666642a02df41095eb724b46a79c1204f8ce2ff6b9eb650fbb46907d00e721c1ecb5df6648afdefeca6dabca456ab54656fc45871beff80 SHA512 57cdf97cf5a401a5ec33f15f8fb1c83998a7503b4ebcab1c2e35c2b35519d9b30f4b25598ddc2f8e6757f6de42a6a5878ab43e50fd45f1df0db6549a204b1680
 EBUILD llvm-ocaml-13.0.1.ebuild 2596 BLAKE2B 4125904f29738c9d1df5dda7737d2edb1e68512f66b561d4ab4b24ebaa457da1a13ab830ab911b5016e05cb48696aff0f6cd1753615e33e8b06f5b086deb020f SHA512 7b80a864207d4c0ef50725a5e9e64c6ff0956b4dfd3f6c55f4363f44703a7113205a39a53624e288562b08ca3191bd11cd7615ecb53395e07777ae7161a173c4
 EBUILD llvm-ocaml-14.0.1.ebuild 2589 BLAKE2B 0c6950ca5cc99a140e53eb08d5de27bf4828638ef68cf795b5ad021c09703518f7fcdb9810154337df912de9a16641e50e38fb9c324e47312f33bb7f60502dd7 SHA512 40f6c41216e9ad68fa1ca31dc49e05f19638e0d3c8da2ba6e3173f336a8bb7a53152760650bee17346e08005cc8524c71a3ee7e9ceba271ecb451662b8b31c39
 EBUILD llvm-ocaml-14.0.3.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
+EBUILD llvm-ocaml-14.0.4.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f829c7c13b55cc142348fa2ac7feff500ddaa00929e7c0152f114cc3dd257f20063290d40a725a5cf05fa51c3ef7072 SHA512 a323d719faa75764be7ae4e663beaf806836b8388521c3aec93ea07a2f3e001a130c7881a15137a7199660a3e0e7baf646391817b09921dab693adbe03c2d173
 EBUILD llvm-ocaml-15.0.0.9999.ebuild 2578 BLAKE2B 97a593be8139c38da4982fb71466961d2adb99abe6a8b9c84d5ad8f5d19baa2c20d4e614c73310ab5d14e76edb39afcda90ddf373bd4f124697815acc84c0625 SHA512 0f61326a23d3a283ca122398a6ddfa4c9f94c56838c0c7247772c1102eb115661c624d4b118ac5f572b2111ed529dc9756576ae5d042bc2a7516081be9b715bf
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-14.0.4.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.4.ebuild
new file mode 100644
index 000000000000..4dd3009c2bc4
--- /dev/null
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-14.0.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-any-r1
+
+DESCRIPTION="OCaml bindings for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.00.0:0=
+	dev-ml/ocaml-ctypes:=
+	~sys-devel/llvm-${PV}:=[debug?]
+	!sys-devel/llvm[ocaml(-)]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-ml/findlib
+	>=dev-util/cmake-3.16
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_OCAML_OUT_OF_TREE=ON
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# disable various irrelevant deps and settings
+		-DLLVM_ENABLE_FFI=OFF
+		-DLLVM_ENABLE_TERMINFO=OFF
+		-DHAVE_HISTEDIT_H=NO
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable go bindings
+		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+
+		# TODO: ocamldoc
+	)
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	# also: custom rules for OCaml do not work for CPPFLAGS
+	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	local llvm_libdir=$(llvm-config --libdir)
+	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
+	cd "${BUILD_DIR}/${libdir}" || die
+	ln -s "${llvm_libdir}"/*.so . || die
+
+	if use test; then
+		local llvm_bindir=$(llvm-config --bindir)
+		# Force using system-installed tools.
+		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
+			"${BUILD_DIR}"/test/lit.site.cfg.py || die
+	fi
+}
+
+src_compile() {
+	cmake_build ocaml_all
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-llvm-bindings-ocaml
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
+
+	dodoc bindings/ocaml/README.txt
+}
diff --git a/dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild b/dev-perl/Alien-Build/Alien-Build-2.480.0.ebuild
similarity index 81%
rename from dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
rename to dev-perl/Alien-Build/Alien-Build-2.480.0.ebuild
index f268d23499d0..5d93da9d7e85 100644
--- a/dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
+++ b/dev-perl/Alien-Build/Alien-Build-2.480.0.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_AUTHOR=PLICEASE
-DIST_VERSION=2.38
+DIST_VERSION=2.48
 DIST_EXAMPLES=("example/*")
 inherit perl-module
 
 DESCRIPTION="Build external dependencies for use in CPAN"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="minimal test zip"
-RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="minimal zip"
 
 # No, pkgconfig is not suspect, it actually uses it at runtime, and this module
 # is somewhat a wrapper for pkgconfig :/
@@ -28,8 +27,8 @@ RDEPEND="
 	>=dev-perl/File-Which-1.100.0
 	dev-perl/File-chdir
 	virtual/perl-JSON-PP
-	>=dev-perl/Path-Tiny-0.77.0
 	>=virtual/perl-Scalar-List-Utils-1.330.0
+	>=dev-perl/Path-Tiny-0.77.0
 	>=virtual/perl-Test-Simple-1.302.96
 	>=virtual/perl-Text-ParseWords-3.260.0
 	virtual/pkgconfig
@@ -37,13 +36,14 @@ RDEPEND="
 BDEPEND="${RDEPEND}
 	test? (
 		dev-perl/Devel-Hide
-		>=dev-perl/Test2-Suite-0.0.60
+		>=dev-perl/Test2-Suite-0.0.121
 		!minimal? (
 			dev-perl/Alien-Base-ModuleBuild
 			dev-perl/Sort-Versions
 		)
 	)
 "
+
 src_prepare() {
 	unset LD
 	[[ -n "${CCLD}" ]] && export LD="${CCLD}"
diff --git a/dev-perl/Alien-Build/Manifest b/dev-perl/Alien-Build/Manifest
index a546803203f6..8ddea307667a 100644
--- a/dev-perl/Alien-Build/Manifest
+++ b/dev-perl/Alien-Build/Manifest
@@ -1,5 +1,5 @@
-DIST Alien-Build-2.38.tar.gz 331770 BLAKE2B 13a688073ad6840e04a2c2191ae5974048e53127bcd7f15bfd658ef8c047fd0ecd990bd2f787dca0bf02fde48cc451a39ad5e41bd737f4ac36a64aae49aca226 SHA512 a77b27894c74e9b73fd479f3efb67c748bf9f32931a75471f6e5e0ccbb65d2e5617abfef28f71a7e461f4e1a4216fa8968564aa8ae52ff1bbeae570743fbab81
 DIST Alien-Build-2.42.tar.gz 319048 BLAKE2B d4662f5a9e0bf151d389949cc696258fc8d96a0f2aa0f6bb014f1283207fdc92e8af994499a391439a8ba725d6a23a60ed33bc0701f4a2596cccf808c9c23ecf SHA512 83f30bc5f7e417c3ec4ddee463f24c73f89038feb3820520259fd33d4357007d7d39e14c3369e0d14f4b2f946606bb3db02111c2c497e93a961f7a3161af5366
-EBUILD Alien-Build-2.380.0.ebuild 1316 BLAKE2B da956aa2e5fae70135869be14b477abd88a0a27d7fdce105869977036f496324342c187bec8168adcd82ad42ea9347ac60ddb47638a0dd275dea350353bae52f SHA512 3d1239e3f12da866807e0c8dd848707babae7e61be6458def7843b30d7a6c556779b985b4c15abad94e7ae1365942ee69406e83270797271ff223a54890d79bc
+DIST Alien-Build-2.48.tar.gz 320641 BLAKE2B f287b379d8f68c7eb19f630656b33c98ad707e53cd6cdfec2003e422e65dc9f7539966b538dafb512d13154c9429d80832e03ed587262a6d685854b78345b0b6 SHA512 36311680b79cfac3abd04e22c69f7a7f5083b069af3afa34dcecbc7e6beea6b20cb643b1cbfe98f7a6f7e0b83d49915061c84b2f728c94d07e8be80e44317864
 EBUILD Alien-Build-2.420.0.ebuild 1243 BLAKE2B 4376f80ae8cee27a4eee920f9e106391dead47faaa4cf00e7619d510365b65f8dd38499dea899e9240c4b39bcc8edf8038cbf385d9959887299ba46b1aea295a SHA512 1a8f5a8421af2ce08aa478aaa0cdf6f30742de68af3b0dd541ee37404332c4663c05e8e851ca659304cba53ccbc3805439d6e352704c51b33cd8fd5be90b0c03
+EBUILD Alien-Build-2.480.0.ebuild 1294 BLAKE2B 98b2480a722c76a0ff62ea7017756eea9013511653f1c6d07133ec44cc82dc9368e0f37e08f8fe3311a6e5d357643b4022287098ca33f051e2955afc1cff006b SHA512 6664a36ba010da011a77a9770efed357b5d2fecd95e9069f9259f28ca305897056f1cfabdfd3b432abc2b1f882118f83b511a853a58bbf033e2ad436505ca694
 MISC metadata.xml 6071 BLAKE2B 1b4234bdc465faa73b6e0005723167f09d358c426013b312abf12949d2392929d5e80c44c1e6a8883c5633ed841a0f8b4f5977a9354b789153f559ecd8d4a4a2 SHA512 b5f6e6c37a9b7b8f362e53a622c2e80c8af32189495a74e8d199dcd7e6fc77720c5cbd481d8eb8233c943a6b817475b0d91b784b5474bb358fd91ca4424a82ef
diff --git a/dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.0-r1.ebuild b/dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.0-r1.ebuild
deleted file mode 100644
index 541029e512bd..000000000000
--- a/dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.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=7
-
-DIST_VERSION=1.033
-DIST_AUTHOR=ZOWIE
-inherit perl-module
-
-DESCRIPTION="Find and verify functionality of the gnuplot executable"
-
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-HTTP-Tiny
-	virtual/perl-Time-HiRes
-	sci-visualization/gnuplot
-"
-BDEPEND="${RDEPEND}
-	virtual/perl-ExtUtils-MakeMaker
-"
-
-PATCHES=( "${FILESDIR}/${P}-version.patch" )
diff --git a/dev-perl/Alien-Gnuplot/Manifest b/dev-perl/Alien-Gnuplot/Manifest
index a2c811612a2d..da0f23f865fa 100644
--- a/dev-perl/Alien-Gnuplot/Manifest
+++ b/dev-perl/Alien-Gnuplot/Manifest
@@ -1,6 +1,4 @@
 AUX Alien-Gnuplot-1.33.0-version.patch 463 BLAKE2B 46b6e7de3d44cac98e8f66d1493ced755ae10d5d5ee1b7e435941ff5e19675003425a1984e44b1f9be8e79342c2c085c6706864c492d620798c0b13d754ad695 SHA512 55f13e2f6b7a6b78906c3ea9a1fa3267f09537e36ab7fa5335014c43de606950e843b51e2d2c7030981a4bb2ba49e05bf7e34db208fea772a75feb2b58ccacda
-DIST Alien-Gnuplot-1.033.tar.gz 7827 BLAKE2B beb340f3f0feaab56f60811c3fac41fb518e657f82dd8b4ca53697b75fdaf53bf071ee89e6514115e3d110db122c5fb1b2c56506317f432bb80cba4ef808a677 SHA512 b846e9be8193af376dced487b99bafdd29fdf094a92f824bacaa3c642ad110918995cabc66300bd04fbf78ae779855ba94d1e634398f479961f98bb7f1cbbf46
 DIST Alien-Gnuplot-1.034.tar.gz 8662 BLAKE2B ce0f520326c2228f68c826a49c1793a7e7152e22a7593ae2e99094c8db1348f8e566efbc963b0089965681a5586b71fd8551b0a230b81506e2229ab538861fe0 SHA512 9fc4d9e92a478c9399802b5161966efc625b676afaef2f212e8706da28a03f4fc265df953e55f0ad541795d90aa9066f71838362146cb8aae3caf9f0ea157fc8
-EBUILD Alien-Gnuplot-1.33.0-r1.ebuild 519 BLAKE2B 011a722241ad1cc437212a0545db81c2332d9785c2510b32bd10b68cee11c55be81024b8ab0e496e621093cc2b657b33a9642db4c427eba079e0dd9891f1ce78 SHA512 18210e4c82b4b1b305201399fa92321bb0b5f371506d516797f188835da753d4b654f1dfdc0f060faf34a6c2abf1e07e7d5d448d729abfbb5763acfa62137c36
 EBUILD Alien-Gnuplot-1.34.0.ebuild 552 BLAKE2B 1320fa59363d1bb931567667cf57e2b3038900bf3027d13250e65815022fda768afac2052811f052c962b1b83c0cc99455acd0d2259f0c1e82a6d601f33c9b73 SHA512 fe2146200cf0e73981a2d6685f0bfe1332b8cdb9998bc5017fe554130ebc8400d9a1f15533bdbcbe27207a67e47f130731c18352e62c5dd7f51f0c035ff7a97c
 MISC metadata.xml 471 BLAKE2B b3b81618e661578016ab5ed67fb32585e943b9166ceb066ead1985cd82e568e6d96752d08133ce142208eed867df0e3cd952b4b35d7a5afdf22d587b7a773eaa SHA512 05bf9d74e3705c44197c58d24958e76bf53e057465e895402a9637ad47a2302ce709e11247bf0eb80818209d981b331cb5441a37ab45dd1e07d1d0042bebe9ba
diff --git a/dev-perl/B-Keywords/B-Keywords-1.240.0.ebuild b/dev-perl/B-Keywords/B-Keywords-1.240.0.ebuild
new file mode 100644
index 000000000000..c43ebc3f887c
--- /dev/null
+++ b/dev-perl/B-Keywords/B-Keywords-1.240.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=RURBAN
+DIST_VERSION=1.24
+inherit perl-module
+
+DESCRIPTION="Lists of reserved barewords and symbol names"
+
+# GPL-2 - no later clause
+LICENSE="|| ( Artistic GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+BDEPEND="virtual/perl-ExtUtils-MakeMaker"
+PERL_RM_FILES=(
+	"t/z_kwalitee.t"
+	"t/z_perl_minimum_version.t"
+	"t/z_meta.t"
+	"t/z_pod-coverage.t"
+	"t/z_pod.t"
+)
diff --git a/dev-perl/B-Keywords/Manifest b/dev-perl/B-Keywords/Manifest
index 6d8dd670d441..5d412bcb8209 100644
--- a/dev-perl/B-Keywords/Manifest
+++ b/dev-perl/B-Keywords/Manifest
@@ -1,3 +1,5 @@
 DIST B-Keywords-1.22.tar.gz 12417 BLAKE2B 4cc51674062299a3776e395910f5d1ee279a5bde68b35adf867ea263bb225487ba85e5100e1474207e7fa6ac336d8bc880990749710e72864d344c51097535e3 SHA512 9dd44cafe4502edb519d885d74688183275550c3ad4da61387e805cf7a4789434ebda8f1f71104515c688e0e0358ca38399a1d1bd2ba066c7e1e3de76ae68bb2
+DIST B-Keywords-1.24.tar.gz 14110 BLAKE2B 3b5d8e32fdd4470463a5e93035c8fe6a5620f4331d6d90ce1765525597e490483a906ed7c82b4fd851f7f5fc939a03f9933cf715b8164f622e4730791e0e97fe SHA512 b48290ffa0fc2f843930c0dc5227c0cce5552c5e112d2c63307b7557323387207a70cb30d7bc5e00db6e1ad4c8055b40e80c158e449a4fda9f4471cbc07ca8f7
 EBUILD B-Keywords-1.220.0.ebuild 550 BLAKE2B 13e8831021abd23c2da8c94721f5c9aab66c289dbcc3e577375bfbbb93bae6ec8ca212e38410d3f092bdacf4af5616ad6712b59794eb4e76b0d8e1b15aef9659 SHA512 833cf8a869aece2cc22b73033db584373a3d070613be0a1a1d1b0925aefa7f4e6e4a30b9d543eb4e2c84d8190bbdba690d01b0b23cff3c47ec87cbe258b5a19c
+EBUILD B-Keywords-1.240.0.ebuild 553 BLAKE2B e35231aa2844c830ccbdb0d48353b36a687655996c8d6821baca13f5ecfa741050104e8feca2fcaa21f77f4c3441180fd4acaf0429d2bd9375875fdc942c76fb SHA512 f4bb3d50612f9c60349be51b549e50660fe08b4491256c440d8c420b88c4ceb756cf2ae6b1ee5e012754d1b3d9f10fd127677408050651869b9980f719045952
 MISC metadata.xml 393 BLAKE2B bc98e38d5dfbadc296e201fa2bd738bf149278a5af52b738e5c5e8813f164dc2f252b2b9691d1e3813a26aa35c1ade600f967ff694bde02b74db9a0ccff5385d SHA512 e86b75c1f1606ea93050c4e9928c5b9f00844c95d3e0e7032fdc43dd5644b0a6bd9cf08b9d033c3ba62ea2c3194561993023c0ab2318006710d42e5fa7c14e97
diff --git a/dev-perl/DBI/DBI-1.643.0.ebuild b/dev-perl/DBI/DBI-1.643.0.ebuild
index b887a71b7a5f..723ae24e89b4 100644
--- a/dev-perl/DBI/DBI-1.643.0.ebuild
+++ b/dev-perl/DBI/DBI-1.643.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DIST_AUTHOR=TIMB
 DIST_VERSION=1.643
@@ -19,6 +19,8 @@ RDEPEND="
 	>=dev-perl/PlRPC-0.200.0
 	>=virtual/perl-Sys-Syslog-0.170.0
 	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Scalar-List-Utils
 	!<=dev-perl/SQL-Statement-1.330.0
 "
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index e742d8b2eda4..ead348bfd946 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,3 +1,3 @@
 DIST DBI-1.643.tar.gz 612372 BLAKE2B 9a4b45bbf979d25e54f1ece056c3bb1d753a016e8da41b530788e69181027a9f974dd9c0d1939adceca3877c4b46d4113a2c234960b4d4bb9c12261301b920b8 SHA512 03812f3eb1e43c8290dadb8cb14bbced9ec6e237228ea2a2ba91f22e52143906a91a7e82945dab30b1d1b9fc925073721111adafd9a09fac070808ab88f908b8
-EBUILD DBI-1.643.0.ebuild 1048 BLAKE2B 9fbfd9e2b08820ebb1c3cdd771ce5848cf2f6a067ca30652a86bac2ff71c085c633a495f92c7758c5d2f03c2c1916dcb2d9ef881df4e9131705553361c21cf58 SHA512 ff39ea45698ff0cfec381e260b110e0b7cc11af995d59cd81bf25b5f2bcf7e1d78ed572c118c34e07f836d93463f8e4bb0a221c473cf6ee8c50f250183dda582
+EBUILD DBI-1.643.0.ebuild 1104 BLAKE2B 66482b98fe3f77e867d43eb4adc6782461ef24a7fa8221fb638661a51928d2531435aa7857d600faf29c348d05dc5ab36c813e00d6b8311186aba5be2ca87394 SHA512 bcf002d52533977571af7cd33521f6813366c225a40ed3986f06fffee35e723893f1d8e315bd4650f7107f26480438eb9a0b35e737dfb5beca7735acf2e36c21
 MISC metadata.xml 6617 BLAKE2B db386403d9e508151fe42ee6598b46a4aba3ee39ba3e3ab96ac7c8bf294ac36c87a0e2a32ef79acfa8ac8c968c4806524f6558bd4c1cb10a77d7149039c83810 SHA512 dc8980036bf1700cd931f0da179fe44a8f5500238fdd075c5ba08d2ac59edec24e72b9b4b456a0c7cc47c78071ed4ef102aa4525f2098ae3682da81da8fc10c4
diff --git a/dev-perl/Inline/Inline-0.860.0.ebuild b/dev-perl/Inline/Inline-0.860.0.ebuild
index 535c2d9a6e42..e76ecba139cc 100644
--- a/dev-perl/Inline/Inline-0.860.0.ebuild
+++ b/dev-perl/Inline/Inline-0.860.0.ebuild
@@ -16,6 +16,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	virtual/perl-Digest-MD5
+	virtual/perl-Encode
 	>=virtual/perl-File-Spec-0.800.0
 "
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/Inline/Manifest b/dev-perl/Inline/Manifest
index 31ca7b56cfd0..63c9205727f7 100644
--- a/dev-perl/Inline/Manifest
+++ b/dev-perl/Inline/Manifest
@@ -1,3 +1,3 @@
 DIST Inline-0.86.tar.gz 87329 BLAKE2B 843a6c041a3c766b9cb9b9c70863ecf2631dca2cd6d1d461d4c0b8a37a30d1707480b57adf2da6a0440da880cde61f7c219982a2cd37226ab01ae0887368d29d SHA512 d7f5a15f66c686c89dbc0b6aa3e2496b939683befeb5033b242b4d5281cc1ed6bb5d7303f51059177e042d6fe8c903e4df535099b60eb16dbef431b50a179ac0
-EBUILD Inline-0.860.0.ebuild 591 BLAKE2B e5a03c7a8a0497321d64677ef066de13065918a2170afc65f36fd8d526fc1bc599ca6029c6470c9c010ce56dace994b2b2ed7db455fca8f961bf7b485633583d SHA512 a947f5b455b8fc87babbbff178b4beff6eed7333a313ec47af44e50348937056bd67da64830df4dbf6b39359aa231798f54091dea84e5f01c4ebd9a9e8731a8a
+EBUILD Inline-0.860.0.ebuild 612 BLAKE2B 3983659e7beada3c6eeffa5f76671f3927d1f2551b1d1dde97b86ccc67c1dbc7ded3ca5642fdb4db5d4b32464fa8d5bdaa6ab9520fdfad8aedfb561ed029cf66 SHA512 eb271f406cbf4fd8bf5c5ec34c3ca0e54dbe7709aae7d0177123419252a5f76683c499d36b648d239016cc132815a8c0fdcee88ff790da90ba94a3fd54576b5f
 MISC metadata.xml 882 BLAKE2B fd0e926649cf9b78f019d34990ad039a9166163ccd87f9fed9c5461c0ae5e1296f5cfe948902ddece9cdfb3bfdec862b3bd7f7a6352891c4063b3517eaa4286a SHA512 964b77dfab271dc30f48b56bbe1d12b25cbf4b90200be0d1c207bf76eea0af332e55a8323b85d29ff0376ca488d2914404a7557a283e531ce21e079e3cb26350
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index ecbee25185f4..c3a9bc82214a 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 01ec69f7d7db..81f651fa0c50 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1,5 +1,7 @@
 AUX Net-SSLeay-1.88-fix-libdir.patch 946 BLAKE2B 8f3522ccc62c5b09942d61dbe73fb87bec5c5fb15e460b5a00b4a0108f6c50299304acc7e37a268a46d75af86cbdfdfab80cdf2ebecf5836f676503869727cb5 SHA512 76ff12ce42631393dcf95008b3a4a5064f2f0cc54dd44b1002fe02fccdc4b8a47871f77b28ce43346f140058c23bd9d6be08261d6a4cecffc45ced5416aa4cb3
 AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455bb37b4cfa81879a880b35a315a90df9012b1fcbc545205b206777e6929454d31f881f2581d9dbd9f6b22cd849846bc0b9f3c6484b SHA512 7fd3078e55b4c829224289e7e1cc0628e2fb162dccf151b559022d5367ac06593a460779b28d9cae015dba6614d9e273399fa6b81144aefaf47d710f63b6c046
 DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891
-EBUILD Net-SSLeay-1.900.0.ebuild 1409 BLAKE2B c52a31772b17181ad03006523965289feb31cb7ecb676702de9504e28b971bb149b3e02c2a7a3e669516561fd91adb8bb424299998b30cf95e2f7c4be5cc04fe SHA512 e917a2bab1dfd8fc4e861e3442cb15dc210356a0d18b98625532b6b6972355f36593a977385a6ec57fcd1e07fce6d0290276ad895e241d4754af3265a3912ab5
+DIST Net-SSLeay-1.92.tar.gz 555930 BLAKE2B 04d97860817b013a9680e0ef29b0004ddb98da2db859761a45612c4d25b6edd16bf92645293d1108d83352bce18665721c6df05455426b32a95a42b464119a3d SHA512 e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173
+EBUILD Net-SSLeay-1.900.0.ebuild 1463 BLAKE2B eaa31e733dc8d19370f77d608e84fa9cfc7e2746793e01ec48c1aadb75a5c1c8e2b6c2f80be118b1b877c2c555196d3ad584251a29deac729299a9ff1c0f8687 SHA512 c3a0c8db551f138be800afc8396f263d3601f13a5737d0595cc9df869cd06da68c18b7c8b32dd274b20d654157ddbe3c0abd4675e5ec0c962327232d9df5800e
+EBUILD Net-SSLeay-1.920.0.ebuild 1471 BLAKE2B 50f66356135c513c6c9f612c3f6e0bae292a1c9770b59e599bf0d5483ce21b703a1954456e0543a05ce609f6be0d1509ade9f358035bf32bcbdb7d16797f1edb SHA512 6a86c3319487d9738f2cfca0a138a309e0e655dbc03e8d72981b5a17a2f18f58784c3538dca451cc7a884130996b8476c28f10b8975c4b19e132c1ea546cd212
 MISC metadata.xml 459 BLAKE2B c3621c53dd1e2593f2855530c57671797678132180f2b3e7983f1ee62eebc0da4655ca78def94ceb2543e0f34cad1261afffad60ee86f879094be1c43d7b6e55 SHA512 2dcfa628355849c903774c7bf983e3b8b98810bce37effc7eece1c3b92c54941641f0da5024fe42220b824adb4141bf1555894adbc80d03f9396b739e6c360ba
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
index 21b2d12a448e..6143b9e2f5b4 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
@@ -51,6 +51,7 @@ src_configure() {
 		export NETWORK_TESTS=no
 	fi
 	export LIBDIR=$(get_libdir)
+	use prefix && export OPENSSL_PREFIX="${EPREFIX}/usr"
 	perl-module_src_configure
 }
 
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
new file mode 100644
index 000000000000..b0492efaee97
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=CHRISN
+DIST_VERSION=1.92
+DIST_EXAMPLES=("examples/*")
+inherit perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="Artistic-2"
+SLOT="0"
+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="minimal examples"
+
+RDEPEND="
+	dev-libs/openssl:=
+	virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	virtual/perl-File-Spec
+	test? (
+		!minimal? (
+			dev-perl/Test-Exception
+			dev-perl/Test-Warn
+			dev-perl/Test-NoWarnings
+		)
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.88-fix-network-tests.patch"
+)
+
+PERL_RM_FILES=(
+	# Hateful author tests
+	't/local/01_pod.t'
+	't/local/02_pod_coverage.t'
+	't/local/kwalitee.t'
+)
+
+src_configure() {
+	if use test && has network ${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}; then
+		export NETWORK_TESTS=yes
+	else
+		use test && einfo "Network tests will be skipped without DIST_TEST_OVERRIDE=~network"
+		export NETWORK_TESTS=no
+	fi
+	export LIBDIR=$(get_libdir)
+	use prefix && export OPENSSL_PREFIX="${EPREFIX}/usr"
+	perl-module_src_configure
+}
+
+src_compile() {
+	mymake=(
+		OPTIMIZE="${CFLAGS}"
+		OPENSSL_PREFIX="${EPREFIX}"/usr
+	)
+	perl-module_src_compile
+}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 3c204810aa30..3a870730327f 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index e79293bc01a6..0f14a7c6b90b 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,6 +1,4 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
-DIST smarty-4.0.4.tar.gz 359012 BLAKE2B 84f34ff1e00f81de8961e252a14a7d813180b789820ace363c7a64f05d57c874d1f77068aed43d1d4cfc9aed0b348625e85e75a30ae3f1dab7a15c92f6ed9ab5 SHA512 1eef2585b415905e4a67328ab56ae473e5121b8f3a50f0d3aa3c60ab331eda9137744c92dcf2fcc674a6ec68eb714aa60468d1b56a436a94778be242fbd0b377
 DIST smarty-4.1.1.tar.gz 235624 BLAKE2B c624812ebebb1a8d09a5d80e2826b4e0e90310f6f53f903c9e962542b41b5c150ede1031f66c290e4dc2bb336eb532fd3305a3d97c7e43768d45f57df6815448 SHA512 93e601959651a00bdf9be9c9ddcfea6b189f70270ec8ab4764d2759c0c4de07c74a79cf4e42ee97d16c246130d6f1da5c8601fa60e5194906fe3b416934d1ef5
-EBUILD smarty-4.0.4.ebuild 1344 BLAKE2B 80344cc79df6ab8d1afcf0dedf442cebbb23bd3d14e2e3aaaff58de681fd1d444e1887448e1c72f65e2a22bb101ccfc3f56ec1a1b499c79d19e5534bef1d3a32 SHA512 47bfdd8491f4eb1ac7c46670c91539a20a880af791eefab712c9230ba9b27b8ac8193098967b90441bd497fbf41242b963fb98b22c756477e764f4dfb26e105a
-EBUILD smarty-4.1.1.ebuild 1349 BLAKE2B 21a788ae2556328e15ff8153fb71e385ad2eca62126d87abd9f121f416a6d46646f1c211ffa876c4fa475265db8653033bb606ca3f786359125e4660f601e997 SHA512 7e1db2a808be9b30b9e7af27ce643b02406e3ce59eee3d0385b06b1b5127a2284e48c56909f4723093039d268f8a7027567f0779068b0d18d873f3211f24bff3
+EBUILD smarty-4.1.1.ebuild 1344 BLAKE2B 80344cc79df6ab8d1afcf0dedf442cebbb23bd3d14e2e3aaaff58de681fd1d444e1887448e1c72f65e2a22bb101ccfc3f56ec1a1b499c79d19e5534bef1d3a32 SHA512 47bfdd8491f4eb1ac7c46670c91539a20a880af791eefab712c9230ba9b27b8ac8193098967b90441bd497fbf41242b963fb98b22c756477e764f4dfb26e105a
 MISC metadata.xml 742 BLAKE2B 2e882a2cd16715923bd3b93e032b2680fe07853bc0a1a03a62690f57a0254373611e5dd323dec285ac3d051dfdfd167f114c68ad4ca2caa916a76262d71e4725 SHA512 3589fb45084564c669e97fdebab3964ced2500dea7a53dd452961e71a3a2d5070cb71467dc3489a4a2474858ebf8f4d05d8b01728382e08215752b535b6a3681
diff --git a/dev-php/smarty/smarty-4.0.4.ebuild b/dev-php/smarty/smarty-4.0.4.ebuild
deleted file mode 100644
index ec9685432afe..000000000000
--- a/dev-php/smarty/smarty-4.0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DOC_PV="3.1.14"
-
-DESCRIPTION="A template engine for PHP"
-HOMEPAGE="https://www.smarty.net/"
-SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-arch/unzip )"
-
-# PHP unicode support is detected at runtime, and the cached templates
-# that smarty generates depend on it. If, later on, PHP is reinstalled
-# without unicode support, all of the previously-generated cached
-# templates will begin to throw 500 errrors for missing mb_foo
-# functions. See bug #532618.
-RDEPEND="dev-lang/php:*[unicode]"
-
-src_install() {
-	insinto "/usr/share/php/${PN}"
-	doins -r libs/*
-
-	local DOCS=( CHANGELOG.md README.md SECURITY.md )
-	local HTML_DOCS
-	use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "${PN} has been installed in /usr/share/php/${PN}/."
-	elog
-	elog 'To use it in your scripts, include the Smarty.class.php file'
-	elog "from the \"${PN}\" directory; for example,"
-	elog
-	elog "  require('${PN}/Smarty.class.php');"
-	elog
-	elog 'After that, the Smarty class will be available to you.'
-}
diff --git a/dev-php/smarty/smarty-4.1.1.ebuild b/dev-php/smarty/smarty-4.1.1.ebuild
index b8594fc0e25c..ec9685432afe 100644
--- a/dev-php/smarty/smarty-4.1.1.ebuild
+++ b/dev-php/smarty/smarty-4.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="doc"
 
 BDEPEND="doc? ( app-arch/unzip )"
diff --git a/dev-python/GitPython/GitPython-3.1.27.ebuild b/dev-python/GitPython/GitPython-3.1.27.ebuild
index c9c4086745eb..8417e2e45d1d 100644
--- a/dev-python/GitPython/GitPython-3.1.27.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.27.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 223ccc7317b3..47c7a6d96289 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,5 +2,5 @@ DIST GitPython-3.1.27.gitbundle 9652508 BLAKE2B f81b6d94b302b1d4aec85096bb294df1
 DIST GitPython-3.1.27.tar.gz 192188 BLAKE2B 3cab995a17d8eca8d4301367b1ee7a2c3c0a46a217f6e6d89e1bb4e62b733d21cd6d9210faac49c3c905343067e819f8c37ac9cc69d9fc33ce948b63fd53714e SHA512 6f855bcfc380c1a83a97807ca8ddcc4dfe8258f3aba0790142ef41f28befff44847aec925e523eaac47fd6c0078eb6296f52bb4b7d2be7d59ad95bbeb930fe28
 DIST gitdb-4.0.9.gitbundle 1461448 BLAKE2B dad9efdc4e9711361c851f4745df2e3fa3b2360ab58cffea971a854429cf3e11862a267efb5afa3d9ff7668dc6d1bb7f11aa033172238bea61a6252d0488b746 SHA512 eb71e6dd380e67a96a9dcd50a3a3c82aab8c7f85b1ca4258a92202a5e4cb5a1535363599c94ab26884b4cd755ce30694c1b193a95e5cd5199b5d4e2cf8e72818
 DIST smmap-5.0.0.gitbundle 338621 BLAKE2B 58c151245a1353d482e06313beb1cfbe7aa23d30733b284b1745b562da1da4e6f9b8acd7d4b967987e8c29a0cfbe6d3b27790f4683f6cbd86fc22a1416bc1c24 SHA512 94b827cdcfaf31b726b48b7b0a9036e852683046b07430b79e59a1339079ca078129d5eb02d9009979ce86892748b700d6cd281e401ddf6b0048252e2181fe1f
-EBUILD GitPython-3.1.27.ebuild 2194 BLAKE2B b63e055a653379846f94f4536c532116ea45353574777397c8e42d1f871189777a6ddcab2b58a2c614d78b3ef3d2be104dd5df005db434822c224f40652fbb31 SHA512 923da9f3e5bcf94123ed3988624f15f3536c07d02030027efed18148338aa40f2e16641b74d7c58a00d0f33fa7e8d900d9bf037737da8c580d1595a4ea6fcd08
+EBUILD GitPython-3.1.27.ebuild 2200 BLAKE2B 56e801f92c86d7f52a85ac1a94717437cf33e344f92219c3ac81ce9684772540904d53e28a28a01fa1e2c6a02d0a78b8ee1617d76e2a8967cbb98ce628b8976d SHA512 4b489b3dad8c5c6b60a20f400bacea66a21f4a9e7f98856a005cb470e57f7ec923b659b5ed9af6762fc17545a144fecb50f714dbd09b69f978f5f188b4801f34
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index fc6ef16579f4..8bc1ba0c6a52 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 7b64bede3270..1c6d2e80b0c7 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -1,8 +1,13 @@
 DIST PyPDF2-1.27.12.gh.tar.gz 3430850 BLAKE2B a0cb344f616d628b7c39dc360234057ce68595ffa554a8588990ef0a1239ade2db6415caefb84bc058d89067ed04ba66ba149f6f106bbf9a55a13f523dd826fc SHA512 ee00c975881b7e6716656b1cecb83c3e1f7bffa4ed9fb0d8c8be45c7d951b2b79f0be4f9098569bad783703fbc00f0797e73b970b02adad1ed3a4cf3b6ab7b73
 DIST PyPDF2-1.28.1.gh.tar.gz 4260569 BLAKE2B 69b925a463c262ab207dd768160ea9083b14eed6a25a234d09e472ce812039aeb899674a0216b20ead3a4814cc3ec83ee320c99b84d109d8a320b925b7654ffa SHA512 22dec520e256420b618d5611f44f52752ad3c7ccee325991f4817e88ba69d01bf705708877a0df450297c3231725f72e03c4d8b33ced29fd7445c0ac2701dc2b
 DIST PyPDF2-1.28.2.gh.tar.gz 4260541 BLAKE2B 16cf7358dbd201e54853022b341fa7501b691d258380ac02464ae410d045a454785e03507b48f05b2ed92dc7a437cdc7703ba2417ca0c6d3c43846d3daaa00fa SHA512 3f69e983fcd83485cb76a957ee5ae436468bb9d04db821271cbb1f37c1f796ea974dd8dd425e0b4f9867e19fe14861355f9f5f8349a52ef8f7f829832f0694ca
+DIST PyPDF2-1.28.3.gh.tar.gz 4261567 BLAKE2B 8f76d23d1c30c42e78585b6ced44726c9c6a701f52b08a7130e3923e63a058f69525442d06e85db4de4345b6c4a14ce97d5e7fbec4431b01d5ca86ba759482c4 SHA512 0a7b54759b0ce6a5383364ea1014e8c3bf80c180ab533b905dc676df8d0307ad6ae46007033b8c23f2c7986d45086d98485631f867d562e70cc09c52862142d9
+DIST PyPDF2-1.28.4.gh.tar.gz 4397029 BLAKE2B 2db9aacc55d06e961708ee455562e28f59bbc3fd973547feb1e596df52872fa2fb7a424e2159e7c0c2cacd3c6bdff987f72fec7db41422a0aae4aa33a60f1cb6 SHA512 a93406f9a0e177f0ad1d92430f212abbc7b7486b86f37b281e68595de125e0fcdfbf73fc7d66490698d8355875659633c3785e8c2725e52ef9d615441b5aa517
+DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 DIST PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz 5406287 BLAKE2B 8ddad01235bdb55cee596d9114e5b6c3b153919bcff5203d229311243516f3595cb36dcca87cae27514a8231d72daa94782115795bff8c1c3d046236811c21e0 SHA512 6c38d5ee0e1c5c0ffdd78f7c2fe56dbf357a1e82d2af642a10264a6102ae8fb95cba6d2f76b26df6a33a5d84cfd5111885d39c1747cf95a5ce545f26bdb37263
 EBUILD PyPDF2-1.27.12.ebuild 1049 BLAKE2B c35ea4aa3e945b72eee65291cb07c0c7160f3bc0581dd35930e849cd6efc0cc6545c2b8079aa7b1494fff3d6e45fd23f6afe89cbc3052ff957a723f4be335dbc SHA512 f2c4d841ed062264bd6ac58632bc8ddfba269c06325f262bfd63323a9bdc5325e2ec3dd379f9b1fa04f7695557ec392a1014851466abc769a247ff5e3256791a
 EBUILD PyPDF2-1.28.1.ebuild 1051 BLAKE2B f0528e2d856c882c9d1ddbe248604165f859d6a22c5d476704f66b6df9fd6eb9fe7b6a01b5baa4bf20d3244cfd438f5986423a51f706178e81465463008f420c SHA512 3c140505453156fd1e6b33073dbcc4008c8185baed92e22a6014c7b9400b4ee18caa91beeadd060fd9fa7db7c8c80e1666a83926505a478e94716e15a4753cc4
 EBUILD PyPDF2-1.28.2.ebuild 1051 BLAKE2B f0528e2d856c882c9d1ddbe248604165f859d6a22c5d476704f66b6df9fd6eb9fe7b6a01b5baa4bf20d3244cfd438f5986423a51f706178e81465463008f420c SHA512 3c140505453156fd1e6b33073dbcc4008c8185baed92e22a6014c7b9400b4ee18caa91beeadd060fd9fa7db7c8c80e1666a83926505a478e94716e15a4753cc4
+EBUILD PyPDF2-1.28.3.ebuild 1054 BLAKE2B 73fe77a89753485cfcfb0a8b800af8e8574b91272e6264d377afc0974f297fab3f35b050628d5701f25a5bc666f219d8faf6e8f016f03166c3dd91f2d1cb3e8a SHA512 dc77f19c094eb1078c8ee68d83137de97d0b0f6cf0e9c3d60c381f2c2b035d10b79eaa909984694a324bfb4feae9c03c983db32794efb6dec42ce7096b8dbb1a
+EBUILD PyPDF2-1.28.4.ebuild 1054 BLAKE2B 73fe77a89753485cfcfb0a8b800af8e8574b91272e6264d377afc0974f297fab3f35b050628d5701f25a5bc666f219d8faf6e8f016f03166c3dd91f2d1cb3e8a SHA512 dc77f19c094eb1078c8ee68d83137de97d0b0f6cf0e9c3d60c381f2c2b035d10b79eaa909984694a324bfb4feae9c03c983db32794efb6dec42ce7096b8dbb1a
 MISC metadata.xml 375 BLAKE2B 2493f7d2ef79342af0ef890e3683fa55255d869c684bba7224ab3afab61e77a239e323c8e63138ce4fea23c32348458cd27a0c58a3b6640854ec27b26cdb40cb SHA512 5e0d6e18e0005e4f323468b8fbfa26dc7ba33d26a94d5fda11c40f62ece84578c1f08843c9f0cf96f0d918d22063f494d486a6d692cecb5b407efaaf92aa9b8b
diff --git a/dev-python/PyPDF2/PyPDF2-1.28.3.ebuild b/dev-python/PyPDF2/PyPDF2-1.28.3.ebuild
new file mode 100644
index 000000000000..8835d6159d71
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.28.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_src_install
+}
diff --git a/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild b/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild
new file mode 100644
index 000000000000..8835d6159d71
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-1.28.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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
+
+SAMPLE_COMMIT=41b5cd4f774f8fbd8ac42d93b9962f0376352a15
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? (
+		https://github.com/py-pdf/sample-files/archive/${SAMPLE_COMMIT}.tar.gz
+			-> ${PN}-sample-files-${SAMPLE_COMMIT}.gh.tar.gz
+	)
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use test; then
+		mv "sample-files-${SAMPLE_COMMIT}"/* "${P}"/sample-files/ || die
+	fi
+}
+
+src_install() {
+	if use examples; then
+		docinto examples
+		dodoc -r Sample_Code/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_src_install
+}
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 4f044898e42f..dfa76baaf0a1 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,12 +1,4 @@
 AUX aesara-2.6.5-compiledir-tid.patch 1707 BLAKE2B 77f8fa3618f930dddad8e864dee3e73fc0b965018d508be5877d5bcae4430024c4e4f90e905ac912da22a4d4934d6fc71acf4ebd49b7e8efb12c90dfaa072ed2 SHA512 9b6bbd8bc56f61c89dfd85cb18251ff8d73d717d91178efa9309e6b897dbda28937dea84f1d7d1a917c285219d51c0adcee1233112f2dcdb9f8c7b714a6c6c12
-DIST aesara-rel-2.5.3.tar.gz 8191431 BLAKE2B 698bc3b6f7e84288be3318796989d13d7de92f72c66abfa83b14c08f6310f974f7381d729e712c2bd5e76f398d74a3c5dc03d7515a22254261312e586e3fd461 SHA512 5c1ad9d6ad1fb58be1477713d863f2b1371544ea8293d8e9e1a690860a0483b83c9558827856a2546498bab26360f141a5ee97d4c7f3f2aad773e84f9766a59b
-DIST aesara-rel-2.6.3.tar.gz 7845423 BLAKE2B 66b84a10337efc01e37d82793da56b61b1825829d982e24e0f93ebb67cd3c22e5bb2e37c71ab8bd9648b039efaf4c667dc53df2a9613ba9370c2138eb74ca400 SHA512 e0a804c0c3c1cd24753a237c386df9600d2b01cf4991aeca3d794df4068f584a9ab5341b72fa5695ccb9d06f1e4954f450436e3a7ebe4c2efc1354a5c2e5979d
-DIST aesara-rel-2.6.4.tar.gz 7845688 BLAKE2B bfd0222c2a8d8e22abb56b785b73a121032832417562046445b8e0b2f6461326ba760d1839fd1acac2215a1547ed48d613998cb4915a07521f4d976a32a811b9 SHA512 a9f47bb4718fab974a35d7eab1b2a5ab8ea7d911dd9d92a791763a659f96b52b9832532e5e13aad10ac8e2f0927d2cc3e97c09e84046fee125925b3ac2898893
-DIST aesara-rel-2.6.5.tar.gz 7849097 BLAKE2B 85bc1579cd22ccc35f727ede3b337d1bdb613924f7568ac403ca1d2da42e442006afdd80e8eaeed14e0c2bd7a550127b9474b9424ffe800426203e1e31e65256 SHA512 cb5ff0f8c5a475ab733000df9d96ea3410c5760f263bb8a8f1de093f47fca3d7428d37253ae114d61d925777e98ab0c8f698f7864615ea32fe20efe6fc5042a4
 DIST aesara-rel-2.6.6.tar.gz 7847814 BLAKE2B e4edd575d49f548fab0ef971dbab88beeb43859ec7b80612145ed490b31d6e7dc6b6818653396938124a22fa2f54f8d151c5039cc2e9c9070c88cce9cb1c5596 SHA512 028a208fc7e5921ce1df34dd23a42cf90d419e06f0192d9a006ebfb8c5f36e35e347214e53f53e688a1144063c7f4853a8cd44eef6fc205225147116839008de
-EBUILD aesara-2.5.3.ebuild 2220 BLAKE2B c63f083ffcfec83fe5e4be3376f8c802e14ec75971273bf08dfc9b557d4ae3e880ad9061e060fbd4d50c798aff10e8bc70035fa4897113e6f716285310c7dadd SHA512 316b85a504558d62b630be739ef8571848d11cd676ecff988bbd84cd18f2577c67b47d8fc2f6c25d4095a095d9323580e6daa86d40bf6091727a017708d02679
-EBUILD aesara-2.6.3.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b
-EBUILD aesara-2.6.4.ebuild 2265 BLAKE2B 2e92bf9c2579393d0a6bea1fae4b2a738d14d8bbf54db36b1b419dbd9fdfa48ac6066eaee5b8d6e514a7d1c68473648871c0fbacf50bdc2f1459e66ba80d7b6d SHA512 5d030018f7e1aec0cfed2d3f0427a562b84e2eee314a2fa26e48f119c0fd240bf3ca761003d546e460d8d3add904ccec1aa9bc7bf61bc32d1d98b152c259219b
-EBUILD aesara-2.6.5.ebuild 2598 BLAKE2B ec2c9a5359c530f8a4a8a274c0439d65cb10c8d73bb55e364296a6b6268bee5077846a5ccbec83ae3bb65e9842c29a81882ce8ea8004961613666768e6fb3c9c SHA512 6405bb798d228e1b6d41a6739d8f0a596337596225ea0094fb54f0383bd9a4cd130d7d2e5041b80a77ccf337cc4912bb795faefad3f447ac892113112ed6ab16
 EBUILD aesara-2.6.6.ebuild 2596 BLAKE2B 8559deaccfe85f53d5889c98a2eac4d43c94862e1c24e13a3470057d6c4737f906e7b0351bc0cc2d8c61bbd1210d655dcf2c9c51cf2c8eb4a06f6aa2ca4cbdfc SHA512 37f6ea5bf1920441f3780dcb85129f73c3954413ca87929d6cda3c5d0bd928748f3143649ddee08dda109fe418c2ff0b6cf8ef55bd69f2569a44000770624225
 MISC metadata.xml 506 BLAKE2B be65b6be62282fa47152985d79892fd04105a47e00a427ee8341d27aeff21b144bee7e7d0f16b2f4b617c941bdf5ebd9de37a42c39d117cdfd579c3035d35a74 SHA512 a207ec3db85a8e6f03feabd14da588f0b9ca9a88ab2495ade0f40b516b3bbd20fe78b14698d28da7ceed238737a9f4d63f587156ef609e846b485132d598c6bb
diff --git a/dev-python/aesara/aesara-2.5.3.ebuild b/dev-python/aesara/aesara-2.5.3.ebuild
deleted file mode 100644
index 22962f0d5f3e..000000000000
--- a/dev-python/aesara/aesara-2.5.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2021-2022 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 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="https://github.com/aesara-devs/aesara"
-SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.3.ebuild b/dev-python/aesara/aesara-2.6.3.ebuild
deleted file mode 100644
index 5bcb330fb0af..000000000000
--- a/dev-python/aesara/aesara-2.6.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2022 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 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.4.ebuild b/dev-python/aesara/aesara-2.6.4.ebuild
deleted file mode 100644
index 5bcb330fb0af..000000000000
--- a/dev-python/aesara/aesara-2.6.4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2021-2022 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 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/aesara/aesara-2.6.5.ebuild b/dev-python/aesara/aesara-2.6.5.ebuild
deleted file mode 100644
index 5010ebf96928..000000000000
--- a/dev-python/aesara/aesara-2.6.5.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2021-2022 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 multiprocessing optfeature
-
-MY_P=aesara-rel-${PV}
-DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
-HOMEPAGE="
-	https://github.com/aesara-devs/aesara/
-	https://pypi.org/project/aesara/
-"
-SRC_URI="
-	https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz
-		-> ${MY_P}.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-python/cons[${PYTHON_USEDEP}]
-	dev-python/etuples[${PYTHON_USEDEP}]
-	dev-python/logical-unification[${PYTHON_USEDEP}]
-	dev-python/minikanren[${PYTHON_USEDEP}]
-	dev-python/filelock[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/typing-extensions[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/aesara-2.6.5-compiledir-tid.patch
-)
-
-distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# speed tests are unreliable
-		tests/scan/test_basic.py::test_speed
-		tests/scan/test_basic.py::test_speed_rnn
-		tests/scan/test_basic.py::test_speed_batchrnn
-		tests/link/test_vm.py::test_speed
-		tests/link/test_vm.py::test_speed_lazy
-		tests/tensor/test_gc.py::test_merge_opt_runtime
-
-		# rounding problem?
-		# https://github.com/aesara-devs/aesara/issues/477
-		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
-		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
-	)
-	local EPYTEST_IGNORE=(
-		# we do not package numba
-		tests/link/test_numba.py
-		tests/link/test_numba_performance.py
-	)
-
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	local -x AESARA_FLAGS="cxx=${CXX}"
-	AESARA_FLAGS+=",config.gcc__cxxflags=\"${CXXFLAGS}\""
-	AESARA_FLAGS+=',compiledir_format="compiledir_%(thread_id)s"'
-
-	epytest -p xdist.plugin -n "$(makeopts_jobs)"
-	# clean up the compiledir, as it can grow pretty large
-	rm -r "${HOME}"/.aesara || die
-}
-
-python_compile() {
-	esetup.py build_py
-	distutils-r1_python_compile
-	rm "${BUILD_DIR}/install$(python_get_sitedir)/bin/__init__.py" || die
-}
-
-pkg_postinst() {
-	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
-	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
-}
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 9252720bd901..afad3394d9b6 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,6 +1,4 @@
 AUX apsw-3.6.20.1-fix_tests.patch 340 BLAKE2B c70f404afaed26c92f60690820812fb0ccbe355f43384b4e0a931851c27348b04335aa4c25baf5b2662c85403ad2eb075ce049a724c297a46ea2f796845aebd8 SHA512 386cae12d949a6f4dd55dc7e3e1bc176c43c5001f10acc75261c92fbe14bb09c0e054dfa4087d285496dec4cbd4a9add5733742dbfa82c6e10ee1c8d0f43fb0a
-DIST apsw-3.35.4_p1.zip 685034 BLAKE2B 5845e5fcb286c587367955c33fbee9aa4b0687af666f1d50f35f5dec8e756a0fbcf0fdbd120dd3c7a78df1f05d8eae5a973a8a71fc8a6f4271fff7d83b399013 SHA512 f420560e5821bd6305705ee6c14174f1770f4811edcfe152cb1f2ceae4295f13c82552386a7ef42c5ce88165e88bd2080b4dc2809484598522914d99f2469135
 DIST apsw-3.38.1-r1.gh.tar.gz 338985 BLAKE2B aa0ef335bd3abc708b41a92959f98b4fd3961168feacb9ca6d382e0279c46d4227a8e09373721ae1361fcc38181376664130b3623b2f36e1596467b99959ecb8 SHA512 4d161641d7bf7f933507e7d7e71d437d9db95f7327e29cf34848d9b741e2711dafbefbf19cb34d78d83b4e69115acad855f924fdf80de1cea4c9d61fe0f2b670
-EBUILD apsw-3.35.4_p1.ebuild 1051 BLAKE2B 668a4051c5238535b4f267c6c1a6fed22db382ca1d8884f16216b0e98ffb6dc5fe34dca93082519e9941372acff79f2b05f024f4bd3c95cf6c7d06a8cdf3096e SHA512 ac359e50a625bc456e617808841a531b4760a8c19121dbd16b604cffd6bfcca0212a45cbb247db804a1712da1c74b1c20488043880f0c9417cc45bb13ea4c398
 EBUILD apsw-3.38.1_p1.ebuild 1075 BLAKE2B ffb7fe5a7aa01bbf69ece10be3a391e76b0180154ed5270e7eb5750f243ebdd86daaeb9d04619cc18fd9472b941e1b8c9d1955c0be6df317f7fb4d3e28e914ee SHA512 12178823320582875c6bed5d9f7066638259283f129f0f1e76b51f29e4037d49c6af85dc0fd113f671539902052cfd6f83149c16a1d78714be10d576ebb744f2
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
diff --git a/dev-python/apsw/apsw-3.35.4_p1.ebuild b/dev-python/apsw/apsw-3.35.4_p1.ebuild
deleted file mode 100644
index a98b052e48b8..000000000000
--- a/dev-python/apsw/apsw-3.35.4_p1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PV=${PV/_p/-r}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="https://github.com/rogerbinns/apsw/"
-SRC_URI="https://github.com/rogerbinns/apsw/releases/download/${MY_PV}/${MY_P}.zip -> ${P}.zip"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND=">=dev-db/sqlite-${PV%_p*}"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip"
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.20.1-fix_tests.patch" )
-
-python_prepare_all() {
-	sed -e 's/"gcc/os.environ.get("CC", "gcc") + "/' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile --enable=load_extension
-}
-
-python_test() {
-	esetup.py build_test_extension
-	"${EPYTHON}" tests.py -v || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/astor/Manifest b/dev-python/astor/Manifest
index 317803c85b2b..57268da2d076 100644
--- a/dev-python/astor/Manifest
+++ b/dev-python/astor/Manifest
@@ -1,4 +1,3 @@
 DIST astor-0.8.1.tar.gz 35090 BLAKE2B 11e5e77d4f8a8617d0330d3091a1571744bb5773df926f41b10208e1c5beb7e82ad8961a460dd326e9130591dade495c77a36456618a97a5c22e41237805a4ce SHA512 cfc69a21fcbc9842bc26fbe8372e5c700d9957cc0c3c62de415155d2036163951f0ece88557829afd7c4dabba8a8e238a2335994ddfc020cb3db913eed5b6f28
 EBUILD astor-0.8.1-r1.ebuild 528 BLAKE2B 85ecb62f4eeab6bfcfa9c0bf79e344b29912d1e7b0e3c60216fbc9f3a1598faae6f3a18959ef00b9eeeb6713fa384e52711df36199f103cc8f8afa4f55169935 SHA512 7fe878fe7c2d5b4220926112fb963d0cb5ad3b2438ece44aae7fa16a251b734d8bf194d09981ba674367870b420b5129d79c9c4d0e3969d6a934ff106de05f83
-EBUILD astor-0.8.1.ebuild 475 BLAKE2B 088174a87c013b94e8a81cc90b1450818d2bca33b9925a1687ee8c85f437c5ba8e8c48b2423690ea5c516107c3373a212d310e0afec87afb414e5d298dcaa564 SHA512 364ca6f843157533460a33bf07efb78712a094edd89dafa34239b9593be1e8b8ccf18b65d0ac0ec161b120ca06869a62fd46bd16f25fe593a04b367869920d3c
 MISC metadata.xml 391 BLAKE2B 484d2cd9e52afbc57c49df869d111c214de2a3f1914700a168554f5946b89522d48a613c37a3f2fa704fc8de585047304340148ec34c7a7d8e8097d7499eb507 SHA512 413a0cd6331515c0462f22bcdf7fa1c2693e282b84bc34efcb9ada65f5ca65c6808bd9d678b6c9d1e24c5230dc1c5f3417cda38ee79103a372997a30d68dc572
diff --git a/dev-python/astor/astor-0.8.1.ebuild b/dev-python/astor/astor-0.8.1.ebuild
deleted file mode 100644
index 7d8443b2ac12..000000000000
--- a/dev-python/astor/astor-0.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Read/rewrite/write Python ASTs"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="https://pypi.org/project/astor/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	tests/test_rtrip.py
-)
diff --git a/dev-python/autopage/Manifest b/dev-python/autopage/Manifest
index f89602548d02..42a872740b7a 100644
--- a/dev-python/autopage/Manifest
+++ b/dev-python/autopage/Manifest
@@ -1,3 +1,5 @@
 DIST autopage-0.5.0.gh.tar.gz 21403 BLAKE2B 1c20123bd7ac9dcfc53d5531ea5cec5dcb2d4b8f4c433ab958b96b769540084989ee841f963d24d1b01c3c4deed9933ab213e3838a898a8fc3261096a272d83d SHA512 b40bf0c432a8ecf82f56cf9679191bf13e5fbf478f1236d197df05e29ac27a1d33bffbf3f66fedbf93548e7314ee1a8f1687fa7c696b35f944f8f5dfd2b2dd19
+DIST autopage-0.5.1.gh.tar.gz 21406 BLAKE2B 45d67443fa882d6f824ea71a8f9d20eb1ae789a271d84dc566a2535de631b5ce644aa28f51c5be1db818194e39628b6526ac087cd6eccc425132f15fafda10e9 SHA512 3d6e10c222566fd5f5e07e3247ebe19ce7ffe3b4baf9948741ee9a8aaafbefb0fcfaf4b26f0a4a6392615e73c7e8539c9bcbff1112a291c193c0b653f33e8657
 EBUILD autopage-0.5.0.ebuild 700 BLAKE2B a220c1d89c08c2ae83f115c2c731c9cfcb5b02efee3686facd6d5d36c3f1876d1517ccd96991a66ee4fbcd88a1933977b34ae77e93cb48faa9036bb226a77f75 SHA512 6df3adbfa484a8236e74ccdfbbe57b46c81ce72e916a1db021246bffcd5edbdabf14bd027341e7f41a3e2720e7513321ee3044c51e5e72e59f4fc8967ec5720f
+EBUILD autopage-0.5.1.ebuild 711 BLAKE2B 4f5572bdfadac5d0f06db4eaaf41e45eadacc60f9c15e3f3a59d609d35e2be5a875d5c5316bc83a0122df662f8e0158d6f8fab8b8511600326ba37af15899442 SHA512 0bf45a56fd6e22631aab58e433343621b0a1e15b14c03fbeaf7726b53d9bd2e3c23408d15147226d939d76600c43d34103a3c4710bc89c2c28ae22c1cd6d3b88
 MISC metadata.xml 390 BLAKE2B 6be679e40e58985a6ad622fcb85f130bcc6b8039accd14243e6dcba458a0af721eaf9e7928bfe0d29f62477df6e437143865b68a61820b88dfd61a6e760992ea SHA512 3d76be1ae51467569281305138475733f9ce9b89b7d2a41f496c69bebd86e205019d1e75d1de22267d36aa2822ebe8bf94f5722d46ec27a8a79f349e38dad3b4
diff --git a/dev-python/autopage/autopage-0.5.1.ebuild b/dev-python/autopage/autopage-0.5.1.ebuild
new file mode 100644
index 000000000000..89a3f66f2dd5
--- /dev/null
+++ b/dev-python/autopage/autopage-0.5.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2021-2022 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="A library to provide automatic paging for console output"
+HOMEPAGE="
+	https://github.com/zaneb/autopage/
+	https://pypi.org/project/autopage/
+"
+SRC_URI="
+	https://github.com/zaneb/autopage/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	unset LESS PAGER
+	eunittest
+}
diff --git a/dev-python/backoff/Manifest b/dev-python/backoff/Manifest
index e82a468edb95..da06b12198e4 100644
--- a/dev-python/backoff/Manifest
+++ b/dev-python/backoff/Manifest
@@ -1,9 +1,3 @@
-DIST backoff-1.11.0.gh.tar.gz 17566 BLAKE2B 4afed5284eb3cbedf54e06fcd89861701613357c672ebabe2611a4bc28c3a6e4539e206cee24bb6a646f7c16c033f16ef56be3b21867aad760b71410749383b7 SHA512 0f5e176bf9d093a72068cf6e55ada8da3e8ec67b85b4fba2d697117dcb3c563a429ff53c5fe17b4a20a8b5ee0420930b789478bd89de5949b628158263413a60
-DIST backoff-1.11.1.gh.tar.gz 17581 BLAKE2B ca940270859ad78cd29d33cfd3c17605f5b42c2c745b7e7a41d53b2d6ef4bee78dd9e8f15c80387da31679aac6d30404c0988013a890ff34bd55e91716c0eff8 SHA512 7ba0e579d2a4a4bb5046ddc0d1f4b5b58ae2969a10a10a3c657e7dd9b8fd0cd6bc56fec18c28c8fb49101521b3840fe31c65e103977ea5f52f3671a07def97d4
-DIST backoff-2.0.0.gh.tar.gz 19327 BLAKE2B a53d97c8f27b05a2cf0fac9d7ffd5c964f7f58c8c1d6957bb495502c4dd2742fb3dc7c9a6e31f9aabc8982d548926a93e23aa1a60bada4cb3ac9f0968647face SHA512 34e37b3ff45e92311e7d040b05783e094cafc5d1d32c7e2cb8ef89cb9c0ca1a7ca2b16ba596c3b1c4a308d1780d790c9b077411eb8d48d6c5c86f2d6ea82f475
 DIST backoff-2.0.1.gh.tar.gz 19356 BLAKE2B 0d4867372763d59cf3d20e15ef5a9d01d314f9862170f55bcbbb5c29eb571dd672d4e0393f6b5b6d84b695264915d6c9a2649637b84a79062d4fe6a37b742cfb SHA512 bcec57466470ab419b04e5bdcad7dd6717fda1e27678a9c0e2cab9ce974d55c2057a73dc488105e71ec9a893acb32a907809a839490ff6442f20d9d3f41436d9
-EBUILD backoff-1.11.0.ebuild 587 BLAKE2B fc65fe2619f995e9f35f23a2d1d2969213f4587052f354065a1cd4b499d95330cfe3f5f577d6b9a37b8e042f30decfe4cd8e8c06405de88086d7cecb95b4c1dc SHA512 c7a9ed39694d6f21f1734d9b637d5b210f480ff83cb4fb5e9f6cc1039a4a1a226da9379edb78e9df4e5c6e70c6ccc02174ad7f0ff88cdfdfeef2e63442b938ab
-EBUILD backoff-1.11.1.ebuild 593 BLAKE2B 7c79ee8006416a85a75a489cf52124673ef74dc54587b1a19ee9539b3b62b3ab6ed2c24c172812613cb1e6fa3b40c64772475b30b58e6f8584a65ef359e7c45c SHA512 bb5ade4d044249eb24e6e4d269bfa3f294e1ab47251b90a42184a21acceda611de8d85e5d06d16a55376fb2bfe995c7b7e66a631088e9d4c83e10b48d08b5ff0
-EBUILD backoff-2.0.0.ebuild 674 BLAKE2B 1f55afb78979118cead44d4f0dbc51fcba7295551c276c2875bce2aaeedb5d81a13990bea4165934d95fbca823af48564ee72172ca1982d374d9dc39390ce303 SHA512 9bb7442e54f9ac737fae1436698d83eb268c2a9e2309533227d5b07d588cfa98cb98bf6b2f7e31af6ee0330246a2bde37fea50e1adb34d78741d2cc05c4e1b88
 EBUILD backoff-2.0.1.ebuild 673 BLAKE2B f610104a4dbc494b7802b22dedc03a16047b9d6a8b7e835eb242c61bbd87cf8815df472769d801509e77491f430592c29e5e82337d90a8439f08b0868b2b52b3 SHA512 8c6bb90b06b73dbf4907ec59d4a2f3dc82f129b34c59e76223234bcf60d0f57ac142d58568a1df758415d4a271cd68d7b67be8b34189560a7b0052efa4c3921c
 MISC metadata.xml 387 BLAKE2B 4f92bcc32f0e26aa86b9f1968002d6c43a454ca27996158ca2a4b98b467c80d7ed6cd4a23e0807e813ae73ba2cb5ccae5fc8612c4d7292f2d4981374e9ab4f10 SHA512 52f3668afe9b067c240ad5db519b08a3e054e2864233eb6f079d339f704acd73cc66e239308c90eaadff09c630a6788886c978fb622f2e29b081a27c23525489
diff --git a/dev-python/backoff/backoff-1.11.0.ebuild b/dev-python/backoff/backoff-1.11.0.ebuild
deleted file mode 100644
index 50f63c524f6b..000000000000
--- a/dev-python/backoff/backoff-1.11.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="https://github.com/litl/backoff https://pypi.org/project/backoff/"
-SRC_URI="https://github.com/litl/backoff/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-1.11.1.ebuild b/dev-python/backoff/backoff-1.11.1.ebuild
deleted file mode 100644
index 30c7e50a72c6..000000000000
--- a/dev-python/backoff/backoff-1.11.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="
-	https://github.com/litl/backoff/
-	https://pypi.org/project/backoff/
-"
-SRC_URI="
-	https://github.com/litl/backoff/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/backoff/backoff-2.0.0.ebuild b/dev-python/backoff/backoff-2.0.0.ebuild
deleted file mode 100644
index 6e819a3cee44..000000000000
--- a/dev-python/backoff/backoff-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Function decoration for backoff and retry"
-HOMEPAGE="
-	https://github.com/litl/backoff/
-	https://pypi.org/project/backoff/
-"
-SRC_URI="
-	https://github.com/litl/backoff/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS=( README.rst )
-
-BDEPEND="
-	test? (
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 5a4575619760..c7c383eac4b3 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,3 +1,3 @@
 DIST bandit-1.7.4.tar.gz 495104 BLAKE2B 5531a602dea877745ebdecf768fa83e0e478c52d472fbfdf98fec32c73a76a73e4f6dd957be760b4757e47c5f9cc25f6cd2f6c593df1e54165e647950a9f8a54 SHA512 93e1a25fd41e9409971f4cbac2ff73971ba270936a6b2aeecb3e0a2aa2015bcefd5eaab3cc94b2d9d96e4604d1a39c5ca1150c9eadd073357a90c5265c592407
-EBUILD bandit-1.7.4.ebuild 998 BLAKE2B 49ab3b3e2c9b6aa3e2d1b41e4a17524f63dc2eecb56b73f0622e0cb21f24505bf1254b701cb1cd474e6dbad416dbe8add30b13ed78145f1c9990d9e06a494e78 SHA512 a990b91f6a468219e513f2b59af5e8d926876c1d4828057aeba39d68aac39258cd1354a541aaab9e9537c7014a87196a1c9ed40cfebdcbe1f7bb8cc34b815e0b
+EBUILD bandit-1.7.4.ebuild 1005 BLAKE2B 66e736cd32142e8dc37e427b458f928f039a8f94e4d01c60dd64cee99f31f6e453db3c136c6ace4ca0e678a92a6e1d597b2852d7daa72842131f187e8fd2a4e3 SHA512 708f6d9365c2ef6b68ac99e38010b1de7e7b6e2390ecdd1317abf6ad6e31febbd735f24f4ed3a0b3c67e1767f267e89bb38756e1d347e5cb345a9712a15ebf65
 MISC metadata.xml 709 BLAKE2B 845208c1e800577f159e34675344ce540c61888393dfcfc2f7c47e77ccfd4784cb3f1990b25b78f97d62c8b5c53feaadfdc894990333a09b7938a90be68b8815 SHA512 ba2c6de072973fcd891e4e161a43d52100df89f13243765cb5b2f2ccd7ef7a5266d8fd6e8d373859b53d6743c1de5b0733d5bb4f81b4a94d95843e0593e9dc8f
diff --git a/dev-python/bandit/bandit-1.7.4.ebuild b/dev-python/bandit/bandit-1.7.4.ebuild
index f75317ac605d..898f32bd880d 100644
--- a/dev-python/bandit/bandit-1.7.4.ebuild
+++ b/dev-python/bandit/bandit-1.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/beniget/Manifest b/dev-python/beniget/Manifest
index 9a5069a8c6a8..207c8bfd76a0 100644
--- a/dev-python/beniget/Manifest
+++ b/dev-python/beniget/Manifest
@@ -1,3 +1,4 @@
 DIST beniget-0.4.1.gh.tar.gz 16353 BLAKE2B ef7de5eb15b59de10c56057b22e718ca7284d251a98ff1f8dbe31bad2e1bc7ca3c22c2794b1cae8b4c5fdf2a4b91ac6f9a3a0bef3c3aef51fbe6a93341333e31 SHA512 bd2b7beda41953be9b4052b539ae9812a370702874602175bfca66deebbc569515b9a59c750dc4898a6cb9f4a1d49f8ff15c1288035aaf72940cdd439eaace43
+EBUILD beniget-0.4.1-r1.ebuild 630 BLAKE2B 9f1f1214707c745f7f013bc21bde337c30a50ff2e2a932973673e1f24b0e75d08adb1abc7db22cddce2530a3327f51ba50404f763bbbf19c51250a094b317189 SHA512 27d9e82ec759e98eb9371daee9a2fba822392e8f099a6ce07125bbd61bfa05db291cc62adc7baf605da219878dc958538696214a61c64e094b4e9c58810a1e6a
 EBUILD beniget-0.4.1.ebuild 592 BLAKE2B e9a6c78f4444226557fc7b06e9846114a64b5f542d44d406c7c371dd0bb5395e1b304dc3dd1ad0dc8f81180073bcf7e585d390a82cc4fe467b60f6f893d6ad86 SHA512 61cd72404ea03ea023778612e0a9cf8f2411020217185d6ef9f32c7a71d06e9aadafe935c9f6cac8537f9b63e497c8af9dd8e2bbf2b0e1a6896ca685959fcc12
 MISC metadata.xml 354 BLAKE2B 07c668c0a7fbbecdbb11f3a7b302ac589ad9af00e5ffca9b10f2542d9cdedf3f16cd5e9b8e04fe2b79a469f38a2083339b49503b90589b7322ec10cc867f9d61 SHA512 5dc1c04d0de4d6150797e91bd7f3224ec6fb5656bba3bcd48e332fcc5758c41b1e02bf74844a92eef5299af953ced75ffcc59cfee062c21c5c5ea6d83fd3472c
diff --git a/dev-python/beniget/beniget-0.4.1-r1.ebuild b/dev-python/beniget/beniget-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..57cdfd31f83d
--- /dev/null
+++ b/dev-python/beniget/beniget-0.4.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Extract semantic information about static Python code"
+HOMEPAGE="
+	https://pypi.org/project/beniget/
+	https://github.com/serge-sans-paille/beniget/"
+SRC_URI="
+	https://github.com/serge-sans-paille/beniget/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="=dev-python/gast-0.5*[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 258e676f0bfc..a638ce5b2d2c 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,5 +1,3 @@
-DIST python-blosc-1.10.5.gh.tar.gz 1570462 BLAKE2B e2ee3cc3827e1df89afc97a0cdc3f07670368d2edfea9b6ae32ecbb74b464d5311bbd7b129b3b94fb91d20fd579425859412665de397facd4c119e429fbcd014 SHA512 75b91e50def65ecbbdd29f7b7aba65c6ca611eeeaa9e55583c0253eda5d1e1ab7d899d0c77c45ae999188f701205f20d8c8ed130a3865433edd87db3c0eeebb0
 DIST python-blosc-1.10.6.gh.tar.gz 1570504 BLAKE2B 44f444fa5050a6198e83649973fc82d6804eec50bf79c332ed6a974e417f2a58baf09480a9bb5c5b7abcef2a961cd7bc61f962c12db625b1a7c48799ace0b39a SHA512 e283b132ebb91e7ce362ec65a1d6760e3793046371ea545a9e842372084182bcc194c3a0e1cb20914de58554063995a238ea0a129214731689e8cd5f4203d3ed
-EBUILD blosc-1.10.5-r1.ebuild 967 BLAKE2B 46427100a1e846ce6067829fb17726c5879634efeda8ad53a61cdea1d853b3f63aa98918f78749e7f7076105f653191b7fc1db55796609463daa050fe0092c1b SHA512 93475018956bccb45c6c3e0f0dc0739bdadaf7047398fe21274de60ba9d9cd132009f5f2319acfafe17f31abe0813fa4a24ba36ed86ef13a3b945a64f80db942
-EBUILD blosc-1.10.6.ebuild 1042 BLAKE2B 1fdab18cb9b7a214751ead5c872a099f0519845302b0d518d5b3a1dfe50277677a882d1d40869698e8fcbf3918f994ebceb5a8016c5cf10c912b795431d1da8d SHA512 4d582f5116b518ad4227a8deec8f4093ebe9c6cfaab63db1161711a71221c833fb785c5cbd163869eaf3a82dc86bce3af71a316171f92c035e4f4cf5d096ff80
+EBUILD blosc-1.10.6.ebuild 1042 BLAKE2B 2d3b7779dc3e9e7e79e3129bc8edd1257d780f44bb5881fc605a83a3aa3e6da06601647deb040d15c39449b5b5407805deb4e955f89bf74c522d459430ee3640 SHA512 d94ab6390fc8f9164743c21620d6a9f938cf5cad81c95ce066c0ccebafd9613e0c13d121dacb989f0bea37331de616e8c691e1047e0cce9638c6bf1ebcef0e4e
 MISC metadata.xml 999 BLAKE2B e8ab94b206c8364bc10de6e57872e6f4264927118269fe74dc040d5fc1c8fae7b3422a62c6d675b47a87168f03eec83a8ea16210bfd1f7e11920ae94844d9546 SHA512 5dec5341aa068659bb74d206ed7ffc96bc47d1128eb48827ec189be38d9112079c37a140dadc6326ba84352ccbeeac453888391920737bbf73153431d8be1720
diff --git a/dev-python/blosc/blosc-1.10.5-r1.ebuild b/dev-python/blosc/blosc-1.10.5-r1.ebuild
deleted file mode 100644
index 79ef5a1ac142..000000000000
--- a/dev-python/blosc/blosc-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 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
-
-MY_P=python-blosc-${PV}
-DESCRIPTION="High performance compressor optimized for binary data"
-HOMEPAGE="http://python-blosc.blosc.org"
-SRC_URI="
-	https://github.com/Blosc/python-blosc/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/c-blosc-1.19.0:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/scikit-build[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( ANNOUNCE.rst README.rst RELEASE_NOTES.rst )
-
-src_configure() {
-	export USE_SYSTEM_BLOSC=1
-	export BLOSC_DIR="${EPREFIX}/usr"
-}
-
-python_test() {
-	"${EPYTHON}" -m blosc.test -v || die
-}
diff --git a/dev-python/blosc/blosc-1.10.6.ebuild b/dev-python/blosc/blosc-1.10.6.ebuild
index dd372041278f..42cd0539a1e7 100644
--- a/dev-python/blosc/blosc-1.10.6.ebuild
+++ b/dev-python/blosc/blosc-1.10.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3b618b6f68d5..157a22c6301f 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,6 +1,7 @@
 DIST boto3-1.22.9.tar.gz 497262 BLAKE2B c3fad6d556c62403578347600f2781b5fbf34a5ba975b596878f892cd1981bd06e25e50e4c67e5b5b27d6a0fec3aa8af0ea6e30a38277dcf1ae157719d95b3c5 SHA512 f32d6b9b2a8f2d6fcf975446f2c3530a8ba29dc8a3d55ed7b675bc7fb68694c3e6e1f0c54c3f6a715923f9c10268c7db04d897b73add7098f0e43062d2f28775
 DIST boto3-1.23.0.tar.gz 499085 BLAKE2B d606370e274564f909be46cfac838212de3213fd8407f1f2ac26afc3287feaa4aec8bf25ac6db4f1058739b2cbefc99c8e16c9dd0c12a5bdeaacf4700e9b0015 SHA512 c44237239cadb98f257796e152b13514839d2003d2a8157bf5f8a41c726401a3e248ff021ccfcd3e6b8099939744fb309c6f1ba342ff066e84632f1ac97dbaf8
 DIST boto3-1.23.1.tar.gz 499867 BLAKE2B 1ea53a7bf5f453a202347f29f0278d5397d6d10cfb52253a64a09ccb6ddfe1a95631045ecf7b526016f314c8773db04d25ed8cd2a539ae20776629079c168b61 SHA512 a1cc49cd53444bbda3fe0bbb1ec6e7e445a53d94af1eda0ed2984f7e0ddc4af14eed09b269cb4b4e62a15d647071bd9a9e5182b7049da745c19ba8da74e5c9b8
+DIST boto3-1.23.10.gh.tar.gz 504080 BLAKE2B 1840715ec72b10131a430abdb303adf7619fb4dc542cb22acefffe378c96d094eb7d024c068df1df48882a22fc52e3883791da39d0e4fb34abdddad4d78c0ce8 SHA512 88d0abfc990eba2118698c27fe9f556a2b2ef27d0e287c2b3d65a1d485d4be264a5e9ccc02c017c404941c34efdb5f9d480ceb7c5752f99ebf95d3fab184dded
 DIST boto3-1.23.2.tar.gz 500287 BLAKE2B b997f18cfb2b5c03eab7decd14a60d70546eb60fb2d52f02d94ee478686bd520e4e8111757e9e073f17f7f415d9eb7243fdcd9ac2e0f2b98f6bd6d34473dc794 SHA512 6a774199b719496143af79b1a8a0612441a4f1d9ce426dfc3d495679bb0fda3856b7b0e81e8403d050de52bf8363dec9f0242cca6b32cf39d172d559d6ddf548
 DIST boto3-1.23.3.tar.gz 501196 BLAKE2B 8fbe6ec091e249bf675b9245a3ad73416bfae77de8c197f6b5bc6d919e7082aa36b53a93034d5658d7f27c928c932b0f077fc9beea6bbc9015c26e925cc565c2 SHA512 96fa0382a4841901eb961a1135799823710af24c236c4be6def180597bdb53a852fa2c0ea34cf6d1b8cfba0e5c5a2b10f361677a993b733bc14729ee68af16f2
 DIST boto3-1.23.4.tar.gz 501445 BLAKE2B f38c963558c99fade5b55c0b8d96221de7af7a215f7be2a4863285152720318f05cbaf996f8f0910f68830fdbb214b242d2e8e2e538ae345e4877a0ed733c148 SHA512 85298ddbb4a305354c50f4f63e9e6d0a1c821ac18e15dfaaf3d8ea3e03fd86fb6ea913402c6ac5cde4305895f387cf25eca928b7f00403198ad2eb5efe965eb7
@@ -12,6 +13,7 @@ DIST boto3-1.23.9.gh.tar.gz 503767 BLAKE2B fcd4556331020c6db015fe1591344c5fc4ee8
 EBUILD boto3-1.22.9.ebuild 1568 BLAKE2B 47270b7b90a957fd9cb3fbb5f7709c7f1469adaebe26855f74b5da2dd27ac35fce878faf40769fab20fd5e3c0f1c135c33d7582c1d502eac348448c8e7535dcc SHA512 29fd7a0d0cbb0de167d8be69f072749b2b45847495a2f108d9a4c87b518e09f85c64c06d2d77aabe62a86650db7db5746d3ac38db26c023849659b2782cf127d
 EBUILD boto3-1.23.0.ebuild 1575 BLAKE2B 857fc96ecd0c8819f3e984cb67d71cefb1b7d69f3c86ccb646b090416f0b75614ea87112ee9958393abe8f9efcf47345dd873767fb81c8b947c6051ce4c37c5f SHA512 55269c748370a20fedc6dce2d79740e9d1df29e8de29f5ee8a9082b1a9a79776cee40be27c96fa51a0ec855be8126506dfa9fbd4ec084c249e8faeb90e7ab9aa
 EBUILD boto3-1.23.1.ebuild 1575 BLAKE2B 857fc96ecd0c8819f3e984cb67d71cefb1b7d69f3c86ccb646b090416f0b75614ea87112ee9958393abe8f9efcf47345dd873767fb81c8b947c6051ce4c37c5f SHA512 55269c748370a20fedc6dce2d79740e9d1df29e8de29f5ee8a9082b1a9a79776cee40be27c96fa51a0ec855be8126506dfa9fbd4ec084c249e8faeb90e7ab9aa
+EBUILD boto3-1.23.10.ebuild 1586 BLAKE2B ae400f6655d06eae856d11a973e768f889051862e139c79f7a673ac09d18b479b3858ebfd82e2ee9ee63b2653bbd04101c84b0c308dc0b48f9615823919247d6 SHA512 c346b367e6f09128f3ac6f616a1d687f2125d5773520dbbf58c8a1b5f2dc5a959d9c8771b43eeacfa66364eba38c69bc2f8b769a3ac9ee1ec1ecea48f9f6461e
 EBUILD boto3-1.23.2.ebuild 1575 BLAKE2B 857fc96ecd0c8819f3e984cb67d71cefb1b7d69f3c86ccb646b090416f0b75614ea87112ee9958393abe8f9efcf47345dd873767fb81c8b947c6051ce4c37c5f SHA512 55269c748370a20fedc6dce2d79740e9d1df29e8de29f5ee8a9082b1a9a79776cee40be27c96fa51a0ec855be8126506dfa9fbd4ec084c249e8faeb90e7ab9aa
 EBUILD boto3-1.23.3.ebuild 1575 BLAKE2B 857fc96ecd0c8819f3e984cb67d71cefb1b7d69f3c86ccb646b090416f0b75614ea87112ee9958393abe8f9efcf47345dd873767fb81c8b947c6051ce4c37c5f SHA512 55269c748370a20fedc6dce2d79740e9d1df29e8de29f5ee8a9082b1a9a79776cee40be27c96fa51a0ec855be8126506dfa9fbd4ec084c249e8faeb90e7ab9aa
 EBUILD boto3-1.23.4.ebuild 1575 BLAKE2B 857fc96ecd0c8819f3e984cb67d71cefb1b7d69f3c86ccb646b090416f0b75614ea87112ee9958393abe8f9efcf47345dd873767fb81c8b947c6051ce4c37c5f SHA512 55269c748370a20fedc6dce2d79740e9d1df29e8de29f5ee8a9082b1a9a79776cee40be27c96fa51a0ec855be8126506dfa9fbd4ec084c249e8faeb90e7ab9aa
diff --git a/dev-python/boto3/boto3-1.23.10.ebuild b/dev-python/boto3/boto3-1.23.10.ebuild
new file mode 100644
index 000000000000..73f2eea33612
--- /dev/null
+++ b/dev-python/boto3/boto3-1.23.10.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 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 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 84d4cc2c51d0..eb21a261d9c4 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,6 +3,7 @@ AUX botocore-1.26.0-py311.patch 2164 BLAKE2B bbe6b3db1a2369293894e8d7ef610301223
 DIST botocore-1.25.9.tar.gz 8962451 BLAKE2B 5930499f514d5e9b9f0fa0c87a2461071a0432bb3957779a4669448bd7b34e94a5339598703419f36c01e505c8487217a4f525ce63832bc97ad35ef584ef45f3 SHA512 533c5ff383e53aa2b00a83b182207e9dd2d40ea000c7a0f1e74e30989c6c15f54fd26eb67375ceeb90c1a6ab158bda7de75ac40fe6b14614209ebb7063b9e2a1
 DIST botocore-1.26.0.tar.gz 8968864 BLAKE2B fc07441c4a759273a1abe6826048082b0e2ce38964de507a9091d5898d998ffb30e9bab835c9a6be2d3d01c15813230fda3a1d0457c5e7aa8573fc262cd9e4d4 SHA512 2bc8cd2c7db5549fa1f8f1364d42a4a6463b1fc8d0a80cd5026ec5f765b2a02108274eb33a6d5d00b3bb07a30351b458e1829b547c07134420a6aed343526990
 DIST botocore-1.26.1.tar.gz 8972136 BLAKE2B cf5d18d87fe5e78f6bb623e82dea9ec712867301e7b1fdd46724eb3aa37b7395d91dc206bc9329df96bab9c8072c8b071eaaea767848794db349982c630ab0d2 SHA512 c18160d1eb6f9feb6b4db2441c360112c1d8f88d8d2a3624f89b6ee4815c200c68d70601fbea1c93682af506cc6809a7e34568f543a25adbfd7ca09c309236ff
+DIST botocore-1.26.10.tar.gz 9008316 BLAKE2B a05078ec5732015cbd8ea4da2d2d82e28f4241b7c3164f3410ae396a19f79c116f7a9059a3361e99eacc952f860a516b187375dbf64ee5e4e5648e8c3b0f95a5 SHA512 b12e9002dc8e0912a9681938f343b51d628f0b2798693dc81636fe7ede01d006d5bc8a901f92edf10a88d97c3c6311aaf97206a6f55070e645747536fe39b144
 DIST botocore-1.26.2.tar.gz 8990271 BLAKE2B 95ddae48b54ba0455959a95eb4dc992bf1a28b5b0004c8004298bea30eb729cc20d0bf7b189a0e62a12939365fd106ccfc06a00092b3229077b665bdcaebd86f SHA512 df478a29511a9436bcab16dca448d4d196988402a326fd8be8f0dd4fbfab0b97ef16b31f241c44e9f9973bbeafc99d79f317838e0e6a83f25299218fd5fce1ac
 DIST botocore-1.26.3.tar.gz 8992054 BLAKE2B 74937d1a12f4c7509e0835ad273850a6de6df2f67d594cc30ea4bac7ef0b920e8d606aa39e4f47ec3a08fd0e47867cf7832db9218d9eebf4f2a08194ece63f4a SHA512 aae80723446a9f3ac4beb1fdd3690f62c2eb87cf41c2d5106d5ad1679507c7ac82da8b375a5c67a773057f7c1692e85d723952edb4ba62fe378788324b758b55
 DIST botocore-1.26.4.tar.gz 8993009 BLAKE2B 4d968ed094a8581efa08ce7b51ea8967937e41192e1d7ef71a8d26220250c1534f3c9f4753913ce2763c3bb90305a31823507a7ff9f1c318b4c7b0fff06a59dc SHA512 80f2205e86e36e7c5ae7e29626fc5ff9b6e92741d752b68e37d835255d0a58663169232a7a57b57eb09dc84c6050b2d96fb1d17f571f894fe7a2f31135cc2a4f
@@ -14,6 +15,7 @@ DIST botocore-1.26.9.tar.gz 9005786 BLAKE2B c68e4ca970a4b66e95fae1b5fea1c4515994
 EBUILD botocore-1.25.9.ebuild 1650 BLAKE2B 8d3b535e396faf48a9c3abcfb7b59128dcf159bd66e06760ef88e0f00f28b27eda68bbb377ab5e2b4787e9f674ed3c81c352ce0b5ff6f7552c07c8abac596bf0 SHA512 4adc3d131053ccb7dcdc799191422660d8e246f767cd6137e877eb592e7d8c70a25f216313b195ec3fcfa20a4c0600082ba9dd7c2c0bfd96b8b198b022099cfc
 EBUILD botocore-1.26.0.ebuild 1700 BLAKE2B 89dffe66e43d0001c48568403b5ae1466bc24a5e14bd46974eaa7a5ce186cbe65b2f9e60c037aeb3ba2e5e28218690511d83253756ec0cbd642456a8ca664256 SHA512 8ca2b1cd36fb918c1e85f8cb1243233e891faadab672169a6a83ff699faee84cda6c240546c3acb997749cb5bb047ab982e012c2fd5fe4e56edc04ca76db1264
 EBUILD botocore-1.26.1.ebuild 1700 BLAKE2B 89dffe66e43d0001c48568403b5ae1466bc24a5e14bd46974eaa7a5ce186cbe65b2f9e60c037aeb3ba2e5e28218690511d83253756ec0cbd642456a8ca664256 SHA512 8ca2b1cd36fb918c1e85f8cb1243233e891faadab672169a6a83ff699faee84cda6c240546c3acb997749cb5bb047ab982e012c2fd5fe4e56edc04ca76db1264
+EBUILD botocore-1.26.10.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 EBUILD botocore-1.26.2.ebuild 1700 BLAKE2B 89dffe66e43d0001c48568403b5ae1466bc24a5e14bd46974eaa7a5ce186cbe65b2f9e60c037aeb3ba2e5e28218690511d83253756ec0cbd642456a8ca664256 SHA512 8ca2b1cd36fb918c1e85f8cb1243233e891faadab672169a6a83ff699faee84cda6c240546c3acb997749cb5bb047ab982e012c2fd5fe4e56edc04ca76db1264
 EBUILD botocore-1.26.3.ebuild 1700 BLAKE2B 89dffe66e43d0001c48568403b5ae1466bc24a5e14bd46974eaa7a5ce186cbe65b2f9e60c037aeb3ba2e5e28218690511d83253756ec0cbd642456a8ca664256 SHA512 8ca2b1cd36fb918c1e85f8cb1243233e891faadab672169a6a83ff699faee84cda6c240546c3acb997749cb5bb047ab982e012c2fd5fe4e56edc04ca76db1264
 EBUILD botocore-1.26.4.ebuild 1700 BLAKE2B 89dffe66e43d0001c48568403b5ae1466bc24a5e14bd46974eaa7a5ce186cbe65b2f9e60c037aeb3ba2e5e28218690511d83253756ec0cbd642456a8ca664256 SHA512 8ca2b1cd36fb918c1e85f8cb1243233e891faadab672169a6a83ff699faee84cda6c240546c3acb997749cb5bb047ab982e012c2fd5fe4e56edc04ca76db1264
diff --git a/dev-python/botocore/botocore-1.26.10.ebuild b/dev-python/botocore/botocore-1.26.10.ebuild
new file mode 100644
index 000000000000..2fb86c59b25e
--- /dev/null
+++ b/dev-python/botocore/botocore-1.26.10.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 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 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/cachetools/Manifest b/dev-python/cachetools/Manifest
index f4ce039038bf..632a02cd4bfc 100644
--- a/dev-python/cachetools/Manifest
+++ b/dev-python/cachetools/Manifest
@@ -1,7 +1,9 @@
 DIST cachetools-4.2.4.tar.gz 25487 BLAKE2B 91979f72b8719f4fbc57421ded6edcca38106814997abd2a17c1147af55a1b64e11b347c8ef790cd8cdafbd83b8492d377540b872430d285584aa3d3228f6435 SHA512 29a6bb3a064e5603cd3e3882d8e5a6a6ef95ba3029716692c9a82d7186a0befcfb8ed4a0ee3ecb591fdff93a46836d5b25acca7ba5eab1ba837e86404aea8fcf
 DIST cachetools-5.0.0.tar.gz 26119 BLAKE2B 29d3c9d9859c4848d807dcf8d84614b23a125bdabd4188191e7ccb1536da249226ed4b21798b49c2eb764bfea4ba16b557440438a827b1bfd8d4c5b0984695e4 SHA512 3d311969a4fcc180767f4546f384e16d47bbeb5c1d97884006872317514ea2739560346d62d0afed1916def249d92f9ff14e4d964e9521de09132d3a83463a76
 DIST cachetools-5.1.0.tar.gz 26656 BLAKE2B 709b4e5ee7a0e86ccd0d947828f36b7c98765dddb0d628b28d17ed745633b747c16f17df7ffff79a87e8916702c4a513432b832a6d06f2ac57c1c9199e2adeef SHA512 6732c5a305c506843caa13cdacb210a83695a9cb65d065b95e1505530ffb6899200c1d89b66ede33b194b5af1a01ad99e79aa85ec754d854de476f243380bd53
+DIST cachetools-5.2.0.tar.gz 27342 BLAKE2B 905986bca98996fbc74c74bc5710b429ae63b4bf6283a3910e83a92cac461ef4a0271b1691a694fe8ecacf38eeeb921d7345c9e015f1400705662081d5e29dbd SHA512 e12766aef1725091edcdd0ef3687b891242f711de069c0d0642680d61dcca79e645e6ecb5f2e22470f189aba59daa2b5a830dc76791256517368f8912a065eef
 EBUILD cachetools-4.2.4.ebuild 419 BLAKE2B 0cb00cc291fba7a29b18af9b3e25202cd36891bc52f1d1d5ba9134e0fa5de557545b3572a835d0584ee8fa7ad77a08b3716c983e0335605438f6e6f63bd33338 SHA512 e52ebe03812ca4317222d0cb040f498d4f87fdb99cc624b5415ee171efab35f8ca9072fd913cfcf299d871a0a61a5a4703a9d7232962a28c3ec3c255b54a606e
 EBUILD cachetools-5.0.0.ebuild 426 BLAKE2B 2bb25e4179e8f1b91cbfdc665b1289004ec7743e6f52022579dd925bfb12b65cd2af25ba8bcff54661de31aa82114757a3b3fad2084bea80b07ebe9f3ee7dac9 SHA512 ee5d35d82477fb585959f3a5d0ef3d188ea641c4a4d1738fed6888d475fdc01f82f4c0a9868e07fbdc55b1140696649f7a4bbe77b0a75411558d1bbcfd60fc18
 EBUILD cachetools-5.1.0.ebuild 501 BLAKE2B 316c1686233e60167582db0f1e63d25382aeddca5924747387cd795f0b39366c9843cfbeef82498346d38529686754a8f0878678e153f1e512b9aa0f973a2625 SHA512 624296118f582e0a84c5b544875b2abd7cd79b0183675763620ef542311fd2f6c9e08e80a4b211942adcd81b3aba4929f5e27b7a148ded9dcad3d5f81226ab4d
+EBUILD cachetools-5.2.0.ebuild 501 BLAKE2B 316c1686233e60167582db0f1e63d25382aeddca5924747387cd795f0b39366c9843cfbeef82498346d38529686754a8f0878678e153f1e512b9aa0f973a2625 SHA512 624296118f582e0a84c5b544875b2abd7cd79b0183675763620ef542311fd2f6c9e08e80a4b211942adcd81b3aba4929f5e27b7a148ded9dcad3d5f81226ab4d
 MISC metadata.xml 508 BLAKE2B 46dd3d86627746b2b26d9980c2773a25cde3fe6d8ef25bffd88edf1cd2f66a9457f09eea791efc1dab3d354f405bf755992e4a44acd721e4e72f085eabf9b61e SHA512 63d48b1e710965f09538e71b982df8e2fdf5693c6043d5498e4536f76e139584f8783479c1742f91fbe45b4e7bf9eec8d8a54d698734c196bbd8d5a14712b59b
diff --git a/dev-python/cachetools/cachetools-5.2.0.ebuild b/dev-python/cachetools/cachetools-5.2.0.ebuild
new file mode 100644
index 000000000000..07e5f7a7371b
--- /dev/null
+++ b/dev-python/cachetools/cachetools-5.2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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="Extensible memoizing collections and decorators"
+HOMEPAGE="
+	https://github.com/tkem/cachetools/
+	https://pypi.org/project/cachetools/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 99da12ae7cf4..3bb43f7efb5b 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,3 @@
 DIST cfgv-3.3.1.tar.gz 10395 BLAKE2B 8727a9886334a1fe59aeb0554c4c53139ae7e1f66534102c67f005d66dc1f78cff5e5534468a10b85df645f7e8a2fc72ca6ca2e448d09cb7636d08e8b3843113 SHA512 59c358bab9f2b32a1ac6eb72bba67b76e8368e0cf78c32228a6add200a0205f698aa80d9bd1b1e8701fb699b9599c88a240f76e2c91a602a0c292a67693e6857
-EBUILD cfgv-3.3.1.ebuild 484 BLAKE2B ed55edec6ac310c09b3c1ce6225ba0a41e67c5688146e84aec0c93c0d23f5752ee8101746099350766b39ffd3308c7202a21cc4f66fb0ff7be1a33d4a3518c6d SHA512 877aedb77b3e6359aa5d4d99a5e6c829d7e27f18159d24f1d161198bf5e34e0fa729f734e8eea92eb26d13a3d0342e2dff34d1a5850b3d24f8fbe4bf93701fc9
+EBUILD cfgv-3.3.1.ebuild 484 BLAKE2B bb794b8d5f92ec4d474d573055c3c456eb621fcaf8c85f4aa658bba18dbe522f8ec2706f725c102020f6ba2f1152a8bbf1e052020d7de304d907f3704aa9d2b0 SHA512 1250a5e1a871a3be213dbb27a0d5dea272422a6953dda453a52b5b85bdf774121bddedf7a6d63cf1c22ae5f365a78499b801ccf5b15f3d25e98803653152cd1b
 MISC metadata.xml 491 BLAKE2B 8adc9313dd82bb837c84287063374dae8d9d851f8d515ac69e81cfc3d5b0b1369f709113bef6ce348329e0e6394de7c3b568fe86cd45081a546a3fb54f01642e SHA512 ef1c16ef95820a9eaaface09373366b62660b6e9a8fa05800c4ecc578d4b3e6c64ef3094c496dcda1c8449b9cfea7e427299ebb4750e5fb8ef49f78cdcbbe96c
diff --git a/dev-python/cfgv/cfgv-3.3.1.ebuild b/dev-python/cfgv/cfgv-3.3.1.ebuild
index c5062d91e2a3..adcc5d30d50b 100644
--- a/dev-python/cfgv/cfgv-3.3.1.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Validate configuration and produce human-readable error messages"
diff --git a/dev-python/cgroup-utils/Manifest b/dev-python/cgroup-utils/Manifest
index c9d71634eea6..7bc0df254cf0 100644
--- a/dev-python/cgroup-utils/Manifest
+++ b/dev-python/cgroup-utils/Manifest
@@ -1,5 +1,7 @@
 AUX cgroup-utils-0.8-tests-builddir.patch 644 BLAKE2B f2ff44542b2883f33aebb43bea4178cc8bfb55c4544f456fb657e901c00847ea0f53cb140c4acaa0b6cec1d8f0bfed993fb842c1d9bb7d08ab9459e2187fd31b SHA512 930c1513b79fd1bf81085bbfbb0bd1031fa61bf7e5cd227347f8976b930c441585c91003ff9345d43cd1fe7a7b8ba0d12b07536a7127fe0d9790ebfea7cbc7e3
 AUX cgroup-utils-0.8-tests-mountpoint.patch 713 BLAKE2B 1f92579b823ad8f0fd26df19226017d5c81a781e4eb368bcb7efcf1cc7aa0930e150f26d237fb3134e583079f8db42642ae366f3e4d9630d90c137f395bc20e9 SHA512 477c8a48bb82a1470ed5afe8b6d48963247ef6b7617e1b316547372fe785661fbd59dfb713d9e1dc88bd55a3e9b8b2593b92eb2ccc3dfbebda83649cb611b9c3
+DIST cgroup-utils-0.8.gh.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
 DIST cgroup-utils-0.8.tar.gz 35260 BLAKE2B 11187a917d5159699eb46fb67f5057eb16317f86c32e6471d8543955e1d40107663517395226ae75e3b0739fb59c7521590a3d04a5d818b151970cbea559dee7 SHA512 fcc31fb6d2bdfa761c248553d056ea1bdcf697ae9ab8ccdc895feefdec7bc4e560bf2352968866b3064548545d98527d2a4092d4c8d2f335ef76e3c4b721bcf0
+EBUILD cgroup-utils-0.8-r1.ebuild 657 BLAKE2B d98d7bb62ddab53975fcf7452f007c599b21c4bc76b134b1d0d0585f7ca1a2fdc53efb3aeeabdd5b64c9ef2d04ac3f77c16b8be4fc9efa9169532e8f13771d00 SHA512 6ae9697dac2094dc9ddb99a509a5ef34126a7058355261c939cfe0ad49c1b3770f6255df922ad44969ee7e0f9fc9cbb1dccedba35e72c76c06340b8dee8b2e5c
 EBUILD cgroup-utils-0.8.ebuild 622 BLAKE2B 3a0ac4eb97648e6222c88a92e3af790a3ff1f9439609eeb6e10ad3134bb290e166937b7795af789be4722e34a16d54a37f4b9dbc7702b7970f84bd3b77eefaf9 SHA512 097370f66f6a58febd7526fc515970d5d101040304edd2e7b7345e7c08050b6d156ea582a6953d00efa2da9330a041a1ef3bbb51351005feb3e0f482d7f3b9b2
 MISC metadata.xml 486 BLAKE2B b15881b19a24abf60b9a8f92b5f43307faad1432f6fd0fac43bc18b265eac2a359cd9a4f7d130d6872aeaca23d7eb7d532380093d05ea2a8d480a2a2a26bf46b SHA512 46325fbefa6f1ccad0147d9b98761ff638fc250f35e92753bd60325f24a5c4bd741c2b30bf78020e6f1b84927fcde476968e4e28c9d676ef26e4c6199ca768e7
diff --git a/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild b/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
new file mode 100644
index 000000000000..ef958fcdcceb
--- /dev/null
+++ b/dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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="Tools and libraries for control groups of Linux"
+HOMEPAGE="https://github.com/peo3/cgroup-utils"
+SRC_URI="https://github.com/peo3/cgroup-utils/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8-tests-builddir.patch
+
+	# Upstream: https://github.com/peo3/cgroup-utils/pull/12
+	"${FILESDIR}"/${PN}-0.8-tests-mountpoint.patch
+)
+
+python_test() {
+	sh ./test_all.sh || die
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index b013d7806fb6..ecc0f567f7b2 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-python-12.0.1.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.1.ebuild 927 BLAKE2B 2c35566372b28bb772b497e0b11728e6fa1dab90f31ea9a9d3b954c54d028cef8240c336570a9b3c5249d4c995160f1e618fce4c217557d4bdbd13aae3789f8b SHA512 09bce3ba304c6b7759823625b1e54f49d509bb2fbe523925cf3d2dfedd7f54dd87dd5ce1c4d6c7ce5b334c5be16c6723aff258c1d5813a817bd9fd4c6fe5f25a
 EBUILD clang-python-14.0.3.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
+EBUILD clang-python-14.0.4.ebuild 958 BLAKE2B 1fd62aa82c0b224e068d043830ad4a0fd44b62161df1e912f53ea0e6ae2a923d4d7f5d2d897d6a74ba1b8fc9a4a8c632072daf9cb50927d73f055a9ffbdd2a00 SHA512 2cf161f95be1521e2e5b6e50c881f90918eefc501059e0d0ab9d376ac56be5dee590d40a79936be021889a8fcb4b98d730316b4dca67e5ee314ff97ef48d1fce
 EBUILD clang-python-15.0.0.9999.ebuild 935 BLAKE2B 259d469221df0c360735c5c033f89523161f2bf19db811f390973b52229a50b82cb06f96c05230a9862986a77d42466d1b3bc95b5bd30578c96715b28831212a SHA512 a26fbbadeff6657cca7ef915d263bc9a1a4543116bb1f14282b889c5463a662d280ce8d7e7f674753c43b186fb0531062ea86462221adfb4a8b76a50c214aa1d
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-python/clang-python/clang-python-14.0.4.ebuild b/dev-python/clang-python/clang-python-14.0.4.ebuild
new file mode 100644
index 000000000000..0b7cef715981
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+DEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+"
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index e58c6024b534..ce418fa61f78 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.10.1.tar.gz 82764 BLAKE2B 88e8481d23f6ad35acac9fd17b1e4930f31ebc13211ad5bf1db441dbe4ad99faec023b6a46640d0fa3dbac4d76f4fd9d9fd3cd1e6c319cab390d502c9adff53c SHA512 2a1eb1f5311eb92ac481b35e0f703bb37171c9c7eee68a3d8322786a802d562d990ea8e3e52e924215b2ff8c3f14614f99ea403d94bfa2ea3794ab3556baa0c9
-EBUILD cliff-3.10.1.ebuild 1105 BLAKE2B 6b41e6283f7c589b5eca72c72e950854cb7ebb65cba04a36fab2ba5d4fe6a1748fc0996831280a47cc665561bf66e652ee9fe3ce38913d679a7f50dced1438f1 SHA512 e7bd70af6d7d8acbc980907e89a702d47be2417623b4bf56161ab2e6f3b88d30eee3bdab44eff142b0bccaf01077e3c4646cbe4f2d11179279a807340803da52
+EBUILD cliff-3.10.1.ebuild 1112 BLAKE2B 33776b3ea7488e5ea45d47eace9b5e58cb0d3e0431e7f4fc7f1f4d38f8b4acdb431110faad821dc9c3ce007e8310600311a9d34cdb5c984b61f69b71ff9b0ed1 SHA512 3759a0e561ca2ca0dc1e777d7338a0f9160c17ea127f65bdb01fbc2d9c80d8c4fa8994a4884ec6b8b215806954e4bd5f2480d4ac750f76405e470669b5ecd413
 MISC metadata.xml 767 BLAKE2B d9d994960046172167f20f59073011b2defe84e94144386db5465a973050e48e05abccff88d7f84cbe9f20615eddc5b61a46920f8b27c4dc9b2587f762f3e368 SHA512 018a0bfac3f0126341207d16203fab4a666b17d8a5dcf9f101335c396797f2e724e2250910fca39e12cb6616614983a756a42dac03aa215d2a1b51af5246269b
diff --git a/dev-python/cliff/cliff-3.10.1.ebuild b/dev-python/cliff/cliff-3.10.1.ebuild
index 2ded8dc1f6e7..8c1db180105b 100644
--- a/dev-python/cliff/cliff-3.10.1.ebuild
+++ b/dev-python/cliff/cliff-3.10.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/autopage-0.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 4d851f0dd4a8..0e45adcdd88c 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
 EBUILD clikit-0.6.2.ebuild 851 BLAKE2B f088a0f346008b53ba0555496e5aab81158417bbfe82aa6e2d5af41a5fd4bb90fa597adf23cc834e2a35b597e6d9c2435b575009e7b936bfc6967bd6767f0166 SHA512 74b902ea215c672b3bc07163b4368880faab40ba7a4965154511fd007c68d9f2267918298baeba24dae5511a51b8ffae3c8f3ed180f178e6dbe6a36f0d5f9466
-MISC metadata.xml 412 BLAKE2B 79ae358d09fe2f24fa3a16de6caf873fe4d423e731605b0d5b7cb67915a1f1e879279ed8526f3c7e1d272c9a209c74f0d546d18f152a593337389bb0409fff91 SHA512 13b98a2040e30df09ccb0a44719c3f0d5ac4b603ba724408de045613c33eb8f8d4cda05e4d9641819d30574bc33d2a3de9f54469a662c2713520a4faad8362b4
+MISC metadata.xml 410 BLAKE2B d41047e98bdbd0345d6091af448d4c195b9d8858a8cfeba5bf8ed1cf2f999838672f12fe3210a237e4a2fb4dc274aff10cc12724e1d2a570deb8d4e8eb8728d6 SHA512 62374193aa556621d5e225d7121f770d871eb8a1f63c1576622101402426ee7ea4d77264d2b8290f1d2605d492224f6c4bd15ffdf4941a0e519db36836f76652
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index 58c30e5a789a..56a7414e444f 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -8,6 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">sdispater/clikit</remote-id>
-    <remote-id type="github">clikit</remote-id>
+    <remote-id type="pypi">clikit</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index c9e43b353ca3..7b574d144fd1 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,6 +1,4 @@
 AUX cmd2-2.4.1-py311.patch 1303 BLAKE2B 611d6270470b838cbe7551ac1019323217e7f3d68efe9c17d81a09a2124707f63af51ef5ed7adf0b3e8e6548dc7c55f5d1be29258f5e44d1be03d59ba583b482 SHA512 1e7893e4c2c0286dfe29d7688200a1878069cad46ded7d4ba8921944d47a5e3626324a5cb59ba38ecb20d8bfa87ecd5e5105295595982a33f44a3cd4ae1fe887
-DIST cmd2-2.4.0.tar.gz 680118 BLAKE2B 09f4893db7587dce9fd59103f8a1ef54c2b61248dd4aed313a90a390bb50e8927ef7a11dc5ca3af90b5ccf36ce16e0e18f3b555cc961a8c6862f7b8131f190ae SHA512 4ecd4c71294bee86f02b39a588c42a7232309db54459c950f77734926dedc3ec273237b9615bab6ef8a499c65442e3d6f7d2e9f159ccca021db0b450435ffbc0
 DIST cmd2-2.4.1.tar.gz 676903 BLAKE2B 10b27d7658ee366d44d5fd13a4daf3adb65537043e0475e4c30b5a3b5e142cae982515f033e52fbd63bbce583ffc64e7b0a032d4cc0bbca76303720ecb2a8232 SHA512 862ff0ed301dc8fd588fb564602b32c9e8dee1dcae9965b0ed4605acc98b63ca5767b28c0030410395fb34ea1a0c7cf966972c19b75b93c1a3a3b90b582279fb
-EBUILD cmd2-2.4.0.ebuild 1480 BLAKE2B bfc6bc865af4ba2d333cfd54c765d5af146ef0cab8974408e29821168b24211c5593215211d4242c8021c2374b6b9721092f34d75c42490c089fe3539ae48c69 SHA512 872ff54658926538c30086fec4540ceb5d900a4553b053112f6906001a01087b6143e281cccd277c7e89f669fadc521aa8679d4f870dfea7ac7c122a2e798a03
-EBUILD cmd2-2.4.1.ebuild 1539 BLAKE2B 2a3c731c73802d035df215ea1b39abbd46da3b5b8749eec82adb31a84c51406177a5b3dd4b49f884d7221bae29c0acff6e19dc4a58f3fb02fd7c8c335eb884a5 SHA512 8220a613505f9935ff3e47398f4f3b7f3e885289f5ea08cc846993e80ef0886c13b5096270e7202c390aedcf65809d1c5b010b6c817a90278fc6bb89769a5a61
+EBUILD cmd2-2.4.1.ebuild 1546 BLAKE2B c0cc684936461acf7ea790dac74b03c186674ee6a7650a8826c676487bb82f53a4debcc663ec5152473566a962fc89226239c7e4b762a6448c3e8d98d67e5d02 SHA512 5f7769893acad0d1bc677c5304c1ae14fc7dfcb0132c70762bb61e18aaba5ccb176e6ce0e383ca4e237750635f1ac206943aed82f42a5c1a7ee551938949d3eb
 MISC metadata.xml 522 BLAKE2B 39d319b6a64a7b54568a3fbd3d7db9adf7719b690a8f086018ce41f0595db157b1f7825ce28afb4fb0d748ca0d6dc21d79e480361b69b4bf29c0efc2d2540bba SHA512 57315c23dd64534085502e59f0b8ca01ef8088d5a2b16ed807631a1f36a523768960754b00619e802333552c405e2984e314d91003f7a624da6f1eb8e8e4b98a
diff --git a/dev-python/cmd2/cmd2-2.4.0.ebuild b/dev-python/cmd2/cmd2-2.4.0.ebuild
deleted file mode 100644
index ccb5d6207f86..000000000000
--- a/dev-python/cmd2/cmd2-2.4.0.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Extra features for standard library's cmd module"
-HOMEPAGE="https://github.com/python-cmd2/cmd2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
-	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wcwidth[${PYTHON_USEDEP}]
-"
-# pyperclip uses clipboard backends in the following preference order:
-# pygtk, xclip, xsel, klipper, qtpy, pyqt5, pyqt4.
-# klipper is known to be broken in Xvfb, and therefore causes test
-# failures.  to avoid them, we must ensure that one of the backends
-# preferred to it is available (i.e. xclip or xsel) + which(1).
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		sys-apps/which
-		|| (
-			x11-misc/xclip
-			x11-misc/xsel
-		)
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	distutils-r1_src_prepare
-	sed -i -e '/--cov/d' setup.cfg || die
-}
-
-src_test() {
-	# tests rely on very specific text wrapping...
-	local -x COLUMNS=80
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	epytest -p no:pytest-qt || die
-}
diff --git a/dev-python/cmd2/cmd2-2.4.1.ebuild b/dev-python/cmd2/cmd2-2.4.1.ebuild
index 532d9ba6a4aa..d14b273ef06b 100644
--- a/dev-python/cmd2/cmd2-2.4.1.ebuild
+++ b/dev-python/cmd2/cmd2-2.4.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index fd58bf879fc4..4496c4b8d1ac 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-2.5.0.tar.gz 31334 BLAKE2B 1f06725ead19e36e6feda1c8666403e536d5f39f775d9a9929a06ea053be41e64575a4e4d28b3a0032610cdd7f68f35bf54ff2445543c4b8ec667732e1a8d5ea SHA512 3f1378c52994a0320b8abd997a1b240496f6f12d29e8b08612bb97c7c8d2993b23224be62cbe4eaa556dcd5a3c7a4a8f8ea4873688e1aad2f26bb5ba522c1d6a
-EBUILD debtcollector-2.5.0.ebuild 783 BLAKE2B 3d1ffd6f59e53a43b2475c854e4ffe345db50f01ebc9b6648788625cd8f9846d939711986ecbf6f57b5ddc80d62d3c278ec466aaad5006cbe18555660d61cf14 SHA512 66c2f4759bdee088ba3521d29527f99837fd58b707a06423079c97b2d7a07d82bcd694664c96bd3feb44eda8b9a84ae0064af4c6f0a867ff14aa46aa1238577b
+EBUILD debtcollector-2.5.0.ebuild 790 BLAKE2B 97191e92e214378c2787172679507dc29fb6d45ea9d9977aab4107346b04e9925e5bf8d49ccc1200477ea1c816bd9f195966341630a153920c8f2a654ad6d114 SHA512 e85e80f4d728d80c5316ad59fd82b121d9bbd7c4ef5c5057a89c17e3d4dc3ae0edd9188aa81f794d6996903c156d6256a3be13514fab13676955c8af1a35df49
 MISC metadata.xml 418 BLAKE2B 1f3466117ea254c0f63a9281e3051dd933446a82203153ab31427575948501914f9aa6a14e87331d21f1994079935d6ecf3238099e9cab7368bc0c2d44fe3350 SHA512 6bc03c4667e05f99c140707098339dd590da95fc36f2c0634cf4374b714bde1508558f9e0f5b6a98f05d2950ddc2df78d0732f84f2be47bc317a086ed29581b2
diff --git a/dev-python/debtcollector/debtcollector-2.5.0.ebuild b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
index 6f4355680b0d..4f5658b2b5bf 100644
--- a/dev-python/debtcollector/debtcollector-2.5.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index 4079c60a237d..344c129649b2 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -2,6 +2,6 @@ DIST dill-0.3.4.gh.tar.gz 152875 BLAKE2B 61c638f0459b94f5cc0dabd9d5fd224c3c010ab
 DIST dill-0.3.5.1.gh.tar.gz 161203 BLAKE2B 2f778f3d2792d5606f8a5d7fd7d993490592da5ade701a38a270f756d129ad49f2aa44277fcb1f69a14779fe2541e2a720dc643ebd0fad258725d5d9452c048f SHA512 3dcf5e262110031412d9dfaee5548fed80bfc4d6b404cddbc2d9a6f65e2b80fae45a622ef73768e7996d2fc9e8d2757ac04e2a73f3700c526037dbabaa8adf15
 DIST dill-0.3.5.gh.tar.gz 161213 BLAKE2B 305aabe868b7718b57199a29fdb3ec4a28c797d36be458bb182f909ef39f15bc016779b2f08a1804c0eab6c940a2d5baef26d1c34bb4c9a0d0687674265bff96 SHA512 3bcaf692e98f2495aad9af44815c33ac9c64ea7c946f41a8d37851b63fc2c94bbcbc4a923559e2433971a900a34daf404f9461ba28b38657dd908a84b9f0b8d6
 EBUILD dill-0.3.4-r1.ebuild 721 BLAKE2B 10ec6652463e1536a5fd54b1df89d6fd5a156ee1687d9293ac41176de883bca74b201ea2870d8eb9cbfa447d1dbb4f1bbbd4342e23fc229bd4397d106b9c66a6 SHA512 e5429ae71bec3b01766364557bdbaf71112cd0e000582f7b5548a041b48eca3b5f0c583030435212eaf7d2ca9b44e1886d05ca7f88138501ddd98c627d495f0d
-EBUILD dill-0.3.5.1.ebuild 771 BLAKE2B b6e6ddb5178b2bf43915fd9c860ba30c2dd9a17510d12a3806888c0fe92b72cff219e691d1b78b4bc64c2c3b82cdef043ff267835c5e47a08db951d847739fe7 SHA512 be6c4ece1dfcda5278db9b6688a95f5ac51581951e9913bb528f9fc5431611d7e6aedbdd7fdc96b14a4c22bc71b4ea25b502554663ab68997b25cac5a5b962e0
+EBUILD dill-0.3.5.1.ebuild 777 BLAKE2B f3e62826f8726281dabb2442b68781fea6bbd36ac2ef2f0d7f626f51a1b6c38b3fdf333932f1554d7ea030e932e1ef88e71241676e107deef81b932eeb1ff20b SHA512 b2f7e5709a6e7b1282b55467283bb576fcaf90c5f093b22d4bce567f94e722174ed7d4ce7b7c367ecc2f98a9b0e4ca44ef19060ca2a32daefd0a571b4357a806
 EBUILD dill-0.3.5.ebuild 771 BLAKE2B b6e6ddb5178b2bf43915fd9c860ba30c2dd9a17510d12a3806888c0fe92b72cff219e691d1b78b4bc64c2c3b82cdef043ff267835c5e47a08db951d847739fe7 SHA512 be6c4ece1dfcda5278db9b6688a95f5ac51581951e9913bb528f9fc5431611d7e6aedbdd7fdc96b14a4c22bc71b4ea25b502554663ab68997b25cac5a5b962e0
 MISC metadata.xml 997 BLAKE2B ae32cd96d7a4967a9886d4903e21720459c0a963a675d301c2bb651fdb15877d845100822c1e7a7b6184ccaa666cbb6dc58f939616de9c1c22554670d841bd19 SHA512 e3dc363382bea8ed76343b62377c139ad84011a6b804f64b65d93941a7c192c268c0da273c73d5ec1cece7320b15fa88bf5a2f20a628d8845efddab24f3acc5b
diff --git a/dev-python/dill/dill-0.3.5.1.ebuild b/dev-python/dill/dill-0.3.5.1.ebuild
index 7c162ac2dcdf..4e83dfb67b9f 100644
--- a/dev-python/dill/dill-0.3.5.1.ebuild
+++ b/dev-python/dill/dill-0.3.5.1.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	local fail= t
diff --git a/dev-python/django-cacheops/Manifest b/dev-python/django-cacheops/Manifest
index c89da8fa501c..3a7d2080461e 100644
--- a/dev-python/django-cacheops/Manifest
+++ b/dev-python/django-cacheops/Manifest
@@ -1,3 +1,5 @@
 DIST django-cacheops-6.0.tar.gz 70280 BLAKE2B 9efe5a10d86f9ad25ad67701005de962185d2c491305bb56920203718c2d5fd0b28d43f2463e28c7c00c7592a78a3adea66090b398a205d5e361dfbcf90ae887 SHA512 54ecec62ff255a867b382bb1157117c8d14d7185891aacaae33ea11283beeae2fae60659621699a52f86d536b5a582d31f24f3b00f16c2e81c1a78ea4079504e
+DIST django-cacheops-6.1.gh.tar.gz 52972 BLAKE2B bdcd045912100ebdfdfd9add23b0df634b029cc2ffe41c351176e327f1e21c90457cfca9e45348dddce60e39fee5c431428ff7f2c954194e4c06c8bc09d78945 SHA512 43dcd4f302afee1acf73125aae7c2e2eece560cc6f07f3374391ac54e0438fd59b80a24e65f52bd7aa4978fd8a428939a8d607c7aa4b25f47d68373cfc12772f
 EBUILD django-cacheops-6.0.ebuild 1343 BLAKE2B 4fb0a485ebca18e0826ce6838cf11afb3712c13752537e95d6dc28bf4f13e20f772f940547b5babe38ce6214e7dfb29b6e07647f5bdc93156bd2a8ad279ce388 SHA512 901a88bbe46c43d767c0f68715c251c3df9b4a559f25f316da07598faaf73abc8b679c1b819611c3b5196ff397f3e0adf75f928b66eb576d6da024b1b9fe0d4e
+EBUILD django-cacheops-6.1.ebuild 1488 BLAKE2B 2904bd8d68e8ce6e69e11f3b0e12902ad452a5d3ee670fb688e3c552b8ddb371d3b341086fca4ce0120f22f5eda0bc928248bb1baf7ba5d412fdceaeec23ebe6 SHA512 2d09d1a1b390a6b9ae760a3bb1828c94cbdc7d369fde0d6451ce9153c4d4480e711b7acae039cf3256f2a21cfa6bdbb37f70b723c3225193455e905d5b4dc406
 MISC metadata.xml 381 BLAKE2B b8bf138d65b463c15b22be44750822bf6d49f1e651ecc6884dc008b9f1c93ff314967d8d3793825e129c8ac5d98348ac2726ec36ad43b8ec5d0829a78a16a26b SHA512 ad1f2ac5abcfc3705d70cc717bc076115d299a3b973852a542a7d41fabccc695b79ada0297a48cbe8f04815d66e696b437eca896e291c7da9682a85542d3e469
diff --git a/dev-python/django-cacheops/django-cacheops-6.1.ebuild b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
new file mode 100644
index 000000000000..9b7a1f421dc7
--- /dev/null
+++ b/dev-python/django-cacheops/django-cacheops-6.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 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="ORM cache with automatic granular event-driven invalidation for Django"
+HOMEPAGE="
+	https://github.com/Suor/django-cacheops/
+	https://pypi.org/project/django-cacheops/
+"
+SRC_URI="
+	https://github.com/Suor/django-cacheops/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.8[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/funcy-1.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-db/redis
+		dev-python/dill[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	# Remove test dependent on unpackaged before_after
+	sed -e 's/test_lock/_&/' -i tests/test_extras.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x DJANGO_SETTINGS_MODULE=tests.settings
+	local -x PYTHONPATH=.
+	django-admin test -v 2 || die
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<-EOF || die
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 91e6ea768fed..bcee98dc5d8a 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1,3 @@
 DIST dogpile.cache-1.1.5.tar.gz 392536 BLAKE2B 062392cda9b06da889f924bc04743faa133b978a908ffdbc1e9cc9a2a9a69db22ee26b27c7cb2ec2dedee20786cf90c6d02d163731224956091b2d3baa25774b SHA512 b6d453121ef8e58da60478e2e1e2db57804dfa3b17cceeace930ba75d159629dfba4b5d63c50fbbc2eafeadbfcd6e1e4cbe22c8da1f54c90473f8ee677d764f8
-EBUILD dogpile-cache-1.1.5.ebuild 757 BLAKE2B 879d7d4f43856cda3a935158cfdd91ccdb212cf312d5f1a8e3191f48237e5060f87c229439df9f9ddcfb2aed1b4e9506d59066956e3ed71f529ee22714ced4ea SHA512 874736ef61254fda9fe33dd67298941fa993c68a9264c6d57d04cfb5c73c4c3fa5955d57e5107e433f2773e9686a8faad57286834c30969976e23a9d8cbccada
+EBUILD dogpile-cache-1.1.5.ebuild 764 BLAKE2B 20769cdc35655b7558a5ffb40aff848d63446217e9dcacb1ab721fb32292ba06bdcce8df27802a3721dbc319ceef2b5354fb1daea4ea8044efd1392c3ced79bd SHA512 c6e320308220aace89dec02426d5d1b17ed64d03c3950f4adc326ee301219a50cded0c7ce7832211a213be761761e51e256be84fdc3b5ed066e01a6ee47e11a1
 MISC metadata.xml 843 BLAKE2B e0b6ed26300c658bb3f9bdc500bd24c38f26821d3a32ce448c56e5fd129f211efd58ef0faab1a6a9114a96991514de5fb9cf53b26601cb68fedb4c43aab3cdb2 SHA512 992ae84d983cbc06969e888e298cf8124dcf6068871bd5e12dd479a70ca00f5422d8c3cc178a842a340bffc5f72a5b203ce307ccbe49a0a60c0c52a5091052d9
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
index d962b2203d14..9e59f4575916 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 812c749a898a..cb85f1c70bd1 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -2,8 +2,10 @@ DIST fakeredis-1.7.1.gh.tar.gz 71151 BLAKE2B 87877c94a4c03ad6ff4b55f307526f712da
 DIST fakeredis-py-1.7.4.gh.tar.gz 73024 BLAKE2B d3d18611d846a0dabb52d74ca53cad997b37e794ef320bc800ab5339f70710bc30f9e33c0820db941064fbf9dca0dde3e72c78298895b8c2510a93353898b355 SHA512 71c9ffe7c208453bc8f5e719b3647a9b9fc5406c5fe3856ef1dc42c019bd7128355d260be468b62dcb764a918a3510f193fb1aaf374bb3866e352c9c2bae90c6
 DIST fakeredis-py-1.7.5.gh.tar.gz 72932 BLAKE2B 3965df2d238e70f362e5e43a52fe763b2fec34ecc87d4bf38cb8fdf5e8f58b6bad87b59353a932d5e7e12ac243f3c884a19079752c48b6230795c53f7512d345 SHA512 bcefaa8e425cb47d7881c2f91d35e5ec5b46a94f3189b1ffbd71a92cd202a5fcc3d82df8250cf683475bacbbbec088f1e49545f71f2c98638adca58063cc0fa2
 DIST fakeredis-py-1.7.6.1.gh.tar.gz 100750 BLAKE2B aeaf9e38b173d169a8108c6559b3900ac3232690513a735f2592790bfd3866cefa5dff663672fb2fbeae96fd40c203d5a6d86c4ccc0336f54f5f68f7d0f3d38a SHA512 6a92ae7fa60ce7a6913e40b5c6b9bcbbb286f44f8602ff4bcbfb0739d8fd18d772291124a56d9dbff1fd0f69f0605a5a5f524161f8661b1529d9fe4f5f2481fd
+DIST fakeredis-py-1.8.gh.tar.gz 101156 BLAKE2B e799b5636a89edd8795fdc79811689cd308f8a7dae55d7ac4045352f370f428d96fdfed7886598e856c203bcc44d58236a8bf5229ee49a9cec90324f0778ce78 SHA512 7bd553dc724b9d664ff1c403fd9a234ad7a8e95f81a3761eef28c7e6d919b7756040a70382e61d9ff54f8bd8f778130c035e9384707403ca9a4340051a4cf861
 EBUILD fakeredis-1.7.1.ebuild 1874 BLAKE2B 1bdfeabf7b64e17d6b328692d17fe9ec4df6ed413af01132bd813084c8864e4708c18b420455ad4202b5622f9d17209ab7c2471562ab9f8001f0a1e27e131532 SHA512 0f000b8bddb4dded8bf138270bd14053f7b5bb97cb7735fa3918d7a76580841229cd9375146e5e762e6975f382ba630f16f7d29205fc2a70bdb630b9ea1fcafe
 EBUILD fakeredis-1.7.4.ebuild 2120 BLAKE2B 0055f639ff97e1514176862fab473039d729532a42537f6d3f89e17fdf6474db9a85d15eb148501eb58dc94e6a759c6f2a77a2ad71bbeb459b2359f379ed742d SHA512 10d5fbaf60e6981bda102f7e0fbc396837d0c19af18bde1f770e3886851c82b812f68c3c98be360143931cd9230593be48a6c33606c70d15bdfe553c60b72781
 EBUILD fakeredis-1.7.5.ebuild 2120 BLAKE2B 0055f639ff97e1514176862fab473039d729532a42537f6d3f89e17fdf6474db9a85d15eb148501eb58dc94e6a759c6f2a77a2ad71bbeb459b2359f379ed742d SHA512 10d5fbaf60e6981bda102f7e0fbc396837d0c19af18bde1f770e3886851c82b812f68c3c98be360143931cd9230593be48a6c33606c70d15bdfe553c60b72781
 EBUILD fakeredis-1.7.6.1.ebuild 2144 BLAKE2B cbccfa7306a140e573030a4a58918a4fb93050388d7e8fb2277f7049d5cf97ebcda47a202ad4e6ee75d5219b2ac45c453b966cf0ad27e69b96da92b7f548221b SHA512 fee6b9c567383780e19f1117239da16a77da32143d2dec9d2f41120aa5618265f177ac1cb6685f6b955d8f2c078476b3f51a38c74e73d31c588e55402e569472
-MISC metadata.xml 377 BLAKE2B 3d0193874a2947ae2ebf1d74b7f54ab8e8b9459e120413f1fd79883afbdf4222483d6d912831d244c4148856b6ca6f74f38f24d8460f617d00365777e572fe17 SHA512 73a67caf1f31ffcb1935dff9c02f777cb6ff011c06f3c2f262a3cfb37b292ebf1edf5f3332d771119d2a1b165dd390ed46b19a1896f120f238059925826f5997
+EBUILD fakeredis-1.8.ebuild 2144 BLAKE2B cbccfa7306a140e573030a4a58918a4fb93050388d7e8fb2277f7049d5cf97ebcda47a202ad4e6ee75d5219b2ac45c453b966cf0ad27e69b96da92b7f548221b SHA512 fee6b9c567383780e19f1117239da16a77da32143d2dec9d2f41120aa5618265f177ac1cb6685f6b955d8f2c078476b3f51a38c74e73d31c588e55402e569472
+MISC metadata.xml 380 BLAKE2B a47afb846b4f7d2257f29d6d33ed6a00c8cbf147bc3a74202da79dbed75c0ab48969ff6d9d6a7d508d62aaab2a7e0049e4e38ae357b6c99844b6a78da1a851e9 SHA512 74bff19b3e0ff7e90137e0b90dbe5b2a04b5b2b0b2c621a19cd3c2773fae9ca6673d52628b4bf37c36fd3d7142197fad16e0f0b495b7650545523806234d17dc
diff --git a/dev-python/fakeredis/fakeredis-1.8.ebuild b/dev-python/fakeredis/fakeredis-1.8.ebuild
new file mode 100644
index 000000000000..7b846fe8e9e0
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-1.8.ebuild
@@ -0,0 +1,93 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..10} )
+
+inherit distutils-r1 optfeature
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/dsoftwareinc/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/dsoftwareinc/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/redis-py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/aioredis[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin redis
+	sed -i -e '/redis/s:<=[0-9.]*:*:' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
+
+pkg_postinst() {
+	optfeature "Mock aioredis" dev-python/aioredis
+}
diff --git a/dev-python/fakeredis/metadata.xml b/dev-python/fakeredis/metadata.xml
index 3d21e4768321..2b6b02ddf6fc 100644
--- a/dev-python/fakeredis/metadata.xml
+++ b/dev-python/fakeredis/metadata.xml
@@ -7,6 +7,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">fakeredis</remote-id>
-		<remote-id type="github">dsoftwareinc/fakeredis</remote-id>
+		<remote-id type="github">dsoftwareinc/fakeredis-py</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/fastimport/Manifest b/dev-python/fastimport/Manifest
index 917ad7d4553c..42f131bb6645 100644
--- a/dev-python/fastimport/Manifest
+++ b/dev-python/fastimport/Manifest
@@ -1,5 +1,3 @@
-DIST fastimport-0.9.11.tar.gz 41764 BLAKE2B afb82878ea1996894ff71fe99edc5ca26d45f98eedf7a8a6e85af45949e1e81c2112de9fc2c026438306a8a0e89c484063954ba7d2ff9a80c6b71ab40174f8d4 SHA512 e1b7e4897542ef6f33af51e1018340a6807688e44424e4e7e482b3347264d58d4290678cc2cfa230af500a53cabdcf35c9e7b03c8ff0f1ec3e6e0a9e869a1455
 DIST fastimport-0.9.14.tar.gz 41791 BLAKE2B b0becb3de319c44e60cf8575afd9b19ad69ca8715d9eae8ced079136dccadda82ac340ad7e01f8a556bde07fbecfbbe6f9eb841909ee2e6b6bbe8e808f463e43 SHA512 cbf8f0bf5b66e847d4482b6af29ee26a69a2aadefe22c4a2f17d976a94fce86b016b61b17d0a7f4be82ceb7824d0bc12b509b8148c18f9dc8888304158a7c266
-EBUILD fastimport-0.9.11.ebuild 664 BLAKE2B ea96510fb3370df0e9767b51b4e53288fa38a674c59bcc40d6d864b600c9d41254a1e3bbd4e0ffd2bcc4ed1e3407a1e4a9c1241788fa1086142918e9c4014f1d SHA512 a55790e863752620562e8aba4c8cac5778c0c11f335153cf38c18e365e76193bd0199521fb7f41816cac9ad75fd5636d60ad390740d14ef426a4c0b7fc37407a
-EBUILD fastimport-0.9.14.ebuild 745 BLAKE2B 161ca270d7f8ba70cce2e287e8c3d4c75fc71836ccbf2b92965dc14d7ca2f2b90a4527b522fbdb06382d015c9039e737c0dd3e218910da7c24d6efd5f890bd9d SHA512 058ce59157abac1d96a60f6943a75ae7dcfd948605d63571bcccbf050359ad79078c095fbc1d367dcc058e36a71ede7704d8aeb424f2fae72e002f4745a3dbf4
+EBUILD fastimport-0.9.14.ebuild 744 BLAKE2B 6fac364a7d842ac9b7a3e250c9b69e96e1f83e0c95bba392ff59932ce6096f46e3a481489412fce9254b027638cccaab4e323181c8d53b11d007d628658123ef SHA512 de460c066edb3f795c4baecda36690350132989fd6d8758a4201af58d4930353417d17709e26b2efb6418bf7ba5bd8dd54c996b104bed2cf0806b68aff2ea70a
 MISC metadata.xml 510 BLAKE2B 4a5fb1bbc975e2ea96ba006cee969224dc838dc670338210a95630dd61b3e4fda8e9d0da833ff0afbd68900f50a3cec06bd768f41c013f843ebad1e38ec9c095 SHA512 a7319e71da1dd95051e339715b4359e0a99ae1de246ce64094222013eb27cc2e04aee484629aae172ddc26e594b8dda717f8726e5c4ebcb46e351064169151a4
diff --git a/dev-python/fastimport/fastimport-0.9.11.ebuild b/dev-python/fastimport/fastimport-0.9.11.ebuild
deleted file mode 100644
index 59fa4261dccb..000000000000
--- a/dev-python/fastimport/fastimport-0.9.11.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fastimport/fastimport-0.9.14.ebuild b/dev-python/fastimport/fastimport-0.9.14.ebuild
index f4cb9b7189ff..804e761483d8 100644
--- a/dev-python/fastimport/fastimport-0.9.14.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.14.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/flatbuffers/Manifest b/dev-python/flatbuffers/Manifest
index 9f5e948c818f..70e4336ca902 100644
--- a/dev-python/flatbuffers/Manifest
+++ b/dev-python/flatbuffers/Manifest
@@ -1,4 +1,6 @@
+DIST flatbuffers-2.0.6.tar.gz 1724250 BLAKE2B b6969b28dba753c4551b33d27409d9925c10a640ae860264f8054c19a470ce3da366c0bf7917bf7fe4f6cb57acbfbe1837f175fde40b84d311df6d1378d146ce SHA512 be631f34064c28d81876bf137c796e9736623cf2cc4f2a05dd45372e7195729c99fad1fa795f8ce71a408756a842edbdc0c3bc714a7cf63203a1de8681d86fb6
 DIST flatbuffers-2.0.tar.gz 22462 BLAKE2B a07f1d27afd71aaa23ba26a061267f95bbb7e0ced8b2c110b3d60fdb9d922fd4b339d7abc63068a030e08e6d824871c61110a665edd6781ac54dd5ef8613975a SHA512 76636449c107f1b2d1a1f395dfbb04c89c25946d8a731a257475ff2517f9667095f3527280b87fdd4081fd5a9f7aa0a112d5daae742c1575d29abb69da595b6d
 EBUILD flatbuffers-2.0-r1.ebuild 480 BLAKE2B 5a1be0d0e4f8ccc6eab4514866d8b84477e89f836b2aaaf0652c1f6831f1749cea41ab840a9743dfd53d0a7403677fe67832ab2f70ae071c5bb8e38ff57e4d84 SHA512 0013ed1c17435b4b25fec703a1841e0f9f0c2de32565e38dc045fe90281ed1c3ed72f480d720c57c3897e62c8a56cacfd50cd49d3cb085f0e63add2b5c3d224e
+EBUILD flatbuffers-2.0.6.ebuild 534 BLAKE2B 82828d254a0fa9de04286afe2d094577e0c6c47f674cea306dc38008e29a3258999776ca9d73a48ac29082df9f638fa7d01f7061fc18516eccf68f06e9171753 SHA512 97a51c592fefcdaab7f29dc474a7cef148a05b7056cde20908275174db5a05928b0855f0dae0629bd86b00928d512d078f601e864ffda6c196d47b395dfe01b9
 EBUILD flatbuffers-2.0.ebuild 439 BLAKE2B 5c1a0543a7b77d17990dd8fe6db2234314fb8c4f0ad07c6a38904448fea67f427e6dbfe12e591a8e33e9979c6f76dccedeff5eed6f587879971fac392197e372 SHA512 d5cfa733d215a1014f766268a961ba7ecf3a86d50fb28087778e9b0d35e431f8f743aadb34d0d182e5a722900bdb8232a5549c1f06c70544482c786a40d18610
 MISC metadata.xml 402 BLAKE2B bf3db07152b0a0ffc120390c8c0267887430428621aab106730b9ede41e211594d7950bdd52f5eee15080be5f60d4d781269f5ee192b131256e6857ffe45a2b5 SHA512 dd3f03a16f95ece3be6ed0967ac0f948c33552e2af05d52780a376556189839df020b642fa7151e78031cac6a6f7b2811b616c2a6da4f2d7dd95d12789e33764
diff --git a/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
new file mode 100644
index 000000000000..963fd1f08d88
--- /dev/null
+++ b/dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 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="RFC 7049 - Concise Binary Object Representation"
+HOMEPAGE="
+	https://github.com/google/flatbuffers/
+	https://pypi.org/project/flatbuffers/
+"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+S=${WORKDIR}/${P}/python
diff --git a/dev-python/flit_scm/Manifest b/dev-python/flit_scm/Manifest
index a9ca2aa80dfb..5b20b9ebf693 100644
--- a/dev-python/flit_scm/Manifest
+++ b/dev-python/flit_scm/Manifest
@@ -1,3 +1,5 @@
 DIST flit_scm-1.5.0.tar.bz2 3230 BLAKE2B f29f7c0cc341fe12d621d0a8f91b5d983f8f7e4259155a7119b07d8e159a12755ae60e007d1ace9054385104aa2a572454653ef9f92a3043777b1e631dfd5f20 SHA512 1b8d4a653dffb4685ad91843147ba6dc693b6d1d4f21e8766782d04edc1ec992e3ad4a3ce82d25e01a089816648f86228db75024e39a7a277b6fae9f8fc4567a
+DIST flit_scm-1.6.2.tar.bz2 3230 BLAKE2B 3977f1be820f2f590f4f781f065661adfc4a05427a87882093acad81f87eee2ba20d910ba3662b5b19997735f0356d262a4f150ba940310166b62a019b68ba05 SHA512 32690af4d24eb704338c78fdb0080d9f910a0741066d282e79eb88c473ada8d9a3daeba1a9aecfe830b2a6d0cea8da471bf6ef904b105fd8036994e4a0e12d12
 EBUILD flit_scm-1.5.0.ebuild 842 BLAKE2B a49c7e6f53f5ca840f3ebcf5d23f0adb10d126a50a3ba261485b8e2b204b7b62c238995d7e971e89a14c9a09c73efd3a15e579c635e416e744c3360da9a45754 SHA512 864c29941abf9fa93e6540b2fb10cdc57e7f4387bf3f15baabd7566476001937e8cecb3a7cd3a3fd9c7116cf7e491a060a0373ae8d89a3d6536d3f6d726fd32e
+EBUILD flit_scm-1.6.2.ebuild 842 BLAKE2B 58e4691221f6cdf99ecc919e340f47088d1e0d3a0211bb585537afd388cc47d074177a9fa1e5583ab54ca5c35a39fd72144290d5dc81c1617c8515acd89190b3 SHA512 2988e352bca4bfb3f3a7d1259ec59079a1f61ea333bc28776915be04691b7f68a6c8e5964428d08f33b52efba43734671f00c04512c0f114667b212969562a59
 MISC metadata.xml 290 BLAKE2B 555156b5f21d6d87b8077755a5e7ce59b7341380e29c073535e55fe44aa668db2837e42416f88d8802ef879be0dcc1ce85e27545db479add9b4273de348083c3 SHA512 7c3f74c83b9e928eac698099602db5e75cb9878354bd465c063f0e050fdc16ebcfa0e7ead8e26e5c82cd54684e9eea9b2657376c26330bb8c77bfee42116b889
diff --git a/dev-python/flit_scm/flit_scm-1.6.2.ebuild b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
new file mode 100644
index 000000000000..58badd36d354
--- /dev/null
+++ b/dev-python/flit_scm/flit_scm-1.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A PEP 518 build backend combining flit with setuptools_scm"
+HOMEPAGE="
+	https://gitlab.com/WillDaSilva/flit_scm/
+	https://pypi.org/project/flit-scm/
+"
+SRC_URI="
+	https://gitlab.com/WillDaSilva/flit_scm/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.5.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-6.4.2[${PYTHON_USEDEP}]
+	<dev-python/tomli-3[${PYTHON_USEDEP}]
+	>=dev-python/tomli-2[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	# unpin deps
+	sed -i -e 's:~=[0-9.]*::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index b94f35acb402..79a0da9fe935 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,5 +1,5 @@
 DIST filesystem_spec-2022.3.0.tar.gz 331768 BLAKE2B 8f4e75f839419f7445a9291e3b67914338b0371742f1d3a556962b6e5abb31379cfeba52e0101f7660fd69569dabb49190820323b7e067a0c33c2184422ba067 SHA512 7c793b506e93f727bc4533a778f6108f82c9ab9274a8d259ecf483e0acbbfc97e3c8b07735f772f996867053d7e1f9c22687865f4f64cae6eb4fb511de2e9220
 DIST filesystem_spec-2022.5.0.tar.gz 337612 BLAKE2B 722ce370d0cfa97548956ea8bfc533ded3eadfb6a1fdfbb83513fad4fbfd34e2d700ae69ede812b7ba132beb29ab18914852487b94b2a8e5de4b106d6f554eca SHA512 9ea8040d5f94c3b0d3c21df7b27413e0a9a4f96973c961e3f88238adcf69a9c866790370c3d8b0149aa85d0bda67e72f7b75a2a9ff1c27e5171a4f0e41e3ffe9
 EBUILD fsspec-2022.3.0.ebuild 1295 BLAKE2B 2b32ba25448d9f566929572e1966bb0625f05e032978deed0dab3f4638eba9437e4d8bcf5e448ad005792e6b94ff7ed68f9d0cd6af77394dd5c2411f4b8910f5 SHA512 9cc1bb6e9d76ad35b0204ba10de4bad1d2f9392376a1927650bcd548a8e66758d7b9468e31753489b83fdae1ab139f7bc6d333a82086fcf6848dbe48733a97e3
-EBUILD fsspec-2022.5.0.ebuild 1404 BLAKE2B 5e241ce56a7137c70abea20cdf922b4225d4a27fbc2af261f249c5d3f5dd1f9df93ed6159ea406b1a70f4a76cba58c74d7a79284d1f0e7c7a3c20ebf5302dab1 SHA512 ff7acda580925c927bd232eafb64054b4ca93a56b6de0e147fe5690daf9b8599f391648c6233b167330307a75205cbe8c70e810a816be224f979b2a339257fd7
+EBUILD fsspec-2022.5.0.ebuild 1363 BLAKE2B 35f308d1290e616857143985b08881a7a363ebdb424dcf3cccbaeb3fe179a1a65c17d940c14e3dba1ed1b7a9ab565b6ac4991c5d1b2774c99758c51d2279cd97 SHA512 beee389997557d3dad3fa058b56f4ef2849576491a309673140c6fcd0be6ff4ac02841b0108ceb16b070a7bd644eb152ec339cc50b2ab53fc5204097f0332af2
 MISC metadata.xml 374 BLAKE2B 6c0b18a0ad3b85713ae6f618ac0646ed63f08549bd7d1ed5bd94b80d89d79efaf2f97ce913a0a7d6e54e77cc602994416520a22deadcc71e484cf7ca22bc6dde SHA512 5bf051387d6bcffb3022d023f60ee8f76ca277bb8d626dda988a0baaf1d1e3a71e872d8316607ee7e269e579b5a17c23ab93c56fade533150171d3ce44e4bb71
diff --git a/dev-python/fsspec/fsspec-2022.5.0.ebuild b/dev-python/fsspec/fsspec-2022.5.0.ebuild
index 058fa0de88c9..d1a992aa38bb 100644
--- a/dev-python/fsspec/fsspec-2022.5.0.ebuild
+++ b/dev-python/fsspec/fsspec-2022.5.0.ebuild
@@ -22,7 +22,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
 		dev-python/aiohttp[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 733edce9d073..f117d0da671c 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,9 +1,3 @@
 DIST funcparserlib-1.0.0.gh.tar.gz 66709 BLAKE2B 76229795e88b5b880667e41b2cd3d534649893019824e7206f41d188f44e7a67bc1cdb97b0cbcf731eb840ed128f29434d0748d0923a16ea0a3130b3ee10d206 SHA512 431d6b639c46dc84a0a12c8de976cb2c1369f0172a18d1eadbffba31aff12e9cfeded5ebec3ec63065384547000144d65d60003c55e2b23a1a40818d910aaef3
-DIST funcparserlib-1.0.0_alpha0.gh.tar.gz 68260 BLAKE2B e1a9a9a516142d683424df881a7c390a3999438905136fbd394f23856022f14390d22f1dd3914e680d2c188c819cce9cc4f7ff2e485478614dd4632701db4614 SHA512 02cac31d76bb888118a99367811a8cfac28a999ba113ce43f4bd6211cef815ce1793fc1767637dd019728f15d5c408e859d5bc8365a2c53804092f1d6f03e54e
-DIST funcparserlib-1.0.0_alpha1.gh.tar.gz 74033 BLAKE2B bf4ee5011f595c6b7ba7430c63e21243257ddc2e00cccea75bf5b16feca2a629becd28f196d657e024419010051a33e5f12fae29b6f8763b35cb8d1bb9144a6b SHA512 16dbf07edd5cad979c61396adc3ccce7dcedd46b3cf6394ecf35c9fd2b22cdf262bb609ffca9a4b6f9f0c236124a7b7cdd929166d65056ca71e73afa2f6b97e2
-DIST funcparserlib-1.0.0_alpha2.gh.tar.gz 66692 BLAKE2B 5d45b48c0efe6025b50cfd603f2eeac4341b5e41185fbbe1e0b948975ee778fcae05dc229a34bfde28b64f2723c21699ffadd243629244a067951cf17049abb3 SHA512 a7c1f4219bee2b203d5f3a1701e24f838b348965ca5bc090aa8f7af0407344af22ec5eb2e161212e6ece42491a775076f45a36f8e2b691d78a3c639ca4098af1
 EBUILD funcparserlib-1.0.0.ebuild 669 BLAKE2B aff216da08adbb2c1445ced33a3479a90c40d2274828576da8228839a361f7389674232a3e7ff3736e91acc8bbc3a75c2d7fb12e74e1a00efb21fb88a30688d3 SHA512 b07dd9975a716fafe570899f2f6e158c8f532776f87ae479ecabea16e5fc6df4ce2b113a08b0e21e809d89923c5006dd4cab80ae1b3527f6cd4fb0a81a316595
-EBUILD funcparserlib-1.0.0_alpha0-r1.ebuild 899 BLAKE2B 398dd8ee978ebc79b8ae0a8f20caf30d20f79a73b65882c9f468c4bc9f4997c83e3902fe4393b40118c62011c77175ccaac9f67947cf8a465c936572a3b5391a SHA512 b05b2f838771f953bfc69cbde48f15ea17f4334aab056f491d52d9c02b538085fc54446d70924fb94f103cd62c17efdda8d1e5ce8dff3409a3d8760e6f39188a
-EBUILD funcparserlib-1.0.0_alpha1.ebuild 772 BLAKE2B 9d982d2289bb4a5cf84df92663af51de036b15324020caa679d7848f78730096cc37f0e2a4c3137bf6556e81ab5699af53bd29dcbaa4abc80895e169280d3972 SHA512 627d7b2f423ddfdc753c43a48ad09ef473dd84ce7e690da43603fefa2b13b5565fbf7340258977b15b248929af533420d0bb9983ebf4934256c36592b86d10d7
-EBUILD funcparserlib-1.0.0_alpha2.ebuild 688 BLAKE2B 64d934a9dd0b848a681ad2261700c05874f23577e47ea0d506651f5b2091c8e60beb87072c283360479cf6d22df93535ae19cec3aa0bbef2ba156bc3991de862 SHA512 4fffa878ad7e410d022bc1a09fb4132e1486623051647a903cd1303a8e74e4d607425f0c43c6304a6fe6bc94c71d2182df434eb610513bb3332b689908f3c5e6
 MISC metadata.xml 406 BLAKE2B 0d7fe946eef963283c35b6cf68e714b4c0e09e0c6c132d568b71ed8f646357dc22af1de032258fef3a013f988a2876a392fbd080b271925de52aa7de0736ec40 SHA512 372cfba71b6342d5eab47086dead58bbe506a8da0d3f32b4538d7e5ad03a6c1916410c5f2f3296a9a07d1b5a7a87a1c93fc109a657a1e94b4a5dc2924fb744d3
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
deleted file mode 100644
index eaa5d281e793..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-BDEPEND="test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -e '/requires/s:poetry:&-core:' \
-		-e '/backend/s:poetry:&.core:' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
deleted file mode 100644
index 61cd5cd72023..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	local DOCS=( doc/*.md )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild b/dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild
deleted file mode 100644
index 5688b13e39c9..000000000000
--- a/dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PV="${PV/_alpha/a}"
-
-DESCRIPTION="Recursive descent parsing library based on functional combinators"
-HOMEPAGE="https://pypi.org/project/funcparserlib/"
-SRC_URI="
-	https://github.com/vlasovskikh/funcparserlib/archive/${MY_PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 74a2d71eed77..ecc0b66fd11f 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,3 +1,4 @@
 DIST gast-0.5.3.tar.gz 23455 BLAKE2B b7263e959178421a7ba1cdb41cb09edbe1c30680573e1ab3b4de114e0bd151d2278be799fcc1a01524bb5ee6f6d6764d9902dd0018e7cbe54ac7a3d1300bbeb1 SHA512 a836be76303591ca7c40596d98a29dbd53f281e277c8c23e3821b2003d4e8aaf4d806e7f532f27c0eadd4bdca5a28dc0a3902245505ab97497b9afbfee0c2e52
+EBUILD gast-0.5.3-r1.ebuild 509 BLAKE2B c0c103a1c476e068c88395d7c96c9c21b74093b76005c53ea1cec4048b59e378008c51292679ca733197ce49ff11c0bf186bb1379e20664308f36d0b569f5438 SHA512 72ada64d963d0a34c01e421ec4312fa618bef7d90edabaa77aa4d49772c2b10f852793318c6915c495980cd61da1aa174a4349b9a0f1b4b14be34ce7d435d14c
 EBUILD gast-0.5.3.ebuild 471 BLAKE2B fbabdad15673cd0c30c70dca16d22714997a486d741acf5302f26253cf12aef3ec56fd67ccc8fb6c7ba84575544bca5abfdeb153cb04fe651b7f29813e1a859a SHA512 54cd3099101646f0b8bbf131257bcf82a0e5b4f5ccf8f2bbe352070a8974eb58ef3db55e4bb35c82e694d63dc6348b6deab64a3b6ef7b583a30b9cbfe783f767
 MISC metadata.xml 677 BLAKE2B 2c536c1a53fd3be71dae57488b28f71af9e27dadf2987ecf3967bd74e30ee688fcd598f995d7e0b1b74694668b92699036a8049c54698e389d71687a06df6587 SHA512 9330e92aebd0ca5ead979f70d86540c5b416b60580d45c6b7f8f02e4753bfab476d9b1a22dd7ba32f1167be5512983d275cfe07f57757c484aeb8619e836e13c
diff --git a/dev-python/gast/gast-0.5.3-r1.ebuild b/dev-python/gast/gast-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..d72434e33798
--- /dev/null
+++ b/dev-python/gast/gast-0.5.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/genshi/Manifest b/dev-python/genshi/Manifest
index e4d54bc98db2..f8c695ed09b2 100644
--- a/dev-python/genshi/Manifest
+++ b/dev-python/genshi/Manifest
@@ -1,5 +1,3 @@
-DIST Genshi-0.7.6.tar.gz 268913 BLAKE2B c54930023c4cd45e24f44baa62f3cc3fe887c5bfd5feb9f7c694cea9bd500cd8c0cea0ed7a60035fb58de9b933199f54ada2a14edff9f5a1b1f63203d10ac7c8 SHA512 a05e82b2b1b9321153a202e5926a26795ebc7c56ee13b8c6da197007a00711efcc7f8ebfb759446c4c2cb99e7e92a6f689576f9ef1f766aa42e0dab86fd5e335
 DIST Genshi-0.7.7.tar.gz 267206 BLAKE2B 0bad4b26fbfda27572e78f87af6093c87d738ad6fdf2beea5e8b0b21b3f5245a4e239bbfbad63e71e73f6588e7cae97f2b3bc7295fa30ad7a203a7ceff7074c9 SHA512 b0a3dee68523292f0672a180c5f2cfbdf48205d82286359b9fac9f668cbc2806c649d1e158d6fb8ead5b1cc5cd44eefe9d1cd79077f96925b8d24dd8e746b40f
-EBUILD genshi-0.7.6.ebuild 877 BLAKE2B 45ea1c9cba01dcee34fd3a5ffcde29bea2dcafc4b59ce2f583a6921870060b57ee1059b033e96c3bb59e2bf719f620813a7cd96c01d857c32b05588fec3cbbc4 SHA512 1cda1d5b91ac45c8c6a76864db04f29b428fc761e150cf9feda91af96df8244f7e85da416751075ddcf62170a6251be1396353ccc097c6b93c31cc89886f97cd
-EBUILD genshi-0.7.7.ebuild 923 BLAKE2B 603e3d03182ca664c202d9b7d99f7391744f8fe3342c6354465499dda369bf3cf7327d54ec144ac0706d14101c5eed5e8d9314da406c14b8ddc5c5bebb5e3b76 SHA512 509f824a0826b547e934c11e0e8a148ad8c1cab4acb4465aa66e6bcd7946a0ea6b3796cb8a986f8fefbd62a777445d0807eb6564bc404dcb66af586509ad17e8
+EBUILD genshi-0.7.7.ebuild 922 BLAKE2B caefe4517af6433406319d3490b0dd76544a5fcf6b4da76d91a61adb09941c218c3bbd1f8efae56e99968e760a80e2c325a1eebfb8853cedbf71e940a34f0fc8 SHA512 21ca8f92c9fdfd24a1d3fdecb08f192d8cd0f845bc5fda8472d09313d266f52675e42df41f9b205af05b6cce98cb177a1140f6b9bd1c7ace10939de16d5c86fe
 MISC metadata.xml 365 BLAKE2B c5f3b55444eb424fc0ec15f0f19eef39a31c2c5e900fab7a06fe7bade29893ddb59baf4fa7f60621017a400dc7004dc093d124e1d3366df2663c0b714e31c8cc SHA512 1914d0acf5d6c517ff0198c827f606acc4124e834c306312d49d42bb729bb82b80ae6c98f3ac0797178eba3beb2c437a10665a23a843d0d3efbd148250a189dd
diff --git a/dev-python/genshi/genshi-0.7.6.ebuild b/dev-python/genshi/genshi-0.7.6.ebuild
deleted file mode 100644
index 0672470e7184..000000000000
--- a/dev-python/genshi/genshi-0.7.6.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python toolkit for stream-based generation of output for the web"
-HOMEPAGE="https://genshi.edgewall.org/ https://pypi.org/project/Genshi/"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-S="${WORKDIR}/${P^}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	if use doc; then
-		dodoc doc/*.txt
-	fi
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/genshi/genshi-0.7.7.ebuild b/dev-python/genshi/genshi-0.7.7.ebuild
index 51a18a6a0eb6..faeb204e2307 100644
--- a/dev-python/genshi/genshi-0.7.7.ebuild
+++ b/dev-python/genshi/genshi-0.7.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 18d9551697f9..a2484f637a69 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,7 +1,4 @@
 AUX gitdb-4.0.9-nose-to-pytest.patch 2453 BLAKE2B 6c827808467f874d500bd6b15cefae6292d01ad9f104e8085e5038c92970a329847654c097b6be8e3a2edeb42ff0c2ebc708de9601f74cb90a4bbfdba31e1cf6 SHA512 d5878b74919cec9481b6f0012e35bb01e4fbfc42d053900f1ef1af3f1f4ebcc01c3a0a14a4e60519d24cafd5c51fb43174c58ac00f5bc7eceea10a8ec1f2f3bc
-DIST gitdb-4.0.8.tar.gz 394637 BLAKE2B 8eb3b04664df0fb40b93ee814d94a2526d62127c3dd7d0908f8c3ab9c3fc4d7ad368ad6a4288e509ce2f6e43348cb4f3761aaf404040bad1c59bc920517888af SHA512 fa883bf135080a9defa039bf1f13aebdb91c7e8d397c870e24d7c13acc1b30fc32c6299b43c117657382c1908ace748b0967bc53e02c2d73633cc8603fcb8003
 DIST gitdb-4.0.9.tar.gz 394670 BLAKE2B 7882c2757f7c6ff9fa6518504b46ff987fa69f38ba28713a6d140614944e2ccb1c371321402faae835455659a8b33c12523cb781e9c62c79132a724c7ad4d86d SHA512 174b90e09b65ba38d3404fd79a8963987ab49a5e2b96ce82057b519861e8312342c425ff10849c865f66e6e88c27d651d8902a6f8abea88f9f33161f44974109
-EBUILD gitdb-4.0.8.ebuild 1209 BLAKE2B 7e119209dcfae9a1103c0a53496ce5b36972e76a786340869707dd41a041a2acb672058fe55e0fb3ec627fb0dcafe2675fe2948ba4f44e09de41184df4184295 SHA512 1ee0583c19e3091f97f6e20779e1b14f7b4fd8e14be1ab32a25ea3915c170debd8359c224c51b38e89f66994289ce1e2c61ff9dfc5e3f0c99f17fcb92d02cb55
-EBUILD gitdb-4.0.9-r1.ebuild 1261 BLAKE2B d60c9fd95a5c24b511f765c98f5230b16e3bf4e119b14bec9ea2bc79da432348bad1334bd312639cf20280dbb84d20302e5aeec5896e7cb07da30eba05260bbc SHA512 4ec807cb33e67d3949e47752ca5af94ec1f0687e9c55595a6a77fbdfac9541179833d93f47afb999e91de90d4f6fed1066261cd3c93c2c6f2b67d278cca5cf5d
-EBUILD gitdb-4.0.9.ebuild 1254 BLAKE2B 0de9b98a7cbb256145d0142e7d5f4c169a5787bcf83f75b711bf546e98f21bb263bb9abd23e5aef70d20f52902fe7804ae977b58b2a303664d9d298629e05350 SHA512 2392ec273180f309bad7a9afcc543749cd4971efa34c1ef9796f8d53f6c63bff094abacf5c13761a9e9d726a6cadaaf3c7449d6c063a6e4f1dc4f30bf63e407e
+EBUILD gitdb-4.0.9-r1.ebuild 1267 BLAKE2B 22afdea4f7c6cce18b10019f72d2ef391236411d749078446b70231409bb1882140a2b00534d55649ca8521658204c147ec64b976b150f5555aed162b8f46cea SHA512 8a253957a94a0f4f58558dfa5e5804cede22f470a0a0596ed921e62ac962a0ea9aaaaa811a1e71fc76ec7ef5b09abc9459f97a475dfd74216666d5bc59b31c68
 MISC metadata.xml 412 BLAKE2B 102f815a0eee2ea04a3c77b8b26f08760bbd64ee1f0b6b2523164f3b3fb576003865198574529332c2da8f6548f232b4cbc1bbc2e93fd7a437fe77dbde934ca7 SHA512 1f94c86c4366e0be10f89e3dbf935025bbf51d547b0ba65d99d2e97da0590de0d05fbe05e0277b0177fb1b2a9cea55cf824d332a224336d71cd49b0257fc31da
diff --git a/dev-python/gitdb/gitdb-4.0.8.ebuild b/dev-python/gitdb/gitdb-4.0.8.ebuild
deleted file mode 100644
index 8c146410de5a..000000000000
--- a/dev-python/gitdb/gitdb-4.0.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb
-	https://pypi.org/project/gitdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)"
-
-distutils_enable_tests nose
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
index 1f7510bdfee4..5eb050582e8b 100644
--- a/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.9-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/gitdb-4.0.9.ebuild b/dev-python/gitdb/gitdb-4.0.9.ebuild
deleted file mode 100644
index 94184a149103..000000000000
--- a/dev-python/gitdb/gitdb-4.0.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 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="GitDB is a pure-Python git object database"
-HOMEPAGE="
-	https://github.com/gitpython-developers/gitdb/
-	https://pypi.org/project/gitdb/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests nose
-
-src_test() {
-	local i
-
-	mkdir "${T}"/repo || die
-	cd "${T}"/repo || die
-
-	for (( i = 0; i < 2500; ++i )); do
-		echo "${i}" > file"${i}" || die
-	done
-
-	git init || die
-	git config user.email "you@example.com" || die
-	git config user.name "Your Name" || die
-	git add -A || die
-	git commit -q -m ".." || die
-	git clone --bare "${T}"/repo "${T}"/repo.git || die
-	cd "${S}" || die
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	#TRAVIS=1 disables performance tests which rely on the gitdb repo
-	local -x TRAVIS=1
-	local -x GITDB_TEST_GIT_REPO_BASE="${T}"/repo.git
-	nosetests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 16a15e17cae9..506c90eeaa69 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,11 +1,5 @@
-DIST google-api-core-2.7.1.tar.gz 163942 BLAKE2B 0b28e8dd8607ed6a64a3715c14e321f74d18abc09bc2eee5c6d080936160ea9d6839f1acf9589667c86a688e4e02038cc204f25d0b7cab3e3ed3af2463f31abb SHA512 2264eec00309f272ecca278e8f310bca4be64cfcec94c05fa96a7a8ae350fce0ae9931fbb27aae71e89393289cdbef782631a6766e85d5aee449e903e70f0817
-DIST google-api-core-2.7.2.tar.gz 164017 BLAKE2B d2f1c690527c750a819718043542ce853be7f135660dfe661db2ba315213ef4a9756eeab6f1854275044d4f1fed50d119c2914eb00e043b7d5b085dad426a26f SHA512 1fb420a41d603d576030d2b324036de10831035ce1505ba94dedc9e58ce354d0f23e1d3df8a4f2f5082147a1be49d93e10c2209a1407f90ffedfa74815730e14
 DIST google-api-core-2.7.3.tar.gz 164219 BLAKE2B c394fd95bff3ac393174372e0c49f9a7974a006de6f14d07af7b15b4c531d6dae7af8c38e00263289a895cb9dae9ef23368d793f5ae3649b9b029337a72cc0ef SHA512 2bf49738216cd52dad2bdfb3367e370390c366b49a8c3c4f6f49a2a3f17b27120d99933b57c8eb8c9a1f0f25ef5ea6d876cf8c3c6c759d3585d625e57b1153f9
-DIST google-api-core-2.8.0.tar.gz 164541 BLAKE2B a62aa242e99f2e554242db1bdfdedc5ab4eb7ddd0efb3758af33dcd7417ce964cb1c5d11547c26b03e92684507e1573d1cbdc158efa39060e59254fed3e12626 SHA512 5ad9c4b8f8d15645e18f4377396a073cb23b03e4357d3840bcfcdc5bb182731817bb1188b3dd7f37e4083d4d6d0cea3d46fadee23fc9011a2fe9ca67f505e245
 DIST python-api-core-2.8.1.gh.tar.gz 164630 BLAKE2B 88db73f210ae5ee4aa2e7382ea34ef59fb51f88e196622556327c130057b74594884bbe21719bf12cc6ddc9975cf12ac71fa24ac4dfde4681b4742af57702b5d SHA512 f3bfa476562428246203592b53c22e8e52af167af10b1fa68afb51fe6e8ca8090e9231e4c297847d12c201ca791aa80153bee07f72939bc65920260ec50b3d38
-EBUILD google-api-core-2.7.1-r2.ebuild 2292 BLAKE2B 20473aefcae801fc41b1207eea8d9f781ab330c5ca4b6f857773cff1bf8ab373f80fdb49052d33a69c4123e79610c09b895b98302216648139b864a223bf03c9 SHA512 8cf1ce44f00419ab30eeb71f4eb3fbd91ef198a2e22fcf97ae9c15b103d0229d6dc44aeae2f905d596d50003c097e56d971412c4b544c24a686e665bc7bab734
-EBUILD google-api-core-2.7.2-r1.ebuild 2035 BLAKE2B 8bdab82df068514cf5630211b0ae3653a5c65fc29a188e977e9d0842b5f8ebedb15affe28354c0d86c8a5abdb8bad13e7d546d897690f5b9685403e2e60381c6 SHA512 d6e1ddb9db77768041dcd76eb4aab27290a8101938c9fd4930cd30d77fd90ce521e7fc4bf55cd77442e5348e944689c5e2385d87ba90292c6a82426debf977af
 EBUILD google-api-core-2.7.3.ebuild 2033 BLAKE2B 07991fdd69d5ccf49b352fc93851341f765c33fb8f75ee8b4d1b370ddbfa34279c7fd9974b25a2f2e7eef68f3027c6b082e1cf0ccfe4938c17d39b51e4ed60dc SHA512 8e6be9622052c0b63c0ba7aaca18659245410fd45888596c137b57692ab916a4050ea9ba154954f97d378ef7100a14c1730d8cf171549d1c834198380ddf51cc
-EBUILD google-api-core-2.8.0.ebuild 2035 BLAKE2B 8bdab82df068514cf5630211b0ae3653a5c65fc29a188e977e9d0842b5f8ebedb15affe28354c0d86c8a5abdb8bad13e7d546d897690f5b9685403e2e60381c6 SHA512 d6e1ddb9db77768041dcd76eb4aab27290a8101938c9fd4930cd30d77fd90ce521e7fc4bf55cd77442e5348e944689c5e2385d87ba90292c6a82426debf977af
 EBUILD google-api-core-2.8.1.ebuild 2118 BLAKE2B 2b8508a51da3bed4950e4e3c9066acbb1a8e3404415beb4108ac0cf8f72eb43ab367340093fdc377b83236a306a339e4d4cef26286da2fae8a44f60446179073 SHA512 7aee5143b8943ee5895244e40b68ba4fa31401eaa1909aeb79887c1ea338f678d292400a516c8f6981404b041766580b01813b0a837bd47640c7b2d7c7663637
 MISC metadata.xml 453 BLAKE2B b53e834b3c423d8bdceaa2568f38173fc203f92f2340edd42899e4d4a93602118dbdb2283d492e34189155c336ec659d96f907f257b34cbe5557be331169a4f5 SHA512 d26c893b82fa946cab27669148b3dc2dea8b985636209ae49294cb14a7055f6c4a3884b38bce6e4923a54e9872af7e540b33a992eb727caae96e071a8ffe3237
diff --git a/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild b/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild
deleted file mode 100644
index 8b6705313d6d..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2020-2022 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="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-	<dev-python/requests-3[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-# grpcio support is broken if grpcio-status is not installed,
-# and we do not package the latter
-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_StreamingResponseIterator::test___next___w_rpc_error
-	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
-	# TODO
-	tests/unit/test_operation.py::test_exception_with_error_code
-)
-
-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-core/google-api-core-2.7.2-r1.ebuild b/dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild
deleted file mode 100644
index a009e19f6f23..000000000000
--- a/dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 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="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${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-core/google-api-core-2.8.0.ebuild b/dev-python/google-api-core/google-api-core-2.8.0.ebuild
deleted file mode 100644
index a009e19f6f23..000000000000
--- a/dev-python/google-api-core/google-api-core-2.8.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2020-2022 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="Core Library for Google Client Libraries"
-HOMEPAGE="https://github.com/googleapis/python-api-core/
-	https://googleapis.dev/python/google-api-core/latest/index.html"
-SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P//google/python}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
-	>=dev-python/google-auth-1.25.0[${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-auth/Manifest b/dev-python/google-auth/Manifest
index cd9259c34e71..7a03425e8aae 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,5 +1,3 @@
-DIST google-auth-2.6.3.tar.gz 189685 BLAKE2B 68718ce4031c4e764dcfec19361b034ed5e1efa602d5c734b61a853020f40aaa856f9d9a3b964470e148fbfcb081dbc7d2c8bf0a53fc843d9360dbc72623bcdf SHA512 cba3228dbc0887c127d50cc45eb134e3a0b2bea044b8a1e65807918a3808e550fd58217a236c07b6cb908e5a080d9c1c1a2e9ee1853968d8c0bd50b7228ea262
 DIST google-auth-2.6.6.tar.gz 189789 BLAKE2B 8adf725ac8678a07c6c35f641950c5da0f269e8556074b5832a08267cbb64237dda817c576b15fbb315fd0a018e30bca1fa1f5a0d1f85aaae4ab2bd58538b191 SHA512 bac6345bf142a8dc6acde0bec43a8fd78f76277740114a0557af88748a5ec2f509757e6099f570ed037b2265717f339fe319254a826793d0b16f1a7d227a6b09
-EBUILD google-auth-2.6.3-r2.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 EBUILD google-auth-2.6.6-r1.ebuild 1525 BLAKE2B 0559fae14e6b27d48b0a8cf5babe40d71283d26581e6bc1c2efb0e9c20b7757ba820fbed34dd73b32198cbde9f2b3a620b9d27156ef9847a875908ce663a3e63 SHA512 e9ade71009eea68d39214942b376aff7aa4c1660e29cc2bbc535f7e0f40fdbe0ec30140dd4a21dd503531577ee6c183ec78fcf433f4898f819c620be02dceda1
 MISC metadata.xml 521 BLAKE2B 784282f6a173e7746a408556d77e1277f65a41eae545b6b26054c1e506642e683c1c7d91798f3b7b690bc4f9d2f642a51c1395593177eebf1770d2a0c0ba589e SHA512 c2624ebca3dc42961e61531db4724b2b354a722f71cd7f2c194680fee50125d2251f4b94cc7e31b008a2792e74b0f55f407a1230d3f59572df9cf32ee49d2fb7
diff --git a/dev-python/google-auth/google-auth-2.6.3-r2.ebuild b/dev-python/google-auth/google-auth-2.6.3-r2.ebuild
deleted file mode 100644
index 37c2ffef06a9..000000000000
--- a/dev-python/google-auth/google-auth-2.6.3-r2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Google Authentication Library"
-HOMEPAGE="
-	https://github.com/googleapis/google-auth-library-python/
-	https://pypi.org/project/google-auth/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	!dev-python/namespace-google
-"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/grpcio[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/moto[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pyu2f[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# these are compatibility tests with oauth2client
-	# disable them to unblock removal of that package
-	tests/test__oauth2client.py
-)
-
-python_compile() {
-	distutils-r1_python_compile
-	find "${BUILD_DIR}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 85b18415a92d..5e0b7399bbc2 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -8,5 +8,5 @@ EBUILD gst-python-1.16.3.ebuild 1556 BLAKE2B 5a5f9dc90cdbc2262f226b00ee166afd8b8
 EBUILD gst-python-1.18.4.ebuild 1698 BLAKE2B 0e59a331c3d541409d4cd30fd4222bd468f8931cd877d43801e90947774a5441391ed6b9e8d6750e6e45afb91108d77841251a7d0d3829f2c1164ddd7d284de3 SHA512 3255646772f025767c7e73159ccf06eb75e3421adf0f0c5bb3364f347516e4aedc230e7c35350d9588d6d8145e97d533e945d375aa5df116008047a9c7b253a8
 EBUILD gst-python-1.18.6.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
 EBUILD gst-python-1.20.1.ebuild 1637 BLAKE2B c58fbc16ef1dce5236e8a6dbb326cac3aac4be3d85a7faf349b5984e5545ce25e420533fbbfae582f60e3dfbf9be2d80462d0d5e85fc875a8204741a27ded058 SHA512 22afc8437c0627599779f923cad9c2f0f9e6b0a04f4a244b997f7f5e9166758b7f52d82ffb40e4e64f275f154d6d1ad6dc30300030bf5f17963d916cb5e44bef
-EBUILD gst-python-1.20.2.ebuild 1633 BLAKE2B 45d388e1f969cceeaaa2368df57525300c89f71586c68632368c10749b3f34984a6436f867098b49a2cc6dc2b93d7279ab299a82e079b3c1e3eb8cbd229dc1c3 SHA512 5eaf34f4bddca1b8e24fe59aa231737f3074f4c3383484ab947079aefc7495345c3fca94d6362e7da9e29f0967f23e0759119981c706fb9d7715a1a65fb19998
+EBUILD gst-python-1.20.2.ebuild 1631 BLAKE2B c365d5b9958e7f95f2c78e5e29b5d12589526b8e5be98c78e810872d8fe332250aed63e4e51ca25e45a9dc894c7d9151d762ec595848a064541af3eb78f9fed1 SHA512 4d82a2a5def91828763c71099eea382c407fd84d5dfc8b1c3eb76deaf5bc8563171f050d2db4fde2d830c64af94217fb489e7dfc87b0bbb97de1f1eddd23d3b4
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/dev-python/gst-python/gst-python-1.20.2.ebuild b/dev-python/gst-python/gst-python-1.20.2.ebuild
index 39dbb3d99b6a..911b008ead42 100644
--- a/dev-python/gst-python/gst-python-1.20.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.20.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index dc183398c916..36a809bff5b8 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -1,7 +1,5 @@
-DIST h5py-3.3.0.tar.gz 380221 BLAKE2B 0fd44e780304f0d56e8fd8fd0f42142c80935fa7cc3e6c53ff68860f32755d3d5e576fc283bb9b21e9d7dfb905bdeed6656eeaa33e48cefd34de86fde3efa49d SHA512 f1ce944375da3db65829e8a9d667ee7ffa2f863e408aa4ccac0de9d999e0710ebcb1e116537616649fcfd05731cad3cbd968c9593f0ba0fd4348ee06c74d9dae
 DIST h5py-3.6.0.tar.gz 384160 BLAKE2B 354764bb002cd342623aa962de88a24ee45156c0a2d61088508017980e407e90f85e65da9d3e29a6745dbca754ba1708700fbea4f4123a10a620bc758cbaa3ae SHA512 f3a108d16578ced552fcac4fceb7f3180ee71a3c8f6caa8702fd9989728d8284afb9d85f1239648e10d14f3532c772f46d05f8306bb8b305d98b162d7604683b
 DIST h5py-3.7.0.tar.gz 392355 BLAKE2B efc974ff14457ef00329c6b2adf5b926e2dff33bbb4b9e9d60773760a973214c5279bfafca87c6fcab02bbffb85b780c708d26fb55a1e7a401d8d676f20acc15 SHA512 c10a9a623c88dbc965238cb2057b8924492c762c29610cfdb24f26f878a7322e414d3e5c90d750c2f5cfe1b4949f884bc17f09a126b01a4721ad6e14761174a2
-EBUILD h5py-3.3.0.ebuild 1356 BLAKE2B dcda3ffd431351c36778d5fa9fb1d9a4b7bc104de0e4d80ed01656f10b87c52b923441dc35d0b5ae05c920943c4c6f3774d205c4829210555361aeb224bda708 SHA512 4418c532c552cb3e1f168c272093ef4fef47781a1794698c3ba02ec7c5dbd9e65f873c6c5b12021822a8382481296def58af6c59ed6c980f041ff43c1d462699
-EBUILD h5py-3.6.0.ebuild 1465 BLAKE2B 386ee0828b72a06c694691db2aa99d392d7ab69ccf8cfced3fe1109add73cfd066429e67b5b6ee1370c73e2552ab50e2a2449d5ddec22ce783452a14769c4e06 SHA512 c2ef975fbca458cc5954c3446e27b15847028a8105f1dbf42d9e4a3fdec40b15bc92b46ce39bdaddf48d8116e5d56b9f5cd80367e0f6c36d87e4807d5dd73465
+EBUILD h5py-3.6.0.ebuild 1464 BLAKE2B e8cbf89396ce6be874c723ced64c1d08ed21c11c875e5fb7e2a84225915eb3c784b3a41693c54960f967c23108c8668b1e7c2019c6874ec4df6628a287d7c176 SHA512 95adbd8b245149d692d8e8712f4ac2e0dc6dd11b96b4424dc5bf12563735708db85a16ffe18d477e151a0d4c5bbce136fa1efbe6a8721f30dc3132464aeaf5e7
 EBUILD h5py-3.7.0.ebuild 1466 BLAKE2B 6f6433f0726a575b606d004d83b575508acb5feb3dcb9e7b4b6280a8bf7581fb9427517e3003cd73f4a34a2a5597a4f5b54be1bbb9f84a5144a092f36f3e6dc9 SHA512 7380ab2f8cca1c9c8b691b1f71c3ac9373c5aff45a9426cac7b3b47981d90c34a9ce8191af7340df1181b011f15513cf949f1fb2d2717b557fd4b432358463fe
 MISC metadata.xml 1016 BLAKE2B ab015a188dadacae6ad496f541bb6d4df97631d5d1601e21396509675f03da4060dbce67588e77cbffea5a7b763344e95b61a7ab482d6b64a16b90b0f1484d0c SHA512 fc4debeec5b4fb1b22f1c1f23d9dc2bf090e88451f2e456b5c7c82d11abbce789ecc79993dff9520a4a407c94299a10e1eddce796a6d44e216fbc7702dc23dc9
diff --git a/dev-python/h5py/h5py-3.3.0.ebuild b/dev-python/h5py/h5py-3.3.0.ebuild
deleted file mode 100644
index edb9f5089319..000000000000
--- a/dev-python/h5py/h5py-3.3.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Simple Python interface to HDF5 files"
-HOMEPAGE="https://www.h5py.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-# disable mpi until mpi4py gets python3_8
-#IUSE="examples mpi"
-IUSE="examples"
-
-#RDEPEND="sci-libs/hdf5:=[mpi=,hl(+)]
-DEPEND="sci-libs/hdf5:=[hl(+)]"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	test? (
-		dev-python/QtPy[testlib,${PYTHON_USEDEP}]
-	)"
-#	mpi? ( virtual/mpi )
-#	mpi? ( dev-python/mpi4py[${PYTHON_USEDEP}] )
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-#pkg_setup() {
-#	use mpi && export CC=mpicc
-#}
-
-python_prepare_all() {
-	# avoid pytest-mpi dep, we do not use mpi anyway
-	sed -i -e 's:pytest-mpi::' pytest.ini || die
-	distutils-r1_python_prepare_all
-
-	export H5PY_SETUP_REQUIRES=0
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	epytest -m "not mpi"
-	rm -rf .hypothesis .pytest_cache || die
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/h5py/h5py-3.6.0.ebuild b/dev-python/h5py/h5py-3.6.0.ebuild
index 174bc724845a..bbfbfbcd2ca0 100644
--- a/dev-python/h5py/h5py-3.6.0.ebuild
+++ b/dev-python/h5py/h5py-3.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index ce2fc58eb380..13191122845c 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,3 +1,5 @@
 DIST imageio-2.19.2.gh.tar.gz 388434 BLAKE2B 4f0ec3f2586cbce7c15ff0551b8b5389d9236333eecda0870880c6dbe93bb2de464e57af7bc20c0f63aec6d53040a5140195d09c4c8a3c50c391a42b7847cf49 SHA512 6711a3be92f840d821f6539636072654d000932a6a7688384ae6bc007af5de41c8f90ed9a29e6401fd13219f50082ba5b75a1b383f1ac9242d568f95859de9c4
+DIST imageio-2.19.3.gh.tar.gz 388949 BLAKE2B bf7f7b2cc036d6bc808cedeefe624dfe43b232518f78974fffe9c664f23c8e89da73e5b777ee6049aa0ec363400fe8d9df1388a91a4b0a01089609d7ce12eaf3 SHA512 5ad9f332ea723facd5d9295e463b12d2cc17dfef8a7349ce194a8d32fcc5d07a29550834c66dc6e5837f8440347387b46624243fa267750f986042910ff6cb90
 EBUILD imageio-2.19.2.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+EBUILD imageio-2.19.3.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
 MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/imageio-2.19.3.ebuild b/dev-python/imageio/imageio-2.19.3.ebuild
new file mode 100644
index 000000000000..6770d9759db9
--- /dev/null
+++ b/dev-python/imageio/imageio-2.19.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 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="Python library for reading and writing image data"
+HOMEPAGE="
+	https://imageio.readthedocs.io/en/stable/
+	https://github.com/imageio/imageio/
+	https://pypi.org/project/imageio/
+"
+SRC_URI="
+	https://github.com/imageio/imageio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# over 50% of tests rely on Internet
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
+	media-libs/freeimage
+"
+# requests for fsspec[github]
+BDEPEND="
+	test? (
+		dev-python/fsspec[${PYTHON_USEDEP}]
+		dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/tifffile[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# Fails because of system installed freeimage
+	tests/test_core.py::test_findlib2
+	# Tries to download ffmpeg binary ?!
+	tests/test_ffmpeg.py::test_get_exe_installed
+)
diff --git a/dev-python/installer/Manifest b/dev-python/installer/Manifest
index 5232127bee83..becc4f2d6d42 100644
--- a/dev-python/installer/Manifest
+++ b/dev-python/installer/Manifest
@@ -1,7 +1,4 @@
-DIST installer-0.5.0-py3-none-any.whl.zip 452177 BLAKE2B 41bb5929c1bc42afa1e09f366356aa441eb92d258da40421d7f46ceb466ee4604ed96fef0969dcd2fe28e8f4b06c741ac3108000f69ea42b6bb194890102ad71 SHA512 470c4fec8888114af6769db8b8cefa09a376bfcdf0d78320f884a7453a4991765cdf0b9122c74d8e147d193e75ab3e12cc24c3b93c0668956c17f52443833c4e
-DIST installer-0.5.0.gh.tar.gz 468351 BLAKE2B 6c258bdaae3351e87a88675fb813bb70611d9188ba16a09ba03de4caa3d79fe32544e229f880338304d00343c2b3121b1948bbef2e27c7255d231a3d5665aa5f SHA512 8731bbf8a51b1094dc87f84575eec07a650988bdeddf205d04cf80a5088eac0d8b2927022864f4011a9562fcaae9f511747e5672f94ec3cce1dccdfa833c4fce
 DIST installer-0.5.1-py3-none-any.whl.zip 452220 BLAKE2B df2d2b351c3ca1e7d5991cebc77035bd8da980d0cd739b11532dac3e1fca4bcf58ebb746b4a3468978f765515ca22d3f777b279174715aaa2838231d4204028b SHA512 50f4778352393ad4d56ce5ccce2f5691df2114ef133b1a614e1c4ec2802261dd4de162fd359f47a51b4195b9b5594f5448591ee80356fd2ddb3221a2e602c797
 DIST installer-0.5.1.gh.tar.gz 468433 BLAKE2B 5ba76eb2a576209c2bdf80adfcbd8ea22b55394652640085cf8dd39ded06a0a33ab75f3e4ff73d5de2db028b8c4dac652d631c94e2c9401a825ee75e7b143c01 SHA512 0320c1795c98a593b5da46775465e26bdf8736f59835970517cb02f2756030a3744b9385a9342e8062362d0769d585ff6cce504fdf105e99d27d6ba40281842b
-EBUILD installer-0.5.0.ebuild 1164 BLAKE2B 2056582c7f5133bd4dbf155dd9bb436f5d5a9fe83e930e2491e2384378836036073e9247b365e0461d09eb2294e0402fc7ae26ab1a4b25bf1c22f4fdcc157ea1 SHA512 2922dc55236b6012e2198797006a22a8b26e808ed429595a0fe8bb761cb0aeefd098a72bef0faa33e3e81acdf8722af838e3536ba1772abed87c176294f64baf
 EBUILD installer-0.5.1.ebuild 1161 BLAKE2B 2094b8f7e3224c6ce81fe003f06a378baaa82e50002a07fcc343e9db69b4af7faf609319410464f2a36ab852ab67403f0850fc610aed5dd5742497a1ea58c879 SHA512 7e8f5b964849412f6270e3319c450df8861bff3bc99ae00694e3d27e9f31267febe30c2dbc1e6a47c22a798a774f0110f2dbd57aa8277271ad5df0431d48bc33
 MISC metadata.xml 391 BLAKE2B 4dd6c80628cb652a95e1c779b87ccd3503197411b2bbd2bb64b964d57f6af4a60d5ef7f58b0c20a9842f9124e5c2129211a52dbdaa1192c98157de65aea64bd2 SHA512 2c2757ea4c6676a8282983f5b941d9ad6100228b0008bad2b216ade9f5489092c6337de3e43b4930e79c5fb548669eb337861a6cb7aec651986597202b4d1c6e
diff --git a/dev-python/installer/installer-0.5.0.ebuild b/dev-python/installer/installer-0.5.0.ebuild
deleted file mode 100644
index eaf0e45936ad..000000000000
--- a/dev-python/installer/installer-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="A library for installing Python wheels"
-HOMEPAGE="
-	https://pypi.org/project/installer/
-	https://github.com/pradyunsg/installer/
-	https://installer.readthedocs.io/en/latest/
-"
-SRC_URI="
-	https://github.com/pradyunsg/installer/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P%_p*}-py3-none-any.whl
-		-> ${P%_p*}-py3-none-any.whl.zip
-"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-
-BDEPEND="
-	app-arch/unzip
-"
-
-distutils_enable_tests pytest
-
-# do not use any build system to avoid circular deps
-python_compile() { :; }
-
-python_test() {
-	local -x PYTHONPATH=src
-	epytest
-}
-
-python_install() {
-	python_domodule src/installer "${WORKDIR}"/*.dist-info
-}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 0049b436679a..573ffdedbed5 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,8 +1,8 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.31.1.tar.gz 5156314 BLAKE2B e6528c9d3920078918180c4c2fae5d0ac20cd377e012691fee4c0cfa6c3056c739efc1ab9cc6231f55034d70619e501ff30e31b929bd5f1f623c89075abfb02d SHA512 7bd1378f7b2bd2146d8c2cf15c958b08f286b0163ca3e267bcd92c3f988d2d20cf48fd6e3c185eed6d30baceb195aeb0170280900e587c898d0812c4ffdee3a0
 DIST ipython-8.2.0.tar.gz 5400583 BLAKE2B 6af50e671823005b035a8463e65463b06dacb3bf4d43c4d3bd9720d1747ebda8abe3d73a49f59ae0e6e2651035db20bcfa1e82dbb0a73e40b4e2507e63118921 SHA512 0bf93527bcafe5dfbfe034b901dff2f002e0fc732159073f0371263e23784f45eb6c9e3f7f2cb9567e93ea4ee313773f836157afe9d23256e71bc4b2fcac15af
 DIST ipython-8.3.0.tar.gz 5314400 BLAKE2B 8f06dcaf32cea70ba9f19fb218d4ea6ca3e42651da065521133b1c7163f80324244f59b3c4d85039f1aa5ed363acad0dae11615ae4927d6c9a24197cc9640349 SHA512 95a3d50a5cffe9d4ed3f072c7fa8920c96beccdb15a7437836daa5f38f1ba228b4ebc4c3313d4c5016b77ed7d6f3787af727487ea379c9dc3b3de90eafa4d1c3
-EBUILD ipython-7.31.1.ebuild 4651 BLAKE2B ebe9ec2ae2f606efb76fed9ca1e3e04c78a13c8d86ec3223d02c980289e215bec65f01714d7758b707784c98f59fb7c934ff6f207cfe8943c9c0712217457637 SHA512 27e831552e274196810f5e88fbd7242dfdd8a233f60e8767c040d70557f0389f973105905eae473d8136d10b4f566ef3245afeb286065156d0b87ed3d451267d
+DIST ipython-8.4.0.tar.gz 5314601 BLAKE2B 4a5804ad115b45568ddbc0b8fcd181ae0088690ae2d7dda8580588d1e1caa087582a279449142e0144568815270b3a9476893525c0e90320f9ec580a06126d1d SHA512 975915ee64ce6f3fc9bcda383c784759dd8b19151428b10ef92020097718c6e2a9804a00fe02bd541b845eca146c63a672f25ad4f00ec5302b3c61ae0c6935ce
 EBUILD ipython-8.2.0.ebuild 4534 BLAKE2B d7b8576e1f7dd95b2c6e7d5fca8fddb3438835447a3c9c48f6a5bcb495fb01ee18fe535834f1ccade71270f592dbe8698aee316b142678bccc2ef6357bc7d3e9 SHA512 2cdac89d6ec11bc21c5c2131c4b461c543d755760d8a9a3e10420f781bf1e7133569df4bc0a6a3e4b8886e1e36957150bc2fe7e0a692bf37d3455a3590d4eb43
 EBUILD ipython-8.3.0-r1.ebuild 4529 BLAKE2B d83840ca04cb890d4defb7b7343ad978c58544be975e1595aba52e97e958352979a55071c8e5d3782ba97fc883f60653630088e8b5698681efdfc675cb042182 SHA512 a3e28a4f412449d8122152b4e04a620b508afc39aeec8614b26618b644ba9d28e4225900dc174f47251e3fd5c76d5847fa193fb42c04ebe4ddd862ed5f70dc90
+EBUILD ipython-8.4.0.ebuild 4767 BLAKE2B 0e3425ab089eb396da2f5c08b91173a188b99db622f8d000962fcb52177e173590e9aeaf764e741d139cfffe4753819a24980f9ba0883a5e6512a2e698110839 SHA512 7eaca963584a2911146e7b3b90ec064b4c1faef86b9ebab26fdb65732da45d39c8fe0d5076e4920e48da1ca7615849935a7e86969c6346de2bdd13021d7ae25c
 MISC metadata.xml 2883 BLAKE2B f61d1c66cdc9a956f3fdc9fcbc93fbc2051e9d0872beb9229e87a8fdabbce656efee9702e66bf30bec68009702f42e4036202e02208a428a8ed87b448f625536 SHA512 617f19e859544079d2680e9796e3ff0b7af41577776847d4c4dccfffc460dfc887631169289e5271120f375bea7c7836395abb9bf8a7628b3b55a7c1beefda9b
diff --git a/dev-python/ipython/ipython-7.31.1.ebuild b/dev-python/ipython/ipython-8.4.0.ebuild
similarity index 79%
rename from dev-python/ipython/ipython-7.31.1.ebuild
rename to dev-python/ipython/ipython-8.4.0.ebuild
index afbb895bd2ba..bf72d46c9cb2 100644
--- a/dev-python/ipython/ipython-7.31.1.ebuild
+++ b/dev-python/ipython/ipython-8.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='readline,sqlite,threads(+)'
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
@@ -23,27 +23,25 @@ RDEPEND="
 	dev-python/backcall[${PYTHON_USEDEP}]
 	dev-python/decorator[${PYTHON_USEDEP}]
 	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
 	dev-python/pickleshare[${PYTHON_USEDEP}]
 	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
 	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	)
+	>=dev-python/pygments-2.4.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/stack_data[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.0[${PYTHON_USEDEP}]
 "
 
 BDEPEND="
 	test? (
 		app-text/dvipng[truetype]
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
 		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/testpath[${PYTHON_USEDEP}]
 	)
@@ -52,14 +50,16 @@ BDEPEND="
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
 
 RDEPEND+="
 	nbconvert? (
 		dev-python/nbconvert[${PYTHON_USEDEP}]
-	)"
+	)
+"
 PDEPEND="
 	notebook? (
 		dev-python/notebook[${PYTHON_USEDEP}]
@@ -70,16 +70,15 @@ PDEPEND="
 	smp? (
 		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
 		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
 
-DISTUTILS_IN_SOURCE_BUILD=1
-
 python_prepare_all() {
 	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
+	#rm IPython/extensions/cythonmagic.py || die
+	#rm IPython/extensions/rmagic.py || die
 
 	# Prevent un-needed download during build
 	if use doc; then
@@ -100,24 +99,29 @@ python_compile_all() {
 	fi
 }
 
+src_test() {
+	virtx distutils-r1_src_test
+}
+
 python_test() {
 	local -x IPYTHON_TESTING_TIMEOUT_SCALE=20
 	local EPYTEST_DESELECT=(
+		# Internet
+		IPython/core/display.py::IPython.core.display.Image.__init__
 		# TODO: looks to be a regression due to a newer dep
 		IPython/core/tests/test_oinspect.py::test_class_signature
 		IPython/core/tests/test_oinspect.py::test_render_signature_long
+		# TODO
+		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_aimport
+		IPython/extensions/ipython_tests/test_autoreload.py::TestAutoreload::test_smoketest_autoreload
 	)
 	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
 		# TODO
 		IPython/core/tests/test_completer.py::TestCompleter::test_all_completions_dups
 		IPython/core/tests/test_completer.py::TestCompleter::test_deduplicate_completions
-		IPython/core/tests/test_oinspect.py::test_pinfo_docstring_if_detail_and_no_source
-		# fails due to changed argparse output
-		IPython/core/tests/test_magic_arguments.py::test_magic_arguments
-		# py3.10 API incompat, doesn't look important
-		IPython/lib/tests/test_pretty.py::test_pprint_heap_allocated_type
 	)
-	virtx epytest
+	# nonfatal implied by virtx
+	nonfatal epytest || die "Tests failed with ${EPYTHON}"
 }
 
 python_install() {
@@ -142,6 +146,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	optfeature "code formatting" dev-python/black
 	optfeature "sympyprinting" dev-python/sympy
 	optfeature "cythonmagic" dev-python/cython
 	optfeature "%lprun magic command" dev-python/line_profiler
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index dc5f060bcb76..f4b3ab087c03 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,4 +1,3 @@
 DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
-EBUILD jaraco-logging-3.1.0-r1.ebuild 882 BLAKE2B fcf944b3d54fd0ef64a42baa410a1342dbdd8b48b923288be1dfcb74ed8d1edd6f730faadca53df9de70f4cbd2d50bbc6f8385d00eca54d8bb9d7fcea2109389 SHA512 404362952b44af198349be1fa755f8e48562f432acc9c7b8ae9429a77bdfcd54f2fe36e5af17fe7369e00e582c70bcdb15b750895cc7f00c0f8ece52356981e1
-EBUILD jaraco-logging-3.1.0.ebuild 1132 BLAKE2B 4779589275390675aace6120b60c5cc2037b0a87f1bf592e91560d83a7731c6801ae9b4bf465f2f2074df88498d56d021365fed25c2d72fcdf4de11a110c58e2 SHA512 1eaa8c30526cf1ed1c911c22deaab4c87f6e651bfccd428880476f934de9eb0c5c470450801305102965d7e0c5d83ef5820194903fa42227ac9d41cebf888ac8
+EBUILD jaraco-logging-3.1.0-r1.ebuild 880 BLAKE2B fada073312b4879907072a0d50f8a501270b2f74af659a58774035b47df604db81505c479e47077ec96ad2a8333de29aad5f264582437cc1605f83081a821cc7 SHA512 64f87d268fccc8af8568e41c86fdf1e5a6b53915e28fa1da6e47116d158d8f2e30f05ee698482cbc355ca9a45f2136e40211d393f6a621a5ef4814474cc9b7a2
 MISC metadata.xml 477 BLAKE2B 80a8d13614d491f26aab4b2c061c59632368d4749d4df2e1ba2346367b4b49410b26fdafc2e7f18c6d3f45290e887ee537e46f82977951b7189d400c291decaa SHA512 a5c2ad40d7ccb6d1c70ea541c57b0320dcb53f40edff344a9358f6d5867d560aa5898dccd681967ccef790844c1934fb91e6de4a520399e59b9125bd23377fb8
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
index 046c961f479f..70cb1e6c3b0e 100644
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/tempora[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
deleted file mode 100644
index 9a25e08b7941..000000000000
--- a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
-HOMEPAGE="https://github.com/jaraco/jaraco.logging"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/tempora[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests pytest
-
-python_test() {
-	# Override pytest options to skip flake8
-	local -x PYTHONPATH=.
-	epytest --override-ini="addopts=--doctest-modules"
-}
-
-# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
-python_install() {
-	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
-	# note: eclass may default to --skip-build in the future
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index f11848e78fea..0e517e227470 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -1,9 +1,5 @@
-DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
 DIST django-stubs-fd057010f6cbf176f57d1099e82be46d39b99cb9.tar.gz 183312 BLAKE2B a68f6139903f5001db994ee0d881f40ab74932e81c3e2c3a0c22dc56e6be681d0fb42ce837603b21e4d0d448ccb25884ef0f69039305f309e82603267cee9f6a SHA512 506322c132f94e6a1e88cdbde6027a566387731fa6ad59934f95c3511f49d90eff2a3138363811be648b096407d418cd1f801df0bc35b1e464ef181e4076ada1
-DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST jedi-0.18.1.tar.gz 466884 BLAKE2B c2403b20447b27b1fb19c16d1131299154fcb767453116964b339bf7ef4a1ca20b6c3216c3fbd63c304dd2c0c02a67702d5228e1d847975b778597dc58b489d1 SHA512 c72dc4927fe44641ea57c61e68b3c74c3a3f70ddc2990454ba931026c288723e07263918ecbb4ecc6f79716d37e10a1b1448ae8cfc6d52465122b3d1e43bea25
 DIST typeshed-ae9d4f4b21bb5e1239816c301da7b1ea904b44c3.tar.gz 602044 BLAKE2B 53298918a7e9a1163e76d4c70ad2a2117ee90b49329aa82d82b2aaaeaf000c971872f83ed283af6dc4be068b813876760c8b1b4acb4131865572a4aed3ea9230 SHA512 b3b9da66b6c6e03e0b262b3262df31215a5e080468ca9ebf4332ed53d715cd3956db7067fad3ec267042ff704f81ac665c703ef2fd0c5b445d440bd8e52bf1aa
-DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
-EBUILD jedi-0.18.0.ebuild 2481 BLAKE2B 30334950169a5fadec676f806dab2560f77c30613a892814adf7bcfad81cb8ea70fa73ba5ab545b50dbd7c0ddae10940cbb2f3a780d6d18e5f3a6e111dc048f9 SHA512 807a4df4b642123e99ab87578a7089dc561dc0429e3ed9714da25ad95a6dbc3a69afee37d882fce4be793ddcd0433a33f010f99dea25b5fb38f4385f6eb0e94b
 EBUILD jedi-0.18.1.ebuild 2201 BLAKE2B bed3608a18bdc8c1390eec43612bfb987839196798e0a708ca94b46ef1d082d49490ecb3886209f18aeaff01e7c5bc5e3e1b179196d0d9da50a4bbc1fe9469b6 SHA512 883ab512dc50f7400e0252ea182da65d3ede3e8e71441ecfb3c7a7e365815afc20d08ed93109da7f5d13313ab40594c2240e978cf4eb5addd9031d100ea87157
 MISC metadata.xml 401 BLAKE2B c540d55ee88ab5a7be9ec902059a766a754da42ba5c1836c990d0d64edfec91fa33e8a745b9a15ce4a97831259150e0298fe2a5ed4c21993be73d9fd7af3d865 SHA512 6af98463225428333ec509b334014bd307569ce852f640a1f1c1e18f7551185d8db9b7c80822012c14f3c6ca1cf79ff24f289df3cd42803759d012a1a73ac07c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
deleted file mode 100644
index 59d2c1396385..000000000000
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-TYPESHED_P="typeshed-jedi_v0.16.0"
-DJANGO_STUBS_P="django-stubs-v1.5.0"
-
-DESCRIPTION="Autocompletion library for Python"
-HOMEPAGE="https://github.com/davidhalter/jedi"
-SRC_URI="
-	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
-		-> ${TYPESHED_P}.tar.gz
-	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
-		-> ${DJANGO_STUBS_P/v/}.tar.gz"
-
-LICENSE="MIT
-	test? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
-
-# RDEPEND needed because of an import jedi inside conf.py
-distutils_enable_sphinx docs \
-	dev-python/parso \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# upstream includes these as submodules ...
-	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
-	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
-		"${S}/jedi/third_party/django-stubs" || die
-	mv "${WORKDIR}/${TYPESHED_P}" \
-		"${S}/jedi/third_party/typeshed" || die
-
-	# don't run doctests, don't depend on colorama
-	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
-	sed -i "s: --doctest-modules::" pytest.ini || die
-
-	# test_complete_expanduser relies on $HOME not being empty
-	> "${HOME}"/somefile || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		'test/test_integration.py::test_completion[stdlib:155]'
-		'test/test_integration.py::test_completion[on_import:29]'
-		# pytest?
-		'test/test_integration.py::test_completion[conftest:27]'
-		# assume pristine virtualenv
-		test/test_utils.py::TestSetupReadline::test_local_import
-		test/test_inference/test_imports.py::test_os_issues
-		# fragile
-		test/test_speed.py
-	)
-	[[ ${EPYTHON} != python3.8 ]] && EPYTEST_DESELECT+=(
-		# TODO
-		'test/test_integration.py::test_completion[lambdas:112]'
-	)
-	[[ ${EPYTHON} == python3.10 ]] && EPYTEST_DESELECT+=(
-		# new features increased the match count again
-		test/test_utils.py::TestSetupReadline::test_import
-
-	)
-
-	# some plugin breaks case-insensitivity on completions
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# django and pytest tests are very version dependent
-	epytest -k "not django and not pytest"
-}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 3616c62e960c..a5a2a7bcf921 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,8 +1,4 @@
 AUX jupyter_client-7.0.6-test-timeout.patch 1270 BLAKE2B c039b22d8f0c2893738a1b832bb82fa19c746dae8bfa839fd16056076e9a905218201d2cfe8896c4e826a09424656657d109b12893d21fee0d8e6b6952d55ae3 SHA512 66d57b9efae86bc2531d35634f35a5d74de6d467329aaea7a487b010b582440cdb8a91e318a3c6ce7f26d9fdae6aff7adff3a59c57d053695076b9f1c092fbf1
-DIST jupyter_client-7.1.2.tar.gz 326163 BLAKE2B 0cc11210cc3a472585d21acb836e316540d768c8c9ccc4a024720b278f3e2425e645080d8dcd501c118b3759bd354bf4f384821e87f1be0b7525addad6c267e0 SHA512 7baadc7d508c25ea588d0d7a6da8eb5a28fe4dbce32c9dfa1f9b2b82c7c3d7ae8c034cc03414b3eafec620931bd760c0844421197c01a3d25597af18f6e60060
-DIST jupyter_client-7.3.0.tar.gz 328515 BLAKE2B a5e0ad2f44c2171d75848f057c3d582e66b308d0d0fb8d7c8c7266e51009f2281a1ff5b0f92b7a5491709a43dccd6aa69f45681cfb6b79008082f5a955212b61 SHA512 5edf711afe9799fadee901de404ffed5b152618ccab960777a5f17cdb5adc6b945b189502f1dc7b2728fc0abceb668e54f9543eb952738d02500f109df6fa913
 DIST jupyter_client-7.3.1.tar.gz 328697 BLAKE2B 9bdca39d974c21e1674f58a7aaa51a6b96e4dc307f918aacc403146827df5ad7a867243dd2df95e717ab7ebd62367817e4f43cae562f47147b4271d72240600e SHA512 86a98288f1be5321b8495d78770501ca45fe3139a482ec41606253eef69eaf4d3f284d1c373d9df64efe28428f32cd1a3b19842a7331b3ac200d780e7a786407
-EBUILD jupyter_client-7.1.2.ebuild 1387 BLAKE2B 1e2aafece99bb7e7933846a18baa7b27391123f0434cf38409992f53bdda1351816f395965ee02d405a52185bcf1c33db9cbb930cd421cb7598fd53f9e44a4e6 SHA512 dc9a1c8ad7b2fa51d292df61468fed638fa41afdbd1585b710e4ce120b39e7d9049bbc7f28775b71175c9e183a39b7c0cd7b26c0d2fdadfb3ab34b00c97508f4
-EBUILD jupyter_client-7.3.0.ebuild 1231 BLAKE2B 527ea26ccaf61ba58ff6bdddffca1d88da17cfe3396da2855515959e1bf49f52624d285e07671febbee1e069a80341f6edf47bb63df1677298267e0746776126 SHA512 3faa1caac4959332be7660cb988bd8b24a658f5a792cf1528d59f85b45dccc12cbc2b6e25ada86d2bf66fc27988791b3f43bf4503c0c5c549f70fae7bf979cbd
 EBUILD jupyter_client-7.3.1.ebuild 1223 BLAKE2B 1f496ce6cb37ddff806e283d510314d79528f9daddc99dc693401d46ca82518716fc156976cd18cca41cc6a5bc8523260107b398c8ead3669c70b85a2c644f1a SHA512 04c4483b2fd3bb788da7bb2474f8a079f3bddee9818b6aa3a307b106bc712f28cdda525b33846a75fdc5a7bf4e05d522432d0f7df517247aac48dee1b383eaaf
 MISC metadata.xml 780 BLAKE2B 98556448199bd8a63d493b16bdde3942dca45b907f3e2da4f94fdf77bedf05c55b08e5b8f05b01c818f6440ebd21552ea8edd7b2a970ff07ce03e88873197df6 SHA512 76411204bca5fef604cbbf1d320eb7de0ba3faf66ce86f4f1a8488de43fb854a21ad8f4137b365b129e6e565dfd276169161e183b18fe9b7b0960beb1b790293
diff --git a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild b/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
deleted file mode 100644
index 57c632a5c3bb..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.1[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-EPYTEST_DESELECT=(
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_signal_kernel_subprocesses
-	jupyter_client/tests/test_kernelmanager.py::TestKernelManagerShutDownGracefully::test_async_signal_kernel_subprocesses
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild b/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
deleted file mode 100644
index 2c0770e6eb96..000000000000
--- a/dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_core-4.9.2[${PYTHON_USEDEP}]
-	>=dev-python/nest_asyncio-1.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.2[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/ipykernel-6.5[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		>=dev-python/pytest-asyncio-0.18[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0.6-test-timeout.patch
-)
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# relax pyzmq dep
-	sed -i -e '/pyzmq/s:>=.*::' requirements.txt || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index c75063d42413..8b364086ac8e 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,11 +1,5 @@
-DIST jwcrypto-1.0.0.tar.gz 87000 BLAKE2B 6e85d52c26447b07c3d06387ac9e3b7adf585d5dc320c633e80ca2bc1e327f01ac95cec9a0fe2b92f7f8ed7f5650d5ad1a95de500d328b33763d604aaba1bd62 SHA512 12d270219d289041098f875f5b2b0773ffbf9044996a6189b827cafbf3e5dccfc103915275b1a11dce2d50e3510510eea476b024d19cf97fd7c66c25de5b3dbf
-DIST jwcrypto-1.1.0.gh.tar.gz 87344 BLAKE2B 4bc72c01e6d49d68ff8e3c89a09758a5e8a634c308926ed2b750fdc373006b30710a841df4e26e1ce3287be6e4b509674887a0b01cc3b225bc87d97588f5b7a6 SHA512 c7530f68d74247f23ad2d76def257f4f0091203a22d39f248f4a15363b17bdf79699b96775cfb7f909b5b0a99ed1dd73ff5ae30ca8bc41662f1be38933c9f3c1
 DIST jwcrypto-1.2.0.gh.tar.gz 88369 BLAKE2B c2f03cef2130884e8a27faa5a7e204ee448ef0a2b56da414f10df34821a67898a0ed2768201d00e2dc7d14b5a3cad3e73c0bd5707910dd2cb1082d1a20a14c04 SHA512 df9073b0561b43cd92f7f1861f9b517bc736d0846f8ef1c7496a48aa5dec49755e5915285ae659c5e2bb18cd51912cd782d799c41c5c6399330f688348096fa5
-DIST jwcrypto-1.3.0.gh.tar.gz 91206 BLAKE2B bbc11ae9fe5a27233ad3e27e0ef38fff4bacd4d429fbf7b379b0ee61f4551cc3f8810181ef6e61c196951b971e2e49c5faf34e481b62f2caebd534bcbf26f981 SHA512 6071df4bbb735b7096fab35855534cbcf6bb2244b3e789cac81cc49d1d2f3a79112227a909074e2ee30e9a2fdf13d711f15222a2aeaedf8b7a098d8f569bcc40
 DIST jwcrypto-1.3.1.gh.tar.gz 91903 BLAKE2B 49fb3cb9548c85d406d47074a410f6bc89cbc32f16a0244b4ac5e3fa219bc66fc1e4ed32056f5c9885608b5225c2ed3423555813938465924e60dabb8f39749b SHA512 bc43a1acdb12a4e25251a3c5f9c85286c5a4234bd098efe69b7e3bd3da9ec72e80d7239cc20b1f971e17218cce9a7febe6a92efca33da2f2e1479fe64150bb71
-EBUILD jwcrypto-1.0.0.ebuild 791 BLAKE2B a90451bb2d10e6983575167d8856d12b5b83cfd8f283fd1c240cb17c1345ca1769857f450e2a78598de12d06f73b6bf5cbdb75d71988ba43234224285a75de8b SHA512 6cdcc65ce1b10407181d0464bf7d39d5d40c9b53569e3e0082a6483d69549947e64bd7e41150ffe0b95c1a902a8abc215dbe483a65465a058397c6b069ff9f56
-EBUILD jwcrypto-1.1.0.ebuild 844 BLAKE2B ea60933ebd51e71e1158cebb57e94471425897ea1a51586ff1e7304fa9705cfb89c54bef24cc13668b3d1849a75d2ab8adcf4855f16720ed3d6175b7bfe4d60e SHA512 ef6aa367b683de4da0bb0f8c8b59c51cc124055da0d8767966ab26deeb8f6067a7d4002c77432c20f4f511627cf88b89d842f1ad27a00dc6b756ebe450dc134b
 EBUILD jwcrypto-1.2.0.ebuild 842 BLAKE2B bbbc9216514f6d7093c966689aff6fbd3c03884d2f02d3735d919c2a96e74f8466dea7d7ade565ab3a409ee644c5a68b8d8be22b08a306cc6b97e5913857dc40 SHA512 aa3c78a6551dc7bb2215cf00c584b4904bde5949a43c01f4165cc7c7af4be6a76c6e89c17d3a21e935463e7954438a90fe3729ad893926df289fe00298ac7372
-EBUILD jwcrypto-1.3.0.ebuild 844 BLAKE2B 923e13b419fecf879d39f5e1dbd0ea5e86a5ca93c392ad01b07e8ecfe67258b2cc2bbce447f97716af2af2b9801b660e93dae507b950ed4bcef29aaad2c6df15 SHA512 74b4e896a64689c5c86042077d89c3a7a3eeb75d508d5c6d2b56248990e0be9e02e8b8f8b60284c074f0e431ebf6f5441a8a7b2793cfed7aa02ba8daaab860fc
 EBUILD jwcrypto-1.3.1.ebuild 844 BLAKE2B 923e13b419fecf879d39f5e1dbd0ea5e86a5ca93c392ad01b07e8ecfe67258b2cc2bbce447f97716af2af2b9801b660e93dae507b950ed4bcef29aaad2c6df15 SHA512 74b4e896a64689c5c86042077d89c3a7a3eeb75d508d5c6d2b56248990e0be9e02e8b8f8b60284c074f0e431ebf6f5441a8a7b2793cfed7aa02ba8daaab860fc
 MISC metadata.xml 369 BLAKE2B c7868e0b20a2875964290642cddb457b71628e361f0e032875ac45f4405abeb76c8c53bcfe623c9a2e49ea6e184505503b4e43f34c456528ff3250aea5110b10 SHA512 a1fec6ac31bbb096e508b0ebd644aa8a96418e6972d852512d4b7702b67f241f858610235dbd68430c588d8b837c7a0866f333c8aab182e7cd01e10325031d34
diff --git a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
deleted file mode 100644
index 782b19d68aaf..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-
-HOMEPAGE="https://github.com/latchset/jwcrypto"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
deleted file mode 100644
index b57976ef02c6..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/jwcrypto/jwcrypto-1.3.0.ebuild b/dev-python/jwcrypto/jwcrypto-1.3.0.ebuild
deleted file mode 100644
index cc2a94b3af64..000000000000
--- a/dev-python/jwcrypto/jwcrypto-1.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
-HOMEPAGE="
-	https://github.com/latchset/jwcrypto/
-	https://pypi.org/project/jwcrypto/
-"
-SRC_URI="
-	https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Do not install doc in non-standard paths
-	sed -i "/data_files/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index dd7fa705d992..bdd60dc59fb9 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,5 @@
 DIST keystoneauth1-4.5.0.tar.gz 266418 BLAKE2B cd56e6d62e185ded667b2e9a53478e65fdea7eea203e3598193b34137297a5b75e315433882a08d16f360936208eb55c6d4e5c80e64161f1ce00db2633e59d7a SHA512 eebf9f15624d4544351b26e80af4023dab3a60ad2848b14c1cf6ab4deab50d2c9812747f3e737aacd9e49eacaff3960d8cb1432067d2648d7d2552fdad907457
 DIST keystoneauth1-4.6.0.tar.gz 267019 BLAKE2B ad1df2ce6f88ca03f1c9cde6bd84014fc7afedb3fb2375bc95461bab466f82464393e20919e4e506bce2cdbf1283ef53777c7ab3e92e2195b21d95459814f408 SHA512 fe6fbb0e47fb3608b0653362da0d19bdcb7055f9d043c776d487a2f6af76bda1cc1d8a2b87a771cafb54d0cd349695618428ed7dd93aba273d3d455b4175cbc8
 EBUILD keystoneauth-4.5.0.ebuild 1792 BLAKE2B 8d6e3f459551b0c39eb6b262f247385671cdfa6bedf68ae7fe05f0f72ab7c2a12ec148b37a876a0973adbf09d011c2ad7317429dccc1134940b615a7860559db SHA512 c3b0c4d2ad7e9f7fc855a792d40b8efa8dfbc5074f1ad27e6dbd3df76001f02d3f2425e0ef73aec232feab45307cde4ac2576a3cd342f381051b32d7995ed1d3
-EBUILD keystoneauth-4.6.0.ebuild 1795 BLAKE2B f25b46ccd0d4aa806cef0c8ec8d70e0f38c2a23f04cbf5958dfd6cdb49f9ec06ce235ad96ec28da432fa40e385191f09cee63a2b8eb2164fc80d26c94144c1de SHA512 6a60a114eda593f1d93defbfced5e2469ec13af6fad61046ec2f550d19fbe3ada56db087d7c8d13a0e22d51ddc4d03723f9cb7ff249155f71b719a12730063bb
+EBUILD keystoneauth-4.6.0.ebuild 1802 BLAKE2B 855bf75eaeb28b9e6890430898844cb88028eacb2836ef2739f5fc498fb5d4a9093ea18ff8d1b620b81c9dd1bbcf5dd5d2bd7da3242fce71655502be36469b61 SHA512 3b78d5498ed078709baeb52c10530c218e7a593e7e115341e7a54dd1f00218c743855b6dc99a4239461f519cfac29c63ba64ab0cff71f5564e334dd325dff0c8
 MISC metadata.xml 518 BLAKE2B 8a84b6a7146096e67c0517623f0680cbe7772a48d8167b1aaf34dd12f7f626c84e60c0a15b3d90ae9df6483c33d7b51fc5cbf51d35e4f409e04573eb8fe18d1b SHA512 9a5b7fe8f29deed8ed59d6b3a96cfbacd5b566d6aa6eabd55545f02521d3dcc7ef7347632cdbead0735d28004ffe55a18550ee45cf8634253900f0190f140434
diff --git a/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild b/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
index 3be77a24f5f4..ced69f35280b 100644
--- a/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 CDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lark/Manifest b/dev-python/lark/Manifest
index 252dee18df0a..99cdd82705a3 100644
--- a/dev-python/lark/Manifest
+++ b/dev-python/lark/Manifest
@@ -1,5 +1,3 @@
 DIST lark-1.1.2.tar.gz 243201 BLAKE2B 0f1b51b0276ad893f29d0afa6c3e18211b0b92832c8c6f5cba6bbe9e03486b5598f55fa7c6f4d77798ed070decd902d01faa4df62039031fe21d392d29122125 SHA512 fc797c263410f461e1ef28fbbba526472b9c4d8dbb296b309e59daa5945fdcc0c2f9347b3b4bf78e189c6a3d8f1333c74a5f3d80b82ee54867181b84ba263c00
-DIST lark-parser-0.11.3.tar.gz 229917 BLAKE2B 14bd76f1faaa4fa0aa3fea300d7a4969e0afd70cecd163304047b34a001c012932f37a170d6727a01c93f69ad4c29da70e0b26cee477d81880fa7f97ebd01598 SHA512 34cb6b53dc782a8de57f1f9a0946e7d1f383fad83aaf85102f7d8ca9e5ecd1f83a7666ee1ed8bf556a0d21e1ac5af23964377619882b81dd1033512f544d51c0
-EBUILD lark-0.11.3-r1.ebuild 791 BLAKE2B 52472cd0e01845abb9529baad9a1d2bad5ad92e0ac87cda74b7cc91a9d6a4409c5c725f76bd089812c43b2574eb2739c511956cd9e1b3d210d5b18bae2f59f17 SHA512 d085cca68608cf4988ed78fb9faff1bfe55c63e8aa489f0ce2c49cd930dfd9c17ce5d98035047a027c572c6daeac2efa20ff1e96a743f3db912df1e28d26d1e8
-EBUILD lark-1.1.2.ebuild 1046 BLAKE2B 83f7559b61146440ecaca280b97f0e7937e3144e385b6a0436a4c309940ed68401f00f5937fa171c703313326d82bc38ae852f81cfa951bb1078b28da51d8d21 SHA512 a0eecbe6269c7662ed0bf5b2d9b63c4d782d28bff3848d746712545d4d9fb68566a6a93f89a9df50597dbf388afb04c45bc79ac27398881f7a79936c08474c72
+EBUILD lark-1.1.2.ebuild 1044 BLAKE2B 37651f4ac118748c27f1ba76db1cf0400957dcd8e348023295306f86b88c7e864dfebf80a273a0fbc515c6a536f9fa3d1010172df4682c35a7097254ec75b841 SHA512 e5b8c6d42e4af12bf07d2c6efe3d330f99da1f5cdac46a0ead309707f812489ef43a91cd54d61249e6c13cc21a4fff3352a0ea2987182af60b73f658801462df
 MISC metadata.xml 364 BLAKE2B 8a1409bfc4f242907355a931f5ca7308c96b424cc06cfbc82f281abbaea32a0aaa5257d04f4fbd6131e9056dc08ec2f5834d80608d68d5e9efd32314d0a5cd47 SHA512 ed2ecc7da195e14e5a8071f3c5d277ead1dbbb811c1b7b1163c53d0b5e01ab299a7547de82782c9211aeb8fb6d97d3cd6bc0c4f258c533e884c4e096e7ff20b1
diff --git a/dev-python/lark/lark-0.11.3-r1.ebuild b/dev-python/lark/lark-0.11.3-r1.ebuild
deleted file mode 100644
index 1b17ebf7368b..000000000000
--- a/dev-python/lark/lark-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-MY_P=lark-parser-${PV}
-DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
-HOMEPAGE="https://github.com/lark-parser/lark"
-SRC_URI="mirror://pypi/${PN:0:1}/lark-parser/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/atomicwrites[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	"${EPYTHON}" -m tests -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/lark/lark-1.1.2.ebuild b/dev-python/lark/lark-1.1.2.ebuild
index 71a481472852..a74107bac7a7 100644
--- a/dev-python/lark/lark-1.1.2.ebuild
+++ b/dev-python/lark/lark-1.1.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/lark/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index cfd1f09eda39..1d90b7562661 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-4.0.gh.tar.gz 47743 BLAKE2B c6246b35a9a389c6cd999b32412436f8134737a4cba1c0bf8a905e3ba6e1653c515956f43a580901dd4278cbc00b783ecfa7a4306f0fc7ca2d2666b3af500cb8 SHA512 787b049a5f06d7370369a6bb2d9ebab6e4e5eda0a4f839906e205a7e19a00f9f7e350d4c42e3434e345063dd0ea44e5b0b4c0524033b05a6d8f15758757c5c36
-EBUILD libarchive-c-4.0.ebuild 638 BLAKE2B fc1e1a95aab27e3dc5d08661d091c5ee727f8e26c9217c8e2f73e876cfe507e78bdcc6a86855183d6814b56d11cb0b605daaf41aceb43bbd7c3c2d99dcba4c66 SHA512 f84349e4c440056991395bb4c60ae4ba42f368ed09e8f1645ed39fa6f1038b64df1e7027be2a8e7c616b1100713f227b445c4dc581e610b29e6da6702cd84c54
+EBUILD libarchive-c-4.0.ebuild 638 BLAKE2B e3358172192cefe3b80817d1803d4d4c11663af5d99a7d54c0984226157ab309c18bd96e3a00afeff1707ccc18028010aea169df7697b24677b91ffb256056d9 SHA512 3cab85464bdcbb6bfbb2eacd372d09b93b0368ede8f44cd9dee3dd8eab6ce2eaca709f60aea11f099ced25d58af05a0dd467902ea23b7794164e9455ce294ae2
 MISC metadata.xml 562 BLAKE2B 5b9cebc30209b517fc5ed60eea8e340dd36b16fb1c593bb857a05bc6a8cba3b6ac45a54891c72429a775b15afcd7f56b453ae628aa61d029db1df633e764518b SHA512 200c3fd7789d21103719ba2693f8298a8be1842535ff086ad487a66e9d4ae39f6dd1b2435d60fc0443add133923cf047f37c2de17f581fd66f786f935e203c43
diff --git a/dev-python/libarchive-c/libarchive-c-4.0.ebuild b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
index 58a8bcd5595f..60ae1296caf4 100644
--- a/dev-python/libarchive-c/libarchive-c-4.0.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="A Python interface to libarchive"
diff --git a/dev-python/libcloud/Manifest b/dev-python/libcloud/Manifest
index be2506407491..d5ecd12659d5 100644
--- a/dev-python/libcloud/Manifest
+++ b/dev-python/libcloud/Manifest
@@ -1,5 +1,5 @@
 DIST apache-libcloud-3.5.1.tar.bz2 1859270 BLAKE2B c2e49a79ac4feccb5285d9bf55a4a6e8486d32968216b68e8c8f5b049ef5fa8caae853b4e4cc31ec2c323aedf3de275ab79758b1a055d7f20bbde994c58ba882 SHA512 22d6facf344687bfcfd32e53ede12227882f55bf54ffcf75d5584652c4cd257905c56e359d9c6b050635faa2305c344a6dfdc17007eb41143ccff772bd31d91e
 DIST apache-libcloud-3.6.0.tar.bz2 1873596 BLAKE2B 7ca67d0a84d1af9a216882efb35ff48f4a795eacf34132b78429e0158b1093b3eec316541a52673e61edfc5bfcb326052ee874fe59b1e4a65b407bdaccf38774 SHA512 3a4b4ecf35194e70b6cb70f0619238e1c0140891c08438d4b1ef308fffc9dfb973a5c1534b6ee7864797925b7f7be77eb79a2c4d621627d8042da3927b3f2ff4
 EBUILD libcloud-3.5.1.ebuild 1556 BLAKE2B 9387cd43339f7ce4ede8fe0d423a51abef5aceb996064e8326dab6f5fcad1c5e9b5f2c3350121549d16e3cb85e354d248aef7955d523fb36e02b26b222e0ccd9 SHA512 08a9138bbdf960a87c6ee4b5af259b7cadf5988ec652b339c22901c6695a1e9af6132808119b811d515aeb25916854af42084217695ba807b4622f5b8f388da4
-EBUILD libcloud-3.6.0.ebuild 1522 BLAKE2B e88dd27ae666a82b7797719cdf51b1f1b19d01203bdbfee25e6e95ae71aa53f99c48b85c03bbc0af9bf51194eedfd5df23bbee6cfefaa03dfe3993efa1346560 SHA512 d5fa75de66799b00dc022a0b62564e8b66b0a42a778c3581746c4a8c26525011c906539253e5529a9421963a9edf576a8b86999bc70e72ad5b8a3d9f7ead5270
+EBUILD libcloud-3.6.0.ebuild 1529 BLAKE2B 8194e5b9e86361f23b7e19ed35cf98279fe6787b012a89bee669c86a9ec504ca823c0ef48b7bff54dbfdd6de259108dbf0416acea8ba460d2e18af11de321394 SHA512 87bd8111bfc5679b2e3c71556235604417a09b59fe0f921f6cc2559d2148aae4ea30dc5501b24ac2630fbfe098811c85c0fe42887342704106454ad3e5b0cf34
 MISC metadata.xml 398 BLAKE2B 5623f486a289eea0196b22b2f88ff377589bbcea13e341efd85d31dee07f8638bc985e6a1c03ac7982da08c879b5b09a46e5679fda8666f93366a8561777da7c SHA512 bc6e38c949ed0513f4e562406fd84031cd80f01a881844202e033fe5225490d42b27855413cd7d2fec216b002c38e1832fa8f841112c68628c906189ebf1e937
diff --git a/dev-python/libcloud/libcloud-3.6.0.ebuild b/dev-python/libcloud/libcloud-3.6.0.ebuild
index 83c24363bde5..03f2ad22fa9d 100644
--- a/dev-python/libcloud/libcloud-3.6.0.ebuild
+++ b/dev-python/libcloud/libcloud-3.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/apache-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1b201b1134df..41bd9023e8f5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lit-12.0.1.ebuild 874 BLAKE2B b81a41897a2bf7e2c266cc70bc77c694f6d49423b6d7e8eec56d2702377abf4df9dad93126232808dd913ecbdf489fc2a21f4a4281b266e74498f241815a858e SHA512 584c8ef14481ac16ebe461ce0fd7680eef44f743caf51a30fc78e4b4b840a335cd37e2a767140fb65daad543633b8922174892d47bdc1dee8055b6a97237167e
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.1.ebuild 919 BLAKE2B c579f3fca21b5f18b4a286c3ad73fc3120f3548c8bc3d0560a571d2537e7aed432a5590270e0756ad5be2a8c2a9ab076ddb1eb15111fb9dff39797c47090c645 SHA512 657aac1832e2d9082a79a8cc5aab2bf5ac7d2dc396682411f917edcb43ea1d80aacd1025b9878afed8a215017020cd0d0af15844f7a3fd7ee9a75b3e02cabeef
 EBUILD lit-14.0.3.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
+EBUILD lit-14.0.4.ebuild 920 BLAKE2B 97bfc25ead78c898e41321f68e8667b4dd3ccd7927e2a80e8de7eb992ccb6c9b34a54a5e43ccf3962ea19b0a01cbbbe3a8529c5e5c3222eb9303a7ba1ec86102 SHA512 8868c596fa94a532725f2806c4e14b2d9bbf4615f5c13a376e2ee8627ebc8a499d3febff129077b89199567b6ed9313f11a211f891d2aa2d81ba573607f4dbe1
 EBUILD lit-15.0.0.9999.ebuild 871 BLAKE2B 7637fa92b7d8e5b7c87bd1cc7e8941357b48064795ca297050fcbd83f0e2a9a2a36bc1916d2cff19e95fff353250c5cfc82d2eb052c36b8bb9cb9398df19e3c0 SHA512 d049fceece84c0a07332d664a7f9b98b3c5ef81e69f24394f3e81e733977b64a523eb9b15a149e82bacd54c9a262f988ea777ee7af7c3ad48007be62f529c103
 MISC metadata.xml 283 BLAKE2B 7636ccca14947f04df1e43d5ab56b0486ea2a3c500077c6dacadce13f2eb46d7729bd2766ed9e4bcc1748dc72d9c21b61b8c04c83fb78d4341f286e04b5d33ea SHA512 8816317f9fe5bc2df7b2e5bb9a9582f042e5fdd634b897e1fcc6a256d41e45d1215399b0a4bea8b1d47bf10ee122796eb723f3e4c654d4cc6d7772927aae790b
diff --git a/dev-python/lit/lit-14.0.4.ebuild b/dev-python/lit/lit-14.0.4.ebuild
new file mode 100644
index 000000000000..638a94fc8e55
--- /dev/null
+++ b/dev-python/lit/lit-14.0.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 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 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm
+	)
+"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/makefun/Manifest b/dev-python/makefun/Manifest
index ec74b3cf6a18..9848fe7c7d39 100644
--- a/dev-python/makefun/Manifest
+++ b/dev-python/makefun/Manifest
@@ -1,4 +1,4 @@
 AUX makefun-1.13.1-no_pytest-runner.patch 184 BLAKE2B 663db5f0d235f5117a066fff19bbb940c3a2b7d7cfbe2c2b07430d85d33e0a62800aa89c38530526eeae76611a6619eee765f5fdd69d9ab38d39458d85cb104d SHA512 179e9db22717ec79d0c4ae9dc53ceee26d542eb4e3a957bb4ae4689ba808476894a8276e536214c9923140ee8307393d96b417ea8477d393e399ca4c953dfdd4
 DIST makefun-1.13.1.tar.gz 72170 BLAKE2B b1b5e76277e742ef51bcdf2bf6f1d1e761010d75bc3f20d7a8c079b368972b90775bd3bb23cf1787911a8d858549d72d4a2c9379675e59f359486bf1c49566e2 SHA512 ae103d3827673c4124d051e3c76d3d0d126c783ac7a1ea09de3801fd695439eaa549c297bd5c262184a3ee6fdf7b046065081fa3183642778148c2134d7bfc06
-EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 84ee1a780585bfc5b53f575a50c01ad6de218039ae3b851bf631c9880b0db3b5902070798748dc389d2aa0dfdac30cd69f029d994a5989ccf19bc01dc1433b22 SHA512 e96b200831c021ad0ba9d0a7440930756c8dfeb93d5ae753e91074171913988ab4c266abdf9555b62f75ce4cbf291859ee6f16f28078fcfd814387e8becf6fd5
+EBUILD makefun-1.13.1.ebuild 623 BLAKE2B 07d6c59a1faea0879c792c37752a1e4edfad0f1f575199b4fb22794e5dad32cac11f846f21d722f81e6c5e23a9a24be424e65ce59a6626095a05cceec7403bf3 SHA512 d08ac35b8b5425d17dfb3c7f98716345ac26cf60003c33a694e962422d4964b1c4e6cce08ca7a5d68c44538b0db26cc9154cbc91abbb273e80617a32d52f7184
 MISC metadata.xml 401 BLAKE2B 0657deb821edfdf648e5bb0a95255b87df0c090c6e719a5ad94a6d3f6e2e64f36d4093a2bfddb5e8592d3d38741e8d0251c8331133113766ef2fc4caa48e88ad SHA512 cda21fbaa9b62896ba3389cf281ae35bd9a59fb0d0604e61fb3b046061de47a2535d7a98d335b66f44483ae43deadf05abde0a2285902c1c3fab2762b080dbad
diff --git a/dev-python/makefun/makefun-1.13.1.ebuild b/dev-python/makefun/makefun-1.13.1.ebuild
index eb2656703a7e..c95083f79b0b 100644
--- a/dev-python/makefun/makefun-1.13.1.ebuild
+++ b/dev-python/makefun/makefun-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/dev-python/markdown-it-py/Manifest b/dev-python/markdown-it-py/Manifest
index ea0fa6b197ff..31c54a845297 100644
--- a/dev-python/markdown-it-py/Manifest
+++ b/dev-python/markdown-it-py/Manifest
@@ -1,3 +1,3 @@
 DIST markdown-it-py-2.1.0.gh.tar.gz 265858 BLAKE2B 0d1bb789ed9a8d08b16c753f7ecc7cc6a6b1fd59fc39d303a0de15276a0a0f93dc8c8bc952de60450741f26770dd3955ae0e6aaa358bacf1003e5eb9124d3a54 SHA512 04e90538c8693f795aed2ed0a5bef4eaf0c12fac32cc0c2049c563e974b229940b9ceaea849ce86fa9804ccdd7be93145f3b6fc8d0774e96fafa0484368d0a88
-EBUILD markdown-it-py-2.1.0.ebuild 963 BLAKE2B 66af3087e97990deaa160cb68f6e2d62e6eda67d7bee1f33044e20928a2229803d34a2b68b18d3a8f61ade1546898bfb13ef12865915845a177125bcd0ad5e3c SHA512 daba8f667331757497123e6dd140e0844fa0ede8fb598f120151807046b6ea5db5866cea96a261e5ae60c9a41470e090e129d59306fa97b887839896260749d4
+EBUILD markdown-it-py-2.1.0.ebuild 963 BLAKE2B fdb3e58c37eabf241a3731bc9bb65db782adfb05e4bfd70d88ddc4a4f76ed7a7647b6cb861b87c200b6655df5c33fe4e2c1d7919d90af1dece7d3e3959b31115 SHA512 2856c1b039a45bd4dfd16c63e75a1d9f0b09a5322e1f9addf2551dae328dff6806b1f3766bc66316e3fc18fa2ee091f43cdb895c657bce4093f27a67f8797670
 MISC metadata.xml 412 BLAKE2B bffaf51dbd0a94b09d07650e49e9bee76015ab4358c36db207713d82387a1d729e7f6576d824b02ccfd786353762e623e3dd657fb3d7c42f8467c8165da61ed3 SHA512 88b86fad883100895db6feee193102cc93ead665e1283d02f9f57a4bb228acfc738cef11af2ba02cab9b02fdfe8ba35861347a19e5b0de22f546e8e0a297e173
diff --git a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
index d0e2f2e3281f..d87d24a6cf40 100644
--- a/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+++ b/dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=flit
 inherit distutils-r1
 
diff --git a/dev-python/markdown2/Manifest b/dev-python/markdown2/Manifest
index 3e825fff4118..72947ca66adb 100644
--- a/dev-python/markdown2/Manifest
+++ b/dev-python/markdown2/Manifest
@@ -1,5 +1,5 @@
 DIST markdown2-2.4.2.tar.gz 96270 BLAKE2B 63808f2b6e8af25eca047e7b24a7ab7ce7afc35fa10aff57b93952cefae765ae8746300f6e93033be87aa73607249198cdfd4fa6e3b3aed711e80d9dc7a006ab SHA512 8c41617213ae8a2d02a986489756d511ee7e1ae970eef348f68808439feaef099ef935ea0a2c31cb9e9abe39899a24fd981a29b7c90d1f8096ba999506121e60
 DIST markdown2-2.4.3.tar.gz 102973 BLAKE2B 7a856a9d0bd539e3de1e358aa7d4968aca62b67a30dc64a905633040a6a525b2ac1ec0d4cd7d8d4ed9b38e68e5df3f187cf0f56e1816a4ec10efe4e849356580 SHA512 b5eb5cb6ac52878a224aa6b4642ade86593de5340594271940b3ef25809a9e37b9b3cbb04f4fa9880a50a4fee8ed85c1c6d76b19065b0fd703363faf4d812679
 EBUILD markdown2-2.4.2.ebuild 657 BLAKE2B e98cf6a720af82dba5b58fc157bb23068d29f2e9c53e5bbd58cf0d219d4507765f833461f7a8c4a3be3bce2c2b985a6398dfb00f1a7df6a96144a63387cb6518 SHA512 0985726470e92ba923c86613253615571fad519905ae09cfb2d1a0d6e9f22948239294ed18fc1d4457d2def7dd9eb6042794fb2b148702b38b334bb817ca4001
-EBUILD markdown2-2.4.3.ebuild 699 BLAKE2B b35556814f6779bd4cabb2960dbc0ffc3d1e83d72a3d663664f00ee317f07282d405ac5855690f930062c0dc3848819fd7b4f99c8d5f2b3aa2fa15a3b2fbd6b4 SHA512 b08780947c663e683e0d23fd69d4d3ad548e3cba13ad5a501304e86dd8a329e03d5aabf419136c5b901e30f8f9034d7479ec3f05b750fc12032d30ce5066168b
+EBUILD markdown2-2.4.3.ebuild 699 BLAKE2B 69532b65d3899a166eab62949680885ab1556e8bd8459147df89ff245141903aa93c0df1ab9f50e36eebded132d3886f2c5e9a430e86dce228fe616451e13357 SHA512 50325c9e6d6edca45d061bd39c7cc2ae22e834a322a9c671a9f936365c3cc7e3da83a307d393114709772f59761f4310d069f26d188115fde21ff61339cd1811
 MISC metadata.xml 551 BLAKE2B 293046752073df3a0fe72acea3165d62ae78297f82aa72e40edeaab6bb6021ccbeaa8cc145341aa05dd3fe87c2f89e88f2281ca95ead33d99bbfc5ba53573ca1 SHA512 9d30d896754f1379f4fae79f86bec966cc3639a42e5e7bcc7e8d2e94881ee8a75b7e3ddedbc1573f1eb3c429aea636512efdb887f2827dc1b1aaa4caaa44e413
diff --git a/dev-python/markdown2/markdown2-2.4.3.ebuild b/dev-python/markdown2/markdown2-2.4.3.ebuild
index 9bf9f43c0072..0e1a7c9090f2 100644
--- a/dev-python/markdown2/markdown2-2.4.3.ebuild
+++ b/dev-python/markdown2/markdown2-2.4.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index bce06c6ca246..bc9cb91948f9 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,3 +1,5 @@
 DIST marshmallow-3.15.0.tar.gz 179483 BLAKE2B 5cd660f4b1bf3ffb775e06659adce2f0da8bf46bd5376eb4407793925de60fce48ac633baced399314d9cef1faaf00f2643e56404cdc2c44e51b5b0c42ab533d SHA512 9d688466b9dfce7cd3307538aadb68c8297d3ee026a7a61953d361a9e52acafd00da81f48ab26771dba74bf8024117d53292763ab98cb78e2bbd7b5604bee4f1
+DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
 EBUILD marshmallow-3.15.0.ebuild 680 BLAKE2B 91ca8eda12e9cd00c5624a134139922f09b1533aae29e7d7c9a5863d8e113aa689e4b4fc802ae53dc10aee72644cc6ab8a9525c59c2a6416a6e376bffb060764 SHA512 6a81faca248de16f1723c11df27e3cc6d66fa39dc960341cfe6d1e384b00c40e657f5e6a44f3295b38dff20d82bf35e5d6641b332e0efda841162840a019bb93
+EBUILD marshmallow-3.16.0.ebuild 687 BLAKE2B da59e69f7fe2a95e6d582589da2c1b1cc2791761e0f08a78312a2aff1cf34ff8a3ca5e64235bec0a780e6adede7137a34690a2c36c8cde0740cec6aa19366dd5 SHA512 63fc50025e89c1f9e455e094dd08556b35149cca8f61d6bed612f4a52a4c50fd638871741d15a13352eab250a30182ff3d9896f210d9709133896a176dbcbdac
 MISC metadata.xml 462 BLAKE2B 8092c0a0e4a28fdedd16131788e41c7133a7d114b6603c859a7b75a3e2c1519e51450c6ecd8b8bb42b16feee2b187d61a3241c4af6a4decebe85cd011944271d SHA512 bc243259fe7e0cf4892a8e9d5bc9792cdf9166400e6c5a2bb00dda58a1a4eae672c9b5c9723ba662f583bf47b994134943d6879141472e9ca4395d8700649997
diff --git a/dev-python/marshmallow/marshmallow-3.16.0.ebuild b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
new file mode 100644
index 000000000000..98fb29348702
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.16.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 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="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mdit-py-plugins/Manifest b/dev-python/mdit-py-plugins/Manifest
index 7aa66891d010..2b7ede09e539 100644
--- a/dev-python/mdit-py-plugins/Manifest
+++ b/dev-python/mdit-py-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST mdit-py-plugins-0.3.0.gh.tar.gz 50654 BLAKE2B e84842e7cada1d9239f1d449c1a21ed654ab13017ea92f82190053b37371bc7e06d7afb65f6f56f7fa935666d24d05dca99628121bd4092a1143c289588ddfa4 SHA512 dd6aa738c6d93e45437326b1be52e0a9fc411aa3beacb61690919c272979c97ac1b38116b1ebb01c7d8fe724d4af9621c81ccd45131a690df8a2c0c325eef0e8
-EBUILD mdit-py-plugins-0.3.0.ebuild 720 BLAKE2B b43c3d5a7db15fe83a402e8ad751a9b39bd1df285680d52b397a0c41707b43c26cd8e254d86c463ec2d507f68318ce6ac7a7d68d4e59f954c864aba32ae0e158 SHA512 64d52667b813e3222caebb4a871e837ce099d1a3a55237d0a40eb8cb2a2a0d2eb6c8bd74cf15ffb55b692cc93b69eb950a42096c48fc80001d834c747ee36b26
+EBUILD mdit-py-plugins-0.3.0.ebuild 720 BLAKE2B 838cdc7bfa6d39707ae0ead81eca2bc1f57c990d4a1019af803d3eb0225c64c05f6354af979ff0abd831c87e92afa2a4b0443331a517b7eefea3f0e11cfa372f SHA512 06f05c73ce61a1585dfb22ef0ee99a5dda683769cbb14c858e4ba9d5f1f903cb1a1039084261ce71015e26e4521404f9136993c9fc14e9bfd3e2b9117ee2bff8
 MISC metadata.xml 414 BLAKE2B b7b6cfc3dff5ca097543d0541b066c466669ea3d9193e10530e97f6992053bedb67badf78023b14893d779a1580eb3bb385d51affc5a0927d76f89ddeed1be24 SHA512 564918fba45aa79a7a05d532691fe15aaa61a0e16e6004d57875720a26fc13548d37793fbab83479d0fc8c70764b3f919430a9bd698c03c85bf9103b56355166
diff --git a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
index d7b94a9e2c88..d3bbb79c4893 100644
--- a/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+++ b/dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
diff --git a/dev-python/mergedict/Manifest b/dev-python/mergedict/Manifest
index 0f9144465765..cfabfea25d97 100644
--- a/dev-python/mergedict/Manifest
+++ b/dev-python/mergedict/Manifest
@@ -1,3 +1,4 @@
 DIST mergedict-1.0.0.tar.gz 5188 BLAKE2B 6ec3a5df1b9c366cbb8b87b4c02ff18f15953d1e10469c5d20e170f0a1deca949edab6f0bd0100fb085401375cce51b9e323279d296153144548b93a8d072e7e SHA512 0f9f619961d2840995d2c2498debcf8b47c54fae76f419588562311d5bc43483c994cbeb618f2a1220a9ab33c56f12e3e257323c40ecd0db3a7181d7dd80ef27
+EBUILD mergedict-1.0.0-r1.ebuild 444 BLAKE2B 258009af12151b11adc9c4c537959904fa7bf95c77449a4ff1e89bd5ab5011463f902e48e093e2d38e95a3991dc3eb5b5e1cf2d3b3243e304eea3a4e5bb44002 SHA512 ed2291b584bcc78e69c86ca4d031381e6ca08b2c486948073196d830ce1862db17dd7cbc979547cc482c8153638315f554ddf5ba9cd233f999ec30b37f1567ef
 EBUILD mergedict-1.0.0.ebuild 410 BLAKE2B c6b49b61287107c1591a3fda81c39362878c5fb2a35bf78767e559fe2f58a53c300f36d3adc24873133557ae0a501e2e9a8b33f0dd7130cf22d0b750dd911ead SHA512 65d25b201ee2d1db73eb62d52203a261b8d3890344bc3b9b2c7cfe4ee32fb43b89c6a6a6446d320448034b64c1643cce9b904291400354a442d56ef0f4c76229
 MISC metadata.xml 376 BLAKE2B 187fde54addef683a9c1fd63cebaf56d1a9e7be22bff5635291785a7f5cd15c26f2bbae8d09033364849d3a955db8e3736c4180e72ef1df38179a5764cac4d2e SHA512 60ece1ab0999b9fb136fcfc52237285a8dcb7f54f73ee1d6b4ec2051361883f04237117f6e8f5d6558b61ca94d55ebab3b40b683d075b060c99eb6aad5c29ef3
diff --git a/dev-python/mergedict/mergedict-1.0.0-r1.ebuild b/dev-python/mergedict/mergedict-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..d96ac8c4a475
--- /dev/null
+++ b/dev-python/mergedict/mergedict-1.0.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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="A Python 'dict' with a merge() method"
+HOMEPAGE="https://github.com/schettino72/mergedict/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mimerender/Manifest b/dev-python/mimerender/Manifest
index f89d1c893475..73475c2267c1 100644
--- a/dev-python/mimerender/Manifest
+++ b/dev-python/mimerender/Manifest
@@ -1,3 +1,4 @@
 DIST mimerender-0.6.0.gh.tar.gz 16677 BLAKE2B 55db5bf97cd65de89271af8713d9dbdebab6254fa2dc62cfcd78394f4333093fdc508ad6e93f104eee2f3d8a1ceb9197353b4ca085e3b4887b4560c2c65c45f6 SHA512 68c584ba8ae608097b739078dd729bd8b5493087901ba281959abdb81d4e6052ff045c487fde4f67744b413bab36d7f938c68b162049ebe33bff642571b8fd98
+EBUILD mimerender-0.6.0-r1.ebuild 722 BLAKE2B cabcf9c68e8edcb36da31c5bd73da5307b813200b25c3c13722c2f8abdeaa2794ca8bb8078885c13d99d552734f8d772ced5768b3e4de4dcaf28ab63b1050602 SHA512 79dae7e3fb652830c76cfef2d5f55ba3d5081e991df8597e8887baaef3bf1ec727c1e461acfabe3bcaa8a3b2338b3e856cb12b3f7e0ac1aee80e7f6e45745708
 EBUILD mimerender-0.6.0.ebuild 687 BLAKE2B 2d456cef3b2d10dbf55d7088aaf5f1fbd806644a271524d6dd571e9135e1de201d0e2633892def7a59f0bcda9719a1f235022960f88d468cba20c777cbaf4199 SHA512 6cf3b50633225fe57b44423f11964b71af1f76a8b9f9c25ca01066907d3e818ffb3f50e44dce584b4f003d501e4d25521cbf7108aa50be8081d9f0f4e65b5942
 MISC metadata.xml 376 BLAKE2B 107a6d555f9627145798ad26abec52ca2c37d62d3141fe0d36dcb6e0c9be40d514eefa6b0a3f6aa813b3f30411a61d5e9ac35b50ec20a719e0c11b0cf9017f3d SHA512 ceae628b841986e04e52c4c093d87457db0399f18bc102a488de0f638a66dd39624c968e5ddd62219461fe4b49045169f1d56380602ac7f26d87876186c3e36d
diff --git a/dev-python/mimerender/mimerender-0.6.0-r1.ebuild b/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..71402845f379
--- /dev/null
+++ b/dev-python/mimerender/mimerender-0.6.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 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="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+HOMEPAGE="
+	https://pypi.org/project/mimerender/
+	https://github.com/martinblech/mimerender/"
+SRC_URI="
+	https://github.com/martinblech/mimerender/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/python-mimeparse[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" src/test.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 2346a3e62336..e7b54332c182 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1,13 +1,7 @@
 DIST moto-3.1.10.tar.gz 2314423 BLAKE2B ad09f8cb70a1541dce640c870355c349f9a932beec1c98d3d4739bda89e773670fb0209b9ec7aca3a250472d425048d444b08edf2f1555c6777251de14c5a80a SHA512 138e5be59fffcfe4579b6cb292f4f8ec21c5d05723bcd66cae85bcc0f60991ac84310206d5a0fe8361135ff04573173f41b276021981d6f7844a726f18b54f83
-DIST moto-3.1.5.tar.gz 2282060 BLAKE2B f7b2cbf1de96b6d96b334e5b51bcdf69fb9645261564b28b290c19c37c27df5c25395ce54cc7d9c424f25cb381f4ddf13dc51456fb7baeec5e21b2da6abf725b SHA512 583c4e76a5acacdcce456cd953109b130dd53d6bf3e50d56d5ead6bfbdcd181109ce3df141686a4717687d3e1e8b33a73bdc7155c36aa5d064a4621e007ab17a
-DIST moto-3.1.6.tar.gz 2273226 BLAKE2B 91966fd315b3e5b4904ecc0e17c716bb47ecb6b644ccaad2cd52fb92754b79af0edb11573fadfd40b8ae75c17bad3429b6e2c4801424c4f30fea32689cd790d1 SHA512 f97ca412910ec9a0cf6d7e28b2ff2f2bf6a3d142a091f65eb4ccf8d53ae9d5362cccdbd24d72083f2d9c6200a3f6e400cca32c16965731d0fbd22239f9866d59
-DIST moto-3.1.7.tar.gz 2275858 BLAKE2B 7984da8df1ebf305ae11f16179612854b630e20eaeb834d85be4063becf73d0615183c93d242e162c7520225fee9eca149a9756fd507b9aaf8e19242fee3f25e SHA512 fed1c97515bed3640f6959cfba417ed27771d77a1b43e94877520ed582542eb61cc4f7d88c791834425b1a1614641a2c178f57787440af545ecf5b03fd6649f2
-DIST moto-3.1.8.tar.gz 2295468 BLAKE2B 0417e08d730d840f552c171d3ee7cfc07b395ffaa27b811c8f43426aebca6969b29111d481b9eb6d7fe1d4cadb4296027354b908512f03e0c45e2d9175b4376f SHA512 357b5841601f39732aa244d8ecd062b6812eed3d41cbf3a08138d826de5803cd631adc5b9fe2cae2d1e7553951906e49a8af464f97dfd5683f8099e475ca8b94
+DIST moto-3.1.11.tar.gz 2320905 BLAKE2B 14cd572defd974e428a77f75be32f576d7cb222fa80a37b5f72bdb8f10fd36be3b456d7d660fe7943862824393b48b4d70687dde191ffc49a49db7ee05772994 SHA512 2e1a84beef161442f74dee95b1e5dc7b23c77d9b001c27b0d8ee3c429c5da13be9a6d0074bc26bacad72f5ea82b0eb85e88dd2adb585f7dfd688bd1e3d9cc5e9
 DIST moto-3.1.9.tar.gz 2308059 BLAKE2B 85f5c084fc81d74e8297ab0a78e3823bb6e98b1d4fdb70b802dabfa3ba11475670c3bfda27f48069e5298691a8ca71c98acf156c3b15ab79ff85555545c7596e SHA512 600ec2042e5e6df5e3bbc9fafcaa32255568c35a2a127e4f093ecc9332a799b568002cb414e5c086f24795c4f8f510517bf00c29a9b6a38dd667807d04a18954
 EBUILD moto-3.1.10.ebuild 3854 BLAKE2B ef6d32957a4b1a5525f14ca4dce0ee923a0c0b0e695cebd1fa072b18b00c7f2f1580b5437bc06f98591dcaa087fcd32d0dfae8b305a9b8edbcdb64b855e076b7 SHA512 bcaaeebff6dffe3ed42489f70bec9fcab13ed65658f0d66b05fe4c2c87664c3bb13dfe759bf6ad315c993198598bce50962ffd67a77a17f328a730683591d2b2
-EBUILD moto-3.1.5.ebuild 3783 BLAKE2B 2a10964580092a2fa6b56972a30bd04b4150a1902af028b600ad3ec4a098be88064cf5c14c4293b35ca87fd5b4a8e583f22a0d1e9820b0462af7b049255bc16a SHA512 0c4986fe5dae3ecb5183ab6fb60b7445a6bb7046f94fffd3c7e2f87e42efb3ca4c0d4f1e37033f0c72682a3fb6b35dbe3499334f203f3b2cf98da233a7a8f946
-EBUILD moto-3.1.6.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
-EBUILD moto-3.1.7.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
-EBUILD moto-3.1.8.ebuild 3785 BLAKE2B 5c1564be7993d5052755debb2d57e71f12a83d3fea3e30c089b5edae24f86621f4029287be2c5e6467c24c5fb53408859b2cd06ff6bae1ee33fe40751d040f39 SHA512 6d89d680ada9e7a1274b16c73cf62c901da07cd6ffc5b668dfc5658d183dbefa494b6f349178337402bf0bd04f7914d613382fc42566874d1b991340c5f74b33
+EBUILD moto-3.1.11.ebuild 3954 BLAKE2B 75a068f77e5a8328fca12cc29ef15d02b3fe2371fb15862e7f2385d4094caff3a7c1a84fbc3fce0c31899aa53df14a23be8f92c5a2a0973d4377f5ca6708fa98 SHA512 b1fd624f48745859c4b867d7548a40e10039c8e78e262c2fb528eb72c4ff42b35de276cbed81e461f4d820710db5dc0e7af4e14b4a7793dc7adfc4dd26fe6e8b
 EBUILD moto-3.1.9.ebuild 3783 BLAKE2B 2a10964580092a2fa6b56972a30bd04b4150a1902af028b600ad3ec4a098be88064cf5c14c4293b35ca87fd5b4a8e583f22a0d1e9820b0462af7b049255bc16a SHA512 0c4986fe5dae3ecb5183ab6fb60b7445a6bb7046f94fffd3c7e2f87e42efb3ca4c0d4f1e37033f0c72682a3fb6b35dbe3499334f203f3b2cf98da233a7a8f946
 MISC metadata.xml 552 BLAKE2B c0162cc80007c1fda211c105b3e7391e3596ef11deb9257bab489f4b112f79ed115ca3f250bdf1b87aee0af258aa59056c8d062acebca7dec631acf3ec9eb2bb SHA512 3f7b3c5709bca51588e58f9eeb9bb363e2657a7e6483519ec7782eb047a5311d434e2459ccd3b495340f85f72a92da2f7cc6eb3de617e979bade7b8fc7b3c01d
diff --git a/dev-python/moto/moto-3.1.8.ebuild b/dev-python/moto/moto-3.1.11.ebuild
similarity index 94%
rename from dev-python/moto/moto-3.1.8.ebuild
rename to dev-python/moto/moto-3.1.11.ebuild
index a0c6ea25e7d8..d32692d1217f 100644
--- a/dev-python/moto/moto-3.1.8.ebuild
+++ b/dev-python/moto/moto-3.1.11.ebuild
@@ -31,7 +31,8 @@ RDEPEND="
 	dev-python/flask[${PYTHON_USEDEP}]
 	dev-python/flask-cors[${PYTHON_USEDEP}]
 	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/openapi-spec-validator-0.2.8[${PYTHON_USEDEP}]
 	dev-python/pretty-yaml[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
@@ -75,6 +76,7 @@ python_test() {
 		tests/test_batch/test_batch_jobs.py::test_container_overrides
 		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
 		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
+		tests/test_events/test_events_lambdatriggers_integration.py::test_creating_bucket__invokes_lambda
 		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
 		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
 		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
diff --git a/dev-python/moto/moto-3.1.5.ebuild b/dev-python/moto/moto-3.1.5.ebuild
deleted file mode 100644
index 9069529dd086..000000000000
--- a/dev-python/moto/moto-3.1.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.6.ebuild b/dev-python/moto/moto-3.1.6.ebuild
deleted file mode 100644
index a0c6ea25e7d8..000000000000
--- a/dev-python/moto/moto-3.1.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/moto/moto-3.1.7.ebuild b/dev-python/moto/moto-3.1.7.ebuild
deleted file mode 100644
index a0c6ea25e7d8..000000000000
--- a/dev-python/moto/moto-3.1.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 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="Mock library for boto"
-HOMEPAGE="https://github.com/spulec/moto"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
-	dev-python/boto[${PYTHON_USEDEP}]
-	dev-python/cfn-lint[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
-	dev-python/cookies[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
-	dev-python/boto3[${PYTHON_USEDEP}]
-	dev-python/botocore[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/flask-cors[${PYTHON_USEDEP}]
-	dev-python/more-itertools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pretty-yaml[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-jose[${PYTHON_USEDEP}]
-	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
-	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
-	dev-python/xmltodict[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/test_firehose/test_firehose_put.py::test_put_record_http_destination
-		tests/test_firehose/test_firehose_put.py::test_put_record_batch_http_destination
-		tests/test_swf/responses/test_decision_tasks.py::test_respond_decision_task_completed_with_schedule_activity_task_boto3
-		tests/test_swf/responses/test_timeouts.py::test_activity_task_heartbeat_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_decision_task_start_to_close_timeout_boto3
-		tests/test_swf/responses/test_timeouts.py::test_workflow_execution_start_to_close_timeout_boto3
-		# broken code (local variable used referenced before definition)
-		tests/test_appsync/test_appsync_schema.py
-		# Needs network (or docker?) but not marked as such, bug #807031
-		# TODO: report upstream
-		tests/test_batch/test_batch_jobs.py::test_terminate_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_pending_job
-		tests/test_batch/test_batch_jobs.py::test_cancel_running_job
-		tests/test_batch/test_batch_jobs.py::test_dependencies
-		tests/test_batch/test_batch_jobs.py::test_container_overrides
-		tests/test_cloudformation/test_cloudformation_custom_resources.py::test_create_custom_lambda_resource__verify_cfnresponse_failed
-		tests/test_cloudformation/test_cloudformation_stack_integration.py::test_lambda_function
-		tests/test_sqs/test_integration.py::test_invoke_function_from_sqs_exception
-		tests/test_sqs/test_sqs_integration.py::test_invoke_function_from_sqs_exception
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events0-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events1-ObjectCreated:Put]"
-		"tests/test_s3/test_s3_lambda_integration.py::test_objectcreated_put__invokes_lambda[match_events3-ObjectCreated:Put]"
-	)
-
-	# pytest-django causes freezegun try to mangle stuff inside django
-	# which fails when django is not really used
-	epytest -p no:django -m 'not network'
-}
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
index 182bcd873b7a..b3231f654c33 100644
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@@ -1,3 +1,4 @@
 DIST multipledispatch-0.6.0.gh.tar.gz 23692 BLAKE2B 4f73f05382c4aefbe3706839a18ba68d8ca0ed025744fe67d2069a770c517821d726913e5757dfe0ebe4628738b4b3dc83c76049f2beb4411b3679f574cc5f8d SHA512 34cefbceef1c756d06f0fbcf34709b70750928e21b1d5f02eef61eec3d5b8ce29475bfe4c53943f3fa9264b4de1f2524d813c6723927e576cd83771b6a4fcaf8
+EBUILD multipledispatch-0.6.0-r1.ebuild 701 BLAKE2B 614e59e4921c912d8498e0b338ccbc4dffd1873d361bbaeb6ae97e3ffddcf636bf04feee64cf54f629f09e3e8041f4324c2f765a704f53177141fb3d8914dc97 SHA512 f3c739aca27379d6e3546af5e2860e151b33b1c50eb61769af00b251cbb70e9a587bbc327eeae03b467a0f01602c9a8277870bdc8ee25c76667f8d36f0adff3d
 EBUILD multipledispatch-0.6.0.ebuild 662 BLAKE2B 5ebc4eac43fb755ec52b2f7df1b608672daf618b1daceb128349df5158358c2b48c22661ab1701e6ea1655034c517f52797ce518ef113ed386c82e7b0ef78612 SHA512 a3d4c9b039b37aec7d06d1d8a5383e0f9e53478b4a9caadb220ef32ba216a746ac04ca0781a63372ec0fbab11e707ce8c12899ff4af1095cadfb50b7705f015d
 MISC metadata.xml 464 BLAKE2B a464e3fc85e98875517a3d4b074d10f9fa6551d3efd9c809fe5aeb4ec52a98a8ca013fdae69b14eb936fabbbe13ead24bc9df5fbe1517d76afde445307b82ca2 SHA512 bee687d0f5502a80f129ae755eedb4aaeba508789f118cf7409ac01f8e81c2de9aa48ea85c9479edfc3b7e8337768402758bda94e602e9694b6b26230fb7d099
diff --git a/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild b/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..665a6a06ac63
--- /dev/null
+++ b/dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2022 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="Multiple dispatch"
+HOMEPAGE="
+	https://pypi.org/project/multipledispatch/
+	https://github.com/mrocklin/multipledispatch/
+"
+SRC_URI="
+	https://github.com/mrocklin/multipledispatch/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	multipledispatch/tests/test_core.py::test_multipledispatch
+	multipledispatch/tests/test_benchmark.py
+)
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 76c36bdced9c..b78806b2b07e 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,3 +1,4 @@
 DIST munkres-1.1.4.tar.gz 13777 BLAKE2B d783ac7a4fd55826ef3ddddd2ba82cf0499727e605a2414491af7dd9080193c53f1e48ed17dba9a462578bc958d3d9e2e1e413408143b4cfd0305f9cb3b6c517 SHA512 24ae7d04f4a6fe52f7bb9dc79bbee3e33425b85813382e2634e106a5d26d2d728ba8d34fab9390b7c3d651bc0e95214dcf9c94ac436636cd5b487a054b5a2c54
+EBUILD munkres-1.1.4-r1.ebuild 561 BLAKE2B 8eece822518f684a7c246f86f333a79f10e100ef4399b20cb3727a0eb8487cfb20e2fcab8e83590e110a845ac325ec2a285e615df59fb3911db542b6b29c7ff7 SHA512 a769a2a1100d9a128b21d240c1e83aaeb954bdbcd3fd0858adf76f28b11c8f2ca90d34c90fef2195f3b7075f47ec72ad3f38e09605908a3d2a6f9c8d0a2453f7
 EBUILD munkres-1.1.4.ebuild 529 BLAKE2B 3b5502867f9c43f3e9d5d5d3182623266ab59755af6d53fba3716d271bb60238b43fe807faf86185fa7ebe92e837be59de2944378fca7f44fa41104f28804814 SHA512 10fa2274a450f4d14dadd939463600098e9389d826bcc2ed8d679b16ed15acf7a333cc7eb67c5fc9862a663a01b814428492ef0572c83732e8b74bd496b94194
 MISC metadata.xml 772 BLAKE2B 476197b5218d2e1b000c16be048dd1ef56b605a93978468b0fc95500032102497777021803c5b6db546ee433aa4b5d1f02f232384a0e4665cea4d2a5b0cf1230 SHA512 5b433e5ab0c97c69680da925ed03362fdbb40ab74c5d8cb851f5b4c3b66f50f9de066657024b230d4d0d8274c6dd1035502b375581ae595c2032f3537035a8a1
diff --git a/dev-python/munkres/munkres-1.1.4-r1.ebuild b/dev-python/munkres/munkres-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..4cbfcc3928c6
--- /dev/null
+++ b/dev-python/munkres/munkres-1.1.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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="Module implementing munkres algorithm for the Assignment Problem"
+HOMEPAGE="https://pypi.org/project/munkres/ https://github.com/bmc/munkres"
+SRC_URI="https://github.com/bmc/munkres/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/myst_parser/Manifest b/dev-python/myst_parser/Manifest
index 70aad6e4d4f0..b49f03bc2183 100644
--- a/dev-python/myst_parser/Manifest
+++ b/dev-python/myst_parser/Manifest
@@ -1,3 +1,3 @@
 DIST MyST-Parser-0.17.2.gh.tar.gz 878600 BLAKE2B 0c5b9dd5aa1e1e54706c1a04770fac33f8b2233164f2462a27dccdd405592dde4d41ab986632a2903aa26a6e7ae942e0ad54103c48f0829d410b080facb061a8 SHA512 625894686093266af03ef2cf01cd3dc2fea80c933479d6df3a4b99a103f17e8afd7120fe7a56ef21bdc8aa33569741a675caf4a7e1ed6ddbe3facae19b3c222a
-EBUILD myst_parser-0.17.2.ebuild 1307 BLAKE2B d7834f7bd73343bb7452729bab4241e904b22089f8bd8b39790f8c5b7b23393883e0451296d753f6f627871402c237dfccad8187978a20a04eeae082efdcb14b SHA512 082e74704f42bd041af1c5599df1629fbe2576dbae1eb261993fe4dcef38699e2528893e360531a6457d82e709044beafe592ca8b3432a01b1ee10862a3e29a5
+EBUILD myst_parser-0.17.2.ebuild 1307 BLAKE2B 0b16429855acefc1bca9c867c20f5f03b6125d2df0083d25c30fac7e503daa08cd9a7aab1fa4da0eb70441d4b9be4580a273a3c54f2618ad1d46aa379ed44c16 SHA512 d6c780e2078bef21d367bbfbec9c544ab0c9bb853018dc7e560f99b95e32642373cf0f78a9ad95220dc9355f55ddb13dafeb138024f8c431a2491ae279468ed4
 MISC metadata.xml 406 BLAKE2B d8a974be3dd4fef4800958dcb1eef3124dc8e3ec49e6678d0db7d6096ef290019aa025796c4f7c38bc11b750d1667ba97d4429b64e7271009da707cd945e113f SHA512 acdc27a39e068c487306002342b9c0c5910d61ed34a7b62878272054ea458d5aad46fe24095a52666ed77ffcb6e703687cc83de0c9e2cef395a1decf9003d918
diff --git a/dev-python/myst_parser/myst_parser-0.17.2.ebuild b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
index 6e9a73f61eeb..89a18be3805b 100644
--- a/dev-python/myst_parser/myst_parser-0.17.2.ebuild
+++ b/dev-python/myst_parser/myst_parser-0.17.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 354e68e0ebb6..63483661a7a3 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.11.0.tar.gz 30106 BLAKE2B d531cec80142d005548ad30f4d13b23d0a7aa85f6907998bdc6d6081567234b169774b25d2e274d14e68564b16e96ff016c429c0a7aefabd6abae6994f1e7c5c SHA512 a53110efb78c89c4d72d002104866253a4c085dd27ff9f41d4cfe3811cc5619e7585ceda4e91e83cdd0645c40c745c61d205708ee9a34427b35f437a48f148e5
-EBUILD netifaces-0.11.0.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
+EBUILD netifaces-0.11.0.ebuild 566 BLAKE2B ac823e892fe220b4cec3dec87288d3c4282247f26e7ecf978e9c24f78daa4f2f8be5f2725096795bf453e5991ac38344c2ede9e412e8a00e170a98f65412a4f2 SHA512 5d5a74a1ef2f4f9530e6cb142bc39a7726b8917478b4c947c397d0085d18f0b82610d13f0cc829f90b93ea0e7276d06320c75d07f8795c1eec240862e01d7e30
 MISC metadata.xml 451 BLAKE2B 4d43f77c5e911cad7a8bdfa7cee80c553a645abfce7c551f1d819a62193e1263bf28d70c47d14f05ccbe9155ab08dae49c18cfdafdbd6c5705eab28e5c717258 SHA512 abf26a0026b93acfb3d81979694c13b2298bf09d410fa85994c9406a4e0219c1ee8d83b4814323cde287d27fab2526682df48238fe5db35ef93c4c3e0c0e068f
diff --git a/dev-python/netifaces/netifaces-0.11.0.ebuild b/dev-python/netifaces/netifaces-0.11.0.ebuild
index 9d457ffccb7e..654c150c80a3 100644
--- a/dev-python/netifaces/netifaces-0.11.0.ebuild
+++ b/dev-python/netifaces/netifaces-0.11.0.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
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.10.4-remove-osx-fix.patch )
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index 0aa44ba15605..30b2cee20375 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,3 +1,3 @@
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
-EBUILD nodeenv-1.6.0.ebuild 488 BLAKE2B 315e82ae857f22e5dca08f33173861522608a59aef6401e38d6db45c5962539524a25f2564b183d303b6736d9e03c17720b896ed9228b3d127f2824f4d74943c SHA512 c79cc80bab972b26c59e53c14c0cd1e66a0ff2883eea763501db70d14623c6525f203615730c2197130b81b0fc3d5726a34c4322be2daec8ce5e6684c0a4b312
+EBUILD nodeenv-1.6.0.ebuild 488 BLAKE2B d62471bae2ef3c5d6c1ce6d87c3e8a4243eec3cce4f330a1cf1b7edd1fd8135eede22fd766af939657df891c5b0baa6ecdc6f7a4d05e527b933c89e1f1d88d4e SHA512 8a605cfe0ef66a3071516154e0c601aee3801014a019082a7bb69b146858ea0c89b159964eec5a059198978af4fd6eb67f98a1dd069626180ba5040c1c5cffaf
 MISC metadata.xml 378 BLAKE2B 7dfad28224587f9df7781a7b1d8837b6c386b40fe20da3fe4b1cd4dcdc417a55ce5da03870907e44f6aa64e1d1160dda43848dac097ef881615688c511ce9a4d SHA512 06d76ecd3a1077b3bd37d37783ff37b4f58ad2e7fbb5294a0594ff748e5f64498567e4d1814a89ed0136ecf17a335a0f8a1627af2185144b4d929b25a8eaa2d3
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index c4f47045664d..fd34280955b3 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index 45882983bd1a..9b6113ea058c 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -1,9 +1,11 @@
 DIST Nuitka-0.7.7.tar.gz 3785340 BLAKE2B e856bcb3ecf69ecaa447ea73219f544bfceae8ee3a480fbd13b0a763efb8c8ec3c856a6142cff6a91273a88fc0aec15a6bb6c28fab1d9ca0c4dfeca229c11b68 SHA512 124e2d405b1104d0ba42a69b20a5c6168bb0643a13a4de789279401e09c30091853a8e464d9c4877a01f93a5a63934617cf52678994d0ae179560cd21d5b196e
 DIST Nuitka-0.8.1.tar.gz 3831036 BLAKE2B 3215344e0d46da8bee8a9c3246d2a6a8be86882a446f4e6d84ad924db821c051cd7d428f3e5372af69049e36ffc4a5b0e812f2ae3ea311b2759fbe42f87e2d6d SHA512 69c84d962ec03fb8dbd086c50076f656a99563985cc1750fcb0aebfde50ed68e6982ce2b0f2c3ce84151e9ea2d0cd679370a52c1f1dd0b8f943fc5f5938f9e15
 DIST Nuitka-0.8.2.tar.gz 3828013 BLAKE2B b5f3b59ea641714a9e437b29dc4b8db6b9f9c09d9b326b5eccc8e302bc5d205e561069c353c337ebd0d81434338244ae27caffb0e246ace0e809ebed0ae28e45 SHA512 7156745a83c9fd18a9564883e8ed7972002b19026d790b864a1383e8a131eb2adf271f403190909e2586ea3a7eb2d28bc3e469770fbae0d392617b26b3e63d25
+DIST Nuitka-0.8.3.tar.gz 3826774 BLAKE2B addc91ea87dfc2bc8cef5fe4f1285935c9f09cf8e3d88900fce004c4c5e83a0c3052c8848e61f2160ea12136860849c907d80930e0589a6ab5195c586102817a SHA512 0f0b648eaff3e7d8d2af5f554a7b2e7970aa01036e5299ee2b72e85529d70750bf54f78dc8fa5cd7dcfa77e15b578cefa2586b71401fb8b20331db418afdef24
 DIST Nuitka-0.8.tar.gz 3829530 BLAKE2B 051be63639e491fb26e7ef36b7e034715d0dd0e39417b59c30b0c5628e78d6c655978a2198d7192b431f176a24060fa899fb9c17ff6dc02fedb64865ad37af5a SHA512 f4eef21a32b68d52363ede1f68afa0247bf61a142fc86763f28805ca3a611195bb87bd1229a31a4d0ce47bbae7f70cc18580ebab528772f0908f122d8341bc6c
 EBUILD nuitka-0.7.7.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 EBUILD nuitka-0.8.1.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 EBUILD nuitka-0.8.2.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
+EBUILD nuitka-0.8.3.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 EBUILD nuitka-0.8.ebuild 1140 BLAKE2B 0f839fb78068157dccbf22121b2ecceb056e1462a5f7c8ce7c7d28116e390ec618b02f42f8f67dbaf3b345f04d519b0214bbdbdfe03b8c0e7594366a7a6911ea SHA512 ecbf3874813e37fd078cd5900a53b28e4686ab913b00867a0817ebeb7ea21f2c9d9fa712993ae7fc8eb26d9e31d375bff729135b432693700ce4e31fe42e631f
 MISC metadata.xml 943 BLAKE2B d7ab883773e7480dcfb4b79932a3874e2274669169a24a54aa622a2a0ac079e0296da4bd196d166cb11fcff785985da0b10d0fae351032914ccf312c9bb9833c SHA512 625d8760b8e849c6e014856f584cb42f50bb5ebb1fa648cb704a5a1baf175e7d2ce9f43f6f724d11c81a68e364b6ac1c38459540b58f2ccd6a675902af5b1cc9
diff --git a/dev-python/nuitka/nuitka-0.8.3.ebuild b/dev-python/nuitka/nuitka-0.8.3.ebuild
new file mode 100644
index 000000000000..5b987e13729d
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.8.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 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 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${PN}/build/inline_copy/lib/scons-2.3.2/SCons" || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	doman doc/nuitka3.1 doc/nuitka3-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numpydoc/Manifest b/dev-python/numpydoc/Manifest
index 58996ba862f5..72d2e1d2dd06 100644
--- a/dev-python/numpydoc/Manifest
+++ b/dev-python/numpydoc/Manifest
@@ -1,9 +1,3 @@
-DIST numpydoc-1.2.1.tar.gz 70350 BLAKE2B f693436efa8e95527e4d7d20676b1f3e563369190a71cc4e2cc8ec38b65ad500f3e0e8a4e89ce48ebd3bf1190c8fff1ead05cc22dbbf80fdf147b9996b2b5add SHA512 439ff422d46ea8eaa26bd14ac41f8d64638d8df081a3b889eaadceafbde64f2a091f6363d0565759618d60c4fe869d8f62ec0878d45674022056058621048d0e
-DIST numpydoc-1.2.tar.gz 69659 BLAKE2B e5483ad3d6d82e9ff51d2d7cdc36c75407361059a696047f1d0fb7d3307c36ee056e8c0b9eb45fc11e4d341350c1b1dd021d60252055154c6907942e549b9555 SHA512 b8ea82a947c7fca9d02c2083f6040f2a1a115400e43257fd6ce7ac9b1b174d22ed7723053b87893d6bff8f47a625932297c884e853be4e00d3ae2262ad0161cf
-DIST numpydoc-1.3.0.gh.tar.gz 70243 BLAKE2B 64b6550bffb644945972e38eb9783ca0a81478c9c9f8aac9d0a91b5871fcc9470d55533ebd4cbe287cf7ade2f355b05e4a31e8558e4fff3a836b37ed33027b13 SHA512 ba6b77fba590a9cb97562e9325db98d3423e39eeca6f28975960bc3ac9c83922ad9c47ecb92c2e2ec359f050304225fc204347708cf699cb40074eaefaa29e41
 DIST numpydoc-1.3.1.gh.tar.gz 70432 BLAKE2B bcf1214625671e89fcffedb7a90b1ef7f5993a43bff5e632e21bde647bb1b1ae1f4d21d4cf653622879121ea72c58486b78266d73b51d239243394b177b80078 SHA512 2b2ba50444765460d2df756c65893e59236bf3e47ab5980ed2279c0f3930bd841c68b2cb1438c3e25d0f2416fe4f2670dba9ebad4809c63a8db479fc8068916c
-EBUILD numpydoc-1.2.1-r1.ebuild 1080 BLAKE2B d295ef6e9227bf3360ff4c334ef7ca212d2795dd46f9ac62475ad01ed597f71f4356c226f210196aa8e6dc6a9b0f37af51c3d31d6b0613902f2d945e1c939958 SHA512 3328cd1901fe44a2c54e1c339091a1fd61fc47ed3269d0c83a27bb9076e2cb63302693652d396c0bcb3daf5e117bf5bc4e16127a8267f613e471389baf784628
-EBUILD numpydoc-1.2.ebuild 1008 BLAKE2B af23e49a4e3599f7ae80c717095cb3f8c758e8e6f8265901db7c315718517ca6ebfaafd39bb4c7b665631e0a416d717743c95ede1fc0892344e847f77fb118da SHA512 97aab5ab6d369fe625b2108d6913df429e5af8f09fa3f9872f768fab1d797714c5bb9ad4bd3a94890a3d9f7b8583ea2678ea2f1b5a19d6084a301cef78554240
-EBUILD numpydoc-1.3.0.ebuild 1134 BLAKE2B 1316fef4887ac48f0004835bd50362206ec48e7800c7a589053ee13d0e8dcdf11bc3628a3d8fb8ecc6aa97d75a5e33d0b3203a78ece40633b61da8a54bc76e9c SHA512 38e124822310ea45c8b79692c5feebd2eb6e8f5e755bb61808493431e813022b34a7cd06549ad3c4384274b47020fe69b7280e629cfdb73ba30115905a1e680c
 EBUILD numpydoc-1.3.1.ebuild 1126 BLAKE2B 3f4342751edccee8b8d900db7e9b1aa6118218ccbfdf93c35ba207629a2f8bdd2acb4be63c5034a0ff857f7070a74826d6ae776eebf975754f9fe9525dc5801b SHA512 9592a745a59051ad0f3e93e7b3f13d1c09e90d6beca8e256126660e41689d4115c35a8e1e7039272189d13950f11d699ea3de67dcc6d8b26f28080b99d3d2b8d
 MISC metadata.xml 403 BLAKE2B 437fdd3881a5ec60a83b3cb018e57c714a91030be9ab0032b8662e30b7bcd120ee3dd2015be561dd8a65a39833ef777e22f040a6e466c1b56a602a4ac33d4917 SHA512 833d00712cf7dfdc1080181301c03388a3c966436d2d9c9badb609cff66fa49035a6d001d60f205e1c2c49808eda7fad65abda8802f42f7ba36939b3691a8390
diff --git a/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild b/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
deleted file mode 100644
index 8a0d7f8dfe4d..000000000000
--- a/dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 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="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-	# unpin the dep
-	sed -i -e '/Jinja2/s:,<3.1::' setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.2.ebuild b/dev-python/numpydoc/numpydoc-1.2.ebuild
deleted file mode 100644
index bf62083a00b3..000000000000
--- a/dev-python/numpydoc/numpydoc-1.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2022 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="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="https://pypi.org/project/numpydoc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/numpydoc/numpydoc-1.3.0.ebuild b/dev-python/numpydoc/numpydoc-1.3.0.ebuild
deleted file mode 100644
index 8b2f2b65ba40..000000000000
--- a/dev-python/numpydoc/numpydoc-1.3.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 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="Sphinx extension to support docstrings in Numpy format"
-HOMEPAGE="
-	https://numpydoc.readthedocs.io/en/latest/
-	https://github.com/numpy/numpydoc/
-	https://pypi.org/project/numpydoc/
-"
-SRC_URI="
-	https://github.com/numpy/numpydoc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/matplotlib-3.2.1[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e 's:--cov-report= --cov=numpydoc::' setup.cfg || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# these require Internet (intersphinx)
-		numpydoc/tests/test_full.py::test_MyClass
-		numpydoc/tests/test_full.py::test_my_function
-	)
-	epytest --pyargs numpydoc
-}
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 6ef65458b156..3afbb6bde3af 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-2.4.0.tar.gz 1255985 BLAKE2B 6066ef5b4fc50093dd7a55d4e7824be9495f8cc9af5f20e1ee7ee5bacea1deb5d1e1a08e408470ba5923de9ece2658dc187bef9c6d5cb767d4c492543bbdc3c1 SHA512 34bc69fc3455c013ba05e6662ea362f0b9ac4070a9e70b34987846eec84197069622fbddd295251d2a363f08303c5a2e9b998b01207bdf6891ca68aa33682c78
-EBUILD openstackdocstheme-2.4.0.ebuild 600 BLAKE2B f24fcc130220657b1ef34d6500d19b9adacbe9cb3b6cd20c6010bfb838c99e6255c62dd8853a318e2ac45622fa1ec3aebe3f152491b176c78f907b1497be107b SHA512 306d0df86a6cd8fcc4d1d0f9469cc57618ab634c23b0bf791eb76e7757295ae46223eabea1789dc51589757e2324594633d6d4f349b31c7a0a1836bdef0cc486
+EBUILD openstackdocstheme-2.4.0.ebuild 607 BLAKE2B f217aa59ade34b83d2cc05fd93051cb81d8ff8d80befe46f5940d980d698142d696fb0f571c65fa4fdc3e5ff811ebfba1a2174d2f017b2978a623ed2bc712a5c SHA512 dba1ef34eb79e8e7a0fb4cb4cc9d8403eafd1ea45c18724770ceecf0b8d851e9e2cd02d910b20093f1405c34dc9727cae5bf7958719e710f6e6b94c7a783ff69
 MISC metadata.xml 740 BLAKE2B d720f5054a6752889548dcff3665b0a02d8f55b05ad96e2783fb2d460d8ab9f9eda52b589c18df1aef3c0eb383bb5b94ab0182f41c0e04fb831b5bd023f1807d SHA512 8c2c6ba17eebf016e8c8e45b0181505d152cf099ab59f4d2c2b2e6447af7ce949ff1cef198253d4a70f7a4d37b19eb5ad6b2feb53ed3f83c54ba850a94d8f4e6
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
index 1a2bdef4d1d6..6f53ebadad60 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 BDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 1bbed849e681..05c7c992c0f0 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,5 @@
 DIST openstacksdk-0.61.0.tar.gz 1029483 BLAKE2B 5add768f12bc42562bcdaddf0379e1f59af80b34c5a7f808aaa7469788a685b093b47a4c2a8a771f6cf426f6ac11e188fca0843aaa5173266f3c69a0ac69c4f9 SHA512 6f02486b9de8c540cf43f49f55b67dede34a24a96229d42b43aa215f6286566579f726b53732a9b3b952cee5df1fa8d3cf2f6ccc7c0ca7f9a1a96888640ff734
 DIST openstacksdk-0.99.0.tar.gz 1060314 BLAKE2B 0c8f641e301ba4fb8ca83e651f85f8ba98aa73904b2e94b15b17d99354aace5b73ba243c4e624e4c53dd7fb1deb147801aee93233f1fe019a0068873530bdb37 SHA512 5e15f29002231dbad15e7a2dadaa97e64ed191389d259222880a7e40984d6fbcd9d1602a041164e4f819141417d108a179171b4c1430947dc5c5e9cdc5409aea
 EBUILD openstacksdk-0.61.0-r1.ebuild 2622 BLAKE2B 7cdd297b2b2f0bcbb710bf80c9e41545e4d5258250adcbb91342c872d34658add7827a17c6c64e1513ddf72fa4ef18a82605f1a535ba8813c651505a12efbfcb SHA512 ab1d8911500f274961686147f1e028d1974480b434bda034880bce8afb77ef160d2d7643bad5a726f3e4fc4ef75921b2c399883a5137252b77e71d0c0e6c0568
-EBUILD openstacksdk-0.99.0.ebuild 2625 BLAKE2B f1c6a27554c53f1e77223ec3c16920ee3bd8e281499b5d9b53bb78e89e01524a650a9ca56b14d8afadb7d946af4442126dc8beba56dd331deda996b2b6ab7962 SHA512 9075a98ba1a70555f3ec2b683cf36c90c0c14d4091d827bcd260961a2c99347fba6268fb9fe9609d09bf862061f3f26675f188cd1f0b0ffc4b66f2321d580ef3
+EBUILD openstacksdk-0.99.0.ebuild 2632 BLAKE2B 65c2fb88da6f6bcf39fd051a7c75057786319219148316a2a04353ca3e4a514a782e71e2a84741dc86bdc9b95a336d6993af2e5add1aa1141a1bc807c40a21aa SHA512 e1b3a0f075f05df41da424265f08e3c47ced879e5a3f29677a96f08284e4af3d5cc9e83dde51ec10b57e5f1e59c825d8bc2a61b9410b6e85348d3bc0bd8ce2df
 MISC metadata.xml 517 BLAKE2B 661ad1e9eae06e7b36a5ff753e73bd4434042966cff3fd6fbc11bf70a1acc3eb8de29ad2a033d6d715e1152a5454d84077e99db3b588199b317f925864dc1403 SHA512 e6dbfbb3546c2a62b204b33ebb3bb33611079698212f098bd4da072200fe43e3bb350cc998b255ec4a15aa2ff3a04c89a9553dd7930db48e658dbcaff78526d6
diff --git a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
index 6e6dbaa5bb04..90bd9115ce25 100644
--- a/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 CDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 5666e96ff5fc..19d9c627b35b 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0-r2.ebuild 1109 BLAKE2B 821c011b7b4eb20e1a26d18ed05e7c9b85867bdaed4d47d6047315d307a398ab9130da8f24a265ed44c9406a175ccca068110ba0ddb721b916824f06c8105f55 SHA512 27bccc9fbe1510a593018e04c83d3a356392f44e533af01b338738a7013dc105cc97ff313bf52dc0365ab2fcb39afa95dd1edff6b5cbd7ec374b0eb2c6dacdda
+EBUILD os-client-config-2.1.0-r2.ebuild 1116 BLAKE2B aaf7b54cd0990ebf3d621837383506805776087239714d8e52df10b73ca32b9678a5e54cf38fc8716be34210a25ebda88c41186d511fe0942448fff55709d7d4 SHA512 50059e6ef8ec9ded6005d2691d724246a18ab87f4cc16c1e6100adcb37faa69c917c9ea82001caf17adfa8b30ad731c4b3751f716dc304b808bb25949462f568
 MISC metadata.xml 476 BLAKE2B 5522345b88cd6cb95631c8b391617d6c42ec4c32ccb78321caa7cfb6649d30dc20710ab0ff15d976b3cd3439483c08c44b354c44e2ea2f9e9dbbb72812f89975 SHA512 30b3055b7e24c72808c5c196e42eb755c9cf48e0be6ecd808c0725118c5de54634c36ff7d2972df59c240aaa129fa3032f8a1a5c372b1ef68f71fa2263211774
diff --git a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
index 5d9314515e08..5d494178906f 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 3a4d92a178e9..c4ead2cfde8c 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0-r2.ebuild 798 BLAKE2B 98b6098724350499089a1ca38da8856c711b2bd51afe8402a2492f3fdfe485748a72359a6ccac6af531b6f523592fc3da27e95fc380805fc8fcdfc7f613925c0 SHA512 18fe3bc3680495c4b296b16ff7e0c128f0c17fb34c4cef465b7217389a764276be1ff41e41d52867fa7185b1f846d0e0279d63f127be26aaec25406748c6fe44
+EBUILD os-service-types-1.7.0-r2.ebuild 805 BLAKE2B 06fa4e3c13603d23f955f574434f36b20b8067078b3f52d0a145839cba20435f5cf9f6331611d44cbd08097c41f48203e097b96b923a5b8ff976f98626a07636 SHA512 1181fbbb8b1f85066bd8c742423487f7dfcc2195843ec93badd3ad3bcbc0ed66afbc141801853bec1dbe8944f9c3823b62846f79e188359de45c12abaad5cb6d
 MISC metadata.xml 479 BLAKE2B 4938f0bd922ecbb31533b39c79b0dd063ea3cf3516714a66fe60d3e683c0064d7d3fbc8dd0bef95ee6f701dac3d6a22ed0528b014626464ebc6b762c4ad96aa8 SHA512 a41c9dccd4965c90e599a5ef74687e33f334b4d6a2f5bc0949a30b3e8a71a3689973c34e4e4eb3ed048a6653ccddc81cd9ce9f6c18fdc4015ff4418794052e00
diff --git a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
index 2b3295f88abe..01193a9fc226 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/osc-lib/Manifest b/dev-python/osc-lib/Manifest
index 8089be82cc82..141568cd21b5 100644
--- a/dev-python/osc-lib/Manifest
+++ b/dev-python/osc-lib/Manifest
@@ -1,5 +1,5 @@
 DIST osc-lib-2.5.0.tar.gz 97942 BLAKE2B 92c2d80463d966c96b3aa18edefc6044a8f20c21484a6ce52e81b57d7e1cf9ea4f3fc5d4a95f01a23c5480a4c4fa06c29d492d48a36f3b6a8df5608203d82045 SHA512 00351402b1048f3efaff2d21673c5dfc9cb41683a0ccb40defb6e8aeedd60271172e63fe25394f048dd4aed22a6bd185946d4d324b30ce111264fa6fd85acfd5
 DIST osc-lib-2.6.0.tar.gz 98452 BLAKE2B b22bcce4a0cdc787422f4fa2d63cae8a289801f5e04bbb2623f261017887e936d2514016ee38aa5b2e4f6e87f137f1d9f59a289b589cd0d6ccce21c54065ccd1 SHA512 b97935da923bbd802ba32a70a91084ca60377a0995b1b204053409c87865dda2a88e8bbf9adf3ed6fb05169448a9d1793a9ea00bc0199f17f86201989159621a
 EBUILD osc-lib-2.5.0.ebuild 1452 BLAKE2B fe813cc9357a60162bfd4955a2b5fff2c20995d4583d5d4bcead5ecfcb3fa56fb8d02d9950a784eb2d990cf379a721e2dba6490a60195b0bb8b205b3308662ed SHA512 8fed060a1362110c35d934ee45a3ffb14a31f36496b130c32ae6708cd92793a01591ac67b7ab1ffc38e82367db3fba85e1302a5b65e23a22b3a070440490dc16
-EBUILD osc-lib-2.6.0.ebuild 1454 BLAKE2B 7e2a1591b5abd8005d03c52291b8a7b8f8c35960687c58179bb41d6923e1af4d58d41329b6dae3b1c704ec14760fb8492c0283449f4f921c6232e3201b0837de SHA512 d8da7307d95d7dff2845c7357b9929cdae285b0b98a0f04d671af2071cd2dde086e6349b37a3e2e54d142bf72628c161a2e71c1fa7f9eeb8ded9c548b4af5399
+EBUILD osc-lib-2.6.0.ebuild 1461 BLAKE2B 73c85884635dfb00e8f7b9aaac58041f544ba41578ec8832557a9b708202cf8d660afc42d06282161dc45e835463bf97c7b0555c15d6a836d6641f51cb429ab9 SHA512 c4ffa4b24d5b2527c3d543f2050e45247b80cc85246239eaab9083fa0abb8f970f621076edec16629934a7e8d7e23e8c7445467014e5b11c56238eaac3d2b1de
 MISC metadata.xml 729 BLAKE2B 176bf470c3c3bbe5474967ab8123237244d26e811aa6ef251e88cfb3a6ac6b7cf3b96085dc670cf2053b700e2d98534867ec043e8c3f26249d4152f9ed70d4c0 SHA512 d75db35ea445e03ca7adbfffe78946519cbd7a44251735193fab8a0a1cc3c80cf60ffaeed5b9c2f9ea92bea2ee367271f6c068690625562c8c96341f38141d7e
diff --git a/dev-python/osc-lib/osc-lib-2.6.0.ebuild b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
index 1a9f3f2779ef..7971a2fec01b 100644
--- a/dev-python/osc-lib/osc-lib-2.6.0.ebuild
+++ b/dev-python/osc-lib/osc-lib-2.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cliff-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 5058f60ff668..13c4d24239fc 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.concurrency-4.5.0.tar.gz 58979 BLAKE2B 9e2eb4a233985a33994aeaf335c195c980e1e9dd8b48a7c4e53ae502599f12c0dc65466ee45569a97b72f1face0e80ce166922ca3e42f6ad28fd5b27bdf884a3 SHA512 13a2f4d39d3241370374e6fe4ea6047dfc4d20da6116aaebd27f085fdbce089d58b0ebab4f1224234c88237cdefafc2f96229e6527bf5cda13ef1e471e25a50c
 DIST oslo.concurrency-4.5.1.tar.gz 59126 BLAKE2B 61f509b4ce76cd036b695bb5ad744374e029239a63a629a4b96d44c8ba29150095fe9d57000367c4d07dc7c358ef61cfa4868a2347f206327093ad32ffb85955 SHA512 88319915c90befb01a275666b4a760357c1e72f04d5faf27ab9c67629ecbf2dd3a73d077f3c57435231b55aa777a9642f26e91cc4cb27ad56eb801b2b98eca48
 EBUILD oslo-concurrency-4.5.0-r1.ebuild 1288 BLAKE2B 979ce66648dff0255feaddbc99ada6574aef396c476a0230fca12ab4a12642b4c3f50764c64977d9bc1efaf493b0bd2be01fff2d31a9c1dc3f9a866fd31e5305 SHA512 0872c65dd1f4fd0e36382264cc2085538b22249a1040b4858ad6e8a61938aee3ddc330c0dd9d5551a3443b3319780a8f51727e7d65ba679682be46b7f0318f50
-EBUILD oslo-concurrency-4.5.1.ebuild 1285 BLAKE2B 5a796e60c803c7247cde42c3432a439e58386e54038cd4ad7072f24031bb346834772ceca403c86140ff56adddb50ebd8ab62989456116418545f17766594ebd SHA512 98e0807d1a3632b717371a9a19704397275bb155e54323d94be7de98b83ebaf30c8d79cf76960d1d35c933a981d2e04831d83705d0665d9c0277132bfe3906d8
+EBUILD oslo-concurrency-4.5.1.ebuild 1292 BLAKE2B 6c5a0c831f1c8b8fb1249ce09f457ed9db601a7e50da9758fb4cd5f28332ec52050fdb049405f9b4f1f9a2fef72bbe5b62470bd5ec15b18e20488f20cdbdf233 SHA512 5df7eb7251a88c734025055a42bcb84f00bed3a7a85c22b955d7e1ece249af503dba20897076e13045971adf79a0f70aad326a0294c25c93c742a33d582c4c13
 MISC metadata.xml 540 BLAKE2B 3cf35ead27deb8915aafded620fabef948d56e3feff9a6936bf8b80cf4ca3a84a000a0f56c2fee944dbd5c0ad7fb5211656ae861c64257d2ef83629e914521ad SHA512 a10fd1f009c73620ae68719bda0304ee3d8b64c0edb05d6bc818d14475499a1a78c613815b9fd29991c9b90b830e099139f263861e10b696432651da65a7d637
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
index 03da8577b477..458bee0136ed 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN/-/.}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index f00b69c36bcc..abb8d846fe00 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-config-8.8.0.tar.gz 160783 BLAKE2B ebc9cdd7ba9ad3e1bbca932f7c87dc5573a5453808baccd2885345efad4d62ad23819945b5a30645983489312d3fc083cdb414c13d1b772a8de49d74aa1f8797 SHA512 8ddb6a631421737fe9c08b5a5fadfa68a53ef6bac396b86b4d30b5be0449f0e000a40b09939513c3651eca49dd750c324a01656792a68ed42cdcf1539d65cf44
-EBUILD oslo-config-8.8.0.ebuild 1376 BLAKE2B e294d772b72b6a280cb2fa2f23c0166e639705cdc883adc457029eaf8c9f3d1352db747e20f9ffb3e2bb922a51772f0f147370e86a7f06e9fcb0a0e5fc1bdfdc SHA512 326bb1c25a68abcda7cc566313940b37ee7cbc438ef66ff7a601be580532931ece0884733de5b87afeddf66549ded018dd7249ec9f7348a50455d0caef0dd586
+EBUILD oslo-config-8.8.0.ebuild 1383 BLAKE2B e22ec891a4969bfe4c0ff831a5fa4dcd9cb7c512aa8657c5685d27b40e86cbaab7ae70f0e2e52a024e713d42b9f83e9b8df0130a9fa52d106a4c822720bb3b89 SHA512 1be08a1513d699ac4061c6cd44fda8bb2f514660e859cdb00fb0d6792a09b83baa63198cc6466222c89dcdaf7e31480ce1a68a8cbe23a7a4a3e7d0e01d3b3507
 MISC metadata.xml 696 BLAKE2B de9409262056cc13ab81347edaca214867f49fcd909ce16a21023c70baab5a888d8db7a9cb5ec094951b4e2617c82bc5778bdd85c18aaa683369c093c42045a8 SHA512 24f2510fbbad8f21fed9ee4b171ae33a1d271980bf227288c957497ac305c890578a93bc0ff93997e73010bae82d933b4a7cd3aeaebb762bb3a36baee0e07014
diff --git a/dev-python/oslo-config/oslo-config-8.8.0.ebuild b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
index 2c3d56e2b930..0a11e48aaf96 100644
--- a/dev-python/oslo-config/oslo-config-8.8.0.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.8.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 817e97dd7a83..5ff27bfaea5e 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.context-4.1.0.tar.gz 33573 BLAKE2B 8fa4f94f5cb5c82d95e55bbc553f97088ae8907b38ebc95b81674709c6fb4eeffab4f83f042c2069a9bcddfa827ca0c5c9e31ec12f21ad1c82dc111ea7d1732e SHA512 83ef0aafc94460bc16ac84841ffa78bad2594d7b81578552579251b2548779296552f86204788fe3acd1a393e7ca54d479475e8c062649d0fd2f4989c3cbebe9
-EBUILD oslo-context-4.1.0.ebuild 865 BLAKE2B c1db480c6d3581f452aadb22daaf6af5780772f6d56e0549fd0841d38c2dc778529d32b326a2f2c7008464388294c6267147111fdd38c09c9f5f3324a547d4be SHA512 d7b3a1015aef1b6a11b74531eb7bf10facbec1373901c833d6453e1190740fd44242e9159fa441bd912f38b4dbc7dd522c79115f7aa636afdc2c039c6d3e7c03
+EBUILD oslo-context-4.1.0.ebuild 872 BLAKE2B 6f2874144a5e7a88a65d2ee150b0f1fb1d8155ae37d4c5652f12467d36d6bc824f53b220b26720c27976c4e1197263c0bf146f1e0a6c8c7d52861269a7bc174f SHA512 cee48c0a8ce4b97ab9be4db769b3fcb45654d1adfce7d6808a0fe8f1fe2e3a5679b7a46f0f7457723e1a888d0177d0414dd7190b651d733ed815e5d10e8c0687
 MISC metadata.xml 790 BLAKE2B b75e2d3cb436d1245e9ec756f17e5e759d98b4704652c46269f95c284318111e1cadeb389445851719c4bee57d04593ef21f9b21c7b3c8395eb937cc78782f71 SHA512 3b7edb7e029b009e861282ac5c8fd71a4a4e968935c3e91bdf11dbaac1eaa2d434003dbc4b0acef53187ca6c42a3f9908124b6dcf9a50d444068f49ad1c5d42b
diff --git a/dev-python/oslo-context/oslo-context-4.1.0.ebuild b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
index f5946ab6512a..601a617e6c76 100644
--- a/dev-python/oslo-context/oslo-context-4.1.0.ebuild
+++ b/dev-python/oslo-context/oslo-context-4.1.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 49b46b42213e..650606896adc 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,4 +1,4 @@
 DIST oslo.i18n-5.1.0.tar.gz 47423 BLAKE2B 621ec835fc975978fe3da392edda66471cd85fcfbe5af8c7a1704d7422d8f52f3b61c97ac8cfbd2aca94f65c8428cc5f97b095bc116ece605a4dc325a4a0171e SHA512 b2243f22de3ef3e33609c5aff573c4448a42c74d75022e023bea97c5338608e3fcd9da92aa2d262051e6b2ccbd5a88cfb2c91da79b7e3f81420dc24117da9b1d
-EBUILD oslo-i18n-5.1.0-r1.ebuild 775 BLAKE2B e636a2236319c5e6020fb4d90a92f0ccae21e34606cd8f8cf38880a8f3fdd20e26d55172ad3827b6beb5545b1d14c136190af399a04829a9d8d35809423c2c91 SHA512 82809722101c43886079ab3ab0db251367f9f3666e014267b463690ffb0e1176e1d97c4e8b7244db59b1f5f4af7cbc8e2e2e9e4911aa63df1a67d38fe27c8622
+EBUILD oslo-i18n-5.1.0-r1.ebuild 782 BLAKE2B 6a673221f9948537b4b3b5fd356b9ee9c0589c3e7b55e71990422078b02d4468b365bdc7cb5da928971871f85823a437905e6ab305919349703b31a5f7d1fecc SHA512 fec035c2b815f1bab13183a223ae3f6ba5f75d9ddfe1dd2e869ee29666e93f4aaee6662319a9b163cdd045e6cd193aaad9806221d22180d6192698abf7318339
 EBUILD oslo-i18n-5.1.0.ebuild 709 BLAKE2B 8f0264bf6b0d3c7da62b0543f714fdeef744b83dc6cb47898cda29f0b2469b42ddd7ac8a44a2cc46bb07ffa77d3be91807df1f5281be44311f75b9208e039187 SHA512 8987898bfb17b699ce9675713502726e3b2f6dfef23b4379e64f21e017a68ae828d12d464d6ced75988c511232802183b712be67668a491484b9c0b65e34384b
 MISC metadata.xml 665 BLAKE2B 8890b37ab4cb0fce66a2e6f8be6da304a0c28d75d203a4413d6c8062a984a52b4c6004145992d3e00dd156ffd64a2bbb6b75eba85954de9fabcd88d24e925cc6 SHA512 b4a5778815e857a638e0ca9c9d228e9c941f9b541d667c7e4fcf6ef4814c8b24cbf0c8d24317ffbc7e65e25326f5043a546f42b7982f355551d1b0d0351472b0
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
index ebd950ee136a..671af22dc31d 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index af6e9576039c..808778e67667 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -3,5 +3,5 @@ DIST oslo.log-4.8.0.tar.gz 92939 BLAKE2B 1bbd2d6c2d7c44ea9a2bf8e037b64d37018e320
 DIST oslo.log-5.0.0.tar.gz 93053 BLAKE2B 640d88e3e7a0f45bbc1407d5e0298a157653d5c2c18a9347057447f0ffbd2d12d878ceefaab6df5e0df2337a85f63945e2af2fb1a58ab51ed2fe039b088c1667 SHA512 fd5cc985a6ba8fecbe052d1036620ae3fd5b6d7a2bbabbdc677fc7db399c6ad806ec032cb595f005ceda74b5477b120df65839cb7904049cab8c2e57a82e8d82
 EBUILD oslo-log-4.7.0.ebuild 1365 BLAKE2B 430d2e2915630c7d1cb5219e065650faec75a555b6270ad5e7ffa668a9668c71b7dcd1ef61d062c5f85f972d597dd2c2bc795622fd43b5f6c0f21d367f125688 SHA512 1a3123249272a4e406b2044c21cd742c5855da64c26f9d4a050592aa3a5c1d79c73c6fbfc662ec78ab4ace2d1aafa17387b648dd671b07acd2bc1fb2742ae25c
 EBUILD oslo-log-4.8.0.ebuild 1368 BLAKE2B 39a84d41b1725fee6040175421f6aa99dfe7fcb533425f5be875748571f95baf3254f1b80d9fadf2d3b56301c1511f9728d9cadf16160eb42d756397a5efa9bb SHA512 86c86ba753728ef81d89181b2f17596508e41eb9143a0c4cdfd1fb68bbf47408fefc9bb19432d4cfacef41ef7a95bb87cd3308df38a2658fa0cd5855e6a74e2e
-EBUILD oslo-log-5.0.0.ebuild 1368 BLAKE2B 39a84d41b1725fee6040175421f6aa99dfe7fcb533425f5be875748571f95baf3254f1b80d9fadf2d3b56301c1511f9728d9cadf16160eb42d756397a5efa9bb SHA512 86c86ba753728ef81d89181b2f17596508e41eb9143a0c4cdfd1fb68bbf47408fefc9bb19432d4cfacef41ef7a95bb87cd3308df38a2658fa0cd5855e6a74e2e
+EBUILD oslo-log-5.0.0.ebuild 1375 BLAKE2B ed55969466b789c79622d7250e36b7aac51a1d2809c4268d3ccf048a02f17c008aa1d7ccf0691351dfd5d2b52550bd23474ca97c56e7b175804195584a9fe0cf SHA512 5bac91cbb7902374992f7242442a225b920c836bd634c39723deaf4288292a9bc255b311df756b1536629bce6a70c7a5237de65a39c01648de1d91fafcff5a0c
 MISC metadata.xml 908 BLAKE2B 49c859acb4b62996a3f4a9beb659b8e1169e700cb4da456d030da25d9c38f05de603e03e5e6a7fe56486b0d5dff6ba2953825d95358b32f53f1e66ce76b9e57e SHA512 9eb901e9f165d84402bcbfc048d2ca08533dd2f6450da96586ec536269662ae68518f50abd5413dc65f9bd817798e2cc10b219f6b5c0805a38d7992ef82cf7db
diff --git a/dev-python/oslo-log/oslo-log-5.0.0.ebuild b/dev-python/oslo-log/oslo-log-5.0.0.ebuild
index eaf985b0c766..036fd4a1014f 100644
--- a/dev-python/oslo-log/oslo-log-5.0.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-5.0.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index 300e0a306bd0..f60aecd59072 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.serialization-4.3.0.tar.gz 34114 BLAKE2B a123cdf8a52be65e5c8ce8073bd04db7013f88aae20ebbb8d32a8a4e30588d5e5c11ba8c60087264b0b55e98962172ecfa1030f48c223d52b6dbe814c69c9014 SHA512 78c8d08365755c2bd10fce1fbee403e3c8301bfe0f3b7dd9dccbd5aeb3e010cc00c7b295c3b33b472b50911f332aa3d40d761e49ca0252e522e9cd11017b807f
-EBUILD oslo-serialization-4.3.0.ebuild 1040 BLAKE2B 5d69725f3513e34d24cc5f0e98328f16e755f4bd63c2d9303c30bafc08b25cb9da34c15f7108b3212073600f8034dc8e07785f153be7e0548a2bbf73d98baebd SHA512 77d97a36efbfe3f290beac4b948dcb1dd46890f288b917179b57d15398cd819f23818ce038fad6d17cbb832ddeda04f0a40f87938008924e0685feca85538c90
+EBUILD oslo-serialization-4.3.0.ebuild 1047 BLAKE2B 0484f3f68f2c441939c35dceff633d99e1e55547aeaaa255e98b498a8a83e0a51a63585e545f01b48e4c4a04c0a74b208f96abbc07b29f35c1bbfdd2eb65922d SHA512 311404a8aca2f69940239bafe398e72d5a6449cd87d546c48d00534aa56d41f0bed86909fbc9e0ac64bb38b2dfc28ed20f8580bda5095d42678836b5bee68f7e
 MISC metadata.xml 615 BLAKE2B e25d338d3ea1f94f81bfa5d225b1883ac14eeecb217ab0b4d8687bb8a7ddb35bd33e39d894444655f67bdf346cd394ad280aa511b8c291c4525265877ab75942 SHA512 a95c2e689c9f7d5a60fe1c4bdb9b78eaca78d78cac5ccb765696204122f65a21ea5285f6bbfb88cdbbe1042e69998872bc545bd2af1ab8765317f3a042860778
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
index 968510426ef2..68125caae558 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index a218166d58cc..0f1a00cfc61c 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.utils-4.12.2.tar.gz 101505 BLAKE2B fb2d56c767e8ed100ba789560e6b50dfecf8528de2a2717a9660e3dc8ceb93838137d59f1c2e3f05ccb99b95ea1ec86870e22160fb670a8cfb2dd9d6783f1d0f SHA512 fa56225f1991b031e2122cf08cd0992d8a9bfacd9a83d590f87ff86c495d51763ac06f65076c746a59563a60f886601d00ea9536dfcc927fca94c5a1431bcf67
 DIST oslo.utils-4.13.0.tar.gz 101834 BLAKE2B 9d3457ee9ce1746869120bf66d83495b4e1f2b4ca005285fa121ff4c176e85148662cd1de52bdaf93dc18d85478f2cbfde9b310e748b895f01c77ef82019dc0e SHA512 1d97fdaab79cc6c4cc34efdafca7263a2679e60d446aadc46fe31d7fdda2051b37f9df79d149644d914c7274e7fa2d9ef6a1c1aeafad8a1333221dcbe65f4723
 EBUILD oslo-utils-4.12.2.ebuild 1625 BLAKE2B 9f10dfc95d869452f0a40e7696bc383b0d99e361a10c28d6bd9cf2c207e475861a627f1a4881eb448761943f43c2b123ea05af129954932ee0eea86fed4a9fd3 SHA512 dc033d47519f54fb0fac47152c7931a670ce885099adb0ba856058683a7aa26555689ceeff9b6510a6faa3d2f7588a2b17e6a9499a56b3a85a9f8f459d478670
-EBUILD oslo-utils-4.13.0-r1.ebuild 1665 BLAKE2B c6cd2ab7179ab9422b68cda82dabf6d689a100a804c211c66be1a7871c5da942b7191dbb13c0561ba76a1e9fb165373a2d896c0cef8e87eec41ed9a68c60ecb6 SHA512 eb604282dddbd71b8df0d8ceb1f955c3b5551405b03647b51a9c1e881267f3d3caa3fa287a57b08d1b5037bfc4d4194caec1bd9689b4d15f78f23b4801e5fea1
+EBUILD oslo-utils-4.13.0-r1.ebuild 1672 BLAKE2B 5c9840e3cda6c0548860f3896dd2915e6f816990ad0ccd9e7f90656d52e8b199aa8063db0fdb6b6c0a0e2e6e908ac25b212256699c2ec52a5eb5c51a2c2fa42b SHA512 4f6dec1e7153b2858c7594b528c9b6552a710296a4b79fe77866514813e0a1d8b6f96a30823defcc0b53de45f7153ffb70693738d72b2eb78a23eb249a6790b5
 MISC metadata.xml 607 BLAKE2B 4bbcd1e819a4bd7ce0fd4f13d70dfa686c1731f4e7b73d49dbe9dad97d91d6d3bf8c323d0aa167a8ae94b037ef7ef70150debb5a45fc8ba0121e94b02bc688ca SHA512 2a1d9a822c4b6ee4a1cedd2e11970e04ac7ed0639fe6163196874784867a7b2796b840a46338ef53a748b9b6e2dbc6526798124f576a0017c0fe65ec5d46aca8
diff --git a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
index 15e4051eafb6..a0bf0d0fa37e 100644
--- a/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index c5b17052a9ce..ff33b5aa128e 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-4.5.0.tar.gz 38233 BLAKE2B 73fbf056467c5d86c647b0ff49ce2e75654c8a2ffbcda78f8ea49edddb55a4c5e0f065c7a95291468b2d5d73ec5f5152d16a2129ab17fc5e6d457284e684ec31 SHA512 2dc0644365621fe271e09f2f7be631f697749c9d343f1ce9b635986df41ec5be8787350b3f2eb6b6501f4baac1ec597b2f0ecada7936db967075ebce837e1517
-EBUILD oslotest-4.5.0-r1.ebuild 748 BLAKE2B 5260cafd8214523efda8466f5510a6af106e3d903c371e3c03c66de1f54b2b1696f2c0532732c821425e2d0fe614dad91f1a2b26d949de37f17cb05c289bcbdd SHA512 dc9f9698b1a383a38ddf27e14dff466e79d2c43d74133b0766658ef0bb990e5fd6f06dd061809a497455a72220a965c6931682c63d9ced35df539b564b5c4c37
+EBUILD oslotest-4.5.0-r2.ebuild 841 BLAKE2B 5d0720a8ff933d1b2fa867b01529478e476e223eeed0aedcff8ae4cd5b0d0099bd31b5172cb5460c580b0f15aa20ef809fc1d1984f768567e6f248b28a93702b SHA512 04a59d556f658db19e84fd7dac8e03aacd9ae22915c3985a681f8832085369aeea77fe524f7bfd91e1ba13958530b55c708e0e1b9c24f08372b2dffb1166d93b
 MISC metadata.xml 935 BLAKE2B ec63aed42de004f150dad32092560db0c3e76297cffdd791fa4f717af68ed6e88ee012923e1a41583ae56568e9e7ce8dcefa58d38cc66f675d78d9bf6a17601d SHA512 b116d2489597a1088c189a0db83950551c2da239d7a27319b63f886b63deb047fc6ef1b021db8044b14420bddbd759856d655e7d114df11bd918c1263ec8a1ed
diff --git a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild b/dev-python/oslotest/oslotest-4.5.0-r2.ebuild
similarity index 88%
rename from dev-python/oslotest/oslotest-4.5.0-r1.ebuild
rename to dev-python/oslotest/oslotest-4.5.0-r2.ebuild
index 0cf654906661..a5d04babb6b3 100644
--- a/dev-python/oslotest/oslotest-4.5.0-r1.ebuild
+++ b/dev-python/oslotest/oslotest-4.5.0-r2.ebuild
@@ -30,3 +30,8 @@ RDEPEND="
 "
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e '/subunit/d' requirements.txt || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
index efa222d5085d..b1dbe213d298 100644
--- a/dev-python/outcome/Manifest
+++ b/dev-python/outcome/Manifest
@@ -1,4 +1,3 @@
 DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
 EBUILD outcome-1.1.0-r1.ebuild 842 BLAKE2B 72f21ae60bdf2feb37e01b26bc62456edfd7d921351b02020e2cafb54e413241b2c5eae011702af4ad4e95eaa1e1e4934ca4013f97ecd5502a47309d1e2cc424 SHA512 256f4eb85822405032b324d8f42d3a53ee2d458aae30320041b6a8d03904bc329010f6b5ccb5e2df831f61e1aa3563079342b2b97c24cd25b5b495c3aba592d6
-EBUILD outcome-1.1.0.ebuild 777 BLAKE2B cf2dbdeb7aa6c9db4e9e87733533235c0ff5357d949582c03f85ecaaa05e35aa7777406a692e9c9104c19e7171ab5e62a7a0a6ee95c9a5995dd87dd0bdf33fba SHA512 d435bef3694e0b2593a628a56a3c258c4e9ce9d079cbe8cc228dfa8856c12ce33065ccde3e2bda4f5f85428ff51d19e340351971abf45ebd86982fdf2772189a
 MISC metadata.xml 413 BLAKE2B 375ed97b3bcb2ba5392f09962f6376e5ec8ecb842a70eb8c94647968f2f59e326ddacba74f0e65b7bb5733a05779d464b38d589f3a3dd364ba510bec2825eb5c SHA512 b9b9b94031580858aae25d0733688ce39f5026b4c1a59415370ed50dc27b63654927c36536d4c4cdf6389e68db0b397ddaa7e0aeb786713fdffca4bddaa217d2
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
deleted file mode 100644
index 722e60e24ead..000000000000
--- a/dev-python/outcome/outcome-1.1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Capture the outcome of Python function calls"
-HOMEPAGE="
-	https://github.com/python-trio/outcome
-	https://pypi.org/project/outcome
-"
-SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? (
-		dev-python/async_generator[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index 0bcb0db8d53d..90195ed91992 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,4 +1,6 @@
 DIST pefile-2021.9.3.tar.gz 72179 BLAKE2B a1b5390936e6c307b1d7d30f317ae77b432b17300941bfe71c4c8ed9dfecf95d623ce98eb762378ee1ff7ae938e4105e4dbcb2f6b8fe32c502b725c43b3a1154 SHA512 1960a6301823387c76e61dff73250686a32dabe009ff0410691ab9be4e57fd5f7ceca2b78302c935b74465a1e0b8faac659045c8a2be07b21dcf1baf510b1b33
+DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
 EBUILD pefile-2021.9.3.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
+EBUILD pefile-2022.5.30.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 EBUILD pefile-9999.ebuild 856 BLAKE2B f8204fde291e54d945b1302c7a7c17a89a8b7a991124c7475aece43b64b3963cda90efbd0944b672bf7876474e1b282bf138d431445843b5ecbf195484ff3358 SHA512 27492df698e28b6be1845423210e3f87fec8bd7d097baf448cb3018c7fa89f437f817e6b51134b33cd68023c0c3fc1f168a16dd910e4ce8c21ccc2c0ec9120b7
 MISC metadata.xml 766 BLAKE2B 8cd0206bb0cc7de9a76159851092c27b5e7c6d8294a136de2dd74e51da9062f6daa67c2421c173b6125758a9f350b84b03e2a85fa2029beb50032aa034f08c3a SHA512 7c3e9d6d89108b17a722c805353a9c457ccb5a5233bfca7145f82a37ab0337405c84a1e806d9fba77dbee779dd06cb18f7272399277d377aa84dcafc470156bf
diff --git a/dev-python/pefile/pefile-2022.5.30.ebuild b/dev-python/pefile/pefile-2022.5.30.ebuild
new file mode 100644
index 000000000000..e80b72dea457
--- /dev/null
+++ b/dev-python/pefile/pefile-2022.5.30.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 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="Module to read and work with Portable Executable (PE) files"
+HOMEPAGE="https://github.com/erocarrera/pefile"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/future[${PYTHON_USEDEP}]"
+
+# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
+# suite inside the release files. The test fixtures in the source repo is
+# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 3e150c5d80ca..70805d4e3d69 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST python-phonenumbers-8.12.47.gh.tar.gz 4899215 BLAKE2B 102caf51e4cb01140b43273b13a8ce44f51a3617fb48261f81e9d125475e34eafc6d8163e2baef861d0057d5f4f7e683b2934d4a15144277b203d69b12473819 SHA512 a7c24e469cd50b60ec9eb96dee6ef1540d90b20260c6ff6bf2eb8c0e6bf9c1e759d718de052805bb285135e2bd4927c469e901c811580a1cb4d6223757784b16
 DIST python-phonenumbers-8.12.48.gh.tar.gz 4899266 BLAKE2B 560af7966d06aaf116d2fcd3b0f7ecaddf9ce6d01b31f66461e54b9bf12fd724edb099352d5d7639491ad970ed94228deb1a648a3f7602b9a247cd97d4ec754c SHA512 d983ff0703c45517a3657f3beca63437a6d653ab34ee5124a6d7d2af31630472e985dfd28718b6730046460b7959d3733c39237fa861fe2c5ef30f5007e0eeae
+DIST python-phonenumbers-8.12.49.gh.tar.gz 4904202 BLAKE2B 20974162d5a8668c1d15021de71795983c4eda1f3afc931822b3593c80249481bcb4ea9f8b80066a71f7f2821284534991d3307eddea0e8f0270e75eced0573e SHA512 0504a84b3a6047c7ca4bc1667a0418d60c7f43052911751572820e7f4e40b430b8847e4c8f6e4d88dd7a2684b5ad8de2dfda8891d81fd8e1af1c595be152f9fc
 EBUILD phonenumbers-8.12.47.ebuild 801 BLAKE2B 6a2726b7845d46717aacb23295f6248b11475b197ff1a37c0de0d2a4e409cac62e941f005057f715fced24909943303ee1f0e975e40484368d82a81578c26b14 SHA512 8b5f322852d39eeec3bf3f023765fda596f6459eba5fa70f9f7074bf5e45428a5f292b394bfcc7786cb25049e198c410d794aade497539b6f0e8964a9f72bbc4
 EBUILD phonenumbers-8.12.48.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
+EBUILD phonenumbers-8.12.49.ebuild 803 BLAKE2B dd6c1b554ced6eca28935fbd1f727c43f0b418398d373e1da3e7903d0e03d2db7ee8bb62cdd74a82de71d9842be842d3a2ac738fd88bf491d4547de83d27c656 SHA512 6e3f8ca8e44af7478eab31426c4df3fccccc74675f8a4d73d600bf66b4883cba399188d863010af45c9c65b1345f1693634c2ed3c6b992ef13759726c0d2290d
 MISC metadata.xml 413 BLAKE2B 4fa9965e76205ab35de37314b8c06fae26ccf34a944401e672487d7ad42b0046b4de85c8dd4c500d2703b5ecca49755b3f6d9047a20d7226fdbdf63e0aca3220 SHA512 de88d4162ba8f97748a1d2a17a8bea48f59b84f67c76aec11a9bad8ab0d0b66bc9cc2395dfff446bbad591f52f755a38ccd0daf2480b4f2e22e80ce5d44a42c1
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
new file mode 100644
index 000000000000..3b1d20a349fc
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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
+
+MY_P=python-${P}
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="
+	https://github.com/daviddrysdale/python-phonenumbers/
+	https://pypi.org/project/phonenumbers/
+"
+SRC_URI="
+	https://github.com/daviddrysdale/python-phonenumbers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}/python
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( ../README.md )
+
+python_test() {
+	"${EPYTHON}" testwrapper.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 894551a466e1..18d16dfa43b2 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,5 +1,3 @@
-DIST portend-3.0.0.tar.gz 9439 BLAKE2B 50c6455c8d5ad51e1b523d4aa150ffc5a607a35d3c6fed4d2f686f2fa7fd7eefbe00bf0a033b9178b205e5bba5650e3de484c66d824f41b259ea031b985d2ccd SHA512 7228d454e7d22317de3462edb1e2f1b7fcf29e4601c9373709d80260ea5964c0dd4fbc39543e27a7f375b478ca119b285e47fac6ffda41401399cbe7bf485c8c
 DIST portend-3.1.0.tar.gz 9448 BLAKE2B d9391577ecc6f878ebbceb07266f06902352076fb61164b5e905a3ed0a557ce5dafcd8e3c77a099aab97fa576aee5be024d98f457e3b333aa80dbd534167218b SHA512 017dff68ea85f48d19398f71fbd8189329ca9c27c05d8599dd5e53632eb5ddc6dea322e94c924a0653f25f042a3c8ee1cda5f8450b02f3406a72036d54cd1aaf
-EBUILD portend-3.0.0.ebuild 644 BLAKE2B 4c029c20e8c10e62402446c5cbe908d7c843c3beb41d4266ef06c7ac9b9c09f8e3cf93e5aad279a8fcaeeb1a4e64423795439ced40e8fb0853fd9a24fe543c15 SHA512 64e7e503e2f71934a20739e86b186b61c60a6801a9becddbdda7e56072b03af15fdf87aad68b3dbe46708f0e160d847ca3e721c0631d0ace5a8ff3b2f05faa34
 EBUILD portend-3.1.0.ebuild 652 BLAKE2B 76c4e258a8707805de339cbfa80b6b6ce6063a38756dddc15c83135dfa54c69fc6fe48a5f7ad90083166e6577dcb9a38febacfab95e63ccda166424f1de4fe73 SHA512 c3f2da79386b2e40231e2c2f3d908cd2f48c3da89a21ddc9832c8a96897f7d9ff13fa386e2b6738dcc78704f0aaea43ae7c359eb53c6c116f9ec09edda2c714d
 MISC metadata.xml 494 BLAKE2B 00d31a220312e6d69d0a037174e45cc0e5ecbd963de8e513b6b0358ff40acbedc73e316801daad373e4007ec978f5097b4c00e25f2198ce86d5dcd879c4f2e2d SHA512 ca046a5e36611bd83928b4202c24af68aa7cc1cafbf2bd62a86ad4751226389885ef3aab6be8a25ba17513c89924901d5ac2a31ff27a2798506bbf2f09df2ed2
diff --git a/dev-python/portend/portend-3.0.0.ebuild b/dev-python/portend/portend-3.0.0.ebuild
deleted file mode 100644
index 4cc0735a2a31..000000000000
--- a/dev-python/portend/portend-3.0.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 06fd84e5fcb1..14f202632dbd 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,3 +1,5 @@
 DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
+DIST pyacoustid-1.2.2.tar.gz 15869 BLAKE2B 01f327dd640819dd799f48b32e859fe39dccda3fd62714bf324c8219cf7053b36f1399793523634e9d4f3c6405bed5050abb34bdf53c72ff0ee22708fb57225a SHA512 5bcb3f017c3013eb8fc9e335540a1f5e6a52fc2fefa53d5ef246ba16e4ff615dd1d1cf08b5c80b1a38b149e0fa7dc0b15e4890dcc3f5478ef874b4ec22cf0813
 EBUILD pyacoustid-1.2.0.ebuild 693 BLAKE2B cde0fb7d648f3616525b072a99109ebf5a055ef6d73c65a9eeb87139b13169700d7c4bc8301dafefc40c57941dcdd75bd80da0f7532b0402e04d3c46fcaa0391 SHA512 32f69fe18b0d7daf746770278b7f2132195968d55a1750ffdbb00b2f2786d4f191ff1e24880d098b48b28c8612ef3b7353b31556bb195ab8f012c7538f59cd8a
+EBUILD pyacoustid-1.2.2.ebuild 725 BLAKE2B 8d824294a40352de4e48bdaf7a89574943afe0a14b97370643d62fb4dcbc9209c6dcd3be9734e7a2c490ccba8d686f4e6b7d88e5dcc3515c47ba2bb78f061545 SHA512 e50db12e828ed5d8f78facfca65eae2bb2c58263ad8ae77895a68cca80b210a3278bfd1120edfcb7160a4fd861030790ce889b5c645183553554202376f5791a
 MISC metadata.xml 714 BLAKE2B bc0db30cff6644da34b7944bec3d60b47f394ac854d547fcbbf3ee4d2719edc4cb781a42b3ab266fb7dfb5762679daaa0e382fd0fa8c2cffdd35af4cc55633be SHA512 6b6063bfe7d64d8a053c0e5c1609d8011e8aeeb265a895db88154e246761027ec2ba5fd582fb08b64e5ee09b3a238030415613df9267620936a718b76d6d1692
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
new file mode 100644
index 000000000000..5428e169fb59
--- /dev/null
+++ b/dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 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="Python bindings for Chromaprint and the AcoustID web service"
+HOMEPAGE="https://pypi.org/project/pyacoustid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/audioread[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/chromaprint
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	if use examples ; then
+		docinto examples
+		dodoc aidmatch.py fpcalc.py
+		docompress -x /usr/share/doc/${PF}/examples/
+	fi
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index b23fd78a5140..3ac4aca8d4da 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -2,5 +2,5 @@ AUX pygobject-3.42.0-dynamicimporter-py310.patch 2283 BLAKE2B f59cd749cea48343d0
 DIST pygobject-3.42.0.tar.xz 557060 BLAKE2B 25c0634dcb713f4059d19ff2efdd67004e1343f49982123686f4df71fc2678583244dab7a22160f42d5361c3e5c6e38bcd8ccaeeafb3e1d885e5d5febaa9dde1 SHA512 2f3e9187cb8dd7ccbf139a58ea348732fc7cb95dbf4bee2ba8f78003a7540d90c0b29153d93f50bf613c2d43f0de0ec8971c61c358d48552e42ce17775a178dd
 DIST pygobject-3.42.1.tar.xz 557904 BLAKE2B 5264c1b187210622548203e0df5089262ea0b3e93d9e46679030b4722e74f1993f200cfe9357c389357902bcdfdb13c8fd9cc9d6efa3b5fa0f730c3b54017fe5 SHA512 b044d395f8334057be632fd56f670ae8405d9fc375bcbd7a0a3b2dcfb8efb06bad45e62e92d2ee5432e503642dba11d6f9bf91f26bf135fa5f9a871657105a18
 EBUILD pygobject-3.42.0.ebuild 1840 BLAKE2B 17e0358b9b7821ff1ff2159b70bcaa417ec4b5925c9714a9b128693e35511a71f358f7db70d950e20024676566dea92c6fd77756a100cfba44738f41e330e931 SHA512 259ad017d2d4a4b81fe8b709832934963f1e5c05224ec5c4761987462a293954e2717d904435fc2ed6cc35488ed9637a1c2c6de402b7350c07f7a46a8315d000
-EBUILD pygobject-3.42.1.ebuild 1794 BLAKE2B 6825df9970267de8b434413bbd85c23e664445ccdf49dc0bf43dffcae5cef2ab862b41c53c990b3e27f1d653680eee1d2a423c146bcca9321151541ce54d0ad2 SHA512 c94b322beb9213a1114029c65d5134e6391b5525ee0494e511d90665e139d2376a9abeaa4b42c6f4f9a1646820232e592b047b18e0920aab3c505793e0a78261
+EBUILD pygobject-3.42.1.ebuild 1787 BLAKE2B 7965009eabe55abb6235837769cda9a08ffe83a0e1149a6950dc8a6c826b549b67b328bf8e5b71e76dc7e0b819ba1d25eda0ec2477f3455b1203e65e325cef36 SHA512 59cbc8592e03ea3e616186a1c6d3678a6752d2bcd0b945195e3b6d8722a565f270f5365e62d3a12a8ab661842576f7ef413c6f58c0266145f402e3456ed2904f
 MISC metadata.xml 1293 BLAKE2B f47bd4d3e2239697d3684223a8dcfed77c3af429414f6bbbcd6e37d1707d38796fc1ab6ba01402442dbf9cff8d89349888403240ab9dd348083968c61eae5cb8 SHA512 33ad074a03fa3ac7917dc7225218cf8e636776588015c9a9cd9c2274fe77b63a0695f288ff06e0cb94899e5286d11a9746457531df945f8a95fd7e031f601db3
diff --git a/dev-python/pygobject/pygobject-3.42.1.ebuild b/dev-python/pygobject/pygobject-3.42.1.ebuild
index 2ed7f38687b5..e21c0116bf82 100644
--- a/dev-python/pygobject/pygobject-3.42.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.42.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pykka/Manifest b/dev-python/pykka/Manifest
index 2eb55ed71a43..e4ed69ea698a 100644
--- a/dev-python/pykka/Manifest
+++ b/dev-python/pykka/Manifest
@@ -1,3 +1,5 @@
 DIST pykka-3.0.2.gh.tar.gz 44440 BLAKE2B 8649e4b5134d902a459cd7f43ced59fb88bf6e9f7435aaf89a3c68fd349b941eea8154703107611a027c39b9eaca374d39497dd4f0dea72a1edfc4df99153539 SHA512 0e10366739839d792ac8866b2dc5f7a2d352b04f896ffa1c1922b215e8907f6fb9300ec955d5ed5f8c19d0714720b7f20569177cd1a9f2c98fbd27e42a9bd3f5
+DIST pykka-3.1.1.gh.tar.gz 44312 BLAKE2B cb50f01e27ca7b6aec10b61fb41d59e1d4fec29b65595afbab1e931137ef35efe8860bab0ce3b7a6a30a44aa215deb237a4e13abc541c537dab062b7d14acf0d SHA512 0cb5ca7924f77d9d0ba8b2f288e2a635f7ce70ae49bd5f5ddf574f37f76252b575cb95898ab244d27b96090345bcbbe82bad1c97f5cca73fb8fffa707e553e55
 EBUILD pykka-3.0.2.ebuild 578 BLAKE2B 0121c6c643470a953c255bd4ef29b3e32965aa0ee3f8367433b83e8e0407048e5752e20cd92eede3ab642a887a00fa7fc3fd0c7d026c374407e0f625bca9a5c2 SHA512 7310b5513d859cfdc3885f3a0b74dcea3ce5e522961915c24b226f70110475ccc3e7c5630161d154f527b938b1c430762f5c702da7584624cd53d45aaaa05fb0
-MISC metadata.xml 360 BLAKE2B 41f09dcec8c459e443b0dcb907f2997b5a2a558c897bed152978530429f6493d44a720dc61b23840d489037769f797da9295faffab86be143e2e8f5224fde226 SHA512 13717275dbab6fe660af9c44f6462b33d1122f60b954b18bd99efa83320820c166e3f2c6e0d81825819d3232945cc0d1d755e7ba24e1a046d78e658c1b2a02d2
+EBUILD pykka-3.1.1.ebuild 598 BLAKE2B d37ed434e7febcf4a1641d28f7c8fa5af3da020c94ee673a41aa5fcc1af6d6075382894eed724eda10e46b5308da9ee90f35094b5f7597e20a5ee297d5817006 SHA512 d8a30acd89c7db48e9a7aea28bf460f5c6b696d656965f64ce65c8f9b9ed67f84dd0ae74c09fdf4ba0d18839cbd4be50e69f7fe83a77abc58e4bdc738763cb12
+MISC metadata.xml 360 BLAKE2B 6a3cd04142f75ec9e5c91d91e2d267e618e9824ea8b9b6be452c77b22c7d2f29d41068848f32c4e03e85f90767d4a8c83d2064cd9e20dda4997194fcc1bb9e81 SHA512 1fef48dd8d3bc9397d4bbbc90a8a1a3db7f39a1e6795e9057d6bfcde6ada8f939b2589235b07824c15ee348c42f1ffb372a10d7a49741d7db57b542ce31c11e9
diff --git a/dev-python/pykka/metadata.xml b/dev-python/pykka/metadata.xml
index abd70e879547..f001f2e1068c 100644
--- a/dev-python/pykka/metadata.xml
+++ b/dev-python/pykka/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">Pykka</remote-id>
+		<remote-id type="pypi">pykka</remote-id>
 		<remote-id type="github">jodal/pykka</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pykka/pykka-3.1.1.ebuild b/dev-python/pykka/pykka-3.1.1.ebuild
new file mode 100644
index 000000000000..03afb4608dbb
--- /dev/null
+++ b/dev-python/pykka/pykka-3.1.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-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="A Python implementation of the actor model"
+HOMEPAGE="
+	https://pykka.org/en/latest/
+	https://github.com/jodal/pykka/
+	https://pypi.org/project/pykka/
+"
+SRC_URI="
+	https://github.com/jodal/pykka/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index eeadb4a083b8..a86a5ff8f5a1 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-5.0.0.tar.gz 39868 BLAKE2B 0cb6d96ac74a2e62325b8a91cc3601ab4ea7ea629ef40c02ce1afe13fd067abc48f24092138fc4584382c9c7f8c62eb070f1a3173b39768ac4ff8e3904c255d2 SHA512 ebad77e66d39b5625d0afae3bba346769159f39dfbbca0fea6aa0e6ad683fea6ea04093dd4738e378ac419edcc9970e8070d7ff912cc08110a5f41f7993489ce
-EBUILD pylast-5.0.0.ebuild 773 BLAKE2B 2f1b561e26e6c8b73beef953a0c5b45da8ecfbfd5965d3eaa4811e7bdad73aef8dfbba694f74acc39fdedb4ba06a8e4d0ce6402387cb594ba8d1e167a6c0b3f2 SHA512 9d7add6accc8c2bc3bfc4493850158ea4dcf6b0c320e1e0fbcb67be8316b18f2bf241eec68f95e2b80751f72f9476dd974c66e0eedc271e682d36a561e819379
+EBUILD pylast-5.0.0.ebuild 773 BLAKE2B 4689bd56b0a492bbe89a755d170fd26ac093eba8e6188e82ccea5beee9ce01826c1805700d5a1d621d920efb31195c1b0d6ec437a32669da33be7cb736078012 SHA512 289710ed082564ca66a389bb2ecd226172a94b1431e4fd9209759fb58ca2c1032087d45aa1340e975c138254599de524dcf979a714e0a0288a7ae38558f91dfe
 MISC metadata.xml 907 BLAKE2B a4a6aee5b2e805d27d001b7c51dfb2a26b935c38380e85027059b02e75057fc02f9ad311fd21326f6f16e7528a15c0577aae31f695f8a74ac42d274c10e7ca17 SHA512 1d0b7327a4e9a24940cff7a27b64bf5a27d5e2a1391d31a99d3473fccd54e534722ba826a64bcfc5f0da7a505241e617d23aa1f7490218f1d39af4cd3aa29357
diff --git a/dev-python/pylast/pylast-5.0.0.ebuild b/dev-python/pylast/pylast-5.0.0.ebuild
index 3cb7ce9991d7..93bf1e071624 100644
--- a/dev-python/pylast/pylast-5.0.0.ebuild
+++ b/dev-python/pylast/pylast-5.0.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 7cac53d62ad6..56fce9fe1511 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -6,5 +6,5 @@ DIST pylint-2.13.9.gh.tar.gz 1123216 BLAKE2B f80e88f565595b16bba650a009bfdd6d55e
 EBUILD pylint-2.13.5.ebuild 2201 BLAKE2B b63bbce7df072dcb2092a09962aa1040ecd8631586f925550c7e83942d8c1dfad07763a099c4b1cb4862968ecc2f7297dc4bf0eb3357a4ac140ff4748b7f6fb1 SHA512 02a543138358a50d7e068af511f48dfc5db2e41c514a274ddf08dd9e864dbb80818a90703082d747a3343b40b67ae6031dabd5cadc306c957b6eaacab9976aef
 EBUILD pylint-2.13.7.ebuild 2209 BLAKE2B 0127039c27fa8488bd52f2b3d2e1d52a05ac4ae1773254098ccb052797f2253d44449f9d7347f81131e8d25cb87b828e1f2d91a8381fc21ff13fea9e0477bb8f SHA512 c3b946fa2523f220278db8a915f4c6c047754e760920ed33bf76fbbeea7638c23096a05298046d1c1773be487ac05e2ebe6cd997396045306d2f083cab5ede2a
 EBUILD pylint-2.13.8.ebuild 2209 BLAKE2B 0127039c27fa8488bd52f2b3d2e1d52a05ac4ae1773254098ccb052797f2253d44449f9d7347f81131e8d25cb87b828e1f2d91a8381fc21ff13fea9e0477bb8f SHA512 c3b946fa2523f220278db8a915f4c6c047754e760920ed33bf76fbbeea7638c23096a05298046d1c1773be487ac05e2ebe6cd997396045306d2f083cab5ede2a
-EBUILD pylint-2.13.9.ebuild 2274 BLAKE2B e550203186cebbb22ca28ca725c10d51ed4ad9d8cdfd46127369021625ad06aea9a5742184674e5793dc6c5426b996d1f89f7fd210bd94cdacd035b196f7fc2d SHA512 d6ef46182ac98c6f3c86fe16964b8aa81c1649d4cd5565993d59ffac0ec2b6f06a63e89795c32215fc1f6e99f8837ab103b396bca4971385a1d39452de36e39a
+EBUILD pylint-2.13.9.ebuild 2280 BLAKE2B 1cf41e342fc60d42f770454987ae995c8135a6bbd2c53b4bbb7483a7dc87c566626e0776d46380b1be46b49871723aacb82aa3acec147cce230309f339c6ee96 SHA512 619147f3479d3fc5ff6fbf3ad4042ab57344bb453db06d29072cf4840ced19cad776e5b23e120a3d406e9497f6c3d3916f9a1ec2fef8790f67bfeac41fd6f842
 MISC metadata.xml 1100 BLAKE2B 97ec6bd2f6cf487afb93136e9ee58d0d5f8ad37e2ded456ed4f196e73fd37cddead2462d3592b44ca1a6c3722b1f194905238299f0c066945d1e22bdb18acc9b SHA512 0418d987879446fd76fe9b7fc4ee8b1c3c0d9bbab1d1fc3eb66eada0bc52f6b6480cf9852dc3a18b1915d2093642b9c87f24207e89b34d3e48c29a282a3ba979
diff --git a/dev-python/pylint/pylint-2.13.9.ebuild b/dev-python/pylint/pylint-2.13.9.ebuild
index 111e5206ceda..f9cf8953a38a 100644
--- a/dev-python/pylint/pylint-2.13.9.ebuild
+++ b/dev-python/pylint/pylint-2.13.9.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="examples"
 
 # Make sure to check https://github.com/PyCQA/pylint/blob/main/setup.cfg#L43 on bumps
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index f89b1604af20..12c9aa32a8d0 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,3 +1,3 @@
 DIST pymetar-1.4.tar.gz 3162928 BLAKE2B b92686204e84070722b3351ce04c1e65e3b47c7802767fbdb95027bcaea566518e61ac4c3e02dd0345c6672a87e2d50239a679dd7db426f7fa183023357763d3 SHA512 d5c5d382c68ffacefe07d63239f3b56984bf2becef922c945b0014a210ddf9ce1f96f99028e0ec9e649f70f6262925a836dbeb83309407aa2c4ddb4769db3dbd
 EBUILD pymetar-1.4.ebuild 584 BLAKE2B 33ff4940decdb60e07aac80e53a72821e1220d5d8124c1052078776fe14d416e01ae3596a7efdc279d9fd2fbbea7c299bf1f3ea008253a3000c0869e7e056bd6 SHA512 2818639d2bd71c7a8702f6b31ec3c27f4f0bd8380f20d2c4ca8bb182394cd64a79e3e557c145ee0d52c7bdb4a5c709188d2d3d0642e84b5a9095e5bdc4c71607
-MISC metadata.xml 1036 BLAKE2B 67594afc8ff3a4b74b89d55a22e2493e0e99e46e92909140317004ce83e37b6f6c864b6d7a58683f8e0eaa9557159e8f6ce7c07969893db8ee6d116904997f51 SHA512 3ea100f741d9635d5d512f91d1ab1be74910f40330da6ec7f2225e09ac8b53cb0b659d1d66f0f585ab3d6b8a2e1ceb6e9890f84d7bde20f01739dbc9656e0232
+MISC metadata.xml 1092 BLAKE2B 33e3f517b7f3451e463f2ac4a3bfbf0e6491e4e8990695dfb6dd9c0e9bdd823582822ba5142c2c4e67d7e6fc9a6162cea5b6e22cd62103fa16ccaf146e99763c SHA512 4a658b23fcbe07fb83a67d87c2a99254aa7a5957a53737e6af615aa8bfbc0db2a680d5f8f1cf81ce1c3c93875002fc50cbfa557978570c7ce99026258d9f7603
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 86d9aa756992..7d530b629b05 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -17,6 +17,7 @@ report. Documentation and a small example app are inside the tarball.
 ンはtarballファイルの中です。
 </longdescription>
 	<upstream>
+		<remote-id type="github">klausman/pymetar</remote-id>
 		<remote-id type="pypi">pymetar</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 56feab344aac..df75dd962e88 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,3 +1,5 @@
+DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.tar.gz 452537 BLAKE2B 0d4d178a6bdf14dc3769dcb78c42bc894c0a443a6811fe9b25dedbc4a43debc06d1a1c32cb2a0df06fe16d1b2e78e65ef4f3ca8e9931be39384b3c8c813336de SHA512 e873807e757c19b59dbac2a0522fbb9c6e8af955d62bdcf06d8f3d792db3c9d2ce15372a6eefdca5b3f6756c35a85b5ff8d7dc1b6449bfd12c2b588576dd6f24
+EBUILD pyopencl-2022.1.5.ebuild 1526 BLAKE2B 9b68731abc39755ed821c519b707266dbcd70894d42e08b25a469eb7890e0bda52b0f2b903a52215aa0e2c58951e1c7c54f87b95be1c54aa0a6b0c86f67c9a91 SHA512 eb2efe2fb5d0ca6b85204e55256ba7f6eca721d68b96eeb421f465f1bff4332a10c587f3fe71d5dd72d2e5812f1c9ee4449432464f73d7cbeaca48c10d807124
 EBUILD pyopencl-2022.1.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
new file mode 100644
index 000000000000..dc2cb443735e
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples opengl"
+
+DEPEND=">=virtual/opencl-2"
+RDEPEND="${DEPEND}
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+# libglvnd is only needed for the headers
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	opengl? ( media-libs/libglvnd )"
+
+# The test suite fails if there are no OpenCL platforms available, and
+# even if there is one (which requires the presence of both an OpenCL
+# runtime *and* hardware supported by it - simply emerging any runtime
+# is not enough) the vast majority of tests end up skipped because by
+# default the portage user hasn't got sufficient privileges to talk
+# to the GPU.
+RESTRICT="test"
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index e7ae65b9c8a7..7423190d3172 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,6 +1,5 @@
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
 DIST pyOpenSSL-22.0.0.tar.gz 178438 BLAKE2B d34c91a54aaf6b28d92ba83c26900fb308835512275267e11a5482ede4ab45177434559a53c64a116aa19c84d65dcdb459aecd3fc5587cb13e21cd2f196a0078 SHA512 3d7695f27b7909eb82f05527ab7551fe90a85a70f20ea980293b59672a62f9b015966180407fa0786e94b01ad1d1acfaa7d40426bb63410efd24a144e559e2f0
-EBUILD pyopenssl-20.0.1-r1.ebuild 1724 BLAKE2B 2e72e8d066f76d65045fafe4d2467bf8d5c20789bf2649ffd15ac4ebd7b72688a35e946626cbd52d0a6043b6e21f0455acd12a366c08a82b8f639d97e1a1a8aa SHA512 77e697a580ce05e24e72c53b76d0bf915b1ea6353e277e2295c2239f0d0f9b26b7904025e6bd4b834d6d9ff4938c17a64804cf69e9f561c8ba6327540b9e99c6
-EBUILD pyopenssl-20.0.1.ebuild 1812 BLAKE2B 2a2cc8e08f97fea2586d96521c2a47d6464ea0bac973ae49505c05f9c3436369b3867c6a353f7a83f993bccd2eeb11b999fc33c93dcf6d7c3e0448ad6c408318 SHA512 194f7d3330d4f66b4144a7aa520f817a9fb4dd273dbc833dedba6c8cf16fc03c3d0331b2adfbd5b9c55aa029eae613884382b64604816c2c2b26f45b1c773d55
+EBUILD pyopenssl-20.0.1-r1.ebuild 1722 BLAKE2B d72fda3e356d0890e501a924e57eb92bf7adbffa5e18dc0727785a54eae14946f182b37d1adc77cdb90fe0e53b99453b9c55e78622d0c0fcb93b011ef0f8d94b SHA512 fb4aa69b3ff9b0e29bd97b9ddc9ade6391adafbbcb3d8f65f1476fb716a2b2ac1c67e9b45827348f87c40b8e7ef932804ff23323640474f19b95e1b0ca483080
 EBUILD pyopenssl-22.0.0.ebuild 1522 BLAKE2B 3d1f1f7906f120b7bcc83fdca153cbf854a7692322bf119f9b308c22f40a13017304fe9c1474ca82534cc21e38d66729247f70c28cef92db03af3729fc436837 SHA512 5737796d10a73dcc13d48cbb9bf4836b299c1108d32d528ded7018951d3dc81eb6183ac06139f065f2c1cea955c9ef8d1d124cf5add88fdc0866985d68d40320
 MISC metadata.xml 536 BLAKE2B 86db822042b6fb3e965ece87b6b15dcabf76cdfbfa76ba285a491208ad5c6a2a196ca7144a1a73b152decc4df1641ad4c57a1cbde9f90d09d25eef1f6f4da39a SHA512 996d0e20291e744c6c20b38fd750d242920541aca7d92de63ca5b1dcc2f1c10308545797ccf499f38e50dfd04db2bb031e93b02c7c1705908f2363c813294ff1
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
index c12d0c04624c..6ae449eb04e1 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-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"
 
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
deleted file mode 100644
index eadda66ac57d..000000000000
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-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"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-src_configure() {
-	# test for 32-bit time_t
-	"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null <<-EOF &>/dev/null
-		#include <sys/types.h>
-		int test[sizeof(time_t) >= 8 ? 1 : -1];
-	EOF
-
-	if [[ ${?} -eq 0 ]]; then
-		PYOPENSSL_SKIP_LARGE_TIME=
-		einfo "time_t is at least 64-bit long"
-	else
-		PYOPENSSL_SKIP_LARGE_TIME=1
-		einfo "time_t is smaller than 64 bits, will skip broken tests"
-	fi
-}
-
-python_test() {
-	local -x TZ=UTC
-	local deselect=(
-		tests/test_ssl.py::TestContext::test_set_default_verify_paths
-	)
-	[[ ${PYOPENSSL_SKIP_LARGE_TIME} ]] && deselect+=(
-		tests/test_crypto.py::TestX509StoreContext::test_verify_with_time
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/pyprof2calltree/Manifest b/dev-python/pyprof2calltree/Manifest
index aea6eee24996..2273a2735b57 100644
--- a/dev-python/pyprof2calltree/Manifest
+++ b/dev-python/pyprof2calltree/Manifest
@@ -1,3 +1,4 @@
 DIST pyprof2calltree-1.4.5.tar.gz 8806 BLAKE2B 3a8a838a8b03294504c64dbe1d0caee2606a1ec53005222dfe6c3692bacd0801041ce199fedb9c38e4f6edc91e210116d9c1e034e0aa283cafebb19bf6303fed SHA512 2fcda74ae67dc3a8abb5dc153864ef59f96cc62b1c9359d02be12e83966c17738f5aa4a3d1c6e2ff81614dc963fc4b2faf375bbbb1ad15650a6817e493cdde39
+EBUILD pyprof2calltree-1.4.5-r1.ebuild 522 BLAKE2B c6fafcc988c7aa46422905644d70941d582f5e94a01104ca3e94ffaf09b537b49b6a6afc2e442ad89ad1740b952d6219b80daad2c38d23f344cb91ee59da5ad5 SHA512 c2d9dedf97e5a2b5bdc0db5d2c0f73166d93b34de0a525f8c2be1905f377549951e81e4c79df4de7eea969acbf28abd3c3824d574c21ded24792026d1a77e13a
 EBUILD pyprof2calltree-1.4.5.ebuild 490 BLAKE2B 759af98d2a74f670f1b34a1181aa2a02eea56eff80b58cc4616beb16c35243930925ca409fa4c020240742822858f261cfed5ad1f88ecc81ffb02846f0be5475 SHA512 b3426f0112284cec6d11ecf5c2373a4bd12ae0f52389c669a7ec5dcf3ad5e7ddf6af71c4bef6b67ec8f56aa7f1a1f558aea0786619d452aca6e826a7b4af5ca6
 MISC metadata.xml 406 BLAKE2B 7d3e2257b0a06747c1772ff90ac2375467633f40d7b4064389e64aaf426b07d5ea263098115a96ce035f200d55c9e83049ef7df0812a585ff7dd9a86407db832 SHA512 ff6a0e3b75a157ad85bcd1e75dc277849b67379bb097e4ba0b2373247456cfcbc079d36f7cdde266669bf2db99eb63a471d3ab156e1218628db3b1b51abf43d4
diff --git a/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..dd5ed079c2b3
--- /dev/null
+++ b/dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 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="convert python profile data to kcachegrind calltree form"
+HOMEPAGE="https://pypi.org/project/pyprof2calltree/"
+# pypi tarball lacks tests
+SRC_URI="https://github.com/pwaller/pyprof2calltree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 5aa46508f674..64098393d4b4 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,5 +1,3 @@
-DIST pyproj-3.3.0.tar.gz 217539 BLAKE2B 14e2332ffdf3d67e531bb4809cd50fd4902828b0cc3d2427921624d56cf05bdc0f3d5b17ea0516b3f428ad82bc57df840e4bd2dde1232870c9b959c34998c254 SHA512 9e8429a4fbec1950bf72a8c582d4a944a6707ac54a107a7837bf7fe44f8c2e29f1f6d0dcd9f5ff3ef511f3d31016389745cc2dfc14e2089756e6e72fe6074c47
 DIST pyproj-3.3.1.gh.tar.gz 238373 BLAKE2B 7996d253a35e3d64a343141179a88d2ab97e88f96447f3daf14c9f8d731099b506228c163fe460d3be30ae69c87e908879b3c0fe31eb7624c3bb8da157838337 SHA512 7175479f4ec526ada830d178bea77552d66aace4c7f6cde584aebef5fc4c6b7a46272eea2bd95f71910411c9ac8d8832d350891ffffda8a86eabb5449177a5eb
-EBUILD pyproj-3.3.0.ebuild 871 BLAKE2B 35550104ff8397b2b3df3353d473380ed270cf647bfc1038d31a0219977234e63220e1b6290edc328c583b8e3fea5377e6e1b7dbacfb8612351c02823b96fa36 SHA512 937e8b3efbaae0c5ab3febf7f5cde40db467506782dc8d68fd3a2f59cb3b056467237d2846c71d31537d3f2a9cdf6171a529d0d57b6dc022e9360e2c5c5d3dba
 EBUILD pyproj-3.3.1.ebuild 915 BLAKE2B d5f849bcb9810ea120ec31a65d124ad5486bc46dddd06cac47e3fa0c28a58c0ab0e49b611b9a0ebb976bd3469ad9125833d8d9fd7b0dbeac5175b98e3c3b2284 SHA512 297466d81bf0c982091a883222d0064f69f7475535b9b0e60b38128f8ed93c568d99f6f548c1dc7929ea44d7815d66fd02698b95c834f2c451e5fba410043c44
 MISC metadata.xml 415 BLAKE2B 4f3ab70bc72ca97a428c357257d3a59591b410f12276a42e141cd0a43072b79107529c95c6a313906129e8893c75b63a6ef11ddc2f3842a7f5e5e7f7349ec38e SHA512 7ca8a01534471dff67c42a96c524d166278e26da309b2c4d766045e38086cc0e52ccc990881ebed7ca81219d705d9e4a9c16e86b052a50867bb032457e354903
diff --git a/dev-python/pyproj/pyproj-3.3.0.ebuild b/dev-python/pyproj/pyproj-3.3.0.ebuild
deleted file mode 100644
index c6d3c9d8003f..000000000000
--- a/dev-python/pyproj/pyproj-3.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/pyproj4/pyproj"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux"
-
-RDEPEND=">=sci-libs/proj-8.0.0:="
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/xarray[${PYTHON_USEDEP}]
-		sci-libs/shapely[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	cp -r test "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	epytest --import-mode=append -m "not network" test
-}
diff --git a/dev-python/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index a9bbba84b300..5e315a7ca620 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,3 +1,5 @@
 DIST pysimdjson-4.0.3.gh.tar.gz 3783913 BLAKE2B 74c186e87540c4806ec311e7a6ca05bf28b2a2060ba078919c68d92812a1bc34efd9f0deb30b85dba134af9ce99dbfa2b8fa33c1b14926915e284f262a7ac4f1 SHA512 eb2cd8b96eed8985674fbcfeafc21b58c9985c46c7f46b72ee78fbf91ef659acd5139fa56c251bae22418007b3da6ff7e5cdd2d28b2ba22cf19771f2f74880e3
+DIST pysimdjson-5.0.1.gh.tar.gz 3827732 BLAKE2B e42d3fd2ef857ab7c22a5afa6abc3313ff1ea0aabc8a6e8213df3eaef65eb3df501bbcdba2d0de501fdec310aba00c110a30814d548255401fa0b51ca7ee03d4 SHA512 4ace2feca976afdf113b92dd263918f88f7be32156ab6f3b6fe4b798d83bb7c66029bdd7e63fb1bb3bf6568e85b14ad227934114fa7e0da0961888cdfdca8943
 EBUILD pysimdjson-4.0.3-r1.ebuild 1020 BLAKE2B 842a50ae0f703d6897efa4e04b90358cab64bf2a13f7badc551018edfec651c1506df74d615ab0702aa47bb59c011d80d611c4b3a5d22ff11a06cbe28a031d08 SHA512 c907bac4da86d2912f05a07a2cbdc047934015187d2fa3ec3d0e5132cb25fcfeedca7d27e348de9b04ef6939fa3c30ce72e9fb42f79b186c2a5d1b7c2be43c9e
+EBUILD pysimdjson-5.0.1.ebuild 1023 BLAKE2B 9650e4c0badaad29593dd959a6910e0d117468b664be910acca5f1346cbeb134c51eb1516280f2970d4292b57ee0fad9abff1d13d0ff86ef4e6d077f708d0d9a SHA512 512fb2427e871a8e6ed1d62dc8330d31355248b6a084b375415690f6b9b32688b1cd729a3c6a7ed06a924b85d36137a06b015a01f1e4517410d79b297968878e
 MISC metadata.xml 424 BLAKE2B 2ce7103dd2d65113aaac5d7acbb50e6fd92726f640c3917339bb1bcdf6124b6c3f1d926c73ce0beba130aa20ede87252a2fe9e0fe4d89bb7c4c9501b4931afd8 SHA512 ba65f9b7d1340d102a782321859be6b03aebd755eb4c8bb604a0e71ad25056f2029a77c92fcf623130f8accd6137f1722e99db3d0b91d9d00d2331cdea5a9bc7
diff --git a/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
new file mode 100644
index 000000000000..16140f582754
--- /dev/null
+++ b/dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020-2022 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="Python bindings for simdjson"
+HOMEPAGE="
+	https://github.com/TkTech/pysimdjson/
+	https://pypi.org/project/pysimdjson/
+"
+SRC_URI="
+	https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=dev-libs/simdjson-2.0.1:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# benchmarks aren't run
+	sed -i -e 's:pytest-benchmark:: ; /license_file/ d' setup.cfg || die
+	# force regen
+	rm simdjson/csimdjson.cpp || die
+	# unbundle
+	> simdjson/simdjson.cpp || die
+	echo "#include_next <simdjson.h>" > simdjson/simdjson.h || die
+
+	distutils-r1_src_prepare
+
+	export BUILD_WITH_CYTHON=1
+}
+
+python_compile() {
+	distutils-r1_python_compile --libraries simdjson
+}
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index 7c50bba536ae..ad35204ff3cf 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,5 +1,4 @@
 AUX pytest-freezegun-0.4.2-distutils-depr.patch 1655 BLAKE2B 3af611f832244acc2dc76ec8a69522275063dcdc4dc48b1d9235260e194be01730cc2b1b5a1507286594f2a27e2fffe489ced4a29624c54cb834a3fc6b1e8c7d SHA512 da1ef13c2eb724012a6b011f3bcbe6030200c1ca2a9bfa4cb0a0337e22641e16091d0e58b71367a232419f976f98e6269bd3a5a0a03f432dc8e3927c97b556d2
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
 EBUILD pytest-freezegun-0.4.2-r1.ebuild 830 BLAKE2B da4d183497be1a9eb75ad730851bf660ced2bc4ce5bc183849ff925bf34fd519370a0f4b386830a7d45b174469f8b95aeebc4b5e7d5397f792176bdbb4871d79 SHA512 58c9bf02de3fc51b1066710e2ffad262100b4d27fef6d53c07001292d10880a71a800c7ce5ae9f07552872e0aff71e2d89b269cee5674581ffde82c31998f384
-EBUILD pytest-freezegun-0.4.2.ebuild 635 BLAKE2B 199816a86088fcd6f125ac3cb51fe73e9cc40d993a74efabcd2c60c1b2bd699c408b8904488ecc10f7e778275138d08cde894a001c261662e797a98a4aa082e9 SHA512 27f3e0ede6e0afd84a8096005d4856e236b054c5bbf532a58e18618287503652d9624f3d16842db097b887677809248e9b0c9466971feae67c5bf70bec1519a0
 MISC metadata.xml 322 BLAKE2B 3e34df76fbf36fdf27dbdae10499c4925f51f9ef3945895ea54f4423f5efef036bcaf6e9516e74c4e0eecdb4e7a314f0a689804e1719ee28287b6c417bc7c1da SHA512 6b495faa2f661da0b83e25fd3bbfad4e3856247948b503a3f01d82d2cd3d9908c85699ab4e5d99dfe2ca48d55287e320f9c908ae4a2330f2f2c037aee258bfa9
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
deleted file mode 100644
index 27d5e3ea6050..000000000000
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Easily freeze time in pytest test + fixtures"
-HOMEPAGE="https://github.com/ktosiek/pytest-freezegun"
-SRC_URI="
-	https://github.com/ktosiek/pytest-freezegun/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	dev-python/freezegun[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-helpers-namespace/Manifest b/dev-python/pytest-helpers-namespace/Manifest
index bb6e3fa4aa93..566635435fc6 100644
--- a/dev-python/pytest-helpers-namespace/Manifest
+++ b/dev-python/pytest-helpers-namespace/Manifest
@@ -1,6 +1,3 @@
-AUX pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch 1218 BLAKE2B 1126c43aa209aa989f969e9ef04e1ddbd9502b697f46f4920234f022b380f5098f06b12fd1b9aae42d29ee61480f0db617af261da01b6ce2cf749e4b20fc06b9 SHA512 67fac2cd8ff09b6e104ceb2c7c239316444a9ac9e361ca2dfb152118bf540ab64eb336dd6a02a2c30a1579d47f3aad64789a5f95f9298f28a696219312af1bc6
 DIST pytest-helpers-namespace-2021.12.29.gh.tar.gz 51376 BLAKE2B cbc79e6868a18f7174b96e73e3e902ea969d5a361c141e12bf5a67eeb7c93cead61629842f8b8744e58240cd8b85f9864ed95fec7ce048446963592b41bbd7e5 SHA512 82c231ff11a36fce7b16a0ceea51c9306f7e05ca3f9e8cc7cc1c77ac9822f974d1ac893d2bf9b7154bf9593a529193daa041ccaaced6fdd9e38ba4f794f161b0
-DIST pytest-helpers-namespace-2021.3.24.gh.tar.gz 25881 BLAKE2B d13e82eebf09b4acb1d8fb9d3609f8814a49bfd0df56f23fe6f3fe3fa1508c4f1ac338b3f75e1e97ae90f71cae548dd100548d23cdbaa6c4bdb76cdb6e3d4a41 SHA512 1914427a4805a168d4067cd5db5663d28e3ff680f612e70a169a7efbc6c2c7ba0e2dc74132595aa70e13b651886bd10a6947e56558edf22b871618c967537073
 EBUILD pytest-helpers-namespace-2021.12.29.ebuild 1002 BLAKE2B 968f8a81e4ecd7feed1157f8c57107cc3a1dff2cd8044310ab4c63513f08dd7f111ffefe62ab51446087e48d7c153e8733f294789400b01d646c883826ec73f7 SHA512 8a18e7d72c12e0c28eee9bed39c5204a22905e9103fbf62068b89acfd507ef6373fef68be84c6b719a21cdec9b59eea4aae21e2533b3d9df88fcf8692679ec61
-EBUILD pytest-helpers-namespace-2021.3.24.ebuild 819 BLAKE2B 18b08e19e531e108b235a6795dedd86b46b9ad7fdd2d26521a8a825fead3461586a516e93d9f045a50f6f837d5ab511a09fc691e8057c364fedff98bf2b69187 SHA512 452ac5e8c6a884c25218b1aa5f549688edb972560822534d35edafdb49574a5efd7e4b42fb2c03b983b08f646a6e5e70a71fb530d343c6e7cdb04107b8fec588
 MISC metadata.xml 514 BLAKE2B d2cf552d0b34b0556bffdb2afb6524b5c0ce81d503a6a1dc2b4957beea0c96c1eb3ea4f6e61bd4351a26fa2983d10b155a58bbf04fcfba1fe4e55f720a7db09a SHA512 9aa9a28164597c7a6bec22f6c07f269c5954b02a4a7523373866e60f2d6824c83dd4912ca2e05081a2257f7e01e135f2544a0732d3c2f51266b331c753314108
diff --git a/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch b/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch
deleted file mode 100644
index 5bde4bccd537..000000000000
--- a/dev-python/pytest-helpers-namespace/files/pytest-helpers-namespace-2021.3.24-remove-extra-dep.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,7 +1,3 @@
- [build-system]
- requires = ["setuptools>=50.3.2", "wheel", "setuptools-declarative-requirements", "setuptools_scm[toml]>=3.4"]
- build-backend = "setuptools.build_meta"
--
--[tool.setuptools_scm]
--write_to = "src/pytest_helpers_namespace/version.py"
--write_to_template = "__version__ = \"{version}\""
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,4 +1,5 @@
- [metadata]
-+version = @PV@
- name = pytest-helpers-namespace
- description = Pytest Helpers Namespace Plugin
- long_description = file: README.rst
-@@ -34,21 +35,12 @@ packages = find:
- python_requires = >= 3.5
- setup_requires =
-   setuptools>=50.3.2
--  setuptools_scm[toml]>=3.4
--  setuptools-declarative-requirements
-
- [options.packages.find]
- where = src
- exclude =
-     tests
-
--[requirements-files]
--install_requires = requirements/base.txt
--extras_require =
--  docs = requirements/docs.txt
--  lint = requirements/lint.txt
--  tests = requirements/tests.txt
--
- [options.entry_points]
- pytest11 =
-   helpers_namespace = pytest_helpers_namespace.plugin
---- a/setup.py
-+++ b/setup.py
-@@ -2,4 +2,4 @@
- import setuptools
-
- if __name__ == "__main__":
--    setuptools.setup(use_scm_version=True)
-+    setuptools.setup()
diff --git a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild b/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
deleted file mode 100644
index 4022f5c76182..000000000000
--- a/dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Provides a helpers pytest namespace"
-HOMEPAGE="https://github.com/saltstack/pytest-helpers-namespace"
-SRC_URI="
-	https://github.com/saltstack/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-extra-dep.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	sed -e "s/@PV@/${PV}/" -i setup.cfg || die
-}
-
-python_test() {
-	distutils_install_for_testing
-	epytest --forked
-}
diff --git a/dev-python/pytest-param-files/Manifest b/dev-python/pytest-param-files/Manifest
index 54e742bfe19f..0872291dd779 100644
--- a/dev-python/pytest-param-files/Manifest
+++ b/dev-python/pytest-param-files/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-param-files-0.3.4.gh.tar.gz 6882 BLAKE2B e2e96bd2cf7b8676f92eeb7821ef76f1f82bb066210170ed4d04a16a7fb3ce346bcd63688ef9d46118c03fd74812fd821fff0414565befb8c558d03d15af2945 SHA512 2df6fe798aab743fdbf892b88ee1d09c554119429167e85bccb87e4ae9d487f8ab5a66c4157827500e8a5d2930277c7490348f6c38f23243e421d5449bde2df5
-EBUILD pytest-param-files-0.3.4.ebuild 642 BLAKE2B a4657729cedfe84412be512e84e70dd0b59174111fa08dc972ede712ad201eb3875ff03f3e81a3ad5ce87cd18a1fe4d529c373b4c942205cedd754ab9802683b SHA512 ac9f6d852663f2a9542e2c3f48d4ffb45fd8191861180bf4297eaed3ac08c2d2518fe0e6e8134fbcaf0262f425b89ed544c98d494cc97fbd9d0d79cd13884354
+EBUILD pytest-param-files-0.3.4.ebuild 642 BLAKE2B b069229d3f3dd3f104b6fedc7f25d1fb125296486ae6040a974f97ba917ce5e395fee59479b0ec7b28a9ce7b6732cc09a5dc48d82d53bd9b2acf013026c5dce5 SHA512 b3a1903f6616ec5d9b2406df015e0175d7730089e488829ce725a1dabd06d0a0931b1ffc488e253fb30f26b296ad4c569088a5135e63dc2f897e02bb1c498fb1
 MISC metadata.xml 417 BLAKE2B 94bde89ae7cf0181aba1215f8a406889a4473736c37cc325c57635f590f72369402e54f8e54f0b528c9757229b4fdf8608b292a15cc6fa83a997aeb53a64b4ea SHA512 f5b341a0619f750edc6e3f22fc3cfb0c5204d2ce19a756df0f5b282f97fe133f8891105c48b532711bba826ef4cca935eeed4fbb0703da5213cbc3074b7229c2
diff --git a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
index 5e0850cfa5ad..f4a729087867 100644
--- a/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+++ b/dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=flit
 inherit distutils-r1
 
diff --git a/dev-python/pytest-shell-utilities/Manifest b/dev-python/pytest-shell-utilities/Manifest
index 70f6c381fd83..00d84e3ad94c 100644
--- a/dev-python/pytest-shell-utilities/Manifest
+++ b/dev-python/pytest-shell-utilities/Manifest
@@ -9,5 +9,5 @@ EBUILD pytest-shell-utilities-1.1.0.ebuild 1033 BLAKE2B a7b1a0e7f4c37fb6c6311fa9
 EBUILD pytest-shell-utilities-1.2.0.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
 EBUILD pytest-shell-utilities-1.2.1.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
 EBUILD pytest-shell-utilities-1.3.0.ebuild 1034 BLAKE2B 6ab4ef08db8eb81bc65e57e91b3d4ce60ff4f977888ab6d26857424119bfa7e512f3372a20d85abdd09739e4b29b00d8879f4a2f4c6f3f1f83ddefd6e3df138b SHA512 a5d42634b41da2933f2ba145889be0b300a7e70aed8ed9c0cfd47ddc76ba0dcf40ddc4bf58d602ea4270b282e3ff4da2e1a417d6982485e55a66e7459d45138d
-EBUILD pytest-shell-utilities-1.4.0.ebuild 1054 BLAKE2B 42495fa747a8d1a410cf6f99929d164b6a8331e2033ae031e093826ec1f4ece0c0449f3e1a86789855e24233f879763782a173bcff653a3c4b5b5e568877f3dd SHA512 8e0393cbff8c84b52cffe7011a7624fe578ad5e394552fad5528a3e38474ba8ffb64f8977b99a5a8732a418ee23c3769c494b65248ccb79f2c6ee1acee033864
+EBUILD pytest-shell-utilities-1.4.0.ebuild 1061 BLAKE2B 6f97d065c5018425d5156d75f01f81f17218b23386f1e037c07ad6f2eded1c077cbbd4ec6c9835e39a5935bb5128ecb03e7924077d016bfd662dd7467dd8805e SHA512 c20745d8f005e5162f66e0aec5e20266dc7958ac713d167eda9cdff54ef009d559ec5ed7c95e4887e3a1857798472dd658395516b7341cf5ae37aeac46c36662
 MISC metadata.xml 335 BLAKE2B 62e842ec4ec614a557cbe0360488a306fafb8db8c858615403965bbfa7766ee9388f4786c027b303e9e550b7104a3b600d678239feba18a66d77d46a51e2d33b SHA512 62b9164ddb9f3e2c9d3869027bf116bccdf3ec05f35ec6e8094fd4ab79d1ee5c142c810b2c47dc281e23b4aa0c1dfa8f48573d97ae7f45e001dbc0288203b1da
diff --git a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
index c6edd8e6acc4..a8e84f1cb8c6 100644
--- a/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
+++ b/dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-skip-markers/Manifest b/dev-python/pytest-skip-markers/Manifest
index 8dbbdbc9635a..a14bce49bab4 100644
--- a/dev-python/pytest-skip-markers/Manifest
+++ b/dev-python/pytest-skip-markers/Manifest
@@ -1,6 +1,6 @@
 DIST pytest-skip-markers-1.2.0.tar.gz 79343 BLAKE2B 7f24b454fe19210d9ecadf10317a5a32830d722b64adbaf0fa6fad70a4c0cb598fa93b782a2b0f71bd23c4f91f2007d21383b488d725f61519d064e98ddd48f8 SHA512 76c1d0f0af7f7a56fa95d33bd5cb078792df3f054714d2ca1baa6d861e9404e2ec734a88a0768985388b1226c399ee6b54fe082ef7fcce6fc190fcae6201a416
 DIST pytest-skip-markers-1.3.0.tar.gz 79882 BLAKE2B 2c44711e6194aebf0a0299f8a50e6162a088023c2fff6bdb7c142060695a6977b1d4a5cc574199d8f11a5a94e413d7444f81d9e954327e8317ed1bcf3725a60f SHA512 bea602032a7796be7c2dad62ba750e987b77f04349c96f6f8e1f15f5d2b58c3ba1e549a775ce7e541f6041091a578def59900a726872c8aa8b31c585e3f0c3e0
 EBUILD pytest-skip-markers-1.2.0.ebuild 1580 BLAKE2B 70ba4fe95d5b71e17b685f45bd8127b6582346b8b23d20381dac9ad3052b407b1b1117cd57e81a0dd37df39b898520b93a7f1ff53efbeb8b72f6a0cd8b8859c3 SHA512 c8457d502fb0e48a5fe24c8d7749559e2c9a67990080144eeda26cbef27abb1e9059463ed3b341995fe0f4250a49073d519f8baef9fc876dd6790757fd2b7d1f
-EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1004 BLAKE2B b6b031e6c913fa0de12082e98138b2f51b5c1103c41d10dcdd956bfc73cd1326567121355955feb9647eba5a83b2c4c9815dc96f34db9c108bd77e1fa31c2135 SHA512 ffa4f67d422b2a6e87c9752fd6a37b99fa751f7ac2a6202c67f2be8d51b55741db904ff5d82ae925a3c2095f2c5ed31969abb265a8e36e3532658998cea7dd9d
+EBUILD pytest-skip-markers-1.3.0-r1.ebuild 1011 BLAKE2B 7af0a7bff6ada12fc40f555c7f493a754189eeb1ac50d9c8066233cd1a951e8e083d9fc383320bd206c6e18beb33c8b4c71c04a3b5fd7652d341d184354fe9ea SHA512 324468fb6194002d6a9e7f644390a1b748a158264ee5d62ed540b693c4347b8d8a8a210f122f9a6349f46c727024640eb97c064cc77b993f24fda1c0b1f8d39b
 EBUILD pytest-skip-markers-1.3.0.ebuild 1581 BLAKE2B 0f4da0a78e83a949f96a16a4019dd29f0aa96736769a64167ae70d88b64fdd234615c61bf4ff1e529aae2037e40da1aafa4d089758c0d848ae4d54f7da6db931 SHA512 1793ba8b9be8b75df611e88efbddadace8ca513bee85a871ba0c2037643ecdd808afa9d0410f4a3ea45f102ddccd92de0ffe4f2193ce3dec3b129672ccdd7f2f
 MISC metadata.xml 433 BLAKE2B 07de1af137dd4f1644c069f92e73f7558023095fb0e965ae3e1fe04ecf80f65fe267aa66cb54bddfe4df70c65f1bbbd87ddcb018e4e6bc52e8a83347d0720220 SHA512 842b3fedb252ab2493f2bd349fe6d1dd475bfd4b2ac6422c5dc4eea0ee422dcaebc09bf57a87b3f52260408e56b1036961af3accfcf43cc8a10c2d957ea18573
diff --git a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
index ba1bd126b36e..2dffa25dc6d5 100644
--- a/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+++ b/dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-system-statistics/Manifest b/dev-python/pytest-system-statistics/Manifest
index 92e9c3b01329..bb6c3a8968a0 100644
--- a/dev-python/pytest-system-statistics/Manifest
+++ b/dev-python/pytest-system-statistics/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-system-statistics-1.0.2.tar.gz 55147 BLAKE2B 9b1217102a23e723090e04652fdd727818e2404bf110e4f54289251eb92f4abb59861ba6c6fc611c843960cf0595fa5cbd636071033327d4e602606e8ab63abf SHA512 1fab5038dde504ab0d5d0f4da851c9a8260849adb38a1196c6399131d77cc24a1926e68310dd0701ed001a20a7fcfb57c5202c5ebfd6de4c85aac4be49fc7347
-EBUILD pytest-system-statistics-1.0.2.ebuild 1280 BLAKE2B 84625cce9af9867e86b35b8511da868e8564ac1edc5d2a4ab6b20c368522590d7cfedd8a5500861886c9540abdb9db3b67dcb73e63a781cefc1ee2f9f5af9601 SHA512 2421d59b76373e3f822275b7ccdf5d42165c59d9f34f29dd5630335235dc0b2b3be0e1b633ea490386a929304207a0588675f017d9936d07ea00953d1f30e66b
+EBUILD pytest-system-statistics-1.0.2.ebuild 1287 BLAKE2B e022b0b1c59f0ad4c66194941c095fa790bb273cca566ca2beb9ac44365d81d789aba7246ab8bb2552867cdf6cc5e0fe17a71b3fc02cdbc16a77bb769fa017c4 SHA512 4d5ee20cb93e02e772bf4dc2b41ae98de0794013850cf69a3c947a699c0017c44e805f9dc83c607c0f8e51c490cadcf5d241386fb9a980a7b1610d7dc8b2349b
 MISC metadata.xml 337 BLAKE2B 00bcf31ed6a7b0b94fe3bc0f3031d64bdd682be4797a4f2878ac0d66012d8c026a7295c923f9081f9e7b1b2dc1fd7c6dc7a4e33dfcd97f80785a737815979313 SHA512 a28c702734f0907afdb667a42e8d2672ab938bb4802f4e55e69de872694176b5424cd7073a9b2caee7dbe856fa511e41447ed30e49cc64d053a14b9ad830766a
diff --git a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
index cbef3f0ce756..cfad9b945e60 100644
--- a/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
+++ b/dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/saltstack/${PN}/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
index 15f6147cf46c..6427a99e8120 100644
--- a/dev-python/pytest-trio/Manifest
+++ b/dev-python/pytest-trio/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
 EBUILD pytest-trio-0.7.0-r1.ebuild 1410 BLAKE2B 97dae59eae0a296ceb1f966428e6fc1327ea94c7c31885d6bb170285e8fb9e97cdca433dd73e89606473006a6f828478f5ddb75eefcc062fe7325ea75fc2730b SHA512 5fec150eafe5735a4f795f4b4b5b6ab6ca8354bd3401bc10fbe11bd5500f7c06e1f6fce6d463a803ae908b5ca821beea16a43be7805b402526315ed1b22cf358
-EBUILD pytest-trio-0.7.0.ebuild 1352 BLAKE2B d8b2cf8f9c25872ed7e0109e60d477bfee74a0b97d6f9b0888de997c33b33ca3ee1b5fec5b3b7d939207245b3d99f7a0674a9315c6b4b5a27e57a8e4dca5e048 SHA512 8c239976d389d4f2c190da5a7cbcf751e9225fdfbfcc09cda700e1ffcded5fa4c70165850afabab096dcc2b9a8c91ddbbc4778163445d9e766243d8272be51c3
 MISC metadata.xml 420 BLAKE2B 42bae65fb9b23797c96bdc057faebc577f89f0c83f27031079176c2a122cb15e70eb5937a8cd52d09b3d7c5a7d16f62768452c87523fdb0fad876b63836c171d SHA512 5dd3d9e96df753347ccdf41428b5faa1df217985d7cfda1d7bd933fdf755f8f254fd9fa80e7cbeedff318327c4ff4257d8598a17def8ee6144d27aa89305cc3d
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
deleted file mode 100644
index d5f1cdacce4a..000000000000
--- a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="This is a pytest plugin to help you test projects that use Trio"
-HOMEPAGE="
-	https://github.com/python-trio/pytest-trio
-	https://pypi.org/project/pytest-trio/
-"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
-	dev-python/outcome[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	>=dev-python/trio-0.15[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/source \
-	dev-python/attrs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/sphinxcontrib-trio
-
-python_prepare_all() {
-	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
-	mv pytest_trio/_tests/conftest.py conftest.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# disable autoloading pytest-asyncio in nested pytest calls
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# since we disabled autoloading, force loading pytest-trio
-	local -x PYTEST_PLUGINS=pytest_trio.plugin
-	epytest
-}
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index de1658a240ca..d5fcaa2abba2 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-cinderclient-8.3.0.tar.gz 234371 BLAKE2B 092d7abdd348f5fac750efb3f3f4df1575584684ad613d22c558630576ad2f82c399af671aad7070dd224a89fa01d73333c2505dc0166d2e4c70e21ac01f298d SHA512 4d633b39a3c59cfdc2fc2c6235b3b87093f7617c89a80b50cf26d8f6fd63e8c3197d788e0b9e81347b9427cf363289b09b85376512d5820031472a735e0ca839
-EBUILD python-cinderclient-8.3.0.ebuild 1230 BLAKE2B 4ef8d54a5919be9090bd62d63bcc89d86696221ef5dada366b663a705f34feaf67120cd633b21eda59eb6213d030633aa9f3928fdc593e26f29e8d10e53cc0f7 SHA512 072b26a6b28e3729f1484abb9f010dff33f8485dd46b480be2799041f831f2d22a1e7fdb071be02e46923ad680dadbec7d3796eb55c8b05957d4eaea0aa77afc
+EBUILD python-cinderclient-8.3.0.ebuild 1237 BLAKE2B 83416e79a26d7c137d7a8871a11d5e1203d438cbb04d2719f862663e76e94ca5e5288ac25bd838468f3fa6eae4f0fdef20ddb58c67b0d83b40563022ab960c4c SHA512 e512063e57ab396f5673a3ff3334631808393b033cc764670a23a9b590e5f6caf70ddcedeb6c017c8da220b33aea40bf790fa6bf716bb623bd5dfc46d660b2af
 MISC metadata.xml 620 BLAKE2B 0ae868352f45097f3cf441ccf11551a05c6264d441f7b42452ed40e8ae9b6f68a5413b4e2cf91e20eb7bbf8bef7cc8f1dcf203e0378e42b9d27f04f96dfceca3 SHA512 cae62ef195e410efe40d9b693c2526c6c966790701006a773c931ea02cf5f2f6cefc1c08f27ddc07d3306794130fe99a87e4e2fc49f573741b599145e1017915
diff --git a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
index 6b385327639c..77b4b8b22dad 100644
--- a/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-4.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 183e97890f91..c51682a3cd47 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,3 +1,4 @@
 DIST python-cstruct-2.1.tar.gz 17298 BLAKE2B 9acc10f0d386c4413634945fc94b3e44210617c408ee18cf6533f70e7d64c609d463e9beceeea7c79b125e0bf0ab67a720d9ff98f45b4e7ce1f51d9280b55733 SHA512 c56c87d291c4aa2afcfdbcbbc19c03ec634b6fb0dcde9d516ef2a9079be2fea52a053c47cd20dfc0fe6537ac90939364da659d8eb4763069a9990681207d432c
+EBUILD python-cstruct-2.1-r1.ebuild 511 BLAKE2B 57d9a0555155fffff38d8f290191b7b61225f1697fd22e35670c4618960a8143707c0c473e9d3cbbbd4bff6b5c2ea23b2cbf7704685f01fcdbfef96ef270171d SHA512 ea33dcd6371bb90efa9fd376b3746cd544555d005d30f6203170e0c075c2b31046c3613222714d42c641e20081903042d474a76b51092eacb38c533e883d0072
 EBUILD python-cstruct-2.1.ebuild 479 BLAKE2B 29cecfe02f3aff90a7d9cf8ce888fda2b28edaed9a81463d7b15fc0b16c35d1aedd1da6cd88054353691e4d101e4034832c4f3f776ae4dc696b7e4da0ac0cb1f SHA512 1928a9f672f070c5093651b2cfdb0804ceffd70689a637b5154d6009ad2df4030773bada4c420a610ef7247713e0a95c24bb9b40c00d66eab40670c04ef62577
 MISC metadata.xml 454 BLAKE2B 5138bc275b0b9e18cab52fb309283c6b6dab8be5dcc3c86dd6526f350b216c68bc94dd2aabc7a33a4879c23165924563396c6d5991f5c702a12e184067d25cdb SHA512 bb259a25444029d8ea63577f0576ab283282298d27987e276bf4eb6d4ef00853ed019ad199830e9bb4e738f9a151feb55d53e76917508f1033c2b3ecd246276f
diff --git a/dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild b/dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild
new file mode 100644
index 000000000000..b3f6cf186e00
--- /dev/null
+++ b/dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 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="C-style structs for Python"
+HOMEPAGE="https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/"
+SRC_URI="https://github.com/andreax79/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.md )
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-daemon/Manifest b/dev-python/python-daemon/Manifest
index 5dcc3e169c12..328a91520a58 100644
--- a/dev-python/python-daemon/Manifest
+++ b/dev-python/python-daemon/Manifest
@@ -1,4 +1,5 @@
 AUX python-daemon-2.3.0-fix-py3.10.patch 1137 BLAKE2B 6731a8f43214d3a69bd577b1cfbe1252c21d0f76377026a73a09edcf9f8a99f88e104214ebece37a8a658c458fab0c4970796f46a8b976218062a4b5ab4e4e0f SHA512 5012ad1c3a4b2e88c16e7e3bb64761e9b99a8233e25808aed9e9ddaeaeb9c47b8b3b0884ca927f9d7c36239b84c932f96ef4d84e26cc005f25bc222332f1c4c6
 DIST python-daemon-2.3.0.tar.gz 82831 BLAKE2B 6e7fa082a513827283f46044347dfd445633db0d1781a33aa1bc5b14c340da784310ae6bd07d6cf3673cd05cb14a9d090ab51857d26cca52d09bc8c3b195360f SHA512 30bb70821aae720d09032c8c666524fa9a1a486314ffff73eb161231a1f2b954914295b4ad41f9c8529bc045fb6d0f89256bc59f8979a4f8a6698e9bd4d7441a
 EBUILD python-daemon-2.3.0-r1.ebuild 916 BLAKE2B 20e2b44d23b276872a93fea5cfb193ba41ab3f4421c22e9e6be82277e3256e5996155339558b77cb4ddbe2a09d8b8fd62bf3be32dcdf3b5e9a20df374ccccfc7 SHA512 5f2cf9dfded0645053b1a8c68c5264a70963a3248918cae8a382d051097c46fc328235bceaedc9573d7bee02ef04b3d6d1bcd93f836ef6839b6e1b4b931806b8
+EBUILD python-daemon-2.3.0-r2.ebuild 918 BLAKE2B 8a749881b3d90ea73d1c9f70d970395859c802425d474c4932f1ad9c37b76742d4ac2b52dae1ec957ab1863df51dbfc46268ff2423513b1181b40d9d03351afa SHA512 0ccbd939fd5c15268e57795ab3a58281c05652c3f61e3d0b33adbd5769267f4c47f02060c8d9148c684883a2c765b2bfdd90bdc5f126c471dc91a6a2da9f0b87
 MISC metadata.xml 341 BLAKE2B 62d37c28a9bf9e9fc6e2dd9fc5295558eb395dac54a45e548ec7d6738fdebe42053cd2f85b160135fe8fe5828eb065bf7d95b17f3c76697ab6ca2f0e664ffb8b SHA512 83badd112e5e5ed2584cd883abc20b43a18585e7c1d006c4d4861f555e633225f251d7c5b05e2e8f94f74107e32a5eeffcdd3f1265feb463f7c521c7c7141752
diff --git a/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild b/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..6146ac0fb6d8
--- /dev/null
+++ b/dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 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="Library to implement a well-behaved Unix daemon process"
+HOMEPAGE="https://pypi.org/project/python-daemon/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/lockfile[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+	test? (
+		dev-python/testtools[${PYTHON_USEDEP}]
+		dev-python/testscenarios[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10.patch"
+)
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# fix for >=testtools-2.5.0
+	sed -e 's/testtools.helpers.safe_hasattr/hasattr/' \
+		-i test/test_metadata.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 7ce0e80b49b3..156d67a65b95 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-glanceclient-3.6.0.tar.gz 202581 BLAKE2B 20bf5ee863cc3d319cc7b670f4a218c9b84b49c392f7a7756636a93643ddf81781f808d6d966ca1982246b66b7963354c433239f554eb2aa0291bd1d57da2e79 SHA512 7bcf08386cfe6d4787dd8e6616907814a53fcc35bdac1818aef7ba094dcd37dfddddda43a1451d55f22d175f400f8680801d1a43508c5d85ce39f15164b71a5d
 DIST python-glanceclient-4.0.0.tar.gz 202815 BLAKE2B a1d6dc46ca77c67bd42e6603b36652cc2ad9464b172b0bea778aa87130a6ed68613dda68db1ad5215e6d2ea34b9ecd96bc0ce853b94fc137b80aa7c85763622e SHA512 31ce9ee865ba543674a9ccc0267f1e02308e444bedfe1728ed59c20abe77cd7936b059c5adb0a8f73e5bf999c5ac5a34ac3cafe2e695718535ead786916e2414
 EBUILD python-glanceclient-3.6.0.ebuild 1361 BLAKE2B 15a65849cb2717b5b58a93b0d1fe741eac75df7018ad46625af80e208ea9139d260278cd0816337d94accdee84d49be5fb5032e1cf9a886dfbdda09f555390c9 SHA512 aac93dfabd708f2a3fe4d3fa90c0dab1aa32048ab3aafbb32d0165afefc4957d3e464136e143aa1eaa91ce00a5d299968f518effefc0460939b8e80f3489e596
-EBUILD python-glanceclient-4.0.0.ebuild 1364 BLAKE2B 3aca14cf800c49306b79ad29da6872945d7448c270724c297e1699bbee851e9914553d5d5988edbdc5e67f6d7eec5267534c05fadc4ca8fa82a3868b185ffb23 SHA512 1d0dba6aa08eb4296204371885bc9e77d366878a4a49b50c2bfb2a483c4406c166bd389891923828d8b399c7beb90a0ed0226a52fb5a8c422c1b561a5d7b47f8
+EBUILD python-glanceclient-4.0.0.ebuild 1371 BLAKE2B 996adf0be8d7a17b7d055ba49ac0637d932941990d355659659ca46205bde78799a23f260388b506251c02e86d7b2a0f3aa01b50f3be95a837a2c864abf3da62 SHA512 fbdf8ff51ec8bce53bdfca4f24215d0d709ef3b9b3618bfb5f89857a8f5abeaae18911cf023fb7c067d0efd220ba46f228ea97b33bb4763c8827f8fd2c2b1faf
 MISC metadata.xml 556 BLAKE2B 1007f5d86b8a7a5feb6018997ad5126f31c10d619d480adaf28db855ae9745c1395632b1d0fb9c915106e7678b7148487c3a2de800e8bf19e1abe55b00df7ecd SHA512 43aa944c6c8a91dfe59aa8261718fe144c852f0e036cddbf4453cfcfde21816e619388de98713de965d03c63ae242ee4fc27be103263cd1d44a5985b3c905fd0
diff --git a/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
index e4df4bd7c457..448af8dee379 100644
--- a/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-python/keystoneauth-3.6.2[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gnupg/Manifest b/dev-python/python-gnupg/Manifest
index 61649ea8ce9e..11541129510f 100644
--- a/dev-python/python-gnupg/Manifest
+++ b/dev-python/python-gnupg/Manifest
@@ -2,5 +2,5 @@ DIST python-gnupg-0.4.8.tar.gz 58696 BLAKE2B d9ab2fe3ea933a22e731fd70e153e60cc3b
 DIST python-gnupg-0.4.9.tar.gz 59982 BLAKE2B 09ca33bf181239d2ed39930e2b017f30e5c3ff158ccf937a1a1e72366cd144bc7327c8a57517840f976b10fbf542f8181721fa6e203cf0b67766b3fea9ca2d16 SHA512 e59685bea966addbfacfd5516601c518c9ccd7a828250584a00dca5c2062b30bd859ae73b467bd16db60abd800bd0b66f68177e56d3c48654416a294e72f3e8f
 DIST python-gnupg-0.4.9.tar.gz.asc 801 BLAKE2B d95b5e5bb5613adfb5705851ba1f1ff4a9331bfedb452d3f15e7838aaaf66b9b161664e1dc7f16acc4490eb2647dcf6ed1d1cf9b5272bd9523527b7329917cfb SHA512 ca91795ae7c43e825f35bccbbb3464e6f9e60742f28d1e215e97680c4de454b07375d66593553ace53d6fc9ceb423253a34f3ea6a5bc1b27e7da9b0ba3c385f2
 EBUILD python-gnupg-0.4.8.ebuild 666 BLAKE2B 2f905b1d595897a87d3837c0c279e29dc6c50f73c5e087b1353f30219df33f2eab52741d7c74f14961b19a18c5b4dc4dff3f5b90ed9097ce11653e63858f0cc4 SHA512 e0d4de3a335ca8c3e386948ef53f88f16893220c182e7f2cbf4aa3a4606bd24a67f29109bb8216f8d08a8fa9544e876d4b81318e11bea0cfedb7272d18db3d13
-EBUILD python-gnupg-0.4.9.ebuild 937 BLAKE2B c9d869ff792c2ee9afe50108381b22e742dee71665f227ce4920e22ea5651034c0957dbef43777ffa7a1c80325f5d962e2ab21a1de7efd33f7e7edac3839f72a SHA512 f807e6705fc781e065ff93a04b8c7eb2741cc28856235b96d74cd8dd78685358c160a5ad66e4ff410ab209f26e34d02b6bdf4cbd85dc70defd34e2d8e64460a3
+EBUILD python-gnupg-0.4.9.ebuild 937 BLAKE2B 3f5458a401d3d595acd60a35d4c57ee39a0524ab603c61d29da7cd6241299b02a3ecc283fc847437020a7b8b26d26b1337d84b7abafdfd9924ca5a42ee10079e SHA512 65723f065466f60317f5f59257e020129685f8cfa99f2ad7bbee7072143e81ff74ce660ac4de5faa3840c48e2f15511e025b7b60f3801e58ce8d6840f3b7ff40
 MISC metadata.xml 720 BLAKE2B 774ac2960b75f506d7ce3770bb5df5df01a5950a19f90ea6467d4be13aba8401ea5f1ead501f3d87d3387f83c4b78ad60cad984ff3ea8b1ae12eee3ca3736faa SHA512 9f237208c6c1ca48719e75842ba59963e707d5bba577a98205491a1531c70b4844dc119d267e2925b7650193a3d8d19ab04c4c26b4459192e0293d37f8990ba1
diff --git a/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild b/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
index 09b0665503e6..da83d6412692 100644
--- a/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
+++ b/dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/vinaysajip.asc
 inherit distutils-r1 verify-sig
 
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index f2c745bcae96..a555d81e9720 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-keystoneclient-4.4.0.tar.gz 325003 BLAKE2B 4c375ce3c3e0c5c97c20ef89fe240c8d36fa6f2cbd32adc91759cf4a94c95eea8b7a90a08be77322253adf8982f12523ec6cb49c4e0997245bc9dbd5f5d9c5ac SHA512 04e601bd193ea6301cf6350618221f857ff7c43cda350368954417559892101aa47ff9e053255bc4c7ca5dd5bfa6ef724eeec49dfcf29c2296033d80a8aa0252
 DIST python-keystoneclient-4.5.0.tar.gz 325120 BLAKE2B 4511cb381ebfc11afefef0dbb7b9962efd2bbb5ac7455386ef4e831459614dfd51570cfaa1be9672936a6ed45d58b9b29e8326830840e80ffdb758089cbab887 SHA512 d3a5034bd05843b733410d4c6fc2c271edb25c837b50ba801031b45a00c0632b4420f2f4dd24dd25e78bf71b5ae31e2ec6b303d85aa4ecea0a89a49b5c67533d
 EBUILD python-keystoneclient-4.4.0-r1.ebuild 1596 BLAKE2B 8dbfb36ce7c6feaad6d10fe07ebcd885ccc698f8d93c1204c304048750d62b94e6425df95be2158bc9c9d01f533af1facaedcf10040c1a8abb0ed1c969de74fe SHA512 62d8eb6b41948f3f15e14a36e18c669c8c1517d019085fb3fa53836a1a3fd1ec9b3179bbb732765811e46a362927fe696fae89598b80af5f03673c7cadc73b5e
-EBUILD python-keystoneclient-4.5.0.ebuild 1598 BLAKE2B f70c73d41a33331b78cb06f78e400e6dbf42cdb69e3ba1bd5a451868a799089f9b7e42ef491fa1ffa2f49bd53c093872482faca5cc1d50b3c3c2a9429827d9d7 SHA512 cccb9c45aaa51d262ae39a3b9584f0571fefbb55152908091a76daec7daf89f672605edc09ebaf3c9424b8bfeb9b3b5a223bc0ba05359156cbe53d71b044050d
+EBUILD python-keystoneclient-4.5.0.ebuild 1605 BLAKE2B 3d751c0f9f6a9dae5e686a9242445814909e7f14d1146dddc2451231f6449ec9bbfe98adf711900f7ea974e22c1250fae233ba0de4c58ac73ecc0f6c8cccf3cf SHA512 123cd2608cf0d67b2ff61c5796e95375cfd1d5fcb41d178399159433687eb267c83be6caaac277b13b6a0b308fdd0ebd03eda1e8885196b068f036f38bfab206
 MISC metadata.xml 487 BLAKE2B c7f320cf61a9bfbf677834c4376e5cbbe9485702895086a48f4ad8c858f21713e6c727a94d6e0d80c114fdcda9d06b0bed06ea82444c5e39e27f0a3509c9cd17 SHA512 af483e3154dd91801e946b454974fce5cd9178c35c18068bf5aa6ed6a031cca79b2fd8c268bf6a5e8d12412731144ff5b9819220bf2213e107db4aed7e3edda4
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
index c7ca29f24d85..1d319bef1a1a 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 9861065bb797..fa5275c1dd6e 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,3 +1,5 @@
 DIST python-libevdev-0.10.tar.bz2 32385 BLAKE2B ae962d714168a3c035220dc9343ae5907e5de5a645b9d5857cfd884a847fb5b2b13cbdcc6204a66940ad406e92a3add332755c3adb5a10b7cc6a5ae62468c1ff SHA512 1ea54c5e335d348182fad71151ab37103a8c295c8efb73a60f40b41e399cc5fc48525006b15337e591147fc5385e8e56a12dcbcec2dd2e07652a7b60f85eaf1c
+DIST python-libevdev-0.11.tar.bz2 32406 BLAKE2B 0291a9008590a2900961d9e790c2946b67bc045a5b0df43f9f40d9c8838b332e1a839c21411ee88eddc92e9c59a038bc7ce8dd365bab71075fdd0a8c629c3a34 SHA512 6fb6181fc97cb1a7a087d298a933891cf05d0160d033c6d6300bcb6a904064b727a15e8e75665ee2933d0e8a0aeab2638f01bbd8d9f803f508157fd0e5ca41fc
 EBUILD python-libevdev-0.10.ebuild 690 BLAKE2B 93170e3c547d00ac719543abc5693d142db9f0530f2eb0e1b3a78867562e8bfeb3f4fbf03f0f8ff64f12044b89093897e517692c66a9b0f4809decc863234f78 SHA512 440d32eb1112fd8b7f7859783b8671a918acf2216516066a2903ab70bc1f23fa833f3c842240ffd44aea810a98ffa00f9227ee81c42284163a24ced95420ea51
+EBUILD python-libevdev-0.11.ebuild 750 BLAKE2B b738b7b4e4fdb4ab27fa75d1d27768a99193420e9e97fbeeabbd1ba9eab88a6a37f1abe636a5106dab4663c5c7361ff59dfa526771dda4ca9366b4bc4845a48c SHA512 9e726d9d6e391eb1c7af4dedc38c24f0b8264cb9f35a5138368eca9a5a0dbfacd29f8e07fc6c42614071f362d81cc6f42055f1306c464d56de1e1863a00440a7
 MISC metadata.xml 330 BLAKE2B 5e5d0c798e9cda51a5339cc535ed4095ce88aa6b8e22f50301fa5eb766635411729a8f1568727249b38623974b9eeb027d81b9515262b12c74fcb720680ccca1 SHA512 7eefac30ab962d4e53a7e8e1e1630f891c0f985d70579ff53bbff9acead6e324747d3771bdaef274abed608c3c983fc2cac92acb7970511b45612a63b3be95ec
diff --git a/dev-python/python-libevdev/python-libevdev-0.11.ebuild b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
new file mode 100644
index 000000000000..7725950e387b
--- /dev/null
+++ b/dev-python/python-libevdev/python-libevdev-0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2022 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="Python wrappers for the libevdev library"
+HOMEPAGE="
+	https://gitlab.freedesktop.org/libevdev/python-libevdev/
+	https://pypi.org/project/libevdev/
+"
+SRC_URI="
+	https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.bz2
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-libs/libevdev
+	)
+"
+RDEPEND="
+	dev-libs/libevdev
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme
diff --git a/dev-python/python-ly/Manifest b/dev-python/python-ly/Manifest
index 1f7f75d0dd19..da15d39885b2 100644
--- a/dev-python/python-ly/Manifest
+++ b/dev-python/python-ly/Manifest
@@ -1,3 +1,5 @@
 DIST python-ly-0.9.6.tar.gz 179345 BLAKE2B 56b4e01b61ebe189f1de942ce848bb652bff857d61e2c410ac8e522cfff99b0e9c14d9619dd6d657a20d5a7abee16950c91bf0b1d5184fd7152c8cd2465360c9 SHA512 76da1c895555c87eb58308db13347feb66e9090bb1f6cdc253a1eaf810439dbe4089e9e0453fa1e6e0e30d19a91e0a9d7d20ea3ceb0062c76ba16cdf3b389e3a
+DIST python-ly-0.9.7.gh.tar.gz 239814 BLAKE2B 322d8e9bb3293aada00834e8e4822b2ace11643ac8bec2d351d38f302c941703c1c47f541c5141097fa0e9e7da59fb93f473891a568a222dc5f6cf212e004af3 SHA512 83b5030e2626146f1309b0cc8a4626d6fac58112c97785ef47672fcb14dcb8fb7e95ed86f3afb09709cdf6c15d4ed21619d94926b02315860b9e151c411f6652
 EBUILD python-ly-0.9.6.ebuild 518 BLAKE2B 6c4c598502562cd75c928eac43e72f2a68ea4c2aa13d4c8a9b42f11bff97c862c77b2fb8723ef6ae919f557b000a35a5c627c92246f7a2d19c88368bc0f47621 SHA512 08291203751905df39ee8af9c693fa4a6858f86a6ee4e426add957f7d9adc2fa7d94ba6c5bc17f896b2923e9ab38e02ce6c22c92abd1c10afebfd320ebbd0a13
+EBUILD python-ly-0.9.7.ebuild 578 BLAKE2B c56ab0ec77efa37b8d384d2e90384fca64181109dc4c679e3e1e86d52cde0fd577b7d6445fa90ab602f40dbc1de27419208b56e30274562b8df6d65c92f8772d SHA512 655b8cce76ebf29b8914cf36dd1d8fd9d3b3ee7834c5075bf71813ed248e0b6ec71806c254bbf86fe39f3b39ae5af5c7f3c7d1bbbfc5298594913b15958fe691
 MISC metadata.xml 308 BLAKE2B 98c8e0b71cb17a542fdca32a5ce319424e03edce2e7f4404a196ec22d1268938a04264cc432f67488b4eb2016e748a98e690206253a3e8305a62469c81e16874 SHA512 3fa5710f000482b5ff321d7fd66a0d3eb62542fd4bf18a424a6248dc0b02250fb7c8552e2b3869f6eaed6959be0ecdf63d82f1a3014e258591156561a80fb2f8
diff --git a/dev-python/python-ly/python-ly-0.9.7.ebuild b/dev-python/python-ly/python-ly-0.9.7.ebuild
new file mode 100644
index 000000000000..ed6ec0f61d5d
--- /dev/null
+++ b/dev-python/python-ly/python-ly-0.9.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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="Tool and library for manipulating LilyPond files"
+HOMEPAGE="https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/"
+# No tests in pypi tarball
+SRC_URI="https://github.com/frescobaldi/python-ly/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RESTRICT="test"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 2a788fc179db..de7798dc9f1c 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,7 +1,9 @@
+DIST python-nbxmpp-3.1.0.tar.bz2 128551 BLAKE2B bbff0bd92b12addb73e661136531df7629baa7936a1d52a86a17b59047681d30744dbc3618143a0b4ff5460bb64ad01a70b1bfb018f32bd78cfd9dc848f18668 SHA512 6676da4a21915305952118b9d35d91f3b420a23f1f3bc1fa22ee885face3f9b4474417f58e4a2c6446fec48ff632822ab83343e104df480d33d75f1b46cf8fec
 DIST python-nbxmpp-nbxmpp-2.0.6.tar.bz2 122203 BLAKE2B 925604002f4363f1e0b72f05c13742f4652ba565a9faa48faf8d47688f480a7f1d7585c593b0dcf07bded8c4aa3a1d02e9697742a07b9e815daec062dfb93104 SHA512 a536b25c8a6298892a51adef4b64b75ffab88ce02fb08fc07ecd1cfe2bc794262d4d58a93248439723e6e0544485da7351bb98189b0e422a1f77b01c6f6d238e
 DIST python-nbxmpp-nbxmpp-3.0.1.tar.bz2 125866 BLAKE2B 9338dc599a1a3ad1daa455877c5078a7dbd3b76f9914ca7f43b4defceb4f62dc84d77e9def7e08cd42d970d7e1461befb7208bde1c6db784de69c4bf92d3ada6 SHA512 3cf8de99f418b8f4e52b03147b305573e7fbaf79277f27b9b4b05f88686390d28cb8c3437c511d291cf677fdb96ac15589422b7395827b8a9f2298e15eb1a48b
 DIST python-nbxmpp-nbxmpp-3.0.2.tar.bz2 126796 BLAKE2B 1a9c42db9358ac0d453ee7ae88dcc35900e6a68b0d158a3491e99f748d792dc6047a24e605c9538128ed4e84447e341289cfd8384affe8b0bf1b9853a5325e08 SHA512 04759631960110c2d60be29cf00f93c8d0079a883f2011c27b35a9846203cefe8c0c42a90d93ee3283cd400fde0d5a5748f5b21b35b5328f5465e95a1e3ba861
 EBUILD python-nbxmpp-2.0.6.ebuild 771 BLAKE2B d26169a1d21a1d512f27711653642514b64c644f6dc786d5b701e1651df0e3e3ccae11a25ab77641a8ea6244df6ed3f9bb28cd0224018859171d6a5aded3ad73 SHA512 df49ab8432177b1c35b72b8015a9f7f5184a8cca6172271c840f4c4c15a937d463946a16ce863787a2050e14b5e54ab81c2738565e002e9d9dc11c5eeeade72b
 EBUILD python-nbxmpp-3.0.1.ebuild 810 BLAKE2B a81c707f6b36e9ed7b80b1e488756739b86ceb7a6225a266500018036e77402bff0edc2e574b9dc2558ee4e2a263c88b52585e9f7f68fae5e227292d917f41b9 SHA512 460e73a6cb6aadfc195c40d5025be791d4f6f66dc38253fc4e6b42e8b85dc2548a11ebcdd680cf330f1bc31b50530fe84ee3878fc46bad6c6c6cde957ec13cd6
 EBUILD python-nbxmpp-3.0.2.ebuild 810 BLAKE2B a81c707f6b36e9ed7b80b1e488756739b86ceb7a6225a266500018036e77402bff0edc2e574b9dc2558ee4e2a263c88b52585e9f7f68fae5e227292d917f41b9 SHA512 460e73a6cb6aadfc195c40d5025be791d4f6f66dc38253fc4e6b42e8b85dc2548a11ebcdd680cf330f1bc31b50530fe84ee3878fc46bad6c6c6cde957ec13cd6
+EBUILD python-nbxmpp-3.1.0.ebuild 747 BLAKE2B 6ccf123262480eefb28bc977c298400bd530322ac9f078d1ccd0b774b5e2601efe1d5d883ce13af849528ab0ad33ee5c9593fa28c9d426caee25a9c8afce5e69 SHA512 b7b830733f566e9297804782c9d1d50a9641e6ff7ccac0e1ded9b3812b9e8e164ab580fb3978b3744520247888868e1bea6839b85b3994c2a9b8f4f57c0695a3
 MISC metadata.xml 426 BLAKE2B 2772501445c7b3f8db801d5d6c52c6004cc6c67527b30cfcd5f48b54c3e483f1ace9307632f0da179cc4462e3ffde741b66af38c76e248004ff7238a591a15bf SHA512 0f456e67e255e045d97f969ed16c7e304d07a6b9a60d938dded30e78235a2ef984f5883c08f655e14084a8d76f54cd578c3d1eb387f0cc4d8502a5188dac987d
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
new file mode 100644
index 000000000000..20ab63a80429
--- /dev/null
+++ b/dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
+HOMEPAGE="
+	https://dev.gajim.org/gajim/python-nbxmpp/
+	https://pypi.org/project/nbxmpp/
+"
+SRC_URI="
+	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${P}.tar.bz2
+"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	net-libs/libsoup[introspection]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/precis-i18n[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index ce989ce6f17a..72c889092478 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-neutronclient-7.8.0.tar.gz 304872 BLAKE2B 780e1b2942a43bca93888683d1c2e713cfc0927d49135004a6f6d42dff7962def6b0fc7f308b75b4392f4fb5df4d26fcea107b9006d4ba957c0d76294395e5c9 SHA512 3022d79348334632ab3afa142aab11e424b168a4ba04223722da80e59de2695b477c2d829bb14a37e7baf387f9d63b8c4456fc5712f8d591d3de51fad76d6c78
-EBUILD python-neutronclient-7.8.0.ebuild 2235 BLAKE2B 20567491e93584820a02fd7e6a5e795dffb6d58476f9470ca3383bff0d2e3adc8489fb7281b672c5d5975430fc22c4b7ada367d12231d3eca48a4d434aa27477 SHA512 d94be5286f4358af9b4406f30d7296b6819009c66f26685dec17ca7d23cfaa2f1b27662a6e84b79a07c924eec127aafc22ce5e865179d587fa1f66dc594d7847
+EBUILD python-neutronclient-7.8.0.ebuild 2242 BLAKE2B 652582a9b006c17bc92c9f6c29fda3385677d7d6a7f4869420ff1b979776a6eee2b049a27afbc4440dedf607cf70a5611cf9adebbc5d9f626bb11b48c0df7271 SHA512 a1271d1d26ba54fe0c53a488459452ed40a56009a81fc31e25c954a9a803beec2dcd922168735c3e45a2ec065f535ffda06d8ea748ee6e20e76436b9f5e57f64
 MISC metadata.xml 538 BLAKE2B 13ead632c3a584fb1e8393993fef34cf6e9e61c3d80b90ffea2ab5280abf61235c8823f62154741fc9dcb7bac9be9565c4e8a1e3c4aa4c24af9a6673b0fa2f79 SHA512 50378bab897481da3809a9d9c82d53d7b3e0470e1decd432ca18ea1e57875aed3ef5b8c993f23099529ab74d7e0575b664d53b4abf8d737a1c7933ff781cfee9
diff --git a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
index d4d3c305f1ad..143e5e0a0ef8 100644
--- a/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+++ b/dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-novaclient/Manifest b/dev-python/python-novaclient/Manifest
index cfe93aa1c99c..23479e72aa6a 100644
--- a/dev-python/python-novaclient/Manifest
+++ b/dev-python/python-novaclient/Manifest
@@ -1,5 +1,5 @@
 DIST python-novaclient-17.7.0.tar.gz 335462 BLAKE2B bfd7853a5100df1d9a0e17f905c9a2d4ea0d13e1345438d42e4af21e348e78c3f4ddca6408f31fb164f4bf3b2770088118e24ec12edd1afb2a4c22b3b0461092 SHA512 3942088f2636d186434b7ae4184ee84f5e1e4862a526b33befae09219eb7d08ab02fed64589aa9eefd0ab263ea231969b0e4e59a0427eaae5daaa26516d92ffd
 DIST python-novaclient-18.0.0.tar.gz 335142 BLAKE2B 0b76ce92897e16310892427efc9062d20d1316be61e7391eaf9aca618844c4420f963591d1aa773b2d1ae1785aaf63888de6aec5baabbbedb09e4937a14d24d2 SHA512 fe3c5ad591679329a77421a1ef520823855d0ba1a7aa077d92a8b01e2b8bdab814c8cc94b5f76c1e59d6c7e70355f6efebd7b3596a4d4f74966aaedc38deac4a
 EBUILD python-novaclient-17.7.0.ebuild 1832 BLAKE2B f8e0ecd415f4fc41a00b45f6ad910c197ccdc893d827b68e9e9d65f751af0bdb60e51f3626e19140a964dcd076ee13880ecb6d02810c7efd6f87a1b382193a37 SHA512 88456332de00a57d5b4500bf432df5227c28a94f8cf0996893bb6f6147d836c5876516cc2b7906c298593ab111c4858957f6dcabb9fbf0fbd881a44a19e3b180
-EBUILD python-novaclient-18.0.0.ebuild 1834 BLAKE2B 381796471e1602f85fb810cd60f748081c19e1273ca2e132c250301a48cfaa30e2d8dcde2751f165954f6d7d995c1018d2fd0e6161399548b4942210cc8223c1 SHA512 56e71db3011a061f09b3bbff3a8a5d94358b8f87bed700a02240dd13b7eb02223afe33798322bdc6cc32a89dac1266e860a107e4ef0e35120185c8ad5a4cfe11
+EBUILD python-novaclient-18.0.0.ebuild 1841 BLAKE2B cc1eed33e23c55420f8f7b2b438801044277564ebc2a32b2621907685e15deb771aa8f608f15824232bc4a51f8f25b5c1ffa217d23c4090aa02638a4e7b0ec44 SHA512 3438293306c1276d24e53d216bb8da89ecfc9e9ff6e682d196dfd65df1c036968278cb699aab55f0a9028c0c6bb625695c5d464efcfea0259c5e82541f1cf598
 MISC metadata.xml 786 BLAKE2B 8e3cf9379a274131833f3a6ad3f5582cd9517ac8361aed04e3a39f14da4074de9f462ab890107db966f553726067b4109aa18d21e747545dd4a25c8794366a80 SHA512 568595965bb99b0f0cfea9e502d1876652a3184e54a963ad3841e28ff5205479a525fbd8252998a4df5505b6a50bccd59bb10288cb0244851c47b967f58208d7
diff --git a/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild b/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
index b699f25b31ce..a3888aca7507 100644
--- a/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
+++ b/dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-openstackclient/Manifest b/dev-python/python-openstackclient/Manifest
index 047f6ff0c0db..c3f3e19c254a 100644
--- a/dev-python/python-openstackclient/Manifest
+++ b/dev-python/python-openstackclient/Manifest
@@ -1,3 +1,3 @@
 DIST python-openstackclient-5.8.0.tar.gz 827602 BLAKE2B 07893ae405532614605560d4d3423e501e2d86da5ad5a529fdc62113d55ad7a010407d45143a4d7ae8adc731804e6698a5cd527089ff9de809ac117f08e4e959 SHA512 ebd288fbdcd18245bed4262ab191ba06dbe6fb54ad4247c332f9c11b1439c3158e557bf20a7a7205e7913becb6c59126121521a32bce1f70092dc2d7f648b808
-EBUILD python-openstackclient-5.8.0.ebuild 1713 BLAKE2B 92df6e375d5f83d65d9dbfe62485875cd3f66019218780c67a686efbd120c99701cca9907840d4f93a48bbd5b7e1b82b180c4f466848fc4dc4cfe75c41281586 SHA512 df9c235d692412a1765eb970a28015eeea7146d85924e4d27ba1f3d08222e39a5247dfff13833f67d08d34c8c328aa8971253f0fbddcdf9d638913070a42c945
+EBUILD python-openstackclient-5.8.0.ebuild 1720 BLAKE2B 01514eab267866c7e837c930d90557c8b783f223d2a801141dce6ca8e4109e8b46d7d5de10c7334057f3c710b854966ec61d2bb6173ea4f2e3f70248f4c6972c SHA512 bd565751bfbd20c53b498bedcefcc0156749b2d8722671396fec1b6c1623a1ae193e02a7801fe334132e7fdeb776ff972da1e08f4d87008d07f4e68d6ca90277
 MISC metadata.xml 562 BLAKE2B e4f7a3fccc9c2c798962efb6dda973ad71c19e5db8efd57869b6a8cd565784d5f4a6c581bf11a28eed826bb8c3451b5938e43974b91291609d177050fc654603 SHA512 3fdb3a9300dcaa310ec02266127a998ac4587fa9fde5e381342a5c18d0435442dfdafd0b326730e1cee26f72b43fccb6a15df7d5d1fd8f5a9bb3783983b0dcca
diff --git a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
index e262f189ad35..6313a9cb59bc 100644
--- a/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
+++ b/dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-utils/Manifest b/dev-python/python-utils/Manifest
index 18b2f0a6228d..7ae2454c44e1 100644
--- a/dev-python/python-utils/Manifest
+++ b/dev-python/python-utils/Manifest
@@ -1,7 +1,11 @@
 DIST python-utils-3.1.0.tar.gz 24251 BLAKE2B c00f4c45480f0948cddfa65d4f1ce17ac6831e29b24913d225544619ebedaca67c0f143b55698f8e2edd658e5f90ac39e005a5c29e09d75b5643f79992ba878a SHA512 e22ea0dc7aa0e6c5b45c55843011971c5075639424d38a712703b0d5ef8af32e3661d39af63b6015c4edfe11fca7a256f4f02c3705e1724fe8b9015931d85cbf
 DIST python-utils-3.2.2.tar.gz 25202 BLAKE2B ae36d918bfd125ed1c01a71f8b448390b70071eca8c404f2ce89312c0de8296b29026cd72baa1eeba940d84e2f0b5275ea0ee96735fdecd1b7fb8f5d42ac1b57 SHA512 cd3a9efbd71e33a343de4793c1b415129fbe280ea6b6bc40e84fc1ada7d409139d8bef6c7e2954ef6cd3b9407d817b07a61093d1a8b9de70f6af0b6aba3ebc8d
 DIST python-utils-3.2.3.tar.gz 25153 BLAKE2B b4e65b647b42288111edc7a90f7c1b1c3a222a999edacc2f0764e378f7c5f0b5c512842d73ea9f2e70052ba43ac48f9eb914a8a410b564bcd965c357672eda57 SHA512 85f1607faacf210c8e377a438c5d2f66e237cc870a91a9ed1ec7150aa8a7bb8f8fd5b3b0fb5e9585afb81801e7048f92b7ea46943205ddd9e271d6087b5e05d5
+DIST python-utils-3.3.0.tar.gz 27537 BLAKE2B 95570896c9a96161f0bcd2966ab8ffe8cf29ef29d50b8103ed6d0df4824aa3cbb6058d2b1d58b0ab98033775c5ea522c962bded2fd48b156bb57d686c8c872b0 SHA512 94a6ba6d303990cfd976d5676b5383df672d775385327e342b938483033fbd12fc75ce75afc6b66dd9fbf729d13e2a695246cc6a48073f579eeb7c0c82c7730e
+DIST python-utils-3.3.1.tar.gz 27565 BLAKE2B 79e865342d57ee1a841d9f17f26a26586ab477f5b7538ce514091f2c1f6d9054b34b8642ebc0f3555abdf696f74ce1473d80365844819829b9d8be37d1cc58f0 SHA512 d2c91f50999b3706696c161abd1f3bee5e39cb5078daa8d4604ad9c9905a02a221d0ffb7ae57bdb7c278b8d0c14c763d613305bf3371cb01adf4075ae55fd4f4
 EBUILD python-utils-3.1.0.ebuild 620 BLAKE2B e9dc61bfcd0d891238f969befc4097e3b93d667b11d699ad8e148674914bc14566c119c83ee0ad52f814f22a84db3fd42fe74249daf5c182db50fe6ff707b7bc SHA512 b3e960ffd2dd79013123553bacd8c7b1dec3aa791464b60405f2b0e8d9f4cf09c2c5e4ddd951800707d40d77c04448a27209892373ef7a92f8a1fea3fe0d32bb
 EBUILD python-utils-3.2.2.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
 EBUILD python-utils-3.2.3.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
+EBUILD python-utils-3.3.0.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
+EBUILD python-utils-3.3.1.ebuild 763 BLAKE2B f5b8c60a98b1c46721314c73971bf8cb793c96304aa12ba9be47751146456f6f7664fad0261f5fd4f6a9b2b3f83831b5204658a287d643b95496c326e83d916f SHA512 119f736a64b9643b058c18bf6e2a159e8310e7968d75599c9b7b0e3cafaccfde922ea260423994d6085b97f6310101cbd38009c2819613b429c1db505c291bcf
 MISC metadata.xml 340 BLAKE2B dc9b0299a4b93a0e53cc8e8e5ab494a8bf04ea54da4c2f9a658ca485925f86b5a765299c6680ecbff1e29a4e94a88dcac1891e440c788ada76b2123e352ac6f2 SHA512 68222ff7625c88a73f918e1864b67a2a44ef128023668b2a8706e873b4a8703928f1961baa0b304fe8fa075261edcd183bae02a2416813b283aa57c16bf6e200
diff --git a/dev-python/python-utils/python-utils-3.3.0.ebuild b/dev-python/python-utils/python-utils-3.3.0.ebuild
new file mode 100644
index 000000000000..ce049eb48c18
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-utils/python-utils-3.3.1.ebuild b/dev-python/python-utils/python-utils-3.3.1.ebuild
new file mode 100644
index 000000000000..ce049eb48c18
--- /dev/null
+++ b/dev-python/python-utils/python-utils-3.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 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="Collection of small Python functions & classes"
+HOMEPAGE="
+	https://github.com/WoLpH/python-utils/
+	https://pypi.org/project/python-utils/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	docs
+	_python_utils_tests/test_logger.py
+	python_utils/loguru.py
+)
+
+python_prepare_all() {
+	sed -i -e '/--cov/d' -e '/--mypy/d' pytest.ini || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pytimeparse/Manifest b/dev-python/pytimeparse/Manifest
index ea1589436b60..d132b61a2e5a 100644
--- a/dev-python/pytimeparse/Manifest
+++ b/dev-python/pytimeparse/Manifest
@@ -1,3 +1,4 @@
 DIST pytimeparse-1.1.8.tar.gz 9403 BLAKE2B 671a96f0f7d517e6cd137b8ec7bda17976993a683ece5e06f857cb07063cd4d7fdd08a98f838dbf35251a8403b68f7dc538e5450db3abe644e8c7c4f6c76b645 SHA512 9eb4530d779b940d66412920eefa4f4d3c43719aa3e4104da4f337c05421bcbb6ad4cb2d6459ddfac770fc9f19960a9d8ce578e67f2513499a7bee8efe9541ec
+EBUILD pytimeparse-1.1.8-r1.ebuild 498 BLAKE2B 9aeada4248de898b4ae3774ecb747ae3b05e4e70f5542484d0d1d87882bb14538fece59161bcc4ce0156242e80110009ce5f009f129097e10ac3a7ea89b44a56 SHA512 120ba958202bb5f8af01e2860b55b2234e69d4c76853b02e646c544bef27ee63823850e286cbdf6a5bf06c04b5fc4236b53d595f97e7d0050987f17c5fddbca0
 EBUILD pytimeparse-1.1.8.ebuild 653 BLAKE2B c0a653a8eff39bc3490601ea744d0023aa2ed66c5908725f49677b5552c8897072d53f716b30bf24c34d5bf7f8f83fd364809c361f0ed80708a6c2c80dfe2d81 SHA512 3d5a6399d3734baf680b5b5f5afb7359b51b85ecbc4e078d36ff9f6fd1ca04c161f6d88b7a15d2f61a08d38f799893c1fb7b6031c77152d7da48eb8f64419897
 MISC metadata.xml 501 BLAKE2B 9ad6298b97c2882d63f95eebd4e055745b736b15b28c9268096b08e8a1376169614795b2b5138ae03fdb22c75be6c30776bc8b998955b88aaf1b3ab2ee60d44c SHA512 2a01bcf9ca0e6a9b285f5aff31e05e8b31c00487ddb09036c69d86fcdd3c28ce89f89a309d9510436a0b27bf922778f46914b215918ed9e1ab9b31887d1e08b2
diff --git a/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
new file mode 100644
index 000000000000..307c17920bb5
--- /dev/null
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 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="A small Python module to parse various kinds of time expressions"
+HOMEPAGE="https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index baa2362e1b29..3c8afdfdd02f 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,5 +1,5 @@
 DIST pytools-2022.1.7.tar.gz 69154 BLAKE2B cba04b4033b1910ad0946f650a6e5ab94c0802375eb27575ce56a838a6c62c541f5ed6f80842b2b42c7001a6d1bbf0379aff559110e07862e24e60d60aa2a619 SHA512 9b96aded94604848e9e8784ecdd09aa1fd99a33005ac4840f9a33a5e059895193967060e9e9eb37281a8b8ebae5c9867671109137685492c03492efe672302db
 DIST pytools-2022.1.9.tar.gz 69731 BLAKE2B 12a6b4a299eef5713dbe226b65b3f1d7ef92a67fbef7bcbf166a09dff79ce6eb2ac7976aab9c54d5a1363d96dc61db928ca44c22de8b33637cc0f09f0b0dd347 SHA512 242b41010db581ad18bc96572bd8f25b15ff4228e1ea3ad8eca2016a36d6a2b55bcc570437821eb40605ab45f574b738f8364adbfd0cac28c2b12fb75e75dd14
 EBUILD pytools-2022.1.7.ebuild 760 BLAKE2B fb24f7cbfd2287480ca897f296ca11dd0e9f15ad88f41a866e29603d3ac0ae0a371af4e6d2c9e1928a36983ec3f596e8e0394856b20db261426476e88ea81158 SHA512 baeb20772e5b0e6a3922fc5eebade7a8e5ce86877105191cd7e3cc2547dff1b321b72e7f3c1d71339c14cf5f3bc7acba0a140a5a2b9a6016c06db719cd0e15c4
-EBUILD pytools-2022.1.9.ebuild 866 BLAKE2B 34893e2385ce816e9dd9166446d3f9038b225c3fd5c759545c7fc632bfd0b41f52c41b58c6c1d5a0cd99d853cd967c84bd6b2da0bf659ae3c10013e5a80faa88 SHA512 14cb0f5a05d65d3f9be1be7a0d583daf4e0505547d8fe4436671b00c0566be6e0fecf834c2dca90b528640624c04db1c9729da25d16bce296cfc3f58031a5acf
+EBUILD pytools-2022.1.9.ebuild 866 BLAKE2B e3b3789fc882cb66abac9ddb48ea2253d6a04bd426c41f4385531bea63f9796957671624dd9a2b79d3191b3ed1731be1bc2d56344d9c1d9be935fc224d106953 SHA512 4388571c6bdcc6fd19016dee9fc2a4a30f9d109d6a6d1bb24afcc96c732408aefdf5f5fbd8fe2fe21cc79d94ab6549374f2db6b8607de49911480e60da921819
 MISC metadata.xml 395 BLAKE2B aaf2add895c8e4001828d7b4e34a251d6690ae783d129b5a75e7676aca5f7e655597343df4eba3dffd40cbb9f4321766885a94ef8ae5c31f57aba4b23b8d6d67 SHA512 3201eaa7dccb492b48ec3143ed91696519c420d99d453e5e2a489592c50e532c7c270be8c6ab8c09da0eb8dac85dad9ba3ca0c98ec57b5fa850efb912c557917
diff --git a/dev-python/pytools/pytools-2022.1.9.ebuild b/dev-python/pytools/pytools-2022.1.9.ebuild
index 268f1db9af33..099c6522be45 100644
--- a/dev-python/pytools/pytools-2022.1.9.ebuild
+++ b/dev-python/pytools/pytools-2022.1.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index fa0a541aafcf..278ef7d72447 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -3,5 +3,5 @@ DIST W3C_SVG_11_TestSuite.tar.gz 14651624 BLAKE2B 680059d8b20775725cebb3aed4444a
 DIST pyx-0.15.gh.tar.gz 875286 BLAKE2B 49d36e1c0df3ee47a895279d7f296194324cf1582bb7db0259bcd01c9b17c4d0903c25fef10c7a22635fac62dc6378ffbece200eac99f75bb3ce81d48a71a0d1 SHA512 a7debff01f8055455855f4cac5a08d00c22d20d7918bd7341d2af83844223ae8bb23bbbe92149403656e18ffb8861e8568dfdcb59cc01c55ec60e63b62a8825a
 DIST pyx-0.15_p1.tar.bz2 746171 BLAKE2B 5b2325c7bb279e4f6425f0ba7f3808b7e540c7455738c617efdf1ad9d383a466d1b67b90e20e0bdbfa7d2fc56f1c80a4ae2badc5ef78f63ec410370d516f4ab3 SHA512 97809a38029011735d2cdea8f7e8326890d748d4159f44379f89c396b7ea4d2a026ca3370bb069974b07215da91a47b9334d8dd1f7db954c2dd272122bde8ff0
 EBUILD pyx-0.15.ebuild 2101 BLAKE2B 96ae821b8ed0b2decdd83d8e161acfd1042eede9ae5b2a6942ce97d4429df932c41614afe454d7f4b12ce21201e5a49d2954e570c846345036b0680bbbf62cd2 SHA512 f83c165ad41c470659b3d60de980cb626d5dee57428e64602ee6c06c55716c4a00082a195b19161e8094023d27022c5a63b93ff34e298a484661a27775ba5532
-EBUILD pyx-0.15_p1.ebuild 2117 BLAKE2B 4aa69985f83957f9b9c1fe9f9063d46c14aaa0421433079185b4158e01f1e79c4816cefb523ff294b9370120601670cf087de3a4d863c018fef5d99eeb78d338 SHA512 c7611f9288780c874faff55ae750d3529f38990e2efeb8e66d0bd72cc75d3b945f8c7d8af79489d2467f7f1a7da7eb18e9cfdfa1f16718d068533893380de1e6
+EBUILD pyx-0.15_p1.ebuild 2116 BLAKE2B 7ca45986128d0f817b8f14529fa702dbced71aafb92dc3e72123ebb6951dc5de8db55c53381a23984847da82ca949e2ca6e27b079dea53881bd871e9ecb8bbb1 SHA512 40d5e3d0a5199fa254eb90796b8debf4ec0818b52fbb741b68afd4c70ddfb797466ed982bfa1e7472e5bb4a1bb467eac81821482390b81d3fbd7e6666996682d
 MISC metadata.xml 698 BLAKE2B 4932dd660d490e02e5129236ade8f54e6b62da7a785cde853a7d85b6b8686da100a3d1ea6f515fb87cdde040a2affbfb0a8034038c7e4b0a9b384576afc134b4 SHA512 002d4f9eec26d792ff59fe4772344c573dbd2615d9dd09ab3fb6109948a9ae33858db8bb6b2b79970bd5a19326f6bddc1e3969d656f684c7cddb7fb581c54ecd
diff --git a/dev-python/pyx/pyx-0.15_p1.ebuild b/dev-python/pyx/pyx-0.15_p1.ebuild
index 0d9517439908..d2a3f69e6665 100644
--- a/dev-python/pyx/pyx-0.15_p1.ebuild
+++ b/dev-python/pyx/pyx-0.15_p1.ebuild
@@ -27,11 +27,11 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/pillow[${PYTHON_USEDEP}]
 	virtual/tex-base
+	virtual/latex-base
 	dev-texlive/texlive-basic"
 
 BDEPEND="${RDEPEND}
 	doc? (
-		virtual/latex-base
 		$(python_gen_any_dep '
 			dev-python/sphinx[latex,${PYTHON_USEDEP}]
 			dev-python/sphinx_selective_exclude[${PYTHON_USEDEP}]
diff --git a/dev-python/radon/Manifest b/dev-python/radon/Manifest
index 824d78933709..36b4eddf911a 100644
--- a/dev-python/radon/Manifest
+++ b/dev-python/radon/Manifest
@@ -1,4 +1,3 @@
 DIST radon-5.1.0.tar.gz 1873643 BLAKE2B 475c140fa3f9350b2376a66d3cf0dddd7f0ab1b3a4f397e82b65d175dc20ece38da1cdc7a83ef2f9e65d7d735dd589fa7ccbb5d966ca07cc7950430dd33642b9 SHA512 98e1c3dbf419ff0a791f01ea5376177c5be47c9cf1afdd9ae53014e8869dd10c7a7661a69bace48adb880173a8a176d4a13534711fcf53408b3f495f4579f7c5
-EBUILD radon-5.1.0-r1.ebuild 735 BLAKE2B afd264184c1ae0467d1ec9674c49abdb262d0d8505a2a696136a3b04146d74961218593a6dbda4d2906babe6f43b7920a1109ec0c292cf04558990e556d71c0e SHA512 90cfa8bd680de4f3ce359d84f576489457194d5e896edfce44cdb6b1ae54522977276e618b684a5d1bf655591516e3348515952817972acabfd7975e1e6db7d3
 EBUILD radon-5.1.0-r2.ebuild 837 BLAKE2B 10bc3e11bfed93545e1634dc6332883d37ebf431bd25eb94292344ab20d40a6c113b0d1693b62cd196cbdb6a0e044affc18bb09ea5b7da9a1db061f012e026ee SHA512 6040254a3ff2ac52c89f31243e7724998efc1642537761a874e0cb25e84f67411baff31bdf701f7036456d3606e7e0d262691b30fbb08c349c4cb7c2f954207d
 MISC metadata.xml 384 BLAKE2B 9c13838aaec4e01a6152498eb4f0e3bfbbb8cffe0cebc53ae7602c6ef1009852b8568f33e6c0299619a2a2df234abc6e06726ca145b09470b2798ea500dde731 SHA512 5c1a2d23ef8a2450f6d2540d125c9edea2e512e2df03a6d8501a41e238902afe4283c9f455b178e80626cf266aa472391c342d6128683f534f37db60eab38720
diff --git a/dev-python/radon/radon-5.1.0-r1.ebuild b/dev-python/radon/radon-5.1.0-r1.ebuild
deleted file mode 100644
index 0597c06cdb0b..000000000000
--- a/dev-python/radon/radon-5.1.0-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Code Metrics in Python"
-HOMEPAGE="https://radon.readthedocs.io/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/mando[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/mando/s:,<0.7::' setup.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/random2/Manifest b/dev-python/random2/Manifest
index 95daa4b382f9..de4052c78f6f 100644
--- a/dev-python/random2/Manifest
+++ b/dev-python/random2/Manifest
@@ -1,4 +1,4 @@
 AUX random2-1.0.1-py39-tests.patch 1264 BLAKE2B 8a9010deebf3529bc968c6b05a84a2034994455874a1b011d0a711da5ca863ad1aef4e462e7d5f6183121bd0f01e2f2270e057cb2c54d907541e9a0e491f09c7 SHA512 20164add503f8a6cf8750cc2e95baec382f3faafac8ed50046b61e5b81a9a2da4033f8a9f196e3ce1516dfe21228c2d25e3957eed3c85bb1c8aeda284a864d1b
 DIST random2-1.0.1.zip 21088 BLAKE2B 69747711e355d3dea2b16562a6b9cdaa170732172e9eaac9a5cee4b8058f569e0c4527aec89e408e6472168fdecfc52b87703d23f153ec04f6ed2c049bcd162a SHA512 31de31c27bc6e07e99c24d30e97d9ddc3085fe557bcb0725881d4ab0b4c06e6208f64ba6267098c7b1be4f115ad45b399e841beecc90f71da2fb7d82982e75ff
-EBUILD random2-1.0.1-r2.ebuild 522 BLAKE2B 7879648d7168d78e20c3f3abe9f8399d03492d65a84daaa5098550c5d034d75a699c9e7559a9251a722aa1dc77b3dda9780747a4d5afb8dea6dca22dd51fae00 SHA512 84605bf1a71cbad616668fd5e3752eef2a5a688b7e01a85ad5b047d5c8dba16692492896e70e14bef28fa5e3144d11cc92683e6487b3eab5e444f045e291c60d
+EBUILD random2-1.0.1-r2.ebuild 522 BLAKE2B f657d837672eb741fcd112c8a24c1aca28d0191aae69e5f80e9a38f01f20ea7624d9ad9c9e5ed66a3c02e8e9a11d6e3fa118240d13e363f18016dc998c49f6fc SHA512 09fec47e106c41ad20114cbbd9773e3c0acd446281e913db388dda15ce16195df43a4265caa2aa7dea13d25488703c388f3589289ec74ac2b2f7a72ae7329b96
 MISC metadata.xml 317 BLAKE2B 8308aafb7ac32af516a3ae84ce565e825a376fa226b11657b4175a847961159468bf474e0b293ebde604ef2ec7881b2fe8f71aaf4c326f9cdcf39acea3edc2dd SHA512 f569e09a6f9d184b6261fdf01b7568727d267c3e66b1f450b55b31248b757269d7c0bef6e87e4b3a4b1937c8dd4115338b484fa32a84fc3b4cc8b41450f3576f
diff --git a/dev-python/random2/random2-1.0.1-r2.ebuild b/dev-python/random2/random2-1.0.1-r2.ebuild
index abc7460ee960..1bede88ea6f1 100644
--- a/dev-python/random2/random2-1.0.1-r2.ebuild
+++ b/dev-python/random2/random2-1.0.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ratelimit/Manifest b/dev-python/ratelimit/Manifest
index 9ce1b79e3893..4bae087253ba 100644
--- a/dev-python/ratelimit/Manifest
+++ b/dev-python/ratelimit/Manifest
@@ -1,3 +1,4 @@
 DIST ratelimit-2.2.1.gh.tar.gz 12366 BLAKE2B 7c810bd111202ef6cd86a789627367665457eb2fd88f13d91b18c934210b72f8f4b0ca1ae0e26b502234c4bf3e74d1c6608260d51a022f9f733d10eb061de023 SHA512 a9a2347e9f9e152e5b1ffcf346cf750c5c52471aa2216b485d989edfc55686077990676a35e0125277313ad50a656a14ab72b7aac61b661e2fc4ec74611b5990
+EBUILD ratelimit-2.2.1-r1.ebuild 574 BLAKE2B e2cf708c7a9c77c5829a9b23e3c75d3709acfacef51bc1754d27bb9378d99c0ab7645d238034662027087ca9367ed4e3b276c0c80d81161925a8405320a20426 SHA512 99f3d0837c05510cb4a6af565721d9c0ba8d5ecbe705f4853f238d100346b5258d9e40c8d8c5fa4bcf1d3f8679a40f5f42afbb395680352deb45f280c08234f5
 EBUILD ratelimit-2.2.1.ebuild 542 BLAKE2B d42a37cf7c65da5d617000a6d8c06bf6f5bad43c896612c897e1f08a5ccdbd97c99960c047ed16796a11590b86864cb32799d9a798f9241a0c35bc8bcdc4b452 SHA512 6b120be4ba600e3e664baedc5de186cb32442ad36ba893996ea11847f4c1e3f5abe0c74597188840cd5e9ce883bcedb54080095cb0b1f67ef9254dd13053df05
 MISC metadata.xml 820 BLAKE2B 9e052ae412570ce5ca7ed5a001faec65df8dcb5d43aaea653457b19f285143f192be11fa3e0fa463ffb82f3db720bbc01438c695503e1529497aa3a864f0ee66 SHA512 8d4d294bf2a966244112f55d4519d2876de7d3500254f2b5c4c700e2d6a16cdc7caa6c1f9643f9622118e1d5703038d9bb2d1c42f319c8be5c729b88ee900dea
diff --git a/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild b/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..8506452099b0
--- /dev/null
+++ b/dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 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="An API rate limit decorator for Python"
+HOMEPAGE="https://github.com/tomasbasham/ratelimit"
+SRC_URI="
+	https://github.com/tomasbasham/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove --cov args injection
+	rm pytest.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index dba163522aa6..49bda4599199 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,3 @@
-DIST readme_renderer-34.0.tar.gz 28835 BLAKE2B 556088064a27ca0ab556102a9bc7026f5089e8a326631c0b7d3d5d0906b63191fac1f4f473c5c3229c0357b090bb63c8bbf0cab66e793c5de0d8eb8da696d2db SHA512 835beadb6dd98793cfce1a1691c66121ad2df9d205d9e1415bf8555495460af7003c9153a58fe5ea0909541b305d2fc4a39120f395805514e11fe391783447a3
 DIST readme_renderer-35.0.tar.gz 27224 BLAKE2B bb58a6cb39aace47714aa351c710663ca9f43f04055e21a5ea3954b2d1fff58dce073b0a41bdfb07f34ffe16f2fbba9ba59c2a6b8f84c0eacfb7d9f7cd881380 SHA512 29377cea5a029f7c4cf2ec0362771a280936e84fc39117c13fc6557172581570af298520ea6f5df53260e1da539ebe3fe4183bd1fb5620af48824bee04fefc75
-EBUILD readme_renderer-34.0.ebuild 810 BLAKE2B 2f6596e00bce5cae7e65cfd01efde0ad59db2176c9842753dbc27b6720cf716e7b9255a2d211251d0168dd625093c80fa225c3a528f4e4f6d6d05319943c1b03 SHA512 c23162e3b5a249dd717a9818b9a8b5399fc05ee826466f16c3a7f7261238f1d55ddc8eec509c4fc34b9bc68d3aed6b888e932df8eb0bd3a61f57cc3381935285
 EBUILD readme_renderer-35.0.ebuild 826 BLAKE2B 07790975b0eeae82f5171b2694c92ab376a2f8195d05c68113e2852ca22c6e86f8a41c4c90d483d8a66253ed2651751f5c19e0f62363338287286afbbaf4b696 SHA512 58c1d989ce5bda468254c7971de1c00ce8f22a8159cf4364f182e589cd89632d7885e755ef276f6eda529aecfd78d65fb8e71ad075dd1e848a7bcb53e825c0f2
 MISC metadata.xml 416 BLAKE2B 1441314990a3eca464ea227d76e458a42b3c9bf44076f64a59d22cdddaace1fdbe219b3e6f8fb963cc40174aaf473852698facbc8816f55278821df0f452a1ed SHA512 50abec4287629f7982049959696e8f21e0a773618c40b42815d53e709d080ff6051235453a4659c50bd4cf856829d0489cdd0f4e1f56cc65f28d5de45d849b86
diff --git a/dev-python/readme_renderer/readme_renderer-34.0.ebuild b/dev-python/readme_renderer/readme_renderer-34.0.ebuild
deleted file mode 100644
index d4550307dee9..000000000000
--- a/dev-python/readme_renderer/readme_renderer-34.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
-HOMEPAGE="
-	https://github.com/pypa/readme_renderer/
-	https://pypi.org/project/readme-renderer/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-RDEPEND="
-	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.2[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-DOCS=( README.rst )
-
-distutils_enable_tests pytest
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index dff5774d02ea..448ba254fd79 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,5 +1,6 @@
 AUX recommonmark-0.6.0-sphinx3-1.patch 3684 BLAKE2B 23692ee5c248f2ba72194dec9908c56df252aea2482e242b3541deca0e19d705d82949bab3b82a451d3926792bee3d4dd1a37da71850e1799e9f36035ce82564 SHA512 f774f143b23e51556551a75f13eb8da3e6f22bc223406bced4158e366accef637591e8b299ba0fe2565208ecb71ce44677c0cc29bd914721f1fd3d229b1cfc46
 AUX recommonmark-0.6.0-sphinx3-2.patch 2547 BLAKE2B 9bf1c55cfedef690a0377cb7ee59941e6d42bf464d073e578576b8e57dc9209e97811e0715089d8c8cf1fec27d32c63a180bc2c76eb1881530c6d84971392f43 SHA512 78ee5758d1fe3a805f3e40bb8e49d76155b56ff4f87910b084c9f18e0dd06559fcf91c55abea547537c02dead8ab029f77bf080c9c07e239b2dd0193aa1c619c
 DIST recommonmark-0.7.1.tar.gz 24720 BLAKE2B 6543a23bd262be0ff6847fc1eb1bd3dad433606aa1adb52162cab2e0c4dd2265ac41b3816bbe1994c4f6ca732105712dbc9cd295d5cfd93061ad83520b8f449c SHA512 3e03440d606ea6247df9bd122a6fa2dccf01c0c315eeace046d5cd336657e26bbd1c6b7ad4ba46f344215905128b72508c036cc57bbe4b5e27df50c55371fe01
+EBUILD recommonmark-0.7.1-r1.ebuild 812 BLAKE2B 5805f62ae3b1af6ab13250f47baa24b883282ef0f75f76d7fd0e5190471fd6217886e6b189d8d81cbcb31bdbe2de0a0a6de4f79c0bdb330ec14420f49920ffaa SHA512 d0b0e64da290d4634666a55d2834ea75baa155092dda8e29262d712e89bd802c69ce27ee3ee38d4c1485a104deba22ed92abad3c1afe8da0e266446bc41a89c2
 EBUILD recommonmark-0.7.1.ebuild 773 BLAKE2B 323f01c99250e0a4f7247336d6eef7f9c4e16c685fc9aab37c3e2c4a820eae340eb5d80888256677966a73f3ff28c4633e4dce2dd9c04f675ac55fbe7819ff43 SHA512 2c89006cc89d74c821498a5a447b824120d4fbe80f66070d73f64e07887881ee6ee53d191c5f5fed7c4f7c1dbb3f31c03f87fa97f6543b76be4d310aae85c681
 MISC metadata.xml 417 BLAKE2B edec6b1431f7ee81baf5668ef5b0b8e65e01cd936cc8e56e6b71b27463faf2d24b70fc6bc85b6a3298146b4384d28326c0929b8f61aa0c2811765395d1e03dba SHA512 420722dae406a557f45ae5f7e57a7cd38d5b3b2d7419e41d4d4249975947524dcc26fbdd8d6fbee216af3b07763d5955ff0a7e30968397afcc0278ce71d4e87f
diff --git a/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..5069662f14f3
--- /dev/null
+++ b/dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 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="Python docutils-compatibility bridge to CommonMark"
+HOMEPAGE="https://recommonmark.readthedocs.io/"
+SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-1.patch"
+	"${FILESDIR}/${PN}-0.6.0-sphinx3-2.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/reedsolomon/Manifest b/dev-python/reedsolomon/Manifest
index 22aaad645606..d2d51df86255 100644
--- a/dev-python/reedsolomon/Manifest
+++ b/dev-python/reedsolomon/Manifest
@@ -1,3 +1,4 @@
 DIST reedsolomon-1.5.4.tar.gz 283778 BLAKE2B 5354b8d320db1533469ae1fd706c0412a81bb408675041af5dbf42b42014e4b779b937fa8e3b3d0a5e67e62d9fd7ce9ac519022dd98dbc82a156ee0cda7914ce SHA512 c738f817c8f536ee86e5bcd3de73a4cf6a3e606ba196a359b6c09e7372dba31316ddb8b134d7c335100e4c2ff0158ff07caa35fee9bc20768bde23cd803e274a
 EBUILD reedsolomon-1.5.4-r1.ebuild 791 BLAKE2B 6690500f52bbdae8e9aeaca4248b1c3d02c56b5f3aa8f2d5acce2d5f296f62f532700b0873371e36aafbc22ff5101c3008cf99c602f9a52668014ade05421323 SHA512 fee307951edae4c67812f2b934f9a564edc292b2cbadee5dec728e87ab0526de7dc32d8f4e9141d95000ae648785e21ad6f054c91a8c47975cd06e51a4d606e1
+EBUILD reedsolomon-1.5.4-r2.ebuild 825 BLAKE2B 76d9bb7f58ba208c649720225799b4721c423f91bc7b70e4e062065b0b8cb889fc953bc493c6690553c3d04626c1a9ef39a559025011d1e37738205685fa3026 SHA512 5bfd2ec9b82da681ba14ea0a111ee7615cb7302b08e9014b6d2883c83ae8ba2df65b9e211d79778a855c7221d57b07ebd7f7b57c5b9f9fa78261b8626738ad5f
 MISC metadata.xml 532 BLAKE2B 90e7740e649abc65ccee0b33c6515689b33c33199bbaad9b30ebe8bcd4e86467526d8a85e50af308c69b82930506a942a57a8b50580c892cb9e6fa902b19a3b1 SHA512 76556763e4d00a4796435298017646c45f26c7bc913adc444dc97300cad75a91609fed422ed0f9dd6bca9f0e193d43ab8efea22d321e59e110f0e523be971eb2
diff --git a/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild b/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..d00545330c78
--- /dev/null
+++ b/dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2021-2022 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 Reed Solomon encoder/decoder"
+HOMEPAGE="https://github.com/tomerfiliba/reedsolomon https://pypi.org/project/reedsolo/"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+	default
+	rm creedsolo.c || die
+}
+
+python_test() {
+	"${EPYTHON}" tests/test_creedsolo.py || die "creedsolo test failed with ${EPYTHON}"
+	"${EPYTHON}" tests/test_reedsolo.py || die "reedsolo test failed with ${EPYTHON}"
+}
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index fd84d6614a59..2ff467dbf07f 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,3 +1,4 @@
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
 EBUILD reflink-0.2.1-r1.ebuild 1140 BLAKE2B fd4712eab114ac219d612e9661cd45bfb0d56506a5c9d9b4f7baefab81a1b70c7dc9b24149bc54d7fc656fc8ae545ace107fc6b6ca41911e5963b5849e0e59a5 SHA512 1bb1880ee2b2031669ffa5baa9b9724372e26db7865be3dd4a63ec10635d3369ab517552ad9a1ec141fbd28d7418525a83ac095e202b683e38c8a77bdd4aa2b0
+EBUILD reflink-0.2.1-r2.ebuild 1172 BLAKE2B bd7c4a9b21364da013984057cb32e05f513f8a001b78efa40f0af02c74a0b38fadd1e0bae5a5a03deb002dc255ccc9bdfc567af6c30e2f4656ba58a04d8c081a SHA512 9b47e4abe02e104e9a87c1df1055dba91cbf4b98ad533b57bbf3d4fbdc76ee3d9ea296db46c0b779375433752b3265764e517587361cfa8894ae57b46d87cdc2
 MISC metadata.xml 494 BLAKE2B c3470939e469632cba9f41a54ebaeb727f54059f99d610e62dd82207ee08eabb36279d2ae7270b8be32de60da0e3fb301b3181693b26c5d9fc7f69b03122deee SHA512 8034be071497c8239e2e48fbd7993a1ab3d1875fd925a3d47bbe797f289949f95135f84a732f1edbd829009c266bbbfe9fc9d7ac43f22fad9c2d11ef18118d93
diff --git a/dev-python/reflink/reflink-0.2.1-r2.ebuild b/dev-python/reflink/reflink-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..11eb61de3fe4
--- /dev/null
+++ b/dev-python/reflink/reflink-0.2.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python wrapper around the reflink system calls"
+HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}
+	test? ( sys-fs/btrfs-progs )
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|'\''pytest-runner'\'',\?||' -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local notestmsg="Tests need FEATURES='-usersandbox -userpriv -sandbox'"
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "${notestmsg}"
+	elif
+		has sandbox ${FEATURES}; then
+			ewarn "${notestmsg}"
+	else
+		pushd "${BUILD_DIR}"/lib >/dev/null || die
+		# module import will fail with any other directory structure
+		cp -rv "${S}"/tests ./ || die
+		pytest -vv || die "Tests fail with ${EPYTHON}"
+		popd >/dev/null || die
+	fi
+}
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 17d3173e8139..82f97be53c9c 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -1,7 +1,5 @@
 AUX regex-2021.4.4-pypy3-fix-test_empty_array.patch 1103 BLAKE2B 2498de0ebaa68fcb99653a40bfbb9a1009519a79244fa3193ca43b9b8b3ef714f066fdac68f32d7f24c275690cb24bd1deca6b30120519b99a3402db7b4d4d48 SHA512 d55643d7ca251f465d14d8cffab60e6f2c8fb18ec6f9032a5318fab17a8b8e5ae5c98d22e0eff28aacd5bb8ec2ff606022921f73f3c9f7e54ee0853de262cfa7
 AUX regex-2021.4.4-pypy3-fix-test_issue_18468.patch 1078 BLAKE2B 3545ee5167790fbb1d068afdac3f6dbba28ea92d6c1d4ef31b60a8406061deb8609d7fd9a659b45715d4af0f2deb1da0ef9865aebe58919c2b392e2a1a833cae SHA512 182628709ef0f373037acf197c2ade3215684b2c805a96a600a3dfcb092e6fd134c261330ed76c7c248e72f439e464ccde432444bfe4a9610bd36c777bf45c9d
-DIST regex-2022.3.15.tar.gz 383001 BLAKE2B 459fed91a8996d6191ccd220869cf0c0e793f774552702c9aaec00882f71adae1e7378233811f6885d95b10db963d098a1d4c45aa0887c26d304df85fa9fb124 SHA512 99ef24b28dc5b1ec6a5d670698a98025aff14d082f6c24a3122157d28879f71c3ced2f5d2a3c8c6091609d93b7a500b2882b92b29a8fe1527532dd9f280cd51b
 DIST regex-2022.4.24.tar.gz 383365 BLAKE2B 743a27afa1d504e9653b56d868b076479a476108213137ae7157772d29824204eeb781f5d939debfa8da122e22acbfbea6d8c356b14ad9c1eafca2be5970fdd2 SHA512 2b9e83c7164986eceed5ae0e33aca9075afa022398684bb688064394cfa43f06b0ce72c15fb7ceee55b7793072c7b1d7709513faedce4719f0c406164e9e0593
-EBUILD regex-2022.3.15.ebuild 845 BLAKE2B f92f3806f613635bc00cb858a0e60942ccd44170f3ff5f08d307fa82e9fe8c2bceb5556f71bcf08d3c3802962f2d9f589c07fed5f33f8768161ea3c199345d05 SHA512 073ef9bca89bbdb4af7bdd5b0abaf4773c32a43378c245369f6963196a6d2a53a19e9d78bed80bb08744b4af383b7f5cd7de93bdf3cf076d1e0a017b5ce69eee
-EBUILD regex-2022.4.24.ebuild 893 BLAKE2B c65132fba9db44ade93ffad9b2562499a5212a43ddc0b37fe63471f99e95de698447fd803d444b50534b52417ce78ccaa7f2e293c1679cc579fe124647de65d4 SHA512 154c5bc4287b18ec4320b1cd14dab4877398755d23e1382098fdf35e848a38040b75849a6b6fabe626d7786632e362b0fe68799ca5da6ee845646b649cdb291c
+EBUILD regex-2022.4.24.ebuild 889 BLAKE2B 2f4739ef643cd8ce3dce81e94160c6943bfb5f5309f62306bad54dbdf0ff0035fdac591d776c5da341060b4da89d12396b54e2436855bb85e4e449c454e6552d SHA512 e95dc22617b73dcd0e01504dd8e974f09260c79f0935fe9cc9d6a2842640556ed1f34d619fdf31917ae2d466dda860ed02fb9539178c5700ed26ec1132c738b0
 MISC metadata.xml 385 BLAKE2B 90c9075dcf3be9bd447746b249c438f50bc84a7c6c63051e808c5feb19b2c6208f85a681e449a025fe43cd0d5b2ab541752966b04b787052d78b92d5230d8e62 SHA512 f554035e72bcfff83e693f3651198f09fd354babfbadd5fef26dca3015ef8cc00c47072648794123c69bbd12c637eeaf9e9471680bab847ec701da2146462817
diff --git a/dev-python/regex/regex-2022.3.15.ebuild b/dev-python/regex/regex-2022.3.15.ebuild
deleted file mode 100644
index dc19a169b0db..000000000000
--- a/dev-python/regex/regex-2022.3.15.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Alternative regular expression module to replace re"
-HOMEPAGE="https://bitbucket.org/mrabarnett/mrab-regex"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="doc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_empty_array.patch"
-	"${FILESDIR}/${PN}-2021.4.4-pypy3-fix-test_issue_18468.patch"
-)
-
-distutils_enable_tests unittest
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/Features.html )
-	local DOCS=( README.rst docs/*.rst )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/regex/regex-2022.4.24.ebuild b/dev-python/regex/regex-2022.4.24.ebuild
index f706c26e5bc6..df6875fb35c8 100644
--- a/dev-python/regex/regex-2022.4.24.ebuild
+++ b/dev-python/regex/regex-2022.4.24.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 45970ac02213..824cfe70dcce 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -2,4 +2,5 @@ AUX rencode-1.0.6-drop-wheel-dependency.patch 493 BLAKE2B 368e3b618490538adee98c
 AUX rencode-1.0.6-fix-CVE-2021-40839.patch 1166 BLAKE2B b0ddee3e9ccc62d7caaecfec8d8e1363942fe65c9d931fac9bd609e8738d8a796c644e1657906257daf5161de0f1e7a5efcad31eb424dd3fc9508d5bf6d56f84 SHA512 885ecede3d9fb52eb09728e37863cade4800f87d09ab6ffc1e55d1ace90b8e197e4f3073f6fcf548f2e8e4b9d7cfadedb3190d556427e826bbd6b2ba48ca6cac
 DIST rencode-1.0.6.tar.gz 25455 BLAKE2B def013a569a53e2b2d96b3430c13676810bc5879e565f091dbc44f1ae950b8ec7ca0fa5e35a974432fd71a1bcca5a3f1f18bb2a9f042480167ab50e4f0aba8c3 SHA512 f04de4d3a83aed916bdc4b7a8ca772655e9324d0531ee882cb7d2a1e92b397bdcec8497bf02939e0a806886ecc62ed2e7319dfee054dad1b69052157f0959e8f
 EBUILD rencode-1.0.6-r2.ebuild 977 BLAKE2B 15a4a35f2c803a2ee938e9d1d524693c7b69137699824ae643c2e64ef893bb668e2e3d0132714bbd923a82813930d616620572ea42048e656c4b34b522881e59 SHA512 84f2e115729e2939111a2a10b16fa323fe23912e19705ecd71c84d9e61ed8b51f89d1a2e22088933599c6e37fcfe316a5cb14f5129563e68a9ce0ccd6de9cdbb
+EBUILD rencode-1.0.6-r3.ebuild 1011 BLAKE2B 0bf6727219796ceb61c92fb8f03b16268a3b84e9f50d7b0e7f01f2f27b0585b3ea21069dac61a22d0d36cad22fdb161ed4daf2e90330cc37fe16444f492d884d SHA512 a298834a635e345e3f16a71ead979fac7b2859ad05d6d6584412c4d335ab8bb5d70c56f88111007d341797d16772c7d19d60774e94d375e65c85add62bc92587
 MISC metadata.xml 712 BLAKE2B 0d5545f8297c043a09922dc92765fa62ed6aa3fc77fb69df2208a46f298a50575b5235780c174a044df7f0105b11d1fa9667b77d152bb6f1b91720976200f26e SHA512 10b0ef1c5a426a0ab03b157967710193ab783382619191530b4f9a27e352879c5e48f462ea9624008f6aaf779391f4ccb7cafcbe11c86457618f0365d6f81ea1
diff --git a/dev-python/rencode/rencode-1.0.6-r3.ebuild b/dev-python/rencode/rencode-1.0.6-r3.ebuild
new file mode 100644
index 000000000000..03c76dd1dc85
--- /dev/null
+++ b/dev-python/rencode/rencode-1.0.6-r3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 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="similar to bencode from the BitTorrent project"
+HOMEPAGE="https://github.com/aresch/rencode"
+SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/aresch/rencode/commit/16e61e1ff4294bddb7c881536d3d454355c78969
+	"${FILESDIR}/${P}-drop-wheel-dependency.patch"
+	# bug #812437
+	"${FILESDIR}/${P}-fix-CVE-2021-40839.patch"
+)
+
+python_test() {
+	# The C extension ("_rencode") can't be imported from "${S}/rencode"
+	# so we need to cd somewhere else to make sure "rencode" is imported
+	# from ${BUILD_DIR}/lib (thanks to PYTHONPATH).
+	cd "${T}" || die
+	epytest "${S}"
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 8587d02a1c53..a41f87e47fdc 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,3 @@
 DIST reno-3.5.0.tar.gz 83644 BLAKE2B 803d3d3c9ed572624b77d2851221edcd0a86241f86876970f1a64877d3083b39d8e574567f14dea52680538770a37bc70c55d74b66ddab6fda551209c32bb844 SHA512 4d48ec3faf26d046498edccc0dd6007dff36d8346395b5c62b2b85a8ff9bba5ac571cbdcb2aa8e522b6f4c155bd845a416cc715c30a29e8eae6d033ee1b52be7
-EBUILD reno-3.5.0.ebuild 1065 BLAKE2B 954f9a0e093aadfbef2ebee6d1a5b10e313a44ad44da079be381da6b86ca765ce3f6cf1cb73660c3d097c1e5bbccc008dd9e0af59e5ce8010efffa5ba9521720 SHA512 8d19a4557ffb5dbd1e4783c99da26471da6828e139d8d929abe38b54bae4f9a1a747cb2ef5199594a55249ed501f61f45a00dc589659c7c0a781180ad6fadfaf
+EBUILD reno-3.5.0.ebuild 1072 BLAKE2B 26562df980a0b1ff5dc2159e0ef9109edb14fea22a158c383f1ce2d2cab8be5b6a81ba75c3fdc1445239818266f354891ca5037fdad04345e922580a811f7f4e SHA512 bbd31682fe71658fef20c545ee804197dda5fb14f119b45c3650e667dc14b8312e7950ef3f0ef28fad217607711774236d94b64e313079119a44a0622352cec7
 MISC metadata.xml 400 BLAKE2B 933415cb7e31bbcf30191336617ffb9adfa5c83c26164fca5f813015ad8cb9c5c6a88276e8b8ba37ba0dd0fd4e658861150fe80a6770a16bb419959ca1c9d924 SHA512 2dffa12ad580c59bc034d4788054a4184d713422ef658b031c0190ee8c5756f37db3872e1f3a26c60ecdf9138904f87552119ac5559236a7e4ab2081d7a8c5ed
diff --git a/dev-python/reno/reno-3.5.0.ebuild b/dev-python/reno/reno-3.5.0.ebuild
index 6449033e1620..c2f5a53316b9 100644
--- a/dev-python/reno/reno-3.5.0.ebuild
+++ b/dev-python/reno/reno-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86"
 
 RDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index 31bc866d6891..8aa617fab2ac 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,6 +1,4 @@
 AUX requests-cache-0.9.3-cattrs-22.patch 6925 BLAKE2B f753c154741fe3a6b6fb05db19ddeadff669e2175a2113709921a2356dd53f4b867be8f9a3b91c36cbeeb891f9261c956b8728acdc03183a678117190afbd026 SHA512 f3258aa033e197dece2eca00169a833259d44c91488780edcc945839960bbeeb28f77d7dea806eecabcefea20aaa9c1a8c3448a0d34da58f89083cc7e82a597c
-DIST requests-cache-0.9.3.gh.tar.gz 1541517 BLAKE2B a6096e8db01ccc7e6afa94ca35460ad79bbc503fe32fb272c3b43bb3344cb4a4e3c6f9240dc8d26a49b2ae4b564de72be22553b40847480487c150b192aa9490 SHA512 d413fbed156bd3fca48db8b153b01a883ee72d62f6e8982d490a5378dc188c19d0b3af5e37e6f47d19ed0ba11b3c0e01489720d56df12afcf1b47088e1541221
 DIST requests-cache-0.9.4.gh.tar.gz 1541821 BLAKE2B 90f3ffe8f4213a47d19c1190f1201bb484473a4ee2fae82dff59c9e80bc8c154739e99f5024aa55b436f9e620d5594441df61e2db44e3cbb381d394c1b6b4a0b SHA512 66023dc8b153070a532f160af58ac2102f6b9d536a0045c4c62ad1d4175f59df6e7db5a25422f5610a2f17049270ad0b63c6023ddddf64235432a63d2cce9b91
-EBUILD requests-cache-0.9.3-r1.ebuild 1949 BLAKE2B e0f87b5e1577ff920cb56f50564e1faba6589f28b61fd9893167cc95e4ed515fe04bec4e312879d56017fd2d7459602a3cca0a7c738e103037913b92bd0a66b1 SHA512 d63349d0c19426433db1e4c27087255c52b57e646c09507c4422708360528169a3a12d6047af5853ce3ab18f74c0f8c50d1f231f6061a28dd53daa6f888b8d6b
-EBUILD requests-cache-0.9.4.ebuild 1965 BLAKE2B 8b1bdf3c5dd5eaefedce37c13028732431c21c9cdabe57fc0de6532a93c447c601903d24d71531706c8473a8e9fee0ba700183a98179961602202d9c53d3e849 SHA512 68c0ed1ede594571774590a7746958a6de04f2963a6dc0d695796fb38fe81ff524ab4ea52d5ad37fcb06fd6590a78ac52e73dc67da9083f9c293c88a9cb73a0c
+EBUILD requests-cache-0.9.4.ebuild 1973 BLAKE2B 80dd5db6761f818e3b389fd063371cd549050b7636fff825637d106a58feeb678e9915b773d28beac892d00a1c7e63d5dfa24bcede8c66e7e1b7cd472253bafb SHA512 e82a49eb38e33ffedc1d1cb28482ac838549116a9c8ed73b08f79a74b4f4a2cf95c5638465828056d862a6762168d2678319ddfbedc825b48e4e8ccfec2c52c6
 MISC metadata.xml 470 BLAKE2B 83ea1b65050486c1ff410664b87a19e514102ec030ea0f3d4076d435503f6ad2dd16caf8ff0c947d064c93955a743fe45d14c4d64471613c9de65c33f6708b93 SHA512 54160c5daeea03d90c896e30f35ed6ce8e7a29280a5e1bb1d1b0c04b5899a48ed3261d400762bf9c92bb73ddb554bcaa533b620ecda691e43fe89c1d943b7b54
diff --git a/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild b/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
deleted file mode 100644
index 1d237051f1ea..000000000000
--- a/dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1 optfeature
-
-HOMEPAGE="
-	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/
-"
-DESCRIPTION="Persistent cache for requests library"
-SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/cattrs[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/itsdangerous[${PYTHON_USEDEP}]
-		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-		dev-python/requests-mock[${PYTHON_USEDEP}]
-		dev-python/responses[${PYTHON_USEDEP}]
-		dev-python/timeout-decorator[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cattrs-22.patch
-)
-
-src_prepare() {
-	# unpin the dep
-	sed -i -e '/cattrs/s:\^:>=:' pyproject.toml || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# These require extra servers running
-		tests/integration/test_dynamodb.py
-		tests/integration/test_gridfs.py
-		tests/integration/test_mongodb.py
-		tests/integration/test_redis.py
-	)
-	local EPYTEST_DESELECT=(
-		# Requires Internet access
-		tests/integration/test_compat.py::test_version_upgrade
-	)
-
-	local -x USE_PYTEST_HTTPBIN=true
-	epytest
-}
-
-pkg_postinst() {
-	optfeature "redis backend" "dev-python/redis-py"
-	optfeature "MongoDB backend" "dev-python/pymongo"
-
-	optfeature "JSON serialization" "dev-python/ujson"
-	optfeature "YAML serialization" "dev-python/pyyaml"
-	optfeature "signing serialized data" "dev-python/itsdangerous"
-}
diff --git a/dev-python/requests-cache/requests-cache-0.9.4.ebuild b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
index 9d8c4ac27acb..c9a10a8eef4c 100644
--- a/dev-python/requests-cache/requests-cache-0.9.4.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.9.4.ebuild
@@ -11,11 +11,11 @@ inherit distutils-r1 optfeature
 
 HOMEPAGE="
 	https://pypi.org/project/requests-cache/
-	https://github.com/reclosedev/requests-cache/
+	https://github.com/requests-cache/requests-cache/
 "
 DESCRIPTION="Persistent cache for requests library"
 SRC_URI="
-	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+	https://github.com/requests-cache/requests-cache/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
diff --git a/dev-python/requests-file/Manifest b/dev-python/requests-file/Manifest
index a34c4487c50c..489e4dc13a80 100644
--- a/dev-python/requests-file/Manifest
+++ b/dev-python/requests-file/Manifest
@@ -1,3 +1,4 @@
 DIST requests-file-1.5.1.tar.gz 5668 BLAKE2B 4060ab3728e32d87252d1bb25e310937dad0a6e790a9633f8932d45c1d791343ea6813509d15a24c9787736ef6b9992d236b06a504efce6c3d5fcfc04176ae87 SHA512 e671bba8de63d3fa5665f928734f1a152d95ac9973c99f3a09d2dcbb9c9c16334c54a4f0824a5ebe63e262a4cc5d4990f08244ff0b84af11fa475dd416b1e2bc
 EBUILD requests-file-1.5.1-r1.ebuild 499 BLAKE2B 4c305298a94e0fde0994abb126f8667f7434ab00e0395ff185c0cc979a879ee1bf02c7d5321e438af8bfc326ab343113d6813ae60d2c39aeed379ab3b43b793d SHA512 b64fce5cdf9fa321e49ede55a55a3112b31851496e92159396638e04210a6fd31f1612191e7a3f47e63ffc5e033508b660cc701537e59cfb04249f6ed8f89883
+EBUILD requests-file-1.5.1-r2.ebuild 533 BLAKE2B 46eaef973ac985071123df35f2c9df7b195689191bc78c584838a4af190d09d74ea69ab1d208568893ea00aad98b9f4be85b3f1aa150e6ccfaf1e851dac7aa65 SHA512 fddeaecc58e5a9654b53acfd45907ab463f8872bcd9e0dbbfe3356cba7b5c6ff69780428baa3682f72b4620b73445736766507e6c9e15f6b10baa160d8490fe3
 MISC metadata.xml 452 BLAKE2B 18888177e7a3de72dde3461c1400e4a250f30c68f948c3f0dd3f84c8cd7cfc768ff00e09bc75a936b377e1a2b4e6d8eb5ad704e3194cec74356d1ad1c141ced3 SHA512 efc7c2c991afd404f394057204a0a3450911b466b07f9b123edbeddbf5ce0f54634240e0a91193cb657fefe238483d6f3cd1a97c545ffb62b2701d2edf8cdc0e
diff --git a/dev-python/requests-file/requests-file-1.5.1-r2.ebuild b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
new file mode 100644
index 000000000000..363756b642b8
--- /dev/null
+++ b/dev-python/requests-file/requests-file-1.5.1-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 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="File transport adapter for Requests"
+HOMEPAGE="https://pypi.org/project/requests-file/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/requests-futures/Manifest b/dev-python/requests-futures/Manifest
index a8f43692524e..3cd6ac5fc522 100644
--- a/dev-python/requests-futures/Manifest
+++ b/dev-python/requests-futures/Manifest
@@ -1,3 +1,4 @@
 DIST requests-futures-1.0.0.tar.gz 10897 BLAKE2B deccf99ffecf3dd04eaaa7692b93b046b027109346555ca9b4172f29600615fb78bd46528c2ae925587d06f24e5b52dc2f02f5d5da04eda18cd97037e1b28440 SHA512 64b39ed99712df8f1be74b2de97500d89711c0d5d3ba0f2b64e3bab755d0bf82029d7ced13b755ce12a2b86f3b673305b651ba6ff4cfb60aed40c8d5876f202c
+EBUILD requests-futures-1.0.0-r1.ebuild 999 BLAKE2B 3c957a1f7ab0327ad6fe432f83038948495064857119a6732a88e87057f138f95bd1ba568426daf1f465436a3ae8888ddf935d2d9df85d470bb5f51b912aa977 SHA512 30f0e63918e6532b28033972703511eaa28a98b52a49ac83b15810a2c8a54a55f828c86c11a21111ba20f34a72b2457ebfd2509eeb4ca2ba0ef3ef947e858638
 EBUILD requests-futures-1.0.0.ebuild 966 BLAKE2B 3fb624452834017f69502431ddd9385c9f3185fb334ab738615126fda5fa394957b07df574a8479c1d6f14c08dab22a4032a3b0a05a22ed4bc6e6170b5eefc96 SHA512 e4a56f1c76334d4bb959218cdb0b4867ce573dcf7cee4befea48e014946b4d3474f03f6b5c8583e4ec03ba56da3987ec9b57388324061cea68fe582173881932
 MISC metadata.xml 562 BLAKE2B 116ce554daf71a47d20efa98708554d50185eca1272c26556666152459feb42ef8187fb74da72a5b365f360ea397ed1056b932e9339ca4c3fdb82b2f12983278 SHA512 fc998b8ee8cf4a4d01b02db9890632eb793c8f3ffa021c3eb2466e1ec221c5d36aa5875804989c6ec0897ed243019673e0b185a371d728a86d2d5238fdcaa25f
diff --git a/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..7b959771e7d7
--- /dev/null
+++ b/dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 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="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Asynchronous Python HTTP for Humans"
+HOMEPAGE="https://github.com/ross/requests-futures"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+RESTRICT="test"
+PROPERTIES="test_network"
+
+RDEPEND=">=dev-python/requests-1.2.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# known failures by upstream
+	# https://github.com/ross/requests-futures/issues/94
+	test_requests_futures.py::RequestsTestCase::test_redirect
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_existing_session
+	test_requests_futures.py::RequestsProcessPoolTestCase::test_futures_session
+)
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index 6ca461f742fd..10f71b07f674 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.14.0.tar.gz 21275 BLAKE2B d64c92bf70df07a8dd38626a6699ecb95aaf82b6aa93797eefa80af2b9760f5b064e0aa3a3bca5242ef73ce1efc4b6ef0ef1bb1802c7c59a20b6655bd3894aae SHA512 9dd6eed0d6afe4b852ba96f621be3af2965e9011bf372c5dce77e0bca18191255ea407ba313904271615d722d60029807db2d6815b24437b021b02b026eb60d6
-EBUILD requests-kerberos-0.14.0-r1.ebuild 777 BLAKE2B ceb7d7249dd99be0bd10a30cdaa1aefe8612bf55605c189e76be2c5708ea55dc0b91180b14b940fccf09d49a8e7a8e7886a5a14af9d4f53add18e0a9eeaec764 SHA512 d7cb3ad990cc42f4057d4d868ddf1ebc90aa5b1078e7e0c9c7fe7f9d076e0c8f03db4b62086c5339f89ec54acbd0ddf4b3d68edd346173a7a3c474ad3adeba5a
+EBUILD requests-kerberos-0.14.0-r1.ebuild 784 BLAKE2B 3ab1e697c35f17c7f5080563aee5a30abb20dbe3886f708c09db4ec24802b25246d75eb5718f6c41970477d66314d87d00602fccd7f317cc9f281a8e69d2e330 SHA512 4117a4022b271364f2b407b980c0bd7875add7253aa83e7bed1d38dd34b3417e0a3a9bf4ec6a11d9b029ea34a902ed1b88d6d254c5d5697f10547b8fab805070
 MISC metadata.xml 411 BLAKE2B 06c28d67859801b83b28b32e12abeac09bb3a3d0ed02546ae211b8b8a3ac5a6b464ef3d5d6e6e5f6bac20d9201adc4e543ae02b701a374c50f8e475b7472e240 SHA512 656422babdd89a9afe5c96344c625ea5a5f0e541972636366176f77e39623773907dd0de9bbd53ed664b63bd3215ab40780e6010ea8f1febb73640920a800aba
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
index 14f7c689de73..8c42297bc26d 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/requests_download/Manifest b/dev-python/requests_download/Manifest
index 2f44c68b2200..510164266872 100644
--- a/dev-python/requests_download/Manifest
+++ b/dev-python/requests_download/Manifest
@@ -1,3 +1,4 @@
 DIST requests_download-0.1.2.tar.gz 2584 BLAKE2B c6f2eb7a182e0f42ccb7b603dec47a077b1b946bfa93968972dce5267c7c51fa8c4158e15cd35621cbe229e12f6644db9734e52439796d8d8411be16a38e1e9a SHA512 99d4b275200c88befd2730d17a3329c8cbb155fa5cf9600a7466e8ab109f999a9fc9b8c668aa3b389bc2a3deb33b8a3fd390270d71f04bb0a8f998da67cfde82
+EBUILD requests_download-0.1.2-r1.ebuild 649 BLAKE2B aa43af6ae7a386f425923f964ec8442b8127172bb19ee60b49e4876c3cc0afac1a0dc306b23fa83022cc3a76124041753b7ffad05adc2037bdc7850a9e54d024 SHA512 82c8fbf9e55d86728e97ca27e2cca1272fb150dcd9ab31f71964a3ed6e79a500e36ee9abef272e4dfa63058c4dccca761e0fb31be59825ad4c5b3039ddadce62
 EBUILD requests_download-0.1.2.ebuild 818 BLAKE2B 8796df05fc86245accc7895b49cda1fcb1bf715ee3117965a1dd2475869c77347f1077b03006614c9b6d2b4f491cdf2497b7034c6b5424de6c30faa5b025e1b0 SHA512 8bad3ae0fbaf9850ab6f97709a6df6041252cbe553ac0fb0c0f4c2a10a04cd7122e4f2ac9c1fce09d50543d290ddd08e57bba55159b4735473df7f7d523766fe
 MISC metadata.xml 434 BLAKE2B 55a4f9a132c3c50d9a9852e73dd24ff70517c9be1a2c4c7e84f04fbfd6a24aa250e165db5bff5959fa2e5a88f063f080a16c2b47e061d6d501b67dd0860714d4 SHA512 f7950fc65c69c3376caf4e7865e9517d75e7df1b054748d6ca4850707ec7c5fb7124dc2057f8131c20cbc9e2f1d7198fe2d25879250b0cf99d8ed7fd6dbc1fc5
diff --git a/dev-python/requests_download/requests_download-0.1.2-r1.ebuild b/dev-python/requests_download/requests_download-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..b9bb4886b279
--- /dev/null
+++ b/dev-python/requests_download/requests_download-0.1.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2022 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="A convenient function to download to a file using requests"
+HOMEPAGE="https://github.com/takluyver/requests_download https://pypi.org/project/requests_download/"
+SRC_URI="https://github.com/takluyver/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
+
+# there are no tests upstream
+RESTRICT="test"
+
+DOCS=( README.rst )
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 67c15b969846..3103822a2967 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 497 BLAKE2B 1e4bd873c597108d615c6e4edf954eae02ccaa4a5a9dc9108b2f27020d0a28dca013410531ae56032f55d3a6c2f4c64e104f24504a91ddb7d01e7b2d86b56b44 SHA512 86c80409436322788d730cf6fca227fc5058b7cdab5973d79114fdc6379c50293ce720af8a287ef17011d1886855f775029c9c583b331b66e3854e19b2d543cf
+EBUILD requestsexceptions-1.4.0.ebuild 504 BLAKE2B 06d7a8d1b562bcabee364855b42d9f25ca9b0baadbd53708c9cb2baf892100fc481a7bfa3ae6288146c748b6cde90c97475f66ec7ce2be32ad7696eed0b44dd7 SHA512 366f0117f0e89d48a84a6bc414410732b111ccb5f4ec05c2aa719350abe3898d0389c26b184483bb89d5e59577ead7452c9335e80fb975f04938c2f26edfef8d
 MISC metadata.xml 847 BLAKE2B d56497e1b5b36d36f7155a4a01c5ff0bc591a1c2cf15de3108b8c0b9fbc46d583b1f035787b0f81bacdd3863bb0cc3bde1aaf1b8c953d1f30946bb241e0d24a2 SHA512 fbeaadea31ecb181c762d55714d32bce8039673e1d2e091354e2587631de7793e057a6501c475326060883e0604d4f7fd44d8c07884a2772972e057373427c86
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 2e3f56bca881..8009ee3bc158 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index d38789c195a9..5ed542249a1e 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,3 +1,3 @@
 DIST restructuredtext_lint-1.4.0.tar.gz 16723 BLAKE2B 2beaa565391fd1a130f8ef998b140e0ebb4695759a61c0526f066e71c3bd42e981115f267c48d30e19eb45c240907ea71d9f49a03d74e9ce1d4b80a2c0b511c9 SHA512 8e16e2a43cb1e52bb3b4ac60da53130bd4a8d0b823fc95b32e62068bed95728084de3b55820cfcaba70eecaaa93bdf3f956b8bb6c55155115b40c7151ef58a2c
-EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B 5c6a736fb2ef184fb2d8b55122cc6bf768117ea689445f59fc0236507e64b638e133598ed4ca9781b82cac807673aad0b6b69a7f34a98b6b7524187cc25cdd94 SHA512 39422db38b573904a85f3b62cb1924307652de63a29c8b48531f82ef8dec2e3f7b3af351c7b8d169560e4fd43944be85ac20d5065eacb0b51595d9a63fbf77ee
+EBUILD restructuredtext-lint-1.4.0.ebuild 610 BLAKE2B 574f969eaac64ed5a94a504e060939daf148b7ddbb73f17230ff66bc5afc2ac5fc8a59ccf6bdb27f00a37c2dcc3eb888716e447772ca5737f14be9aece4a8e84 SHA512 cfaf2b79b88dc9c294740c21d996b1dd73a5acb8999eac268f8805265f474db1baf1abc93dfd5b9c25ca7ac9173ff97eecbd543966382989886099008084ee8a
 MISC metadata.xml 464 BLAKE2B 25d6d2cbc0a5fa141d5102f0065fd2a1edb3027d75b93cbd421dc732b24c350ca04c4286abf324ce8bb86af9b48e1805cd737b8987852661942043749b818dd6 SHA512 71919795b1be966904361cf818dc689bfec9db3c48b03d30a8b13817fc3dbe0ada1b898c34bd5fb1859018f079f9cd3ca35a478ca0390d51a3da2baae703c337
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
index 1c41fb8575ef..b2eb200afff5 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index a542282ebc65..cccf06cc9b02 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,4 @@
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
+EBUILD retry-decorator-1.1.1-r1.ebuild 503 BLAKE2B b3cf69ddfd81b5ca965209e4ce8937698baee2a3b03b8683323b521d53d8b206bdc909e18576cbe7d3663cae333545b9a512d697c5542d42747bb8b641575542 SHA512 f315406b0cbbe53b4a2ad3eadf8dc66755b4d4e3eeba9cffeacb23903909e536c4d5d1c2fa47961b14b92dff490e8ba898ab6f754dad8a2ec38ad7584ca9ee3e
 EBUILD retry-decorator-1.1.1.ebuild 468 BLAKE2B 614a2d00079e7a35914ad9d8980346f91ad73a3e9688954d37c193c14ade5ab093f635e19c380491739c57af1de7849f55f963a7f1b099a1e04066e21ee242ec SHA512 55080f646dd21da9b6ce34356fdaf79f7285b2e92af2976c8667fee6a5c92edc9f2a1fb8eef1533dd7b7bcadeb94c23544751945eadd49a5f422da0f843d9eb2
 MISC metadata.xml 405 BLAKE2B 90863423065eb5179620db1812e96da7fbcea74be72b0c3a36db04d26ce08afabba8c4415faddbb09676b4bf5acffc7c3e47b0d1eeaaa4cdb98d935f881741d5 SHA512 078b9f2e7f24393c1c9950d9a5cb106720358ad72db46fb0a238354f1b1b9bacc2aa3b7d99628fd4ac0e52f8a8468b7fd94d194c6eede655f2d2442bcf587cac
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..bdd65098108d
--- /dev/null
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 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="Decorator for retrying when exceptions occur"
+HOMEPAGE="https://github.com/pnpnpn/retry-decorator"
+SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~riscv ~x86"
+
+DOCS=( README.rst )
+
+distutils_enable_tests pytest
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index bd24ee3d0847..8b1903703507 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,4 @@
 DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
+EBUILD retrying-1.3.3-r1.ebuild 592 BLAKE2B 048b2ebc7d80962842d2f33164d83df1f59ea093f977d7add7b3a78a263b852320fb4ba53f5378512fd859c1a16e9c50093a4a1bf89b740737dcec87d2159ce8 SHA512 de52f40f34ded572aa4f130699fd49dee591586e605b7e7e90d42ba31ebc60c42f4673020d27f29ed651c1dcec3fb5171cf2db431b50598cb469618063e369da
 EBUILD retrying-1.3.3.ebuild 554 BLAKE2B b7ae606f564f5f77f31b21e84e49ffdcc29fb785f1ded8cda016567899c79a7b1c0561be7d632524fc0502c86a5633b4cb60928aff1cc4aade6210f020853da4 SHA512 fbd69fb3aeef3276b64758f12990c5565c65b7837ad610f334f3a2c91dd94f1d77d8f0da0ae9cc0aefaa27ed9cc888a859ca2ad68ac0f6cd82858f9dafed3bb5
 MISC metadata.xml 697 BLAKE2B 8e2dbc71defcaea67864b234838a8aa574219c61115fed0a7102edf68b457d2a4a69ebf2e2578c1d1e2bb47762b696350d846fcc1f467c8117f05efee552bef9 SHA512 381bf3359171a8860f0e7c6a485bf8ee6098bc9d0b29e1012bae9c911b775d09cf2228ad061b01184a4fa6c00f62fe2ba3e7cc74c9062bbc0766a017dbb59805
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..5b39a5fe0619
--- /dev/null
+++ b/dev-python/retrying/retrying-1.3.3-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2022 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="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 1bd139c102ee..7fef516168b6 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,13 +1,5 @@
-DIST rich-12.2.0.gh.tar.gz 14884722 BLAKE2B fb3720724d2441cddd85ac22249aa232bd31f664019f9eb02e10fda913b98c0220a4fadff47fc0f6884ff77b7ee9f98a96e036fb76d0492e0c040d752a9e9c79 SHA512 8f8108557ca21e41b35c03242d203c229f7af0d7abf5b394fc894e71ae098bbc14e046b166e5452d7a9f9d7d6e8cc0e13784d64cd721d2f7acec9f624d14db77
-DIST rich-12.3.0.gh.tar.gz 14889665 BLAKE2B baa098e25768b4b84a269547c7726d281f67e333c0993513223dfdda7023001ea78b6edd10218726ae888e7216e18c6c4d5b9711268d083dfd0a41c3162658c9 SHA512 6df0ac70ffac7aca5726c9ea29c6eeada1ff955539842a1352eaa7f7e95c4c7ec57f4e2eaca6808e522d7e455efa80df2ccc3e20188f4646ad0e18294b59f744
-DIST rich-12.4.0.gh.tar.gz 14890620 BLAKE2B fe38abeec7f896053fc2f13259694dd90378db5318683243cf7b13add91c356992b9e4faa475aa282af70694b14e7c82e54c292bd3bcb4411d460dc831310b26 SHA512 dec7903854b29d13b31d3b17a592cd6b94ea1fb6626f7d8abae57927e8cd8021a51cf060b0f431d6fd8a358ae6938038f5aad0c695afa121e05ab3e97aa61006
 DIST rich-12.4.1.gh.tar.gz 14890981 BLAKE2B 7eb8424ca5e3a985e6d000ed2c74784dba104237a67315c59d3f3cdf71a7196621566b9f40f7ca0e9f74d6bcd1daae781ee2aef871f5fbf738d3209ae13dba4a SHA512 ee02526c5e717976c2b4a8e750dc9f87d5b2d15a9b144aabb8e84de01ba4df78985ad5ed6bbcf9f6e42a76a63cab6da76c05da917aa8c09d678858fa148db76c
-DIST rich-12.4.3.gh.tar.gz 14891108 BLAKE2B 39dc5a1104611bff1b15d29f244126fe1bb76862470d28563cc4cd2868357a259f5986405f2142f6710d70fdc1a759dcb0e46f49ec8e7d3107fb6d6b7c51feba SHA512 8ec22a81014abf2511de72009b7673047dd010ece8a46a733ea05f4b7ca7855723f400556834e41dbbd76c4fcdd5132a74f806f669bb1f1f4d4db71e55ae9cae
 DIST rich-12.4.4.gh.tar.gz 14891341 BLAKE2B 7829951edb77b8e78bcbdeb340fa6c96901d634fb59ab16b8866b898973a95bd38de9dd1a8f6c821cd2222447878a5d22773abec329f49753e207b5b358c3532 SHA512 c1d077bb1448fd436fea87697d31b484615f787c9259418d6ebd12da45bf14f25f192198e4522653c5bd4e5ba218da7d72597e20d04dbffce4a3ea8bd82ce27c
-EBUILD rich-12.2.0.ebuild 946 BLAKE2B 37b8aaf2777692d89a64830d815a1bf70389358690062d1c3321ad776ab862616c7a44bf59320d95222e21c50ec7aab0587773dc37cb346b2075afbf3d30f30c SHA512 0adabfe89691b8568c40ca368434e4f9dbcc979c1c6907450a46a3dd35a2c4a74d93cfddc3d2256678156a562a5210beae9b76882adc320e5ec0b4fba93e3946
-EBUILD rich-12.3.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
-EBUILD rich-12.4.0.ebuild 1093 BLAKE2B 91d6d48b2b249ed81190972917ccf910555999096d05d8d9960d9782d5cd63131c7cf7af2a4e2ca12545ae8e051eaf9c9e26bcb9818ecbdaa95a713e374156da SHA512 cf7aaa3a950adf6cfc561b2bfdc7c0327255371a660b2ffe180cb01c7f62d446642bbe65dc7e98b30b4d0480f93a2a317940fafd4d5202fca9b64009c28e17e7
 EBUILD rich-12.4.1.ebuild 1449 BLAKE2B 3d1825adb18151c0e55ad617457319d987ce93dd93d6b893d5cffc0806e934a4bfed4d9bbff1c7e7d87338c877db311c4c42fc6e7b8d8ace7bfedb49f41a3ab7 SHA512 8e4be2afe375b6d98bb3a7c73380cb458596bcba41fdecbff646be8a447bfe907d80ef346754a9b145ce8862094b620fbaf56d38269505a056866bb2cfb321d5
-EBUILD rich-12.4.3.ebuild 1492 BLAKE2B 2df3ff04bcb438dd0895f51a2c2de3da823c4a9fcc52cbb52e4d4e0f6de296ca97546f987b8be5551deabbf6227ee3b2061ccc5bd3c03ac6c7f40964021645fb SHA512 240f45da29c490f9ea76097dbbb23cd3a3e4c2e8d1017ddca37e353eaabf9bcd246c1b731a7b9c350224cdc9b9054144a813fa0853e83f430ec8d34de216ed2f
 EBUILD rich-12.4.4.ebuild 1492 BLAKE2B 2df3ff04bcb438dd0895f51a2c2de3da823c4a9fcc52cbb52e4d4e0f6de296ca97546f987b8be5551deabbf6227ee3b2061ccc5bd3c03ac6c7f40964021645fb SHA512 240f45da29c490f9ea76097dbbb23cd3a3e4c2e8d1017ddca37e353eaabf9bcd246c1b731a7b9c350224cdc9b9054144a813fa0853e83f430ec8d34de216ed2f
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-12.2.0.ebuild b/dev-python/rich/rich-12.2.0.ebuild
deleted file mode 100644
index 88b8c0685694..000000000000
--- a/dev-python/rich/rich-12.2.0.ebuild
+++ /dev/null
@@ -1,40 +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..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.3.0.ebuild b/dev-python/rich/rich-12.3.0.ebuild
deleted file mode 100644
index 6fb3f685440a..000000000000
--- a/dev-python/rich/rich-12.3.0.ebuild
+++ /dev/null
@@ -1,45 +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..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken with =dev-python/pygments-2.12.0
-	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-)
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.0.ebuild b/dev-python/rich/rich-12.4.0.ebuild
deleted file mode 100644
index 6fb3f685440a..000000000000
--- a/dev-python/rich/rich-12.4.0.ebuild
+++ /dev/null
@@ -1,45 +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..10} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
-HOMEPAGE="https://github.com/Textualize/rich"
-SRC_URI="
-	https://github.com/Textualize/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# broken with =dev-python/pygments-2.12.0
-	tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-)
-
-python_test() {
-	local -x COLUMNS=80
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/rich/rich-12.4.3.ebuild b/dev-python/rich/rich-12.4.3.ebuild
deleted file mode 100644
index a049e4167d88..000000000000
--- a/dev-python/rich/rich-12.4.3.ebuild
+++ /dev/null
@@ -1,55 +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} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
-HOMEPAGE="
-	https://github.com/Textualize/rich/
-	https://pypi.org/project/rich/
-"
-SRC_URI="
-	https://github.com/Textualize/rich/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"
-
-RDEPEND="
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/commonmark[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' 3.8)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x COLUMNS=80
-	local EPYTEST_DESELECT=(
-		# broken with =dev-python/pygments-2.12.0
-		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
-	)
-	[[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=(
-		# the usual deal: output changes that cause test mismatches
-		tests/test_inspect.py::test_inspect_text
-		tests/test_inspect.py::test_inspect_builtin_function
-		tests/test_inspect.py::test_inspect_integer_with_methods
-		tests/test_log.py::test_log
-		tests/test_pretty.py::test_attrs_broken
-	)
-	epytest -p no:pytest-qt
-}
-
-pkg_postinst() {
-	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
-}
diff --git a/dev-python/roman/Manifest b/dev-python/roman/Manifest
index 1a763dd58622..6c092d40018d 100644
--- a/dev-python/roman/Manifest
+++ b/dev-python/roman/Manifest
@@ -1,3 +1,4 @@
 DIST roman-3.3.tar.gz 7577 BLAKE2B 651d30154e01c9bc61326581c5600efb5f717b2c21cb6345d51ba5aa44d79bff00e66492d3962ed4c9682103a9c00af8205ae9d90b30b9a3f13dc2d18e6f1592 SHA512 8d2952640519052ce629a3881cb871448fc7921eb5f45525305c43ef9fb2672062d0ca96ab16d7aaa95f5eebcad028fdcf519f224f3631734fbb6a4a314f3a49
+EBUILD roman-3.3-r1.ebuild 549 BLAKE2B 61088b601d0326164bbc375d2161077f0aaa86d229aae7ba0b6672ea186fe0ae0e108d89aac755a38153bf0f2fa340f2995c2668593c455ae5e4b828d519ecca SHA512 2959923f6095e42570947a6e6dcb8afe49b04e6343a3e6d18961490122da1c2967b66729fcb00bd995f876acd73bd96a1df7b4141d06a5feb127a2f5e1c7a530
 EBUILD roman-3.3.ebuild 515 BLAKE2B ef6d0ad6524858b9c1ddf3134f266078ab507dd678d7db6249196ce4cfaacc061d4122bbf4326bda91801cc67a85e85b5531713a245b79ed780723f58a5ee427 SHA512 d465fa7e7b830f97bd17c72194ddc6067a73efd85aff0e5915273ea166d0ef39b4c38419f7414a84baae92a45e55771eb5e10fad7a8999b4e11723ee6d75f8a4
 MISC metadata.xml 344 BLAKE2B 5e91211798d6c6f7dfb0c44686a7d2a0e26e0af4dd07d0bfc670166df0e65911a709211cf2a215954e1db0ee580ced70fc0a51f8e102b553dd0ab0b35c369bfb SHA512 8e60fa9f18e2a7b2ee0575eca3f20b36ae0dec512873e8f4278869e1cf2dcc2e57fb326684a806c37e860780cec81b307e89c83ddbb38a6eae71be118bb51dda
diff --git a/dev-python/roman/roman-3.3-r1.ebuild b/dev-python/roman/roman-3.3-r1.ebuild
new file mode 100644
index 000000000000..0d4cb9fcae38
--- /dev/null
+++ b/dev-python/roman/roman-3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 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="An Integer to Roman numerals converter"
+HOMEPAGE="https://pypi.org/project/roman/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	mv "${S}/src/tests.py" . || die "moving test file failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/rtimulib/Manifest b/dev-python/rtimulib/Manifest
index 04315032df2e..180105012adb 100644
--- a/dev-python/rtimulib/Manifest
+++ b/dev-python/rtimulib/Manifest
@@ -1,3 +1,3 @@
 DIST RTIMULib-7.2.1.tar.gz 915114 BLAKE2B 5d8a54d4b1083105c1bb3b854e8474cb81cfd5eff843422e2f66f363ae04dd9e87d4cffc8f26c2a68c4f535d77ca229bc7bb7840c59ba3c6d2d45d5ee7f31987 SHA512 2a9d40f5c4db7c875fe82bd79408d97f9b00a3cd0d1be9b19baa3808b4cd260200b8ce5f5d9a6298df760aaca10555eb317d4a2431cd1c07a1b7953448852b23
-EBUILD rtimulib-7.2.1-r2.ebuild 539 BLAKE2B b0afbabb6a36d3f386ed519f96f4ead78fa7839cb939f7df141720ead585dc7fb4549d9f0648d9b78f4c0c3c91e17827fdc12ff979784ab65740ef2d88ab7e4e SHA512 182bed3ca73cd287a2969e6b300498c572c3fd4d14f658eedab1b0677f9090e142eca12e387160e83a5bbbd2d06dcbc413c3318a2a9d8bd847853158d63dba19
+EBUILD rtimulib-7.2.1-r2.ebuild 539 BLAKE2B cdc061bd46863c3664ec88a1d9df0b1c90738ac1df0c52c9e9abc0ca7799c844432ac2625df71b22eaa567a0de4e4fc04f97973a6ff3e74053bc04138394193e SHA512 c4f4a7f9671d41cbb06402fc49387723407c46320bc927d73586bdc229de566bf5f3facc6f698e6ce9907f2d9b3f91aab09d5b4dc45f8156d0ef8823a368c23d
 MISC metadata.xml 776 BLAKE2B 50b5d3f746747744be3e52260ec86e255ab41a5bc7f35226855260a9db9b68c206fc8c1b301ca90b672ed7dceb3290c92be6b3c6427f68e0c65258881cd6634b SHA512 8f6d8a0b7930e29eafeb2f047575f0d844e9e7b9e1e243b53e39fa0a6575c46cbe231d72d3ad8f3ff1dbb0e4801b3bbf17b0ffc61bb9299011d2292350d42bfc
diff --git a/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild b/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
index 6418b565bbdf..50a07f8ac85c 100644
--- a/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
+++ b/dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index 45c9033c6afc..e63e18f3d0ec 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -2,5 +2,5 @@ AUX scikit-build-0.12.0-tests-no-coverage.patch 270 BLAKE2B d7cba4096ffb66c98837
 DIST scikit-build-0.12.0.tar.gz 138053 BLAKE2B 5007bd070cee14056cbc9cc24a022a39c920ce7fa794a79dcdb707f185529e1ed2442a201593f6df8d2dd9b4ab7a9a1ed209b0bc08f3feae748edd06894f8661 SHA512 76be92d8ff96dc230e38dc36a58021399dd8c57b6883dc032fbcd8f01ce42c879c6d557e7a46d48aa9b8bc724270f409f3760824d5810654b53a1aca25ec1cf9
 DIST scikit-build-0.14.1.tar.gz 266776 BLAKE2B cb674412ef000fa961b85b32bf7759430cc5ff1b175e29017219ae3b941bfefee5760742cf17549fe7868fa0fc80f72e027aa683cd07bec53c1578e27b1ea0a7 SHA512 c9c3caaab969e83739cb3be718fc7190ef25372fbbf689ea84f9b9725bfc8329640c26038d875ecf3ccdbab0637ef77d6a30c05dcdaaecf441f631c8601d3b63
 EBUILD scikit-build-0.12.0.ebuild 1528 BLAKE2B 5dc1e9936100a34af85ee5673f7bc2f453d016662f42177c92dd1958dfe5e26bf76b2a938c8f1b2d67c1af1e650060d5add8ea4c708a0ed2f571b3f261d3d993 SHA512 ef9d6485ed9966b09cf7ec2e05ecd4ee3857cf40c4d32f58e2a25cafc837bf601367757e0c14f957e0ca3ba66edab8708889ff07b59f933fce963131b5de9ba1
-EBUILD scikit-build-0.14.1.ebuild 1889 BLAKE2B 7239c6e8ec48945d95b2f1e99276811ca39398c2c6d35d181bc0e1f40df6a1a50f3586bc0e417c492c6403a4841056e74fee92d329a1e3fa85fc732e1c0ff9f1 SHA512 e44e28cb3c57e0a155d68907bcab7e4a8ff04e01483fd346d7dc383136098e838271fd058d1bcc59d713a1ce28561d21c19617cd67c12888b86fd6893c962167
+EBUILD scikit-build-0.14.1.ebuild 1976 BLAKE2B 611ea392afa89e788e13fc123a41ef97bf202713631f835b72c2f4e3721989681b04eb1bc092bce6e0340404e7f50dcfe15dd8173e4ffabc15bef6fa6ee23b2f SHA512 2e7b194b386c12154d86f90dd5d6e45635b2fee158ffa8f74657227719e101461a4bd6d6870d6c89cc5fbca4fc1fd65987256ea1faa4b101c4a00461745205cc
 MISC metadata.xml 408 BLAKE2B 4cdf98a2ac7e4bd6e1276e0ceadb3ac7849a81c5a9931b1ea5b3087cd7ced5072c390f1b77791732a3470f2cfba6a0537732f3632a156887d7c4046235062d3a SHA512 deb17b2d33bab0a1f713edd2e10b643b8801b3c04b142dd37530d5335bfde5be6e8ffb99177170a8c24380c2958164bec95db50538993fdb681aa1d0408ebf3e
diff --git a/dev-python/scikit-build/scikit-build-0.14.1.ebuild b/dev-python/scikit-build/scikit-build-0.14.1.ebuild
index fc7bcd982b01..b6fe63a62d13 100644
--- a/dev-python/scikit-build/scikit-build-0.14.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.14.1.ebuild
@@ -8,7 +8,10 @@ DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1
 
 DESCRIPTION="Improved build system generator for Python C/C++/Fortran/Cython extensions"
-HOMEPAGE="https://github.com/scikit-build/scikit-build"
+HOMEPAGE="
+	https://github.com/scikit-build/scikit-build/
+	https://pypi.org/project/scikit-build/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
@@ -18,7 +21,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/wheel[${PYTHON_USEDEP}]"
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
 
 DEPEND="
 	test? (
@@ -29,7 +34,8 @@ DEPEND="
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/virtualenv[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme \
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index d1ff55bea616..ea8162f11e41 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,3 @@
-DIST SecretStorage-3.3.1.tar.gz 19566 BLAKE2B 0b1ab822ee29f3d56148b558b3029fd882f1d10ceb3e026586de2e9bc72b7ac1b35df11052117a7c07524ca72d004ef56d99c845bc3600984fe84e5300f3dfee SHA512 5e874d08c9e00626a217db96b131884daf92429a91f690b32f62052747275ad0effbe2b4abe048e67fe7f81df97507f8375408898ff986e6f883b5fdfbf2a76c
 DIST SecretStorage-3.3.2.tar.gz 19285 BLAKE2B 17089e61a9549f4547faa8c6f7f711f5e4b3ba9ac0bf7787c3384d4920c5cd02704bab86fd4b7abe4ad9b93098b1668cf89901f4a0760023e274c8daf009d5a4 SHA512 f04a35925f86fec25435554083ac0d4b21b88cbc19b67a4c744247e659bc767675a52d18b33be557e99593922aecb0c261ec40803c61e089ff35b6c8b541ac63
-EBUILD secretstorage-3.3.1.ebuild 1143 BLAKE2B d34153ee1dc6c79c1365bfb44663797a43bf907dc38230557eda5a7c77515f9970a589e83f9f2317762810bf9461fa382005be6f86b756752fc6373da9ca35cb SHA512 d65e275870505972a8d2a2a681517cb7f0f00a10cca4cfd06bce51e2fd50b4c0636707a8b3fead1f74ead7bb3718a53af88b0872a0d3ecdac8fa362eb7395ac1
 EBUILD secretstorage-3.3.2.ebuild 1205 BLAKE2B e708db158d78e3b9ac9ec7dd730617e05f671c51f7c6ebdf3fe0758053b8cef34916a0950c539dffbed5dfc4a558a574e66b7643e4e950604923539b1aa7d3ef SHA512 be2af605942956519d2f349ea74b5cec257d460b35751a0b00e8eef9bd05c4437d06ad52d17172a6d69cc1a4f00964c280335c65ad508bf807749314f97018c1
 MISC metadata.xml 402 BLAKE2B b96b0f7f9c4beb113d6df477d250d2b11c173b1832776569dbc74baffb460938979c78cc0eeffb91b357d1cc1f364d1e9f5b53f5339744715d0bdcba42b5a0a0 SHA512 66e94300f5450f6a6cd2999f23099f9821cc9a9855b4c52fbec54743a172c64dfad66fa184fec121ca1359bfdc1d2ff316fd9c3fcb100303537737dd5493d5ba
diff --git a/dev-python/secretstorage/secretstorage-3.3.1.ebuild b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
deleted file mode 100644
index 783105f6acc2..000000000000
--- a/dev-python/secretstorage/secretstorage-3.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
-
-inherit distutils-r1
-
-MY_PN="SecretStorage"
-
-DESCRIPTION="Python bindings to FreeDesktop.org Secret Service API"
-HOMEPAGE="https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/jeepney-0.6[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( !hppa? ( !sparc? ( !s390? (
-		sys-apps/dbus
-		virtual/secret-service
-	) ) ) )
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs \
-	dev-python/alabaster
-
-src_test() {
-	case ${ARCH} in
-		hppa|sparc)
-			einfo "gnome-keyring is not supported on ${ARCH}, skipping tests"
-			return
-			;;
-	esac
-
-	distutils-r1_src_test
-}
-
-python_test() {
-	dbus-run-session "${EPYTHON}" -m unittest discover -v -s tests \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 775b927f93aa..3697f405cffa 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,4 +1,4 @@
 DIST service_identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
-EBUILD service_identity-21.1.0-r1.ebuild 940 BLAKE2B 3774243ba6c99d291c922b58bce200ba26d774a7b1dcf30789788032d9322785cb78332e7745b509906a6d9b82739b38e2c68d3f9637983c617fd3bf6e646096 SHA512 dfd58bbd95fb880cbb5bdefaadbac55e53effa4a7ff5b37d6bb76008de2e9ce76b2070f6aad23d8af3f7e3a173ef4fb82677bb1b47c0b33f8861d7480cb8b4f7
+EBUILD service_identity-21.1.0-r1.ebuild 960 BLAKE2B a797e944481e3079f275e729f79575acf04206c4aead77429eac7dfe5cdfec22f82332d2c4e963c89eaf603ce209d1bf2e19ae85841d024cb64dd444cf0bc6c6 SHA512 aec2726554f8a82f4f8fcfd1a3613eac1c0c2b9e75d12ab7a937662d966a53eb30d559a736ed5f0f401decafd54a66c1298510dcb3c25138090861f6f0a32f57
 EBUILD service_identity-21.1.0.ebuild 846 BLAKE2B 8e26c1b82ad2c014888bcd3734d3ea5bd66a5d84f7f883e73377e4dc62c98c2ed1941d9d13f18ff7d4209295a7e92436c37599a85f7b50247876ca0c0e2deb62 SHA512 dbe717e15e3ac6fec015b91c98bd803c1fcdf75e6d852a0186c3db685a48ea52cc73aa18ee195e87d4d29d1b1bbd24767f97722332a58177df534f5f8566a12f
 MISC metadata.xml 405 BLAKE2B 6cbc25ff47728a28c25dc7c28670486dc3eeb488931fcf3883bd278f72d7f7fcd5834087c811cbeab32fd85f4dc04afd7b6fd50571283b2e88df3cc5b36dbc3e SHA512 db97cac52d30f9e01f40b4e1629b7602f643bbc0947db6ad8d4112a158a2e1caa2200438354e903d6986219a782de131b1a0ad7ad05203242b31faef9fb242f3
diff --git a/dev-python/service_identity/service_identity-21.1.0-r1.ebuild b/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
index 519cfbe9016a..2bd1bd80bf7b 100644
--- a/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
+++ b/dev-python/service_identity/service_identity-21.1.0-r1.ebuild
@@ -23,13 +23,17 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-# TODO: upstream made pyopenssl optional
 RDEPEND="
+	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+BDEPEND="
+	test? (
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 4c72a8617d42..79f3b562195e 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,5 +1,3 @@
-DIST setproctitle-1.2.2.tar.gz 23960 BLAKE2B e05cd482a1a8f76689a57da97f8b139c31ca1ec314fc88439326537e4c7aa4283be14506a42f6aa600dac5478a3438c29f1edf5f492465d0df13786e8ed8e70d SHA512 e89651e4879a33681f2862cbd6b430520fe7e5b56331ff2804ad4d8d4bd0230c4270488b132497efcafbc105f575ed2b66caf667130978c899ebfdcb9949b4ba
 DIST setproctitle-1.2.3.tar.gz 23618 BLAKE2B 58bafb30a9b0da9cd552c7ed1ccd197a2ee7a3c70ae02773e6a857e4f16069126d2507f30206c83a24d84d030a1fc9306d024f4e5b988f73d95df049fa9c055f SHA512 ae94e3f5e1dd10e80488f81250e979a6a15c7c3ae399bf557612b9b1edbdcb8aec4e68a7f44ff7375a399ab53d6319dfb5c5c4a1e3a0bb824c40f6921c9d9c6b
-EBUILD setproctitle-1.2.2.ebuild 569 BLAKE2B c7483a9b25218e159191807fb692a64c20f851f7b7dcf0037ebca99b4a6542bf957ae08e90524f2c96795647cee23d64b620ad9961e91f41d1a86a596831e009 SHA512 9651a530db06a95c5a82a795ab8b9b6bbfe3159a725e77509817cb05406dce02324da05c3dd05341b02e93244268747e22e1301e5e66200e509034b2502df622
-EBUILD setproctitle-1.2.3.ebuild 663 BLAKE2B 1ea7bb0283df0a100de5c1e4665ea9b7c88168a02166a2f197b4ffd5069f8572a53b1fe82b0af980a7097790b7ae1e21cb4859e276d65af042d0cfd13ad00e35 SHA512 83aa645bbc509240896a7a7db5f4193985663023c91cf89f4e3a72772a0bfee24194480dc6bbc8ed9cef76ad53b6daf09319e1287cfaf0f13e6fbb20f01612f3
+EBUILD setproctitle-1.2.3.ebuild 659 BLAKE2B 270ee12849c70a5cb3084c5d92a6cb71fb3ca89ffac5c2ba8fdb6dc48101bbba5eeeced0ed193dbb69a2b1c65eb05c12c27020762366df07cd5e3437ebf0ab43 SHA512 16413006711e1e2b0b75fd61e69f9465a8447be899539d0835166afc84806628ee55c734dbd0c6b82e3d6828cce9d1b14286513185656489148e58766117b7f3
 MISC metadata.xml 381 BLAKE2B 3d670d00f8ea402ac4ddb3a4f92f341f9a983a6dbd7d077523a7ecfea4bcd6ba398e7ccc5866ac2650a765b25a0e83b735293963598ef404af1f106cc629d378 SHA512 49e506f7044fe2ad49ffe16c7070da7fba8768f3e79b4c32e539a65ea94c73c19c7592021434a4ac7e10b7f401c255ae276ce8caa599a14dadb9e512765202da
diff --git a/dev-python/setproctitle/setproctitle-1.2.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.2.ebuild
deleted file mode 100644
index aa3f6ffe1d72..000000000000
--- a/dev-python/setproctitle/setproctitle-1.2.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allow customization of the process title"
-HOMEPAGE="https://github.com/dvarrazzo/py-setproctitle"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_tests pytest
diff --git a/dev-python/setproctitle/setproctitle-1.2.3.ebuild b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
index 048ccb109795..a66f942b8d4f 100644
--- a/dev-python/setproctitle/setproctitle-1.2.3.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.3.ebuild
@@ -17,6 +17,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~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 ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index c210ea6e07bb..2db11a4d5117 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -71,5 +71,5 @@ DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD setuptools-rust-1.3.0.ebuild 3098 BLAKE2B 90d42f5d2cd1ed06f4752b946e567d6ae03640f455a637e4e437cfb07088c7bf3e6210dbfce72eeb734c43ac3ef8f7ee8fb5a81dd11f54ad9e54cc58ae2d83a3 SHA512 1b28865fef78a1b9278a0e123b967504724191430a001d7672491fe9200deeb793149fe2cf9a029095a0f6919f02f2df502ea848a07baff0197b8bec9538a8d7
+EBUILD setuptools-rust-1.3.0.ebuild 3139 BLAKE2B c70e5d91bdb3cb5baf358e57941a9ecd625e3c4a48d5ea34affe8cd71b8eed16d7f414bce9eb1241a20b2d329b844e30431f990b47a5afc1c9fdb0aecab27a8d SHA512 e6fa3c7ffe3f7a4d633a665cb5afb93d808747ee49f3159550eab4aaba710483f3404b36d149644c46a22c4558d2cc6c4784739184afeab371e96dbd9e4de183
 MISC metadata.xml 476 BLAKE2B c8f0ef0779f0a4412a7d9b97e1bb03e3bfb3c031209f489a100b30402d99224014e379712989afd0cb76c85be301dcf9a51e21e8f9195262c5920dd1db0703d1 SHA512 af74755e9e8fb61cbded2dc3e63cd20f95393ef2650bed9f81e299f7759ae79c63b45df8048cd0fe25397ec7db10156be681fa5278606a20481f78d5279b815b
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
index cb38febad267..2f2c6bead2f2 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
@@ -104,6 +104,7 @@ RDEPEND="
 	virtual/rust
 	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
 	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 6077e120ea80..4e855bc68c68 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,5 +1,3 @@
-DIST setuptools_scm-6.4.1.tar.gz 61255 BLAKE2B 984b60de24e3090bfa7284ef91f40cfb8481cd9008d57012564e6631727dc1e1bb6820265a4fd3576581ce836224599bdd8ddef73446ddc3040e51ddad4b6140 SHA512 b4d16fc9f352d7fccf18853aee2e80c2bd048fe46753fe5c099542253cf30e0d087be6dfec846aed0b8182238494ef333363482dcd75781e285312a9f7547c11
 DIST setuptools_scm-6.4.2.tar.gz 61305 BLAKE2B e1b5191425cf5db8334761a6857b0bc39c547c167901cbdf8401af441c5941cd75744162417ff42dbac792ae867d71c7576c5e9e533fe8039a75954f4c2ba439 SHA512 224dfe543e8658e7d8b7272d18eb657fac1774a206d079d65bb6e22bfa68b35e618a31b3671418d095f8b7b492339ea18491a1711be3a87eeecf50c6703a4096
-EBUILD setuptools_scm-6.4.1.ebuild 1146 BLAKE2B 02c030f32a27bb50204b2dd3cd3ca25a88c26ac8544bac4fddf740a1973f34a43392a91868d1bd0f891cad6f9678aab022abb8497975cdbd5f1dc94721beb414 SHA512 3b54191ac55e49f0781d1e5ecb1cbf34e3db2a72d111ba2196d09bd3481231c42ef0c08f7a097b01307f8fed7e6f01b9d501712c3a1ef2c3341218ad2bcefd4b
 EBUILD setuptools_scm-6.4.2.ebuild 1186 BLAKE2B d99353bf7e44158acccf0f8fc1a33a72211c1f8fd735de1cb59cb6eb1927e510b6fd196e11f1a8a122f2529bd6399739fc8ccfb456b2d3868d0dcb1ff93d948b SHA512 903990604ea97b4fd412d041fdf9764dfafdde3c66ce1756d8c9efdc351811bd7bc2062acc65399db6ba3eea5cee7d8bd2e1ac3128bdaa0cc67002f7307dc498
 MISC metadata.xml 401 BLAKE2B 288e77f725debab548d96fa06738fb8262a93deb6df1ecc6c0a77e4a30cd65c4e76e38e86f8101112db95dd67a11ada6c0659e1ac13cf3c0e65dcce44e19bf8a SHA512 61b009eacedf191242659d6be6f62d17f9335674c651cfbdcc88abd074e320ddd79e1610de44e7c8105503f6d8d058ed5910f63b2e740492a982a69c52b30730
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
deleted file mode 100644
index f910e738e999..000000000000
--- a/dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# please keep this ebuild at EAPI 7 -- sys-apps/portage dep
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage versions by scm tags via setuptools"
-HOMEPAGE="
-	https://github.com/pypa/setuptools_scm/
-	https://pypi.org/project/setuptools-scm/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-
-RDEPEND="
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	!!<dev-python/setuptools_scm-2
-	test? (
-		>dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-vcs/git
-		!sparc? ( dev-vcs/mercurial )
-	)"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# fetching from the Internet
-	testing/test_regressions.py::test_pip_download
-	testing/test_setuptools_support.py
-)
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 7416c9522143..8f1fa429b083 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-5.0.0.tar.gz 22437 BLAKE2B 2ff55ff412b10fe6c431df5f1589deb9f6f1c3277ee1ac651513e302d31b4f7ff986bfc548c5fefd66775f0eb7aef11dd8f2821f0e50a2e76d9bfcfaa9c047bd SHA512 03ae478bc83d02416f57bb3f6afc9c80bcb2d4249f3169390ac139b88be94258463dee7744fdf0fd54a7cfe109795a110c43f2b81ffd8546601de274667d353d
-EBUILD smmap-5.0.0.ebuild 537 BLAKE2B 7fe2b7b87d23c7d906370bc6b4c75440330d569e9e2f9618428c6f680003ba2d6a0f9854b8b21afe5031282e147e4db7b1001402268496b908b54ad18ba10168 SHA512 4205a29034e13fc79bf167b3ed0c7b2551d82075d9772986006be64e3a771d2d57f614026de9c47b75bcfae6180b0bd7c844f02d0ae3f5a5539ce8ab532ad4ba
+EBUILD smmap-5.0.0.ebuild 543 BLAKE2B b37b7d2cb77b4684e754835de7ef96be8dc9a59b0b76e06ba1f9834451a325dc68736b09d4d6942a08b6365192d08d6a52ab0a2390865f86531ec5190e75e7ea SHA512 aae60fee8b86da0f74652f6b6b959e5f7a7309bfbe7e7ba9093fec69fef9cb4ecc9d84cf94935c808f1a914320af16bd2f291315d04c768100046dbf6d667381
 MISC metadata.xml 412 BLAKE2B d2178c6214bed671ee1ed50e3d2f098f8091af04f475867685a618df09f91d4340a28557d050ddc0849eea20e16662dccf62d015d565e1ed560e7c3144fbe0cb SHA512 57cfbc2aff045b2b9da66046c29d33523f0ba708861d98cf7c87e3363673dfa9b3d26bbddf794664faaf12c6efb38eb937299158199ab0fc989841cf5e4707fc
diff --git a/dev-python/smmap/smmap-5.0.0.ebuild b/dev-python/smmap/smmap-5.0.0.ebuild
index 62ee6811b907..b1d96a16fe66 100644
--- a/dev-python/smmap/smmap-5.0.0.ebuild
+++ b/dev-python/smmap/smmap-5.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx-tabs/Manifest b/dev-python/sphinx-tabs/Manifest
index 2abffbed2665..e5a9bd2976c7 100644
--- a/dev-python/sphinx-tabs/Manifest
+++ b/dev-python/sphinx-tabs/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-tabs-3.3.1.tar.gz 523932 BLAKE2B 8b941eb549ea8a10fcd329e880b8fa15742ba7903f4f9d6422335cf889c344a1fec8f16798c286b0c0f7561c128ea297153c31d0445b867e5e23f7960698d31a SHA512 d93ba1149a20711b52f8a76f22d212fdbb97349561f3e13b53873cdb4dba8f18f645e2d73ef378c2dde3d1c0c585c1402d73f4102da0e973be0c90a5912e7036
-EBUILD sphinx-tabs-3.3.1.ebuild 978 BLAKE2B 2e1a0ea7c9cec32d5252ed6f0a8c4c7f224494a41e1461e43a032000c4bb02ea97fb809830fe3a8eb35309d0d1392bc2a89602590e98605dd55962e88b1a7fb0 SHA512 ff824eccc7432a5b3ddc3b3baa8f0712ea41bb58d6189567953b729be912da41fe38ac7e1a2445d5e4bd6e017921d4691b64b13e14823918227a157e30564157
+EBUILD sphinx-tabs-3.3.1-r1.ebuild 1060 BLAKE2B 7fafee7e456db576410c3c1b11e0430c49c249869703477a694b0dd5cdbcbf2e7048955a6394248e267f9ea13b21d5951939b2dde5b92124159c8ca43f173e16 SHA512 19f543cd1b8df03b2153af99a72633ce617a784967821fd05a797f54bb3777a7a47626062732422bfc0af62235b8ed0f7547c172b45aafd7ce951c1666b6068c
 MISC metadata.xml 384 BLAKE2B 30013053128e39ca868d7643acbb5da9b87ba83f5fb6657a57dcee48d7322d72d7e7dd5e0d9e27a6b352c968a83f8e71b1c9ca56229fa5fe1eae0641d523a4e6 SHA512 0889534d054123371736de66f805503feab4737fc8b5cf7aa65bbd6f68528f4e871f7c540709b8c34b2d011bd89d889bb94c275e0900f9b3f3701e1628d7a9ee
diff --git a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
similarity index 86%
rename from dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
rename to dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
index 828e5557db8f..c396a7f60c23 100644
--- a/dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
+++ b/dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Tabbed views for Sphinx"
-HOMEPAGE="https://github.com/executablebooks/sphinx-tabs"
+HOMEPAGE="
+	https://github.com/executablebooks/sphinx-tabs/
+	https://pypi.org/project/sphinx-tabs/
+"
 SRC_URI="https://github.com/executablebooks/sphinx-tabs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -18,6 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x
 
 RDEPEND="
 	=dev-python/docutils-0.17*[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/sphinx[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 83d0b9925b78..be8d0a00df11 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,7 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c56284c278c3909d9de34a319b4d5afa2337133509c06f87e53d5ae488efd88b0f79542719e8870c137f160732c25189 SHA512 aed97412a49212856ea6ccb392c2aa210862ec25d49c4b81a7ff17bd2d0cfe4811d80f4047622f7b23473e31aad968c34098b590045c1d0592b19f4cb6ec8b3c
 DIST Sphinx-4.5.0.tar.gz 6698212 BLAKE2B e6c46d35492c3d3068c4f97e497d33973ca86b40934578804fcec901fa89d2c52b45a7546b835b873846dd16936c1bd34a7b053aec8206c688d974671155fd56 SHA512 b44d2a81ed67adaefe16a07ae0cf053b5e6c775023aaa6c57d7b3950f171deac410e8004f787b151c3c2fc350650aa69a4dc2dc7239d1fd3d351e5194617cb2c
+DIST Sphinx-5.0.0.tar.gz 6726986 BLAKE2B 95f2b85c7de6d900922730c3e431259e2333b3fe27e25cbe35e9584ccf1ac3442ca0949018e64ca8481e60f2298b46f6a77523a7a67e6aafe7492b62ff97aa70 SHA512 6b58427aa8a4d9e159f5b84366ab2193df5a9e940c9cb11b440dabd2c32dcdbadbb7eddbd9f6f8c53e577bf7bfb7c11f979835b5df75139b5c5315f88794871f
 EBUILD sphinx-4.5.0-r1.ebuild 4293 BLAKE2B 4bef871b4129b6048a45ca8bf8752a45543191caf84c18e80d826fc8d8c87c012cae76279ec25c9656b5e2e5f3801f15744e122d187514f1a41638efcca794b9 SHA512 331f455811a822b44a398eca904857fc6db2f91f447468029a855d87a5d72378caf9e504cd168511e24896425820c833c5cc10c6dfac005f952471f5808c1d80
+EBUILD sphinx-5.0.0.ebuild 4439 BLAKE2B 096d95482be20107c06a5ab670def8c87d26b605584a1a92dab725bad1d89d30bee93b9edaf40995f4511a30e3af837adbfdf9f9a5769199bbe729f11d9f038c SHA512 cd625abbd6f2dd91c7232eb3e8869b6d8946ff92e622d2f80df39b61e8eb0212f287c305a31c5e493c9c9c8257780010696b720bfeee8f38ac4f59e35ef2a1cd
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-5.0.0.ebuild b/dev-python/sphinx/sphinx-5.0.0.ebuild
new file mode 100644
index 000000000000..adceb91af590
--- /dev/null
+++ b/dev-python/sphinx/sphinx-5.0.0.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 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(+)"
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+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"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.19[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-4.4[${PYTHON_USEDEP}]
+	' python3_{8,9} pypy3)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	!dev-python/namespace-sphinxcontrib
+"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+		tests/test_build_linkcheck.py::test_linkcheck_exclude_documents
+		# TODO
+		tests/test_ext_autodoc_autoclass.py::test_classes
+		tests/test_ext_autodoc_autofunction.py::test_classes
+	)
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment
+		tests/test_util_inspect.py::test_isattributedescriptor
+		tests/test_util_typing.py::test_stringify_type_hints_pep_585
+	)
+
+	epytest
+}
diff --git a/dev-python/sphinx_rtd_theme/Manifest b/dev-python/sphinx_rtd_theme/Manifest
index 7dedfe65c352..c7745f3e0483 100644
--- a/dev-python/sphinx_rtd_theme/Manifest
+++ b/dev-python/sphinx_rtd_theme/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx_rtd_theme-1.0.0.tar.gz 2780623 BLAKE2B 02e72ddade0632423d21e512ab86fbdcc9f18eddbef328ba766f1b06a49c838808af4ee000e57c8f0f40112569b35c1b62c9c0c8853c237fd2ddb6de76d48a21 SHA512 06025445e1358c994bf0c15a382ec8f8f3f2114dfac19f340585a3660d91a279100c2d16ef665d9eb8d38b0e4ed264e96d3ac6814dd01b9430d2f8a0d8275178
+EBUILD sphinx_rtd_theme-1.0.0-r1.ebuild 969 BLAKE2B 124160ff6d970e45a5116b1b8d8495975e5e28677b3f14fec48e0fec934032a87493f77f4624a9f4521ff1fecac4f967a0a7cbfb8d5757d6085899d0a92dba49 SHA512 84612a0543d3340aa0953d5047d25cfb52260551fabef3e8a4b2a5806e6479e955b5b0628c17785e2c9f2a6c8d2239b4d8a5a15c567afd8adedde34ada829fa0
 EBUILD sphinx_rtd_theme-1.0.0.ebuild 812 BLAKE2B 8cf2a133756d55d376f506d84b302771aa5750a3080e7e68eacd0f292e6cb3dd36ecc0a7c2054c1393dde68d05622b264c0542a4e03ad7174db7fd68080c3c52 SHA512 6b56a0c7d3bd87a91d8d6e4b3a796938f51561b93c347bc1a7a1b200dec341867d8b07034f752de763d1fd21d7f6e0a408bc8f76cb87e2ba72ba391c6accd211
 MISC metadata.xml 412 BLAKE2B bed5105c13db0478a4b6129d634b8028b80cfb4e7969705ed0a693286d7f1645608ba6e6066cd3219c267c097bc1bd7d1ee13531d91d8cb4fdf6a5f107ef2252 SHA512 a0e7ce66d5f68145471452e49c173aaddcb502c9ba35af543240e5fbe9b24c0bd94ecf5782d5d81c23b3e63b80cf0cab4e39d279fb635f17275702e9a56bd5bc
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..0a497b47627c
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 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="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="
+	https://github.com/readthedocs/sphinx_rtd_theme/
+	https://pypi.org/project/sphinx-rtd-theme/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.6[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/readthedocs-sphinx-ext[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin docutils
+	sed -i -e '/docutils/s:<0.18::' setup.py || die
+	distutils-r1_src_prepare
+
+	# CI=1 disables rebuilding webpack that requires npm use
+	# yes, that surely makes sense
+	export CI=1
+}
diff --git a/dev-python/sphinxcontrib-log_cabinet/Manifest b/dev-python/sphinxcontrib-log_cabinet/Manifest
index 063af1ec41fe..193621182804 100644
--- a/dev-python/sphinxcontrib-log_cabinet/Manifest
+++ b/dev-python/sphinxcontrib-log_cabinet/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-log-cabinet-1.0.1.tar.gz 4072 BLAKE2B 6e237bee5ddcd13dfa0cf5151446a1d3924534009cf8c4b11c064dc454e0687ed03e9b09052332bf8c299d340a3522718704d65ac0fd7bd5eb22d18403b3b369 SHA512 c8529872c4ee783330738babd5027e64a813698ed38fbc693b23e65e5bfa2be815a7e6acfae42bbe003e542002d7d298ee446cab5dcebb3b65d2a25691bde18a
-EBUILD sphinxcontrib-log_cabinet-1.0.1-r1.ebuild 685 BLAKE2B 97d3585a03581dbec151d38f0f9fc3033d64f71f64609c864b5da038959912bc0311fc3a4f42925ea5e38bbeec2d3661aadd9ee314680ab2f18f040ddf8d0206 SHA512 5b668481bc76972371e8b9a801b91f435ba95d46c6249a701eb14135151f7a869800497c59a9e8c27394d19310c320c582709539a084424e3f241a678c87650e
+EBUILD sphinxcontrib-log_cabinet-1.0.1-r1.ebuild 735 BLAKE2B 76ad94cfff4be5e54cf62cad3aab1d00a7aa2d6b10c2d94489ae83989cdc5c4d301910e977ed87f4fc90a12fa441b816c49456311585b6844432908e88244dce SHA512 b5c085fc905b7ee31e9dac2f6cd35a672dfd244546ff630cd62e70528b727a28d8012cc968cdd1c7ce80e9f6ba95e20f6606e71c4211ee90c19ef89516d53739
 MISC metadata.xml 427 BLAKE2B 0eb6089bfd52a11b5ba031d7e6808283a373543844809bde35eab1a8320ab885531d516a09793c39993bebb03c1cd9bc6fb0bb40d2d425a0f213d9b6e5db76f6 SHA512 a58d1124d0153095c17bf1a1e002d7f3b25267abbe82b8fc7830fba79be8a01fbb83b708145672459f92b144fbcf71cc754f1990327feee1ce28dce48d32a8e9
diff --git a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
index c8ce6d85d88c..0434d7971d7d 100644
--- a/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+++ b/dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
 
 inherit distutils-r1
 
@@ -20,6 +20,10 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
+RDEPEND="
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
 python_compile() {
 	distutils-r1_python_compile
 	find "${BUILD_DIR}" -name '*.pth' -delete || die
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index f38fc748177a..36f75203c1dd 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,7 +1,9 @@
 DIST sphinxcontrib-spelling-7.3.2.tar.gz 51813 BLAKE2B 7c96f3b102fa33ea4d9e35100930a157200a1c01c51d8ec5145c45c5a24e3b5de35f6c4669177363c6098cb96275e10c39ff660c36d209cb6fa658e50cb8e169 SHA512 043a50f694366de4a3aedc24ca2ea7d89c85087097264f4e4fc860f68a3df5a67f19ec7172e4a67074377846d013d24edecd751885136c7263bc30b034c0f0e9
 DIST sphinxcontrib-spelling-7.3.3.tar.gz 51912 BLAKE2B 6a9bd90db2298beb78686252d555dd5e77d0c9042eb0986dd2eeab9e413a921c5f5f594c539c2cfe6315002c2f2892241b789b10976e634158f3ca1d8be1b627 SHA512 7406bd846c5eac507f8e4481ada4d0d725d0a3ad8cf2f8fd3328389128cf54091bb0e304dfe23fdf771a26d9103d2c028d2f7f29e1949ca59fcf43de5bac9cb1
 DIST sphinxcontrib-spelling-7.4.0.tar.gz 52966 BLAKE2B d0dbb6a5ae704f8cc8eaf0a73455b1ae044d68e34c723f1368899f7d7567c0e77a5279f333c710017ed00c53f7eb9a977f6a803b87b03fbf2b78e0be02bd1ac0 SHA512 27edbde0ad7d9321ceda9263e2139421578c48f82bad04c51359134ae89631ddfcf27ac5bdb1d012354e71020be373c8017550c5db73fdccb912d4ab10d223c8
+DIST sphinxcontrib-spelling-7.4.1.tar.gz 53664 BLAKE2B 66d46e9c3a9e66c56e90bbc97efe35517b53fe9f78d50790dc2f3cd14509b20b1c4374ce9230b029c65a91401f2ae8241ba6aecc4116e98849408a9dfe29811f SHA512 54672b1fdd6503dfc15edcbe5e9bcbfe2d67bbf88e44bd1b21ff7077dd3c64841e23eaf24f155075f6385dc17f71c853b583bed0eedc8387c87fe38613e7694b
 EBUILD sphinxcontrib-spelling-7.3.2-r1.ebuild 1026 BLAKE2B d498ef4a02c1d7be3e797489a6b307e0a8d9a63baef574de29ab383fe4c9fd46e934c89303bd3021ba5021d15a5819b281e49c9645e43d087b02170d45fc5dc9 SHA512 1e9b4b9eda19f5be2e233d2c6c660328eb4ee2856a28d069cea8f12043a14cb3c254de748f3b1da2010aa1dbfc7e2dc1aec94801c9e9a3e1996bf36d5af07f84
 EBUILD sphinxcontrib-spelling-7.3.3.ebuild 1033 BLAKE2B b9770b8ec9cf57bc0a9708a32d1d60d00bb649c5dd99f571a699720c6071def6a68ff4dbb09a1451f3b5d84ea1f9c4dd138aff83793d5e03a6b343bc34150e12 SHA512 8ac245f8c2512d7c0fcae2a1ec83cca009593c0262a7db421cb50e92edfbc30f99c4c0427278134fb2a4f190469c34a207abd2afa582d0c3b881f40bcc29da0e
 EBUILD sphinxcontrib-spelling-7.4.0.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
+EBUILD sphinxcontrib-spelling-7.4.1.ebuild 1033 BLAKE2B cb0f2310e25fe207a31b8889d842341efd0683a699f0a959f9f1a5962a52a6d658ffd56936951c1e540a8f0eccd6a7c3cb0e42c916303365fa26c9b32d152ec2 SHA512 140bbb72d466bd6766fd004bd537bdb18981f145e310c05b0ec318d735a4f557bf5061fab31d3ffb49031e7027f6bb4e5610a7f1bfdb6203ea9e619c15fe013d
 MISC metadata.xml 451 BLAKE2B fa659ac4949e98ca8c5a11a9b72ecba8a69ca94d95f8ab5f07c0d43d9684cd1cd21dbd63f42928a9920001904a6f75aa5663a3d924b02910c78b7894f6011722 SHA512 fead100dcd4c1d85e29260a60178e1b866ceb1f944c73fffcc051e2cfb1e96cc2e61bcf94379c0dcf84bed1349abaceb86ca9a89f2b1a8ddd384c14997d1a159
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.1.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.1.ebuild
new file mode 100644
index 000000000000..834977197c58
--- /dev/null
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 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="Sphinx spelling extension"
+HOMEPAGE="
+	https://github.com/sphinx-contrib/spelling/
+	https://pypi.org/project/sphinxcontrib-spelling/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		app-dicts/myspell-en
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# requires the git repo
+	tests/test_filter.py::test_contributors
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	distutils_write_namespace sphinxcontrib
+	rm -rf sphinxcontrib || die
+	epytest tests
+}
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 20e6fdef3973..1f1f11eb6f8d 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,7 @@
 DIST starlette-0.18.0.gh.tar.gz 408097 BLAKE2B ddc85690d9eb962a8d82544a1667d17316025330c8fda0c79dc21422399bcff01ccf5baf85eda7941f40aac5845d18fdcefaa23ba8ba442d30f0b9e194f7287c SHA512 521d39c1eec818250da3f2dc24cd2fb08393b76e6314a9bd5f3e520bdfa4652ae4ace5876b7e7f3a7ddc5540160e1086997a40b86a1b1bfd694c6aa1abde9106
 DIST starlette-0.20.0.gh.tar.gz 414497 BLAKE2B 47c6ef632a600bd18075c8ea65811ed18e08c285ed01cb34e5f74c00b2349430703ac041beacb35b91d941501001d2b93b79b777b403f5b6bef4682f6c13b02a SHA512 f28aff53732ec5950b2432ea644667d408e80cb4b51a177652a9bfe6731c6fa1208cba644fcaa84405bf51ef00f500a277c86e48f5446e2014369c1d1edda357
+DIST starlette-0.20.1.gh.tar.gz 416665 BLAKE2B 1b02f220dd6a8ebfdba405e3b9907030f006ec7ede43022fcef7911f5ac103da0eba16e7175e31e14529e64c711eac87b00c98534fbb18e784217ccca45f0c12 SHA512 4b10cf402bb3b3f96ec0bbb8e5fbd1e2abac4cbcf25a099bafad88fe02653d45e602e683f712251bb6dc230bc0d0754b2c960be2361239dc62e7e96b8b20ce6b
 EBUILD starlette-0.18.0.ebuild 1156 BLAKE2B 2c31219a2ec2d15ff2c2771e321aa36371d61f79eefb3bee6243bd22bbc27da479329cc36beaf4d4b231f7854808682c4885169660a5890b1aef7cd95175832e SHA512 f23e3ea3bbb5bb198c517195dee9bf6210b0dc714d5e86ffdb0831d15fd29b8be8a9be0b2700ac189bb37e1b2a61503893398f85f1026df71829c044a12a92e0
 EBUILD starlette-0.20.0.ebuild 1422 BLAKE2B b69ac68faf2c8a1df9c5c544cfc00258e639c193f5ec2a3211593e9ad22eacaed5fbb9bdd45057bea573257953fe92718dd934f8a0e7ec031155c2bbb161163d SHA512 ec6e970c536574dc59e46fb7cccf7a974514f0e2bb503a2daefb69a2604c9b9bcf798c525e834d8162e8a5b68a6527bb1fc45c4b9838138b45df1082edbcb77a
+EBUILD starlette-0.20.1.ebuild 1422 BLAKE2B b69ac68faf2c8a1df9c5c544cfc00258e639c193f5ec2a3211593e9ad22eacaed5fbb9bdd45057bea573257953fe92718dd934f8a0e7ec031155c2bbb161163d SHA512 ec6e970c536574dc59e46fb7cccf7a974514f0e2bb503a2daefb69a2604c9b9bcf798c525e834d8162e8a5b68a6527bb1fc45c4b9838138b45df1082edbcb77a
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.20.1.ebuild b/dev-python/starlette/starlette-0.20.1.ebuild
new file mode 100644
index 000000000000..2d29021cef28
--- /dev/null
+++ b/dev-python/starlette/starlette-0.20.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 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="The little ASGI framework that shines"
+HOMEPAGE="
+	https://www.starlette.io/
+	https://github.com/encode/starlette/
+	https://pypi.org/project/starlette/
+"
+SRC_URI="
+	https://github.com/encode/starlette/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	<dev-python/anyio-5[${PYTHON_USEDEP}]
+	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+# brotli needed for consistent test output
+BDEPEND="
+	test? (
+		|| (
+			dev-python/brotlicffi[${PYTHON_USEDEP}]
+			app-arch/brotli[python,${PYTHON_USEDEP}]
+		)
+		dev-python/trio[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Unpackaged 'databases' dependency
+	tests/test_database.py
+
+	# Unpackaged 'multipart' dependency
+	tests/test_formparsers.py
+)
+
+EPYTEST_DESELECT=(
+	# Unpackaged 'multipart' dependency
+	tests/test_requests.py::test_request_form_urlencoded
+)
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# fix accept-encoding, as new support was added with newer versions
+	sed -e '/accept-encoding/s/",/, br&/' -i tests/test_{websockets,requests}.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 529dfc7f1397..fdd77ccfd104 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.3.0.ebuild 510 BLAKE2B 33691fa546f94f42ca6640cd1eb9fc4ec539ecececb28b456fb51ab1b9f8a717fc8db74d8c29bb2749716118f05d2e6ce7f31a6d7f837d179bd705939cd0bcc9 SHA512 51d38f29728d673aac17c4fd0c645d6861848a97dacfe04c911cf55147a3737ebb8bf2f84f7ca6e6951d46f7cdc1261fe078b3577d80f3ddd4aa2f2cba5c945c
+EBUILD statsd-3.3.0.ebuild 517 BLAKE2B 0efdb8a2854f0a1db43a926d3f0c86e6821df7fca10ef366e8bb85a9090ca718c4133e92de05183c92bbfa5634e612c57e54a98805a27851b9bec94b2e84e408 SHA512 56b7bdd8721f2470badc40d09b9f9bed8db2c20121f16bfa1bd9f1e7dace7e2a517d9b1785276401d8f8f9f8a89abf2e68b9d158924c34c4ddd35579c47da984
 MISC metadata.xml 499 BLAKE2B 051f5627c5346348db815cc04cb6424767df8c5d0356db4d21a315f3f13acce3389d4f6015f185a24f302a4e768c135eab5255a453791df75f56c966d048ff02 SHA512 3f32abbd1912837281894a52edc7220d52e6324c5ff07c9800e0df86500ac41039225aa0c82b8fdc9d1923200fa4b2bce59ad6562e6d46aaeb4cf502338c18e8
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 32f619417936..98a4c9d68639 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index bb2cb3ba0c63..5c3c4a819f3b 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,3 +1,3 @@
 DIST statsmodels-0.13.2.tar.gz 17874260 BLAKE2B 93f7a308217ba938b3cd2e11d75e8f5ad19e2d4e6ab2abbea702143129bb53e7b9be54864375dbfec805624538bc73850357eb944d6c9a4c1252cc8a7606b904 SHA512 79d8dd63f667d4019e462d93e007a5ef8e11972fe35fb4d657931d6d68f3e35d29978a865682133db12fd6742f3362c2d77dfb5735c82ae454570388dd84d59a
 EBUILD statsmodels-0.13.2.ebuild 2165 BLAKE2B 0ee013541fc993d9bdff9e0ddfb756beedae828680a2f94793ca723571ccd59659123398c3cbe4bc5d497760dd0712a96393a056ee1aa8d9eb50481dbd4bad63 SHA512 58a1c0605040d7dd217fbfea2595d96e3363f7229bde53d137de5cb0a0624ab73053649fb447220596b2e147c00f7d9a965d4b0ae9f01ddab63f72a43394a0f2
-MISC metadata.xml 1344 BLAKE2B 9bf8a6aea4058c34598e450ed56d15e86830819dafe3fadb98c0e9a986a431319291cdd48d6734014f99008d1ee4a434244e142b2412dc49eac74e312ab51f60 SHA512 e87e712b79b666ea207584ef647fb61dc9572a0a4ef2a94e9dd4eae30bca8347d12635fb568483dbbebc483238cfaacea155e7d9711617d7eff4e4624e738ad1
+MISC metadata.xml 1356 BLAKE2B 0eca47b1f489954f26e6a726216f678ea5f9284ce52c00df51117d3414c549e9e43f5f307cff8fc17eb897f00abeb23cdeb4f70c2ec594860875464e0955f13a SHA512 a59057a6fad33b7dddbf7ad1b822934c9f12a45a829bea039f8773c5c778639aa3273d623ec78df653cfb2c4e88355f4a8cb809f4cb80b9dd3e7616cd06cc376
diff --git a/dev-python/statsmodels/metadata.xml b/dev-python/statsmodels/metadata.xml
index 468454c6be33..539db809506b 100644
--- a/dev-python/statsmodels/metadata.xml
+++ b/dev-python/statsmodels/metadata.xml
@@ -28,7 +28,7 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">statsmodels</remote-id>
-    <remote-id type="github">statsmodels</remote-id>
+    <remote-id type="github">statsmodels/statsmodels</remote-id>
     <remote-id type="sourceforge">statsmodels</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 607c0ce8ccec..9001c5079cce 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-3.2.1.tar.gz 118139 BLAKE2B dedb63767adfab26d837ce92762dcc44a482b1772aecbc31d12beb22f2c3c08368475cd110de7376f4df7fa8ce03c5b8e3b04436296ad4bd11c2fc3a4243695b SHA512 43187ca0d81e3b31e16ed60a1db561dc49c34f679594d11cad8cb0e658bf790af0b3d606bf99233a5767e2511675d3aedb6a476046d2f5483ffab05eaae393ed
-EBUILD stestr-3.2.1.ebuild 1100 BLAKE2B 9c2f52a83b48747d2fd7ca4cef49b1118387148eb505b8d01b97a45052b203f87efc762b464ee62cd242267400318eb9cbabe720ac0762d7e95e09391a7e019d SHA512 725ba212d16c6ad2ca71420b62f9beb75e3d390e3b1d6a5acb86c446ad2d314edbcfae4cde68845c6af9f53f2f2f83f157dbcd86e3d4ea140a274397f3a25685
+EBUILD stestr-3.2.1.ebuild 1107 BLAKE2B 23c6e2563af4069538c9053a08694f191ac65df0b0a50c3997c9ad17119b06b92245f5cf5892d21db42df0a3e3f693277a9601751a9e32530118ab66ecc9a0b5 SHA512 7949f06c03edea2e491216af9b72b88b11ec5053c6e77dea77c42911e40a485815c02c4ce7e9dbcb8805ed0fb3a7e5a7c6100bfd33a7360dd31ca59d05239afe
 MISC metadata.xml 640 BLAKE2B 2f6a2d6b549da3bdde1994544d2ed3a5a96ba08e1675394112643544d6afbb64162fd0bf8c72d39f1fbc43c3e120577e9d23506d9b51e1889308e670aa7d0775 SHA512 5fa6c1132aab62f72ff471ee8b551852e6ce84d66ca50c71f11c25f228b2c6de65e9d6dfcf464a7b826d9f0ce8768109cc4e475842c39bb7a6647fed662821a1
diff --git a/dev-python/stestr/stestr-3.2.1.ebuild b/dev-python/stestr/stestr-3.2.1.ebuild
index ed150fd8d1ef..68b581ac3aba 100644
--- a/dev-python/stestr/stestr-3.2.1.ebuild
+++ b/dev-python/stestr/stestr-3.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index fd86bcdac947..34b616a4189f 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,4 +1,4 @@
 DIST stevedore-3.4.0.tar.gz 513360 BLAKE2B 17030d1aa3cfb566e6f589120eeb6241a1bc0a0dbac0825c48fc96b16316348e7b5e87c6c7fe428faf46cb9e2abbb0da6465f404d5a1fb767fb07c5d8078e481 SHA512 a63897c65fe8deb1b900c4279ce38856863a2581f8e0dec3fc082d0bd6daa5f346bfc6af978b73c3ac24215953c1376a973b800ff8dbbdc1a99f52c99bed7d6d
-EBUILD stevedore-3.4.0-r1.ebuild 1360 BLAKE2B ce1968f2e14da88bee2d72453547a71040fc17e02ec58b7ce457a8b84ab8f8efae2a9d4da880e239e413fe92fd62c87c713878bbac712b81d82b8465d32af57a SHA512 b9ad962ae798bf58d41ef8360594ea13ae495b97ab69d64cfc2be705424738a17bce93e3ca0c30a9555957fad2979787fd8aaedbcf89d7765ca6c33347d51702
+EBUILD stevedore-3.4.0-r1.ebuild 1367 BLAKE2B 60f73859547850b87a45b3e9f3ff6a3483cb68355ebac38a053e2abd12001bb04a9c579b8a56563f1cc3b33c3306e7921a1b4d74cd2263ec47178ac45bba8fe6 SHA512 accbb7b3246c8c39f331624ce86cf326d6635ccdc40a496c0922e88be48f88e8b789ce457dc6fcdf20285df8833b27051b5c534133333921f532168769a96dbe
 EBUILD stevedore-3.4.0.ebuild 1154 BLAKE2B af00e453cafa1f232d71c06d6d3c871fb4f235d9927b0933c3b96bdb4364ffd1621a481a3c953f11c23f5da27b92fd32c94d6638497e7f4dbbc3a8417de9f662 SHA512 7589411896dff5c6364d6bd649a8d78fb8466e9c3f55714e2394334f62cdd4df88d01dcb371db9bcb31ca51856c38384e11931357c8bb05724e9162f35608c69
 MISC metadata.xml 522 BLAKE2B 3ed51cb439d8350ff3df20a20a803c14bb11c9e0e5b15bd661f5780513f88a38f8a4d80703f6a7764488aa721f0fbbbf9a25d4fccb0f9916423198daa539bb69 SHA512 d08e11153dbb878de8f93d7a8293ddf2469adad8a2c436ef652f5c7cda7696a91f914260b841b3e64b3aab37d70dc76b1c369a08b9ef4bbd4f7c33c6a0ece690
diff --git a/dev-python/stevedore/stevedore-3.4.0-r1.ebuild b/dev-python/stevedore/stevedore-3.4.0-r1.ebuild
index 28380f084417..1f6940496911 100644
--- a/dev-python/stevedore/stevedore-3.4.0-r1.ebuild
+++ b/dev-python/stevedore/stevedore-3.4.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
diff --git a/dev-python/tagpy/Manifest b/dev-python/tagpy/Manifest
index a58180f3263d..70c2b71ba2f3 100644
--- a/dev-python/tagpy/Manifest
+++ b/dev-python/tagpy/Manifest
@@ -2,4 +2,5 @@ AUX tagpy-2018.1-readme.rst 725 BLAKE2B f40dbe6ab4f03fe0a6141a03ae6f504d202a5c97
 AUX tagpy-2018.1-taglib-1.8.patch 642 BLAKE2B 45c190b621dda7368583c1ab92a01f08fb84d83666953caa5f05c89803db16dc8cd1668e3b891c757c916d27439c4c3143a8a8a2115ad89a8b2f1806dc4a80c9 SHA512 6a3af752fdfd12f6c5f6e52019f3d4f322b9dc3595e810e93ed43e680c1a2f7728efeb8d1180473ca3dfaa7f548d437c32f0a306882ad7f7072388f57ea42caf
 DIST tagpy-2018.1.tar.gz 145501 BLAKE2B acdda6789dae000ba2f664e4a5582f6218f312bed20ec81c4ea54f358bec70d41aceed6704f392a7a32c39d263da81f9c832922942fa179e1865e423dcf28bcf SHA512 2010baa919adadc9fc231deeb093953622ec54c8b6011e2d6a3489b086032de0a71cc26f42439435f26bd7a1ff069e3944dafc61217abe6ea5e81b01b9d18c50
 EBUILD tagpy-2018.1-r2.ebuild 1189 BLAKE2B fc61427e82816e54bf27e1514d5e5b2ce76ee19873a0f3d45a4ee3ae1973d0772682111b15049c7bff3c5fb8778535429de4dc4dca3e394b997a394077319dd8 SHA512 303087d49160c8c62e56d4a27d2f2c403977b28e02327d750294724753c2db5236be59bcafd3f86a222c991b7d54f861a85176dc190845b58fed063afdb59de0
+EBUILD tagpy-2018.1-r3.ebuild 1105 BLAKE2B 01df4e13dcd0c26b0fcb5cc6437b2a3a4f3074d5ece915b6015b0158fba74e80cd65acc2e01b35dd74a04f9563b6589b2b0d1aad321825d22809ba2f097ad852 SHA512 04936165c2e9efab3e36e7ad0ea5bad40df0bf8ef8c7def235a370cc908a4cb3f0c2bdb4c85959579bfeb05858a5662acb626dd8b68acf63299ad90a7b3b0d20
 MISC metadata.xml 548 BLAKE2B 09356a368b0d4c31f10b55afd41560e273fcf85559d7613581be149d41692c48a5441be38f783cacf241925314e4c808309cb68569d8d78d130e8fce7fe539c3 SHA512 39098fc39a9f32b45b95410cb406e0a755dc8d3906168e356253ac14d35fb06a7d68c5ca37f63516d7803442986e4c8e61831f3721e52dd094374dca12d331a0
diff --git a/dev-python/tagpy/tagpy-2018.1-r3.ebuild b/dev-python/tagpy/tagpy-2018.1-r3.ebuild
new file mode 100644
index 000000000000..fdcb87a4585e
--- /dev/null
+++ b/dev-python/tagpy/tagpy-2018.1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit edo distutils-r1
+
+DESCRIPTION="Python Bindings for TagLib"
+HOMEPAGE="
+	https://mathema.tician.de//software/tagpy
+	https://pypi.org/project/tagpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-libs/boost-1.70:=[python,threads(+),${PYTHON_USEDEP}]
+	>=media-libs/taglib-1.8"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-taglib-1.8.patch )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	cp "${FILESDIR}"/${P}-readme.rst README.rst || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	local boostpy_ver="${EPYTHON#python}"
+
+	edo "${EPYTHON}" configure.py \
+		--taglib-inc-dir="${ESYSROOT}"/usr/include/taglib \
+		--boost-python-libname="boost_python${boostpy_ver/\.}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r test/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tcolorpy/Manifest b/dev-python/tcolorpy/Manifest
index 41c2030b1482..b0a86a843718 100644
--- a/dev-python/tcolorpy/Manifest
+++ b/dev-python/tcolorpy/Manifest
@@ -1,3 +1,3 @@
 DIST tcolorpy-0.1.2.tar.gz 11024 BLAKE2B 7d2b8e525f507f2061c7401e452e06b76e3f85db1611a579b6f80d3a781c640b0379c22da85b4ec5878bf9762e1c471303e5bf79f51393c3a0ae8ff8fa3bcd51 SHA512 e5a0b26439291d0c7a045cf92818ad50a5c9fcf5d31e8140231ce8bb4c52a1ce163d125a2094e3738a6a14d29b99036ee7a9d5014ea8578f09307d4a4e5674e8
-EBUILD tcolorpy-0.1.2.ebuild 424 BLAKE2B d5ebf890d4695af95a43cf8bb910f4b105e93bcc4b40f7d8b0893b6bb158d02aa72775c4312cc21182df51c6b91bf3faa141fb9462c5bf0d3d7492dc8b5ef2f5 SHA512 33a7423c6884b681368eea52331f705535070fcb355611c250e15a458e2748c462c4b5568ad816cbcdc198861b764a9238e8cdc9a26237175c6fc441f8786b08
+EBUILD tcolorpy-0.1.2.ebuild 425 BLAKE2B b4aa1046165e33d485ca11fc5692b6e5851220949460aac4117050b536fe74445d9f7b73a8c40d7a75720cdabcb87ee12c8e155357e9c413aa7c1aafaef0e518 SHA512 57dbe0ab1fabf5331c28cdeb9bc4d0db097a772f022ec59e060b08cd862c571b1d6366c81e36b439977ee8bd908f1427b7b73fb79729b6886fec93b8639ff8f6
 MISC metadata.xml 372 BLAKE2B 83814ee2a7eb02f03e516b528f52d482d8ebf6d95923c03cf527a797f66f71a22de1f498578e1288251cf461d1b0f81f1c069a734e4b09dbd3b87ad82a5c7cb5 SHA512 ab4767ee7d098a9d99ad8a806b2079ddced2dbb650d5e9b5cc1762cb20ffadba4807524a05ae19acc3a469601420562ce1b31cccf966550869d4fd79360a7689
diff --git a/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild b/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
index 4e46411a6e05..4913643d8c01 100644
--- a/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
+++ b/dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="tcolopy is a Python library to apply true color for terminal text"
+DESCRIPTION="tcolorpy is a Python library to apply true color for terminal text"
 HOMEPAGE="https://github.com/thombashi/tcolorpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/tempest/Manifest b/dev-python/tempest/Manifest
index befcfb8cd863..d31fdfcc11ed 100644
--- a/dev-python/tempest/Manifest
+++ b/dev-python/tempest/Manifest
@@ -1,3 +1,3 @@
 DIST tempest-30.1.0.tar.gz 1112219 BLAKE2B 864dbd01a843b9c480656788a3a673ea6c089af8bf67e66837fdb77ee46eef00f2caed3ee08722b113db45d1e39fee167dcb344676543ec82fe5f022ae8c713d SHA512 3c4469d5ab590fe2185dbe77cc1ca1179022b75b4da9f2fe0d43956b14598d56328dd4e62e8445197b25f93017c812edd75cb9fef2d81ae183aea478fd817b15
-EBUILD tempest-30.1.0.ebuild 2092 BLAKE2B e858fcb5bb0fc4c433d2f681f92e9e4331f2c4fd45346044735327b4a1dd10f57e7ed0425d6b4ef6af46dc85285411a23ece9f9a8212e6cd23d5041b276e8a91 SHA512 eb9d5d336d0c982aecfc3dff6dcf4d412c74c4e964776dd9c6a219258efd36a83fea45089c4c5d6eeac100ec6948e07f59035c2508471d34f2355cb10369f71b
+EBUILD tempest-30.1.0.ebuild 2099 BLAKE2B d827660f46e8465685aa5f43318144f63a58f3dc1a953c96eda99ab04e1389bee8c831fd5ca3e221e82ac73d272a0d001dbcab628b7d27d5a672a700b8b1145e SHA512 b3ce789584d6cb181841b6c03dad3ffe6342bc4c87819060fe954e3eda0b2fd4852d6ddb865312b42e77e2a73e422428f8da7cdd6f7b07e099c758b34d488655
 MISC metadata.xml 402 BLAKE2B 9a28d185d29e8844299c1f6276b80759cb0ba7d0b9de14f70cb92f4bd69a4604aaffb7ed0cd0e65764099007a87de3e15c519dbdbc8a247d8ffe884613c7af5e SHA512 e9ef089f055cb4d6bb527f58d2e386d7796b2df34a8bb850c90f86cb98d08259b5ecd5e785389cfa6351f1319502c6822e3cf6a6250ac7dcd1838923b3deac87
diff --git a/dev-python/tempest/tempest-30.1.0.ebuild b/dev-python/tempest/tempest-30.1.0.ebuild
index 7fe190ad399d..4aba0be12cb9 100644
--- a/dev-python/tempest/tempest-30.1.0.ebuild
+++ b/dev-python/tempest/tempest-30.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index 16d1a5f14cb3..21130e713ab6 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,4 +1,4 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1-r1.ebuild 964 BLAKE2B f8245d51c92e1d98c2d2dd862a74bbb5ac9ca1de918cdaa45784c64edd536426bbd81c728ca970047e53468d318ad3274c0e7ce5cb9a504345fc4a57d1a10ab8 SHA512 69099e9dc4c9aea7af83a02fa79deb7aec2d98d29cc447891ec423d24ded6f938606c53c1d447a575af0e50b7fc8f47c30b1631f1f1542d1f066454c5edf5b68
+EBUILD testresources-2.0.1-r2.ebuild 1010 BLAKE2B 62707f83ee768d019a0d93630f1cfc4211d4d585d1969b19c7a1691ac37bfb604421f13a63658d243b9e3fa56cfd4b2870f06acab378f8fbb64c1ea9095b3b48 SHA512 73f55aa69bef4a0e76e9531421f35946cc6a479912ff5083b51e14e133bfa5d619701d3a6e6c933d9cf1e279d462cd111699cb6e2f0256118adcb32549e19e85
 EBUILD testresources-2.0.1.ebuild 821 BLAKE2B 4071197715cc11cbe986bd6fbcd80c1a9b1239a6cb642078aa5565ad86709bc749caa48e453958e89ba604a46b551a7ade6f0e02163534ad073dfbc9cce50414 SHA512 515250b688ab2aa632c666529ee80f9028c70e60a78de1d891c73ac0ae1baed73dd748af608d66ff00ff7031fce8492320777363cd86d42d195d9448ef71179a
 MISC metadata.xml 940 BLAKE2B 482d6fa661c25db8138eec79df831557f634853374a3bb6080adf0486aa8043092d716cb4fabd3e8cba505afdebf183d83cbd622f2be4d88a0d944e188aa5fcd SHA512 d009ebb49c2d1a28e22edc86aab7c2be5c8ca00261aa3076999680656c68a693be7b953d6d0b32b7213f08d2f3122113d89d50b43e68eb3000136c9cabb1ed51
diff --git a/dev-python/testresources/testresources-2.0.1-r1.ebuild b/dev-python/testresources/testresources-2.0.1-r2.ebuild
similarity index 95%
rename from dev-python/testresources/testresources-2.0.1-r1.ebuild
rename to dev-python/testresources/testresources-2.0.1-r2.ebuild
index 2805cb3bc836..b30a3c662741 100644
--- a/dev-python/testresources/testresources-2.0.1-r1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1-r2.ebuild
@@ -20,6 +20,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/pbr[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 2686def2c6b9..548f85ed3a74 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,4 +1,4 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
 EBUILD testscenarios-0.5.0-r1.ebuild 765 BLAKE2B e55ea9b94767db3614a172f49b10746adaabfdb74dc1114e31cd8e9fa51a7496cb1594401ce17f2fca03a47b5d8f4199b025ff7572c8855aa531e8d7624721b6 SHA512 a5a732ca6d62fbc4fbc5dffbbb94b1e1530d9072c3ed6676d2dbef0d30fed4bcba91275e036365eb4d87a0107cdf9d5554e94c64e111d8741389f2c4d3d6ad31
-EBUILD testscenarios-0.5.0-r2.ebuild 886 BLAKE2B 648989a103999bd6fd4bda615d09e1928ebd2361c6dbbc7dedbbcc78b1cf58b7a59aa1f64d6dbf59472a4b92bdbb2952cef05cbe1b719defc8ec13924d234e51 SHA512 9b85efdda39cd6a8f73d1aa359fec244c9fa62314644fa0eb038297f48faab239ce7d685351b539c0f63f7bf217165d164aae590788d6e855739466d8430b9da
+EBUILD testscenarios-0.5.0-r3.ebuild 927 BLAKE2B 3b7801c50db75add44a5a2c6cc9769af0de932f5402b726beb763c4266e59b275fd807726c82edd3e3399fdf5285cc6f111ad0ac2a6de3cc188a84baf3552058 SHA512 17040daa11996825953577e9e1156996959bd15f23e506f24b963d17f875fcb9024b93a8d2c2119792329f170bdf081e8b04f30bb6f5fd622dfa2f2a13cf6840
 MISC metadata.xml 980 BLAKE2B 2cc14564ee68d2ae042db7ec07616d1b7dc2b8355183c81111c965e73be351cfd49f8c23e1d60828b714d308297134e712be0cc0e5b1bb6b98eacd35ac753bdc SHA512 6de28a56b63cf6d191c6875cfc1e3cea247bb3ebfa7fc4b8bc19283317bf01f9451b08f175d30eb3e07f225932a3eebae7dd4f85d319472b77e85666e4940f24
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r2.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
similarity index 95%
rename from dev-python/testscenarios/testscenarios-0.5.0-r2.ebuild
rename to dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
index 958c00507714..c423d0812bf4 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r2.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
@@ -22,6 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 
 RDEPEND="
 	dev-python/testtools[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.11[${PYTHON_USEDEP}]
 "
 
 # using pytest for tests since unittest loader fails with py3.5+
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 600aaa3a312b..3d8559bb505b 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,9 +1,7 @@
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
-DIST typed_ast-1.5.2.tar.gz 252310 BLAKE2B c36ab31e4c266de38a07935fc72ece62087bc52a6ebde401f9b2dcc641af064828572fa6e903dbdfb0c573ced10686b8dba995d316a5f7a7ee68efd3a4e9520c SHA512 7da72fc0c4fcb74cb41914765baea5c7f52b1e8a5c58883877e702765be59d3dd8c7f73bd5759a65781d04fdecbcf46160ff4402578a92685f25163e12b93558
 DIST typed_ast-1.5.3.tar.gz 252510 BLAKE2B e258b6c931d31a528091be2e5f7f9bf55f7fa48a14221a95e77924c18879480a34cd8293f9c1125810a43ab001195da2b36637aaee2c9b895b346cc94cab6577 SHA512 481fffc79d99f1f7c0009a9a4f9151745d17269827ea6306f35a015dc9e4cc3d85068948e157076fecff87d9301c18f637edfe7f26d63779ccfe38bf10105969
 DIST typed_ast-1.5.4.tar.gz 252491 BLAKE2B 07a97a881cd4c015897ca85e0b46acd6f63c48dbc69f4d73ad5e3bfd42b1b995a614d97b81c8d21c8d5dcbdddc838bffde033e11b55d866fa8e8db0aa8048731 SHA512 1ff27316d8e07219ad5b3744c167b7a7dfebb992f8ebc4623bf510f8b5d2b939cc9f659428e3228a42cdec0e63215cca973458aa914f2efdc59d5f33c150e153
 EBUILD typed-ast-1.4.3.ebuild 600 BLAKE2B c5bf2d281d2678b0b8c84377ed94fb030c27d5458e6d1de25bf7d6cec22fae095cc3c3177b2f50e6d8c3c3858f75a90108ff791804e4836699f5b2b5202935c0 SHA512 125c63b109886b55c4d6d233bda6dd863a01a35d7023430c75db2a2a4298436826776c7550bc2a1d5a9c814428872fd7a8676d3fa36bdac9ab38326c9b07313b
-EBUILD typed-ast-1.5.2.ebuild 619 BLAKE2B 740331d8b7198c64dccae7cd3d48ed4e10979b4f87d945d5183cec613340a6a99cb169ad31cc545bac24569f58047a8aee497c342ecac62e6f6e351bcc116b2c SHA512 53a94a3f717298e65713f511536422f600065862481b31a6524a78253b932a6a5f2970f8d3bf06ef4e055e39639671549b95bb19754f6b33d5d59f9c580c6ed5
-EBUILD typed-ast-1.5.3.ebuild 629 BLAKE2B 265b0339455adfefb44c6609f74d3ddee3d81cabe30ab02d0734cc3954bfaa2e3ba4f3b0f070bf7c873e326f8eb327659f798b2235894217aba36850202bbc1c SHA512 d8b1ef0eee002b7c64611c3aeb21af687cc455d785a79d4d57ad8fc84bd2bf013a36892ae694b50eff987a24ae01340a0912e50c71f9384e5621ad22d47a354e
+EBUILD typed-ast-1.5.3.ebuild 625 BLAKE2B 9a7bd47aecbde5ebb84d91349f231f8f7b62bddb9d57a6ddde6b9fe42d9f3a8c7af8ddd2513a7bfbe3ec0e33ed90482dd34e47436f3440d253d500d0e80419c0 SHA512 bc5ae13d95f9ddb07d856a9e9bf2bf1eb2f1c307bd06b8558386faaca33ffedb62211da0548828bd734544b3cd35995cdf05284633eb46c78d03b84891d6b9c3
 EBUILD typed-ast-1.5.4.ebuild 639 BLAKE2B 1f351f99e9cb913c8eea8a56e3bbd60d02b021a6fe604b1246a96c8b65100ca3b64cbd3e63d5df871efe4e7e31db34a02a503f4c6137e9e6ef903fe1d7fd452b SHA512 125e9d1d4c9d8b6572a0c5fb30c15daad48895bbe46e85269cc1d6b0d8ce93d75d40a07a943d17f351588b124506e2b83e2a7aed185923157d18bcaf7ec866f5
 MISC metadata.xml 369 BLAKE2B b92a11c32ddd0afacac11717dacfa997976da54d30c6330873eaf36cf1f9a748ab089b5e5d586302abe57d1579054df38a036cbd8534779f7daa59ed92e7bdae SHA512 fc1961ab74c1a975ba3423568be93e6bff1358cb29e3e7209043d890e1d6a9d8659b21a6a5d5c04f42377e608d547c55d008d77811d37bf46c6ccb44d5b931c0
diff --git a/dev-python/typed-ast/typed-ast-1.5.2.ebuild b/dev-python/typed-ast/typed-ast-1.5.2.ebuild
deleted file mode 100644
index 2699fccee1a8..000000000000
--- a/dev-python/typed-ast/typed-ast-1.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/typed-ast/typed-ast-1.5.3.ebuild b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
index 2699c803396a..adf944bfa1c6 100644
--- a/dev-python/typed-ast/typed-ast-1.5.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.5.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/versioningit/Manifest b/dev-python/versioningit/Manifest
new file mode 100644
index 000000000000..7e3cd04b55a5
--- /dev/null
+++ b/dev-python/versioningit/Manifest
@@ -0,0 +1,3 @@
+DIST versioningit-1.1.1.tar.gz 678420 BLAKE2B 9829214f1f8bcea1733926667bac222c5cf34a03808f96b13389d78453da4613b4b6aeee79d0d756a70aae473496f44d4d191da65f50474d7c8222cae05153ea SHA512 4bcb4253198207d5dbb99358e823cd404f98fd9f265e0801c92a2f220241637cffa8bfc8184a1754b45353423e1bde1a5e5019876acce9536ad658289a638852
+EBUILD versioningit-1.1.1.ebuild 855 BLAKE2B 81b0e19308219a38aa9a411aba70e4ecf2d97205994c4b24fd6e75e9e11c2b96ad0e2a510c8b2c9b614a969cd646464b4f01c284319760135b6dfd25cb79bcf4 SHA512 655a71151a3d06658dfc4330ebbbb2d7d60f63cad6cf2a97e9941e9861a270d576ca662ebcf994e123b3abf9cd8a84e47c0f908b1248d85a8eaf9f25a03fc130
+MISC metadata.xml 400 BLAKE2B 96934adb9ade5b51537765da51d530a644f87328688415cfd5b239048adede18db1ec7cbb2a234cc2e28fea368aa9c815176bb22262c9053fdc2c85c6c6e3f56 SHA512 9070b850fff35058a11cc7504bbc5fbef17cc9154df5419a64bae10fd3cb160a043ffd0880fc3c5054bd1d2eb4891bcbf5764c56f2441ab79366336caf91e379
diff --git a/dev-java/microba/metadata.xml b/dev-python/versioningit/metadata.xml
similarity index 52%
rename from dev-java/microba/metadata.xml
rename to dev-python/versioningit/metadata.xml
index 64b71aea2968..edc0e0bb524d 100644
--- a/dev-java/microba/metadata.xml
+++ b/dev-python/versioningit/metadata.xml
@@ -2,11 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
-		<remote-id type="sourceforge">microba</remote-id>
-		<remote-id type="github">tdbear/microba</remote-id>
+		<remote-id type="github">jwodder/versioningit</remote-id>
+		<remote-id type="pypi">versioningit</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/versioningit/versioningit-1.1.1.ebuild b/dev-python/versioningit/versioningit-1.1.1.ebuild
new file mode 100644
index 000000000000..1a67e5bd2f22
--- /dev/null
+++ b/dev-python/versioningit/versioningit-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 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="versioningit is a setuptools plugin for versioning based on git tags"
+HOMEPAGE="
+	https://pypi.org/project/versioningit/
+	https://github.com/jwodder/versioningit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
+BDEPEND="test? (
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+EPYTEST_IGNORE=(
+	# Tries to do wheel/pip installs
+	test/test_end2end.py
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i \
+		-e '/--cov/d' \
+		-e '/-cov-/d' \
+		tox.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 587d78a3146c..9340ac057e86 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,4 +1,4 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.13.1.gh.tar.gz 42466 BLAKE2B ee66abe131d5ed6f49fb6ecc0227c6108617cadc694132826c88abf33b83538db1c97d38451983d2fb1191d5e7066491194fb01399e920b21a9e75d54df2d3fa SHA512 874960bdd3fce213e46f8017fbc56ede02133de6f8cb439d810db38ca06d9c5fcf5496150ef4c73fd19d9e06489ba08a510fd96aa16b8825564a52fd01cc3f4f
-EBUILD voluptuous-0.13.1-r1.ebuild 616 BLAKE2B e1d5f1caaaaa816b9548df19191b7f1bdb1be1d2d81988c36cca4673bd661b815dfbdefbc72fdf59a6dc6f04f42ab542faeb41c606e70cd26fe7131078e7c500 SHA512 4ef6f8d7c3758672ed751ec9747fca4f8829f03109512a60550cc736be410e15da4f33d043bfd0e5da178d6e8163a86a57af28e665582a0676f8b00af38d9584
+EBUILD voluptuous-0.13.1-r1.ebuild 623 BLAKE2B ff81e27102c870c84438827a1bd0f5788ee48909f48b12c6345f8c23ed132512fe3772a2e7ba1476db9819c3603fe61f8228bcea0e0851b3fcb5de3d1472fc27 SHA512 738d972f4d78210910eba56debc5716b02ab4cea4d5bc3b9355e33742de55e7595e44a75a412536419aa93ec4c1812833932ac0668e87bdac451fb8d64112d1a
 MISC metadata.xml 716 BLAKE2B 1298492f8a89ce4babc23481dc56da06e4d9007546ed2804fdf42906f6d90d3b1327ee2d54724fa3621a387429544931d30a0334312a68a17edaeba735c9d7b8 SHA512 80636ea29257b1ff070427dc759f9d0abf02ba2037676725627308c69a1e9bc49353c09507523a739c3f07a4cb284e2df76d3935f4f9dadb64005ad7204ddf60
diff --git a/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
index 6f9a84eb0924..28f3950346b5 100644
--- a/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch
diff --git a/dev-python/warlock/Manifest b/dev-python/warlock/Manifest
index a7081c529c1c..df69b50734fc 100644
--- a/dev-python/warlock/Manifest
+++ b/dev-python/warlock/Manifest
@@ -1,3 +1,3 @@
 DIST warlock-1.3.3.gh.tar.gz 11147 BLAKE2B 1281348076500315c5aa105691b8e5a50ccf2ba79335fb8581a0b89bfc96bb3076a797c4ebe011f6c347667a0971bbbdd2b1bf413d0692ae5977216c524cbee0 SHA512 8a9135a17ccc0d0939ad98eee16100ec68b911d672b3af549f7629edcd6e08129f9e4ab707082593274fc896bc405ab6d6ba9e4bf6fc40b8522ec99327c983ec
-EBUILD warlock-1.3.3-r3.ebuild 1078 BLAKE2B 7576aa9dfd4f451836217e93294b753ca3befdb51008d1c0143e66ed5b591e62391b15d1261a71d890b2d1c0cd0bcd2f8c4d87f55b9f9973c4e5bd657624b9b9 SHA512 3860477675b907dbdbe2fa217e801e7a8678a6f5880d3a981e0752009bf81133397bb020398cee248fcef52ad9542df953cdd215273554e13fc2f2491e55cca7
+EBUILD warlock-1.3.3-r3.ebuild 1085 BLAKE2B ae84d28e0f3a4334bde91a9e31ef85ec10da2c7d99ffdc5d4a4fc007096bc79e90840af0718c0fc834b7ded2e59b2d55d767fa3ce1df88142267aabc2e734e1a SHA512 fed7734ca9fd360c511b926889e15f84b2e16255b46026ea1b6253d538718e154a2b0f0f897371cbfa15150c5aa6800119e7b9bcfe59a6f6e1304a895fd5d809
 MISC metadata.xml 482 BLAKE2B 28941971c8e9ae4f5d1685ac1b9e53497235a62180a4c18093b54c576211b39f3048433d317ffb587a1335042b3894b8bee32cd903a97eee249c4864cfdec357 SHA512 99840c6ff45fdd5a4cb6a06a9322cfcd167b89a540d092fd75851ceb5a03ebce26c7c4adf702b41cc209eb1efd924aab50809c2840799fbb711578185cfbd61b
diff --git a/dev-python/warlock/warlock-1.3.3-r3.ebuild b/dev-python/warlock/warlock-1.3.3-r3.ebuild
index 7949151efc2d..6d98dc033bee 100644
--- a/dev-python/warlock/warlock-1.3.3-r3.ebuild
+++ b/dev-python/warlock/warlock-1.3.3-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/bcwaldon/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 58dc4c8256ab..0c54d7e515a8 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -2,6 +2,6 @@ AUX wstools-0.4.8-fix-py3.10.patch 932 BLAKE2B 48d67a79f12a35fd93e5e493f3f488055
 AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.10.gh.tar.gz 204095 BLAKE2B 8d7652729846e991d84bf3c2b64394bf3954ae69cb1ed49ea7822432b965e5cfabd02f8d4ba7caa0cbf9df57def062b085aae75c5d4af1f9be078e2fd8031e0d SHA512 1acd8e62d71c7d330f1e953a0da1956291c5dfb25ff9b8b8799c83feaa4230e384955735b131bab7b430b92ae6c18498927d416d2d1e11fb5c5dad93417c671a
 DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
-EBUILD wstools-0.4.10.ebuild 1106 BLAKE2B 00c60eb55112619653db53de4b4e6436f69d9096ddc803d03e2fe9b1b0160b76902735045046232e77920f43cf37b4deb9370360637716bc2c408ce9d7609109 SHA512 0a1027f9d3dc7c197ec2cbdb70de6116db47a93b0f3475436d7b216e6783c4ef64bd2f50367b40f519170e6848de2581369ac9a6d4fbd731e2c6290baab466fa
+EBUILD wstools-0.4.10-r1.ebuild 1148 BLAKE2B 22e7cd4f8065101aba13914e6411a8d7a138f0e5b7639c435015a48d6272e4e2862a7d9a346a21a2506eac68a9f242201b0f33d27682309bad9cf94d6c9335af SHA512 1dd168025b59d4a134cf672fb1a43f1ada6c5ce87aed7626ab9fdec0d4cbc70705ad259c11c98c477808eaaa39c905b2b2e3a50063af60a72f7dca71d69414a2
 EBUILD wstools-0.4.8.ebuild 822 BLAKE2B bf2c734584ec582d4e8e3f99ded708defd575affbeb2b3d604d8c6132994b697a1b3c751d19e5093c0190a958b193f2330cfe5fd99b1a14f11a4bd80754b142c SHA512 8c369002ff292e187ed5a1978ae248bbbf5871cf0941b0e0bf38d81740e86c90d6caed400aa5465e1561ab41be1d204052bd4d36948fb3171da36ad9bdc31be2
 MISC metadata.xml 406 BLAKE2B c08ab496c34bba9eb3e7d29283823fa8b2898921e12026d32bbf137df9f0a7aa0d55c2a31c1c28770472db5b0f94fc3fe37adcaffc1d6879d9272ec7c1ea60c5 SHA512 53227904b908d921e3f89ae8955e1334838436058bee7a1b286844b6fd0bf6290fc4e197e268725be7c5e075f07da7303d652b2729374ccdf108982a52647c32
diff --git a/dev-python/wstools/wstools-0.4.10.ebuild b/dev-python/wstools/wstools-0.4.10-r1.ebuild
similarity index 96%
rename from dev-python/wstools/wstools-0.4.10.ebuild
rename to dev-python/wstools/wstools-0.4.10-r1.ebuild
index 81db0a6ef459..606be79508f8 100644
--- a/dev-python/wstools/wstools-0.4.10.ebuild
+++ b/dev-python/wstools/wstools-0.4.10-r1.ebuild
@@ -24,6 +24,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
+	>=dev-python/pbr-3.0.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/zope-component/Manifest b/dev-python/zope-component/Manifest
index 6cbb40cfa6b0..28f7bf828afd 100644
--- a/dev-python/zope-component/Manifest
+++ b/dev-python/zope-component/Manifest
@@ -1,5 +1,5 @@
 DIST zope.component-4.4.1.tar.gz 84745 BLAKE2B 3b8a58bdaf1de1bc57e9642bf76100bd8aa0bbccfc8d6682e7f78363f08f13ac98c7ff37d4892c3558e26537294dd184b75810afaf95c6f8d6a529c9938ea8dc SHA512 dc9f6a725cc49ac94a164d11786ef977e94e1c9a7c88de4aaeb0f62621cfe00284007ae44937ec92ae6cffc5b16ab4af1548db2237b0ba4b818e2c8f6355ecbd
 DIST zope.component-5.0.1.tar.gz 91130 BLAKE2B 4dbd78b003ba3688c0468573f4552c87333fd5fb7e0cd89d4844633f28c19443b3ea884438ff7f7ba8b056790f008c246c1e7ad52403d7b72b146d0d53edd8ad SHA512 fad011816fe5bb869bb2e43e11a66841a6be2abf9002e41207ef1dfe69b1afb5ca486d275daeddf71d2a0e79e1a9c839c4735190dddcd118b675a976bde07a64
 EBUILD zope-component-4.4.1-r2.ebuild 1224 BLAKE2B b9e1b8010bcdaf9c0ef54751c812439887fa86649af66065cb6f51f6710f1c9b8c100c55a72318e1a31a3a28621bbfad7454311caafae5a3e19f5a332f7b61b7 SHA512 73a3b1173a18d61ada6dc728ba4f8755c4b4fc0de97f6ad5b5047fcc834ba564041038127e6687a4ca1c437d2ae84d3a4229e81b4d2a9448a0a9beb3f1af415f
-EBUILD zope-component-5.0.1.ebuild 1273 BLAKE2B 4178e9a634e6069bbfe8721ff40ce146084a20de2034dcfb3792e056496921f39bccd67d9141773f68e949fcaa14168f85b8caa9fdd4612f2316d5c13b04ba99 SHA512 880ce2438fab6e9af5e1bedf102b2c251eb2a964f81972d303aa0795c9fb7a281344728eaf738f974f660ce1c795c2e714b0e442ab5c56f932e09c857c2d803e
+EBUILD zope-component-5.0.1.ebuild 1272 BLAKE2B f41d36bd1e4d94c640a83632b6a9ebad0fa40ad5a555132891563518aa4b55d3258ba623704ead4ec8816dc184666e1083e48d0cb7c273e9f991e6d3e8bae0f6 SHA512 e0fd2f336740ef038445fc35948fd553de552fbdf0130f1677441a8c8a47835901454795b9ee019213029fc9fdb0163ded4fbea56298e3664ed3063cb52f42b7
 MISC metadata.xml 411 BLAKE2B a02a8232c9878cc8c569bf818b81e1b0c2d3cd5e18386f14d8fa228a12c9745a68644e362189ccca52673ca6071f196ebd4603d6f12d6de7839e732f63e4d2ef SHA512 ce4f88684c8c16affe79487c03e5ff4d06fa26c27dc6dc4ffebae514bf498b1f794fbe86f038ea342f08e6ec62eb3722ed118134bca27b0110ef43b155c4cadf
diff --git a/dev-python/zope-component/zope-component-5.0.1.ebuild b/dev-python/zope-component/zope-component-5.0.1.ebuild
index 8b0a285c9213..09ddc2bc5776 100644
--- a/dev-python/zope-component/zope-component-5.0.1.ebuild
+++ b/dev-python/zope-component/zope-component-5.0.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv"
 
 RDEPEND="
 	dev-python/zope-event[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index 9a9a3aedf132..acb4ce2dc701 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1,3 +1,3 @@
 DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
-EBUILD zope-hookable-5.1.0.ebuild 969 BLAKE2B d63695bb9b6fe6f8324b99f36d183f28ab5d0acd5bbf060ad0ca6594506bc6138ab92ebc4c3556bbf94ae5b1b8563bd0481610ae75921a9200a49abbaa0e28af SHA512 d8f668e02f9511b4498b936b725a70e5606d310e018f6bae00089c356710537501264f3e29470d65e960ca758030a7c088acfe816b69e129ef9c9763c30a7eaf
+EBUILD zope-hookable-5.1.0.ebuild 968 BLAKE2B 5a6b5df1f8a38b25df537875339e4d7658f8107627b99053299e02849860aa0f08090d7ff3bc399ea0ef8a382be64c0941d8729848d0e32654c4bc5a5a949ad1 SHA512 ee88cf33c74fb30ba0ffa8c5d9f386746cad28cbefb88246d7267462dda89e0d58e059066610edce67ab464dfdd3ba84d598ad20956deedd1018d009f5b76df9
 MISC metadata.xml 363 BLAKE2B 292afad5ddaa2ae9ea128a842934b751d16d84aebd617a9e5f6c2165245137f11089670fc78791ce46ccb260c5acbf0527030889d709725f6f89532f3972c0c2 SHA512 40afd7e868b05d352bc5f268d056f3550e924e22b07b1f0e41afd25429017cb28fd5b6caf565df04bfcecf5cc1c183d12a122a906affd813542ef32cbbc230a3
diff --git a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
index aa09837c7a6a..85f894384541 100644
--- a/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+++ b/dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv"
 
 BDEPEND="
 	test? (
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3e07254ce8aa..d5b84d165818 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 4bc10b30d692..b417487a6189 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -1,9 +1,8 @@
 AUX qtcore-5.15.3-pthread.patch 1570 BLAKE2B f484f7aab89ba92bc33861abc1a4c5fe5f15139a7b14bb6a84a02d8f064dd6465d6ad3ea39ee35cdbb2dae6a2879a824b23068b8e94d3a6ebb2e6639b11a1612 SHA512 492199fdd7f7252c9ec03ed735a015df51e8de7aa2b20b2a4bb391a133e1dd0d88ce9dbafb600071e07abc9b426a9040f64a738361b71dd891186a59087515e4
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtcore-5.15.3.ebuild 2225 BLAKE2B 5338f40bff3dc63b42d00445c1c89f04bc65d2899cbf21753bf3dc87c82f87e3df28082fc6e51450e4aa769fe64d8bd624975b8abbde06acc8515985b54e46a9 SHA512 1755b7130556dcdc38e3c46e1d174d4aae3dfc66ed9c9eb207d53c8933dbdeca6d7c6308f006c78dfba305307116fa10dfa8de9d7e2d48abb1ce45eb26925191
-EBUILD qtcore-5.15.4-r1.ebuild 2962 BLAKE2B d8e25c31918017481c96fb513df7fc69f3070b4f11fcacd567448635c708252224e3c32e62419b617f769481f1c8dc9cafcb998fd4fee407885018085bf70116 SHA512 7baca4f622875b215d4712bc1a138fb1365f1969addd2929cf18954289e3653b8a5b4b34daf0841d9fc22b3add853fb596b759415a2ab134be2db66dc9791058
-EBUILD qtcore-5.15.4.ebuild 2231 BLAKE2B fe0ed1ff07ff00ee53b2b1ed40a42296d1f80fc3150963dbbefac269a021ee0a4147a8fed687a37319bf4b34c788f4992536257cac6fcb703caaa8cf786c347a SHA512 6865e3a7a81d0a4bdbacdd856545d9b4be6e5a34632913f8d5a1a271befacea5f686eb260eb15d573e01e8ac16d5f4d8ec0073f188f1a263442b08e9fe2741dd
+EBUILD qtcore-5.15.4-r2.ebuild 2962 BLAKE2B c030ab0eb2d8520614fca9d0d0675abf8b7c9c2ebc6c7d0f894800e47d2b81eb91fec6ae859cd8850387718f1c1f8b57d15783561f8b214b7caa8df638bf06b0 SHA512 51be3af4eeae27924dc12a373b426cedcc1a7f0aeb7dc8ade5f01cf96d29ff85aa4051282a4a0c684c0c8aa55a914d9a4e502c3b5bc392aadd1d480717ff331a
 MISC metadata.xml 833 BLAKE2B 79b441c34e55017f23dd85cdb062ef4cbcfce05dff74936de887256ba8b9b596632b570b55b7014c38467829751771bb116f067cd6a246a11309f20b67fb55f0 SHA512 f1ffedc2ad17d198ba14a9a93e6c8dd35a7709e6f1e07dae606c16c05868f2f8e696f25fa5cf2602ed50f41eb5a914ff0d652b9ac37163e5130ddbfb475a1ff5
diff --git a/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
similarity index 99%
rename from dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
rename to dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
index 034469ed1e79..799954faa0fa 100644
--- a/dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-QT5_KDEPATCHSET_REV=1
+QT5_KDEPATCHSET_REV=2
 QT5_MODULE="qtbase"
 inherit linux-info flag-o-matic qt5-build
 
diff --git a/dev-qt/qtcore/qtcore-5.15.4.ebuild b/dev-qt/qtcore/qtcore-5.15.4.ebuild
deleted file mode 100644
index ed8758faba13..000000000000
--- a/dev-qt/qtcore/qtcore-5.15.4.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-QT5_KDEPATCHSET_REV=1
-QT5_MODULE="qtbase"
-inherit linux-info qt5-build
-
-DESCRIPTION="Cross-platform application development framework"
-SLOT=5/${QT5_PV}
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-IUSE="icu old-kernel systemd"
-
-DEPEND="
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/libpcre2[pcre16,unicode]
-	sys-libs/zlib:=
-	icu? ( dev-libs/icu:= )
-	!icu? ( virtual/libiconv )
-	systemd? ( sys-apps/systemd:= )
-"
-RDEPEND="${DEPEND}"
-
-QT5_TARGET_SUBDIRS=(
-	src/tools/bootstrap
-	src/tools/moc
-	src/tools/rcc
-	src/corelib
-	src/tools/qlalr
-	doc
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
-	!:network
-	!:sql
-	!:testlib
-	!:xml
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.15.3-pthread.patch # bug 803470
-)
-
-pkg_pretend() {
-	use kernel_linux || return
-	get_running_version
-	if kernel_is -lt 4 11 && ! use old-kernel; then
-		ewarn "The running kernel is older than 4.11. USE=old-kernel is needed for"
-		ewarn "dev-qt/qtcore to function on this kernel properly. Bugs #669994, #672856"
-	fi
-}
-
-src_prepare() {
-	# don't add -O3 to CXXFLAGS, bug 549140
-	sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
-
-	# fix missing qt_version_tag symbol w/ LTO, bug 674382
-	sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		$(qt_use icu)
-		$(qt_use !icu iconv)
-		$(qt_use systemd journald)
-	)
-	use old-kernel && myconf+=(
-		-no-feature-renameat2 # needs Linux 3.16, bug 669994
-		-no-feature-getentropy # needs Linux 3.17, bug 669994
-		-no-feature-statx # needs Linux 4.11, bug 672856
-	)
-	qt5-build_src_configure
-}
-
-src_install() {
-	qt5-build_src_install
-	qt5_symlink_binary_to_path qmake 5
-
-	local flags=(
-		DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
-		OPENGL OPENSSL SSL WIDGETS
-	)
-
-	for flag in ${flags[@]}; do
-		cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
-
-			#if defined(QT_NO_${flag}) && defined(QT_${flag})
-			# undef QT_NO_${flag}
-			#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
-			# define QT_NO_${flag}
-			#endif
-		_EOF_
-	done
-}
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 405ac3c09581..039697820916 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -17,5 +17,5 @@ DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 18798ee82864bf513525b
 DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
 EBUILD qtwebengine-5.15.3_p20220406.ebuild 9001 BLAKE2B b633bfbfde8cca415d8da6f14e88fd3ca58e95767dcd8e2ad9c28eed44395e313de880bab3d6e8eb6a240a073202b4bc18c7c19f82c4087c7bf867b7a26175b3 SHA512 6b276f14ba6eaca6417c51bebb6f576c18d47a7976544202a5415aaedcec352d8b909e11e5482ddaa1cbedd9fd42adaaac32a72a56d1e847fb40fd86639bd416
 EBUILD qtwebengine-5.15.4_p20220505.ebuild 9054 BLAKE2B fa727d7d3df8479e51c5404a13d24213bc630a4c1b9fe2cde7135f1d94e3aaa98531866de6875a44e42c0b709f7e1ad321b340598eb5c2136e7c18f8f3f72e7f SHA512 398abd4769e59507a6b230ac359f8afc909406752613d7d148f14ea3cea05dcfb8e3cfa3be44c6052637e03cb3db390d2c994db1b05a1db8b342f9d2fea633ef
-EBUILD qtwebengine-5.15.4_p20220526.ebuild 9019 BLAKE2B 6f46761813471d4adc10760d2f48be4c0e04892de024f13e4f44e1a144d570d16685b1a90fd10556f47fa8835fa54287e021b6abc4174ec60a97667cca7072ca SHA512 b12b1e21e191d68c672304a28a0e206bd47b8f8e604688f79658502b9f06c5ed47b91b1bbe7ddf18fc6ca6beead7d177336f3f0142f724924b22b885836e5e03
+EBUILD qtwebengine-5.15.4_p20220526.ebuild 9018 BLAKE2B 00e5ef9618659b83aef7d5ab788cf9a76a68a7f195eccfe64bfd54adbb64d2e907584790c7cff1e40e5b2c785c948568579300e03d4ae6e3caf8e8cea126c916 SHA512 cc36acf1d14c2ce7ce137c4b83fc26ac1ead5f7f89ba67d9b19a623e63579caed8570fc707762f8e3d0f73c59585f9aa65b72032b09dc00add47f710cfd6d3b0
 MISC metadata.xml 1379 BLAKE2B 67b694ac104e8f16a0bb4a33bd178b4507b5c411d62634d88dd8187dd27b32d6a11829883cde03c0a856134c498df7d6c946221a05fec356e62296b64add4121 SHA512 afa7bd418df63335a1b6ad7f1a53be74a710ffaaee294a1db7691ce98d45d2e98e3f40c2e47e2e9e89f766122392def7a3c2198680413c647c9202c1f4c2f0e7
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index 2505b76ea618..ad2857918b76 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
 HOMEPAGE="https://www.qt.io/"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-#	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	if [[ ${PV} == ${QT5_PV}_p* ]]; then
 		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 		S="${WORKDIR}/${P}"
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 4c43a5dac5c9..1b055a84eb0b 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,7 @@
 DIST qtbase-5.15.3-gentoo-kde-1.tar.xz 337032 BLAKE2B a5a3ff6c6002e386d15dd3122faec8e09fba19df12db59a6cdff1f04b7cc9919cf5cc30f4ae936ee3cb29cf110e714bb727929330ced292b699472367adfef4c SHA512 042743816f3c08dc3313be76da31e206c37dd7dc5b2604b36ef4be18ad66a89d9d29a61f9cccaa169665f742f7fbfb60822189e8cab0d23f3d4efe293a79f78c
-DIST qtbase-5.15.4-gentoo-kde-1.tar.xz 507288 BLAKE2B a22d3745d3c690e29f7726cc464e3721777768e6e4f937e84ee2d2e14a13bcf7724e0c30b2cf4277c9ac7dadc1078545e14fb5459fbc3acc7259fb3e39e2f417 SHA512 a52bdf189e4c0fe341c2db0a5923a3600503d8eaa0c3693923a02a0ab4fa6dfc1beb21067f4723fcf2e4d7c71e39a496bf34e109e1e1c8c42922ff53f6712373
+DIST qtbase-5.15.4-gentoo-kde-2.tar.xz 508404 BLAKE2B 315a65bc62ceba98edeaf2e9e212d25d08dd99a309a65000fe4397a69593a30f06a48f208b5506849115ffb8b34a92928d2a8505cbc46567cf37da540be48a08 SHA512 ac4a21f6ee2a1a897b25c8fb4a127ae5b47c7dc5ada5c382dd6976c37e2e1a90cbc5e3d457fc240d8939b20947b0e83a666e141adc66c16188749114f783af4c
 DIST qtbase-everywhere-opensource-src-5.15.3.tar.xz 50204364 BLAKE2B 9c011e8d6033e340a1d7be6bd9100a05d55638cfd53f647752853382574b6c444668eae36bf88cfedde0e7c0e00ecb1f91d025fc59c23be5438ba0ef91a5246c SHA512 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
 DIST qtbase-everywhere-opensource-src-5.15.4.tar.xz 50225468 BLAKE2B 3525126791ca168ea4227bc58bef0202f4cec68396c958b0e7f09e7b41ca9d70bbcf0e78b5e7997bc3e4a59e889128f93964b5d0a9db7d012403581cff3dc30b SHA512 91a1d95c2891939ae55134e8897cbc423142bd8eda954a1e65bb563b0932ed9e2da34db374fd86858b4a819e8abe824a967b31f4fb316528ec8aaf15016c6ad3
 EBUILD qtwidgets-5.15.3.ebuild 1195 BLAKE2B 45122f3ba71a6317214797a0caf6ebe0cf904864df95ec158250bbcc082ef473716422a963a9ca8a3e62914e94824e3a873bdb9c0214102c6c189b65eb9c4c1b SHA512 d6ea638d68a94a8131c6be95ae71b6c44db7cc0edc4f5bcc9937589cbfcf8d23bdd213e8aef337eaa23820ecf8743df579224fed76505912ca9d493395e70b14
-EBUILD qtwidgets-5.15.4.ebuild 1208 BLAKE2B e9a2f7e45dd76af77d7f3af625d2a1c6c9be269f9da5c47cbe093cf5d55cfe1eeb5af13e9b47fb17ac08510b0cc7947705e650f2487404732cfe656d3eecefed SHA512 679402294a844a74981274989e97d50d7d1b5e0e42ed450a77f7ce1909a20361ac3bb72174119021f656f3549c37bd4d235fa5477f6861e324edb6f4f564f635
+EBUILD qtwidgets-5.15.4-r1.ebuild 1208 BLAKE2B 794bdcb1861bd33cd632e26def79dffcefdfa59d2ad5a960f73f4999007751f87733d878895e0d6274113d0f72905d6b4b9476b77130f4a1fc035bf7688d4bd7 SHA512 41a1072bec44ae7e73146ae9e9239affe549d418bc82ad64ac628f172bcf01fe247b9b188cc0203fdffee0d06df3f5363491c0f2fb6c6149fed27968c6b31628
 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
similarity index 98%
rename from dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
index f19e63042ff9..b2145cb8b006 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-QT5_KDEPATCHSET_REV=1
+QT5_KDEPATCHSET_REV=2
 QT5_MODULE="qtbase"
 inherit qt5-build
 
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fe067d5f41ab..54cb37fc6538 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 6da3a3d516b3..495490f59a9c 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actioncable-5.2.6.ebuild 936 BLAKE2B fba18465f441371ce5291ae284941a48a408131f2f9973b608c59246fa8c81c0cd527c51d376baab722f8f0642705ff8969659db32c9b9d0d3405e32e4473fa6 SHA512 27edd8dc75e905e734d218d93c3c34e11c565758766eb4b49a5ad22425855eece0d3087daffc4ea1a587473d272a0e11c976636bfc45921f103412bf851a1659
 EBUILD actioncable-5.2.7.1.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
 EBUILD actioncable-5.2.8.ebuild 936 BLAKE2B 619af8dde4fb38fe35b5c7155e093969da04ba2380b49902b30a6688437754826eeb64944fa8d48aa8f1d5da634b54026da9eb1de68b178cf11eafafe7a9c300 SHA512 9bd391279fd77601af242eeeed7a587209a1890ebc0cc4d68b26e04d70dd80b8bcf048122c12074b0f90f7f6368b2b810079ab4bdb0ff2d2d705842949ae3f6a
 EBUILD actioncable-6.0.4.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
-EBUILD actioncable-6.0.4.4.ebuild 928 BLAKE2B a557d525769f8784d5f738e5a880b8ed0280041fcb79254c7ddaeb6059cb88138ca893221dacb1f459d807ae9cff63d4d61285e6d34d287927a60ac6cd065eb6 SHA512 507b883403a0cece5a74492348f9cce4fb4063472550cf156530b6d0c6d33a9bde8c82eda2b6a5a4219c6bf22b7eb0fe078a9de1b52faf5582e21859d917bb94
-EBUILD actioncable-6.0.4.7.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
 EBUILD actioncable-6.0.4.8.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
 EBUILD actioncable-6.0.5.ebuild 928 BLAKE2B f88dbf36eb9be7a3971374e66f7996e751918bdc8d4320442a28cfc02b5cef0f85ba25706838627d97d98eae180dd4269317fa019e89d837283847bc1fd98a06 SHA512 35ea5a2908c3bfa43bbb71593c8828eddedafd32d9d888f527b7b547f475f585697ce897011082bdf86a7cf16f07f4b240a694f0b03c37490558d10d0f0dee5f
 EBUILD actioncable-6.1.5.1.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
-EBUILD actioncable-6.1.5.ebuild 961 BLAKE2B a57eadba2c7f0b24dd70da1fdcaac9a315bbbd9b946408e21777206f9303cb08d54fc2bfae859753f6724c4643701f0f6af4fc15e980672249168aef2eeae1b9 SHA512 da2dc67917b0a56e24ac6e2815adbec0b1adc6dfcdd7509b9b0f9b7bb9938dc2d208603adeb159748ced629762f838ceb152d4c18380b104089071602b1c0f95
 EBUILD actioncable-6.1.6.ebuild 968 BLAKE2B 402b75efadf53319e8a270fa9b900912a5275674357a9b1eea99ebb7134891a545ad7d50c736841c96cfd8b15942d01dd2e6a8b2516415348aea2c03b97a2f0c SHA512 a28a8d64f3aac01e68f94b79e460ea291104af233b18fa945866182fb0a79745c8a9032c193c51e79474aadddbd9ba2fc13b3fdd5e1cc5faf23eef33dc2abd98
-EBUILD actioncable-7.0.2.2.ebuild 942 BLAKE2B 2de8f5b77f4c7cc09e5aeeec134757320769d5ce8b36344a1c044c02c3e5ed103853416fca09f813e776abafe7c5d2638fe78d241bd6a85c27427ff178d3fd42 SHA512 f835d9ce3c3b1a605963fc7737db879f1bd3b837e4eff74ca8c5ad0e54f29d5f5ace8c8ad813d1bd203b6d5dda6d692741531a3baa584213e7d1d13924d60516
-EBUILD actioncable-7.0.2.3.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
 EBUILD actioncable-7.0.2.4.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
 EBUILD actioncable-7.0.3.ebuild 949 BLAKE2B 94c2bdbe8d3f18d6f577941f9818379f8aaa70ea6f78ee1d0bcb1ed0c689199aa191bcdcc991ef5392d148c63a5f810ea477137747f1ef6c22a4ea732e7f1baf SHA512 f4cfc6d04442252279ed609dc296eda398273db08dfe2a56e6cc43d429476a7f052b78ac10b1d383b4cdcb0c91d1c8360d1becba4d62921c6a3f26eccd3147ec
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
deleted file mode 100644
index ce35cc0e8d46..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild b/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild
deleted file mode 100644
index e1c3359d8783..000000000000
--- a/dev-ruby/actioncable/actioncable-6.0.4.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.1.5.ebuild b/dev-ruby/actioncable/actioncable-6.1.5.ebuild
deleted file mode 100644
index 77aae4910664..000000000000
--- a/dev-ruby/actioncable/actioncable-6.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild
deleted file mode 100644
index 6438674c5218..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild b/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild
deleted file mode 100644
index 3243972e894c..000000000000
--- a/dev-ruby/actioncable/actioncable-7.0.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:*
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 78dd045fe27c..78a7deff18e0 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,25 +1,15 @@
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actionmailbox-6.0.4.1.ebuild 1821 BLAKE2B 7b4273faff9964db379b84db9084bb4d7cd08fa97a097a2713a6ad9f022900f42bdca29c441975de7f6ec4096a75b185095046ce29d7fdaac44494993e15ef28 SHA512 deb2e5e38a5c347e767b0a0a4a9cb6f80197088a18124c5e61b46868427d2e8bfae2952772bbe3f85c7449712aed4347aff6921a8b16aff84bc183145e9bc70a
-EBUILD actionmailbox-6.0.4.4.ebuild 1814 BLAKE2B 30b4a2a061c02712eae98f356e6a076e90060d1145d4720e1755c6ff93603c317fb34bac4d1dc2919ccbfa3a3a0082212e3e6243266da88f69c5c6c8f454a23b SHA512 488cade2c172b61c0a3d844206645e6e0d018c114e826eff8b2f094277112ba243610220ba36ac1eaf6b7f4029c4a3aafe1f96c1cbe2ccf9c407f70a3d2ce9be
-EBUILD actionmailbox-6.0.4.7.ebuild 1814 BLAKE2B 3312aa6fcf29ccd86c163558c79357a533b63a3306e207ad55b79b8e1b3c31a2a30df08ad29f98927f762784f0d494a2fdda44dc07aa2d917d6299b71afaba76 SHA512 ba1dab97450d2204ac6ebd2a9e3332c3ecf2c3e31f2806fd9c979db485b8ccd9ec17def0998ae169a3b2ef08115540dcd966f23864337b1370437d86e3b3f758
 EBUILD actionmailbox-6.0.4.8.ebuild 1814 BLAKE2B 3312aa6fcf29ccd86c163558c79357a533b63a3306e207ad55b79b8e1b3c31a2a30df08ad29f98927f762784f0d494a2fdda44dc07aa2d917d6299b71afaba76 SHA512 ba1dab97450d2204ac6ebd2a9e3332c3ecf2c3e31f2806fd9c979db485b8ccd9ec17def0998ae169a3b2ef08115540dcd966f23864337b1370437d86e3b3f758
 EBUILD actionmailbox-6.0.5.ebuild 1847 BLAKE2B 09ffcadcc426136ed322e1d07c318f94aa05e9c005e104f143aee4763ead0c302883515c17d14609f061806f90680e8054211a6524206cea69ebd04a27b95a69 SHA512 80420ef29eec43301417da81b0ba0637ae36132cbb096c5e46192c1fcb87b9c3fcbec69f343499f6587fd2af582d9f5b4396e05bb5d2025010bb6fb722c556e7
 EBUILD actionmailbox-6.1.5.1.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
-EBUILD actionmailbox-6.1.5.ebuild 1869 BLAKE2B 89f1b2f3a981ef94a906ecde6d2e401a8fc2218d441f1f165415251a720803c86818d71d9b1943d2a7d92f7cb3f67b994a8a6fa7d8fd4ba919282b2bf9aa9002 SHA512 399879aba0a7e6c5d0e997d39b76e1ff33f6e27f2e5baf3cd13fa2022b470ec9c3335620e44a1b9843890d56a4bf1f172fcd47504fcc5e733797f7e6910b2f61
 EBUILD actionmailbox-6.1.6.ebuild 1885 BLAKE2B 08405d93c914d264baf641ee8e592aa308946770430564f3f45bbd3f4c54d279095b10eadc50aa9a95af02fcdeed24ee73ee149a318298c0da1e3b959f6255ff SHA512 1ba4ed9662b6225bb5dcbe3d5dd58979e7ce20feffb4aba7c9f06cbdda881aac58fd414412dd6dfd24143764fc6fd2dd10a8a84f147d0778b72edf04df9dfd0e
-EBUILD actionmailbox-7.0.2.2.ebuild 1974 BLAKE2B 352f1462d534072779abe8f1a78c492b65e85b92e76fdcad2c52628e64c1d484107fcf3fe430df060f6007d44513b160ab4875f0d4908fc9d4f42372918df0cf SHA512 81e778c01d98e57fc2dda8f0988dcdb4c9954161530ca78e4ec57e24e6ecedb54d65983b3dad490df9986d0a1f176b4c45eea02656df40cabb7a5c893f336ec6
-EBUILD actionmailbox-7.0.2.3.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
 EBUILD actionmailbox-7.0.2.4.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
 EBUILD actionmailbox-7.0.3.ebuild 1990 BLAKE2B 1ef989fabf448c590d7ee2ba602b50247cf6dc59611fc6cef71a50726f33fb0e3dada3b04f8c3659684b9c2c06068fa741ca929d26387a903379876ade1cf111 SHA512 3fd0e07f99fde448dfc1b0f840413a6e1156ad86cfd3728f381f3c4ea22dd05ebf7777505d6d6674b06d08fa69d7446377bddf77c474f26bf11344c3def9579f
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
deleted file mode 100644
index c4b746bc96a1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild
deleted file mode 100644
index 845962ff9795..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild
deleted file mode 100644
index e387f1a6cc26..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild
deleted file mode 100644
index 1f39947c5636..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\|rexml\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild b/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild
deleted file mode 100644
index f3818bd389e1..000000000000
--- a/dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailbox.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/mail-2.7.1:*
-	dev-ruby/net-imap
-	dev-ruby/net-pop
-	dev-ruby/net-smtp
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-	dev-ruby/rexml
-	dev-ruby/sqlite3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|webrick\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(cable\|doc\|job\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index e74c54963c8e..9b81e0cf4db2 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actionmailer-5.2.6.ebuild 1405 BLAKE2B 1d24e387325e99a3c395fb599b5e92009ddfad7f577498b1adfb51cb782942c9f893d2c1b8e1e96f1cc1ab56a50de30aa92a9b0f1280626e000ee0f31b70d23a SHA512 7acb061f5bb4946282a576d3b87a441b8fcc3a11f8dfda7201f4b67e0573c4147e6faa79a3f2f1eea6f8baaeee763d55f0e762e90855cfc51b97429bf2c86e37
 EBUILD actionmailer-5.2.7.1.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
 EBUILD actionmailer-5.2.8.ebuild 1405 BLAKE2B 4aab436a9385901985ac01766536248b92e099f89ce67bf7053d34fce5111fbc0408b0fc655bdab1ca6712cd079b98063098c6e55ee4cdb39189922a7a7d3f28 SHA512 ebd73b43abcb87e5920e672604b13d01e041762842e9d7b909e83a1d19c8fa8def5ff8a0966985ef67191de03094a3135eb86da1dbb0215c3c746ab82f4dc8dd
 EBUILD actionmailer-6.0.4.1.ebuild 1369 BLAKE2B eab6498c778d7bdd71a4e07aff5ba62284ba7814da18d1e9cea25d9c6c4f98ab36f1b5c27b1949494c04cb652e3b3e3620da0acf4291af2b89cd18698b8df526 SHA512 235f7c5944630291f7bd95125013224b03c8e69bc951ce3a5064b000375efbbbac12fcc36950b4b7dad7f7a8a97cf11a51aceaad9d1c76580cb335f8eb00bc9d
-EBUILD actionmailer-6.0.4.4.ebuild 1362 BLAKE2B faa04d645b7af0b4c6ba5beb721d0c4125ab791daf4e74ebb03faac3f1ee7b93f0bdfa6118ebc1bee3265b76481428f1d175da27afc4ec409972bb92d3ba4f98 SHA512 474a6d7f7006a1d1c39495cd3d44ea636a10f23b80db8a779be7e9b0ae800cc2a7a403f74cc95b79dd6f99f4ec1b2d71f062ec65e2353029bb40a99a1e64ade1
-EBUILD actionmailer-6.0.4.7.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
 EBUILD actionmailer-6.0.4.8.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
 EBUILD actionmailer-6.0.5.ebuild 1362 BLAKE2B 2d4f9011b0348c5411a87da2980dbcdc545b723bcf26a86075916638811b5eb343a7bdbbe6ad950497ac18db2873a69179b6b1bf696d2e4a17546cd017de56fa SHA512 6eb13171a019a2350015629c444b1d65eb35fd5540a178ac64b2e24823f14aa1e60913abf59e996be1e1de8869fe73ae0ebdffecda79b12b8d71d054cb664757
 EBUILD actionmailer-6.1.5.1.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
-EBUILD actionmailer-6.1.5.ebuild 1261 BLAKE2B 3851fdd29ba3e54d215899df953e52b448144b9d9aecd57c05a6f110ebca853c35f30e5ff6c11ee5b2e6ed31e65995b2890c955dccb1226d0e28c11efc505db7 SHA512 d0785152cbd1c748fd97a6ea26b5a4ccc7d28ccb5cc45213bf6c9a4559d8ba3f936b2bcb4a79b84caf3dbd122c355afb9622e795b913303f064c2b2c66006a44
 EBUILD actionmailer-6.1.6.ebuild 1268 BLAKE2B ffe0b2a2319e50bf9b4e37bbc98e9a97ef0ea2177be520dc0ef4cc5df15946271ceceecef2a4f915aa22366de0f4cc556547c862ca77bfb35ec20db767b31ee0 SHA512 b23ef1349e8a199afe210a231365cd8601a3930d4360db399cea101dbf7fddfe59af0011a74d5da20804dec36aece892b8f831e2fbc7891a27e02a5cf7e1abb9
-EBUILD actionmailer-7.0.2.2.ebuild 1242 BLAKE2B 273bfbd5fddfa7a0062f478f647a9ee6da724f3f63ceabbafb8b0915ae19e43d4be76c2e6902bde8e25fba0d2d0f18ee19f373203c8ca55034e2c18d81f69d20 SHA512 d155f175cb3916fd51c57fd2e758eb42c4a3fe1f7639f3e64a43aa94c3363ed27439a574fb7338f9b4b0a2c580059b056fb409e304e8b794d9a6317df9d936f0
-EBUILD actionmailer-7.0.2.3.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
 EBUILD actionmailer-7.0.2.4.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
 EBUILD actionmailer-7.0.3.ebuild 1249 BLAKE2B 15c34906810befc6d8a27518a53a68239604162862b953c88717fc00cc33c415434fa9e39aa80388bfe6637ddf2c596bce5e6eb14d095e83ce729d065793bb9f SHA512 1a96ba560954fee98d205c4f43f3f23ceffe005591ab1582858e2a0a545c074c32f1eb4a7d4895255bf32a9bb6da6991ccb825ca99a590cb0347fafe561f38d2
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
deleted file mode 100644
index 5c5d6a444fcc..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild b/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild
deleted file mode 100644
index 9f52f098010e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0" ; gem "activejob", "~> 6.0.0"' test/abstract_unit.rb || die
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild
deleted file mode 100644
index 2b16b080cc19..000000000000
--- a/dev-ruby/actionmailer/actionmailer-6.1.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild
deleted file mode 100644
index baca61a4f1fa..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild b/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild
deleted file mode 100644
index 75c786bf6d3e..000000000000
--- a/dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/\/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 3ef86d7b4bdd..c5b3058def15 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actionpack-5.2.6.ebuild 2210 BLAKE2B b2a432e92d419452ead9e92b3e78d83ee82d2d8a21f8f7c1bef69820f0bbf657aaa634fa18e00cf73edab6332b85906336a7f3a3a7d15dad469a4f2f32cfacfc SHA512 cd4e8d49cd04507d1ab995181df66d6793c422efed150887fbdab3dc7abc328ad76a958b149b4f202dc111635141fe49188470b5233b36b73721935cbe5be3f5
 EBUILD actionpack-5.2.7.1.ebuild 2244 BLAKE2B ed76ab1f2dc5c3e4369dd971ef5ca2140a7428a57001abc5cfc3fafdfb72d7ea019e15f0442f2d5cc9cf14e1d9142406acc70401ac27ff445a298a76d4ba8367 SHA512 cbb53ce4f5b334dbba0f1b37897e91807494666f4fa89abb93416410831d21f2e361e39e14abcc2fe732672cc36baf2c70e7440b389cc3d263ccff63ae4ae58d
 EBUILD actionpack-5.2.8.ebuild 2245 BLAKE2B 198c85192ead2a81fb04b085460fd59a7e4a5b184011675520dcaf58ade528a58408cc443ea3fdb241982b2da3f785b4443a27973896542c06a27fe5cd58c043 SHA512 82487e49f5218522d515ef9f9bb94500a0301bdf6b4949d2079ce2b83c29c38eb3b1cc750ab6a28510fa2f987f325ad65d238a3c6f6a359741b8bf50b0a568da
 EBUILD actionpack-6.0.4.1.ebuild 2028 BLAKE2B 145b19617b893dc8db70ac306dfb8f5c54f15d590071713ed7482790e75b57e08a33cb6fa74c606d906deb350aa9e0293073013cebdfb59c3336f8fe76ccd679 SHA512 2970a86b6dff81dd3f7fe0f22ebed43093c82fb6064adbe3a33c272763124dfed0a82bc75ada7623f2babca8e89c7f226babdba46976118d0f89b40a36889a19
-EBUILD actionpack-6.0.4.4.ebuild 2021 BLAKE2B d1520835e397eaff88421ba6f24e714f385064901f1aed81b1319afdc8de847940941e1f45c7ccbbd58c0e5a047afe1235e6535ee02f2d4483172d594fbf5e89 SHA512 45a20453e9d18db11b478de983fb50be8bb8b895b40068549ff6f3f43d9a0e3adf1dcd89d6bf8d0627eeb4280be44dc044a97d42167202f856ba1e9de9efd24a
-EBUILD actionpack-6.0.4.7.ebuild 2045 BLAKE2B ebe4a713c1202259b066a09d891c29eccb2202be6d83546a74a90bc8d1d520e9dc8f8a7bb91afbbdad4e1368374ebce6ad2e8871eda5ad9671d2bfe0853c21e9 SHA512 1f987ad71f5c4f5615e0ed70d100002a7eb200ec0ae5c497490c7aaecd1934236c09131f17d4558c79120a3174fe3e34fb07497446df243f7c69bfcd89035cb9
 EBUILD actionpack-6.0.4.8.ebuild 2045 BLAKE2B ebe4a713c1202259b066a09d891c29eccb2202be6d83546a74a90bc8d1d520e9dc8f8a7bb91afbbdad4e1368374ebce6ad2e8871eda5ad9671d2bfe0853c21e9 SHA512 1f987ad71f5c4f5615e0ed70d100002a7eb200ec0ae5c497490c7aaecd1934236c09131f17d4558c79120a3174fe3e34fb07497446df243f7c69bfcd89035cb9
 EBUILD actionpack-6.0.5.ebuild 2045 BLAKE2B ebe4a713c1202259b066a09d891c29eccb2202be6d83546a74a90bc8d1d520e9dc8f8a7bb91afbbdad4e1368374ebce6ad2e8871eda5ad9671d2bfe0853c21e9 SHA512 1f987ad71f5c4f5615e0ed70d100002a7eb200ec0ae5c497490c7aaecd1934236c09131f17d4558c79120a3174fe3e34fb07497446df243f7c69bfcd89035cb9
 EBUILD actionpack-6.1.5.1.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
-EBUILD actionpack-6.1.5.ebuild 2101 BLAKE2B f8184aaedf9b9ec58a18e7044e46b481c1064eeffc0e8d2bdf86efa85cba10352334bec2f324383c3e4d0ba578ba658371458fccae0defe048194f3ee5286c4d SHA512 76da4d1d40995fdf615757058d7b3c7e46f05f30d9ada03a3dc4a76c9f056a6b3dfafc43c298a5eaa162a8c0445038cd479201c75314728bbb77fd71c582b6aa
 EBUILD actionpack-6.1.6.ebuild 2108 BLAKE2B 2914eaa7a835dc96082a490fdd276f25b42f039af007f84359c544ce1774a651322428dcf32bbc0fdefc8f02200c56d9504d08a65566f829427afd1837cf3942 SHA512 af5f04b94dcfaa2285ea151f4ff59835b3c85cf5a546c8ee091d34533181d5e5f8002ce9d09bfa699176a6337b3091dcb3a2b3e0fd542ea3f50bebcb2575ecef
-EBUILD actionpack-7.0.2.2.ebuild 2010 BLAKE2B 29043e9235890692bec84283b2cce34832c0ce5b9109e587a958feb9a36a12d70f2f77fe800a153cc5d60795b2b25c1fb5e86ebddb68d8887eb3a7e02d10198e SHA512 4604d9f21e86a7770ecbc6c2e1961ce72aec1767e3023979f62ad58d9eb712861c2977d23a8665273e19e360b79ef5d9ab8c5c45de6d5ed5dda9299d78ace1f2
-EBUILD actionpack-7.0.2.3.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
 EBUILD actionpack-7.0.2.4.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
 EBUILD actionpack-7.0.3.ebuild 2017 BLAKE2B 1d3c74798f4215eadf845865bcb35d08cbfe03bb4011dfa7c751fd0ed995eaeb76d06066b24da8ffcbfd4a92df6387ea8bdbfd34de0e5e517fc550abc8ae0be1 SHA512 c0a2c3adc78f19940da860371df3221f7f7b79277ee5312005b37d9db467c0afdec53d865a196ec382d6325117904b541e9efeeb663c13199b2f2cad13c8141c
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
deleted file mode 100644
index a3bfaf000e01..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests that depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild b/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild
deleted file mode 100644
index eec7005b2c02..000000000000
--- a/dev-ruby/actionpack/actionpack-6.0.4.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-3.35.0
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests that depend on an old dependency
-	rm -f test/dispatch/system_testing/driver_test.rb
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-6.1.5.ebuild b/dev-ruby/actionpack/actionpack-6.1.5.ebuild
deleted file mode 100644
index f1c324e78586..000000000000
--- a/dev-ruby/actionpack/actionpack-6.1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild
deleted file mode 100644
index 994dc6c53657..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		dev-ruby/selenium-webdriver:4
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild b/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild
deleted file mode 100644
index f920a8e063fe..000000000000
--- a/dev-ruby/actionpack/actionpack-7.0.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	dev-ruby/rack:2.2
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		dev-ruby/selenium-webdriver:4
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid tests depending on an unreleased version of selenium-webdriver
-	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
-}
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 2634fe37700f..4621858b91bc 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,25 +1,15 @@
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actiontext-6.0.4.1.ebuild 1736 BLAKE2B 05482635d764a53af6b6514d68722c11030a45c28c52621f5800517d41a3dddbf7282b2e5adca22e2b0538f95766c33d01e2eb53dae95299bce122bcb88f75be SHA512 1f951606009ccd8dc70b3120f3d937b6d83ed8b3f06d18748a0acf14e9d801ad0f8dd94207d002d516050d67a2bed1698cf7af223e2e90f6d6da6567e535e778
-EBUILD actiontext-6.0.4.4.ebuild 1729 BLAKE2B 94ccc8c3b0db6206b7b0943a549957c1c7e27ffd95b15e0e08e367e613552fc4c09d4eb9532df957d8c29832a024a31f5161ea8c7b30ce01cc6dcaf150a977c3 SHA512 dc312d5d78902e9b083f5cdb0b6f6d33b9c38f987351464b04dc50a8606e5d0b884a716b22a685fbadf4c0cfcd95257843a67d921f76e8173f532e363bff3bb3
-EBUILD actiontext-6.0.4.7.ebuild 1729 BLAKE2B 8c659919012f1ebbfc8f0002947a167fcecc940f90736b621ec29c92b7816a5c7272cb5fbd50cd22433f3abd3cb150614c29cf73742a34ba550d129277dacec2 SHA512 abaa35a0f39eb5cc68c96b64f203048d5a7fdcb0a98fa358b2b1ae4aaacbd95ee836ba22aa9265b5a4e67ef9a9d26facb94619feb253f3c2749b767595e57165
 EBUILD actiontext-6.0.4.8.ebuild 1729 BLAKE2B 8c659919012f1ebbfc8f0002947a167fcecc940f90736b621ec29c92b7816a5c7272cb5fbd50cd22433f3abd3cb150614c29cf73742a34ba550d129277dacec2 SHA512 abaa35a0f39eb5cc68c96b64f203048d5a7fdcb0a98fa358b2b1ae4aaacbd95ee836ba22aa9265b5a4e67ef9a9d26facb94619feb253f3c2749b767595e57165
 EBUILD actiontext-6.0.5.ebuild 1762 BLAKE2B d4b5aefefb68ca292b5e0e7228c39096107ce342cb8e550cf2b8a15af96ad6b7afe73baab1152c02b8625fd2f493621f8f626eb048f3311ae2b199114814d526 SHA512 4e0176dfcb172c0f1d97e7f4116dadfbe6580830678122e02617b2d88a3c0bd080c0ff1850bc472d6c9c534bbb6303e79f361e3730222495c662174d6395e3a5
 EBUILD actiontext-6.1.5.1.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
-EBUILD actiontext-6.1.5.ebuild 1785 BLAKE2B ec9b7ca5f66f03628c980abe85063f46f331d36344e7cf266d2a089d6c8ac7763b6d73671623ba5b6327cd85442e04cf95adefeaf6ef89d8d51c8013bc7a997f SHA512 18dbbcb90ca9f32422c3016c01d5b1153e758f7628cc5653cdc7bbc753a94f55355913b5188068a212819dd5c555468ab327ee8d380397a0aa4cb04108b53c5c
 EBUILD actiontext-6.1.6.ebuild 1792 BLAKE2B 26e4517697dae8e152cb45bcecd02c9993f478e162b01fb4395491f373434483dcb79cf69321bde6049f9d620d57582e15a2ea3ce9883186b73eedd2b5672910 SHA512 dbcf4d15c3006bd0cd967457b5fbfc665dad7b23e7007478a866dba239630a96604fc2734791fa02a58abd27b91f9de493b0bd1be89f1cafa605db414b7b2ab7
-EBUILD actiontext-7.0.2.2.ebuild 1861 BLAKE2B 7b292e99304101925df1c05747a374752ffd51496be3cc647290dad2e6c81d305949b07ed94a78ea87239138fdde86074228b1be3b3a36a01616b48b1b6bbe3b SHA512 63f432cc1d87d93718da277a080c3be763f4b5977e21e17efbe81e6fd2466d8372590055077e6645266f654ec98a952267e6678a7ea6396d93d61c4fed3ac618
-EBUILD actiontext-7.0.2.3.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
 EBUILD actiontext-7.0.2.4.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
 EBUILD actiontext-7.0.3.ebuild 1868 BLAKE2B d5ba0971a8aa7737c63c67d12a86893c2de7d48c45d63668caf556530f004cfc6cf97331555e2543b06a3d90f473d73e07990d21698c221397622c05d05d9b13 SHA512 85e3dd11f112d0917dbe94eaef2fa73bc846f4ef291ef12cf809eead5aeedd10148c08c054f74a3e2a14e47eac2dfc1e4e7b81ba4118035d893eddc05a0285a9
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
deleted file mode 100644
index 6578fa8e6b1a..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild b/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild
deleted file mode 100644
index bcf2b5e89081..000000000000
--- a/dev-ruby/actiontext/actiontext-6.0.4.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|sass-rails\|webpacker\|rubocop\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|byebug\|dalli\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-6.1.5.ebuild b/dev-ruby/actiontext/actiontext-6.1.5.ebuild
deleted file mode 100644
index b644b504cc65..000000000000
--- a/dev-ruby/actiontext/actiontext-6.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild
deleted file mode 100644
index 34afde5a50f2..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.2.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild b/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild
deleted file mode 100644
index 8c0fa471c2ba..000000000000
--- a/dev-ruby/actiontext/actiontext-7.0.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="actiontext.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRAINSTALL="app db package.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Edit and display rich text in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.6.0
-	>=dev-ruby/nokogiri-1.8.5
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/bundler
-	dev-ruby/mocha
-	dev-ruby/propshaft
-)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webpacker\|webrick\|webmock\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\|dalli\|connection_pool\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :\(cable\|doc\|rubocop\|storage\|test\)/,/^end/ s:^:#:' \
-		-i ../Gemfile || die
-	rm ../Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby:'${RUBY}':' test/dummy/bin/* || die
-}
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index e2be95ca8ad8..02c28d9d3425 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD actionview-5.2.6.ebuild 1948 BLAKE2B 91fab33b6925a4cf77c575279a5d329f856931362dadff109acb4e6bdb9195a1e1f3bc90c1520e5cb78a478bda6c681825b20c09c7107626be51647bac76c7ff SHA512 60cb6494d5b13170bd0730cb13ec3b75dc64a66b808fdad3219bd739ba997adceec772c6e5844c94654050921e4e1c030479dfc17af7f8e4abf91b5aa10aa63f
 EBUILD actionview-5.2.7.1.ebuild 1948 BLAKE2B 305564c561cd73ac2f7f6a564c72bff3bc8d8415856899848ef3e4ba8c3ac14f4cd98995e33142140f733ae83476437a22edc7c5a32c63c2b09b0ba8e3770646 SHA512 37697c0dfd0f9eb823f8dddea5c4b94201156b72f1243d278753e9a7800dcff273e3454a3c71d3ee171cc1d2aaaafe4aa2e6f82cfab73504b75404f4b2c38c87
 EBUILD actionview-5.2.8.ebuild 1949 BLAKE2B 2318f15ab6862d872d64734e008b337c0b51ab4a95f0a2fc1184de5d09bae6efc164dfab01a0a38e22b4778767ac2a674115ee6a1ede2f96ca99ce956a22dd01 SHA512 facfff17ed8150d196d99bc042d2c276e8aedf3791eb25a27309decb09bd97f3c508e95fc7bc00dc5c0db77fb7808e562f47c9889f2686dbe7d2d9d78710f132
 EBUILD actionview-6.0.4.1.ebuild 2242 BLAKE2B 42b0f4c405e3ae296a5ea487851978ed8a9e37e4981aafd84b3e248cbb72b002b48c486b3ceec143fea4e772e56c071be7a442d1a7d033d3f600b600abd6d7bd SHA512 8094a406f78109c27172958c4d2e3e8070a3f9a42fef6e043204cbdb2e7b83ca709665059f39ec274166629a50dbf493d2db9b770090fe52b393ba91bb6d9b8d
-EBUILD actionview-6.0.4.4.ebuild 2235 BLAKE2B 32ec4454b288c2c99803c25296f51191860129c8a6ef6697fc2059e62bf10e042850d5c6424a7d8b817ade50649c1a74969650cd9c792edbb39fe4d5244ff128 SHA512 a01647e768670731e8e9cbf0aa46385da06514cc7c50f2d000c684a8c915c2bc7778364654ae3d9a2c6e1cec33119d9f639d3382dc68cd7b1cfd958c75514fb2
-EBUILD actionview-6.0.4.7.ebuild 2259 BLAKE2B 19a6b5f501cc3c958e0d756fe8b809a37ea994121fe3619d65ccbd5218a2ea215973ebc23c2bf6ef1f562f34a9d35752f1c8e9ed680960389a217d84d713f5c6 SHA512 162fe9ea8ac920e20e10bf458c0de55b95ec65b70fdb0bbfd17fb90c4bfaa99fedc33a583f8124bcb0f8050a16c23240a0a6f5e799cf4474ccdaa9830102b0b3
 EBUILD actionview-6.0.4.8.ebuild 2259 BLAKE2B 19a6b5f501cc3c958e0d756fe8b809a37ea994121fe3619d65ccbd5218a2ea215973ebc23c2bf6ef1f562f34a9d35752f1c8e9ed680960389a217d84d713f5c6 SHA512 162fe9ea8ac920e20e10bf458c0de55b95ec65b70fdb0bbfd17fb90c4bfaa99fedc33a583f8124bcb0f8050a16c23240a0a6f5e799cf4474ccdaa9830102b0b3
 EBUILD actionview-6.0.5.ebuild 2259 BLAKE2B 19a6b5f501cc3c958e0d756fe8b809a37ea994121fe3619d65ccbd5218a2ea215973ebc23c2bf6ef1f562f34a9d35752f1c8e9ed680960389a217d84d713f5c6 SHA512 162fe9ea8ac920e20e10bf458c0de55b95ec65b70fdb0bbfd17fb90c4bfaa99fedc33a583f8124bcb0f8050a16c23240a0a6f5e799cf4474ccdaa9830102b0b3
 EBUILD actionview-6.1.5.1.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
-EBUILD actionview-6.1.5.ebuild 2060 BLAKE2B 346a9891060ab1f570bda2523c06b2eef15a1d6158f9900b357fbaf246c6d416f4f3a4aea6e7f5786e540d84a8af82f8be0a651da46250ad50b9713c4d556425 SHA512 27b00db883d55a869934f0f4108cc53f586a516a383784689b578acc4eb2be985a5407cac7be3edd122b03c371d7ea5c9614c520a4f1839cc4f1d2d70a9a6c9f
 EBUILD actionview-6.1.6.ebuild 2067 BLAKE2B 8a426722a87d183141f843eb2a73ed8728ede4ebad0c1b46df8896c96a4a7b4fbb1038084bef9d6c8280000f0a6c0055bdc00934fc6dd596784644670f4f0cae SHA512 e58ad6c657f930a82b06e4648eb026dce8d501eabf7b92084093288d7a9134abe27c591cea7f0e2a489ef05c932d6cafdb6c441853b07dc5a5f52a5e11ede962
-EBUILD actionview-7.0.2.2.ebuild 2139 BLAKE2B 27d6b9c2e9e5e3bfcf32a3e58962405108f9a002d6bd6c7571b001b05be62f5b071519c89f3da6be2333e59ab6a40e2751304b775e17fa14206ee734ff32d1f9 SHA512 3af4e190ce1958862353af95154827c358a116f695087c7dfa30030941183c0f655215d1fef3318e2711de88a96b93723265c7a3f30a5a817eecf2add55a38ac
-EBUILD actionview-7.0.2.3.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
 EBUILD actionview-7.0.2.4.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
 EBUILD actionview-7.0.3.ebuild 2146 BLAKE2B fe17efbef17a596d2647a1a9e6ed1b9fd2887d95742f768b860ca07370333380e2178c2eff0a970a6fa27aeb645df6d310f4b7cc69f4bb9c24154659cdb1866b SHA512 00fe7697ed2c1e2ab91fa7f14a06a0204691284d9028e7067527ca5e10817da2652ed13bc450e31272d0494f5503d09453c7f970923570b2ff9d3cd9a05ab569
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/actionview/actionview-6.0.4.4.ebuild b/dev-ruby/actionview/actionview-6.0.4.4.ebuild
deleted file mode 100644
index 11c8508cdcd2..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.0.4.7.ebuild b/dev-ruby/actionview/actionview-6.0.4.7.ebuild
deleted file mode 100644
index 0021524ea0b6..000000000000
--- a/dev-ruby/actionview/actionview-6.0.4.7.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activerecord", "~> 6.0.0"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-6.1.5.ebuild b/dev-ruby/actionview/actionview-6.1.5.ebuild
deleted file mode 100644
index 85b9d4b84d88..000000000000
--- a/dev-ruby/actionview/actionview-6.1.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	sed -i -e '3igem "railties", "~> 6.1.0"; gem "activerecord", "~> 6.1.0"' test/abstract_unit.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-7.0.2.2.ebuild b/dev-ruby/actionview/actionview-7.0.2.2.ebuild
deleted file mode 100644
index e0feca00fd09..000000000000
--- a/dev-ruby/actionview/actionview-7.0.2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-7.0.2.3.ebuild b/dev-ruby/actionview/actionview-7.0.2.3.ebuild
deleted file mode 100644
index c700736654d7..000000000000
--- a/dev-ruby/actionview/actionview-7.0.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.2.0:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/activerecord-${PV}
-		~dev-ruby/railties-${PV}
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid tests failing due to missing logger setup in activerecord,
-	# most likely related to test environment setup.
-	#rm -f test/activerecord/render_partial_with_record_identification_test.rb || die
-
-	# Fix loading of activerecord integration tests. This avoids loading
-	# activerecord twice and thus redefining constants leading to
-	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
-		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
-		-i test/active_record_unit.rb || die
-}
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index d363f62ae416..a2a40ceb8a94 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -2,31 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD activejob-5.2.6.ebuild 1194 BLAKE2B fb5d5dc3f503d114a248d4b5a908785923754a59085a142124547cede3c177706f0ed937b14fa7611bd4a9bbf1a5b3cf5ddc84463bc3459919ed321c47718100 SHA512 4b9e1d5c99a192bd64a678541fed2955a5abd7ccd69ae13b3341ad05eb7bf5b895372a732cd9b54e92898bfa3c3ba4f1af27fdc802985becc57d3ad589dde687
 EBUILD activejob-5.2.7.1.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
 EBUILD activejob-5.2.8.ebuild 1194 BLAKE2B eafe15e498ef2337038d194cc7938766da9eca94eb3b8b31b2ecc236c75d07dc0db04f890689c2812bf5c5c78b566aae707ec0415fb9be647f7af0662a6f2f30 SHA512 781652a8bef99bfde9b33cb33229f72c23132bf27ba72d7b5b256c4bd2a3c253e53a40b6b9f1d817f4cc1901a96e0a62c1071de3bcf77a2fbf60083dd5c6862a
 EBUILD activejob-6.0.4.1.ebuild 1207 BLAKE2B 2381e5b47f9ea214bf25fce72612f345fe2e0a1427d2daf5b17cab981c95233486b6c94a5aeb363951f589541a92b46b34e09c449170de9dbe62636258b25e11 SHA512 3192959ef70e56e1c53f5795086a26322301638411804a11891169c754acfbac907ae40eb149efc3034cf514d54a422469cd28d873f575b4399865d6f9114f1e
-EBUILD activejob-6.0.4.4.ebuild 1200 BLAKE2B b25de3d787173d7e09260afbc2b94b0511fc8c019a8c8c4fc4b45d8b07f09f05de2a3d46c6a15eb796c9867c404fae727e9ece495dbdcda31930616c22f81a97 SHA512 d7e47985f0f709bfea1d151b9d691dce08595de9cf3ae3113777c2bd949749388fb96ffc0e5831eb4642bc371e545e09ea3c97a14e370ac3fb0dd448a18a7f85
-EBUILD activejob-6.0.4.7.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
 EBUILD activejob-6.0.4.8.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
 EBUILD activejob-6.0.5.ebuild 1200 BLAKE2B c0f66d62d5d3d5fc3e2a7660655387adcaf4809a8eeafaedc522af934141472f50a749da5062ee5c72c3f68b19436ee7d22082c393cf51e65749b558c000129e SHA512 b65aa787da316c02b0b468fbe3461b96529ea86e0fa2501873a02e4260022f72ccd7191fcb7f6867e5be03decf16409ebc013c2b98b9a50690da2dbce17f6ac4
 EBUILD activejob-6.1.5.1.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
-EBUILD activejob-6.1.5.ebuild 1135 BLAKE2B 338e21f624aa8b72cd87dd506501ad9534ecc592a23862d4b3d0fd02e8fdbbd6308a1861830d340fccb91d79da0123961ec5a93bb03e068466de58e318aa1ace SHA512 643683f734dbd441ecc072695461fe64f9bd82a816f1a47558904fb2415c000a7acd3c8ac9a8b1b9edcfd852921a210d9eb9849ed2e7f23fa0de18bb8550db27
 EBUILD activejob-6.1.6.ebuild 1142 BLAKE2B 8deaf55632d87a517d0fe3e6f0895def8214ef06845567405dbaae6244a93ae926c1c99a0f3819897f2a34144bfe6d394069c89934f3cfa520187299398c97e4 SHA512 787bc385126637ac1ff4940337e05de90dbf2d15fff41344770834ba94fb9ece75657d378c0393d262f56153f33ab6e6165d614b2718c09ad493fa42b3bee448
-EBUILD activejob-7.0.2.2.ebuild 1182 BLAKE2B db5cd8c33b1609e0018edda573def225e99e414d8ec0088dc5f7e065c383a0194e70348a51be30a209961a6f25778961ac0a638d9b469be39427b4b8de11f48a SHA512 1b1a7ae3ff0ca10aad1b8d20f69928abb0d80ccb17b2c1c22661b9ef1c4356a5ac6797074c9afdc4a9d71c3f047196611fc135cff60f69b9f0f089130add126b
-EBUILD activejob-7.0.2.3-r1.ebuild 1177 BLAKE2B 3e30f3386f579e0ecfd305e8043b3a22a91c27410c4f7d287f2c9a7d7657d511429a1731c4c58efd1c3af339b1e67e9523c2d122b322a4eaea8b7e11c517ec47 SHA512 33e483a82038f0d7334e525aa488f5702a3dc445b0c2ffdc4aaad5eb4bf5d83210f896035d8ff47fa37edf9b9f5f0cbf2c150d038e134f7531bc9d37ffabf66a
-EBUILD activejob-7.0.2.3.ebuild 1182 BLAKE2B db5cd8c33b1609e0018edda573def225e99e414d8ec0088dc5f7e065c383a0194e70348a51be30a209961a6f25778961ac0a638d9b469be39427b4b8de11f48a SHA512 1b1a7ae3ff0ca10aad1b8d20f69928abb0d80ccb17b2c1c22661b9ef1c4356a5ac6797074c9afdc4a9d71c3f047196611fc135cff60f69b9f0f089130add126b
 EBUILD activejob-7.0.2.4.ebuild 1189 BLAKE2B 19c984bf8d98c3abb4f985ded7eefe0f47752eaca407536e238ffa059ec2ada62d7a209a3d2e0d778cb285157bb423d5887159f6364f011c1a38be83765a6e03 SHA512 2186ed2f6431c0b7a81805f8863fb1f84fad5f919925ace28c293c420d270c4c3538cf965f3157b0012e5fef69feb40e0632ba846314a8af593285db9761e1d3
 EBUILD activejob-7.0.3.ebuild 1189 BLAKE2B 19c984bf8d98c3abb4f985ded7eefe0f47752eaca407536e238ffa059ec2ada62d7a209a3d2e0d778cb285157bb423d5887159f6364f011c1a38be83765a6e03 SHA512 2186ed2f6431c0b7a81805f8863fb1f84fad5f919925ace28c293c420d270c4c3538cf965f3157b0012e5fef69feb40e0632ba846314a8af593285db9761e1d3
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activejob/activejob-6.0.4.4.ebuild b/dev-ruby/activejob/activejob-6.0.4.4.ebuild
deleted file mode 100644
index 095ae13c2e50..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.4.7.ebuild b/dev-ruby/activejob/activejob-6.0.4.7.ebuild
deleted file mode 100644
index 9f6d7b2fa4fb..000000000000
--- a/dev-ruby/activejob/activejob-6.0.4.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-	sed -i -e '2igem "railties", "~> 6.0.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-6.1.5.ebuild b/dev-ruby/activejob/activejob-6.1.5.ebuild
deleted file mode 100644
index a0adaa549825..000000000000
--- a/dev-ruby/activejob/activejob-6.1.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=1 test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '2igem "activesupport", "~> 6.1.0"' test/helper.rb || die
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-7.0.2.2.ebuild b/dev-ruby/activejob/activejob-7.0.2.2.ebuild
deleted file mode 100644
index caad0a9828cd..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-	rm -f test/cases/delayed_job_adapter_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild b/dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild
deleted file mode 100644
index 250ee550689d..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-	rm -f test/cases/delayed_job_adapter_test.rb || die
-}
diff --git a/dev-ruby/activejob/activejob-7.0.2.3.ebuild b/dev-ruby/activejob/activejob-7.0.2.3.ebuild
deleted file mode 100644
index caad0a9828cd..000000000000
--- a/dev-ruby/activejob/activejob-7.0.2.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-	sed -i -e '/SneakersAdapter/ s:^:#:' test/cases/exceptions_test.rb || die
-	rm -f test/cases/delayed_job_adapter_test.rb || die
-}
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index 981d09220271..be4f8352c12d 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD activemodel-5.2.6.ebuild 1096 BLAKE2B d5117f14855812a0b7e3788fd89fd0d75e74c765e1ac3a2e6c88aef7e877accc0e40245bb425a5968bcdac1cc7c9de79862b11af69bbf7b60fa002c5ea2e9f11 SHA512 b326348e70498784c1f045cedf47498a57eecaf633c90826cfd7e13f6913e3421b4e0cb6ab159d99c133af61579c0a8689e0cff40c94c70e4c121b06286e0b51
 EBUILD activemodel-5.2.7.1.ebuild 1119 BLAKE2B 750cfa6bbfa3d980ecd85af9a5ba1cb1c584ccb4cb75868edeb0e2d3cb990665dd214e915b5a8f28f6622a18ae738e656945ea361e6f1266c99e99b10a9f89bc SHA512 553218e1b4ab9c8f21e9b2e0318408080dedd500843f348cd8f8d8d776e7a54707a1f2588c0b8ec57daf196c2616eed118c2826629dcaca33719addf1fcb5db6
 EBUILD activemodel-5.2.8.ebuild 1120 BLAKE2B 958341ffd217e403d2a1bd68e451ef8c25d14ae621695508c165265732d929320060f9f8b0ca25813740d82ab3967f8acf1e7275aed89a6d03de6480cf517b32 SHA512 fc4140dd601b6c184e12b5844ce6a82b46a1a6e8547289f05edd5f0c8b897f40f3f8c5f3453b758b58c15e4e8eea3f9305a010bd173e16f3be608aceaad3d32f
 EBUILD activemodel-6.0.4.1.ebuild 976 BLAKE2B 06a0c071b03b7986180ce9baf3aa2f7afed66c7f6267305bb870281e2be2dd8020821970344a1591051196be8bbba4d7d286802828dae280b6a9557f58c57fc0 SHA512 9b65a71146f045bebb9e9b8358fa9a4fcc7d5552f0c988580d415909c62a49d0e64a5ecda6d3ac79c0fbec4c57b7a75263f0e8f10f0b4186d3ed7bf3b3c7173b
-EBUILD activemodel-6.0.4.4.ebuild 969 BLAKE2B f826751220996a0f02a92cdb0ec80f704f49cc280043e1d0fbc895b0c99af04543c33124806230661f4acec7b6252d6d9c00d6f8d73eb4cb55047eaaba57fca1 SHA512 1b0c0b478489e64d100842cbe8ec92330e4c5478202495753f7b13872654461901b362fc172548bba1e697e9ef067e75d073eb804e3adcaa5e882382a70e3a37
-EBUILD activemodel-6.0.4.7.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
 EBUILD activemodel-6.0.4.8.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
 EBUILD activemodel-6.0.5.ebuild 980 BLAKE2B b983f2855d832c4b3e3f352eeead2bf79a0fe860be35569cf36d40a5b03b8048e35d28a59fe164d15de4ad21010a616b9066f9cd12e1ff54294250ef082e7280 SHA512 148928824c4dfac16be2cda888bc9d23f851e2cd165ae4d42247974efdac8030500ef1ad51f284fcf70a7bf22332945b35db9533fe80e755081c8aef0195dbfd
 EBUILD activemodel-6.1.5.1.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
-EBUILD activemodel-6.1.5.ebuild 970 BLAKE2B 8c0e5331d728f3bc538660b0ec13f72f4596b6eabeb7b3cc9d22d4b5bd25eafc10832cc2619015f10dbbafc62d14b053d00feba163266cdc9616003301ad028f SHA512 11b7694097a0d14c66c5eb197c1e7c939283b0316be3493619eef4251008ccf395940c528dbf24db8e04775685dd7275e6bc61b3136a9fad008cb8f15ee607f6
 EBUILD activemodel-6.1.6.ebuild 977 BLAKE2B b9b16e6806d9a2492ab8c46e736157bf90eec764d84ae7e4934cee13d9dd57721bdf117cecd5324cdba361eb5ae11a29e7e1f245325c8f15e71fc5608513864e SHA512 0f54d0f2c0e369880989930f0997509dbb061a0b60b6476411ff072620aa9dd45797f962d1a6c78291c5ac106f74a51ca619c44e6ff3748060ddf444a37b7c08
-EBUILD activemodel-7.0.2.2.ebuild 951 BLAKE2B 2331de2fe4e167c16996de3ea09e4ae4541d952eea2d79f631239ed9d799cccce39fd34071adbecf2ad090143356fc83b7c429c9df9d3a9a5dd2ec450abfc52d SHA512 0b347ae77b9bd6096983be1e2b15feb80fb5b594ceaaf31ee41ecffbb16aed9865ba216fa576327dd9ac9beb9d0618bf00f5656e59c2a288b8d04f6d2c08dbb0
-EBUILD activemodel-7.0.2.3.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 EBUILD activemodel-7.0.2.4.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 EBUILD activemodel-7.0.3.ebuild 958 BLAKE2B bafde4c47abe2504c89cfe2614be69b675895216a848bd2eb0e10fd7f82a32b7a788596e6aef46fc85c4eefdd88f2189013c70ccdad06349694a533146b21c2d SHA512 b93b747160b5174c73aeda170680cabbc3e5ec66691eeba9c7b1198052443bc12b55ab284d65ef280a87d6bdbaa5c18c783d23a420940cb6b1d2dfb598919b0b
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
deleted file mode 100644
index 72fd8222d8ca..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.0.4.7.ebuild b/dev-ruby/activemodel/activemodel-6.0.4.7.ebuild
deleted file mode 100644
index 4e43fc718e2d..000000000000
--- a/dev-ruby/activemodel/activemodel-6.0.4.7.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '3igem "psych", "~> 3.0"' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-6.1.5.ebuild b/dev-ruby/activemodel/activemodel-6.1.5.ebuild
deleted file mode 100644
index 621481c37e88..000000000000
--- a/dev-ruby/activemodel/activemodel-6.1.5.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"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-7.0.2.2.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.2.ebuild
deleted file mode 100644
index c5510345e170..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.2.2.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="ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-7.0.2.3.ebuild b/dev-ruby/activemodel/activemodel-7.0.2.3.ebuild
deleted file mode 100644
index ffe12032f8e3..000000000000
--- a/dev-ruby/activemodel/activemodel-7.0.2.3.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="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 30d1ba01034c..7558ed7096d7 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD activerecord-5.2.6.ebuild 2946 BLAKE2B 81d5b3915867571e063987354da77067a07e7d6fd2e28b6a58031679948fccca12b6629f159188a3f87d3ddcd28baa0512e502cfd59dee60db2783482a66d4d5 SHA512 6d42fd304dc3a052f74d7dd1e978db0bb6130136ed9449de503bf2202b8de3e46aecb09ebdd4a21797bae455c8d4f149f3665e9c2e96ba10fb7337804c5abb67
 EBUILD activerecord-5.2.7.1.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-5.2.8.ebuild 3092 BLAKE2B afce126a087c592c016e7a2cef7bc367db343e45a8b72f5e8d61575ecaa5cc5f12b161f0f8ff2fb2a17578e12efa50a6f170ed723895a406ffa6b25dcfb741cf SHA512 c456d0741cfc8b886de94f28289e1cc8a468698e261c713424f3467865969debd104224957ece76b5aee75e6d7a31f22dfc3817a893f982659dd51b58235fbd1
 EBUILD activerecord-6.0.4.1.ebuild 3152 BLAKE2B 21c8878136747d8ff16e154c26ac7361c09a5d36fffbb00d757db64a9125e9d64e805e59aab60c214727ed0f89f2d781d4f99b32b4298378e4f94cfa45c99623 SHA512 22f53a47fa85ff5898c62d52d85ca3024b620a21f7cd834bd3c79853dc039eff89e4b279b007a37710941ae02bf133d1b24ec34e3f3367c55e8d411a52cd45ec
-EBUILD activerecord-6.0.4.4.ebuild 3145 BLAKE2B f24ea20902a8800bd20e65274cdc72347949eb1cc530a53cfd5e30c2bd0cfdbd88559cf272e3956c27e37a6abbb2927cc86d5f120cf9657e7808ec7f4035b98f SHA512 9c846fc1a2acd78a1b607b8645574d54a828087f8ff751adae1b9ef94dbb50e24a120c0e1c3a8c357c3a036261d7c7d314ef2aed5c60e36ccaf75e6e21302dab
-EBUILD activerecord-6.0.4.7.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
 EBUILD activerecord-6.0.4.8.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
 EBUILD activerecord-6.0.5.ebuild 3279 BLAKE2B 7b8a25923c1e052c4dc1ac54d9d7e6bdbfb389219562d526a6f680cc3f6eb1aca245cf3d836f04ad6f964f4ba06ef4233da78659eb515730587c06800f9166e2 SHA512 68b9f350a473142b9eedb41e5b036f5f6c1621a88c0e34c79cc91090f93cfb47db733615faaa50b105fbed9c7fddb77ab491d96750554d5c3c44ebbfb0263bfc
 EBUILD activerecord-6.1.5.1.ebuild 3376 BLAKE2B 16091f6b4a2ee090cc13c59ba4c5d198f7815ea0f6b45f7d719f28e561ca81829900d8f5e158045ac1027475a90001fb0551848613d0110ebd09c575a62bdd2c SHA512 7afc3d49f9025fd6a87e67a9df55aefc16a4a55bd2bb05eecc71a92a6dacf6933fb2522a91e78d7941ba6fd57767e7e8d263169166d91c94afc311ec32c340c8
-EBUILD activerecord-6.1.5.ebuild 3369 BLAKE2B 1d41bddab16daa366449d72eee3b6fc38d5bea1b3fb372e22c05b478b2c4b9dff388fa310263ad6b9d0f1d852491eefa22ec67a1a3809a0b5409df42630fca5b SHA512 6a87b5f796c70d3fb9e9cf4df1624bad7a86ca559bd88e893e9404025976d053f65de77436a8a9f62add5ac65555674e10aa29384aad040fd447aff6cccd7f6b
 EBUILD activerecord-6.1.6.ebuild 3376 BLAKE2B 16091f6b4a2ee090cc13c59ba4c5d198f7815ea0f6b45f7d719f28e561ca81829900d8f5e158045ac1027475a90001fb0551848613d0110ebd09c575a62bdd2c SHA512 7afc3d49f9025fd6a87e67a9df55aefc16a4a55bd2bb05eecc71a92a6dacf6933fb2522a91e78d7941ba6fd57767e7e8d263169166d91c94afc311ec32c340c8
-EBUILD activerecord-7.0.2.2.ebuild 2950 BLAKE2B a17059c97353ae55ae0f23c63877db11620eaecffa66a2036069ee9d74097653b9f422456f396bb4a6a11be914266b9d03d94303bbac75bc39b69ee697446bac SHA512 87795ddc0914007934db30499c2cf43bae23391c2ab37db8e655c43194b2c24c30bdedd823cf813c2bf49e4bd16fce8c98fef771a622bba0a1fa2b3a80625a00
-EBUILD activerecord-7.0.2.3.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 EBUILD activerecord-7.0.2.4.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 EBUILD activerecord-7.0.3.ebuild 2957 BLAKE2B 50dcc61f8e2ef461da91dad821341f8c6612d37040435c1f9c3b8a87ef791b29b14a2c7e9087b175a7ef8b64389526c6780e270f15797c0a38ec73fb29db3fec SHA512 7a4a86a3457a8945e788f76579bcbc4f04c1743646860199cbcdd723e6a062c9684a7cf7458be141711762ff3f85b355d48c25e6f0a315e44a4f57e5e0e09c52
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
deleted file mode 100644
index adc29bbec73e..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.4.7.ebuild b/dev-ruby/activerecord/activerecord-6.0.4.7.ebuild
deleted file mode 100644
index dea3e73927bc..000000000000
--- a/dev-ruby/activerecord/activerecord-6.0.4.7.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( dev-ruby/pg:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	sed -i -e '2igem "railties", "~> 6.0.0"; gem "activemodel", "~> 6.0.0"; gem "psych", "~> 3.0"' test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems activation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-
-	# Avoid test failing due to sqlite EXPLAIN changes
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.1.5.ebuild b/dev-ruby/activerecord/activerecord-6.1.5.ebuild
deleted file mode 100644
index a98f8886dc8c..000000000000
--- a/dev-ruby/activerecord/activerecord-6.1.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Load correct rails version
-	sed -i -e '2igem "activemodel", "~> 6.1.0"; gem "activejob", "~> 6.1.0"; gem "railties", "~> 6.1.0"' test/cases/helper.rb || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid tests that no longer work with newer sqlite versions
-	rm -f test/cases/adapters/sqlite3/explain_test.rb || die
-	sed -i -e '/test_references_stays_as_integer_column/askip "Fails on case difference"' test/cases/migration/compatibility_test.rb || die
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-7.0.2.2.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.2.ebuild
deleted file mode 100644
index 47d013e257ae..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.2.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/benchmark-ips
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-7.0.2.3.ebuild b/dev-ruby/activerecord/activerecord-7.0.2.3.ebuild
deleted file mode 100644
index f59c119d4b8c..000000000000
--- a/dev-ruby/activerecord/activerecord-7.0.2.3.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-1.1:1 )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/benchmark-ips
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.4.0
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' ../Gemfile || die
-
-	# Avoid single tests using mysql or postgres dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-
-	# Avoid test failing related to rubygems
-	sed -i -e '/test_generates_absolute_path_with_given_root/askip "rubygems actiovation monitor"' test/cases/tasks/sqlite_rake_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index b49947d65360..bd67251800db 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD activestorage-5.2.6.ebuild 1931 BLAKE2B c21846d95430ec061a032edfc7fbf0c73fadd63e6cc7b3fa9e05ab254e5c9770911cc1e070af93f5b2ddbde7152fcaa5e6b18fbc133e4be00aded83c1f3d29d2 SHA512 cc5cb62936d3e6088bf9fab11d754650dd931aaec24b41bde568a28d8a644ab7c9f4780b60a6bfca23722c406c90be6872ca84a3a4fe3b2ae1b51a405d691739
 EBUILD activestorage-5.2.7.1.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
 EBUILD activestorage-5.2.8.ebuild 1931 BLAKE2B a22f9d410858367f434cbd9344fa280765aee175f86c9aabec3a13a0ee4d5135e2d48c74d1fbd783042404deec5944cb9a70822ae4703fd10a7bd0fa35af0547 SHA512 9269cdd38589705cbe7639340de90abee2c2b33d929937e4a56541626eca4c5cab49be95b69a00da76de0904a91109bc68e05ab4a4243fa237f8dd716c5e9711
 EBUILD activestorage-6.0.4.1.ebuild 2173 BLAKE2B e175dbe0b39307c2ace8d1a5d2f10ef4fa9bb28cd9decd234213d5a3fd3431a6c298ad2114c97b30b956f3a8a95dc847506ecb6b8bdf0bafc765a2c503b02ba7 SHA512 5f8115acebcda3b591bcfc197bbe074678abcb80f573008329983dfbd151f7c7400984654bcd211290e257831e132976b32e960ab7d317c0c49c86ce5dd2a7e4
-EBUILD activestorage-6.0.4.4.ebuild 2166 BLAKE2B 463877b18f2e8a9a4a232792773a63b45720b03421ea333d1768621e752fb7d05b42ab39fb9170516a49c0d55d92f0f6679b76d43ec797cb800fb841c86209b0 SHA512 21997ab7e51ff7d6fa0c20e64f92e4bfdcb5deb749ae17a27f380b860fd9f8f42a36abac1d7ea6a618f1b0359aa41ae6702b5d6a4686c99bd1c78566a55240c5
-EBUILD activestorage-6.0.4.7.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
 EBUILD activestorage-6.0.4.8.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
 EBUILD activestorage-6.0.5.ebuild 2166 BLAKE2B 0f6f53ab9169d78d9f52cdfe2c0c99528796c45236333ae6f32a925c2304e529237aef43ce6c5da7c08a0412abbf15f5a9226e4e36ff48f6beb94bb0dde73136 SHA512 e011807067d6ead349412c1c5a993bdb7b085ff380edcf022d40032073b24aae8dde0195f4d5b364444fecd06fef369532e682c7b4e61681747bfdb2d5648b44
 EBUILD activestorage-6.1.5.1.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
-EBUILD activestorage-6.1.5.ebuild 2042 BLAKE2B be18bb3355be7c7f0bfdb5edd8e4bf2af211769f0ca741abcd275c7e96533926fcc72048a9c753a4e29b22fd8cca0919f782bd6840d6676452bef8caa9243cfb SHA512 4bcdd75b98784c4e93606a73ab0fbcc28457ad6c929be849d242d72303bd2e4286f4c6281fc36bb65682534c167ed1d4a7ef87b761102b701f13f71de0cc7e0a
 EBUILD activestorage-6.1.6.ebuild 2049 BLAKE2B 843e293c3ebbfa45f11bb1f8e5119b956466e8f1dc37dca62dde9cb0c8510117d6ede7e93df63040e1e1fcced5085f66018e818582b27f94f8aaa7a3085d507c SHA512 302a8e5c7d516b83795b2fe19f91d74d32d334ae2897e93d6d88a6150b1909886e0d530dd5306ef749cbd22456b3457619b7eff1047a6f4c43b346615915a8e0
-EBUILD activestorage-7.0.2.2.ebuild 2468 BLAKE2B 7d7bee4258b13812247e55b0986f862080020a10c4f11c31373aaafd8b7abda740a8c3bf5d4808c07bdfde14d989d2452bf2072720b804bfb241846ffd9e7482 SHA512 94551935e2242e3e86ba8291cd2e22f98bdb573599ea2ae8bd1a8f8ba19d3ddce5cdd070df31d33b5ff480d0e57bb1d4fda089a3ee567cdfb56ec087363c6322
-EBUILD activestorage-7.0.2.3.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
 EBUILD activestorage-7.0.2.4.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
 EBUILD activestorage-7.0.3.ebuild 2475 BLAKE2B 9eb0730624ccd559c66123af846c21cf18ca71c020fc871f1b4cb0b20fd9254a21f35233b98b91dcb697a07478ba3535e8d86efda4d636ccee8b2dfebdf564f8 SHA512 375a0f524fe77750397236e78a76bb8f4e10db415b3d2cd65b96e3381fb484fc9f83430bd3135d8161eee9875a00c976b762abd049747f0e07b91a5b35de59bc
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
deleted file mode 100644
index 4f45ca8b516b..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild b/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild
deleted file mode 100644
index 2655d687a077..000000000000
--- a/dev-ruby/activestorage/activestorage-6.0.4.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	dev-ruby/marcel:1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Skip test that has already been updated in later versions upstream
-		sed -i -e '/resized variation of BMP blob/askip "broken test"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.5.ebuild b/dev-ruby/activestorage/activestorage-6.1.5.ebuild
deleted file mode 100644
index c613c84ed18d..000000000000
--- a/dev-ruby/activestorage/activestorage-6.1.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/marcel:1.0
-	>=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-}
diff --git a/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild
deleted file mode 100644
index af4f860483b1..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.2.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/marcel:1.0
-	>=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		>=dev-ruby/minitest-5.15.0:5
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sprockets-rails
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-		# Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
-			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Use mini_magick since vips is not packaged on Gentoo
-		sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
-		# Avoid vips-specific tests
-		sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-7.0.2.3.ebuild b/dev-ruby/activestorage/activestorage-7.0.2.3.ebuild
deleted file mode 100644
index cdac79348cac..000000000000
--- a/dev-ruby/activestorage/activestorage-7.0.2.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activejob-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	~dev-ruby/activesupport-${PV}:*
-	dev-ruby/marcel:1.0
-	>=dev-ruby/mini_mime-1.1.0
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		>=dev-ruby/image_processing-1.2:0
-		>=dev-ruby/minitest-5.15.0:5
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sprockets-rails
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-		# Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\|propshaft\|sprockets-export\)/ s:^:#:" \
-			-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
-			-i ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Use mini_magick since vips is not packaged on Gentoo
-		sed -i -e '/mini_magick/aActiveStorage.variant_processor = :mini_magick' test/test_helper.rb || die
-		# Avoid vips-specific tests
-		sed -i -e '/\(resized and monochrome variation of JPEG blob\|monochrome with default variant_processor\|disabled variation of JPEG blob\)/askip "No vips support"' test/models/variant_test.rb || die
-}
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index ff3a14a4f164..cb7d01dbaa24 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD activesupport-5.2.6.ebuild 2542 BLAKE2B e35b58d232635db20c433dcf8237da6f990462f6c974f2d7a43a3b83bab0a60369d41e4827f54a03014411959952e27d41b333d7b3e1c9fcd0bc7e2d83a1035c SHA512 a242ec95b4068ed86bd5085c982a2c017f4e8cda427b5fd9b9af715db5d7ac57192f6ef117f8b2d850bea3a2bb8c2befea2dbd5a65916090f8fbeb1e9804802c
 EBUILD activesupport-5.2.7.1.ebuild 2559 BLAKE2B c09a8886f4da6f8c762c5a92ee99e37a5e97d1e378d73a913d8a171114c90c4b9e029900876a3c4b203f5f62e573e76473eac11efea755888500e670dab7bd5c SHA512 a68fe114f59d46131b7353fc728773a1e3823cb7c71e5d39043a896ac99911430e18ad534b77178f297f5e21199aa40d29dc4d530e4b704895819240f6b4b078
-EBUILD activesupport-5.2.8.ebuild 2560 BLAKE2B da9ab28b62de841476d5773d9a712d45ea267ac3a81259dff4dda510e2ab60ccf122371d763c46821ca07be9f9bda9a0137c9dc9b4e9c7cf42b75fac0b36fda8 SHA512 9e0cc8e5c05053c2241ad1a80e3299810557a3156524e319b91f6f8fc8f3575c376a9f78ac8c1183e064b4d737ecddfc1e81345391a6d69ddf699c999c19c7cd
+EBUILD activesupport-5.2.8.ebuild 2558 BLAKE2B 2937e4199201e656b1d6f428f3aab85d2a2d24cc6828f67d19128f528cf41702c45b01a40dfdebe32ac648dc53685fdd01d408a6dab7c8c8c9160104b8c5f159 SHA512 84be4fca800b263ac70869581ec58208613f322d5b1a51a6b35ad356112113e4695a8d1c461bc7329af6985fcdf6e35fb859a69605a1b3c7b45a934dca72ce54
 EBUILD activesupport-6.0.4.1.ebuild 2577 BLAKE2B c911f5ec8f7d00f4f40f67c5fe2dc84804d8b260d771e0511ffe325c9452d3a53497458b6cea8d02706f52080512c59e76dfb3620a331634b824f04b796ff81c SHA512 cb3ca951abce0c852ce23e324494d684f6b30146062c8a9a87ce67e2e5856b233d32514dafadd01a3087a6c21527ef32d64f3b259c584ca70555e0fa0c0c0fd0
-EBUILD activesupport-6.0.4.4.ebuild 2571 BLAKE2B 7d26d5bbb0973f316862af5b0b590e6c4b0d3c14a4e528675ff936a6d63049a3daaf77076ca8f51689f6ff986ad5804b090c4b8f56b4e82b65bfc7357b00a8a1 SHA512 36e5ab500a30b0d1a05ed3e16af03e080121b2c11a8e6e76119b6eff6cf544eb975c6f94c41ac17678923dc094d13585e271a2819edc3051d5101d94d7f0d249
-EBUILD activesupport-6.0.4.7.ebuild 2595 BLAKE2B 9ca5342c7e9de1ecefe1dd832321c38c22f0d883426225769cb363329e6f93225d8a8c0028b5aa8a70a7cde4455c161b2bcbd4bbbc84339b860dc955f36bac76 SHA512 6d1efd335f20ebb1c45c645dcd43518f3be79dc73af876109c8269b8a4c217de76b130aacbceed01bacf347cb1f697b6b3d3b1d20620ccea7b569aa82b19fad9
 EBUILD activesupport-6.0.4.8.ebuild 2594 BLAKE2B f863950cd753d007919595ab4235a65b411ee0f576cb01b733c6719d9024fc338bfe7089caa09ceb95cc52f7484598cbbcc7cfc0d5be1e828172e26457239820 SHA512 e6150ca20fae74de1a239523d5ba306b38366eba1570e712da0685bfd47b7d05bc49dfe51a51d3f4d8164d08a3439e84c7b2004ba27cdbf56131a8dff0e8e5fb
-EBUILD activesupport-6.0.5.ebuild 2595 BLAKE2B 9ca5342c7e9de1ecefe1dd832321c38c22f0d883426225769cb363329e6f93225d8a8c0028b5aa8a70a7cde4455c161b2bcbd4bbbc84339b860dc955f36bac76 SHA512 6d1efd335f20ebb1c45c645dcd43518f3be79dc73af876109c8269b8a4c217de76b130aacbceed01bacf347cb1f697b6b3d3b1d20620ccea7b569aa82b19fad9
+EBUILD activesupport-6.0.5.ebuild 2593 BLAKE2B bef9468f2915a8f675ff63a1f202a26253862d06f06aa1bd819316973af8aec4bb25a84ab68b7e77fa6ef5524d8784873ec0750949cdddd82c5f896df3e69308 SHA512 30b66c4243686fa1c2430d557c38450477e7a827896ab4a3f72074d1c1a4542dcaad1c4d55b242121c5803e6d96358dd816255c65bc4f37d677667166336c937
 EBUILD activesupport-6.1.5.1.ebuild 2686 BLAKE2B 64ca20f79b35e3122338d86e561cfe94ca26043aacee60846cd322942126771c914eb55b3acff504d25e197b62e08e2dba587fe63add53729a2967f5a6810ccd SHA512 1671dadf7797a7edc97f55cca0067ff544d4293ca39a6aa2cbfc9fabc25c8e51cffc7c854f5906054aadea45c4843dc76a2b693e04602aaf92def5b377e101f6
-EBUILD activesupport-6.1.5.ebuild 2679 BLAKE2B 0943d17143645d51a64269f7a1227dd74621b9d381a0724f5ca9f393dcb1dfcb210f419fe146e01faea20d296ac45cc9ca2633a9e21034235f20f8f31f916be5 SHA512 4c79f4fb00dc2e8d29e2a08751ce6d3fb48affd8cce268c9366e2ee6ca81543ba09e16489e3d3b8af9cd8b7b036fa807c69d49eeaa50d6727b0bfa445a2bc30f
 EBUILD activesupport-6.1.6.ebuild 2686 BLAKE2B 64ca20f79b35e3122338d86e561cfe94ca26043aacee60846cd322942126771c914eb55b3acff504d25e197b62e08e2dba587fe63add53729a2967f5a6810ccd SHA512 1671dadf7797a7edc97f55cca0067ff544d4293ca39a6aa2cbfc9fabc25c8e51cffc7c854f5906054aadea45c4843dc76a2b693e04602aaf92def5b377e101f6
-EBUILD activesupport-7.0.2.2.ebuild 2634 BLAKE2B 20a361f65ee46633a929f89198ea014688fe4f461c90c2fc6c36e800ee8e8192d02021bb64aa0e547d9aa0da288594c7f65d08ed4262810a9b143a038db8b478 SHA512 c75a5ad29150d369473f0a8089e25365436e6c01b680c43b52adef3a670cfa16fbaaf764233c8b32e54f034f10f89a6552e7e97e9811033c7fb19b77062eb093
-EBUILD activesupport-7.0.2.3.ebuild 2647 BLAKE2B 1ba06dda035f25868903d4cd18a651f539f2750d6d119fb983080e4d1cd5a5ac754b517ac46a7e1a1324970b7ff0dd04b1371bd2309422b51761c8b8f7355587 SHA512 bec8593cd5a925aa1c9bd8e89d11fea9184bdf804986369c064a19f5d22e4e9edb8f1dc5062762f88392f56c8cc597df77d57e5387cfc6ff6d41b664979838e6
 EBUILD activesupport-7.0.2.4.ebuild 2654 BLAKE2B 18b341807ecfc5657b2f75d6649f5e4fa21aa02d976146c4b873796482f1cafea278f0dfd0ffdcf27985c08e2394736d3ddd625b74410cd14b7eb7fae1db0ae3 SHA512 977b8788acd684828c64cc854d633eb55247037bd41e876b94b99385e11535ef34e710dc40cb240656a5c52bd724e11d3b2bf546580dc09c7bf307d67d554562
 EBUILD activesupport-7.0.3.ebuild 2654 BLAKE2B 18b341807ecfc5657b2f75d6649f5e4fa21aa02d976146c4b873796482f1cafea278f0dfd0ffdcf27985c08e2394736d3ddd625b74410cd14b7eb7fae1db0ae3 SHA512 977b8788acd684828c64cc854d633eb55247037bd41e876b94b99385e11535ef34e710dc40cb240656a5c52bd724e11d3b2bf546580dc09c7bf307d67d554562
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activesupport/activesupport-5.2.8.ebuild b/dev-ruby/activesupport/activesupport-5.2.8.ebuild
index 388b98e624c0..b1f727bcc049 100644
--- a/dev-ruby/activesupport/activesupport-5.2.8.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.8.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
deleted file mode 100644
index 32b8856b4b45..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild
deleted file mode 100644
index 42d7b05695d0..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.4.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"; gem "psych", "~> 3.0"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.5.ebuild b/dev-ruby/activesupport/activesupport-6.0.5.ebuild
index 42d7b05695d0..7d506409e031 100644
--- a/dev-ruby/activesupport/activesupport-6.0.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.1.5.ebuild b/dev-ruby/activesupport/activesupport-6.1.5.ebuild
deleted file mode 100644
index af3f42e0b0bc..000000000000
--- a/dev-ruby/activesupport/activesupport-6.1.5.ebuild
+++ /dev/null
@@ -1,74 +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"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.3:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\)/ s:^:#:" \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild
deleted file mode 100644
index e921c0b3b547..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.2.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild b/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
deleted file mode 100644
index 0a0ffb05e4cc..000000000000
--- a/dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	>=dev-ruby/i18n-1.6:1
-	dev-ruby/tzinfo:2
-	>=dev-ruby/minitest-5.1:5
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-3.0.1
-	dev-ruby/connection_pool
-	>=dev-ruby/nokogiri-1.8.1
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.3:3
-	dev-ruby/rack
-	dev-ruby/rexml
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|aws-sdk\|webmock\|capybara\|sass-rails\|selenium-webdriver\|webpacker\|webrick\|propshaft\)/ s:^:#:" \
-		-e '/stimulus-rails/,/tailwindcss-rails/ s:^:#:' \
-		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\|view\) do/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/digest/Manifest b/dev-ruby/digest/Manifest
index 5e3538024b23..86ba00ae7f99 100644
--- a/dev-ruby/digest/Manifest
+++ b/dev-ruby/digest/Manifest
@@ -1,3 +1,4 @@
 DIST digest-3.1.0.tar.gz 58646 BLAKE2B 64ea95ccd99c518b046b0193c5e9230f0941182e527328a3568b352924766dc2b2211f52bacefcd6af87d4ec1b9ecc7d7e96ec2b3b3c29d6406e1b8da245f583 SHA512 2a5d58d4b92f5391f55e43405d515ea045f8d0b0b09602ac8dc57e784b42787956904a8c51ffba026d2f0ecc2efff17a1d39c632d59afaf7941b455d8b2dcd39
+EBUILD digest-3.1.0-r1.ebuild 1088 BLAKE2B 32fe34e7711641babdb24ac3d77ccae025f9020d7cbe80ab861ece1e084c76c4c54c2a0007023459901631234dade64690f4b67455dc1610f233811f471f742b SHA512 e6d2de27ef4d25413ed79b44a5d3a54db7e682ff5b1becbb56d92105ad71770694c7b54808d1c8c0ea6689643c9f353da6b22304ee2edd2dea2d67928d862daf
 EBUILD digest-3.1.0.ebuild 911 BLAKE2B 64ccc720069c328de5f2f18bdafb981647ce8382fb6cec51a30cb2b2e389a510ed197159dd3fcddd5a443cee7917f3127dc8d4e69a78b9fc0d8dc6c363fcb861 SHA512 a8dbf0cbf79b02b474d281c6bf38e057f593e8aae1bc875bbf83a816ce2c4276db505bbfc4c5b3f0b66f494b27ca2f19bf39a1b76f5e6e207ca70a81898a367d
 MISC metadata.xml 338 BLAKE2B 1a016bd3e85b4f5b69ba5786b1ff95851702539014544cca7228219ca187de64a4c95067d45de0a88f2127a91ac8e78b175821682c13ff7ada4effbcfb7f7f48 SHA512 2e64f3ddca50af8e92e9cbdc83fe2145ca3cd88f65599f9c14bb835d27549051ad6e2d82fad57bd798a2812dedfea31f00ba89f7e6de040288be5b435c11d95b
diff --git a/dev-ruby/digest/digest-3.1.0-r1.ebuild b/dev-ruby/digest/digest-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..e7de0f81ae17
--- /dev/null
+++ b/dev-ruby/digest/digest-3.1.0-r1.ebuild
@@ -0,0 +1,29 @@
+# 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_EXTENSIONS=(ext/digest/extconf.rb ext/digest/bubblebabble/extconf.rb ext/digest/md5/extconf.rb ext/digest/rmd160/extconf.rb ext/digest/sha1/extconf.rb ext/digest/sha2/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="digest.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a framework for message digest libraries"
+HOMEPAGE="https://github.com/ruby/digest"
+SRC_URI="https://github.com/ruby/digest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:ext/digest/lib:.:test:test/lib -rhelper -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 2b3cbef6092b..c96fe51276d1 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,7 @@
 DIST mime-types-data-3.2021.0901.gem 170496 BLAKE2B 549bddb921941f15599db71dd76ed1502341101386c10550372796d5de8591575f4525276e196bfafe246132ce6a67007cd8afb0634013e5690eef06439af84a SHA512 382cfe97d19e516925dfa04220516ea6f2c4002e92831d6bb112c11a5378bf8af5b373763841ed84e6fa1bca4d72d4fe9ccde94ad0a9f6f7ce9930270574d8db
 DIST mime-types-data-3.2021.1115.gem 195072 BLAKE2B 233d801305d48a6fc126b8439b2067e6c6eb9e27bd48391fe0a701ca01b12aa23cf807999f46ad945e766b26d8d25a16453a26148f7c91d9322ef8704590cb4b SHA512 995606efc98dcdb9c19cf94ea758a210fde3e56ed6cd853101c97964dff0fba0da07aff87c4e39bbe11887ce2e15b19d781fce4ce264671d004426dde2761c64
 DIST mime-types-data-3.2022.0105.gem 196096 BLAKE2B a36b9254e256c86adf7bff10a0c2e2d4d0bd25257ff7c8b5bc65e57012b2b70a5d1ce9a1ef88126a18cf00bf801eb068160dfbdea4119afe8ee99075c54eb0ee SHA512 4b5998fb5d39ba89d4ee4f2f1fe20ec93a6b7214b28b77421dd9f7647b14c88342ba17f709f34640f65ce4c1bda08bd2be4aa35c7f99ea1ba2f9e21458540a00
-EBUILD mime-types-data-3.2021.0901.ebuild 615 BLAKE2B 4ae3fb11c956bf7fb21f0a3a5f8e0117302b4ea0ef01e68529e3a7ff7b145610be79c4e310f581ca24e83e2d7f3de3b35856b2591c251a09d1ad21d26a2d02f6 SHA512 1b8c453442dea1f1585f921b9aeeaf9ffb27c0667dce92728935c4a5d3a1297044f1b204b4186475fea9eab07ab5797558ffd2624d8f7a58b722b24564b8c511
+EBUILD mime-types-data-3.2021.0901.ebuild 614 BLAKE2B f3fd2cf67e12a5616c4bfec491820de5d3d05b79a8e48986cbb052c87052e4491b7754cacb75495ccbdcd084cd7baa1a30e429d42e3cc57276117d005863e22d SHA512 dcdcdecc566f5c5ad6a6be2eeebb4faae716dc7a95e6b423085fc962afbe84386ddc8bdc04116aa77a8ade62e58e5a8b737152bdda111dcef8519e51ad4e3342
 EBUILD mime-types-data-3.2021.1115.ebuild 621 BLAKE2B 721c9086925e7b18cf72528451c35e409ecc237460ba5ff0bd646bbeb6fd66cd9b39f0b10c2b5893e8188f191f6d4b2dc4e409c5f04ca5aa105bc5c723f5039e SHA512 3c7399bef269d48c58bef801a3fd11676433e0e159a70630c5e9d430ab0605134eeaddd479fdeacc2561bab6332763b915593493a8a8f739c1c91bc5651f7581
 EBUILD mime-types-data-3.2022.0105.ebuild 634 BLAKE2B 8aff72c76c15033f41986ee327da32329d341d17e14bd6a188fb74ff128e6b0fd9a18aa9285799205bf45a87d89430381cc0c67ba0c35581b0793ef528207126 SHA512 62b60817e5890fa3ce14bdc7b5127cfe1c9ba0baf6d47fbafb0215237183ad5ab10c447ee90a466bae3a1bd5cb336dfc1b62a83729c9eb70790a9d65496aa706
 MISC metadata.xml 353 BLAKE2B 8cfdcb1624b48ec3419ebaca31fe8045773377232977772d5445558947c2c0272c8777b5949fa9a30fc41275082fc284d6110ce640d465d9f6ee4c6f70e7f470 SHA512 072336e2f6abae82b5d66bd077d0b3651b6d8a3c1846d1e6e84974e0cb275881a986ec4fbabde731aeab59eb956514c44adfe5b67b185660f20eb1a286b22a26
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
index 7ec3ec22aea8..2bd23b86cbff 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/Manifest b/dev-ruby/mime-types/Manifest
index f0c039c17cfa..c37908a440b2 100644
--- a/dev-ruby/mime-types/Manifest
+++ b/dev-ruby/mime-types/Manifest
@@ -2,6 +2,6 @@ DIST mime-types-2.99.3.gem 149504 BLAKE2B f0e34e5379948e5e742f3d9db0214bcf40bcdf
 DIST mime-types-3.3.1.gem 36352 BLAKE2B 66b97cc51d157d445d05823a3059efb6684a59d6b976945df77beb6497979a83d3ada4832cc36a42b6fad2353d1b5f2d7d1271a7947a0264978f30b857c0c7c3 SHA512 48646c5d3cc1b65ad0418bd765c86102d5dd7d0196f1b2b4b92acd350d6927e0c0fec3d30d04bf8b073d342f56b38663dee791f2c87f82b5743c6508265692ec
 DIST mime-types-3.4.1.gem 36864 BLAKE2B 09c6c2fad3cad3535e5c357b49c84b2c1809903235f3bdbeeb766157c48bfc899f32fe95be535feab3c7835c4b535e25b49019c14f51dee1a812fdb735f0f7af SHA512 d0cec7afbe1685c008765997c3047f23bbb0bd10989cd82475805f932e61c400b3d2e60f5f95804c46919b57f0d3644c866be358b0c4c653ace43d62bbc98e4f
 EBUILD mime-types-2.99.3.ebuild 940 BLAKE2B 4cad7918c2a0be0f6e9b34cf511ab7b78f3e5840dac5f9efbe7dd4543d03e507c94343ae3e04898869399228a5b7b503af68d2c216fcfecb2e0043279139552c SHA512 cc1fa44a3acd61ab4b578062f6cc422c927d91e17dffcdd8a1ac408ee37d74e7614becb4b52ed4a2745cf869344c1c8773e915fc9fc2eb8c813fcb910815e6c0
-EBUILD mime-types-3.3.1.ebuild 879 BLAKE2B 3037ec8d95ff8f322bc93610d2453bcb8a060c8efc25abd08cc1b28a0cd6002251c1eda888c6e691936b0331f9f12599c5142c3fb33896aacc2aef0289cf6b51 SHA512 a53f1df6bb02f913fc8add73d1c03f4ab3115f24a09b4cb64210fe81084bcbf7e429c7f0d4473612321cfafeb75a8babd7b9239c72f29241a16abf4e650eb633
+EBUILD mime-types-3.3.1.ebuild 878 BLAKE2B 9c75a9a749324d00ebcc9d985c8fcc75f2d7bcf5eaf1d12474812744ea5db043128f4c8f0bf7548fd70f5f0e22f2467ff4a566623cf2dee52c15cb0d32af9632 SHA512 c0b4c9f157e4bad0abac9d28eead8b8607639dba04857eeb40c4185b443e6d283e9a264cd668fdc6ff210643df763634577791d36e9437d455cae1d6f7ff368a
 EBUILD mime-types-3.4.1.ebuild 912 BLAKE2B 0c64abe69e4fda465be667ce0fa0edbc4ef9bcc01d9670e773a2191db5e50df40926b955f99dca5c5dc23d9a3bcaa0abfd5d4b13a5b20e5ba3dc3143cedd9c01 SHA512 a68e30250be4f14174f9e0328632ec6e1b653244ac7e1bead5935b0732f544d61b49b04f5c16448db1ffe06b11864d90d0887f3fd80ffc4bd457fffc860a8e82
 MISC metadata.xml 353 BLAKE2B d3a674bfa5b4ee14e4ae29722f8b03c7fe30f8978bf40654bf3dad99d67d09a34fd2b01c1f347cb014f2d306ffd31fdcb1f8d1f68844d5005742a979c6308618 SHA512 ec6b59001e875f74e73e645b69828d9498e39e0820016eb453341f0f0a14b7d50e4fb188d959a1893f438fb4f8f8c8b0f5422b31bc1e9ed08ca8bfc33d78a50f
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
index b9a2ce0dd25a..21734ebfd11b 100644
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index c6c8175a437b..3918c1dc13cf 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,9 +1,7 @@
-DIST msgpack-1.4.3.gem 84992 BLAKE2B 70610107a956416dbc861141cad6f0552f1729d50085a23bb1b3dc8d79c7892488e1cc4e3f3029f770065714effa5c56909df922c96866b25299994f02377c8a SHA512 4ec79dbac8ba4a954757575279b2ea705c81771f65215103149722964ede661e9ceba23ec15b471214cca798861a39122d6bb766f89c2fb1bad3784e7052a37c
-DIST msgpack-1.4.4.gem 84992 BLAKE2B 41cdb4042bc3ca833d2e1f7c3682c06b2dbf6928a814a48d87e08b0f40e092ad295f268f9a0d473de141dcb63b699ea2b3a223c9437e2b3799d8ec056123ed6f SHA512 0ee58d5c334f7ee3e8b890d480b71141603bd5951b188ef162d2ca03f51ef40316ff386c505ccd9dc8a6e667359b9fd8934263b1200a4ee8a399c220e95156b0
 DIST msgpack-1.4.5.gem 86016 BLAKE2B 590226923fd0017a8916b78d87a0a87a006caf1758d563f338371493af2c11ba586a13c7fe1f920e4cfda4a2cf8caa43c679b2709c31cf023f472184234c26c4 SHA512 e750c49c481dbd6bc9c25242f81a86d6ed35895275062cf0928c2929e6c8c354917fa2fcd2a23969cebd650911cf2d244d5d0809ce8252b463c66317f930c64f
 DIST msgpack-1.5.1.gem 91136 BLAKE2B b5e75c9788cb02c6b96a8543c90d1e601a188943c971d8acc594031e76b4836d543960a5fb4377f609d0c9ec9411a80653eb4167f07df4cad8f695fb69cbf278 SHA512 8104eae39b3bae29849d05fa34574e0bbc2d29a99665a20f867d4c01b2ce1aa126486bcb7cd7e01733d3ca683f56b93e651e06cf71229f2bc6f6c8e3f4ff39b7
-EBUILD msgpack-1.4.3.ebuild 746 BLAKE2B b3083ac0104c7662940f318cff547266a610a4b784c20941b264e92285c4d298c15d1c7efc81c5ad8aa605b743bb68b42ecbed24072a83064e2b0f79c1aeffa0 SHA512 3ba61222a206274aabf7fbce9e251854fbd268fb779de2f4cca8b5a3b05d568b3346146a66ddee23f300fbc1d98549e97aec2b14ffa203e2c6eace3120f6c3d8
-EBUILD msgpack-1.4.4.ebuild 746 BLAKE2B b3083ac0104c7662940f318cff547266a610a4b784c20941b264e92285c4d298c15d1c7efc81c5ad8aa605b743bb68b42ecbed24072a83064e2b0f79c1aeffa0 SHA512 3ba61222a206274aabf7fbce9e251854fbd268fb779de2f4cca8b5a3b05d568b3346146a66ddee23f300fbc1d98549e97aec2b14ffa203e2c6eace3120f6c3d8
+DIST msgpack-1.5.2.gem 91136 BLAKE2B fbbadcb82f327f991016e96eb89440dcc3522d67be69cb53a24f7df07d7314edd07dc7f248d26327133fbdf0be44f8b08daca7763af396b55ef7578b19659eb0 SHA512 0a28fbde62527c4344e20181f9538f99281c7b24e1f69d7b9386f1f79486d7ec39bbbde82794d1bac9d827cd3710a672ed5ee411dd02cad5ec5f5ebb5d81f89b
 EBUILD msgpack-1.4.5.ebuild 760 BLAKE2B 42dbe630c18b8b12e8db26aed145a7047daa6eceee18a66bd82e6904dc521f571bbe299f3ddf1d25b41ce1070b5c6ea1620b18c63466c1233323c866a69cc2c8 SHA512 9011acf147e2e6b4f1d6e5c452e4cebf589c34029b8ef7c806cd853ac868d7e2cabd955017837259e9dd3dd78cea3b59f8ff84e4f9e053a031b6e7ec904eab8a
 EBUILD msgpack-1.5.1.ebuild 767 BLAKE2B 4a3ba24543650edb338fe4f13776451bd01fb35f58c5d593b3e51cce8c34892506bd84fd856b3bd77fb6bf91eb848aecc0f740a7cc75adde7faeb12deeb18ebe SHA512 0505d521371378c84339b14c2236eb61386fe31a380a216aa3e1260c487e2f6f95fa9c0eabd431b0f8c9b52d3ef890a7b76a2c8f1ca9a165a3c1a0b37186fb7a
+EBUILD msgpack-1.5.2.ebuild 767 BLAKE2B 4a3ba24543650edb338fe4f13776451bd01fb35f58c5d593b3e51cce8c34892506bd84fd856b3bd77fb6bf91eb848aecc0f740a7cc75adde7faeb12deeb18ebe SHA512 0505d521371378c84339b14c2236eb61386fe31a380a216aa3e1260c487e2f6f95fa9c0eabd431b0f8c9b52d3ef890a7b76a2c8f1ca9a165a3c1a0b37186fb7a
 MISC metadata.xml 322 BLAKE2B 373b64422e0bc265a8fa2c1e3e158b154505d093ce39bd9de9ed90f3a3de0360ceb0dd5a8faa744102a2031e047305bdfa98f1358e6877bea58e8d346a19b922 SHA512 7a212cb2a391a582ef160829455b54ff8ada2a96c134e5389fc945fa394bed41eb9e34e6ac3e4c571a205bdabca9addd65d85516b09d9d75abfbdcc0dd5444ab
diff --git a/dev-ruby/msgpack/msgpack-1.4.3.ebuild b/dev-ruby/msgpack/msgpack-1.4.3.ebuild
deleted file mode 100644
index 40f2113bb7ce..000000000000
--- a/dev-ruby/msgpack/msgpack-1.4.3.ebuild
+++ /dev/null
@@ -1,31 +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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/msgpack/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/msgpack"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="https://msgpack.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="doc"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile || die
-
-	# Remove jruby-specific specs that are run also for other rubies.
-	rm -rf spec/jruby || die
-
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
-}
diff --git a/dev-ruby/msgpack/msgpack-1.4.4.ebuild b/dev-ruby/msgpack/msgpack-1.5.2.ebuild
similarity index 86%
rename from dev-ruby/msgpack/msgpack-1.4.4.ebuild
rename to dev-ruby/msgpack/msgpack-1.5.2.ebuild
index 40f2113bb7ce..7a785b90e317 100644
--- a/dev-ruby/msgpack/msgpack-1.4.4.ebuild
+++ b/dev-ruby/msgpack/msgpack-1.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
@@ -27,5 +27,5 @@ all_ruby_prepare() {
 	# Remove jruby-specific specs that are run also for other rubies.
 	rm -rf spec/jruby || die
 
-	sed -i -e '/git ls-files/d' msgpack.gemspec || die
+	sed -i -e 's/git ls-files/find * -print/' msgpack.gemspec || die
 }
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index e95c39476cd8..df5d76a5f35e 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,3 @@
-DIST nokogiri-1.13.4-git.tgz 6249271 BLAKE2B bc8569a0c80e4efcedd6c5bb8a46c8504cc33ec3d2acdcefe2718047ffabef9404c76003cd279ac55e5a5fb17243af12c335b7d9e300b90d8a97e84015cf92bc SHA512 cca3e8558f8739cca2424e461a5e048a3675a23bcb6549f1c71ecfea0729859cda84ef3bf09a81d2b419e1a7b8ff2616a8dd84ac12f6e1f32b9626a0bd3e1bc4
-DIST nokogiri-1.13.5-git.tgz 6249007 BLAKE2B 6fc7eed6c10f74105917a94e5e8acb0576fbe8e64fecad70e4256d352e1e4fc9cb101be2d518420c7351f72fd03ab385c3dccc3d6442638fe9e6ecfda581eb21 SHA512 a5608c137f60ec3302810154cbe8176bcf281ddae1ac075c08b71d23fd124ac6bc3ca349f326232090475e80524bd53927449cbcba0c6087917c270ddf9e6eb2
 DIST nokogiri-1.13.6-git.tgz 6249974 BLAKE2B db6a7fd70cd88fa784e70fd33102ad2a0d65a848a713bd93907d3c77b7ecc101a4f0a38febf3265b25967e045bf9091e46cf319702c08319e32f94d57a946985 SHA512 96f4e52332052bfae0d88d8c93cf334f8484b51290cafe8c1d43c820ba6ac5aa74b187c37e7177e62435d6101d859c16555b715fa88fcb06da742c84fd0e7486
-EBUILD nokogiri-1.13.4.ebuild 2663 BLAKE2B a8e536bdf3aa49df93a9ddc334cf31ed1615199399aee82a7c638c27793532f728501ab3e64428a0fcc99ba16a0ce412a9a49a6f6186d7cb39aa5ac2363e4bec SHA512 5dd6996572e55396fb73f942331ab7632d1b54b5c61cbba2c8f500aa98b0e9693be19cd79ebd5a8934280ea6b51e7b82627875774b553a070a7454db096f6376
-EBUILD nokogiri-1.13.5.ebuild 2677 BLAKE2B 1ae1bf065c3b133079db326680678175c5cbf6e03e1d593488846ac8caaf47c5d47d030eabba77f5be4b646b10bdffee2fdc8cbb7cfbfa9ad59430fd41bb6118 SHA512 d1578456113d75e9e289c6a5e4a2bdc982ea2f46c17d66e4a773f327c17249f23afd85d3d2fa10a46f0ddf78b2afa508ca1230eb98af02595f5c313686ab8572
-EBUILD nokogiri-1.13.6.ebuild 2671 BLAKE2B a1d621b855c52d151a549bd19b9114f047f8e10f54208e39d630c8092af6e4f69861656cee57ca86f96ceb564b5a02e33cb03094afb44a3b7f34a8eac361c1f4 SHA512 0d26121e8382e14ca6c6f1bf4d272e9003f79ddc31b767ea919e4f6da2b0169957924556a4e767a6df1818c060507f1f95537878c471b19df744f055e5c6bee7
+EBUILD nokogiri-1.13.6.ebuild 2670 BLAKE2B 6009f73f5b582d3878493e3ab0f7b59cbeb50913b1e09ea13f0a49a840ad6bfc2fdfe7deb140881b257b13c3d9f57049859a4d01dfe646bc41d4f7c0dd4373a2 SHA512 c322190d601225828de7552499025653186648706aa467c542c68c2d6e0f1f625a4f3b2a24f9aa76e983fc52f4a98c8bf3dfb1a27aec64613342334a482bbcba
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
deleted file mode 100644
index c125f5d9de48..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
+++ /dev/null
@@ -1,95 +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_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.13:=
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.13
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
deleted file mode 100644
index d3d2a1eac8bd..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
+++ /dev/null
@@ -1,95 +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_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.14:=
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.14
-	>=dev-libs/libxslt-1.1.35
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	dev-ruby/mini_portile2:2.8
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
index ee962b251a70..3f510abed900 100644
--- a/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-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"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 5e5aa7ad9815..4d67279cb07a 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,3 +1,5 @@
 DIST octokit-4.22.0.tar.gz 3141531 BLAKE2B c852f34dc99b10fb06194bda9f15bffb4242a2b5ee7909e74defa2a7ca6b90962fd30232eb8850d97af872bfb036c87f7623acd9088efa3afd07f01cad525fe4 SHA512 e8696176227c81d5f80080fbb3c660b7b6e1b28b149b664b20d7e8cf333450988ac2fb9f5327c5e4e46528dbf7eea1246e82c94b265e6008f8fd7cd98f87423c
+DIST octokit-4.23.0.tar.gz 3149606 BLAKE2B a948f8ad114dd892ee98f18f00104008fb2877eaecd250da834a59fbc24560e1eea5df0aaaf0a25cf2fb980a3c72fc12955d75c7c4348ea60a392abb78e92c92 SHA512 0cd039a8137d3153ca8dbbed9ea1e6eadb9fde8c447b8f5457c05a88b2dfcd6d4b3bcd4c4a828850809146fec588fdacf96e025d0e82ee61ea77773abfffdc61
 EBUILD octokit-4.22.0.ebuild 964 BLAKE2B 71302f2657d5b82f65139f22cbb6596cd55f8f77b31424a8110efa15f47a5b525552caad80f06250eedd157c8da5483b355cda9ab50b9bf939c2831d171ae5e7 SHA512 59febe6e0680988d031f338e7dccb3657f9abc2b141cb9fd2b44b55dfef1dd7813567ef62a6c5b9c4185093997c25037d984016e00212bf4cf7bf36480c0fcff
+EBUILD octokit-4.23.0.ebuild 949 BLAKE2B e1dbc78d8bc28f0d0395497f95141eb1a060e62ec3efe2e6e0751ea001159e9db09f735896bd917f4b0f9806ea0887d636e3e449aa9beca3e928f45ecbf72ce8 SHA512 96dbaa4247b02306f1ac500f6fd4767e4656568b841ef0b798186d41fafefac4802b9549afb19fa157565ff0ccb23e3d077b5fb76b71de98170b78f805538432
 MISC metadata.xml 345 BLAKE2B ea9d229a1fa9c9e756d829b4b07d85d90cf5834f6667c622b5b9b5a886e2bd7b3f4d3e115a955ec823869ffe55d7fa810e97cee634036d7da88846462e42fd8c SHA512 afde1a713d352134bd4ada1404bb8834e0a33c4f0558a56050786d67bc76e9d397b0aa362445b74b29b620f93e2eb85b1374f2becb0d568ab618b65a4a95b689
diff --git a/dev-ruby/octokit/octokit-4.23.0.ebuild b/dev-ruby/octokit/octokit-4.23.0.ebuild
new file mode 100644
index 000000000000..dd9c4336fc38
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.23.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com/octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend "
+	dev-ruby/faraday:1
+	=dev-ruby/sawyer-0.9*
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/jwt
+	dev-ruby/mime-types
+	>=dev-ruby/netrc-0.7.7
+	>=dev-ruby/rbnacl-7.1.1:6
+	dev-ruby/vcr[json]
+	dev-ruby/webmock:3 )"
+
+all_ruby_prepare() {
+	sed -e '/if RUBY_ENGINE/,/^end/ s:^:#: ; 1igem "webmock", "~>3.0"' \
+		-e '/pry/ s:^:#:' \
+		-i spec/helper.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 31f3b8e98a7f..9fc42217d3b6 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.gem 6656 BLAKE2B 95052fd231c0e390b5194af01f7e80d7e8dd34b155b40b
 DIST rails-5.2.7.1.gem 6656 BLAKE2B 0c7da4951ac22518ede6f502bef9c7a13925c27792a97d00e9fecbb1186732e7fc728db6f8c4155a4842c32ece7a9927540e047c3f009828eb8ca3107b29dc3c SHA512 a251d8086c850e04b9e686cc9a7532872c3d81d28ed675c163c9a6bd1a8deae9474512b53216415937b2422d5461cd66220edf8225860a49bc6546923fb0da38
 DIST rails-5.2.8.gem 6656 BLAKE2B dc30dc10e9a2d9f72a9827931ebb1cc34eea3495fbbf0ffdc4feb46ede25ada6f26e8e3ada1180f639eaf066fac0b80cccf5e601c9f73ec507211e9b73ece58d SHA512 b8ac1afc31a13ec9736ef81dbdd3ad89c4c7337e766e3598ea0c467fb06b925dd29372bef7b6b8f7b26ca9a51c1e831621338753519075b3d03f4bf7c237fe82
 DIST rails-6.0.4.1.gem 6656 BLAKE2B f3ab76fa7ce5e3a668a98b7d1292516f34d36c466b8eea45de136791375d480ae016bfd824d6397af4e44280ff5567ce215e5df3d90867adeb0bc02bdedb1a66 SHA512 ae71bf509339b5c802dd9586caa10a3639fe73225ee4afe59a2bce2de9c58fe0f3e6faf6ed8b0e364ca579a9ec78d012c2f7a842745c6c81c5a4e9d0fa66efd1
-DIST rails-6.0.4.4.gem 6656 BLAKE2B 5a86f542a1030653fdb8d9ac994199b32ce4ab19e62c04e6c11bf66ecdf870654a31b312a3b75b8ac1df7b5f6dea7e423873f8f79030dbc7777d369c3c88eb86 SHA512 369a49d6c8371f7216f030ef9a69679bb3676267b4ecb524f8bf06e89f03a28dd0ab981c4cc9498f002bb95874b3661aa3ec923c64c30cc521a77d33352b57a9
-DIST rails-6.0.4.7.gem 6656 BLAKE2B 69c921093a9b0fdd13fa50afacf36bd6ac9230c5aee83b30864b1a9d3754699f6cbb7c89c6d38de475371c1608e398f12144b9649b3eae2ef3cfecdbf3c21cf0 SHA512 6b88dc394ec180053feddd4e8b3eb83152ae2af5418c8a9ba5cc53739320689157dcd2f63333ab44206c035a1fa249cd008f9545d579e73d18423653501af7d0
 DIST rails-6.0.4.8.gem 6656 BLAKE2B b4a755b32538a52d00a5e51729382c32c553eb5104c842b359c9ea069f630b1f6656375c32348c893696e63317f42db2c8efdf28ed20e7d33b3f7dacd63b3d2f SHA512 46cc2868a11f8407a63bdbeafdc4fb550b7d447d9c529dea8cca8da0b4f9848c1b4bcd8dd80999be22d86e05da8cadb6d5e7bdc4351f0f7458b3f6014d9f7689
 DIST rails-6.0.5.gem 6656 BLAKE2B 3cb1a7c175ddd0e69335df2ec4abd9e4edea89e6c69627245b27f676a152e712eb475b6479477cc1cb31f0be7eba1ae11529d3820b9c183139f10064daab38aa SHA512 7ab1e1ae524b9e68f95f833f47908888a1699f5af6494102e66e7c7476924d4dc793228eaef78dda9a497e1988f8367c357a25e7df587b4c9fc9ddcdfa0eb7ce
 DIST rails-6.1.5.1.gem 6656 BLAKE2B 1f050c2c98bafdfe4c70c8581488336efb81e7a93bd86a2a996a6342aa6643e7360eb00d6455939d9412dd5bda3b3cd6770d14b66cb2f00812be4eb950a968aa SHA512 852ff9009d6820161458db0df255db96d85584453716f2b67d273558fcdb4ce9ea5c09f46dbb54a10015c327cf660ab04d5c613608beb7fd9e8a61824fc8c6f4
-DIST rails-6.1.5.gem 6656 BLAKE2B 23cf302daac889afc51fd9a3619cb229843adc91e8b1ff79531758e1d58ed009baa6fb86f04b124146475c7030754365d88b37aea1333cc002a8162182f4c3dc SHA512 f7cf72733a8662a750f3fa3d5fe00209db24109d029b7743e8f73833db5c63cb5a59a99c5711997e543f79c0ffb802f7a84a165d7ab7ea93afff9a564eecaa48
 DIST rails-6.1.6.gem 6656 BLAKE2B 94cbed0213ed04cd0e94d1d9b0af0204ab50c5120efafa950eec899cef814942772ec6f98e4ebcc51657a104d9fe29b060e55f6d1a2dc9a9c7701d3b171ac638 SHA512 60639b4247029d90ef12dffad37a007672d0cc3672316da540ed38e7d6c8a2702ed51e5a48797e1db5beffa042007cc9a134924d8f1f242f49f0c470c80f750f
-DIST rails-7.0.2.2.gem 6656 BLAKE2B 03d726703ed8c9403326b779a84ff8af171636e686a81a92c064156fd014f00f681cca844b5eeb696c6343bf83e72b9d7e2c43237c3d7639e4dd960140b3337f SHA512 475562e77a702eef88b9300a682db04be6f2a6c6beeaab737d41cdc326f80276efc0283e8ef7c2edaedad1d21ea38098af2c5b1f944bfa6be934edb00fc56df5
-DIST rails-7.0.2.3.gem 6656 BLAKE2B 84e016d03df001149f16524dcb5e8372a7e7548eb4b8fd1419d3ec44b39809fcbc26d704c95e5934bcc6c49d57c37114d5a1f16fd93fa929956685ce5caa8dd2 SHA512 8a9cd26ad1ac42928ac9ae9d00579e29f9559aff6dd44f57eb7fbefc06ad4aed320b946aa448c0cdfacd6afc8fbc78cacef031c8d0ca6b657c9a07af359943df
 DIST rails-7.0.2.4.gem 6656 BLAKE2B fb38071f7968361cf08e3332b536e3abdd0ad9730374c19b8322d3c9d688b777c5ccf92d1312336f9cfdcf7765894c44247b5073466dfd073319aef951162ae6 SHA512 18c77aa5ee62b31b0e44a65cbdf99b64b40634ecde72b22601912ce24d7ad0bcf364ef5f8e69fb974802b4e5c1027dfd61664ba5eb8e196f53d4b244eaba5210
 DIST rails-7.0.3.gem 6656 BLAKE2B 4f67a44190a44a6ba22447f7ef900b067332024a74bab2dd1bf52392fdcf28183ee883448c25eca18a3b2435b7f33f0591cbd62e63cbf918da8a9bd7668f287c SHA512 f62ae8430b3a81da3a295aee32bf8176e8becad9f4807c02a7aa582acd8bf3d140ae73169757d49ed6fd5d32fc37ab7c44c1961bddff902283e787a56d86f71f
 EBUILD rails-5.2.6.ebuild 1042 BLAKE2B 88b896643b501daddf1625c590c9b59d197ef96ea7e6d6be9d999dd94afa0f81ea5e132417717203f246386dc6820e44f6d2750a87e5af5e3bb1b9a20554d339 SHA512 8ffcd1181a8739014be3b7b5fe1773f0c01a76c4a31b03ed3a220c2791407a743faa61229a250a070a58dd880f96f2f7ebfd75b1c273ee5846262b5b4371bb57
 EBUILD rails-5.2.7.1.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
 EBUILD rails-5.2.8.ebuild 1042 BLAKE2B 864785d9b78b23c8758ec65b79efc493aab77b2d627aa404b228cd0de0abb9b8565687d341bb2c57965fe7264e62a14a96a21b254664f2ff6ff973f8f32cbecf SHA512 a34da80e066b6bc414a6a2b9862fa74d5213b594290c3a6ca9a37aea6f9e31dc57ed823af942ce1ab57b6730bd44d52336fac88917a3b5c90f86d98bcdcc3628
 EBUILD rails-6.0.4.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
-EBUILD rails-6.0.4.4.ebuild 853 BLAKE2B 0cc894d8e4ae8065fc54d1290bcee5ff7219512e13e28cce920173255a21032973a05786a3b98c541b926d2ff5cf17b490cf462943317b4de9addeb211270481 SHA512 2a089a6364ab9688b9b27f8b36f8338df26fa186223a52dfa9893b728c259182d3163adcc2710d8e9e01d57b8fb83d874147345d93ae2ee6e233d90d3715146e
-EBUILD rails-6.0.4.7.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
 EBUILD rails-6.0.4.8.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
 EBUILD rails-6.0.5.ebuild 853 BLAKE2B 9c84647616ba27a39f70c96039e5d29603d80c54eb0ea4e56b6f8a29490125c16c0038c9ae9bc0f46be0e4a73a9aca785755e0313b140fc6a5420033f01ecdbf SHA512 5b54f65bce87008d9d1e59bc6cbb743ec8d2b6432146ef291af0054c5bd13445e0183e5c6b4f55ff3927121a31b8ec77ff107f5fce90562387fce4492a7bdf7a
 EBUILD rails-6.1.5.1.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
-EBUILD rails-6.1.5.ebuild 856 BLAKE2B a19e16f324bde6694b48f11e6e7056f48e274c08911b57e614ebfd48db2f750998f70315cb6404416bd75d9cf75e454c4647beee650166ff9f8e9931d5d391dc SHA512 479f0788d4e1deb3af9277b2270a3e818c9b82e1473dbd67ec8159fb963f580c0846e01b28434cffbe325dc1c0a395395ed334f3286a8aa0e33e8866c68a6194
 EBUILD rails-6.1.6.ebuild 863 BLAKE2B 90e111f998c2def3bb03a8031886c2b73bc770b620451dd3ad0b7bcba53b63aa7ec35390011d4a92ccfe31f38a7d9b7661d90ee36bd19076d0a18860fb390ff3 SHA512 539100848e74f7db636bc82f08713e5357de33056da990bbc6baf4d7e119d1bcca49a8e194341e03cd39508c0cda3905db8de6000b419e2983ca3df064508942
-EBUILD rails-7.0.2.2.ebuild 849 BLAKE2B a0e75ffe3399aab2956cd7e846a81d30650445b6d320aa7a444b830030c0a9c5ec34abf7196aa537b6601dc4fed4439ca95af0d9e662859fae235ae7a2cd1bdc SHA512 2bd56fc9f6c0ff39ddb55876189c73fe1f889500c5805b096cf44c392e5dcf31821fb795ce7ff96723ca989adaf7b568658054088b26231a8fc73b3d78e1af5f
-EBUILD rails-7.0.2.3.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
 EBUILD rails-7.0.2.4.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
 EBUILD rails-7.0.3.ebuild 856 BLAKE2B 666a7e1b46fb4649234f2f2b21b85198d1e8de65467739475192be508b190bd8d2846c6371912760b687df18e4954b5802c59dcae5c03e7459a732623ff3c32c SHA512 e4fb81a45439133b13e71779f3b0f99a90fbefcfb8b164573c41148b7f296dcbdc5e9cffbc28e2893b98374058f04279a72b81ee66d0ceedecf775988c56e410
 MISC metadata.xml 492 BLAKE2B e1f39a222b68aa3fbe808220276df3f6b7aa633887a0a0dbf4624ba8c8aa6a179d32c856b71dcf04763dd0212d7dbd58a6bd734e382adda25b5e9e28a7dc121e SHA512 16b0cb56755b23acbe3635dd82e72e1fe8b313b43658a79e56a983da672b4eb2619941ca10ce8431192a5fa0201bb428a3ab96b7e67323b893fc22d0491f5f46
diff --git a/dev-ruby/rails/rails-6.0.4.4.ebuild b/dev-ruby/rails/rails-6.0.4.4.ebuild
deleted file mode 100644
index 045971c6e442..000000000000
--- a/dev-ruby/rails/rails-6.0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.0.4.7.ebuild b/dev-ruby/rails/rails-6.0.4.7.ebuild
deleted file mode 100644
index 94bcf8ba4dd3..000000000000
--- a/dev-ruby/rails/rails-6.0.4.7.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="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-6.1.5.ebuild b/dev-ruby/rails/rails-6.1.5.ebuild
deleted file mode 100644
index 27b1d5ff015a..000000000000
--- a/dev-ruby/rails/rails-6.1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.2.2.ebuild b/dev-ruby/rails/rails-7.0.2.2.ebuild
deleted file mode 100644
index 10891fb0b0f9..000000000000
--- a/dev-ruby/rails/rails-7.0.2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/rails/rails-7.0.2.3.ebuild b/dev-ruby/rails/rails-7.0.2.3.ebuild
deleted file mode 100644
index b9ff7fecd2b5..000000000000
--- a/dev-ruby/rails/rails-7.0.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-
-IUSE=""
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailbox-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actiontext-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.15.0:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-"
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index 6d19214aea2d..68df6757db82 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -2,30 +2,20 @@ DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c543
 DIST rails-5.2.7.1.tgz 8847972 BLAKE2B 13e5f47431a7611c1fe7ed490198a81634670460effdb14e6657bbc3455388da26db6a611f363b93b35e25a6d2693f227ef2be960d432770afd63906a2ca2b4f SHA512 64b155d522a944eed7ba08417423ebc8b3a6d2ecd39940021c37f54ae3af649d0de6dc1794b4b295d4874eb58cb17bf11d285daa146f37113c42c3aed9cc39c6
 DIST rails-5.2.8.tgz 8847449 BLAKE2B 11937ee2aeea39cade43829a01430315a997fef070fc73a1e63baaff8b3631f82561c7acdd44cf1981501424be68d814001dd26cbf7678ca987a8311d109d367 SHA512 98e1b36bdd4235e983d0805b6ff9779e3793d1bed486dc6de854215c4294334d5036157a527c1222cc2be4c107754553dadf2bf86e65ce6561dd8152c47ef84a
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
-DIST rails-6.0.4.4.tgz 18594292 BLAKE2B 8f463900db30ffd4850b270aac0ae8c160af36a606e4eddaadbd2a0c086de3438a36665586e20a4b6b8873f8b659f2ecd3e32965a36118a6e63fad2726afa0f5 SHA512 14f7d51ba407589eb4ef1db8a99c21c301198e8cb2fcdf611c76eebd1d52192eb1225bb5d45a2183fbfe103a0b987f3a95c6c5fe6d772ba101da9ed46441441f
-DIST rails-6.0.4.7.tgz 18596833 BLAKE2B a376bed4a0531147bbeb2c147e6067657313b5e0ffc713b18d07037177eaeeade1516197533b022afd9b0b03a1f2ed130b85600af3ea7d53a7d932db1e6f4342 SHA512 e4220411ed28b2e28002820281923b45d90454ef59a57b57c98bad5e185d39b2af75609e7786566135b5e1b197544cc039ad81df1a663eeebfa10728ae2904d1
 DIST rails-6.0.4.8.tgz 18574385 BLAKE2B be6ea79fa452831e1c17ed550f875500c4b00ebf04223335abe8b1e42738f96e6d62ded24913501042a165833235082fde8865cc451dc322a4d7365f9fd6f1b9 SHA512 da48a68029014102e00837a1817d573f293b341716c2ae17fa12f15910a97fcd28ef8b53cb539cc1c029c9916002071485aeddb0e9c6b42aa8d24feeadd5970c
 DIST rails-6.0.5.tgz 18572922 BLAKE2B cc7f3669f5d501031ea5bfcef24db89040dc447923abe255b4ae504c07c648414a19a5d2c7ecb513cb96cf601440caeb2462c37fdae61770cef60ce5708abcb4 SHA512 5f262f65de2e3057b92fdb95bef28ea8c4c44e5ca27f4065bb4946a760b3f97fde10f9a303ccf1fdbf833f1e26db5cde722183f41672614203c4b08aef6780ed
 DIST rails-6.1.5.1.tgz 10993257 BLAKE2B 90146d33fcad068a09bc61c09417514f2ccc18c51043c63672397eb6980a97c9c0c4e6b0679393c3d8ded690ab44ea53b7abd49817f46ca9f8ab3472dec2f3c3 SHA512 8061f2103ad9266f06f902cf7f05b3f94b05d9b454d314d7a7febea2e5e464c5f33d14f48a2a098e7e666a6dc8cd5c5dae4cf4fb669eca28303a4fb5e6832039
-DIST rails-6.1.5.tgz 11017020 BLAKE2B 5e1a167550998f8149ac770397f4e39a979f48365494f97d4b387559070e4e9264ddc93bf20e5c19537b4683a793a2c316bcb3f829cc05f0155b31a609da6756 SHA512 a90fe7781ddbb6a035ea7dcb950e2ab03a7297502891d4a88dfe7c3ef90b78d8009ea62a35272d3500e8819466042b883193ebb030683fc2cf7e5dc0e720edb1
 DIST rails-6.1.6.tgz 10993299 BLAKE2B 98a80cbefc1aafba68a22b60d3df6b81ab1e8247a75a07131aeed97ae621ea45b22918482537255547b68a5fc6b002f551b8b94492da3b1e6e24389a109e245c SHA512 04c578f6d8bdcd72691c8d4e51136424f2241a374cdfad1c3c2b436a4f5fde1955a600bcb98c6f416e22e1e561cd50f9ca5f5075deff94f258f8682dc9b00c1c
-DIST rails-7.0.2.2.tgz 11034626 BLAKE2B 388a27b5434f1ae062cb7c3a68881a885dd659dbd9e86c4d36e0cb29c493f127fb9cbdf0f9ce7dea5a715ddbcd7a3bff5e2de3adb2e278c8bf63c2473d1e4b6d SHA512 e7863f1e072d266b8df1abb8abf6b141bad74ef77fe5dbcd66e7603e2ebf386520e4fd8f337edb5f5a6bd5607fbaa146823cbe6980fd7864e3934a7c9d382e3d
-DIST rails-7.0.2.3.tgz 11037677 BLAKE2B b4d0ac3d2c56d262beca4f5ba1659a67526c01321dc00ef8392a11c6fbc7614e3c02cf02ffcbb5ed1911005c1be0c0741e225f45c5946fc9102629c5ba5d32ab SHA512 4dcbe65ce1bad803dd04be61918f1ca893529705a8336a0c09b0193eb453319fc42ed0e2dca6ff5cb56f0c2bc5ab03c9d9f479101904ad1a746980cd887798d4
 DIST rails-7.0.2.4.tgz 11014591 BLAKE2B 4a678dddca134769a40d73a6652a6aa273456288c19ddbe7611ae40a14860abf77226ab351ead92647fb471751521377c51cafae40383198ff3d3477bc257b55 SHA512 948cf58dd6ac517fb4b1e63c3a1dbfcf2405fd224ea150cb92f5805939d3a458ad26e139b1c6069cc587c01f15694be14e119ee56769a611e6b6eaa0eae5a68c
 DIST rails-7.0.3.tgz 11021571 BLAKE2B 00385233279a773221ae8a1e75354d404d033206089323c53c0e81a134941151aab4578218438dd4193b2c00a0cd4ef1eb6a758502a51d403bddb11915ed9eb7 SHA512 366eaae24b0e147c9e33179c10c0a22f7c7671551222e329120749f04077bd344fabf55e90af041322787bf3063add927c7fd34758ae8764e00f8d8edba388ef
 EBUILD railties-5.2.6.ebuild 1631 BLAKE2B eb7b20ad815903ed036f600906e0a5c2fc3a73ec758443001924131d4e25fee6bee3ddecee01e0828bd59837303a7880d15b16dec0976ff251a8e73a77916b49 SHA512 253ab141a57d19c0a6b52d5f3be5f764539afb1650cdcb5699bc704cecbdd4113713c666d4e67195a2387bea9bf270a6658690b1c9223323d76a6c7acb3c37c7
 EBUILD railties-5.2.7.1.ebuild 1631 BLAKE2B c55333e565b6591df6c6b3ae22d1476726e0a459d5694b0ae0a08e201b065ce4414d1accac499d3d018be94f603a78030062fea53bc0861cb87136795990d4d8 SHA512 cc8ebb684d9d8c2ab20c282f9f370e0a1678f13ea47d5d434335addcd79f51ed849f5d96b3cae345ec507d6e8ef7616befeff4c46237c5ec2c0c9ef5f1e8bbae
 EBUILD railties-5.2.8.ebuild 1632 BLAKE2B b9768abde2b639e1c33d18723add19bcc9b7d97f351362ec260bef1961e3fa54d02520e468a3f559b813d13f3fa14b5b820bd66fa5ed6084a33f72df022e09eb SHA512 d84384ec57fd323915b413e0d33ae2d80478e24c34bfe33f337296ae1b01e6abf5e921f6f4dee4a1471f7bb2fa140a3507b6a4580dc1b15429df350f3aadcaea
 EBUILD railties-6.0.4.1.ebuild 1618 BLAKE2B 5e6ae7e09d3dcb10ebc2d7c5d7e09887d95e21e1e8c32ff10d72201c633dde61f3cfb121caa46e2ab4385287be59bf2ae838ac25edc11c56502add2f79697463 SHA512 29272aa538eafce1d26559008bc5dadd98d14dc089417675a93584798ea441b2af48c621c5ce7ed79cdbf56216714740b64efca5c7e17d110a72e9cea348f02a
-EBUILD railties-6.0.4.4.ebuild 1611 BLAKE2B 528cf6ffafbc653cc98487956602d573db00b2755964de790f9e863ed07c8ba3014193d4def9cefdcb402f5ba60e60135f3d057300e45b70bb60a084e78b32f0 SHA512 ee8167df4ac31608495b11a7720a4464ddee2cc4479b8503b3d0b247f06cbdbbac966b52b9bd402332670c770dad638fa918b59140b07127241585a41167e269
-EBUILD railties-6.0.4.7.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
 EBUILD railties-6.0.4.8.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
 EBUILD railties-6.0.5.ebuild 1612 BLAKE2B 87d6b40cf9bf640f5cd333a4f297d6a5911d0df998188df53e66811391e060d92acbdd3ebf1eba7ff923a3b0c6f449633648d16fed8ed35651e9ce24d760129f SHA512 6766456401f7a7e0e83b11d0d5a8be58a3c47a4c01f672e491c700f2ccc3615c719a2bc0a1a27072fa129c5c3568c331f8ffa1ba7a2249856a8f4830c93d68a2
 EBUILD railties-6.1.5.1.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
-EBUILD railties-6.1.5.ebuild 1612 BLAKE2B ce8ec8ea8987d800964e7701c3075a2f9a8729f4ff90a08c8a0a10e8659db27cde42bd5e30652535bc7b9e59cbc5a1acf4dc0e13dc99044843de42921c9f31a9 SHA512 fd5f1ec7648b5e70c8d550d5213a6306cfbc4abb503e6ac226b04963cf7065a6bd3e19d95977ddb2913684b35a25f41e66346f8cdba1dcf81b914536c3543969
 EBUILD railties-6.1.6.ebuild 1619 BLAKE2B c64348229554155bd319636bcd9324b40087097f75470e4b780d80cec4220f652b154d6a9a9db1019007a7d76df29efb383de61f6076a53903535170ea947e5b SHA512 57972943cfdca05134d86067423231061bcffee623e8cfc02ae75bbcddfba1f673e2e0b9fb5293e3fa34b0e55c82a8b8449ef8cd27b370f7ca7cffaf4db91c1f
-EBUILD railties-7.0.2.2.ebuild 1619 BLAKE2B e93441c553f34e3f494587cb9022788cbd630245b9dee8dbf0b25fd287c850341a781d0e7f7b27e585dc092b63dccaf4738a116079057d07d2857f7443a87c9e SHA512 214fa7f5c9b602e358cdb2495d92f15b469fab8e58cded88d4935925be2c3e8b199d82aa28d5a1a10c25d8bda06319a81e555a92c6e3041a6cb49ebd05effc31
-EBUILD railties-7.0.2.3.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
 EBUILD railties-7.0.2.4.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
 EBUILD railties-7.0.3.ebuild 1626 BLAKE2B 7f2d4e179f48374114fbb37639e9e2a533b75376cb975d6e7271dcde8c7757a1144018d72c4928fb5b27fcb37d3839c9812abf30742c28f996af947761b88603 SHA512 bbc840b9384c40fca3f4d985360f0b065e8f0eda40c502463fcb1b817c53d8c9d6904efdd7dda9e91cd34490612b6d685f4b21ea738a74f20582e65071bb2ef3
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/railties/railties-6.0.4.4.ebuild b/dev-ruby/railties/railties-6.0.4.4.ebuild
deleted file mode 100644
index af4fef171d17..000000000000
--- a/dev-ruby/railties/railties-6.0.4.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.0.4.7.ebuild b/dev-ruby/railties/railties-6.0.4.7.ebuild
deleted file mode 100644
index 201e99487a96..000000000000
--- a/dev-ruby/railties/railties-6.0.4.7.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-6.1.5.ebuild b/dev-ruby/railties/railties-6.1.5.ebuild
deleted file mode 100644
index a36038e9bbe8..000000000000
--- a/dev-ruby/railties/railties-6.1.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-7.0.2.2.ebuild b/dev-ruby/railties/railties-7.0.2.2.ebuild
deleted file mode 100644
index 6d69dd1b2820..000000000000
--- a/dev-ruby/railties/railties-7.0.2.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-12.2
-	dev-ruby/method_source
-	>=dev-ruby/zeitwerk-2.5:2
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-7.0.2.3.ebuild b/dev-ruby/railties/railties-7.0.2.3.ebuild
deleted file mode 100644
index d49f8cb3826e..000000000000
--- a/dev-ruby/railties/railties-7.0.2.3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:regular"
-RUBY_FAKEGEM_RECIPE_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.25"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	dev-ruby/thor:1
-	>=dev-ruby/rake-12.2
-	dev-ruby/method_source
-	>=dev-ruby/zeitwerk-2.5:2
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index f492728468e9..9be2fda8ab40 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -1,11 +1,11 @@
 DIST regexp_parser-0.5.0.tar.gz 80554 BLAKE2B 7890e6850e3ffbb927c5e72430ab29e6aeec4f8684eb56f4153414aca62702faa57f48887618e84b1d087e2ba366ec9d6b2e92200cc34472b7bbb5a8b0043415 SHA512 0d1c43fda01077b9b3d9c28ce9cb01772f10817e42d9c0ff28e6ea5cd059ad4869b940498c6a4e77d4fc6acb6ac0aba293ae67dd012650cdb58989b90868be16
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
-DIST regexp_parser-2.2.1.tar.gz 90169 BLAKE2B dcfa392bc5dc9e08816b3a2e401744c775a8a5c60067c410d195d60ef155eba287b31243e70677f018e3d751b371a8878933a5e34c4bd5b00cef3bf1b266c00a SHA512 a3a6fbd36e980eaf5f14d0c98c2680aed700b01c7941fbc4e406e14992e432b3ce1510a8be9ef7964ddf0ab85c55b556206cdea36a336de98e6956942b4ff726
 DIST regexp_parser-2.3.1.tar.gz 92120 BLAKE2B e4dc8d3d38a260be0d21812703380af418ea6b87c1fff66048111e2d5295b04589cf3d838f3e9eb330f300c7b49c8ccb18867c6fac41e55c0c623cc0206d2c85 SHA512 3f2502afaaeeffe6738c0fa83717f93af22de8704a1ce3cfdae910be287a6bbbab5dcd80d9ce7fb840acabea8d55a0cb06bca1696820f5e568b75c96360c3895
 DIST regexp_parser-2.4.0.tar.gz 93162 BLAKE2B cab80ca22b1f34d60a47f7bb3f671e2a7af46b598250a0d1f85049b5b682800badf82c7f0cfc676808999d4128bd8b8a6d2bd073d8a771ee7c07253f1e24e5ce SHA512 cd7a9d5d3d4882753b47a8369a807b3c6d943e36a66d0001d51d5d37d19a46c2ba078217d95952f1dc7c7434699a35bbd6414cd45264db08a0173f887a8d4826
+DIST regexp_parser-2.5.0.tar.gz 94251 BLAKE2B 203dcef35f36dec5abd737f56aeb826d102fed875ac90f36521ecdc09c4708ab19ea48dcb6d34259c9358e2db112a34a891dd1f61f0ce322318dd010350e81be SHA512 1ea8082874f6ec8f97f1015fc3f6efb87fd59fafa74c92d0f54d4f649be2a5111ffad400851f3fc3307cc5c361c22a2372b12f1af51f5ac5903e407f49c2e8ff
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
-EBUILD regexp_parser-2.2.1.ebuild 929 BLAKE2B 80a4d2a53a748853f0f1eaab7f4410882340873582ead2e7672cf065d092da04dd44a4d4d29726ee63a52679b484ae65453feadd6c204d575f21d8a2c2b84130 SHA512 1b92b93767984477481e8006b695ae4b7cc5428a1e9169899b6552050698dfcf66633119e183d20b62e256a504937076585098cc2fa80559eba9a8e0a3d3e0ab
-EBUILD regexp_parser-2.3.1.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
+EBUILD regexp_parser-2.3.1.ebuild 946 BLAKE2B 1c488c5a84b6d816c9a57bcfdf9e20e6cc8ddb95092abdd41580972aacae2f527776454af6ff11e24e5677b495dea2f736d249d347bd87487563c86aed28e4e7 SHA512 5f96b5ff1110a0c24b2d989888b268cbe5e205cc455b4a53ed54eaef8969898bced8c393e602b0e329945f48f8454ea4a34d6ba9da201a1b62eb5e662c6c3af6
 EBUILD regexp_parser-2.4.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
+EBUILD regexp_parser-2.5.0.ebuild 947 BLAKE2B 97e9f9bd11427029254af7882489c65f49bc70bc916d36d06b1c1cb5d0e9563478b55f4a5f84cb651d949b1f411b2f4d177b2547d5e0b248bef204eb7fe1c81a SHA512 c5f08700a0dc3f3861a607a7e5a66f3a4263c768c785be8d55be2dd6ff38a8a319b825fa8b6ad0cbc615e46024a0b940e3f8bd2f93eabfbf86483638d6613996
 MISC metadata.xml 346 BLAKE2B 91c8aefa1a1d1f9f8b70a36b65524b8e9bc41fb22d7e411e1501d74dde8abdf1fec981340832046edce885ee296cf1beea48fa57678bb5af2c39f957670a5f82 SHA512 15b3c9a8a7fdbbd2f782308687f6551cb626732c0858c2cc88640b8ac2246e453667dfe6e12ff3547c2d7e267304cfdf70fe913ade8d802c321a3df12b699a6a
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
index 6f59b303702a..d7fdf1615b58 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
similarity index 87%
rename from dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
rename to dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
index 44e9c4376318..6f59b303702a 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
@@ -19,12 +19,12 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
 
-ruby_add_bdepend "dev-ruby/rake
+ruby_add_bdepend "dev-ruby/rake dev-ruby/rspec:3
 	test? ( dev-ruby/ice_nine dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 8d5ab3e37de1..18c630dff7aa 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,6 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-bindings-1.7.2.ebuild 1384 BLAKE2B 41e25c46ee6396873c3116b2b240b03621c0de7238f49d7c84959477ab18be9b794f8778d2a6c7aa134e5182b4a7541fd17cb3af8210138eb8d7a2218e4d3e85 SHA512 a2a48c792d77dbed939d51fdb8e11e8af6e2eddd4f3ac7b44eff83a90e344b59405516c14081b7bd50789415279ad5b9c0cc6b18aab3b9092850bda392bea7c6
-EBUILD rrdtool-bindings-1.8.0.ebuild 1391 BLAKE2B 4e80ea3ec0e05b0d407d5903f4e9945f5646f4c955ae8282594098f12f593aec9b3447955b63580cbc82f6e3c5300d59725828d5a0b054730a3ac7aacf984c17 SHA512 89beef5380e9e487bd36f76745a5a5f10cbfab7a32d26b7898b3d9b2f3d55a8be46f6f632c4ba6481a5625d4f1c2669f61ae5742da6f90d34f12b4bf1e90977d
+EBUILD rrdtool-bindings-1.8.0.ebuild 1390 BLAKE2B 3e8f731fe549c68e3914254522d98c2a982cc4fb57cf9cedc1b99b3ca50fb7e8e0988a849a89cf647fcdb9c0590bb67a2534c0f5940249fb94456a8dc1086111 SHA512 fb689fea7dbf3296539bfb85c595e0fa51da4703a4e9518bfd9b67a89592a36e64e159f0ab4cacddc5422097ce82fdff3e0e3bf77dd05813a62dc4ece957d392
 MISC metadata.xml 464 BLAKE2B 9802c0c651c611515835f1b50971c4bc91b0948503ffc62ddaa67fba4ef70f4a9beee54c1de7c9e55fffb7bf97875e6ea9cf3d5fb1882a92065bd4162a0d2ede SHA512 f4b12972651c85515f2ae49fb5124dc21bcf083483ccc1be22df06d81fc17818e16c64a729a0209146688c0552346bc5474b55791871213a946b331548e1ec8d
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
deleted file mode 100644
index d52b6b98cdec..000000000000
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-RUBY_FAKEGEM_TASK_DOC=""
-inherit ruby-ng
-
-MY_P=${P/-bindings}
-MY_P=${MY_P/_/-}
-
-DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="graph test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( graph )"
-
-# Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph
-RDEPEND="
-	~net-analyzer/rrdtool-${PV}[graph=]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
-"
-
-all_ruby_prepare() {
-	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
-}
-
-each_ruby_configure() {
-	rm ../../src/rrd_config.h || die
-	touch ../../src/rrd_config.h || die
-
-	${RUBY} extconf.rb \
-		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
-}
-
-each_ruby_compile() {
-	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
-}
-
-each_ruby_test() {
-	if use graph; then
-		${RUBY} -I. test.rb || die
-	fi
-}
-
-all_ruby_install() {
-	dodoc CHANGES README
-}
-
-each_ruby_install() {
-	DESTDIR=${D} emake install
-}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
index a30192a903de..9890e062684e 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
@@ -18,7 +18,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index 7b50f632fed7..63e3b43c77e6 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,7 +1,9 @@
 DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
 DIST tomlrb-2.0.1.tar.gz 21386 BLAKE2B a9f50d800f7e55c6e6e69fe0a68d1ac843d4aa3b1b68e50c86eb03209c2dd9239f2780fb03152a8638198bf8474593f815025106935a4d81befb5e342f9451f9 SHA512 9690b5689d37cc4634e65a906b1c0bb3692afa96fd92e2dd0d487f2f16dacc64e992e114822edcff270b3ddb8bacd2c6e20e2d12112cd8641c5190ea6ee4e4db
 DIST tomlrb-2.0.2.tar.gz 22856 BLAKE2B dd7ffa3ae0d06a6376947df0472865ec34db815613f2a0a439f91f32421193e89069f31c28ea0bf948cdb4ef259c4d06de02dcd12411bf774b96abfb5a05bb31 SHA512 db00c54d9358d10484ffbd812fcb1ac2d13e631ed2b3e709fee336e8240cf2a7740b6dd0190e38eb6c93b1ba7c7f5a91b5909a546928c600114644fa0d821cf2
+DIST tomlrb-2.0.3.tar.gz 22929 BLAKE2B e67dd81f2d8a49e6c2d296d030d80809d10e780d1fb65e29744ba37ba35a58b8b34fe6bfc4046754ed0f919db2649b68d4feda8b31c35dd09d3df9d607100f68 SHA512 43b02de19b8816fad4e94656ee9ec22e0401cb62b982baa0ac9f4a6af2072e4e8df54ec657016c4dc407e6d977a27eab5b954a7f4ec7bb70b26062022bda96ea
 EBUILD tomlrb-1.2.8.ebuild 631 BLAKE2B ae1d34905e9652014656876580119e2f5ad9e3ec8c44d23f2ddf8540e32d811cd2d7d73d2ed47caa7cb7bd85e7c9da6e2676d6882535c87d0e28768cbe8da3b6 SHA512 c27f38713f2f4328c04a5c702779f6d4479b2a66e518975c746076d896f47ea738ba3158ae4657048cab93d5907962ac0137574704874c9c01d2b04730ec4ab5
 EBUILD tomlrb-2.0.1.ebuild 650 BLAKE2B 46b008791238db1840eceb695b0cf3331e2cffbecb89fe09e56d83b070523100bb5904f2f2dd11a355d141481c9fdefe2f691e9856e16186233791b932cd7580 SHA512 047174181fc573c17fce51c8aa2e141d96ca36d29fd7c2264b65be14f33d2dec50a55bac349337c58074b13f02d154fd611e6a104f876a2dd1f173db4d8e9dd2
 EBUILD tomlrb-2.0.2.ebuild 650 BLAKE2B d702d3acfb5086392f55c674e53f5a4ecfac8fcab959c63fa692f653192f1bbf5ec2e69f63b4282f2e43cfc979229fe0294a9a3c4109e70644641ffd9fc89692 SHA512 87cccba9b2b350300f8ed45373968129f603aee02df153399dea74a4300e38ca74c4ec2d99563fbda40d1d56ea57cab188d4b7398d25f927f90a5af65a33701d
+EBUILD tomlrb-2.0.3.ebuild 650 BLAKE2B d702d3acfb5086392f55c674e53f5a4ecfac8fcab959c63fa692f653192f1bbf5ec2e69f63b4282f2e43cfc979229fe0294a9a3c4109e70644641ffd9fc89692 SHA512 87cccba9b2b350300f8ed45373968129f603aee02df153399dea74a4300e38ca74c4ec2d99563fbda40d1d56ea57cab188d4b7398d25f927f90a5af65a33701d
 MISC metadata.xml 342 BLAKE2B 603c1ce55bc673a27907657f0d61e865aff3a63662610cf0e094d56e311eb0896fa5ced43072359804ea62c741a243cf138c500b8b9ca1513c505776917e3d37 SHA512 ebb4a10c4a93729d88273ed0ecb9832b5f94d71f96b1aee567f4d9b6e11b81b43cf43cf87b04406d9f003ccd7fa18bf9c2f57e8c630042e54a55381821039a56
diff --git a/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild b/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
new file mode 100644
index 000000000000..61130ab444a3
--- /dev/null
+++ b/dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
@@ -0,0 +1,28 @@
+# 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_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="tomlrb.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A racc based toml parser"
+HOMEPAGE="https://github.com/fbernier/tomlrb/"
+SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
+}
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index 98dce34d4ffe..87bed591bf96 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,3 +1,3 @@
 DIST websocket-1.2.9.gem 28160 BLAKE2B 1d0423050d26ee9c719de1803bd5fbcda80acb2c47825e2ad4203b8ac6e3e9a925fbe3cab8f5c0b283841dbfdbb97b753cc4f2c7a9c689486dadd9573b8fb87d SHA512 42044df313e1ca2525700decaac6f77b8bf9d4f1dd21723de408c636196e9f77c4b9d865abeb1de68575ad3b59ad48a9e7c30f0e16dbd15695958f8cf6ca3d57
-EBUILD websocket-1.2.9-r1.ebuild 420 BLAKE2B 8b12cba32f9b7aaef881881b1fca537af588824b23fc060451947f866e855aee0c28750ff6b65cf3801e6a8937ec9007e18abbddedc3a36ac54ff7d3adcfa410 SHA512 b49c7c6049e6accb555f55de4a28d9ada202552374cea94d6c156fa23af967bc65734bd8522618a11ebf153edfe5147d93613492c515d3f5d120699ab9415a70
+EBUILD websocket-1.2.9-r1.ebuild 456 BLAKE2B aaf39296991f53d2420afb12079398d077161c10227610406c58dc352cad6fa221ae5f01538530c436e64fdc22e94126097782aae20e879e6e209adcbd928776 SHA512 727dcafa0759cc4160c5cb1aeedafc191399281a9c11cd796fadb32be7b6c75d8c5082051f885389c6ed50c2ee5be01a9d0516d5c41cc4a2f39088c9ea9bde73
 MISC metadata.xml 348 BLAKE2B 97c5037c95e1f278b4e7607286707298751b9aef68d81d99448842de0561c9657e191dc72ddb530e0202c6be2c0433482d1e0066bd56dcab3b0edd8daa6195d2 SHA512 7d0a8b7a151834686c239ef6f56d2648701f37512fdd1effd3cca0204e2dc445a586bfad9acfb7b38c094db15154b861a31c6dc9bbeba7559932e87d61742821
diff --git a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild b/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
index d3b4e870357a..3c499c7c78fb 100644
--- a/dev-ruby/websocket/websocket-1.2.9-r1.ebuild
+++ b/dev-ruby/websocket/websocket-1.2.9-r1.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=8
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/imanel/websocket-ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 8751b057b7e8..28fc408ea07e 100644
Binary files a/dev-scheme/Manifest.gz and b/dev-scheme/Manifest.gz differ
diff --git a/dev-scheme/chez/Manifest b/dev-scheme/chez/Manifest
index 644fcfb3812a..668d0f81a131 100644
--- a/dev-scheme/chez/Manifest
+++ b/dev-scheme/chez/Manifest
@@ -1,5 +1,5 @@
 DIST chez-9.5.6.tar.gz 34565487 BLAKE2B 5d74cd3365b3039e6be1b774213da75da1080beffb1c9b5044466a8feff0171ce75d9999e69774754a5969d68825c571a88cb27d57af2718e98668e4fe936e3c SHA512 4affd73a5b2ea5cdec01fb200a32499387fc3769b7677ffe7d854f6a5567d50ba114f9f12951f99d8e0fd757c799e82e32c83079fae83e5fc138ee6e1a5f56c0
 DIST chez-9.5.8.tar.gz 35487100 BLAKE2B 6c5467f812788166aded14ce38ec2935bb890f2386f3ea7ec29a97c6a3d9aa37f26960e44aa6acd6b3954e45dfc4eaff4fc7db1dd77b231fb380a1dac7349be4 SHA512 80a4e9f61ddb254bef1a249af1d32f918df88390946fbe6eeb62c3510c760bf899285be1aba70eda9b54bcb0c6fef3fe7deace648993cd9cece2d08cf0ade9c0
 EBUILD chez-9.5.6-r2.ebuild 1648 BLAKE2B 3495e5605e2098f7c8c16638f6c6a6a5d97cf4bb4e2ac4f685e09779e0ae866e960a434e9fb9ed2afa0eefd80351bc79bd19e1421ee8c0c257a908abb0c3b851 SHA512 34d7cb87d6cceb4b24eea892ac517ef53cd27fe170050ba3cf18ca04643fa43ed0d63379d3d7be18e813a872a8ec4e97b7131fe8cbcc2c6506c928adc1946eb7
-EBUILD chez-9.5.8.ebuild 1649 BLAKE2B ab68e1d57b4f3b89b847985983cd25318decfb25370217add54d4a4ca08c84fb01dc7f7cfe772642fa513a781de4377821d20c8b2f6652c2c10303adf8c640a1 SHA512 fc22952807960e917821b165d93a8fe8ccfde2d8374639440b1933ebcee4752973cea2e6668ec61a06e39474747fe370867a64c6db37313cabbc8bfe9c6b1211
+EBUILD chez-9.5.8.ebuild 1648 BLAKE2B 3495e5605e2098f7c8c16638f6c6a6a5d97cf4bb4e2ac4f685e09779e0ae866e960a434e9fb9ed2afa0eefd80351bc79bd19e1421ee8c0c257a908abb0c3b851 SHA512 34d7cb87d6cceb4b24eea892ac517ef53cd27fe170050ba3cf18ca04643fa43ed0d63379d3d7be18e813a872a8ec4e97b7131fe8cbcc2c6506c928adc1946eb7
 MISC metadata.xml 1247 BLAKE2B 2fce457107f3e9a65f30ecc19c891c1b953049889bcd7bd9ccc7537c6ee8b9ae64937ee46c329f74266f095fd611ae53775e4229aacd4ebdf82b83135e13e50c SHA512 2a0bab06ce23b7e38f4651d33337b03691dbe09257ee325236ad5c585af4300e2b15f6b0d9614ee87ee4721adebfd71c0a2313ad3865a9e7f75e5e95b54cc5a3
diff --git a/dev-scheme/chez/chez-9.5.8.ebuild b/dev-scheme/chez/chez-9.5.8.ebuild
index 9b650e16a29b..2d9538ba01d5 100644
--- a/dev-scheme/chez/chez-9.5.8.ebuild
+++ b/dev-scheme/chez/chez-9.5.8.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${CSV}"
 # Nanopass (MIT), stex (MIT), and zlib (ZLIB).
 LICENSE="Apache-2.0 BSD-2 MIT ZLIB"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="X examples ncurses threads"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 52d4197d9f14..0faf06fbc729 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bpftool/Manifest b/dev-util/bpftool/Manifest
index 52ec61dbdbe6..a4a510b828bf 100644
--- a/dev-util/bpftool/Manifest
+++ b/dev-util/bpftool/Manifest
@@ -1,9 +1,6 @@
-DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
-DIST patch-5.16.15.xz 721632 BLAKE2B 650cc70fd15c2f3ee527589e122c0a60543d6aae918eff51a9136a8187402b1812d6439bfc9a10882c20c444fd5dcdb9570e4f53024ee7f2ecc8e2f17b3f1a25 SHA512 e5dcae0e6ed3ccb9956f2c9848df0dbc93de55dc704214fa248ac73a8b9de3fdd829a9e9cfa2c15f452548e5ac871ad1594d6a622271bf98fbd07ae747f18520
 DIST patch-5.17.4.xz 547280 BLAKE2B 453f8ff38a9c6bc69ebb18fe2ea413844e6987b6ff5e0c735f0d047b730349e35731d5a813c3732b330ae9e06e606987952f4d649b3b9b43144710dd296b769f SHA512 9242ce094611d1ee672e782d3eea5910af6c8172fd237afc0a58414106bfc2e7a771d3db91fbf19bcb3cc123ad103c6950951e0c5c5582410a43caec4eb79465
 DIST patch-5.17.7.xz 668120 BLAKE2B ea6a34976496217babeb0668732b9eaf9e29403e691248be0403c2c800822ea3b38d4cda631153608c63eea1d629ddf4686f45c9e985faad25c4a7566bbd11bb SHA512 b471a65070ad927a9ab407a0e177f2f7822ec4a6f8a25aec82a5a56cb20553ce0539f1f276b59dcb4f9d9a2f9da287c639d9c3ae76ef5f4e8f4ba85d215218d2
-EBUILD bpftool-5.16.15.ebuild 2830 BLAKE2B db113b1e8e9b42204215e0d0a6b1ff21b7ca929401f4e63b33e1fc0da8baa837be38349171ff19c2f7460b63062b72423e0524df6180c118ff10e1b110d90bac SHA512 139015d99cf70a7bcf9558f316a214e4c8cb0b9c162c6936df785702b94f02ee5abfccb64e5f6beebef4badebe6182045917cb3fb45a4edf0ccee108c00f7385
-EBUILD bpftool-5.17.4.ebuild 2831 BLAKE2B de315e53f165a2008a74021dbf4ccfeab5a59121e1044dd5b11d3df29c086c38ce32a40ab7d1fb2aa16ed7c1cbf4208a7ca1252fef3eb48716cd0b74d6c64684 SHA512 87b2a927a3b3b2738f0a2f126af9d83bbd68b7200c4b36b987e898d65c3508018636413cfb113715065514b7ccf251a0b8903597249ce8ed116c4ae881a3880e
+EBUILD bpftool-5.17.4.ebuild 2830 BLAKE2B db113b1e8e9b42204215e0d0a6b1ff21b7ca929401f4e63b33e1fc0da8baa837be38349171ff19c2f7460b63062b72423e0524df6180c118ff10e1b110d90bac SHA512 139015d99cf70a7bcf9558f316a214e4c8cb0b9c162c6936df785702b94f02ee5abfccb64e5f6beebef4badebe6182045917cb3fb45a4edf0ccee108c00f7385
 EBUILD bpftool-5.17.7.ebuild 2831 BLAKE2B de315e53f165a2008a74021dbf4ccfeab5a59121e1044dd5b11d3df29c086c38ce32a40ab7d1fb2aa16ed7c1cbf4208a7ca1252fef3eb48716cd0b74d6c64684 SHA512 87b2a927a3b3b2738f0a2f126af9d83bbd68b7200c4b36b987e898d65c3508018636413cfb113715065514b7ccf251a0b8903597249ce8ed116c4ae881a3880e
 MISC metadata.xml 356 BLAKE2B 4cc2dafd4a125f2144fc8537377c1857c4cf3ace56242965c41f29b5601b346b211ae8a05459b555569b4a11d2eed39345f02c3fe27ba8a8f93117969ee8b8cc SHA512 c2c0f149fbec22400163df406cdc10df537bef638251eeabc332709992e7470c323b366cfc465d6ecf14f2d84065660cccefef7a5ca45980d679b645ebf664be
diff --git a/dev-util/bpftool/bpftool-5.16.15.ebuild b/dev-util/bpftool/bpftool-5.16.15.ebuild
deleted file mode 100644
index 6e1462d1df87..000000000000
--- a/dev-util/bpftool/bpftool-5.16.15.ebuild
+++ /dev/null
@@ -1,117 +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}"
-
-S_K="${WORKDIR}/linux-${LINUX_VER}"
-S="${S_K}/tools/bpf/bpftool"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~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
-
-	# 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/bpftool/bpftool-5.17.4.ebuild b/dev-util/bpftool/bpftool-5.17.4.ebuild
index d4a6b8926868..6e1462d1df87 100644
--- a/dev-util/bpftool/bpftool-5.17.4.ebuild
+++ b/dev-util/bpftool/bpftool-5.17.4.ebuild
@@ -25,7 +25,7 @@ S="${S_K}/tools/bpf/bpftool"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="caps"
 
 RDEPEND="
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index f3f3042441f6..45a48d848709 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
-EBUILD buildbot-badges-3.4.0.ebuild 897 BLAKE2B 5da959152c0f909629592039be681e1362049cb91508aaab3d91b160bd62c6633e24100bc86e73ca138dc10ee56bfd60d95e22150291212737d903a972bdaf46 SHA512 b01b4a979815fe4de1a75efc74e449f95998a6491972a79f463ca6ee74ac9f0f8bda1c182326c3d2f92b126d6ca48306fae9474dfaa0b27c2e661da55067b4be
+DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730 SHA512 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
+EBUILD buildbot-badges-3.4.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
+EBUILD buildbot-badges-3.5.0.ebuild 929 BLAKE2B 4d55fd1681ffde007d5d7c0447ca0996d3a65f4640ee9680fc7f9073b62301c85590c408bc7e47234a9ad4f1320ec128c57776bed60e15c90cfa79b6d62c13cf SHA512 7f51477aaac9468a6010a3481efe7a10eec3033aac36b5b0dbd9e2498bb4b359311590a833633dc02ac9a64d69ff9b84e83b5bdd4ebaa6fae318bdeb2803fb1b
 MISC metadata.xml 762 BLAKE2B bad3590966f17a1a4f25b1b382be72f6e2a1ce77c5a0a806fb878b9d20d9c30dec6ea493a530e0aedaefe2dcc964fe7397e752f38a00f9feb2c8ee372d541c9a SHA512 f3936f9cedb5c400740e691833ee030996e61f0f9e6e7661adc5ace37f415c2d456092137a5d14cf792089387177499a36be0bdd53188676b699a829bfc21c24
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
index aaaf23f83793..37e3828ead37 100644
--- a/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
+++ b/dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
new file mode 100644
index 000000000000..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index ed79b2913d06..cd78484b12be 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
-EBUILD buildbot-console-view-3.4.0.ebuild 688 BLAKE2B 78f60d5676ff8ebf5d578b956087c460253827cb93d4014b73eda64e4cf07061a93c4ae5db4fd578270845130362a85d2a25480fff5b2a1b5ac6fd1c894b7ba4 SHA512 546faad9371bb1caee78f4293334a93519bcaddc16858145002bcb42c32e976ee85aaa36c472b5173440c1885977eb61701afe938274c1ad0f9bf01f5fe98b9a
+DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57 SHA512 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
+EBUILD buildbot-console-view-3.4.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
+EBUILD buildbot-console-view-3.5.0.ebuild 720 BLAKE2B a3f51e619f183f83855fd10efac13e7f3c2e182788ada0089f56dac4559319f63ba4d91df34de4802aa1140a4d4d0b68fec87ef427ec395c89f302bc9d92cec8 SHA512 9809463fedb463807372b89228cc648f427196e463ce213def6c14ab36b05a1bc58197ae5367cb027887971075d8b970f16f32fe747c5a4d12feb35184986981
 MISC metadata.xml 661 BLAKE2B 00812636b1e2bf2b7d604a540ed1982e891894f38d8fa256bd954a693f6ff4b203c9a6cf8a2d4b67288b489a362a661b072de042dd3f62cf3d596ef14049e35c SHA512 1f905f5810e7a216e73e942fe2cb42302010fdb19078f20ee95a20555e2b2f0e13e29b3cf326d0a546bfc78e4d610d402199acbb915fc0b57ff55be3c402ec2b
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
index b296e44eae5c..5b7624cd297c 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
new file mode 100644
index 000000000000..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-console-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 133370c9d344..cf1e52ecf914 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
-EBUILD buildbot-grid-view-3.4.0.ebuild 668 BLAKE2B d099858300bd047ba243672b76046c202e0bc43f8da324be52a58a66da4ea81ff2c723d49cdb2366e4d6ac2d4285489ca2c34d8cbf7f41081ab99f547ceb8894 SHA512 0dfeb8c1a97a900269ab41e0c362c07815c697ec0a8603b2ade81f341e1c3436c123f116ae4116bf43e400d3d66a303fbe92b38a2f44e62e58361fe946d6ec9d
+DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f SHA512 a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
+EBUILD buildbot-grid-view-3.4.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
+EBUILD buildbot-grid-view-3.5.0.ebuild 700 BLAKE2B 5786d88489beefb9743c24bb8358a15fa727abff3db1c1e3b74bf433b958fe8d89491c2a2080981ac3549afd8318646ee295295d9365a8210e25d6b16f959657 SHA512 fe5efc116d6eb48fd16addc7f360949d672d68f24f11843d588e2e396f7a7b8951c581e2aab140d1c5458295e5bc45368439112094f2be8aebe04256c537f12d
 MISC metadata.xml 640 BLAKE2B 22ccf767dae88664f3da52b44a6cc1d7abe93e282db0bccd6fc7bcd20bad2719b3cbc0ae75a7a72baf6a542908e7155026d7fdf1fa6976b165129110e348e11a SHA512 d6c7605dc32e3fc40690a45b8bfc70fd73e82e07ddcd49d94503254c25f5d532fc21ce79b94a37fc0a1fd023f5632065c35e946f0d48bc802c051f04a5dcaf81
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
index bace515df399..32ac344a514e 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
new file mode 100644
index 000000000000..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index a0a1b63716cb..6c08fff2309f 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
-EBUILD buildbot-pkg-3.4.0.ebuild 872 BLAKE2B 9990f5c3b7509915d5fe04b477be0d6549a24a7889856f3f2ea06cfac36e234c58db59d24200576c238c898f6341277de5c69b1b37dfc3557ab411da87538459 SHA512 abf1a72f430fffb92207959eda073863e436e7d32284c8f72781e75a68265c4576746379b2cdf9e8fee0c18a1742866e1d19d0402eb16a212a52c1b416c9fb2b
+DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968 SHA512 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
+EBUILD buildbot-pkg-3.4.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
+EBUILD buildbot-pkg-3.5.0.ebuild 904 BLAKE2B 1cc28b279fabe652fa139e915877b970b93f3f9be1a7c565957995cc66de1f1c0bf49b091befbf403812a24241b23d3fc382f0de0cdc7f18de6c574939b565f6 SHA512 63d6097dcb833f15518feec342e99ea1127ad6e9084556799dbae55871555c96c6929750beb00c97feb81a733ce418d260663aaee8c2bccb8f1b7f5c5276b05c
 MISC metadata.xml 1199 BLAKE2B 1eb102f71e83b2d11adff2f92f08614715428508b83042358d054babd4cd7f5bb63ef0e289fd9e60360111dccbd734422215b6f8a9811198f62c30cb82612566 SHA512 545c227af17fe4492aff85837e948769001d281dc40cbfdb5a74663dc5fde6989df632aab9a6f5cda644fd20f385d36469ec38b930bb42bfb61483c1c5e46faa
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
index edf7eaf4cf37..4d4e95e9196c 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
new file mode 100644
index 000000000000..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index bb20d90415d6..4df00eb9f91f 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
-EBUILD buildbot-waterfall-view-3.4.0.ebuild 727 BLAKE2B 06de6d5790c7ab1a0140626453dec969cede77d3b703de747fe68dd2125e002e2e7750e51d01e8282de8f0bd86ab9ca620f399f61c338fb05a5d87c3bb2fe954 SHA512 c7f35aca2f1561f3fd7ea2e54df2d0a5fced41107fe1fad37e026587f290dd7b97bef608d5ab2aa4019fb661bf75dfdeed9585fca93f852978f45c9e9fa5de6d
+DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff SHA512 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
+EBUILD buildbot-waterfall-view-3.4.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
+EBUILD buildbot-waterfall-view-3.5.0.ebuild 759 BLAKE2B 0c1b064d404368d586b8f558e80465cc6dc055f048c1d8415854370b82eaf31677199c770281f8aab61bbc411e2f7454d1b638757aff10ff354842dacf58f295 SHA512 ad93403e653dc3a347717758ef2241a2bc2d345f0bda249ca914d3e93f156c805a8db7ffa3e6ef4fdbcdcf461bb9861a270c05dc60428f769d44df842b3972e5
 MISC metadata.xml 681 BLAKE2B f74bd19772210f0ffbc45a54aa06a05c97c11bcc18a76ca621e4761d36f690bd0d1ce926b744e3b6c0dc83fd3bd709a2bbc7dc53c63c0364cd0e82bafaf0620f SHA512 37b2205043cbbfdf019b0a827494d28693e3e0537cad6fca6a1e46cccd3a6779f5b9244f2b9523953ae07238e8b8c90da00cf5061f8e6d54895c06c447137fb4
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
index 317f27754a58..591aebc7cf5b 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
new file mode 100644
index 000000000000..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-waterfall-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 1d4547428337..32ba7437f67f 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,7 +1,9 @@
 AUX buildbot.tac.sample 1799 BLAKE2B 25fa4b85b0ad16d51780613b20f89c56e0131d73eb7d8b6cb23cfeee84bcff31b99a6bf2e81bbc467db340a774a43be6a2f7fc3c03068df09dd6164fc9e8050d SHA512 4a1b6d78b51067b5d3efb8de18d91995efb820bf9486c6ad6acd5bf726e39c3a7746cc9fb90b5a07eda8a40b09988490972b11707026d951184660a21fddccc1
 AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
-AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
+AUX buildbot_worker.initd2 1637 BLAKE2B d29fa6d6596f789af88319300537ef8ba9d51eff452d54afbf27dcc0da358482b73b0c721d537c217ffe01502acb0eb08c31c138042bc39e4d1457091f84a284 SHA512 63ca598dc7d3102cf74166ddc92045cc06f798f17676bcb7166b95bb5b1562bb1ea172afe39ea275783ec7ca7db1c469c7f54dd588a007026e93b3877ba2ada5
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
-EBUILD buildbot-worker-3.4.0.ebuild 4612 BLAKE2B 7f048e1a8f8dfcf0009d17428fa4dbf4edaf0b3773bab1cf915ad2c9820233a1a528871de45b55276a6cf9cfd727af9e5bb47b954e1ef8c0423c81957065c9a0 SHA512 378b83c7943d08fbd9c316b1fc180f8fc886c2408b9ab56778dae2fa0ea5e5e6caebbb7b8400788d342d817d4649d457d197ea5f2e69c66917e3446247067633
-EBUILD buildbot-worker-9999.ebuild 4514 BLAKE2B 2f6fea082878f4ee08eb5d488237a83f2962fa16cdc46bb40e917ea4c906dab5fe3c33879356f3c5cd6fc7d563f22d543194451f59921853462bfe119bf2b9d5 SHA512 0a0ab5c9eb9eeff2ad181b726bce42820f4a5ec40cec51e28cf3c20d2d6aea298d241de7a9608c914289fc0362315938a93d393186f4af1f351543e8b252affd
+DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
+EBUILD buildbot-worker-3.4.0.ebuild 4644 BLAKE2B a934c87f28b81ab622e0ffcfb3e0e0636722b6d6ea0066fb9aedeb57b9f61857891007584bbcbcc1306b8454616f8a8c241def5467732818e54988e234ef4905 SHA512 a08935e46cb9bcd9ecf76a0e5e4cf94a31f5a27a4d22d94d9ab19e86e6ed163082b36d507d76be8e3692ae4278081d0d60aa8ed0d09b44e53939ad9050be6c0a
+EBUILD buildbot-worker-3.5.0-r1.ebuild 4821 BLAKE2B fd63774649fdeafbb3f6f007d91cc1ded300455b2bbc73bbcf8f06af973528a43d77703170b23595c0dbd4bf6b02eb584bee023e26feebf611f4a5c68c8b6794 SHA512 1859408413d58f7b9b79f2c19c83b4244c19906b58650bc3b22087d32b81b97c8f972acea737db855cedca0f8f17071bdfff722cdd95dba00dfab983f5173ef9
+EBUILD buildbot-worker-9999.ebuild 4723 BLAKE2B 624265dba845045056b7c7b6a58fe070141ea043e8e0b713650e83bf6d1e3ce78389001f831990843df149f2cfab0c02128ab4494310ffea19fadae3560dc4c5 SHA512 680b8c0f51a9a02f8f57dc48af1928084519b5d14a319f0090b0cbe9d7b40a5eb730e4e46ae21ccddb8f1e412450cb09c765cd9689b8bc31f178663701bd4683
 MISC metadata.xml 481 BLAKE2B 884b573e537512f10a184b60b3d354ef70aca1200507c74ad4be79ebd0fc81cabeaafc9db05e23edae6cec47b92340febbcb3345c0227a32f95119d607493cae SHA512 d6f00cc040032613bbbc55fd957a0544266b20e54ae30710f7c32847576a91d329c55692a9fdc74e25827c7b8689eb17770b7935bd91ebd8395237e0e8b200ae
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
index 53095e2d7956..e80a110a2894 100644
--- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 distutils-r1
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
new file mode 100644
index 000000000000..9da9100eb30d
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 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 readme.gentoo-r1 distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 18ee776e0e52..3c8df2e78a33 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 inherit readme.gentoo-r1 git-r3 distutils-r1
@@ -20,14 +21,18 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/buildbot
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
 	dev-python/future[${PYTHON_USEDEP}]
 	!<dev-util/buildbot-1.0.0
 "
 BDEPEND="
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.initd2 b/dev-util/buildbot-worker/files/buildbot_worker.initd2
index 453d207e5d88..4ebfdd452926 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.initd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.initd2
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-BUILDWORKER_NAME=${RC_SVCNAME:16}
+BUILDWORKER_NAME=${RC_SVCNAME#*.}
 BUILDWORKER_PATH="${BASEDIR}/${BUILDWORKER_NAME}"
 depend() {
 	need net
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 123ad2cc37dd..50aa91f84774 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
-EBUILD buildbot-wsgi-dashboards-3.4.0.ebuild 712 BLAKE2B f8e978b24080c03603accfd185a50026408274302b20ed38560bbc75c662aedfcae0a2b0680c927505b0ba5f5e9df215edcb1d536184af496bac34e0c1b6c38f SHA512 22dfbd299cf708d8527fa1caca6d15a027be6075cea1de565764d04572c7d7833edbbe9a7989f2af302a3deeac21f57b8a71f2388f60035e03e6281f71833e94
+DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1 SHA512 d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
+EBUILD buildbot-wsgi-dashboards-3.4.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
+EBUILD buildbot-wsgi-dashboards-3.5.0.ebuild 744 BLAKE2B 3fd09fab4929e3bb190370108cc583fe2df25514c79d60b16a332f516782a32cad2ea1c0a0e52a8e7b3c1e9e1327b536d18269cdb21d61c7f4bd16edf9303958 SHA512 b3a3e3e987888f539f2374e698042ad4f2a1ebb9c77f4921c75255964b469a393859220b56eae830830f5575ce58fcb2b5ae9dd627b81a5e3a203799ada10346
 MISC metadata.xml 680 BLAKE2B b3fea763f6f493b0fb8be5e0408f80b295a5d205c5d01443e3a47965a5c982dbcc8e1f806978b0d8939e31ffeaa425590f9be8d5b563f0c064d700b1f33343be SHA512 01aeda23d466d40dc4c2bf7668595795fb6f743930c168549f259fd2a6e0f3491044079ef039096d030dec48ebb2bf3977bb5084264381675984cf43e063e083
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
index 0bd0ca928a28..b67bfb3e65bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
new file mode 100644
index 000000000000..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-wsgi-dashboards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 6c9115f212e4..070b0b3a65a8 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,5 @@
 DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
-EBUILD buildbot-www-3.4.0.ebuild 683 BLAKE2B ea5075f3fed26d7c763676bb724b44d8435aeaf63694cec7802e0d208d35163177dce8bc37c3f8cfe3d89d400887558458b014d623ed39e22ffc8b16300ba0e9 SHA512 85685b2b4f04263a6d06b6422aea471e6ebcf4d17fbb0fdfd7f10403d54264af817f6c5a8b530c5e3d064f684daffa6a2f99dc6a1ddc4419e751102c0e524a01
+DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa SHA512 f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
+EBUILD buildbot-www-3.4.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
+EBUILD buildbot-www-3.5.0.ebuild 715 BLAKE2B 0335bd4910cbfa25181f900c9ccdc1d4c16f9e71e097b246e1450359b7b38c118e871cd904d3bc921d7ce315d6180aa653a8269c5866807d1099de6b079edb0c SHA512 b6cc81a73694d0cbedc22945708c1ebd391389e3492dd9ab4441d44b88fcd0d5c8b16936b70bba3a3dcf5bba5c659d2047e9bd149c581ba61f4b17b654966275
 MISC metadata.xml 667 BLAKE2B 10cb0032009c616e55be86ca788abf9b643890605d456b71636b40b0b9591136270a2d30227d3b06854ddce18a7697a3326233cf6da0e1386af4f8102d8d53bc SHA512 d024b9e5148003c7d0d20c82d25bd376006d4c2d8bdd8d58c865f6f35a252333618ec3964a5af1baf63ba9ac7fd5b49fca4c65438066512a016804ef85032256
diff --git a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
index c63f1d6ffe14..7834a034d6b5 100644
--- a/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
diff --git a/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
new file mode 100644
index 000000000000..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-www/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index c8239a32832f..3868e755197a 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,9 +1,11 @@
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
-AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
+AUX buildmaster.initd 1651 BLAKE2B 49012bf396862e28af3abcec1669bac93cfa4a60ae889d9c1584f028afe22508db797260615541267d3d501820e2643b2f03f12409b0d2d1c374e20dcebd6030 SHA512 72ea57072291d1eb49a4d567a7bd4931cf2f2d962e1e885183468b73d4052b1f0f4d454a18320969db84d82c144fe47076646f70a7f141f832123465cbba6016
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
-EBUILD buildbot-3.4.0.ebuild 6534 BLAKE2B bd72225c1638f8f472340e92f3cd9ed4f4af34e5cc21be2cb6c9d1efd147a83cda96b3f872432f8ec0afa633712e01212f643214010d47f9420e4483a171dcbe SHA512 bce6e5cf3afe7d37b7992cef9cc36e5368aa362a849c8f6247bcab1f634147d398399ffe7b56dba1edd1937b237c99f9282967d01a0b0dff214d193c1375d1e0
-EBUILD buildbot-9999.ebuild 6432 BLAKE2B 815bc338ec0f9ff949d32ca02201c59b446bde86bfa9b8c9272b785425a53f4dbba30dc16204d20175b9b45f643bcbcb590a86b9457ad063cc4a10cf1d8e5729 SHA512 b46f1955b7a36d981f0cf4fe62925b3aaa93051b0e264c0f5acbb7fe9efb65ef68927f0510273dacad167db22b6ecc5ce6a21a387bc34a666cc47bdc8c16844d
+DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
+EBUILD buildbot-3.4.0.ebuild 6566 BLAKE2B be9edf41162c3d9e0e78d3a80aef9efac6e208cb4862ecab62dd3c6f447ecda995b25b70b1c639c137a5ab96c09aa85d48523da1ac7b8f0013c0ea12401ffc29 SHA512 4d0d86a7ffa33937ddacccfe7f9bca35f03c0c39b5bb080ed576aeec93dad58155c42429474b59b2076d7972f79a6724bc63dd7937910f4dc7dc4c926f0b56fb
+EBUILD buildbot-3.5.0.ebuild 6566 BLAKE2B a39542ace97fc4324b0bde9151b61046bf62c900a5b09fffa1f1a633273a29d145a816738b7c74d057f7fc7d1e43b10e659defd5dfb33a8a66a94b64813480f3 SHA512 683ba1890dc5c99d0d78fff18c690edc835af7c3d57d226b91bb12fed9c493ecd5e59a160919c42ac90f53aab7648c871aa348d64cf4583a4066b5be2e284c9a
+EBUILD buildbot-9999.ebuild 6445 BLAKE2B bd10410044ae6dd5769e78e7c8046d40ff6db777459db60d1683668fc5a4fbf774ecd7208d072cf8a9fe7564e56231b63e654b4c22ae2b227a1b42373d79220b SHA512 da2d4a6481725df2e9307e3a6dd5241827fe0e7b449ae93c5c11e43f6521530842d775ae7ba7c0a147b21ca32dd48e2064b4a3b765a9415702fe29e85f24dd24
 MISC metadata.xml 1360 BLAKE2B 4f54443c55c18288e1cd887528e94c5c258441cbde1579222f141ccba69b241b7163ee5c65056b9ba89794c543342394cd656b5f6d9f8356af47c4681d60bf4f SHA512 3ba99aead69ebc879d9e8a42ed41f250cfea97bdb21147dcefba40b759f87e682f0f416ab6b915afdd4dbe2c4e41ce99aeee23ea8afa349a131f6f450ef7ea95
diff --git a/dev-util/buildbot/buildbot-3.4.0.ebuild b/dev-util/buildbot/buildbot-3.4.0.ebuild
index 38255fa6053e..da16ccd719c4 100644
--- a/dev-util/buildbot/buildbot-3.4.0.ebuild
+++ b/dev-util/buildbot/buildbot-3.4.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 inherit readme.gentoo-r1 systemd distutils-r1
diff --git a/dev-util/buildbot/buildbot-3.5.0.ebuild b/dev-util/buildbot/buildbot-3.5.0.ebuild
new file mode 100644
index 000000000000..eb038ad1f925
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.5.0.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+IUSE="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+to support starting buildbot through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+The scripts can	run as a different user if desired."
+
+src_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use examples; then
+		dodoc -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index 0f755c2b1c80..4b1b1de3957d 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python3_{8..10} )
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
@@ -24,7 +25,7 @@ RDEPEND="
 	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt?]
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
@@ -55,12 +56,12 @@ BDEPEND="
 		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
 		dev-python/moto[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
 		dev-python/lz4[${PYTHON_USEDEP}]
 		dev-python/ldap3[${PYTHON_USEDEP}]
-		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
-		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+		dev-util/buildbot-pkg[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		dev-util/buildbot-www[${PYTHON_USEDEP}]
 	)"
 
 DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index b75ae34830d4..2fe8db9f513e 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
 
-BUILDMASTER_NAME=${RC_SVCNAME:12}
+BUILDMASTER_NAME=${RC_SVCNAME#*.}
 BUILDMASTER_PATH="${BASEDIR}/${BUILDMASTER_NAME}"
 
 depend() {
diff --git a/dev-util/checkstyle/Manifest b/dev-util/checkstyle/Manifest
deleted file mode 100644
index e3b78da2fbe4..000000000000
--- a/dev-util/checkstyle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST checkstyle-7.2.tar.gz 3359817 BLAKE2B 45cb74f6d2ff49cc218537cb9b5f95764a61a506f3aad8e265c809a0fecf9da47e8902ccc3afc312cddf3260d763b9d98a7e148c9382ed4107931cd189841170 SHA512 ee99d96d99a3f75097297cfda46e3647e57213bcb8b78098251a21c3fe0b4bb774393848d444f721d4bea83173581c89377a9d250157d6e6a225239da81d955f
-EBUILD checkstyle-7.2-r1.ebuild 1605 BLAKE2B 173380eef8f493ba97153e13b142669885ed12dea97db709747d584e583ff2604851a8dca3f9948d4d09f0d51b69d2e43e2820b0ee48081ba52539830ee7987f SHA512 88fad58d31b9f8375fad19e241164ca8b5aa71183e5cb9750b6249fbcd3b323fa7541778c749c5dd77a1ea265c9e12628bc155a0310fca95562e95a78d0f7801
-MISC metadata.xml 378 BLAKE2B fc372cc19e520a1601a1418680407b6de80ad490d6b217a500c43de7b1b43e1e94e1808e9435b1ec419812e78e3c3f8ff052944c831d8c038ba2f2f4a5e33bca SHA512 b4b76dd90841cf4d828a76b7005d6dc7cd7d4d18ea07d9d9964f8919dc882f279fa1bf13aa386f15ea2ea6913e1cc516ee0308608890f6f389b06e89388807f8
diff --git a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild b/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
deleted file mode 100644
index 564d30830696..000000000000
--- a/dev-util/checkstyle/checkstyle-7.2-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Development tool to help write Java code that adheres to a coding standard"
-HOMEPAGE="https://github.com/checkstyle/checkstyle"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-CP_DEPEND="
-	dev-java/ant-core:0
-	>=dev-java/antlr-2.7.7-r7:0
-	dev-java/antlr:4
-	dev-java/commons-beanutils:1.7
-	dev-java/commons-cli:1
-	dev-java/commons-logging:0
-	dev-java/guava:20
-	dev-java/jaxb-api:2
-"
-
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*"
-
-S="${WORKDIR}/${PN}-${P}"
-JAVA_SRC_DIR="${S}/src/main/java"
-
-src_configure() {
-	JAVA_GENTOO_CLASSPATH_EXTRA=$(java-config --tools)
-}
-
-src_compile() {
-	local PKG
-
-	PKG=com/puppycrawl/tools/checkstyle/grammars
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr -o "${JAVA_SRC_DIR}"/${PKG} java.g || die
-
-	PKG+=/javadoc
-	cd "${S}"/src/main/resources/${PKG} || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocLexer.g4 || die
-	antlr4 -o "${JAVA_SRC_DIR}"/${PKG} -package ${PKG//\//.} JavadocParser.g4 || die
-
-	cd "${S}" || die
-	java-pkg-simple_src_compile
-	java-pkg_addres ${PN}.jar src/main/resources
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.md
-
-	java-pkg_dolauncher ${PN} \
-		--main com.puppycrawl.tools.checkstyle.Main
-
-	java-pkg_dolauncher ${PN}-gui \
-		--main com.puppycrawl.tools.checkstyle.gui.Main
-}
diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
deleted file mode 100644
index e2aab27f2281..000000000000
--- a/dev-util/checkstyle/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 type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">checkstyle</remote-id>
-		<remote-id type="github">checkstyle/checkstyle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/clippy/Manifest b/dev-util/clippy/Manifest
index c184a4825ab6..b57186d3f7a6 100644
--- a/dev-util/clippy/Manifest
+++ b/dev-util/clippy/Manifest
@@ -1,7 +1,5 @@
 AUX clippy-8.1-big-endian.patch 1677 BLAKE2B b47262fe1d6edb94005982ba854980acc47f21fccbd5969965fa2604cbf866748598a842b71a786a24e07ec39d0fc70652206d3b6d0464c435a06da40fff207b SHA512 c7849814b6b979fee63a2c52d364798f0a8fd4069d14a561881ee7db1c1213d6b1ad726f67a0d68df103e28f18b80aad1071427773b47d9916b3ca0247393c05
-DIST clippy-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST clippy-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
-EBUILD clippy-8.1-r1.ebuild 856 BLAKE2B c9faad7170c18e96b53ad6bf2e3ad3bf9bbd785e3c95aacfc6b7370aaacd90786dda7972fcc9ffdd112812e8cd4c6b51d36dcbacd5d03bbb99cd43fb59ce3906 SHA512 7b58aa8965114a6e96e804cbdc1a9fd94804fa1ef71156a55b25e9e55c29e3387691597ffabc66b82e5fd76edbd7ce0800cc644941bbac315cc2c6f4916a3d84
 EBUILD clippy-8.2.2-r1.ebuild 977 BLAKE2B 89595550f25aff7e0046d536e02e7a2115aa3373ce43cfcf45c4434eea1842049a45ae0af5919d3e658fe9c44a4e5f4f834acf404a5a82725cdce624fbd6732a SHA512 b35cef037f74f51a58b30130be7bcb6a8949aeeb4d77c0bd119f277b7b39e1ddc7ca0548822992d2b6c2fcb4512832509386c5426643b2c18bc923d648fd2348
-EBUILD clippy-8.2.2.ebuild 808 BLAKE2B 297d64319747eea8b57be7b8b1324bbf1671b0b39adf0d6a9b87686d456d8beee3a3ca60e02652ccc79de0a5034eb51103aadc579f66ad3b86b6a81fdc5f5984 SHA512 b1ebcd5eb3385765fa4bd52893b3fcde8d62866821abf97e1c0a82f582fb64e69b2e3b98f8580daaa9bdab6da0415ebc4314e58b21acc04b3f54ccacf99552ac
+EBUILD clippy-8.2.2.ebuild 806 BLAKE2B e67196557780dab504198bcbf73f91fef7a865c24527c1b48203806bb5ce44ded3b9cd1e9d1c20848bf486b78e52d21592ee461c4029e833f9d28e30d60858d9 SHA512 d40aca1c0afdb1bd55c222bd685667c2618e78e41889486091ca00a062ccb5df2afc3fce6a64cd50c011f55de0f0a05f7db188435f9ad13aeffb1c805c2b42d1
 MISC metadata.xml 326 BLAKE2B b909c2525951476b2905e143974e734364023b9ac622f01ddae1e16427359ea47af02af11a3bb6ac5c51ef519c9c66995c8cba31d9ca41f1e48f33106a0678b3 SHA512 ee570ffd0054e2c132d637b41921bb25f3172fdfb0bcbc5d2214eaa3bb95c109ca58a5e6cd7ebd386de497ef3e20cf3696243dcc5e82fc4cfae25bba51be4db9
diff --git a/dev-util/clippy/clippy-8.1-r1.ebuild b/dev-util/clippy/clippy-8.1-r1.ebuild
deleted file mode 100644
index 5102fb496f7b..000000000000
--- a/dev-util/clippy/clippy-8.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="frr-${PV}"
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools python-single-r1
-
-DESCRIPTION="Standalone clippy tool built from FRR sources"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/frr-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# standalone clippy does not have any tests
-# restrict to prevent bug 811753
-RESTRICT="test"
-
-DEPEND="
-	${PYTHON_DEPS}
-	virtual/libelf:=
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-clippy-only
-}
-
-src_install() {
-	dobin lib/clippy
-}
diff --git a/dev-util/clippy/clippy-8.2.2.ebuild b/dev-util/clippy/clippy-8.2.2.ebuild
index 7438cb91f503..4aaaeba91a80 100644
--- a/dev-util/clippy/clippy-8.2.2.ebuild
+++ b/dev-util/clippy/clippy-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # standalone clippy does not have any tests
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index b1554b9dcdff..224c68281f4f 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,5 +1,7 @@
 DIST dialog-1.3-20211214.tgz 565608 BLAKE2B f069968abe258942f27e010f8d14eafd270c45ae467d5131b41b57c0cc5a145a410fdaeab5f7fa221aa7dbea440f8e268d130e0f1f7389a224374b0047228156 SHA512 b76e7e1fc333550a9cc351e37e7121e98f48b2a1f78e8c0c528e2126db16ae14c4c5da088bc611cb12020836e75dd2a1d875561fe5eec6589c104252d4aa7626
 DIST dialog-1.3-20220414.tgz 566701 BLAKE2B d3fba0e896d51048876cd1c393d1f2183e47c5307d218dea0bf8c9cbaaed198bfc39e40e1f52b12c978dda10fa61be75d2527c293da652d2f83b80a2237d9d2f SHA512 53b7bc64bb6406c5828f2d023e7db457eee970ade2077bc64860ef12f06c254b4a13706eee068ffe44055ec6b0576ecfe33153438660a5a54f78ea1be00091ee
+DIST dialog-1.3-20220526.tgz 567657 BLAKE2B 1b46c0310e54f26cf5efcd8c84d9b8ef3d7ba7b58292c0967559e4bf281a0312185d3f9dea090e01a95a096ee1781bcdcbab11552175c8d6154ac9268654b6d8 SHA512 619d52b8123264bf586f5325443c3b85863166119c6fbaa91571a57454d761f01a53ebeb2203ea725c83dc88f2abf886c64c6eac5b56c126e4f3939eb1d24d62
 EBUILD dialog-1.3.20211214.ebuild 1283 BLAKE2B 64250ab768c4bbbae8906615fd597c3faeeed16756a1e56adba1aa17fbab4cc0ab23e32d5591c1215d02ca47a7d70724f537172882ad6b56f63fa44487da2124 SHA512 04a617333f28a61ccac8b3d64299c3c91cb239f68974ce23dbf138bddb16f3b70cfc6f359c0694a597d02e2bf64ade18dac0a176630e33d2add14f729ee2d719
 EBUILD dialog-1.3.20220414.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
+EBUILD dialog-1.3.20220526.ebuild 1298 BLAKE2B b572d1d099d9ecf5d425dbf8a7b9a10b2f708fc264954c91623a8b0ab4f2bd015ab8118d621b8651208f34e1f01df62e6aa2ef9ef85690d65d6048b58d55df69 SHA512 96f582e1c3ea2296c9f5ab984db020c1745965bd48811920a8f3eb4e45079b5b271737836005cb1bc41dbaa1264ea1d735aa381dff58658f88bf94adb7850f3d
 MISC metadata.xml 461 BLAKE2B 82507f66df52f2e9c4f51c52fc346a517e4244b4902dac4d557b52c01fbcdc9547ec8b0b572870a2860f995932973fd2b97698fcf748fe4762f210e4b12b655c SHA512 b07779508297ef58d1fd0349700cb7c609a1d503ce99c4fc3bda84c5441dd52064116680459510adbc6e1b6d9173d53fccbd3d6c2130caeb1d822dca5082a334
diff --git a/dev-util/dialog/dialog-1.3.20220526.ebuild b/dev-util/dialog/dialog-1.3.20220526.ebuild
new file mode 100644
index 000000000000..201a560880f4
--- /dev/null
+++ b/dev-util/dialog/dialog-1.3.20220526.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-$(ver_rs 2 -)
+
+DESCRIPTION="Tool to display dialog boxes from a shell"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://invisible-island.net/archives/dialog/${MY_P}.tgz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples minimal nls unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+BDEPEND="!minimal? ( sys-devel/libtool )
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
+	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_prog_LIBTOOL=glibtool
+	fi
+
+	econf \
+		--disable-rpath-hack \
+		--with-pkg-config \
+		$(use_enable nls) \
+		$(use_with !minimal libtool) \
+		--with-libtool-opts='-shared' \
+		--with-ncurses$(usex unicode w '')
+}
+
+src_install() {
+	use minimal && default || emake DESTDIR="${D}" install-full
+
+	use examples && dodoc -r samples
+
+	dodoc CHANGES README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 30f28c1a739d..88f55fef38a7 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,8 +2,10 @@ DIST diffoscope-207.tar.gz 2707223 BLAKE2B e20f21c9e0acc78cadfce082f874b3e3cbbbd
 DIST diffoscope-210.tar.gz 2709384 BLAKE2B 86b88dacf1d777bc63f7698197bc26abe638a25857fa43eac48051b91c07699d7beb9c0ac6bef6baf23fda895a07ca69342c9469a1853a38276f93fac11ea8fa SHA512 b0bd05ffb6112f5f6cdd7f9567ecbbda286226cc6874dfdded39b5d7221d2dbab4b01f02741f7e10a219bf03f94bc803c651963deebb67308a134b8e97fb3b05
 DIST diffoscope-211.tar.gz 2709392 BLAKE2B c3570f88bcca7193a9650d970f2d943ebe33cc428c5ce3d4c5812588cbb57ae83dd795674e364d5acbb2d1504bd218036a6b04d9431786668386f28bdd6939b7 SHA512 8d674f41e955bd7537ba0cf7df0c886ff87b017a7d756246a183d9ec5ac3b286a798d60d29aadda550de6838b264a9e27fb37cf472b6e93caab7fce2fb65a1b1
 DIST diffoscope-212.tar.gz 2710499 BLAKE2B b941e16ab4520998ddfc039f1d68cc28f60415a1d9adc462651598b0e009cfcb9c5247f05be959a4a044647823b1a4987e6a40d1c1811ba039e67056b833fa8e SHA512 85dfc4dc4fc3bf78432de1782800db5c94a0d9d1d8369071cd2cfce0b0352cfbe51c4746bb2073ade47237911f08b86a2bb22529e13c19e91935c0126e2aadb8
+DIST diffoscope-214.tar.gz 2710707 BLAKE2B 6acd7fa9c69ad831c6d362b805c2094b2f55d57fa87f69e9e153a99a71c90a67884796696df0d24d6b3c94c0b9a41736292d44208f4d8de4262eaa5f2eec6c90 SHA512 67a9b68ce5f7934747e30e41506d7e30f018673314b777ab86af89e3dd56212c442abe6e246741f7b842b5c58f14006442167cf9089823ba4ef1ba07e78eaaa7
 EBUILD diffoscope-207.ebuild 3297 BLAKE2B 38b17dc44cf8feccd717f69ae028dbada341c4b0dae653cc00fa4032da7c26a9d9026b5d8d29f6dc6f4cda42ee66ffb0d25f63c6dc253dbd0320e1848d01dfc7 SHA512 b97eb645cf2fcd16d472c265913373247d1b923586955860008ce2325369d10b6616704b88001e6260dc39bf409f2d4b5645ee4efec9c9e81f59731cce67ed74
 EBUILD diffoscope-210.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
 EBUILD diffoscope-211.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
 EBUILD diffoscope-212.ebuild 3299 BLAKE2B 65d0650ccf6601d3e6afa823e0ada14e446aaab408ada39c34acf153c13ee02cfe9045ce3fea0e134e651a972fb16f5b06ac6a235dbad73295caf31bf7c25a70 SHA512 0cead8b86fd50c651a6c1df897fa57482f5eb70a4371a38d84977fb86db5770e80f2b901a1fc762dfc48537bc0bd6492f62debc5434a802d698a860592f4a30f
+EBUILD diffoscope-214.ebuild 3298 BLAKE2B 9151743c7a7b49ae8e696abbbbe6315d5b34070d31ca5be7a71cec2178a40684a20f01e4437339efd4408ccb4686dfc81c92c43a18c9bd5b5ef75d87276b0330 SHA512 f1331f58f227c2a9e5bdebdbb2a89b7f27f2235a27e4f7fe008a659ec5c4ccf1e2b98c91bd863fcb40789bebb5ec671053739a6d1923122ec56daaeb88e2f0dc
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-214.ebuild b/dev-util/diffoscope/diffoscope-214.ebuild
new file mode 100644
index 000000000000..154291db075f
--- /dev/null
+++ b/dev-util/diffoscope/diffoscope-214.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses"
+inherit distutils-r1
+
+DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
+HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
+find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
+mono opendocument pascal pdf postscript R rpm sqlite squashfs
+ssh tar test tcpdump zip zlib zstd"
+
+RESTRICT="!test? ( test )"
+
+# pull in optional tools for tests:
+# img2txt: bug #797688
+# docx2txt: bug #797688
+BDEPEND="test? (
+		app-text/docx2txt
+		media-libs/libcaca
+		virtual/imagemagick-tools[jpeg]
+	)"
+RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
+	dev-python/libarchive-c[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+	acl? ( sys-apps/acl )
+	binutils? ( sys-devel/binutils )
+	bzip2? ( app-arch/bzip2 )
+	libcaca? ( media-libs/libcaca )
+	colord? ( x11-misc/colord )
+	cpio? ( app-arch/cpio )
+	diff? ( sys-apps/diffutils )
+	docx? ( app-text/docx2txt )
+	dtc? ( sys-apps/dtc )
+	e2fsprogs? ( sys-fs/e2fsprogs )
+	file? ( sys-apps/file )
+	find? ( sys-apps/findutils )
+	gettext? ( sys-devel/gettext )
+	gif? ( media-libs/giflib )
+	gpg? ( app-crypt/gnupg )
+	haskell? ( dev-lang/ghc )
+	hdf5? ( sci-libs/hdf5 )
+	hex? ( app-editors/vim-core )
+	imagemagick? ( media-gfx/imagemagick )
+	iso? ( app-cdr/cdrtools )
+	java? ( virtual/jdk )
+	llvm? ( sys-devel/llvm )
+	lzma? ( app-arch/xz-utils )
+	mono? ( dev-lang/mono )
+	opendocument? ( app-text/odt2txt )
+	pascal? ( dev-lang/fpc )
+	pdf? (
+		app-text/pdftk
+		app-text/poppler
+		dev-python/PyPDF2[${PYTHON_USEDEP}]
+	)
+	postscript? ( app-text/ghostscript-gpl )
+	R? ( dev-lang/R )
+	rpm? ( app-arch/rpm )
+	sqlite? ( dev-db/sqlite:3 )
+	squashfs? ( sys-fs/squashfs-tools )
+	ssh? ( net-misc/openssh )
+	tar? ( app-arch/tar )
+	tcpdump? ( net-analyzer/tcpdump )
+	zip? ( app-arch/unzip )
+	zlib? ( app-arch/gzip )
+	zstd? ( app-arch/zstd )
+"
+# Presence if filemagic's magic.py breaks imports
+# of dev-python/python-magic: https://bugs.gentoo.org/716482
+RDEPEND+=" !dev-python/filemagic"
+
+EPYTEST_DESELECT=(
+	# Test seems to use different tarball
+	tests/test_presenters.py::test_text_proper_indentation
+
+	# Needs triage
+	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
+	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
+
+	# img2txt based failures, bug #797688
+	tests/comparators/test_ico_image.py::test_diff
+	tests/comparators/test_ico_image.py::test_diff_meta
+	tests/comparators/test_ico_image.py::test_diff_meta2
+	tests/comparators/test_ico_image.py::test_has_visuals
+	tests/comparators/test_jpeg_image.py::test_diff
+	tests/comparators/test_jpeg_image.py::test_compare_non_existing
+	tests/comparators/test_jpeg_image.py::test_diff_meta
+	tests/comparators/test_jpeg_image.py::test_has_visuals
+
+	# docx2txt based falures, bug #797688
+	tests/comparators/test_docx.py::test_diff
+
+	# Formatting
+	tests/test_source.py::test_code_is_black_clean
+)
+
+distutils_enable_tests pytest
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 17214d2dd7e7..266d2ebff0b0 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,7 +3,9 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
+DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD gdbus-codegen-2.70.4.ebuild 2183 BLAKE2B 5a25fb25dde1b297bd4c3413070dee2e7a3c51c763372d62c1c92e4aeb022e513c03dae4505a39d011fe10a0e254b90ecb17e56894d4936f0e9ae0aa36f2507f SHA512 fe3d58113918cf0d3d6665d0c243ac900fa54d411a12c8ea1b74e6af49b3055f92ab6142dab8aebeeb3f61aa20fdc176bf0f3b931ec7ac0aa8b9e37acfa1eb6e
 EBUILD gdbus-codegen-2.72.0.ebuild 2191 BLAKE2B 0064d0f01a14f641c9f63239512603d27e9b250724518830c3075e8c05f951e3d14a4f402a6555e3713646722c5e447939d0feab3787aa852753894aff631b96 SHA512 5b0df36169361fa447fd48510ce9a157b562889c8fce22b507203f8b8599b815ae2e4a2aa9bfb7a41cd554ac95fcd22baba8c0afcae9021f447cb4f78440f7cd
-EBUILD gdbus-codegen-2.72.1.ebuild 2198 BLAKE2B 9a02b4a20cdba4634ae1de75132826411b2d70bf0f57db32588dc7687b5394bae15f5ebca8e2425dd1dc8d73a2502631bc49aba92472aa786a895f7e43ba8e00 SHA512 61e576ccc9eebb6074ac4b38185b53f5d9bd04cd2cae25da95fa8042824fe2dd32ec78e4679ff2f0418145496f47566aec7165c5f1b1ee257ccf5b0476e6300a
+EBUILD gdbus-codegen-2.72.1.ebuild 2191 BLAKE2B c2138a498d0789006d252ac39885444f1c79e65856ac72661e13f56fd0eb2d6411d072001d7d26560d0f59d55728882004ce063c62ef698623fc7143e5c58cbc SHA512 2da48f5e1fe63c3b03bf3a93bf89ef0b1d89f7264c93fafc5451126df54d05f3d36d7daf7ad337ecba10f10eaeca4e56cc1106edc1609c2d23f2a13b6028c115
+EBUILD gdbus-codegen-2.72.2.ebuild 2201 BLAKE2B cf9d3de985f048d31c837bfc32022e410b9c4fd9f3adcc9a18b2b4a404d25bae56718328168cf4c106bfadefc0cbb07e237b7d2f15ea54e04cff6d4be2f3ff1a SHA512 f50c39c3f5d2908f552d7877b83cc887ed9cc8f2418a13213ae9a2c8ff426922ad20f6f2d5f7478d7e21b99213b06df0eca20b6081ecc8505fa24314899f8ebc
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
index 9cc939d2a087..79c4806d9f91 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
new file mode 100644
index 000000000000..510504f71cc6
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	local MAJOR_VERSION=$(ver_cut 1)
+	local MINOR_VERSION=$(ver_cut 2)
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@MAJOR_VERSION@:${MAJOR_VERSION}:" \
+		-e "s:@MINOR_VERSION@:${MINOR_VERSION}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 1fa1fdd1eda4..b1d16544e328 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,7 +1,9 @@
 DIST glib-2.70.4.tar.xz 4824296 BLAKE2B 10e472672bfa20cadad01a9c22d01f2363c3033a234f4abe939c30a86e22621ffe9f8bec8031f43b18cc8c07a1ddfa05631979641d8dab88ae7b42345b2a3cde SHA512 e0fa19ef7c2ee48d94fb15074e4e58ecd23b288cfa7bb92ca72d3e337dade80c675595f05b26c10d351a0167f6b273656aef3686d44708121a8861b16b7635c0
 DIST glib-2.72.0.tar.xz 4879172 BLAKE2B 0bff92ac749ff2f39bffb0583e00f3556e04d5fcbcf9fa81fe91f6aa9771490c1732ac451bd685dca18e73bffa10c20ad418f1253ba0d0cc8b01c471cf429eee SHA512 351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad
 DIST glib-2.72.1.tar.xz 4890672 BLAKE2B 95a563b5388ee4d239034fef6ec071a7d608be3dd5de716e7c5baca641a70d19ce6b14b693ac1041f65bfae815e5b829f02983234d1bbe6546cdd1c5159a8eab SHA512 341acc91b4bed7a980b396888a0ab504337b6870422a708ea3e178598c028bc230457a328c35db469d92b0067ce8ec35d08dbcfe6d5af3340b574d41c0131913
+DIST glib-2.72.2.tar.xz 4891264 BLAKE2B 932613e69edc302793c5db9fdff36fb4ec04df3820aaa3dc2ef6cc01b8124bee3fe2f96cabd9c44b49601425ba7af072f8ad6fd331f6247e00ab6fc94f7f2620 SHA512 9a1121be1d5b1de50fb732d55298a8deb6e6e7fe02e06ab18fdfbc51a0f0d77c13c5faf29a227b5746b0f8c1c0502fc79c36cef2b7a62c4701b9deffe5887e69
 EBUILD glib-utils-2.70.4.ebuild 2325 BLAKE2B 767c5fd70775f5a8d8222d802316d474f6b4038556a1c932e35374bc36dcb572d95dabb1fb3a5e60a6e74c0f0d9977821b258cb17c818bf9fda2895c1deb4155 SHA512 5a20a3c359f296ed6df07cbda7222eeaf0fc7891f72124b15accdf2daf8380abbcf707bf332ba692be992296c259b4e5f1588265435d51b6e7b7dbb79fc6f497
 EBUILD glib-utils-2.72.0.ebuild 2333 BLAKE2B 5861c4e70129e259905bb90638338af32383a1ca39b55c4ef4e3a490ef367969b8c929fa83c0cfe7fa497890357aff620997c3f6aa94c7cce94fe70cdfb0a98d SHA512 b8c391ae1762732adbae47742b09f71fd0364f58551592f64b7a63fc62b14257f61a78e0d76809a794d4de8fc2021ab60b39078aca268cce7dc4ed442e9a8ea0
-EBUILD glib-utils-2.72.1.ebuild 2340 BLAKE2B da2fa71e3c678622a203f7643fcdc41a461ae130042d7170cf811f3c6004fa97e5b9aa83b4d76821c1d6bdc6bf6d21c10276558576e9e64359787177cd1a5c71 SHA512 9da47040d90fa3b6a412ed27d4a08b1c5096eeefc57cdcc7b907e7ebe84e74cc8d13f1bb6fc27b3089c1ed968b84701e696c2578d5b673c42f89a6572ec9ffa5
+EBUILD glib-utils-2.72.1.ebuild 2333 BLAKE2B 3040e6032b59d3e596753e212408fb8d3ccde533a3fa9ffb6a8090714be342f6d4bd1bfc9bccd25de9afafe8580e671ad56e29638d002ae6046c39fb7ed3bff2 SHA512 21871820311904381fc8846217cca9f7d813c137d179ee30bdb49ad343dca53a14d261b175ecc6113ab10762d3f11f9469dc0b331e75f5ddc0cefb0c4854c5e0
+EBUILD glib-utils-2.72.2.ebuild 2340 BLAKE2B 76f931baf38bb3e77988477867d576576aef408a629a10b20e5ae6a7fae2b4c8ff8f108d7f4cd23efc1a17c4f8809c537190394fc7cbfb3c3a777d7b9df18fcb SHA512 ad137f2ee9ea091e5ddb4d2ba7455cba82b003d748ffa0ae56cf53e6e443b029f0558b9b7632c4d50ae36a55904dff54cec99bc2d49ee609054fadac9c79f144
 MISC metadata.xml 333 BLAKE2B 70d0e83f8a0437baadea4b6771019a55d0d6f6a292bcb4263a7d811ec0b63a2ee4838b94371e03d62c4c43678eb7ae542b611166e2aecdea8c5194955ef1cda3 SHA512 0eab24184eba31bfda9752b62211472d6d8607644a2a3c2352a4483bc34975b87252aa5482a76499c5afe30414a75ba5958bd5bbf1bc755850806824e4267031
diff --git a/dev-util/glib-utils/glib-utils-2.72.1.ebuild b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
index d724901e3e8c..08622d17b410 100644
--- a/dev-util/glib-utils/glib-utils-2.72.1.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.72.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-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 ~x86-winnt"
+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 ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/glib-utils/glib-utils-2.72.2.ebuild b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
new file mode 100644
index 000000000000..c715c1e6fd52
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.72.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+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 ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index ee8b05d7489d..300d659b1fea 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -4,7 +4,9 @@ AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb76
 DIST intel-graphics-compiler-1.0.11061.tar.gz 8586132 BLAKE2B e8d97622c353e997acea1b9bed34423aaf0044a10d2effbe2c4b146ced1388ca5cf72ff1716e69d378625d674c09e84e7864b6817a0dfd0ba05a29de9f1aca6c SHA512 eb1688ff42c154267b82ffcc9fc58e587d7d52a8157cc8ca692e4d726eb62830fd3812bf391552d43e1d0c17c1ed59a6c3c206a35324c05a12ed943113f1a9d8
 DIST intel-graphics-compiler-1.0.11104.tar.gz 8594329 BLAKE2B 15beca4428816686f29ea14c41c55b4ecd9be094f9dd3c004b6b7a521526205d45f7ccae93f32125b4cde16e863dd5b1d832cadab4bf4500b468900ddcae230e SHA512 9c52cde409168c36ac3744a0cf825f10ce59538eac804721dcb23d72ad7a752e587798b55c4da23edc2b7e0a00376ef29ab39ca485de2ab179f04c5b5bc9a8ad
 DIST intel-graphics-compiler-1.0.11222_p20220518.tar.gz 8809791 BLAKE2B 1b2bb8322e1c6a226ed84f25d05b5a0dd88571240b264b9e29159a77f19c9207be615788502f0f8ce29b751862102319c2f65e3764e650e94a0dab37544cf0b9 SHA512 58ef8040372bcddd6a8401e48be0806efa4b8c42fe4cffe33226d420224c7ec3bfad446195bb6da1803d7d973b07f41e717ce185c79aa9d2c9a759914546b785
+DIST intel-graphics-compiler-1.0.11279_p20220528.tar.gz 8827945 BLAKE2B a8a4788a1e70e45836989a1cf6938bbba26564a4186db10a00f1f1372a1ee289f79a1c8905aa5237bad762f9c67b5339960e80e2e08eb9fe2e7fe0d8e14f1cd8 SHA512 d544cdc3bfb91cd0d585485b569030414291736a1410711c3c678df2cf5f6aa94dafbdcb27282aa75c0d4786291d01208b40fc816caa7ff23ac805940be03068
 EBUILD intel-graphics-compiler-1.0.11061-r1.ebuild 2328 BLAKE2B 59d3568c1f2b4c889dc85a955fa3aca373b258bab5b50aeeb27ab2d938e0baeb7ed508c926bb32d601fc3025ca02d7cbfa715cd0525090957449e54326a2ee38 SHA512 3752ddd8e2a49316d98394852e124ab826048d9df2112b054af3bc1118946be3b9885a87d2c7b92f19e82d3df0d7b1c96a85bb00318797e3f252729af5f51644
 EBUILD intel-graphics-compiler-1.0.11104.ebuild 2329 BLAKE2B 8c5e2713ad095d4c06d2df3947ecf0aa35dfc9cdfb4384ccd40bd8704c6031d15ab56ae7f9410e1f35124964fc9a4e79f479349b0a29f213dfe6607e10d2ca5d SHA512 55ba397dfd2f8663aad30836a82331f95863f3c6e047a350af888f4c9dc9ab4a75ccf66ea082169503e31b889a519e035b45cfc70a198077710ca7e6a4c9898d
 EBUILD intel-graphics-compiler-1.0.11222_p20220518.ebuild 2398 BLAKE2B ff97156fb257c05518116c30d9aa4cd9fc54bb4c62bae7381ef255f2f39521466c2e7a1be434e82f156a71f57ebcf46ff4dc0c3de3fd66bf2b84d66b13ac3e87 SHA512 eda59538cbb9488f38cc2f47b2c191fffc71478e63856a2853be040547f2b4ceb1202ee5954267890e9ebefa184ffa8ecfea88033e843f9677f6c40c375a09d2
+EBUILD intel-graphics-compiler-1.0.11279_p20220528.ebuild 2398 BLAKE2B 61fe8263adf6d3ad5c72d1b960160018deeb4ae71f4e3adf88cc827e268d9ef988b1a40aa826d8294ea3c496f6c775322a181cf1fb1b33162e72756747c1f8d7 SHA512 88d96ba21ec4d2d47dd2f8191dcaa7acdc2a2d150d2f2be4b709063cffa7ad15d7d387d1f07d597c3342883a34820769edbfc1ca1dbeb739c59cf9b95b3012c5
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
new file mode 100644
index 000000000000..867276f64f2d
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+EGIT_COMMIT="28ff9ed04d17b5af2002158d51992cbed06e6a95"
+LLVM_MAX_SLOT="13"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+
+		# Compilation with VectorCompiler causes currently a segfault.
+		# See https://github.com/intel/intel-graphics-compiler/issues/236
+		-DIGC_BUILD__VC_ENABLED="OFF"
+		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index a3cd745f6777..cedca5045f96 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lldb-12.0.1.ebuild 2443 BLAKE2B dd155b7715cd38eebf62d14c139bb0030db953a2f4f14f3c4779f64e70ccfd3c3f64067ffdad3ee407388f69cb6733420197facefcd25297b0f2111d1912044e SHA512 dca2e443a146b1baa60565eaf5a5cc86cb8deb9b9b10594ddbfcc356e62f67f99dd4ba769817c008c753a5ad854e0fb04e96f00c6e3e081bdf6faf3091291689
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.1.ebuild 2591 BLAKE2B 4d9eb995301668d375f12f4d9d4bf3592fa2222ca775db1e4d7856611ed6f264b3719e217b6ed02948ec77f68e7d32421c59a66b241ca08a2d6545f0e17aa01e SHA512 9bc93320df152cd99b8120886ab4acba65a8b848b39255d913e40a5574748ff8f5d463fe480827605f09d9c05360a5eef22e125e316e20e248135cb18a7b8abc
 EBUILD lldb-14.0.3.ebuild 2665 BLAKE2B dd9584bfca30ee8b8c1b563145f256662e4a23ab42b6d44fd394f44d56a46fec5e97c69f6a5789bb720139c4f55b71df2ebf699e26e230df043a4da860e6252b SHA512 d2f848ec5343c4387e220794afa1543a2ad36a969d56460cbb6fd4d5f4984b63ae914df8c5d2d48f110e2b3330714e0ddb417c5d5416aade53caa13d3d1e459c
+EBUILD lldb-14.0.4.ebuild 2665 BLAKE2B dd9584bfca30ee8b8c1b563145f256662e4a23ab42b6d44fd394f44d56a46fec5e97c69f6a5789bb720139c4f55b71df2ebf699e26e230df043a4da860e6252b SHA512 d2f848ec5343c4387e220794afa1543a2ad36a969d56460cbb6fd4d5f4984b63ae914df8c5d2d48f110e2b3330714e0ddb417c5d5416aade53caa13d3d1e459c
 EBUILD lldb-15.0.0.9999.ebuild 2642 BLAKE2B 4a6e9ab20cf171d43de1bc2abe84134fc1c1ac69f89805acd50514201c6525583a2f75d5c77158a613558f6f0375594e10856d465ed02947ed1364898192c7b3 SHA512 9e4a373255635c43141427aa09cc4b4d86be85bb42eeb54c3deabfe1a7c0872b204c5c3e1fe40d5bee2961ed17e453c3fda5dd82a169d2bbb0119614be24117a
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/dev-util/lldb/lldb-14.0.4.ebuild b/dev-util/lldb/lldb-14.0.4.ebuild
new file mode 100644
index 000000000000..aaa455dcfac0
--- /dev/null
+++ b/dev-util/lldb/lldb-14.0.4.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org python-single-r1
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug +libedit lzma ncurses +python test +xml"
+RESTRICT="test"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	lzma? ( app-arch/xz-utils:= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	xml? ( dev-libs/libxml2:= )
+	~sys-devel/clang-${PV}
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+		${PYTHON_DEPS}
+	)
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	python? (
+		>=dev-lang/swig-3.0.11
+		$(python_gen_cond_dep '
+			dev-python/six[${PYTHON_USEDEP}]
+		')
+	)
+	test? (
+		$(python_gen_cond_dep "
+			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
+			dev-python/psutil[\${PYTHON_USEDEP}]
+		")
+		sys-devel/lld
+	)
+"
+
+LLVM_COMPONENTS=( lldb )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+llvm.org_set_globals
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local mycmakeargs=(
+		-DLLDB_ENABLE_CURSES=$(usex ncurses)
+		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLDB_ENABLE_PYTHON=$(usex python)
+		-DLLDB_ENABLE_LZMA=$(usex lzma)
+		-DLLDB_ENABLE_LIBXML2=$(usex xml)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+
+		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${PV%_*}"
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lldb-{shell,unit}
+	# failures + hangs
+	#use python && cmake_build check-lldb-api
+}
+
+src_install() {
+	cmake_src_install
+	find "${D}" -name '*.a' -delete || die
+
+	use python && python_optimize
+}
diff --git a/dev-util/maturin/Manifest b/dev-util/maturin/Manifest
index c37198d17c67..7b694954251a 100644
--- a/dev-util/maturin/Manifest
+++ b/dev-util/maturin/Manifest
@@ -7,6 +7,7 @@ DIST aesni-0.10.0.crate 100248 BLAKE2B 2dba6f1004495a725acf171eeae5a6e393475323e
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
+DIST async-io-1.7.0.crate 30669 BLAKE2B 1efc8a576b44b7853de5bcb2e4de7e031fab805cdd5d9c19a6716b9cac629992f59edb0f340cf247edbb62ce028767e2ca0dc5b2d4414aa86d6048a58e4268fa SHA512 aacb634f225b674cd79ea1e152ef0539f789b698768804ee7f4fd261321cf73ce55cd9028b062acc5ec82d29a072d15da408e14071f78ecc27f2ebe746e08074
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd30212bb7204ab720fedb1df64259bae44500d9162c1c001d2e9d70ff5d698e02e5ac51e5734dbb7c601e602b3f SHA512 9cf3cda1d86deb6b7f3cada0ed7a9e6e54e2d323533e385222a260b2f667bd1989a552cc35806a1579c1493ee1177e474b1d42b29480c09a2735251586740321
@@ -27,10 +28,13 @@ DIST cab-0.4.0.crate 25844 BLAKE2B 335f98874b9bf375fa8119b37acfe4d796ff13d149550
 DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
 DIST camino-1.0.7.crate 26602 BLAKE2B d0ab5d5da9036acfe8ee4f68c015c123773529b9c84f0dd365169f33ca7e23eafcb5353bb2f6db02fbced9c075a0dc356c96d02711af1c4a506ce4d1c9f2fe05 SHA512 0c22c9de3740d39d058de25b2c9b221928f11cf9340562412a15948ddfeaddcb6da38ed3f18321c322d2811847d7cb5cc1c78304f67e9702a2056e59da64bf33
 DIST camino-1.0.8.crate 29300 BLAKE2B d4395b29d0b449ac3d7fc55f6cd112bfe380883087af2a686ac264c1c6dd58ce809b7eebe4c4cac053faadb0adcbe76eb1916ff3fba9f6cb65c7e330abdaa807 SHA512 81b70ee09ea788e0093a86ede0733c8f487d22db05bf2c6e81914e19ece81378aafdad7b6cd12ae6d8dbc3c5ab65880fffaa58a02465e0772f4b79eef9f51973
+DIST camino-1.0.9.crate 29357 BLAKE2B 7d855e08bed677242235197765a9f1f82e2743a0c439fa7ce4febc3b4595a5f9f66b23469d6cd610f4caf4a7bd1dbb1db4a7b6211ce43f08b4fb85a131e69d6d SHA512 5aca5f7a0639c97f5d5898fbbff9fa7ace9603047596941c62c611abb125525cbe5a4672057f4bbaecd7e34d907191ec5800415fba6aa0e6de9f52faee6f5363
 DIST cargo-options-0.1.4.crate 5025 BLAKE2B 270254b16d7d05cd03781ed17fc79f49f6e11a749d8db0b9ac50eb5a214fedd0c501a1bc075e1020ab48ad59b7ae8217a94cba36954bdf9eeb4cd81f9bfebd84 SHA512 a259e849edb121b4b1bd14e6e6ce5ce88643d6917c2d017c215a162a75445ea50a39682f36043625b29e073ac2f87dac2f46e37d040f7b89546b7a79bf6ae197
 DIST cargo-platform-0.1.2.crate 11645 BLAKE2B 7770acb90e299f71c60bbadceaf894a3100916b7f7458f9c949b683b39157d3e1ec17d850f16dfb04017b01d7734d41872d48cf9f4e1ea7414439cd7031c2330 SHA512 c716bf3a4e0942160dbf7be114d1621e1fccc23511e7b0a2b99852b99a851910bfcf8640c2d0d0a03d5a324e1a59fb5d4264ca81bca24e3f1a1ca653bdf2956f
 DIST cargo-xwin-0.8.5.crate 25263 BLAKE2B b2a7574009838ce255f807cf8e568bb3cc7a78906c21b57f3698c74829191da8e09afc39a7ab824a5036569a6c1b321105a56ac3c6da63034e0621b1274a6549 SHA512 23195a622e3de5ccc6a06d2e72b80b519b3d9c302b7c652da150cbfd3c382b5129ec55892e12a60f3dfa6dd089eb74933efbe539bd4becdaad0c613f10ea5880
+DIST cargo-xwin-0.8.7.crate 25282 BLAKE2B f38bcdcec890cbeb3a7f1d73bdcdfcc0e3c497adea64926899b5aac075687ad36f52a29983e6d580a28bd0fd4ff9e14f2b88eaa0efb5df7b04db0f74f952ea98 SHA512 8c86564c8f88ee7238d28c2c3dd680a301e6fba65bfccd11364b0d603a5446d4e850048cbed475912fb4be3e4c677f8cadc6201d0a6a6541e8034873fb657702
 DIST cargo-zigbuild-0.8.7.crate 24298 BLAKE2B 6494498df507125456b9dca7688710404ab92f88c9b5ec5caec072fdb65ec22216f2244d995a3509a9b839f247b1c062df42ef378c8161ead7dce99da0cda565 SHA512 0e911033c425327bad4115ba4b7cf26f8f31f7ceba82f08d382075df16575a49e01b0cdaddbcf3c21e4e9dfc99ef9dba1cb8cfa5f462090bfa1af27f12bc5e38
+DIST cargo-zigbuild-0.8.8.crate 24427 BLAKE2B 20e06c2c123dd86bcd04361f38a2f2b505c73f8fcb717cb2e6ed501ba7135f29cf561bbda9cdaa3554beac7586ec83183a8f77ecbcf6ae637ac03b3fb0d25e0c SHA512 6f54342ab135b090acfaf08caa47f709d25f2773225fe79381f1ce0df43bd39892d67c15f82e3f90e2289ce1c75da43b7d46fc27acf8229af784737804eb1e3b
 DIST cargo_metadata-0.14.2.crate 17469 BLAKE2B 4e64bff7710c51d95944faac60b4881b5a43d5edd07ef87c8f4b9826e63dd708719cab27542fdf82cfe869d8781c1a6918a050aa0de71086316bd2f480aad947 SHA512 16e6bb3ddcfd4c6d48ba3415780518428f771c393ffe10ce15e1f3c026a6f3bf40ea9f25214049841b1d7d51f2208ed032961a75cb641c5afc52e02cb84d3262
 DIST cbindgen-0.23.0.crate 188128 BLAKE2B cca6830ad99538e4e6697ab5fe6b6d36c96efbb33a9e971cf54923f0da327bdedbcae73d388fe522bf0e090b9b90041d6e32f5b083402590ba3de858bcdc6d10 SHA512 d7218e55526abfb226df524e634a72060de752eafe5b7f5c60bb746e2c4b105040455cfa16859e6b231c07cdf0256bbd608fe1afbec35fabe2f961927c19d04c
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
@@ -70,6 +74,7 @@ DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77
 DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
+DIST dunce-1.0.2.crate 7953 BLAKE2B 5572521dd8b85419561ad0af2abc47f3b60b1142c1966b89f678bcce500a38b88b3986523bb6c29b38205440ed110ad5dda3ec7170c476c5614054b36b691acf SHA512 9d1a5d449985913d1cecf2249f3c14001361faf98a0ffa2cb682b4ee4dbde906302355632033484640373587c78c0345c1c7e267c354018cb070cbc46517ba86
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
@@ -87,6 +92,7 @@ DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd
 DIST fat-macho-0.4.5.crate 19395 BLAKE2B 647db9fb4dae829942976a53a251b64dcb4b418eef79f0783dae15a3c0c87a965390d3a2bec0fb5d66543ea258708541444ec04ef29332f53e43526359a163d3 SHA512 fbbb56f10ff74483258c02052f44c25c06ac4c79cbf0172af124b2634b283e22ad8b82ed7ecf563cb99ba2b93e656f5c8d6eeb98f09b893638928fe27b22b533
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
+DIST flate2-1.0.24.crate 70191 BLAKE2B f5ff04557dd0a57151b4c704cce60622157be4c847fb0a42eeb5a9d531ba28d34b41632bc1b34d2f935ab576f152479f72877dc4e6b296edf125becc6e6d52b2 SHA512 8faf97c28dcc4553f4880295677b1269b4acbc6518d006913d32d7e319990c6631e10f1baf7199b96e03f6de95b9e2de04502522bb1eb45bc301a0fbb0bfc0c5
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
@@ -118,6 +124,7 @@ DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d9
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST ignore-0.4.18.crate 53174 BLAKE2B 41a209a310515af9fa066c88c92751e19e0859f411baf9946933203883098f52901f8c03250cab7f716abbd0da9c03c5e6fb270a5f9e26aafab4bf1d5f5bc045 SHA512 5d11a2415f015cce6ce72aa3d08a7cfb645ee7f1845b3445a924a92144438f209c992cc15d4ede3099d1eebe3fa28bde4e0eef1a3fbcb9dbced19a42051d21be
 DIST indexmap-1.8.1.crate 53220 BLAKE2B 9605405ef6d7559fc5d6fde38cc6810ae49e69b93e0687323f9a4ecee9b513a1cf7c57b8ef625a9095fd36cc7ba6e98410fa11a7a8788c424fb6a0cecfe6b37c SHA512 919372d9bbe791092ca78026ea6f7f6b6560b5c011682b21afcfbbc76684a18844602545a527e3342e2b787643b1c07c8f18f2279535b7afdf395361c9a8749b
+DIST indexmap-1.8.2.crate 53219 BLAKE2B 6af0e386dcb4306505d93cae23fd47601c3e1c7159058f02ac435b312697da40538b1cbb0d17c3f2c4be579a4b0a9e8b59c2e145677a69c2f885d3d24afd5229 SHA512 f7780b2a478e2b95568bfa1d10167a02bd174fb9bbbf8ea84e6ff185a03d43be0ef403c2106df8289d399657584abfac6039d7cdb96b52300d7016452808c0f0
 DIST indicatif-0.17.0-rc.6.crate 44795 BLAKE2B 985be7b0b8a2bad4856428b3b9a287832894b10b28fd84e45460eaee20cf1bfc78b52e6b37c57909bea19d686a70e8a0e21b8b718b84c03a46fd457f012101aa SHA512 225c0f1fe4cb81010c6d1a7dda88f90b0ff524dc2eafc758ef109e8f0648fb68bdf43ac06279b9fae66c32ad6f469bf20a623594565cd11e3b4a4c89454c5ed6
 DIST indoc-1.0.4.crate 13122 BLAKE2B f7a352bc2d19f3f2d1479b6add45daf841e02bba563ce9af115118b9bacea6bd39ab2a663bc992b2302de73b52bac1024130aab3dcd79c5b4286c93dd7305928 SHA512 b2d90f074f9a34e330d7d6e6313bd569cd857c791b8ff79191a70f19064fa53ea2ede30bbd16587fb438e69ccce4c3e2fbb127610ba8e470daf076d7373f0213
 DIST indoc-1.0.6.crate 14312 BLAKE2B e4757497450f9c5e854f472e576c0df49f1aecb10e3ae77ca56b436dbefc5c75fd9b83093f9bb485b697d32c454af5d70d72da27e231124f7af20d3dc6e320e2 SHA512 798d36767d29ac5170a9de498ebee1056a6658e74b94310d589d429471ae059f974bd83eaa823c99a637c16758b3fdaaeaaaf7b21a2a35cbcbf345840b5f23cf
@@ -141,6 +148,7 @@ DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a6
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST maturin-0.12.15.tar.gz 293054 BLAKE2B dde49d096561afac552567bd54b06b9ece49a7d4c57e461d94869d1b57028f959287e18ec816101b9d972fb1ba5d2124fa5dea5e7d178e7c0a538a8f7d4176ff SHA512 0ae2f8ac7b32c4560b7c5ebb9305c2587a5bd10fb9a2d0a32a35a6df315ff8c5511bf2a5b5e76e2c4eeba73868e87e718b304854ce8964207af832c72a5014d0
 DIST maturin-0.12.17.tar.gz 299343 BLAKE2B 28daf0ae1aead28075c730c8acdef875918f0c65fcb6828987ffd1b6967221dea201c7988574e216826a35a7938972318e1ec22ade3977259dc610464c940b7e SHA512 21649167f9fc6ebd1388e2cf5aa58a1656fec3bbd1f4d97e4753de7992171faf56bb2a9c0e5d19d2965076ae0e0333db0c1958e7af13473b4af7ccd3c2039992
+DIST maturin-0.12.18.tar.gz 302918 BLAKE2B 2a899d9162e2f893a9effe09996590193b3b04dc54b315728167e7db588c0db87a57b1c0d85ec7060977cbf9948d294a6bcdf66ac639f15415a5c6da7b6b930b SHA512 c4e4c758d9f73e6a6804bb9daccc60b21b9b77b6e3e0f32afc7788e98ce5664de77227f89e7c9f1d4b4330d671c190e3fb6f3c6b3abfcb1c22722b080a53bfbc
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST mime-0.3.16.crate 15206 BLAKE2B 9a599ca82fd0dd6d3d2dea68a47b8441b1024d016ee1fb23cc6431b39ead20c9b3fe1ff3397af79c2c1b2cd277c440d4fff69f6b28c550ddbe15f680923c834b SHA512 cb1d691610cb82720e553247336fc5eab63407ad37febf2eb50aaa4e329cca70959ecd8bb8c7af5753acec2c8e86fc9a0f8ad9ad2de93fe9295ce84033d6054c
@@ -165,15 +173,19 @@ DIST number_prefix-0.4.0.crate 6922 BLAKE2B 81bd3b588c788e6865104e5ce87119b5e0c5
 DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead10c7c6b1d6ad4bd8bd61412794f18827979c477005ed8ec4e2fb2b2e7ffdab118083143e20862f1d3425cc03 SHA512 40dfafba5105a270be3c8378df9000efde2f6bb149b1012da50ded7415c43143f2718431b516cef1b14c739b73e1915e9a1bd4a38141db2c24008fd1d8e1f8ba
 DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST once_cell-1.11.0.crate 31121 BLAKE2B 02ff93cd8845bbc3f7741d0e05fee11df5e1c35961b505b2717e697b9c503891a89e15b2c71b76a66f5f239c5ee650f2ed6105b445a4f977578a4243b4dac96e SHA512 3769223beed1a7c8c5625e18dc000b3ab296c7c3af21bb6cb563ad9d130bbbcd447d420d0ec591e6366652727de11dc76dc8f7720110de50be7cbf177587cb15
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
 DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
 DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
+DIST openssl-src-111.20.0+1.1.1o.crate 5102014 BLAKE2B 3328b4c0c5d76c9176ebf31805380b7170a3eb5b0673631c5130bbb11da39b448438645247408aa7f804092a01ca1a682ac244710973bbb327a3920da0dd2722 SHA512 8c937c1f739411ca1ae6de864fc2c41b7342a788f076e8d83f27d9e8c93d9d0e1994f85d0f6d62d288fa42d1773b7c4bdad6b71f69e3595baf39a3017287c70e
 DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
 DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
 DIST os_str_bytes-6.0.1.crate 21079 BLAKE2B 85c4a5f450d74bae23e2d2ad1c20cc944ff93fee1ab2fb700692645586acb388d552dca2b326f7df2cc4d07f6a3bdf7aa6704833be211f392250a56786519224 SHA512 16035d3032d499575faf5e8114868d57826acf2b4a54e848f9101713b7965a2fecd6c486945b1c8ccc3ddacdbb95a1c6f8a74ca4fcdee24729648edc817c4472
+DIST os_str_bytes-6.1.0.crate 21150 BLAKE2B a3bea67d5dfdc3bdf535b8576a49b3b76aac6fb5e0c9b672910756cf2d8062694b973f4d38365e7e17237efe0429ef942adb0416f8a9fbeb18bac68e1ec250a4 SHA512 b15a901533380be745e3d3ee34d36e192bcf32c8ca66b0aeb77da66b931773b9bd818bd5485c142f8733e7af7d41958957d9ed8f8c6e405b89be69df625364f5
 DIST os_type-2.4.0.crate 8022 BLAKE2B f37d9f43bfb242f1df0f2a5928923265a3ee44b29ffb119475098fcc7ff46340ba70bbc51e00b6e0b29c4f63aa50531f3f825db82ada46b19c429b3aaa52c7fe SHA512 2860d1798e146e4e476c2bd76085e031cd999188a42519ce86ca7bd168a2eb1907d690e15176beff21966135e68ef0cb45b05ee143e74240c2f8d3c1a5c35bf8
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
@@ -212,6 +224,7 @@ DIST pyproject-toml-0.3.1.crate 4536 BLAKE2B a51454289467647437738c2a46a6d166f18
 DIST python-pkginfo-0.5.4.crate 199520 BLAKE2B 4e6a23dfdde6d51ad9a81732f02a42c2c9aea56b36518e140cfa42c78e0c534b0f62a7da32965f18aaef1f416226f94df352e6f9c3cdfd95521debe7d9510b09 SHA512 7afbdfb4f2e06b4e76726c371dc6bc8904e3a7259cd455bac27172dc10abf6295c37eb6ba91c90be4347aaceaf211ca312b011568ce4d779286c5af016448aa2
 DIST python3-dll-a-0.2.0.crate 15702 BLAKE2B 4d141c47218d90ae6f900cda7621a36c5e18c5e4ca9e0d9f9134942327071adc268e3d653b8d64db52cf96c4f3e1185a9b2890b474c7c5b9a148f3c251258bce SHA512 d1a5cbc77896c3c22d56d00273788743b34b02297deec68118383fe0d7c6c8af8b58fae2c23a08eb96ea4d5e307cbfb1cfd0e48d0453f256d7092a6e85c63808
 DIST python3-dll-a-0.2.2.crate 50752 BLAKE2B 557bccb012b2942b06337cae44a4c77eb391d0edcc43e326a1beffca2978a675b9de311aca2aa33da74b48a378100236dd1312170352593350814afac5caaebf SHA512 8c1143c7b67fd674fb6db5acc7dc464461735dc2b909143b4b8f7791924e25d542d95e5cf0b65e320631f11963e6e5b985ff17501f4a58ff1ec1370587b509dd
+DIST python3-dll-a-0.2.3.crate 52115 BLAKE2B ac0d8aa5f1b9bf955067d59ef75e0c32fa2fa6da99ac2b1c02940c0c25c0f4099f3f2eb00ac37a3190cea9df79e3b797edc3ec228273c9cf54303576465adccf SHA512 56a5de431aa12506ab668166e39408441bb452071726cfb67ae542a14c8ba32e960ca20262b955d85749e6c3f54cecc088cc715fc6a3ce082a37e65e58e18b64
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
 DIST quoted_printable-0.4.5.crate 6237 BLAKE2B d1f9e7ab512948454c7aaac1fb05f1514a0bea17bb3455fb092500a84baef1c469fe468663875b3962aaf6032bffd61f15aaa744afe22497727da0bf8b718e15 SHA512 e3b165705bf0861be724d0655ed7c9fc735dee335b7c641d301c9c1b4c45a8f1218dccb0d43874a4a40cc4dbe62195e9bdf9cfc17bbcd795b88792b918306a18
@@ -223,8 +236,10 @@ DIST rayon-core-1.9.3.crate 65300 BLAKE2B de5700c9def379f6a27ee0ac0667f741913c28
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rfc2047-decoder-0.1.2.crate 6023 BLAKE2B 75d98aadeaed734cca80e21fe8d94e8a4a87f6eabc7cfee63052c51d257058f5589d87c757d2e40f223ef8c4bdd6f5c8335160f67e8f5367b80807ca8c7486c3 SHA512 302893aba05b32dc8262fa9b034fee2f760a09f7af860f99e2e5463bb7f3ee8f9b984d8f9b41b0acbd0703b38373ed7722923b85dee766d7c5f25571b2d842e6
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
@@ -259,6 +274,7 @@ DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
+DIST socks-0.3.4.crate 13172 BLAKE2B 02fa5e950aae0ae6fadb11f27c455da2ca3ce5db3b63f27ea720bb748e03652038a599c036941240edba0286b61a35699bef8db07716ada851c1077b0592b7dc SHA512 531ab43f277e2dfc6aaefcb584c5fdf910cba51cc5fee73256ef00dae714ace844251cb53ca090fd3e8258115cebbcf65843476913fadba8535cb44166294eb8
 DIST spin-0.5.2.crate 12004 BLAKE2B d67d9156ca6dbcf4022711cce797cd423a4977115abac4cafaa507aa2e1071b637275637a20934d4d0d6d2bf82c98c74a4506720326d1804952aa0fd5fc4895c SHA512 fc57f7906da2b7a298c5f89215e881e8827b4d9f934dbf138338e0ee30122d8459483be566268fa374b41d63d8dbf65d42e0b322535ba35c827d7edb2176f267
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
@@ -269,6 +285,7 @@ DIST syn-1.0.94.crate 236697 BLAKE2B e3e37de7ed5fe8ec78e3e65de9e64e7328769c5352e
 DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST tar-0.4.38.crate 49158 BLAKE2B a344a65951c5c39212ffa3cfdc7dc68c40a85dbc5e4aa08cfe7cf22f0216443fa081ddba5e8fadc48968cc8e70e08d23391a6caefdf359310e5880741c9d6730 SHA512 4b6458734811e1913cb7e348f32db16f9402fd0e0027ae867db81aecac250b35d07d9478cdae4e27a609ce0f29c9d61683934296cfc3b371119df9f2c380a84f
 DIST target-lexicon-0.12.3.crate 22990 BLAKE2B 7ca04aab44917345e51c7212e8f9d24cc0c7b759cba6031313c2a6f5bf4139b34be27e65ad150fd83f14b440a8e4ce125d156634409cbb2ec01cd370b213e738 SHA512 4ba0de71cf27c4ee330c9b61fc0318cfa3e179b57a7b0a79f296e0b33602c664c4ee2a676d09e0e104add2e0b56144cb5ddcc096a16f332f67862ee94b052f86
+DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
 DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
@@ -305,6 +322,7 @@ DIST ureq-2.4.0.crate 91872 BLAKE2B 07a4fc5f4c285931ee31f869e1a0b96a82ac1bf61a77
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST uuid-0.8.2.crate 37909 BLAKE2B e6ede5f8ae05572d4c55909eb3fe6946de6f10ad9bf71bd357739bc01201bf93f59ccbb3dabcbfd7b3e54b0c98c3b52d21f1bf1877b7283c6df623e9b2b3f33f SHA512 5a1f5ead9a920b9bbc120c02049c24b62ec215765e486d3a15c5015ef49fa506206efb737e6f6555cf6e2eddddfe55f0ca1d7dcfa9aa8bcf3e0ef570a54fa2d8
 DIST uuid-1.0.0.crate 48627 BLAKE2B 87a7b85a7423869a78631dd49855f662185db6be21162da2168cb88c8b6d271bc079e3226026b32919a00e9c4e5fcdc0dba2a8d8aa05ae7f79397c77571404c0 SHA512 9bcd708e12924f0af8c7b554ea428d809f1f93e21a0ffb9aaff2ce9f74d8829677b9d0a4e95200a219c88a0bf8bb5437597ce5c5a7174b458d9ab3e6abe70c57
+DIST uuid-1.1.0.crate 49697 BLAKE2B b3075465f818705e4ee47f25f6a25e189c2220dd46796ab7aa3a6ca88dc276fe6d298962c4f1e3832c032704736f6c2b9dc8bcb874681f92cd82ea1ad173d566 SHA512 75b2801cce746e10779ecbe64695b7aee99bf5cfdb34a54d825e1cfee55c559f78c65c210943338be30a35c5729d024dd0aba140a7cbcc07f0f413d60205ddf6
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8
@@ -340,6 +358,7 @@ DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db298
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST xattr-0.2.3.crate 11959 BLAKE2B e67cc186c3a86c3019cb5832aa515267671b8f11f88ba6253a3217eaf06d70b72a0367e9c8fb42a584b5b57113f8788c67f4e3d70db6427dd4e4a6efff59ac44 SHA512 55b99a9a9440463050b672dcacb7e1d1cc78f2b6f40ea7bff2134ee3a1c787d64972a1e00d2e06cf5a341bf76eff32f68e17a0c939a23f2c9a892715722afcac
 DIST xwin-0.2.3.crate 216507 BLAKE2B c8d7c6aa89c422227cb0afb65c8869369ce94ca7a09bc8c0ff78c713956a5e6952e9ac3b7bc266210df850ec6a4f8d1a6727c79485264e9f176c179dc0460b99 SHA512 baa087ddae40c0b15e988e58451855283ec0fa2cde0a1e68da7f0472881723d23b99a366fbec68be5be6f18a0d8dad8eda6ec065f0e48dc412f471750f9b8d71
+DIST xwin-0.2.4.crate 216729 BLAKE2B f3d2d4a549be57b2cac10b7912f12a71b721297d1b4e6511f21a6f28d089155cd094a814f06b84a568a5fb83ac6e2e51291c4f83423b5163796b96c58f664c62 SHA512 085dcbf80ac12a6538341d10cb06225ae2e530bdec512a016b28ae615952a4991c4664e48e0b2a1e35175fd3f694c636d67f96248a70c814be2bb26e1b9d96e0
 DIST zbus-1.9.1.crate 62908 BLAKE2B 3b443cfa9ea778b95574382784ad23308b08ab810e5b42908d92bb3bd02c439416c99d66de1c9e673284dad9a4023f5c53d8d3935f78779c165013f7e49a1269 SHA512 95b6018bcbec9656dfc8e38b72ff78d9c6cc43209e0930969f0fe2a1a2c4ba2b2437397dc2de0321a75fc5689595994e9b9769c0b0f25a0ddca9f227a64a3800
 DIST zbus_macros-1.9.1.crate 14675 BLAKE2B 36da6420fd908febb695e9ea767f4928f34b7deb2be286ce14b77e0fc5fffdeec950b6e130d374a3eaf0d2a28b826ed7cb55f1c7e17f31eda1872b4c13f18179 SHA512 05a84bb3db5b773c132db27a63123dd8d22acab62f2db5aaef8373d049a27e7fe994ec16e959d512fc280c34b42cdc979506417a30ba8a1626131f37c4d27f10
 DIST zip-0.6.2.crate 60077 BLAKE2B 3353cb0b8557ad1f16f3a3964a5c6d992bd044eebe3857e42ee235bd479875811619001ad54378fa7bcacce8acbe7dca30199eaf88ddc47a91e47f15e0396e22 SHA512 a044090643e22d792a83600631d2828b3fffdc25260bfd7de703d20871c23deb6cfb121dbee9cdd5540125c96d113a9516f26b9f07cbf6f260725627166f130f
@@ -347,4 +366,5 @@ DIST zvariant-2.10.0.crate 64374 BLAKE2B 65f5ec09b812217b2d96f57fcaca7fba97545dc
 DIST zvariant_derive-2.10.0.crate 8746 BLAKE2B 8408e6689f6f849d37d0ade5549dbac25a01a8ef6de5692290f24462e0984128fb5b1d72e87e94e4c422896d68f9acaa382ca6af57f47f470448894a85071b1a SHA512 ba06d0761de8e20839246517d89494e5728fd654cf95eec193a4ca4cdb90090542bbfd7ed0ffbc9fc44edda38c5270139f54e63cb88d09f6c26b39199ea1deec
 EBUILD maturin-0.12.15.ebuild 7327 BLAKE2B 2f358453aa35ae0f863075d4a1394c6037b160d6c3a71e17c4c2bd8028462690c0bad8db53c3ea89efe1bf5247a30e5c330d7e4ea03eb799840c6670301a9a5a SHA512 4bd87e209d20e970d37a65bdd4952042ca600daf3c67629d5e56fb69869969cc4309fabfdec00155d7f017be33a0c6e3fe4bfcd39774b634688c450e30169746
 EBUILD maturin-0.12.17.ebuild 8049 BLAKE2B 2b0778c38b817ea531e12b645a6883aedb6456c0886ddf4b2891247f843d27197a35e44bfa09472d8d2d4dc014e3c9d968a0fe7793480a5aa6b49776cb8e7720 SHA512 73b1cc4fdf5e674068f0c2e6b55607baa4d92a913c8d216917cb14747fa61a2555e84bfb3c1fae7d15aff76f6c18120a1c0af7e268934acf56f4ff3fabc2f2e5
+EBUILD maturin-0.12.18.ebuild 8134 BLAKE2B e729626a411391f6eaf9b458b5d08794d698911f79642268283dd88e09a03dbb89874fd6a78e453a5d5d8c6688997a032d489e175dcb2faafc4626048a3de2ea SHA512 3ace063222579f6c9cf0fed78436c5f783aa248be9349ec1e68ccbacd8eca74bcda4ca1e98c19428ebc1d09d835faa9e8a504696d04811fda5f6e5ebf7d543ce
 MISC metadata.xml 536 BLAKE2B a94fef48d69a1f23ab4cb0c676c47c8b3b3337f78f2095384e9ef73fcf04a9c117766b633cca82c8bde782e70051a944d7508863e36e69f821de7399ea4afab8 SHA512 b66a31403684e70656c7cc25cb0654ac04e4e5c79f822ef3c4ae8aa9ff44fbd13914a90290c922e98c2e55e90a06f9250b93d71fdab51a7d2a727c33d872f247
diff --git a/dev-util/maturin/maturin-0.12.18.ebuild b/dev-util/maturin/maturin-0.12.18.ebuild
new file mode 100644
index 000000000000..589c97ccd2e3
--- /dev/null
+++ b/dev-util/maturin/maturin-0.12.18.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	addr2line-0.17.0
+	adler-1.0.2
+	aes-0.6.0
+	aes-soft-0.6.4
+	aesni-0.10.0
+	aho-corasick-0.7.18
+	anyhow-1.0.57
+	async-io-1.7.0
+	atty-0.2.14
+	autocfg-1.1.0
+	backtrace-0.3.65
+	base64-0.13.0
+	bitflags-1.3.2
+	block-buffer-0.10.2
+	block-buffer-0.9.0
+	block-modes-0.7.0
+	block-padding-0.2.1
+	bstr-0.2.17
+	bumpalo-3.9.1
+	byteorder-1.4.3
+	bytes-1.1.0
+	bytesize-1.1.0
+	bzip2-0.4.3
+	bzip2-sys-0.1.11+1.0.8
+	cab-0.4.0
+	cache-padded-1.2.0
+	camino-1.0.9
+	cargo-options-0.1.4
+	cargo-platform-0.1.2
+	cargo-xwin-0.8.7
+	cargo-zigbuild-0.8.8
+	cargo_metadata-0.14.2
+	cbindgen-0.23.0
+	cc-1.0.73
+	cfb-0.7.0
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	charset-0.1.3
+	chunked_transfer-1.4.0
+	cipher-0.2.5
+	clap-3.1.18
+	clap_complete-3.1.4
+	clap_complete_fig-3.1.5
+	clap_derive-3.1.18
+	clap_lex-0.2.0
+	cli-table-0.4.7
+	combine-4.6.4
+	concurrent-queue-1.2.2
+	configparser-3.0.0
+	console-0.15.0
+	core-foundation-0.9.3
+	core-foundation-sys-0.8.3
+	cpufeatures-0.2.2
+	crc32fast-1.3.2
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crypto-common-0.1.3
+	crypto-mac-0.10.1
+	data-encoding-2.3.2
+	derivative-2.2.0
+	dialoguer-0.10.1
+	digest-0.10.3
+	digest-0.9.0
+	dirs-4.0.0
+	dirs-sys-0.3.7
+	dunce-1.0.2
+	either-1.6.1
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	encoding_rs-0.8.31
+	enumflags2-0.6.4
+	enumflags2_derive-0.6.4
+	env_logger-0.7.1
+	fastrand-1.7.0
+	fat-macho-0.4.5
+	filetime-0.2.16
+	flate2-1.0.24
+	fnv-1.0.7
+	foreign-types-0.3.2
+	foreign-types-shared-0.1.1
+	form_urlencoded-1.0.1
+	fs-err-2.7.0
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-lite-1.12.0
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	generic-array-0.14.5
+	getrandom-0.2.6
+	gimli-0.26.1
+	glob-0.3.0
+	globset-0.4.8
+	goblin-0.5.1
+	hashbrown-0.11.2
+	heck-0.4.0
+	hermit-abi-0.1.19
+	hkdf-0.10.0
+	hmac-0.10.1
+	human-panic-1.0.3
+	humantime-1.3.0
+	idna-0.2.3
+	ignore-0.4.18
+	indexmap-1.8.2
+	indicatif-0.17.0-rc.6
+	indoc-1.0.6
+	instant-0.1.12
+	itertools-0.10.3
+	itoa-1.0.2
+	js-sys-0.3.57
+	keyring-1.1.2
+	lazy_static-1.4.0
+	lddtree-0.2.9
+	libc-0.2.126
+	lock_api-0.4.7
+	log-0.4.17
+	lzxd-0.1.4
+	mailparse-0.13.8
+	matchers-0.1.0
+	matches-0.1.9
+	memchr-2.5.0
+	memoffset-0.6.5
+	mime-0.3.16
+	mime_guess-2.0.4
+	minijinja-0.15.0
+	miniz_oxide-0.5.1
+	msi-0.5.0
+	multipart-0.18.0
+	native-tls-0.2.10
+	nb-connect-1.2.0
+	nix-0.17.0
+	num-0.3.1
+	num-bigint-0.3.3
+	num-complex-0.3.1
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-rational-0.3.2
+	num-traits-0.2.15
+	num_cpus-1.13.1
+	num_threads-0.1.6
+	number_prefix-0.4.0
+	object-0.28.4
+	once_cell-1.12.0
+	opaque-debug-0.3.0
+	openssl-0.10.40
+	openssl-macros-0.1.0
+	openssl-probe-0.1.5
+	openssl-src-111.20.0+1.1.1o
+	openssl-sys-0.9.73
+	os_str_bytes-6.1.0
+	os_type-2.4.0
+	parking-2.0.0
+	parking_lot-0.12.0
+	parking_lot_core-0.9.3
+	path-slash-0.1.4
+	percent-encoding-2.1.0
+	pin-project-lite-0.2.9
+	pin-utils-0.1.0
+	pkg-config-0.3.25
+	plain-0.2.3
+	platform-info-0.2.0
+	polling-2.2.0
+	ppv-lite86-0.2.16
+	pretty_env_logger-0.4.0
+	proc-macro-crate-0.1.5
+	proc-macro-crate-1.1.3
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro2-1.0.39
+	pyproject-toml-0.3.1
+	python-pkginfo-0.5.4
+	quick-error-1.2.3
+	quote-1.0.18
+	quoted_printable-0.4.5
+	rand-0.8.5
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rayon-1.5.3
+	rayon-core-1.9.3
+	redox_syscall-0.2.13
+	redox_users-0.4.3
+	regex-1.5.6
+	regex-automata-0.1.10
+	regex-syntax-0.6.26
+	remove_dir_all-0.5.3
+	rfc2047-decoder-0.1.2
+	ring-0.16.20
+	rpassword-6.0.1
+	rustc-demangle-0.1.21
+	rustc_version-0.4.0
+	rustls-0.20.6
+	ryu-1.0.10
+	same-file-1.0.6
+	schannel-0.1.20
+	scoped-tls-1.0.0
+	scopeguard-1.1.0
+	scroll-0.11.0
+	scroll_derive-0.11.0
+	sct-0.7.0
+	secret-service-2.0.1
+	security-framework-2.6.1
+	security-framework-sys-2.6.1
+	semver-1.0.9
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_json-1.0.81
+	serde_repr-0.1.8
+	sha2-0.10.2
+	sha2-0.9.9
+	sharded-slab-0.1.4
+	shlex-1.1.0
+	slab-0.4.6
+	smallvec-1.8.0
+	smawk-0.3.1
+	socket2-0.4.4
+	socks-0.3.4
+	spin-0.5.2
+	static_assertions-1.1.0
+	strsim-0.10.0
+	subtle-2.4.1
+	syn-1.0.95
+	tar-0.4.38
+	target-lexicon-0.12.4
+	tempfile-3.3.0
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
+	thread_local-1.1.4
+	time-0.3.9
+	time-macros-0.2.4
+	tinyvec-1.6.0
+	tinyvec_macros-0.1.0
+	toml-0.5.9
+	toml_edit-0.14.4
+	tracing-0.1.34
+	tracing-attributes-0.1.21
+	tracing-core-0.1.26
+	tracing-serde-0.1.3
+	tracing-subscriber-0.3.11
+	twox-hash-1.6.3
+	typenum-1.15.0
+	unicase-2.6.0
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.0
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-width-0.1.9
+	untrusted-0.7.1
+	ureq-2.4.0
+	url-2.2.2
+	uuid-0.8.2
+	uuid-1.1.0
+	valuable-0.1.0
+	vcpkg-0.2.15
+	version_check-0.9.4
+	void-1.0.2
+	waker-fn-1.1.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
+	web-sys-0.3.57
+	webpki-0.22.0
+	webpki-roots-0.22.3
+	wepoll-ffi-0.1.2
+	which-4.2.5
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+	xattr-0.2.3
+	xwin-0.2.4
+	zbus-1.9.1
+	zbus_macros-1.9.1
+	zip-0.6.2
+	zvariant-2.10.0
+	zvariant_derive-2.10.0"
+CRATES_TEST="
+	libc-0.2.119
+	libc-0.2.125
+	once_cell-1.10.0
+	once_cell-1.11.0
+	once_cell-1.9.0
+	proc-macro2-1.0.38
+	pyo3-0.16.5
+	pyo3-build-config-0.16.0
+	pyo3-build-config-0.16.5
+	pyo3-ffi-0.16.0
+	pyo3-ffi-0.16.5
+	pyo3-macros-0.16.5
+	pyo3-macros-backend-0.16.5
+	python3-dll-a-0.2.3
+	syn-1.0.94
+	target-lexicon-0.12.3
+	unicode-xid-0.2.3
+	unindent-0.1.9"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cargo distutils-r1 flag-o-matic
+
+DESCRIPTION="Build and publish crates with pyo3, rust-cpython and cffi bindings"
+HOMEPAGE="https://maturin.rs/"
+SRC_URI="
+	https://github.com/PyO3/maturin/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris)
+	test? ( $(cargo_crate_uris ${CRATES_TEST}) )"
+
+LICENSE="
+	0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl
+	doc? ( CC-BY-4.0 OFL-1.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	doc? ( app-text/mdbook )
+	test? (
+		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/boltons[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+	)"
+
+QA_FLAGS_IGNORED=".*/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12.8-zig-tests.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	if use test; then
+		# used to prevent use of network during tests
+		cat > "${T}"/pip.conf <<-EOF || die
+			[install]
+			no-index = yes
+			no-dependencies = yes
+		EOF
+
+		# run plain 'python' from eclass rather than auto-detect 'python3.x'
+		sed -i 's/"build",/&"-i","python",/' tests/common/integration.rs || die
+	fi
+
+	# TODO: package-agnostic way to handle IUSE=debug with setuptools-rust?
+	use !debug || sed -i "s/^cargo_args = \[/&'--profile','dev',/" setup.py || die
+
+	filter-flags '-flto*' # undefined references with ring crate
+}
+
+python_compile_all() {
+	use !doc || mdbook build -d html guide || die
+}
+
+python_test() {
+	local -x PIP_CONFIG_FILE=${T}/pip.conf
+	local -x VIRTUALENV_SYSTEM_SITE_PACKAGES=1
+
+	# pyo3_no_extension_module is xfail but passes with >=rust-1.60, still
+	# need looking into but is not known to cause issues, disable for now.
+	cargo_src_test -- --skip locked_doesnt_build_without_cargo_lock \
+		--skip pyo3_no_extension_module
+}
+
+python_install_all() {
+	dodoc Changelog.md Readme.md
+	use doc && dodoc -r guide/html
+}
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 354e52a5e673..dc098c802878 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -3,5 +3,5 @@ AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a41
 DIST binutils-2.37.tar.xz 22916924 BLAKE2B f5a374fdf0300f7734d1e462333296b16c9d5ed6eba167e1742a4da7082f4388c929e286bf76c3933b3e434937380340732a31790723654b491ea0c8ab5b9ba5 SHA512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
-EBUILD mingw64-toolchain-10.0.0.ebuild 9330 BLAKE2B cd9bb75077789847bcec500f3064fae5aa3f9025dac14223866e57cdef29ee41c88f2e3e61d221d165d5b3aa297fb9ebfb9f295a8ca870e66e602e0081f019ad SHA512 8126a6841441c40868ab5d3c759e308d06f7b721e23f706542fa384bd183dc5d48122b6160a13d3ddcb1665bdb2b37d8408ec509ee874dff68b2a11adc5f10a6
+EBUILD mingw64-toolchain-10.0.0.ebuild 9340 BLAKE2B e3f94ae2f60d225b3397fedb4d594054c5138c8f4d96e554cab21e170028336decc93940b1db7e96d8db00102c74c09b1145279078d3ffc3792935a0bb22b552 SHA512 873de06d2a3eeb8f7d48339846a37f29a2408476bf18b294b7bd8453bbe4dd1d3a0cd59693e1d3e0993515ec3236392d10aa46b498c3913b6c0f0e5d2f64eced
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild
index e0569a0e7981..5347cee7ffdc 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild
@@ -203,8 +203,8 @@ src_compile() {
 		# mostly unused here, so use configure directly
 		eval '
 			local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-			[[ ${conf_'${id}'@a} ]] && conf+=( "${conf_'${id}'[@]}" )
-			[[ ${2} && ${conf_'${id}_${2}'@a} ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
+			[[ ${conf_'${id}'@a} =~ a ]] && conf+=( "${conf_'${id}'[@]}" )
+			[[ ${2} && ${conf_'${id}_${2}'@a} =~ a ]] && conf+=( "${conf_'${id}_${2}'[@]}" )
 			conf+=( ${EXTRA_ECONF} ${MWT_'${id^^}'_CONF} )
 			[[ ${2} ]] && conf+=( ${MWT_'${1^^}_${2^^}'_CONF} )'
 
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 8be260118393..9ccbca04b67a 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,7 +1,5 @@
-DIST spirv-headers-1.2.198.tar.gz 416113 BLAKE2B d2f767a36830a3d1fa6289cabc5f87432473f6f3d3ab3d07b4c6a008a4917f00b3472e6ae9abf12c1a148e757d5a71f270a2ad944413ebdbefb484f498af74ce SHA512 a35167f8de66f2e16c6d2dccdd69f95c58b08abcdef5dac5a705e8e52af049ec9b0e2d0ef6fb732454a0671cd331b69bea75b24911599c0a2ce3972d40addfef
 DIST spirv-headers-1.3.204.tar.gz 417559 BLAKE2B b979ef5a830f0f76744555db830bb0e1184e84af1acddfc97907c562633faa1c62a7e1ebc193d8a0d2433c8d5a0be67d89a4da46b5889461524fbd183e7cdda5 SHA512 52411a51f4b54b86f4120d625c1e24271a106e07bfc1b0a4a7280e51f2a3dc471a03546ac07d89938f85005eeb16176cd731d4ae11bd9d0438791859afc4a5e7
 DIST spirv-headers-1.3.211.tar.gz 420022 BLAKE2B 4feea5f566401aef8c1aa6d677301b6871f8af5213d1f3d257719182b4109fef37c21342e38c6170bc4252a92ea9c2c45470bb9b23425a58f0d6d883982350a9 SHA512 39357d060c9bf030e8df71e734c2adb47832d7fa1a29825305cc92b3e87770a4fe383b534b798da008168bbeedc9f659f97b58a7b13c141d4f8ac94fc329f25f
-EBUILD spirv-headers-1.2.198.ebuild 485 BLAKE2B 65d9c8afaa4b961b291c747e94a03cb9e79a52106f0416d0e91f0bd90c4b96c4f88c16887e9b4318c7b484e9e3f4518f1b861f1eb9f76fbc7aacefa3d4ea3129 SHA512 f415dfa4b091c3a1c8d3fbc373e8f6c1190816535d2048725ecfbdcfa188ed68a5a180bbbdb171a28b5ae121d48837ef9f2484dcf6572ae95f5edd5c0a59d6cf
 EBUILD spirv-headers-1.3.204.ebuild 485 BLAKE2B 3b397fbfc44d46a656393085e6c7ab18a66110e4eeb746f63da8579a577c67a3da1a81fe02eb415f7197ce4af7c23753728dd705e5cc88b47df68a289a636ea7 SHA512 381130f0c27de476117aa0bcb0b4b0e8cfb44f69c733127a84627901ed1137966b9778e2d96791b1dfeb1a6594c164f066c2d8d6d3ffb83d1b2c5d71aa014e22
 EBUILD spirv-headers-1.3.211.ebuild 498 BLAKE2B c3f54f0e300ec8c9d184fa138bdfe3a7b2cff61a1d9b303ff434932fd436c1bb0daf4400205f165ba0e414116a4c199ea941215d6509f81e36d463eb73565c51 SHA512 137f1cb31bb83872c2ebfaed9c1cf3070cc66b6e4ef6cc6ad09a3a983551ebf959f2ab72f3995a73829960b524c1c79b52f116e10479e9fc137014cc1220ea93
 EBUILD spirv-headers-99999999.ebuild 607 BLAKE2B f94f54dc76cecce5116f6840334c3dc2b03c9b7e447765c491777562dc76cb94d2da530e4b678e7d2bde5b8b164b7aaee4421d2f05fde27c18c95e26e0fed2a0 SHA512 93a76d5a2dcb393607f194893ab1edeb28e158c22806a6bf144b345e368e57611f3114d2ad3d7b352d2c941b70ddf042b2325ed018e3cc9c4b4c5a2f7f3bde3b
diff --git a/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild b/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
deleted file mode 100644
index a1de79a9796f..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="sdk-${PV}.0"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 8b91b35cfad1..46678e8c2407 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,10 +1,7 @@
 AUX spirv-tools-1.3.211-cmake-librt.patch 1611 BLAKE2B 1199d25a4933f0d16875f9d8595ba158d84e5cbd6dadf19349667824da4d9931b6d83b9a571242c323868d5bc369f300f9ee2698da5aa65b764ed0c380fc060b SHA512 18935d1f2b520924a607bea05b4a37b371d908ebe317637fcf3d134ee7986aae1be3a8840b6ec674d9cb3dca932bc0896077b7b0660d5b3c016628cd94a7b0c5
-DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119 SHA512 90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714
 DIST spirv-tools-1.3.204.tar.gz 2905656 BLAKE2B 9bea5d91243283a0a167913fe531f0778915c03ec4db3f152d88f0952aa0df0e92bfa57762876c61277fedf99f156bdacbbd934333afb8376555a96566edb81e SHA512 f71738d5494c1e7bc38aeb8b2c89dcf24bb14eb6fcac1b14a794d47427ffadffc8e2b7b793b234e7146847744975a5d20de18043447a50a31af305e8ce4b1214
 DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842
-EBUILD spirv-tools-1.2.198.ebuild 1234 BLAKE2B c24dd15b41ef53e246aac254d77a8861e9a528965c83004e5dd8400295de9c154744ee64719a577f292e43633ae0a01f5df2872b53b844fcf8a231c720a61e8b SHA512 033f36f7da530fe39aaa86e6a84e0cf6cc2408243f765bce1dfdfb5e6fdc16627aec8419859142be8b05ef3374daf376a1a8bd0e1423558492e15db2a1655680
 EBUILD spirv-tools-1.3.204.ebuild 1234 BLAKE2B c24dd15b41ef53e246aac254d77a8861e9a528965c83004e5dd8400295de9c154744ee64719a577f292e43633ae0a01f5df2872b53b844fcf8a231c720a61e8b SHA512 033f36f7da530fe39aaa86e6a84e0cf6cc2408243f765bce1dfdfb5e6fdc16627aec8419859142be8b05ef3374daf376a1a8bd0e1423558492e15db2a1655680
 EBUILD spirv-tools-1.3.211-r1.ebuild 1298 BLAKE2B 6e83bb34e15ca0c6da114f6382110e7628044210cae3291f4754f6e47ec98be5dc3e93a5057065996901e1b5fd1f7d23e140380ae114ffdfacceeb9af66ac1ee SHA512 09020465b3ec17d1a0d54a1100a6acf18788244f8fe2863493a10bf2a5c695bf4c6241e38eb31cec6a1ef80c7ac93052df705a34fb75e0812d25ef7d999b85f8
-EBUILD spirv-tools-1.3.211.ebuild 1240 BLAKE2B 8150c83ab26145e2fca5f48e3469bfb7494ef037dad3ff6113d31410aae5c1db38d13429405cb56eeca07b51cd966c709e0e076c3050daee1863b7fa3997ee1b SHA512 88131c23130a09fd75e2f7d58c567d68a30808501e7307a65fd030012acef2326924dca8fd295b5f389dbc2f644f70f515736a5461187285ef944d1d3fc29e12
 EBUILD spirv-tools-99999999.ebuild 1249 BLAKE2B 14fd4bc2dd9485424f1d48eaaed4a9c0b953d261b06b5ab16e77ed5a1af2b7c314a53bf40e26c436f632dff17fb5a92a8307fd3c61727e1147f74f8d451c0a6d SHA512 dad9e3b1b86dfdb0e21737212804dddd9c07e72833a7129402d037a3da7bee858d559cbb01bd48d7dd0a5b387dcdc2dfe50eaec9e3d03fc384c9d1bba3ab7e34
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild b/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
deleted file mode 100644
index ec2ad8d84ae9..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild
deleted file mode 100644
index ac0beb4ad14f..000000000000
--- a/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	EGIT_COMMIT="sdk-${PV}.0"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
-		"-DSPIRV_WERROR=OFF"
-		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
-		"-DBUILD_SHARED_LIBS=ON"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/sysprof-capture/Manifest b/dev-util/sysprof-capture/Manifest
index 994a23c94c17..8b6f9b874ab2 100644
--- a/dev-util/sysprof-capture/Manifest
+++ b/dev-util/sysprof-capture/Manifest
@@ -3,5 +3,5 @@ DIST sysprof-3.42.1.tar.xz 484096 BLAKE2B bc1124651f6323d6757050ef3225df222039ac
 DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 EBUILD sysprof-capture-3.36.0-r1.ebuild 754 BLAKE2B bab0ff01030d72f2ab0df460e5972b32cfc72a16f5e924a85575e060ff1f796ddf3fdb4f67670204988088dfe838c561888d47486cfe93aaffa2c128501857d4 SHA512 9d7cf4c5d7e569d751a097d1d71e6451b7bff42993bc88c5d0e136d3422b6e30780bfd93fdaaa5477a17df3a5da6503c162f16e6adfc0e775d8c22041125ed40
 EBUILD sysprof-capture-3.42.1.ebuild 807 BLAKE2B ee4ffc9a6b1cb2ebc4f5c437243dcf3dbc87041fdfa77d1a3b8381f6c036e0a13aab40479d627fd70bdf4ccd7b2e2c8a01fdf2bcda51c06cee28ad4be1265a5f SHA512 260f2ec6c29d5089f0b43e1c972f74d254933806ec8c4a074052d4673da754e6865db45d5a3c8ac4b1201609d5f3865333400b112bd6039c623d870f2bd5c4d5
-EBUILD sysprof-capture-3.44.0.ebuild 809 BLAKE2B e9e4bc2b052c696636ac01fe17c80623786e5d09af32ae415f9fa50a4bbea281c6626a0611bda20514b3ffb1847abef86b425afa1f29ddde668d30ef0ac4e463 SHA512 1d4114bf74f1d0f34a919996cc3b3c4ce06113dbdea0b373d5129ce216bef7a9252685fec45d4908ed274f41c44668cf7fca4504336da3f19061d591dd77caae
+EBUILD sysprof-capture-3.44.0.ebuild 807 BLAKE2B 7bc420b2e56396c5bab3b340bf3d53a863470e3bc8acf1cd99c468615d90a54dabc1f93f42d50343cd1f886e4bc9efcf5ff88b7f80b3703f9d08a72343356b7e SHA512 a1ffadacf56e0bf1f54b5238f8e289922b84d36fd920877c891bd6840916e6f25041b90b447cd0af8a51e1ce378bfcd8b53823b15081b9cf67f035d66ce9a614
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild b/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
index 0685cabc9dbd..cb72782316ab 100644
--- a/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
+++ b/dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="4"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 RDEPEND="!=dev-util/sysprof-3.34.1-r0"
diff --git a/dev-util/sysprof-common/Manifest b/dev-util/sysprof-common/Manifest
index 852b7dc13c10..7e52e7a25378 100644
--- a/dev-util/sysprof-common/Manifest
+++ b/dev-util/sysprof-common/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.42.1.tar.xz 484096 BLAKE2B bc1124651f6323d6757050ef3225df222039ac7a5c6a6e2a0e170354a0e89705ea03173302ac7fa2bc172b27485d4e4cdee0f7504a548d51e88b88a19cc8cc9d SHA512 15bf7efadfc88c1342200009e4b74ecd23a320ca272b4ca3736dd41baf9cb4e0a1fd75e0aa20ee784b98c6fee7f86a2b52e63bc4769b6ca9759f58b64cba0dcd
 DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 EBUILD sysprof-common-3.42.1.ebuild 506 BLAKE2B 477bf8a58e3c20d73f9d0b57b207a4120e9e1fee46d7dff55bc1ff34bba55a314dbb8f0d4dcc33fc9959a0db5c9bf0bfaf1e935a935743cacb485acd8e62f10f SHA512 0da4f31647846365fcf0fa6526af035283ee84abf5528bb1b1e04bf364e22c5242feee499be1b07b22588ebfb0a1858a9f2f96be694ad7cd1db15e7861e7beb3
-EBUILD sysprof-common-3.44.0.ebuild 508 BLAKE2B ef7562c6bef098941ccbe0c97ea691ada0937a44e6ce2ae93309351a21e77b29f5d1906f281ba7fc2c037356eb68b8a87db0023f9f32e681dad0a77b81bb948f SHA512 bc783d0e0656c5c4a7dba4a97a22e284bbd265b2c7c372044a60c31842e09ce562922bec96551e2e0736581c3a4ddf9c618952e0ed4ad6358c47016bffa559f9
+EBUILD sysprof-common-3.44.0.ebuild 506 BLAKE2B cfe8b7e9da5426aa95770b726de0827227c34a392e0653e2ffec7769909febe7275c987b8834bf7af33aa94fc7fdb20364c81fbe6ece13cdffbfaec6f540d66c SHA512 69f1acd4e1e26998cfcb087f48493cc952a24d2a2f5b4a3d546f5ea2c5e5627155fbef45c3f6c3eed75536ecdecf681d2abf63978ee429d04c7a3548372048d4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild b/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
index 1b9a49a5d200..0d4a854bc9e7 100644
--- a/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
+++ b/dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 
 LICENSE="GPL-3+ GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	!=dev-util/sysprof-3.34.1-r0
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 0a81ad2b5986..6d4932ab714a 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,5 +1,5 @@
 DIST sysprof-3.42.1.tar.xz 484096 BLAKE2B bc1124651f6323d6757050ef3225df222039ac7a5c6a6e2a0e170354a0e89705ea03173302ac7fa2bc172b27485d4e4cdee0f7504a548d51e88b88a19cc8cc9d SHA512 15bf7efadfc88c1342200009e4b74ecd23a320ca272b4ca3736dd41baf9cb4e0a1fd75e0aa20ee784b98c6fee7f86a2b52e63bc4769b6ca9759f58b64cba0dcd
 DIST sysprof-3.44.0.tar.xz 493924 BLAKE2B c3d9558df99ba23f63fbde0df54e201afce83da8f7d64166b44fcc2c70ec9e54a4abfbd0ac64171b1538af7e9d608b0f618559aba9444a3d884cd4944c4d595f SHA512 64bfe4d39e71954f7982ef06caffc39ff60d2d6005f8392a7918f83263d7c5b11bafdf7234ed86d52063586919a4dbe742c498b6f1f9db91d481337cf568451c
 EBUILD sysprof-3.42.1.ebuild 2304 BLAKE2B b7fbc87c1a56e5a83965d0c17086710aae0a6a1771cfc8e99dd452088972919bd775ab0e0534a9c9fae938c63d1de997fd67294a4b1f0fdee02d221f17a30b27 SHA512 a2adc3f5ac2845c180c2bd625d9be5927a9843b84957923ca7f5548caa8d2492ada33e276b31cbaeee404306d5b60dd7ec1bcf86da1215c22a1ad3e2f89d49d9
-EBUILD sysprof-3.44.0.ebuild 2321 BLAKE2B 6c96bb4c5d0e666d69b1110f80e55b277d93078a0aea269aeee9d8767a4429b4d64df493d3d8b260bee8095d9c8c07e260a0427bc75d67a50a7ad027cafe4396 SHA512 d22006259f4960111708f908acee62a1042a929777f0dc34bf9383906bce4e25e2a9b78403c8741038caf6fe2717396610fd532db3a50c5cd92ee5c8557a4de9
+EBUILD sysprof-3.44.0.ebuild 2319 BLAKE2B b14273539a8aa3c28f5ebe605387b029e5f855706bfe01bf37d2b7636ed9eb354f60003bda48fc6f123de72ed5dc33343ab2804d846bf53dbb231a8fc50ec3f3 SHA512 3390589cf964c8a41235f0c4e072bc7d80da5374304fe575e9ac68843da9ca82f84badc20c701c0b1141ec53657ba6ba854e54b9e9f2f1d3f1e7ef4687f6d451
 MISC metadata.xml 705 BLAKE2B 2880fd6741b2033f9b1d00ca873164d7bbf37cac8c993a83218567e13f2d7f6121419c9e79402715321b14cdbc6592a15bd567fa753dadfc61cf54c1997f8169 SHA512 b4c96e1f8a29fcbd5bd9ac7e16775b9db0f2b237767edfde42c073b4082c4428e0357c785ffbce8f6d662cb8bc9dfc23abb9ae36f3f2a2deb5a578f225dcc898
diff --git a/dev-util/sysprof/sysprof-3.44.0.ebuild b/dev-util/sysprof/sysprof-3.44.0.ebuild
index 4d11d4646eaa..4d5576505ad9 100644
--- a/dev-util/sysprof/sysprof-3.44.0.ebuild
+++ b/dev-util/sysprof/sysprof-3.44.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sysprof.com/"
 LICENSE="GPL-3+ GPL-2+"
 API_VERSION="4"
 SLOT="0/${API_VERSION}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gtk +unwind"
 
 RDEPEND="
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 054101cbddf2..dab948c12bb4 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,15 +1,17 @@
 AUX 0.17.12-tests-Skip-umockdev-run-umockdev-record-null-roundtr.patch 1230 BLAKE2B bc39bf2e5fbce75df409bbdb84d96d09b3a0c1b5468e0e00aa5f90a5c7384202e0889ebb25bc973ab00aad18bc586a6747a2ce7876c5e0631803f10c986d6c50 SHA512 f73385e519390a5672bf3e726cc6db059f63e018814e1cb7f5992336573f7d99226136911d6ad92def98e224516ac27c4351568ebd57e933b6cee72f0e8f1828
 DIST umockdev-0.17.10.tar.xz 489200 BLAKE2B 9dcdc2564398ecfb92f6ba7f164b1cced6e0cdb20025025a61d69c654fa1f709c42ec543c313b37961d87d567ce7f287daea82141a7365f7804069e74d55b5ac SHA512 9baad9a6b4ee010ad7b5502da5ba69a23dbdd60164fed7227181607ea12d585936616870962e552a358c4043aea532e6757213c13a7caa9c9fd5979c9b6fef1a
 DIST umockdev-0.17.12.tar.xz 489400 BLAKE2B 442887e8a62f8320d544039d87d77b9bff78aa5b0d7639320ed5b40973c21d8e2cc7f9492a96cda7edc3fec50af29b017c1d1be4a85cb99a19599780ba790372 SHA512 034be0705b0990e68dff9741d40012a53064bf3f1be0f414d478d36ed03ca0b0ca08e482e1902e6d424b87471a482d3f2166d811d0f558391ca0a58e1e9e4336
+DIST umockdev-0.17.13.tar.xz 489728 BLAKE2B 0bb4d912aa924c91ff1f4e2cd5ca4ddf81eea1db55ddf9e4cd9a7e9683ed92a268063601a38f7f0a6fb669b301fa9ace94c413e5958ad5587db0097acb2f066c SHA512 77863ad67be0995869b35d12dc43a809d2e67e95f727312ffd9f585c5bb1598c4d31f4909fcff5035dfccdbde8c36819daa633cae53c57ea2d9c3ede3587ec4d
 DIST umockdev-0.17.6.tar.xz 486668 BLAKE2B 973c195b8fccd1c080665b65ffd47f8fe110118de9c541d5dda383e51e4dbcc36f77eeda6af5c774f4570a7b839190130fe95559fb3148e9937dae19dace6331 SHA512 05a86e2a583972d02fb3cfa26b017d44600831b6ed1415769d7cc7344357f484d34228b1593de2cfbfcce302611c0c22f045ee9fbd7fea76d8ae0b4ccd28d6ef
 DIST umockdev-0.17.7.tar.xz 486964 BLAKE2B f3c4021198c8adea47383f3d0c111f921c35550ca9b70c0711e71799ba89a44031356a687b88cc80aa51b1bf4606cfcf48a1d24d16501b0ea08f805e4e30cf83 SHA512 6fc611787c9679f450ce7cdf7dccb93a5d7435470b0b5f5cb1803036cf3c8ce73521af9e7777bec68485834cddfddba0ed9379a0818bfb072bb643cf6419c17d
 DIST umockdev-0.17.8.tar.xz 487220 BLAKE2B 6a5cb31462ef5836f6a4329fe0e612dd6bb6f00ecc899cb3d1b093771727361bfbc952c7cf7acb7943b78989cacb1faa2d7a2ee62d9c752ed959ac7b1931333c SHA512 e5e6ba2934e1df9323a4e64ee1fc066ab4abeaf75ad0d7f1f6d387b06315f30877f48664e5992f4b138fe1b76d08860359599249d5b9de516777cf8bdb1b228f
 DIST umockdev-0.17.9.tar.xz 487592 BLAKE2B 9b96ab26d31d927de240fcbbc3139f86ca3108240cbcc4d330a7793472b8b716aa3a573a7ee6a899562411192a6cffed707118a4e648802c84089c211dd870c3 SHA512 f56cc9a1513d05747eda2d36cd7c632502d7f70ccc612e11bdcd1610c96a2be9cf8e883282d024406485c44fb3cedc80dc803a12216ed61f593030d12ece21c9
 EBUILD umockdev-0.17.10.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
 EBUILD umockdev-0.17.12.ebuild 1230 BLAKE2B 483fc01d9afae6f91b3246e8f321016acd8eed505fa14d5cbc7ec74dd7e60b02ee3a2fa060255ef25803c8b16aa11a6030ed554d8eb5936f2919a4f907c120ea SHA512 e84cbe4dff4443bc67158686ce9d425bd8160ac5f949b1ab6a53941c47c38c1b1165ffab2e0c4a6b6500490f3cd1a2fcb5397683070c0ceecd3bcad2c5b24359
+EBUILD umockdev-0.17.13.ebuild 1137 BLAKE2B 0e3e81e2d682863f00a30463e3693d7479daa5b52503c9b3bd88d7ea8ff38338c7e642c651712715df95ca3e073f5fb8c96ea05b1e25788f4dbd05769c1a35bb SHA512 78db8db209fab1a98547e53dbc7c9c275ac9c962d57e9ee93ee12b21df13bb02f0e1deb39d87553a9abd1096a015b9d690ce0abe11e0eacb6be5da8691630998
 EBUILD umockdev-0.17.6.ebuild 1136 BLAKE2B 7e0cd8feada039c7012bb371c21afcf09de79d13d6a66f44caa6254d51a5144d185e0973d97009462028761a615a5c3294966b4613e8d09f3cfd62dae64e3532 SHA512 393815b0d56229ada097d84c2ca78726b1679dfc6d9f295eee260cf783573269c860898ebcc4a9af51dada2a14471477beda9172265870ffe5e4ddbf16d76a1a
 EBUILD umockdev-0.17.7.ebuild 1143 BLAKE2B af1e7ce8e0adee72f52fefc186b2c920fcfe681153d0ad288c2a1c8dfa0695569f8b1280a5369f6b95301b36cfd68a1bdaa61ff34a3154f903c551e355ea8624 SHA512 22fe773dd3be79e64eb45130b8852e4f305c4005c99d96dba3238ef6bed00ad1cf4335042ea8296031161b9d669e3ea0f6ddf088cbf62959d694b60167e4f835
 EBUILD umockdev-0.17.8.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
-EBUILD umockdev-0.17.9.ebuild 1137 BLAKE2B b3f02d4752d54e1398b03df38ce2c786500d1f6c907b477d93cbfb9c8e08bd792f9fe8936002a3dd4198fa4db17f77d8dae03bfd378d32d30e67b6c1a1d9f0b1 SHA512 348bf94ed27295c28b7296c59b21dd33bfca009a33930e1fbb40150d5c83123d6919dc6fbd7593a93aaa72dcf3fb265ec2f50a3038bd10ad30868ce983f44cce
+EBUILD umockdev-0.17.9.ebuild 1131 BLAKE2B 1e627e63170d679bee9767130de289ee46c24e46a524209e5499a152a21d771ca097880ce2fac4fc3fd21eaf93e0e05e6c63bceb01baeb2e07b0a714dfa90c9b SHA512 31c3cdab4823d7b42d58c040242536089714528d85439d4e534204a935c16341c77f34548c2d0fbf24b8106f2f9cb81bedf85c531d252104d97939c2304bad70
 EBUILD umockdev-9999.ebuild 1250 BLAKE2B 7ce582be706d807b53d710d2eab7c1978960cbc685d012a2241012efa2629a6254e6493aa7f2ca4459ed9aa9b1f962fbddb0d562fc23789ade63815e3581facc SHA512 92d6151582169e83375d9121cc24f1deb4479d32639870d982265abf3c370d1ee6c9e7453fadddfefc5677b66cbe4e9de8537b7d9b6b734083e15b4df5a7dc12
 MISC metadata.xml 389 BLAKE2B 83313795741d7a5ece22e39de4d8b138c484a7f298f64d7e87bf44a9c04b6733c80f407ca15eb2b4bd71205eaa51b6b814227f4df730ba77e3b54a27735e7484 SHA512 6aff7de0eb974f8ddc4a7190b06b8e3ad406a410f618935cb0b757fa2bc22b6a33ecf33510ae9fc2d4a03f676905faa5561d030fb5e5065f8dc3e7320820cda1
diff --git a/dev-util/umockdev/umockdev-0.17.13.ebuild b/dev-util/umockdev/umockdev-0.17.13.ebuild
new file mode 100644
index 000000000000..168ec665c590
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.17.13.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit meson-multilib python-any-r1 vala
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/libpcap[${MULTILIB_USEDEP}]
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	>=dev-libs/gobject-introspection-1.32:=
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
+	)
+"
+BDEPEND="
+	$(vala_depend)
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	vala_setup
+}
+
+multilib_src_configure() {
+	export VALAC="$(type -P valac-$(vala_best_api_version))"
+	meson_src_configure
+}
+
+multilib_src_test() {
+	meson_src_test --no-suite fails-valgrind
+}
diff --git a/dev-util/umockdev/umockdev-0.17.9.ebuild b/dev-util/umockdev/umockdev-0.17.9.ebuild
index c1f80ba0b6d7..b714d66288e9 100644
--- a/dev-util/umockdev/umockdev-0.17.9.ebuild
+++ b/dev-util/umockdev/umockdev-0.17.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 95ed9e70b6f0..96236ae050a1 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,7 +1,5 @@
-DIST vulkan-headers-1.2.198.tar.gz 1288107 BLAKE2B 91ec6879af46418e9b4f67124f0aff96d6f748c7eb02b500350f350f1b323af9cbe34c383d3d03643cdd35205e286738072c81a192bb3de4cad7c9e525dbb1d0 SHA512 c46232df1f121e69124c4faf5749032f8b5a1bd03d8ca69a24450008cd0af9c5ce000e48ab5c491cdfffa765498022f50d15476cded958dc25bd90e139c71829
 DIST vulkan-headers-1.3.204.tar.gz 1422926 BLAKE2B f699aa45948fe5a4cd0c28041406d20a42b9ef0547d85c23d2d074ea1caa4cda88a51aab7b6253a71d9d7c27e74a9044e0da06dc4a7218016669dc9ecca6e04d SHA512 0867462a5e30cada535719b5a45454457f7fbdb166cf4f65be301cd7cedca213ede524a3fea63779059c138851e3493d9e9616feaabbce77a96fbbbd803b8190
 DIST vulkan-headers-1.3.211.tar.gz 1469275 BLAKE2B 4b9f5df8a07188b89c2be09e1d71279af1e1513f072d04e0da944b7697759e5c747bf40b78330edbf3ea71287921a9cc0fd9247d188ba9a761feb2bf04d0627f SHA512 35f849b0c493e6e1ecfeb91089085f3a567cce76466f8cc17acadfa2a2b3163420489c11fc5b547de52aed1575f28fc23c1a62ce6d321ccba3dd04fbf7e50ca3
-EBUILD vulkan-headers-1.2.198.ebuild 622 BLAKE2B 5ce440be9f3bef462b5cbc86eb4ae4ae55391ab98630ba3b76d6b6210a06efef946cdd4316e8d87270b5beb608d5c99dd2370a9ae7c6507ff425a0f1141fe509 SHA512 bbcda49da3406b10b547e1a953f234e91fd4c2bb7beb3348429ede6f3f48c10f0da83ad1754032167fef8484b3ae574dd52e145ea55ec5c3d4960d04a6aa4f34
 EBUILD vulkan-headers-1.3.204.ebuild 622 BLAKE2B a0785a058bfc8345c202c72432b68f16ccb81e22f66f05912f71bf0707b056506d96ef89c19377087ddeacdacc28cd3c9707dacba3fe9e1f66ae9db6feb0ed26 SHA512 abb3f1d06090d98a726e377fc83a16f12ef764b9b7108f34c9b1efe58859ab40d0519f325fdba67a950368c1abbf2a0a4e390adcb746a2023642f3c6bfc35a3a
 EBUILD vulkan-headers-1.3.211.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
 EBUILD vulkan-headers-9999.ebuild 635 BLAKE2B 6aecf86175de5bd7199734da984a00c644ff4601fdc56da3937bf4c3bcb0025302b9beae478d32f4a9cad0a7d5de751efd3caf6d31bfbcfbaee022c9e2f26941 SHA512 e740f8b3d7060f8f73eab968b43db0c0a9144cda4863cc7fa6661bd32562f36adc7a4fa00c7074551e5c3f44288ecb4b2b1204034725bb27b464bfe025a4073f
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.198.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.198.ebuild
deleted file mode 100644
index 789f82235589..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.198.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
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 6a9361f7c2e9..21f7553da60e 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,7 +1,5 @@
-DIST vulkan-tools-1.2.198.tar.gz 847429 BLAKE2B 8927740853eb45d495996a8be0bae3d40f84f14f12eb838474241745321d7337a6bae7e118bd626fbb15f8ffd42d574a04c93bd3aca0b3373976d7d976c05d2d SHA512 304ce76c47d4adef3a286439712ef4fd3f08ec8e47ed0e2a37162f9cac5e08af3c7b7fb449fddd4772080d678d84db9e238a5db4d98c7d4ee5f6d87a3f5c8f5f
 DIST vulkan-tools-1.3.204.tar.gz 860464 BLAKE2B d0fdf95bff0dc914cb324a0780763dd87120b7f88a7bfaa6a2e0adef72263bd9cb0769636eda793ca5517560903ce314b96a5e3b00e018010ba0f99f68ba05cd SHA512 1295d0e86b8b81e33b0cd1038847211fb808456435fce9446f9890f8653b854dbd1e8b84a22b646b0fddb8cca33aaee12a2edc043e76c9c4bc718b11f281a98f
 DIST vulkan-tools-1.3.211.tar.gz 864436 BLAKE2B 09dcb3ce388962cff0e75837d07e58572ac1cbdabdc26edf7f6bd1740278f7ea871e0e14c4ac6a203fa13033616240d7338dfb1a52c4e2ed045ed28585bc62cf SHA512 36be2970dd42e12bf6f6644bc1b14f102af36f1297c33fadddca470b65d7d324532b20c071d2f0dd790d556cd99012a4fb80f185db6165ed3f09d1fd7e5c50e7
-EBUILD vulkan-tools-1.2.198.ebuild 1958 BLAKE2B d728a9c077343621f53e04c982a7e4d8b6d2ba6966ab3c6d2d78da3db89bdb4c4c4408b5ebdd596c89ed5efa0466cf2c727a65613d20bebb80cf6c022dce02a2 SHA512 aa6789146f968ca85ac77c3442287288b218278b40469390f60be55e2b32cf43a24c54a1745d688d8021d046db472fc23862b0377f32c5e3e254b5106d6bbeea
 EBUILD vulkan-tools-1.3.204.ebuild 1958 BLAKE2B a9e2f85bcababb40309f8cb50c0432d427d26225ac1f32bd10beeca7072e0b88e3625fa376b4ad6a8e6dc793c5be9d0548896249dc419f47968221758fea8aca SHA512 98ca0f09b3e568057c5037ff50bd84606c501097b5c4891832f2fed332160a708b79bbc96a46802f6a98164b8fc155c9a58431eb6ee9acd86cf86338abc86fbd
 EBUILD vulkan-tools-1.3.211.ebuild 1972 BLAKE2B 59b0ffc904df16d19ee4827b596d937169165361447269bf303ca0fa6bc4c7cffc5420a9e51f4c68ac64770870e8945dba9c7f64604ab6d1cd232771f4b1a6e2 SHA512 bfadf7fbbca1d0b8c414badbd6d4e8a5d53c5fac2f8e0fc4a182b47ddfed6fbed5b1b84dc2474ac25a3103ff1ec3fbc94656473d62763d8168ac28f1d1a938b0
 EBUILD vulkan-tools-9999.ebuild 1972 BLAKE2B 59b0ffc904df16d19ee4827b596d937169165361447269bf303ca0fa6bc4c7cffc5420a9e51f4c68ac64770870e8945dba9c7f64604ab6d1cd232771f4b1a6e2 SHA512 bfadf7fbbca1d0b8c414badbd6d4e8a5d53c5fac2f8e0fc4a182b47ddfed6fbed5b1b84dc2474ac25a3103ff1ec3fbc94656473d62763d8168ac28f1d1a938b0
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
deleted file mode 100644
index 717742bd6504..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	~media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	~dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/web_page_replay_go/Manifest b/dev-util/web_page_replay_go/Manifest
new file mode 100644
index 000000000000..898b3ed6eb8f
--- /dev/null
+++ b/dev-util/web_page_replay_go/Manifest
@@ -0,0 +1,5 @@
+AUX wpr-usage.patch 2044 BLAKE2B ee52bf0e675784e57cf9887edb636ab7decf4f27180e9c0d4383f05b68ac63e9d99c0eecf231d018472cc0068f80c318b5a8c1e4a22f65574bd5db6ca7843cd4 SHA512 1a52ca008a9a29000f97ff1809cd8698892f7be5bc3060f71adda2ebad8f9514dcf567374888157bad357846558ffe8e1753e960b4e06b66b70d6b8d30b7beb0
+DIST web_page_replay_go-20220314-deps.tar.xz 22639912 BLAKE2B 5b9c3753a419a809088b2ad468f44d79ed6ff004132b3e7680d06bda28bbf1a8ce622ea64e2590bc6e7f180a7bfd4d19be1561c9770b000e14d73dffa077056f SHA512 62dde2c4725f5aeba856bb35df04dbe96bf0727095673ef80e195acf600fc615c9f976139047b8cbf4e0cad4632d864e1cd4eede50f022802ffdf60dec56dd4c
+DIST web_page_replay_go-20220314.tar.gz 35660 BLAKE2B 1d24655b1aa3ca9a19430d6acb888ec7fed36ffbeb67f70ccfc419ff9fbf23ae14f95510ad4c514833cc5908d5f58a9e2ad4118c39689387c9d83548f4860017 SHA512 67dc0019d4239d2ff535c9cfbafc5e1a529c11dfc7040f8f10a651e57ac6978bb1b2da39f27d80893614a3fffec712b8a769204d3abb2ddb5cf4738f60e96f0c
+EBUILD web_page_replay_go-20220314.ebuild 1298 BLAKE2B 5a6aeea65271f3a1594cc919af0aa4afb460168a87bc18bf980cad33a9cb3b7af7d8b14fc1247caf58c157fe8485de95b5d87a377a43aacdd746936beba8d887 SHA512 f56d0325e9cd2dbd23540b2f37a6738db0a2f063bea88d5de9bd1207997f48765aafea8f7c2600c5ce8bc718ed237afc3c049aca2d5d7d25845132e5f6189548
+MISC metadata.xml 382 BLAKE2B 462fef3bd8428aaa87d5c6942fc87ecf5f73043ed29d0b22c0b8796ebc11aab947e42acad26af0e254ae9bf4df7d585fa25c5fe8d237829b0f930e2f9eed7dca SHA512 4c0553f05ff9070a6462bc6b12bc6a7b1903535e8ebf51ac04cb6e476f212bed6000b7d561b232706f43945492b7182814cd645a199eb91f80cbe5bc0071602e
diff --git a/dev-util/web_page_replay_go/files/wpr-usage.patch b/dev-util/web_page_replay_go/files/wpr-usage.patch
new file mode 100644
index 000000000000..fb43a9c9f166
--- /dev/null
+++ b/dev-util/web_page_replay_go/files/wpr-usage.patch
@@ -0,0 +1,46 @@
+From: Marek Behún <kabel@kernel.org>
+
+Make usage text in wpr.go does reflect usage information from README.md.
+
+diff --git a/wpr.go b/wpr.go
+--- a/wpr.go
++++ b/wpr.go
+@@ -28,25 +28,27 @@ const longUsage = `
+    %s [installroot|removeroot] [options]
+    %s [record|replay] [options] archive_file
+ 
+-   Before: Install a test root CA.
+-     $ GOPATH=$PWD go run src/wpr.go installroot
+-
+    To record web pages:
+-     1. Start this program in record mode.
+-        $ GOPATH=$PWD go run src/wpr.go record archive.json
++     1. Start wpr in record mode.
++        $ wpr record --http_port=8080 --https_port=8081 /tmp/archive.wprgo
+      2. Load the web pages you want to record in a web browser. It is important to
+         clear browser caches before this so that all subresources are requested
+-        from the network.
++        from the network. This can be done by specifying a new user-data-dir.
++        Example:
++        $ google-chrome-beta --user-data-dir=$foo \
++           --host-resolver-rules="MAP *:80 127.0.0.1:8080,MAP *:443 127.0.0.1:8081,EXCLUDE localhost"
++           --ignore-certificate-errors-spki-list=PhrPvGIaAMmd29hj8BCZOq096yj7uMpRNHpn5PDxI6I=
+      3. Kill the process to stop recording.
+ 
+    To replay web pages:
+-     1. Start this program in replay mode with a previously recorded archive.
+-        $ GOPATH=$PWD go run src/wpr.go replay archive.json
++     1. Start wpr in replay mode.
++        $ wpr replay --http_port=8080 --https_port=8081 /tmp/archive.wprgo
+      2. Load recorded pages in a web browser. A 404 will be served for any pages or
+         resources not in the recorded archive.
+-
+-   After: Remove the test root CA.
+-     $ GOPATH=$PWD go run src/wpr.go removeroot`
++        Example:
++        $ google-chrome-beta --user-data-dir=$foo \
++           --host-resolver-rules="MAP *:80 127.0.0.1:8080,MAP *:443 127.0.0.1:8081,EXCLUDE localhost"
++           --ignore-certificate-errors-spki-list=PhrPvGIaAMmd29hj8BCZOq096yj7uMpRNHpn5PDxI6I=`
+ 
+ type CertConfig struct {
+ 	// Flags common to all commands.
diff --git a/dev-util/web_page_replay_go/metadata.xml b/dev-util/web_page_replay_go/metadata.xml
new file mode 100644
index 000000000000..5cf03e9c318a
--- /dev/null
+++ b/dev-util/web_page_replay_go/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>kabel@kernel.org</email>
+		<name>Marek Behún</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>chromium@gentoo.org</email>
+		<name>Chromium in Gentoo Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/web_page_replay_go/web_page_replay_go-20220314.ebuild b/dev-util/web_page_replay_go/web_page_replay_go-20220314.ebuild
new file mode 100644
index 000000000000..0a45a851bcaa
--- /dev/null
+++ b/dev-util/web_page_replay_go/web_page_replay_go-20220314.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A performance testing tool for recording and replaying web pages"
+HOMEPAGE="https://chromium.googlesource.com/catapult/+/refs/heads/main/web_page_replay_go/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+SRC_URI="https://github.com/elkablo/web_page_replay_go/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/elkablo/web_page_replay_go/releases/download/v${PV}/web_page_replay_go-${PV}-deps.tar.xz"
+S="${WORKDIR}/${P}/src"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/wpr-usage.patch"
+	)
+
+	default
+
+	# default certificate, key and inject script in /usr/share/web_page_replay_go
+	local f
+	for f in wpr.go webpagereplay/legacyformatconvertor.go; do
+		sed -i -e 's^"\(wpr_cert\.pem\|wpr_key\.pem\|deterministic\.js\)"^"/usr/share/web_page_replay_go/\1"^' "${f}" || die "sed-editing ${f} failed"
+	done
+}
+
+src_compile() {
+	local t
+
+	for t in wpr.go httparchive.go; do
+		go build ${GOFLAGS} -mod=mod "${t}" || die "compiling ${t} failed"
+	done
+}
+
+src_install() {
+	dobin wpr
+	dobin httparchive
+
+	insinto /usr/share/${PN}
+	doins ../deterministic.js
+	doins ../wpr_cert.pem
+	doins ../wpr_key.pem
+	doins ../wpr_public_hash.txt
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 41d33e9b621e..1989de305947 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/pre-commit/Manifest b/dev-vcs/pre-commit/Manifest
index 4313c70d2a7f..8f56324c5285 100644
--- a/dev-vcs/pre-commit/Manifest
+++ b/dev-vcs/pre-commit/Manifest
@@ -1,5 +1,7 @@
 DIST pre-commit-2.17.0.tar.gz 261131 BLAKE2B 114fac379690ee4c1c60970a1b0fbcd20faea785837c174514c3fc3d247ec79f52fb5f14c96a762921395d682017a9cc406dc59b3042fc955cd65019fb781a3f SHA512 54b5af9088083ad0c57fab09c06c35bd5921b29348454fc8fc16081d3c6a2e0add13f8a18f06b7408a0e06babc5e15659b37ab53797edd3514d516059e2343a8
 DIST pre-commit-2.18.1.tar.gz 263642 BLAKE2B 0ddd0e8bc7450c6bce2080155851c4b8d7e81fe1683dbea389d24e79906b52850ca8cc16b57a4b6192a389a10f8e9d0dfeaa23deaf59027093dc4db61b4533c1 SHA512 38ad176675b40eb4fd2475e51f3079cff5d84733401592a8a00021cba6656f01a38c5835298db50607fd8d188728c127600c731795fbc149436a5e4aada94fc1
+DIST pre-commit-2.19.0.tar.gz 266117 BLAKE2B d2105fb9aa64e63c7d93142228545e3597eb4a1637f850ce5d3f14b0826bdfb8a8d971779690c4fda6823fa1915fc57f9c86b9ffae48dbe39e7a225123304f5c SHA512 9cc28c5e9ce4be87e09e7be01138c35bbe954efb6c1400e92b1a6b5f50e426b59d74651802359015840d5ec4a5583bf8f579bf7f08eb778d5950c8c8dfe4c80c
 EBUILD pre-commit-2.17.0.ebuild 1598 BLAKE2B 4ce3456da8315ca58792da3ad9d78ee0395d2090b02e505fb43a1ed6a87f1d5ac7a73ce5bc2e27063a045acebc4c1593cd20b0490c25779b3ac3b5f5b2ac5552 SHA512 d2a746ce673958c7985531299281b4b475db2c46edc17716ac72ee3f513deefa15185bd48a6532cdffaefd09ecf8743b42b4dad273f4e54cbf8caec7399dac94
 EBUILD pre-commit-2.18.1.ebuild 1600 BLAKE2B 6b9a7d9e7e640ffa62a7f797cfc8fec15e4cfb9fe1fe207694e67920f723eb4471f980d0b7a8b71776ec914fdba7d5c417db01384f63e075492ba6d8ddd94de3 SHA512 3ac9c85151f10089e0170ac8e922bba85eb71701b020890d03e8e0ed0c08de40058af7de73eb96ba3e73b680384436ca0164bfcb00affed9d807013fa84b682e
+EBUILD pre-commit-2.19.0.ebuild 1646 BLAKE2B 47a35f1c7439bd568556d2b81813d3516ba68f6e8ea4d6169bb448131b4e3fc3342605f882e1278fd9ff73949ac0fb5af16f3068a5663d9facac3f2037a3cf91 SHA512 58f97c33db011542c8c084f1ae470813713e8def4550d73220e53d6087400388f6fbefe976dd0e4c3c90e4fc3d28a1f5bbc99e063dbd409544e557d49254e481
 MISC metadata.xml 380 BLAKE2B 99842a97367e91700c6f714f427b7b3d4b7212c401abae5ab715dfaa724776f02fe250184a33504d3433bb58cd5679af59a32ec21a7e7432481160dab36a4d95 SHA512 45330930d1e58fc1de0fd0ba55cd488dee96579ceab3be5073b91ff8f4f2b9adefff533dbfa5b0e8b23fbb648d45c0b7b4073a1ec57b586600cc2bf6347e0bbb
diff --git a/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild b/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
new file mode 100644
index 000000000000..b30bc1b3b4b9
--- /dev/null
+++ b/dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Many test failures with py3.11 as of 2.19.0
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="A framework for managing and maintaining multi-language Git pre-commit hooks"
+HOMEPAGE="https://pre-commit.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="dev-vcs/git
+	$(python_gen_cond_dep '
+		>=dev-python/cfgv-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/identify-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/nodeenv-0.11.1[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20.0.8[${PYTHON_USEDEP}]
+	')"
+BDEPEND="test? (
+	$(python_gen_cond_dep '
+		dev-python/pytest-env[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+	')
+)"
+
+DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
+
+# The former two require a boatload of dependencies (e.g. Conda, Go, R and more) in order to run
+# and while some of them do include "skip if not found" logic, most of them do not.
+# The latter consistently fail with
+#     Calling "git rev-parse" fails with "fatal: not a git repository (or any of the parent directories): .git".
+# including with the sandbox disabled and when run manually with tox.
+EPYTEST_DESELECT=(
+	tests/languages/
+	tests/repository_test.py
+	tests/main_test.py::test_all_cmds
+	tests/main_test.py::test_try_repo
+)
+
+distutils_enable_tests pytest
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index 9a18a03a93df..21143c505153 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 69d674f46b64..488648a82ab5 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -19,7 +19,7 @@ _TOOLCHAIN_ECLASS=1
 DESCRIPTION="The GNU Compiler Collection"
 HOMEPAGE="https://gcc.gnu.org/"
 
-inherit flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
+inherit edo flag-o-matic gnuconfig libtool multilib pax-utils toolchain-funcs prefix
 
 tc_is_live() {
 	[[ ${PV} == *9999* ]]
@@ -493,6 +493,11 @@ toolchain_pkg_setup() {
 
 	# bug #265283
 	unset LANGUAGES
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
 }
 
 #---->> src_unpack <<----
@@ -812,6 +817,8 @@ toolchain_src_configure() {
 
 	local confgcc=( --host=${CHOST} )
 
+	local build_config_targets=()
+
 	if is_crosscompile || tc-is-cross-compiler ; then
 		# Straight from the GCC install doc:
 		# "GCC has code to correctly determine the correct value for target
@@ -851,7 +858,6 @@ toolchain_src_configure() {
 	is_d   && GCC_LANG+=",d"
 	is_gcj && GCC_LANG+=",java"
 	is_go  && GCC_LANG+=",go"
-	is_jit && GCC_LANG+=",jit"
 	if is_objc || is_objcxx ; then
 		GCC_LANG+=",objc"
 		use objc-gc && confgcc+=( --enable-objc-gc )
@@ -914,7 +920,11 @@ toolchain_src_configure() {
 
 	# Build compiler itself using LTO
 	if tc_version_is_at_least 9.1 && _tc_use_if_iuse lto ; then
-		confgcc+=( --with-build-config=bootstrap-lto )
+		build_config_targets+=( bootstrap-lto )
+	fi
+
+	if tc_version_is_at_least 12 && _tc_use_if_iuse cet ; then
+		build_config_targets+=( bootstrap-cet )
 	fi
 
 	# Support to disable PCH when building libstdcxx
@@ -922,10 +932,6 @@ toolchain_src_configure() {
 		confgcc+=( --disable-libstdcxx-pch )
 	fi
 
-	# The JIT support requires this.
-	# But see bug #843341.
-	is_jit && confgcc+=( --enable-host-shared )
-
 	# build-id was disabled for file collisions: bug #526144
 	#
 	# # Turn on the -Wl,--build-id flag by default for ELF targets. bug #525942
@@ -1079,7 +1085,7 @@ toolchain_src_configure() {
 			case ${CTARGET//_/-} in
 				*-hardfloat-*|*eabihf)
 					confgcc+=( --with-float=hard )
-					;;
+				;;
 			esac
 	esac
 
@@ -1096,6 +1102,8 @@ toolchain_src_configure() {
 				fi
 			done
 
+			# Convert armv6m to armv6-m
+			[[ ${arm_arch} == armv6m ]] && arm_arch=armv6-m
 			# Convert armv7{a,r,m} to armv7-{a,r,m}
 			[[ ${arm_arch} == armv7? ]] && arm_arch=${arm_arch/7/7-}
 			# See if this is a valid --with-arch flag
@@ -1272,6 +1280,8 @@ toolchain_src_configure() {
 		confgcc+=( $(use_with zstd) )
 	fi
 
+	# This only controls whether the compiler *supports* LTO, not whether
+	# it's *built using* LTO. Hence we do it without a USE flag.
 	if tc_version_is_at_least 4.6 ; then
 		confgcc+=( --enable-lto )
 	elif tc_version_is_at_least 4.5 ; then
@@ -1323,6 +1333,11 @@ toolchain_src_configure() {
 
 	confgcc+=( "$@" ${EXTRA_ECONF} )
 
+	if [[ -n ${build_config_targets} ]] ; then
+		# ./configure --with-build-config='bootstrap-lto bootstrap-cet'
+		confgcc+=( --with-build-config="${build_config_targets[*]}" )
+	fi
+
 	# Nothing wrong with a good dose of verbosity
 	echo
 	einfo "PREFIX:          ${PREFIX}"
@@ -1333,24 +1348,40 @@ toolchain_src_configure() {
 	echo
 	einfo "Languages:       ${GCC_LANG}"
 	echo
-	einfo "Configuring GCC with: ${confgcc[@]//--/\n\t--}"
-	echo
 
 	# Build in a separate build tree
-	mkdir -p "${WORKDIR}"/build
+	mkdir -p "${WORKDIR}"/build || die
 	pushd "${WORKDIR}"/build > /dev/null
 
 	# ...and now to do the actual configuration
 	addwrite /dev/zero
 
-	echo "${S}"/configure "${confgcc[@]}"
+	if is_jit ; then
+		einfo "Configuring JIT gcc"
+
+		mkdir -p "${WORKDIR}"/build-jit || die
+		pushd "${WORKDIR}"/build-jit > /dev/null || die
+		CONFIG_SHELL="${BROOT}"/bin/bash edo "${BROOT}"/bin/bash "${S}"/configure \
+				"${confgcc[@]}" \
+				--disable-libada \
+				--disable-libsanitizer \
+				--disable-libvtv \
+				--disable-libgomp \
+				--disable-libquadmath \
+				--disable-libatomic \
+				--disable-lto \
+				--disable-bootstrap \
+				--enable-host-shared \
+				--enable-languages=jit
+		popd > /dev/null || die
+	fi
+
 	# Older gcc versions did not detect bash and re-exec itself, so force the
 	# use of bash. Newer ones will auto-detect, but this is not harmful.
-	CONFIG_SHELL="${BROOT}/bin/bash" \
-		"${BROOT}"/bin/bash "${S}"/configure "${confgcc[@]}" || die "failed to run configure"
+	CONFIG_SHELL="${BROOT}"/bin/bash edo "${BROOT}"/bin/bash "${S}"/configure "${confgcc[@]}"
 
 	# Return to whatever directory we were in before
-	popd > /dev/null
+	popd > /dev/null || die
 }
 
 # Replace -m flags unsupported by the version being built with the best
@@ -1640,8 +1671,8 @@ gcc_do_make() {
 
 	# default target
 	if is_crosscompile || tc-is-cross-compiler ; then
-		# 3 stage bootstrapping doesnt quite work when you cant run the
-		# resulting binaries natively ^^;
+		# 3 stage bootstrapping doesn't quite work when you can't run the
+		# resulting binaries natively
 		GCC_MAKE_TARGET=${GCC_MAKE_TARGET-all}
 	else
 		if _tc_use_if_iuse pgo; then
@@ -1675,6 +1706,19 @@ gcc_do_make() {
 		BOOT_CFLAGS=${BOOT_CFLAGS-"$(get_abi_CFLAGS ${TARGET_DEFAULT_ABI}) ${CFLAGS}"}
 	fi
 
+	if is_jit ; then
+		# TODO: docs for jit?
+		pushd "${WORKDIR}"/build-jit > /dev/null || die
+
+		einfo "Building JIT"
+		emake \
+			LDFLAGS="${LDFLAGS}" \
+			STAGE1_CFLAGS="${STAGE1_CFLAGS}" \
+			LIBPATH="${LIBPATH}" \
+			BOOT_CFLAGS="${BOOT_CFLAGS}"
+		popd > /dev/null || die
+        fi
+
 	einfo "Compiling ${PN} (${GCC_MAKE_TARGET})..."
 
 	pushd "${WORKDIR}"/build >/dev/null
@@ -1762,8 +1806,32 @@ toolchain_src_install() {
 			&& rm -f "${x}"
 	done < <(find gcc/include*/ -name '*.h')
 
+	if is_jit ; then
+		# See https://gcc.gnu.org/onlinedocs/gcc-11.3.0/jit/internals/index.html#packaging-notes
+		# and bug #843341.
+		#
+		# Both of the non-JIT and JIT builds  are configured to install to $(DESTDIR)
+		# Install the configuration with --enable-host-shared first
+		# *then* the one without, so that the faster build
+		# of "cc1" et al overwrites the slower build.
+		#
+		# Do the 'make install' from the build directory
+		pushd "${WORKDIR}"/build-jit > /dev/null || die
+		S="${WORKDIR}"/build-jit emake DESTDIR="${D}" install
+
+		# Punt some tools which are really only useful while building gcc
+		find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
+		# This one comes with binutils
+		find "${ED}" -name libiberty.a -delete
+
+		# Move the libraries to the proper location
+		gcc_movelibs
+
+		popd > /dev/null || die
+	fi
+
 	# Do the 'make install' from the build directory
-	S="${WORKDIR}"/build emake DESTDIR="${D}" install || die
+	S="${WORKDIR}"/build emake DESTDIR="${D}" install
 
 	# Punt some tools which are really only useful while building gcc
 	find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \;
@@ -1956,9 +2024,10 @@ gcc_movelibs() {
 		dodir "${HOSTLIBPATH#${EPREFIX}}"
 		mv "${ED}"/usr/$(get_libdir)/libcc1* "${D}${HOSTLIBPATH}" || die
 	fi
+
 	# libgccjit gets installed to /usr/lib, not /usr/$(get_libdir). Probably
 	# due to a bug in gcc build system.
-	if is_jit ; then
+	if [[ ${PWD} == "${WORKDIR}"/build-jit ]] && is_jit ; then
 		dodir "${LIBPATH#${EPREFIX}}"
 		mv "${ED}"/usr/lib/libgccjit* "${D}${LIBPATH}" || die
 	fi
diff --git a/eclass/vim-doc.eclass b/eclass/vim-doc.eclass
index ba9d00f4f5e8..119ce793071d 100644
--- a/eclass/vim-doc.eclass
+++ b/eclass/vim-doc.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-doc.eclass
 # @MAINTAINER:
 # vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: Eclass for vim{,-plugin}.eclass to update documentation tags.
 # @DESCRIPTION:
 # This eclass is used by vim.eclass and vim-plugin.eclass to update
@@ -16,26 +16,31 @@
 # DEPEND in vim-plugin or by whatever version of vim is being
 # installed by the eclass.
 
-case ${EAPI:-0} in
-	[67]) ;;
+case ${EAPI} in
+	6|7|8) ;;
 	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
-if [[ -z ${_VIM_DOC_ECLASS} ]] ; then
-_VIM_DOC_ECLASS=1
+if [[ ! ${_VIM_DOC_ECLASS} ]] ; then
 
+# @FUNCTION: update_vim_helptags
+# @USAGE:
+# @DESCRIPTION:
+# Update the documentation tags in the versioned Vim directory.
 update_vim_helptags() {
-	local vimfiles vim d s
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local vimfiles helpfile files vim d
 
 	# This is where vim plugins are installed
 	vimfiles="${EROOT}"/usr/share/vim/vimfiles
 
-	if [[ $PN != vim-core ]]; then
+	if [[ ${PN} != vim-core ]]; then
 		# Find a suitable vim binary for updating tags :helptags
 		vim=$(type -P vim 2>/dev/null)
-		[[ -z "$vim" ]] && vim=$(type -P gvim 2>/dev/null)
-		[[ -z "$vim" ]] && vim=$(type -P kvim 2>/dev/null)
-		if [[ -z "$vim" ]]; then
+		[[ -z "${vim}" ]] && vim=$(type -P gvim 2>/dev/null)
+		[[ -z "${vim}" ]] && vim=$(type -P kvim 2>/dev/null)
+		if [[ -z "${vim}" ]]; then
 			ewarn "No suitable vim binary to rebuild documentation tags"
 		fi
 	fi
@@ -43,44 +48,57 @@ update_vim_helptags() {
 	# Make vim not try to connect to X. See :help gui-x11-start
 	# in vim for how this evil trickery works.
 	if [[ -n "${vim}" ]] ; then
-		ln -s "${vim}" "${T}/tagvim"
+		ln -s "${vim}" "${T}/tagvim" || die
 		vim="${T}/tagvim"
 	fi
 
 	# Install the documentation symlinks into the versioned vim
 	# directory and run :helptags
 	for d in "${EROOT%/}"/usr/share/vim/vim[0-9]*; do
-		[[ -d "$d/doc" ]] || continue	# catch a failed glob
+		[[ -d "${d}/doc" ]] || continue	# catch a failed glob
 
-		# Remove links, and possibly remove stale dirs
-		find $d/doc -name \*.txt -type l | while read s; do
-			[[ $(readlink "$s") = $vimfiles/* ]] && rm -f "$s"
+		# Remove links
+		readarray -d '' files < <(find "${d}"/doc -name "*.txt" -type l -print0 || die "cannot traverse ${d}/doc" )
+		for helpfile in "${files[@]}"; do
+			if [[ $(readlink -f "${helpfile}") == "${vimfiles}"/* ]]; then
+				rm "${helpfile}" || die
+			fi
 		done
-		if [[ -f "$d/doc/tags" && $(find "$d" | wc -l | tr -d ' ') = 3 ]]; then
+
+		# Remove stale dirs, if possible
+		readarray -d '' files < <(find "${d}" -print0 || die "cannot traverse ${d}")
+		if [[ -f "${d}/doc/tags" && ${#files[@]} -eq 3 ]]; then
 			# /usr/share/vim/vim61
 			# /usr/share/vim/vim61/doc
 			# /usr/share/vim/vim61/doc/tags
-			einfo "Removing $d"
-			rm -r "$d"
+			einfo "Removing ${d}"
+			rm -r "${d}" || die
 			continue
 		fi
 
 		# Re-create / install new links
-		if [[ -d $vimfiles/doc ]]; then
-			ln -s $vimfiles/doc/*.txt $d/doc 2>/dev/null
+		if [[ -d "${vimfiles}"/doc ]]; then
+			for helpfile in "${vimfiles}"/doc/*.txt; do
+				if [[ ! -e "${d}/doc/$(basename "${helpfile}")" ]]; then
+					ln -s "${helpfile}" "${d}/doc" || die
+				fi
+			done
 		fi
 
 		# Update tags; need a vim binary for this
-		if [[ -n "$vim" ]]; then
-			einfo "Updating documentation tags in $d"
-			DISPLAY= $vim -u NONE -U NONE -T xterm -X -n -f \
+		if [[ -n "${vim}" ]]; then
+			einfo "Updating documentation tags in ${d}"
+			DISPLAY= "${vim}" -u NONE -U NONE -T xterm -X -n -f \
 				'+set nobackup nomore' \
-				"+helptags $d/doc" \
-				'+qa!' </dev/null &>/dev/null
+				"+helptags ${d}/doc" \
+				'+qa!' </dev/null &>/dev/null || die
 		fi
 	done
 
-	[[ -n "${vim}" && -f "${vim}" ]] && rm "${vim}"
+	if [[ -n "${vim}" && -f "${vim}" ]]; then
+		rm "${vim}" || die
+	fi
 }
 
+_VIM_DOC_ECLASS=1
 fi
diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index 50e727e98f4e..edf1c94d31b1 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: vim-plugin.eclass
 # @MAINTAINER:
 # vim@gentoo.org
-# @SUPPORTED_EAPIS: 6 7
+# @SUPPORTED_EAPIS: 6 7 8
 # @BLURB: used for installing vim plugins
 # @DESCRIPTION:
 # This eclass simplifies installation of app-vim plugins into
@@ -13,14 +13,19 @@
 # documentation, for which we make a special case via vim-doc.eclass.
 
 case ${EAPI} in
-	6|7);;
-	*) die "EAPI ${EAPI:-0} unsupported (too old)";;
+	6|7) ;;
+	8) _DEFINE_VIM_PLUGIN_SRC_PREPARE=true ;;
+	*) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;;
 esac
 
+if [[ ! ${_VIM_PLUGIN_ECLASS} ]]; then
+
 inherit vim-doc
-EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
 
-VIM_PLUGIN_VIM_VERSION="${VIM_PLUGIN_VIM_VERSION:-7.3}"
+# @ECLASS_VARIABLE: VIM_PLUGIN_VIM_VERSION
+# @DESCRIPTION:
+# Minimum Vim version the plugin supports.
+: ${VIM_PLUGIN_VIM_VERSION:=7.3}
 
 DEPEND="|| ( >=app-editors/vim-${VIM_PLUGIN_VIM_VERSION}
 	>=app-editors/gvim-${VIM_PLUGIN_VIM_VERSION} )"
@@ -31,14 +36,59 @@ if [[ ${PV} != 9999* ]] ; then
 fi
 SLOT="0"
 
+if [[ ${_DEFINE_VIM_PLUGIN_SRC_PREPARE} ]]; then
+# @FUNCTION: vim-plugin_src_prepare
+# @USAGE:
+# @DESCRIPTION:
+# Moves "after/syntax" plugins to directories to avoid file collisions with
+# other packages.
+# Note that this function is only defined and exported in EAPIs >= 8.
+vim-plugin_src_prepare() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	default_src_prepare
+
+	# return if there's nothing to do
+	[[ -d after/syntax ]] || return
+
+	pushd after/syntax >/dev/null || die
+	for file in *.vim; do
+		[[ -f "${file}" ]] || continue
+		mkdir "${file%.vim}" || die
+		mv "${file}" "${file%.vim}/${PN}.vim" || die
+	done
+	popd >/dev/null || die
+}
+fi
+
+# @ECLASS_VARIABLE: _VIM_PLUGIN_ALLOWED_DIRS
+# @INTERNAL
+# @DESCRIPTION:
+# Vanilla Vim dirs.
+# See /usr/share/vim/vim* for reference.
+_VIM_PLUGIN_ALLOWED_DIRS=(
+	after autoload colors compiler doc ftdetect ftplugin indent keymap
+	macros plugin spell syntax
+)
+
 # @FUNCTION: vim-plugin_src_install
+# @USAGE: [<dir>...]
 # @DESCRIPTION:
 # Overrides the default src_install phase. In order, this function:
-# * fixes file permission across all files in ${S}.
+#
 # * installs help and documentation files.
-# * installs all files in "${ED}"/usr/share/vim/vimfiles.
+#
+# * installs all files recognized by default Vim installation and directories
+#   passed to this function as arguments in "${ED}"/usr/share/vim/vimfiles.
+#
+# Example use:
+# @CODE
+# src_install() {
+# 	vim-plugin_src_install syntax_checkers
+# }
+# @CODE
 vim-plugin_src_install() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && ED="${D}"
+	debug-print-function ${FUNCNAME} "${@}"
 
 	# Install non-vim-help-docs
 	einstalldocs
@@ -46,21 +96,35 @@ vim-plugin_src_install() {
 	# Install remainder of plugin
 	insinto /usr/share/vim/vimfiles/
 	local d
-	for d in *; do
-		[[ -d "${d}" ]] || continue
-		doins -r "${d}"
-	done
+	case ${EAPI:-0} in
+		6|7)
+			for d in *; do
+				[[ -d "${d}" ]] || continue
+				doins -r "${d}"
+			done ;;
+		*)
+			for d in "${_VIM_PLUGIN_ALLOWED_DIRS[@]}" "${@}"; do
+				[[ -d "${d}" ]] || continue
+				doins -r "${d}"
+			done ;;
+	esac
 }
 
 # @FUNCTION: vim-plugin_pkg_postinst
+# @USAGE:
 # @DESCRIPTION:
 # Overrides the pkg_postinst phase for this eclass.
 # The following functions are called:
+#
 # * update_vim_helptags
+#
 # * update_vim_afterscripts
+#
 # * display_vim_plugin_help
 vim-plugin_pkg_postinst() {
-	update_vim_helptags		# from vim-doc
+	debug-print-function ${FUNCNAME} "${@}"
+
+	update_vim_helptags # from vim-doc
 	update_vim_afterscripts	# see below
 	display_vim_plugin_help	# see below
 }
@@ -71,8 +135,9 @@ vim-plugin_pkg_postinst() {
 # This function calls the update_vim_helptags and update_vim_afterscripts
 # functions and eventually removes a bunch of empty directories.
 vim-plugin_pkg_postrm() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
-	update_vim_helptags		# from vim-doc
+	debug-print-function ${FUNCNAME} "${@}"
+
+	update_vim_helptags # from vim-doc
 	update_vim_afterscripts	# see below
 
 	# Remove empty dirs; this allows
@@ -82,25 +147,26 @@ vim-plugin_pkg_postrm() {
 }
 
 # @FUNCTION: update_vim_afterscripts
+# @USAGE:
 # @DESCRIPTION:
 # Creates scripts in /usr/share/vim/vimfiles/after/*
 # comprised of the snippets in /usr/share/vim/vimfiles/after/*/*.d
 update_vim_afterscripts() {
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EROOT="${ROOT}"
-	has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local d f afterdir="${EROOT}"/usr/share/vim/vimfiles/after
 
 	# Nothing to do if the dir isn't there
-	[ -d "${afterdir}" ] || return 0
+	[[ -d "${afterdir}" ]] || return 0
 
-	einfo "Updating scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
+	einfo "Updating scripts in ${afterdir}"
 	find "${afterdir}" -type d -name \*.vim.d | while read d; do
 		echo '" Generated by update_vim_afterscripts' > "${d%.d}" || die
 		find "${d}" -name \*.vim -type f -maxdepth 1 -print0 | sort -z | \
 			xargs -0 cat >> "${d%.d}" || die "update_vim_afterscripts failed"
 	done
 
-	einfo "Removing dead scripts in ${EPREFIX}/usr/share/vim/vimfiles/after"
+	einfo "Removing dead scripts in ${afterdir}"
 	find "${afterdir}" -type f -name \*.vim | \
 	while read f; do
 		[[ "$(head -n 1 ${f})" == '" Generated by update_vim_afterscripts' ]] \
@@ -115,6 +181,7 @@ update_vim_afterscripts() {
 }
 
 # @FUNCTION: display_vim_plugin_help
+# @USAGE:
 # @DESCRIPTION:
 # Displays a message with the plugin's help file if one is available. Uses the
 # VIM_PLUGIN_HELPFILES env var. If multiple help files are available, they
@@ -124,6 +191,8 @@ update_vim_afterscripts() {
 # extra message regarding enabling filetype plugins is displayed if
 # VIM_PLUGIN_MESSAGES includes the word "filetype".
 display_vim_plugin_help() {
+	debug-print-function ${FUNCNAME} "${@}"
+
 	local h
 
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
@@ -160,3 +229,14 @@ display_vim_plugin_help() {
 		fi
 	fi
 }
+
+_VIM_PLUGIN_ECLASS=1
+fi
+
+EXPORT_FUNCTIONS src_install pkg_postinst pkg_postrm
+
+# src_prepare is only exported in EAPI >= 8
+case ${EAPI} in
+	6|7) ;;
+	*) EXPORT_FUNCTIONS src_prepare ;;
+esac
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 94509d4f2dc1..3a454dff74a9 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 197286bef6ae..8ea7c9657979 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,4 +1,6 @@
 DIST polymc-1.3.0.tar.gz 5115480 BLAKE2B ac818b899d25f1545ceafd109a8eb48acd6a2d4b09b8d7f5365de0fc1b6ce0171ed053bc19785192ab781a2d7f506167599e3f3747e94fe1cf62b9989208e685 SHA512 b33660dfc7026f1153aaffd4429b9047bffa9cc80a3231bb19c0f3a7d4046654c49f278d9c07ae3ac631172ed147fa06065c2713fb59221ff9131406d8c6df46
+DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
 EBUILD polymc-1.3.0.ebuild 2231 BLAKE2B affec76bd125b6ae43e26e2084d9c3152c93a2239d6804652d0ee70b34065b58e7a900a2519939b2700ac1f7c8dba4479d8cd009e6041069244154087bf49386 SHA512 ad1c7fdf5db8f066420579b2221921db503f17277eaed3c0b8f3086a977847b7b07b18bcd2402298a68203574d71f39cd639f1c792455cb6371a4c93419430a7
+EBUILD polymc-1.3.1.ebuild 2231 BLAKE2B affec76bd125b6ae43e26e2084d9c3152c93a2239d6804652d0ee70b34065b58e7a900a2519939b2700ac1f7c8dba4479d8cd009e6041069244154087bf49386 SHA512 ad1c7fdf5db8f066420579b2221921db503f17277eaed3c0b8f3086a977847b7b07b18bcd2402298a68203574d71f39cd639f1c792455cb6371a4c93419430a7
 EBUILD polymc-9999.ebuild 2231 BLAKE2B affec76bd125b6ae43e26e2084d9c3152c93a2239d6804652d0ee70b34065b58e7a900a2519939b2700ac1f7c8dba4479d8cd009e6041069244154087bf49386 SHA512 ad1c7fdf5db8f066420579b2221921db503f17277eaed3c0b8f3086a977847b7b07b18bcd2402298a68203574d71f39cd639f1c792455cb6371a4c93419430a7
 MISC metadata.xml 1088 BLAKE2B 5a9d980fb174d942db61bacb4e5b7d65b59f2ecbc91e4e4a5b15b91fc1abb1d6ab9e8acd3a9db6e526df1321e25120ba89f0802f859daae86a2269542b51db3a SHA512 1c2657370e99a198fc2dea81e9829509e0a49a0a87230cf51b6c695ea1f46a85c0a9a4c001c793b733eef2134db8966ba54d6188e4241095a330604dccc91f4b
diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild
new file mode 100644
index 000000000000..abe73ed34f30
--- /dev/null
+++ b/games-action/polymc/polymc-1.3.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="
+		https://github.com/PolyMC/PolyMC
+		https://github.com/PolyMC/libnbtplusplus
+	"
+
+	EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+	MY_PN="PolyMC"
+
+	# Let's use the vendored tarball to avoid dealing with the submodules directly
+	SRC_URI="
+		https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+	"
+
+	# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto"
+REQUIRED_USE="
+	lto? ( !debug )
+"
+
+MIN_QT="5.12.0"
+
+QT_DEPS="
+	>=dev-qt/qtconcurrent-${MIN_QT}:5
+	>=dev-qt/qtcore-${MIN_QT}:5
+	>=dev-qt/qtgui-${MIN_QT}:5
+	>=dev-qt/qtnetwork-${MIN_QT}:5
+	>=dev-qt/qttest-${MIN_QT}:5
+	>=dev-qt/qtwidgets-${MIN_QT}:5
+	>=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+	${QT_DEPS}
+	>=dev-libs/quazip-1.3:=
+	sys-libs/zlib
+"
+
+DEPEND="
+	${COMMON_DEPENDS}
+	media-libs/libglvnd
+	>=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+	${COMMON_DEPENDS}
+	>=virtual/jre-1.8.0:*
+	virtual/opengl
+"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		# Resulting binary is named polymc
+		-DLauncher_APP_BINARY_NAME="${PN}"
+
+		-DENABLE_LTO=$(usex lto)
+	)
+
+	if use debug; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
+	cmake_src_configure
+}
+
+src_compile(){
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# https://github.com/PolyMC/PolyMC/issues/227
+	optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index ae2dd5ded648..588061e87404 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
index 39e3e7744dff..610fac1767cf 100644
--- a/games-board/gnome-chess/Manifest
+++ b/games-board/gnome-chess/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-chess-41.1.tar.xz 615936 BLAKE2B 40a6f576fadd74777599192d7493f3a16abac45fc1a29c9a4e5cf1ec4d432e18910381bb26f9700b4585e1e395601d0b6a72b316139cfe74ecb6e33c9c4f001d SHA512 71d9b51599699c24d505eb4f120d99509c5e69c00d6aba1768029f9adf8ba70be6e40d001928f141a92852fb318d9f9b2ecb01b6bcbfecaf1408b89792b25224
 DIST gnome-chess-42.0.tar.xz 661180 BLAKE2B e9fe75df1b298aad17b8b199949cb02eeea5116fa15adfedfac6ed067123ff73aad8ebb33e512f1eef97237232275528da6454de27c335a897e5e3b942a335bf SHA512 08af368b6fd032976c124a8fa8402494e73b004591eae331523a377acf72d98b9827ed189db1c1287f758f41614e878062bd1ab0b8323bf76d19b9cdedacf9a6
 EBUILD gnome-chess-41.1.ebuild 1085 BLAKE2B c6161ee900c70daf7420066fdafc9e31f3b994942ce4803f223a78c5a24a4a166fb0646ffcc56efb73f65429b7c547d72fc59622797037e6cf48fad531e74e76 SHA512 4d6bcb0b906bd33e328e110fa0325d3409cbf794bcce1c6e1dabbb5e8d4f3acff6b80d49922b29ed1e053f116caf800543f8d62acffc4d245b7051f2a316530e
-EBUILD gnome-chess-42.0.ebuild 1128 BLAKE2B 9ab585e87ba294c412e98414cdeda435a6f39d25ecb5dd066ca0922d37177d4604d882f6b8c8923b5a0dc868e2f179debffbbd5dc983a0156954ab3474dbed0d SHA512 879a6eaf969bceae9d80a452d7052404d7869508ef2249855ca02bf56236ca7abcf780232a95d8e98b7caf605e28cefcab49ed9e70815bd3f4ad1e75757dbeb7
+EBUILD gnome-chess-42.0.ebuild 1125 BLAKE2B 765c5a536ddc2110b0335ac23f43d7320dd2a5f3719073c1c753e7d7b7a2191528ca7e112956bb26ea78281712dd17d14a00879d85d0e2dad479c90bcd18e14e SHA512 3d411e86b3f45666e25273b6f8662e79feba86953ab927b660a077964cbe18fa4e5ff20716a8620e2866b52357d7b8c59f0dc4f670727acd721164d31a4ca754
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/gnome-chess/gnome-chess-42.0.ebuild b/games-board/gnome-chess/gnome-chess-42.0.ebuild
index 8dbb32678806..ec9dc4fc0a92 100644
--- a/games-board/gnome-chess/gnome-chess-42.0.ebuild
+++ b/games-board/gnome-chess/gnome-chess-42.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
index 2a444bcc3d25..dc616706ed6e 100644
--- a/games-board/tali/Manifest
+++ b/games-board/tali/Manifest
@@ -3,5 +3,5 @@ DIST tali-40.6.tar.xz 1684968 BLAKE2B 10fb4633d078cce20b29dca084555c7cb6d7eb98e9
 DIST tali-40.7.tar.xz 1684740 BLAKE2B ee913a4b0420b7751f26ecdb9805d74811330effb0e3d5e8fa6a4005a5ac410274120ac9c78ec240f062a094c603184c8a237d97b744641d3550db9b2a5a5ea9 SHA512 fc9a13b2d8b37fa5726d99f7ca8bde35b23cd210391d6f4309a0b952d28adc09c3566eb5c88d0dd30b39abbb4abe05ba2f441bad6a8598abfcb1189a3d87cce4
 EBUILD tali-40.5.ebuild 751 BLAKE2B f11542ab73406455b64a434c2eb3496f26a84a482c7d2260bb755b5d657341dc41bcc4f939a2def43c30bb89ecf5588ce69feb96eb20b5606bbfe820e70650e7 SHA512 7006f1ee4820eca2f000819bfec4dc9e59c8791d2e1e9d3d200fbb5470e532b2000a68ce51016352f102ca49891daade2acd95df8a1253b0529018d21608a258
 EBUILD tali-40.6.ebuild 754 BLAKE2B c7d8dd6c586985418f220c072fc1c4d217e63a28b63eec264ba95d6109ffb3841b911b61db2f601e295e851f925b7036e54be9fa3b6e339cd801f866cc312c04 SHA512 4cb4130ed904b821fc8eb1b3e8a1d9c124867cfbe673b550de53dfc16229f87c1e5b547b2a839a3924ced79b81f9aece75e45920964f780bba60c477e9670305
-EBUILD tali-40.7.ebuild 790 BLAKE2B eca1d1cd19991263bf382bf46ce1fc97e1c8d8974b921502bf3e4b56f5e40dd259fe99ff6cbce3e6cea7dc1a78264dbc3f4e28deef49c2899f1cdeb9276d325b SHA512 ad74086a48c812c69bf408b4ac03a3aa52bdcb004ca53840129fd33fcae3aea4097fa409ac47b19284f6f2146feb2b69d40f427f1c3668a92cef96326d8a5028
+EBUILD tali-40.7.ebuild 787 BLAKE2B cd3047fa1b615eea50e1e8c2379da490747462bf629a0c0cb6fc8d0763b35136c892048f67dae6a959c52f548ac94ef603da7ce9f7c67867c75e3db602480738 SHA512 db26ccf5f40047efed3bb5cc61b1f5493217444ddf6caba0df4569aac906c33967391918b02a1fef6fda66b3fdf2917d61f40acd5be82693f41b5e19cccffb41
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-board/tali/tali-40.7.ebuild b/games-board/tali/tali-40.7.ebuild
index 569675438474..f4da8469f4db 100644
--- a/games-board/tali/tali-40.7.ebuild
+++ b/games-board/tali/tali-40.7.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali https://gitlab.gnome.org/GNOME/tali"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 DEPEND="
 	dev-libs/glib:2
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 266cb8d71a19..27e3dfb6e172 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
index 22060dacdf86..478fccc0e448 100644
--- a/games-emulation/atari800/Manifest
+++ b/games-emulation/atari800/Manifest
@@ -2,6 +2,8 @@ AUX atari800-3.1.0-tgetent-detection.patch 671 BLAKE2B 53a2e53316957849c9d5e2bb7
 AUX atari800-4.2.0-bashisms.patch 1582 BLAKE2B deb25311acf1ace15168d0af4e010bd94bb9a675a8f78df3a2490a0cb9e9cb65418640080111dfee5bb3737bc2ade75dc007a4f3c9bbf48221f241c8682c975b SHA512 c48f853d078b15ba10c9b20a56e349f8705840d9da5ee04bf6d1d6b6ca1c9068b50467729a3e63672304246f1f20958c8e8bef4ec7d83c0c91b750b67656991c
 AUX atari800-4.2.0.cfg 682 BLAKE2B 78df9048da4010676e9b0b60705ccc4722e7b81602585c3040f846088a7acd6a04133b3cde163f01b0096997eb6182d96d3782e04d8611ba8dc0f81c1e67abdd SHA512 357eb14d270297a90b52d33da98958e434847b84a00896b0cf93257955cab1fb4a214ac0a2a081a8773def9e99a95c6a6ad127b3dd4e7ed9fcbdec57b66d6fad
 DIST atari800-4.2.0-src.tgz 7047710 BLAKE2B eac4b2da03d2ff5ec9e18dda41e0345975ed16c1cee23d15d2633211b7d4835b7a26c79fbf1672bb9ce3b82d52c7273e717371a0065ba29807f76d823eeb9855 SHA512 1236a8e05bf878e4514ae8e9f1556e0961a7f11ff0333eef415af455d217f712d5c6ededdd343dff6ba1aab777e19997bf9ecb859408187d69fc141301ecba31
+DIST atari800-5.0.0-src.tgz 1847596 BLAKE2B 315afa4fc8d88c2267c3da04f50a541a871f2d9d0867030b30e8f5d22b421f73f89de85ea1c7d6bc41202304de43d482f5d0fd9a081b4e493b3bba1363ce1e71 SHA512 2469561cdfe185ad26fd0fff8d589c528ca267e0195dab58a0fe739674f7445b53c21070f6bcb838c1d776b9803b1e2874ecf58a36b2d6df04bd9eb38855bfac
 DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
 EBUILD atari800-4.2.0-r1.ebuild 1502 BLAKE2B e880601e15c1581698677ec856581bed8a3509b14d9fe007f9e64ca487265eb537fb9662e2a5687aa76036d2fa670c3bf2d6bdf49dd3385f290f53235b3cde58 SHA512 de527a7266603ff75a7f41511915110d14b83533056045d863d0401112886239a3d5db5436ee9342ad8d359fd8198e4945022f7dbaf184d334a8df6575add5ac
-MISC metadata.xml 1135 BLAKE2B a4d83f853b08f2aedd00234eaba300788f775c560a32121edf2abb050a5a6025e74551b6be2985aeb9fca08ab0dc2de45220efc9a3ee410d81ad0e25fab03c24 SHA512 0f93d4cb3db5b3b03dc86f03266edead9cecb65b446fa45d17e402c99c4f4adebfcc4e6973737c85585062398882f8f627a6ad2f0d34006ccaf92289198e8915
+EBUILD atari800-5.0.0.ebuild 1521 BLAKE2B 7a5a9e29f5eef6d5f6bdeee17f3118c063fe7d3b62e552bb168a145e3740b8be45ad64bcae711b022744b88612de2d22a8001848819f46c74cc9b220c857126b SHA512 d16ae73013a8effc849b3ac256100c1aa744877e0545d08a1f5bf825122c59452cb864e77ca0f05018c906a1992601141baccf89440a533051224c8dd8da815a
+MISC metadata.xml 1227 BLAKE2B fa307ac2eff2aab0a1d9225bd5b263fa5844967ce541ec96dd0a54b64a5c496938b58627cbe83d75e3b62ac7d3302155ce94fc1dede2a9ecdbc7e8d39bab016b SHA512 012fbb9b4131002f94067a7c43c457f74a101d7f4ee139baa00a665924037888d0579079e58121af518d327060545511467f4e9c4f01edd32233d547d01e830e
diff --git a/games-emulation/atari800/atari800-5.0.0.ebuild b/games-emulation/atari800/atari800-5.0.0.ebuild
new file mode 100644
index 000000000000..8ad5a7e21a69
--- /dev/null
+++ b/games-emulation/atari800/atari800-5.0.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop
+
+DESCRIPTION="Atari 800 emulator"
+HOMEPAGE="https://atari800.github.io/"
+SRC_URI="
+	https://github.com/atari800/atari800/releases/download/ATARI800_${PV//./_}/${P}-src.tgz
+	https://sourceforge.net/projects/${PN}/files/ROM/Original%20XL%20ROM/xf25.zip"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="encode-mp3 opengl readline +sdl +sound"
+REQUIRED_USE="
+	encode-mp3? ( sound )
+	opengl? ( sdl )
+"
+
+DEPEND="
+	encode-mp3? (
+		media-sound/lame
+	)
+	sdl? (
+		>=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video]
+	)
+	!sdl? (
+		sys-libs/ncurses:=
+	)
+	readline? (
+		sys-libs/readline:=
+		sys-libs/ncurses:=
+	)
+	media-libs/libpng:=
+	sys-libs/zlib
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+src_prepare() {
+	local PATCHES=(
+		# Bug 544608
+		"${FILESDIR}"/atari800-3.1.0-tgetent-detection.patch
+	)
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local video=ncurses
+	local sound=no
+
+	if use sdl; then
+		video=sdl
+		use sound && sound=sdl
+	elif use sound; then
+		sound=oss
+	fi
+
+	local myconf=(
+		$(use_with opengl)
+		$(use_with readline)
+		$(use_with encode-mp3 mp3)
+		--with-video=${video}
+		--with-sound=${sound}
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	insinto "/usr/share/${PN}"
+	doins "${WORKDIR}/"*.ROM
+	insinto /etc
+	newins "${FILESDIR}"/atari800-4.2.0.cfg atari800.cfg
+	newicon data/atari2.svg ${PN}.svg
+	make_desktop_entry ${PN} "Atari 800 emulator"
+}
diff --git a/games-emulation/atari800/metadata.xml b/games-emulation/atari800/metadata.xml
index 93a5cf72aa74..70220fb60e13 100644
--- a/games-emulation/atari800/metadata.xml
+++ b/games-emulation/atari800/metadata.xml
@@ -26,9 +26,12 @@ ways :
     * SDL (many different platforms and systems)
     * WinCE
     * MacOS X
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">atari800</remote-id>
     <remote-id type="github">atari800/atari800</remote-id>
   </upstream>
+  <use>
+    <flag name="encode-mp3">Support recording sound in MP3 format</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 30073f9139cf..cb5daa45279d 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 5656629539fe..6cfa0c0f24ea 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -9,5 +9,5 @@ DIST bsd-games-3.1.tar.gz 267636 BLAKE2B 116b340e383430fc56e9d2379a398494b43664a
 DIST bsdgames_2.17-28.debian.tar.xz 58464 BLAKE2B 3f5a70322341b153a8b3cb8df81fea1e773971d0f3b79ba8fb0c0877e95c61c8e8689952333f8ac4263948d781c2dc64c8178f9dac6a1c09ae702f91794b9583 SHA512 7e2db9f830c0657f3fcd1371635bda4a87e7a68180e486e44752904740c0710c02271522ff2d4b606542b3c502dd28795fcecf883360c3ac5bea78c148281f6a
 DIST bsdgames_2.17.orig.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
 EBUILD bsd-games-2.17_p28-r2.ebuild 4692 BLAKE2B 870cb4508d184ede3772dbe890fc146ef0c92d84f7e5db563f52b8087b5caac4c0b0dbf91e6fcc1d910e921624000aad06b3080f5c8026d628d15985cba971f1 SHA512 23d1e06cb44a363e2865563d40b795383e4e824c63e861cd0ac0361c4a0f4f125c3122d2ec1e76dc50bc524b735b8bbfde8f49fae4a37476bcfd70f6af2114d5
-EBUILD bsd-games-3.1-r2.ebuild 4525 BLAKE2B 6b69f897c94e8a438bd32587f0a96ba63c698a3ffa3294524c99141af065c716a08360142bc87dcbd38acb224ec3d1a84492d8340fe4a259e51bc6a787631153 SHA512 f1eeecdd34d5352bff0bb797ff93757b836bd9b666b5d96b18fe96f7a2a2d49e1edffe93de08b570edaa8388d5e8ebd8ccbc9b531e67586276e1a67e15c08206
+EBUILD bsd-games-3.1-r2.ebuild 4652 BLAKE2B 0b357d75201f6d4e98ce52bb0109d9db2106a1e2827acf62282e9b41e531c299cfab9123f44e8b5dd4f72a39264af2dd1b6daf8089b9d2064d6e3ecc43fc5c90 SHA512 728ddd789aeebb398e3f6f3b155aea47d68a4b00d43b15616482a4ecb811379936be625863990ec8b4bd7f0d99ebdf9e80bd4c185f46a999f7d5fbe1783c7d75
 MISC metadata.xml 327 BLAKE2B 89325403c47583b762175ec639c9183287ba2c38b14238a38536ab2084412efadb28bd89d0bee8fcada3b55f8691a096965f8fff0add08f157d4a2d723206045 SHA512 710f729c47be0e809ba982ed6d1845b8ccc374705e60ca7a85145d439e130496c7cd9ebcbe70fc0d4770bad5b420f815eb57cae25734d399bd93c38d61fd9352
diff --git a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
index 748268ebe63e..f59c5b239dfb 100644
--- a/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-3.1-r2.ebuild
@@ -14,7 +14,7 @@ LICENSE="BSD"
 # Subslot indicates the fork / new version
 # 3 doesn't include the same games as the classic variant, etc
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~riscv ~x86"
 
 # 'check' target doesn't exist, nor do any actual tests
 # bug #779649
@@ -67,6 +67,9 @@ src_prepare() {
 	echo bsd_games_cfg_usrlibdir=\"$(get_libdir)\" >> ./config.params || die
 	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
 	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
+	if use riscv; then
+		sed -i 's/${CC} ${ldflags} -o $@ $^/${CC} ${ldflags} -o $@ $^ -latomic/' ./*/Module.mk || die
+	fi
 }
 
 src_configure() {
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index f080b0b19f4b..a46fd602643d 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
index ef80b7c37d5f..73a2a9ab2ba1 100644
--- a/games-puzzle/five-or-more/Manifest
+++ b/games-puzzle/five-or-more/Manifest
@@ -1,5 +1,5 @@
 DIST five-or-more-3.32.2.tar.xz 1238468 BLAKE2B 8d223df7933cc84751c173617540a3b725342e84669be22a865a6751be19671fbe269ddc00e4c3a32d78ce3313c71d3c7e1930beae7d1561f6b90a6f9cdc73b8 SHA512 bbca7ebca45eb0975a57accbd6d3648f3fa5ab6abfaaede04e038b7ea793b44a2e125dbfe65d3f53863e62fed36eb28bbd9180e8975c4988e0fc919a8708e4c3
 DIST five-or-more-3.32.3.tar.xz 1245012 BLAKE2B 8891c32fd00840ed8b27e013d38f1e2da12f3735b9e4ec3eecbb7931d4b5c54d28aa86ce0217830d71797e6ef2a8ab3198e2887dd3a69f7f8d6cf9bdac58b4ce SHA512 7fee18955e25fc2f679689ad4df208e5d4fb7250db4fd3c9d0c8f3b62ef8edf4ed402f45871a45a312637e02eb856854ecc9af33454ed9ffcba54bf742f94fb5
 EBUILD five-or-more-3.32.2-r1.ebuild 875 BLAKE2B 9708268e5f360b4f7f64d0d1be95e0152a61d44ef479c6013c632009872016513858172fa0a5e7ebb6124a8ecc1935098ca508cb40cd9b043decf86fcd6df3c1 SHA512 1205ad0cd4362b7ad1971d3b998ac96ce5502d9c63fc1f1fd4d7273038864b2d2f386de926d793815bd9f40bfb004e3a57223f8e2b6681c86cdc0276d71cb23b
-EBUILD five-or-more-3.32.3.ebuild 879 BLAKE2B f7f8dd4b05c90094d7385d097eeef582babba5ffc6ebf6c945c6fb41208afeef9ee1683b2914d763785fa65377c44b5e439b7ce0d4f6c270a2774f3a7a22da7e SHA512 7dbfe305b6db08921a8b4132585126642949be208adf120e341be3a51c85454092d4da567b3b8da86b0ea4d61a571d2807b90f78f8625d215cacf9cf99ccb514
+EBUILD five-or-more-3.32.3.ebuild 876 BLAKE2B a69a30bcdea0222d043444e6367c977bd63fb6110a489d06b6151e67a176991e553c4e1745751bf95ecbe6c3d371cb792acd1e36c1624a0cae4654c8f7c9936c SHA512 98a30108a9be0f00f57123ab82cd92920874476f4e2a0a62719fab291a16425f3e42180e5c4ce84ccd5222b801ea44e7dcf9404f20bb4d42e4471078a5aff532
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild b/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
index 28d9381e54e6..4bc29c0e31a5 100644
--- a/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/libgee:0.8=
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
index e42efbc876e7..ad8043e2d80f 100644
--- a/games-puzzle/gnome-sudoku/Manifest
+++ b/games-puzzle/gnome-sudoku/Manifest
@@ -2,5 +2,5 @@ AUX 40.2-fix-build-with-meson-0.61.1.patch 1315 BLAKE2B 2541cf70b42a9a5672f229c4
 DIST gnome-sudoku-40.2.tar.xz 358260 BLAKE2B cf48bedee61ee808820a6e7ac3a368f215d6f0370edc83f06d62a3a28c79fb6c024411f9acace3db547a246f721e47c8c8c4ef63c7b07517c587f2b3b1de114b SHA512 5baaba3bba714eb90c9d1597f83c310c9ef59693d5372b3871afd34b2f1c48a3257cb61f220d3cdf624cb29ad80015e0f5ec88485020b7e351540c69374131fa
 DIST gnome-sudoku-42.0.tar.xz 380836 BLAKE2B d496724ab20699e4cd372db02f3a71147d58e77ec8121576f889648cf084e5d87b34c639d0db6c623c9fd04c1111f421b8c350ee227f836eb657be1f99fa5734 SHA512 01f6dfdfe99a4acb4b664fd3573c64b154eea2b8b9964dd08448aa994d1ed6dbe7060157a496c3f895a049a4f267b9b5f9cfdf30b28656b6b2e63b7655d5a7b9
 EBUILD gnome-sudoku-40.2.ebuild 1048 BLAKE2B 6a529fd68a2a041283e9a0aaeae84d151a6a88639d9551f13ddd4e6fa5f32dc58dedf052ce86493bd67162d45cc03a32dc3ec97916849e5dc9cfedd3df7b3be1 SHA512 7e4fe7993ef6b735f88be82808c2461a2eb1cc0a5dcdba54f8f298b667a3bb0a12f77485220d47a7da05bb97346773f495a0e807124f353cdc8aa40251bb6079
-EBUILD gnome-sudoku-42.0.ebuild 992 BLAKE2B 1c942e610afcaf813f66adca1ffdc490a4cd60a00633fa725b4c7d73227e5e27b3898683e66f37771a69a11c50f4f6acf357935350a7d76d56f451c422115b63 SHA512 659b00fa369d663389ed890e19944c9351b3a105c906966681eaf99fca88f1cf8a065aee4edd28b483673c17071b8826234e8c5b6468326dc040da5189e072f3
+EBUILD gnome-sudoku-42.0.ebuild 989 BLAKE2B e6b15c7c18a17728948b0e505b57de6a4ce45f257678f4f48ce096d6c7be22320387c038f7588bc474f6d81d22a9512d8aae98b97df5075c4396dda8bfef67d7 SHA512 b9dcb5c8bd0db13137dd19bb7e9fbf42dc1203032c28994849d9b1052bb170e651d40b4a01b7f7d3c657b17104c305efe60283f9c13a1fbe0b38a9480f138754
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
index f81c261a52f9..bf28d369fd3f 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
 
 LICENSE="GPL-3+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40:2
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
index e712766e9e78..53a59340db7b 100644
--- a/games-puzzle/swell-foop/Manifest
+++ b/games-puzzle/swell-foop/Manifest
@@ -1,5 +1,5 @@
 DIST swell-foop-41.0.1.tar.xz 758800 BLAKE2B 5df8870f5be52a4dfec9c012a2496e9b727eb93d01480bedb1c836b8b399f9b42ff36b18c78dad7ca26dd9da6b143229064167423fba3d7630a86d5108e4f3d2 SHA512 b579616cddb77fb3e6d6a8b382fe4b9692a884d62b0907fd551048dbfe28d3f031ac9c8e43e2888ee408a51bccb026109cd9e9ac371b475eaffebb1d9c237c11
 DIST swell-foop-41.1.tar.xz 832672 BLAKE2B 97908acab3bc565f084d97b02f8a6200dc170bd1bdb87ebc4e027881aa75a5111e3ecd24594395266fdfdab586a328df9d15fa8d25105529ec571b36f4fa0e5f SHA512 811638d9b09d7aaa584e56def47900bc866b56ac59120a1df91130f7a6b9555befd18907647874fd69dfa0992cee1c6320dc2bc684b3e5f05f6a25a791ac0a60
 EBUILD swell-foop-41.0.1.ebuild 879 BLAKE2B 6ac74e2cf572fc2686f3e87158aad05f6cd629aaba056ee04358d4d5b5cf671323eab2e7e41ecc268be2678346ba2266d1d23677125bae87fca2b4e1135ad145 SHA512 988d03c5505fa6afd877c2082d2c4d6192adf6571e53c2f76fecb6642b01eed60a870a95f869e264fb393319c5812f771a0995b05d52d56be2783763d3dce129
-EBUILD swell-foop-41.1.ebuild 891 BLAKE2B e3c750771f97003af31d028a3b1ddd00c95efb918e341d073fe7c843dc0825b119a7706eec6f9d1419714db688b423b70a8df16a918996e27b3802aa471f3d3a SHA512 670fd3df3cd02a2fe5c0fad8e203709c553621c13c2b8f21bc628251717fe9f711f4b9788c5362eec07d0897d49ccd33badabe28b08a7407f4024953b624e4a6
+EBUILD swell-foop-41.1.ebuild 888 BLAKE2B 4d1c2fed71074896d7db5c0cf9e143b59f6d571668cb22c2ac1152c661c8777ba2cf9b6e5bffe6385e1c9fb69c3cc567ef6bef0b65cb114dc1ff6be0e681e659 SHA512 1407aa203786b9c95ff52f9dc59b5cc3010f095780cf1594f3fa3fb24c457aefcd017fa97c1a43fed5f0abe4376a9a50b7c45a643ee96166004f41b351e70445
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/swell-foop/swell-foop-41.1.ebuild b/games-puzzle/swell-foop/swell-foop-41.1.ebuild
index dbf29c588e84..fc8f99fa3be5 100644
--- a/games-puzzle/swell-foop/swell-foop-41.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-41.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.36:2
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 003800fffb95..270aa1875dac 100644
Binary files a/games-simulation/Manifest.gz and b/games-simulation/Manifest.gz differ
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index b2d8b7734c24..cb5011cfacbd 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -1,19 +1,12 @@
 AUX README.gentoo 715 BLAKE2B c7e27f799a33a73dccd75bf2f28882bda609b3ba74fc98ca1b1fcdcbb91290a81a878d10fa1b9b15f0ebebe9ef496a7ac7b8fdfd3a455ca3ebad3dd3df908035 SHA512 c18d5b5950523e2abedd0f9218e71c1f7222615d34eb56c24c69f7dea446e17248086525603d1da63302db6e8c5b642086eb8b154fd531c26db611b9f799d4d8
-AUX openrct2-0.2.4-include-additional-paths.patch 1583 BLAKE2B b21e59cfaa37b211501846e2afb14d9d6617c713e487ffd3ef079c8f75b3113252fbc401da25b53ff6498f01b66bd4e9c1b30c51483b4c32c4ae1b338885966c SHA512 945f00ea986ebcfcaa536a5abf1cab608c96fa211bb839e9d577e969b842eb757307b501740c6015623eb10604f7aa6f7e5c736669cbc46676abe1434296e8ae
 AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151fa7613ed4aef76257b3d8d47bdc48d4e13314115ed5eb9e713a09213ca5c43906f13ce7929ef6795a5ab53a0c75000e3b SHA512 0d955664b28e68e39134438034c0559ee56a98fa7cd16dc5b90a1290f59defe700f4653ad053b4ca403f13f35cb822c0b063a0ff3777996c6049cd686a9a724f
-AUX openrct2-0.3.5.1-ccache.patch 2459 BLAKE2B 9068bfa1444a71ce76423894ef7b0f615e8b21ace75231a7daa8febcb2e807342302d312b7bc923fcda342845d34bc4d10fe55264fe376db79d7f869cccc6e66 SHA512 821568cddd703eae871541a30aef3586bbd83d6cde722070d99d395c5fb1eaee96e8e79533ebff53ce8490468fc4ca0baab5def998fc5c7c475c87ed4478ccf4
 AUX openrct2-0.4.0-include-additional-paths.patch 928 BLAKE2B 0af967acd22b8f11b15bfcb433b1c586dab100839bba49867c374669e27f9677c82f16c727b939dec28e95fbb42278b9661935aac3cc23fe6b8ad8b64901a029 SHA512 6f2359f8fbf1fc915909fe404300e016d4f8d55f3b0f59dbdbf10e6376c38c412de23394c2138fb56666be059221c60a8b488a6965f1b6be19e834a6fc624b53
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
-DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84
 DIST openrct2-0.4.0.tar.gz 15179718 BLAKE2B 7ff0b3532d7d8bf4e325f5b3bea602d19b884346f4ab98ba9533cad5cbd9d7f79d20c7faf52e8c5cc68e140aae52710d00c87d551d097ccb448610c7d0ff69d3 SHA512 b1edf0b8c2987ad2c7fb7f69bb7402ac2a7b783f0a49831a20e8ff8cfc28e84d3e4bc265c986079d58ee430fb1fe6593cde04859cbba8e7aaf1d890091a478d0
-DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
 DIST openrct2-objects-1.2.7.zip 3424846 BLAKE2B 3c66bf448fb6ac130d4c5690e3f1a510a65d3058630b427bbc19d067e3ca7f9668b44864c3fa6fb8153d573a72f23c254d15700c97dfa0ecbe76be15f8198fb6 SHA512 b94027944e8e82dc0ecd9f330c5cb707f07547a3d787e5a8251bba7c7528a5a15fc034e251dfe70ade397b1aa990c148aa7ccdf2f7e8964db36f143b38f1a4f5
-DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
 DIST openrct2-replays-0.0.67.zip 1479146 BLAKE2B 78e2872013e20ce389dd24d70aeeeb2fe3822dbc3bb6059308ad0f2014d0550fe26f85b7dbce7ed8373235e688e5a8e2817b16231a751871d22301d9e3d1ecf7 SHA512 41745238b61128777ae4fee1ecb7e9284d84d9b420d653b5371d1349bd00473a98beeaa41688903081390ad38b693cd5e54d230bfc2c255beabbef93ec326f69
-DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 DIST openrct2-title-sequences-0.4.0.zip 7945853 BLAKE2B 51f07af30c3702754d806829fe612891a883adc70b8e89f64094b28c94879e5c98feca69f3c1f389ceeb33a99175b41afa794a4f2d121280dcce97c428d2ea99 SHA512 fcfabb02fb7cb9dda7f73f8a24fb426e23b1ea4c417deacd7147e4d2e8942223e0cf9d9cc6ae371f7508e8d3b1f3161e05677a301a330ae265b6610e1c5da487
-EBUILD openrct2-0.3.5.1-r1.ebuild 3968 BLAKE2B e489d7be25d664fd73efdb62e3551cb3eb537545ec8f4f83b1ca06f073872bfc56ff343e08725a33a8fa5ef4918daf40dc3710c04e0fb4ac57d9e54a07721158 SHA512 951b457cde394a64c7cacb05b854312855a6b4b3ff06fb7c2777019a79c7b4f18b8b6de52da5eddc77e935ad13990189ea24c5a624e499a8c66dd38f5b7c6721
-EBUILD openrct2-0.4.0.ebuild 3926 BLAKE2B 0096a095c1e5b28ceef5f3cbc51102f51cac080d045c032dac059eb7c99e2a67f50b4c1f29b7f749ba468b2d8229566991f486285ce9446c6976300f0aa7fd64 SHA512 c3dbc24caadee03596c692723c8bac3507b6b48f13217061d202b107e2da75b01b3775171a64c7e1a3ec02892fe2fe247d68fcfb015d323fbf438f9f0c540c58
+EBUILD openrct2-0.4.0.ebuild 3924 BLAKE2B 4a8d315a3cf45b6d27e012bb4c138d74cd45fe2f168d424dc277ddfd8c9d359e40e947ca48c5d0c0518d692e6f309ac7f985770f7adc4d6dbed0fd5991ade044 SHA512 1ccd0bb98691b68a125c2ed7ef2aa88326e979d34f6d9e81f1b132bd45fde59172fe23546b640fa19c4bf65a7c455ac071b087e3025670492c43f13a8ab6b155
 EBUILD openrct2-9999.ebuild 3883 BLAKE2B 2685d376f7e1f4e7d3f9739fe7add5992ad1297c7fdead8db7d9918b0d4a0026c1456c2c2f568ac2cd1fb6516da860f1369a4333f0be4ebd20141733bbf84c0d SHA512 5378717cb97f736f745058b09e9ffc3fc857e4231a76f1af024ff80f60ca9ebd2f02ef11b0029023c0d31425e34e083f9e7a2a14e63d2acf048c7ac2ad1b4fc8
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch b/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
deleted file mode 100644
index d7c3bb7b4442..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.2.4-include-additional-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 370b6c6ee48dd1ccc68e03f4bba3e9a2cb2067aa Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Sat, 9 Nov 2019 22:32:03 +0100
-Subject: [PATCH] src/openrct2/config/Config.cpp: Search additional paths for
- rct data.
-
-With '/usr/share/openrct2/rct{1,2}_data' added into the search path list,
-it makes possible to install rct{1,2} game files globally,
-so every user on a linux system can run OpenRCT2 directly.
----
- src/openrct2/config/Config.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/openrct2/config/Config.cpp b/src/openrct2/config/Config.cpp
-index 08d59488eea..969533f8820 100644
---- a/src/openrct2/config/Config.cpp
-+++ b/src/openrct2/config/Config.cpp
-@@ -615,6 +615,7 @@ namespace Config
-         log_verbose("config_find_rct1_path(...)");
- 
-         static constexpr const utf8* searchLocations[] = {
-+            R"(/usr/share/openrct2/rct1_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon Deluxe)",
-             R"(C:\GOG Games\RollerCoaster Tycoon Deluxe)",
-@@ -659,6 +660,7 @@ namespace Config
-         log_verbose("config_find_rct2_path(...)");
- 
-         static constexpr const utf8* searchLocations[] = {
-+            R"(/usr/share/openrct2/rct2_data)",
-             R"(C:\Program Files\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\Program Files (x86)\Steam\steamapps\common\Rollercoaster Tycoon 2)",
-             R"(C:\GOG Games\RollerCoaster Tycoon 2 Triple Thrill Pack)",
diff --git a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch b/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
deleted file mode 100644
index 97a529c6a8e2..000000000000
--- a/games-simulation/openrct2/files/openrct2-0.3.5.1-ccache.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From cb6d7418c53e10bd4120891f6a2312d3ef839ca8 Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conikost@gentoo.org>
-Date: Sun, 12 Dec 2021 23:04:58 +0100
-Subject: [PATCH] CMakeLists.txt: update CCache handling (#16185)
-
-This PR updated slightly the handling of CCache. With the current
-implementation, when CCache is not being installed, CMake will complain,
-that OPENRCT2_USE_CCACHE is not set.
-
-This logic is slightly updated, so the option OPENRCT2_USE_CCACHE is always
-being available and when this option is enabled (default ON), it will
-search for CCache and warn, if it's not found.
-
-The idea behind is, as in Gentoo, we never let CCache be used by the
-package itself, instead, we enabled it globally. But this the old logic,
-on systems, which don't have CCache installed, it will complain about
-OPENRCT2_USE_CCACHE not being used, but we have to make sure, OpenRCT2
-will never use by itself CCache and this message will be gone..
-
-Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
----
- CMakeLists.txt | 23 +++++++++++++----------
- 1 file changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8d202cf5a9b8..566f3a8a9688 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,16 +8,19 @@ endif()
- # if it is available
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
- 
--find_package(CCache)
--
--if (CCache_FOUND)
--    option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
--    if (OPENRCT2_USE_CCACHE)
--        # Use e.g. "ccache clang++" instead of "clang++"
--        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
--        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
--    endif (OPENRCT2_USE_CCACHE)
--endif (CCache_FOUND)
-+option(OPENRCT2_USE_CCACHE "Use CCache to improve recompilation speed (optional)" ON)
-+
-+if (OPENRCT2_USE_CCACHE)
-+    find_package(CCache)
-+
-+    if (CCache_FOUND)
-+         # Use e.g. "ccache clang++" instead of "clang++"
-+         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCache_EXECUTABLE}")
-+         set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK    "${CCache_EXECUTABLE}")
-+    else()
-+        message("Usage of CCache was enabled, but CCache was not found, so CCache is not being enabled.")
-+    endif()
-+endif (OPENRCT2_USE_CCACHE)
- 
- if (APPLE)
-     execute_process(COMMAND /usr/bin/uname -m OUTPUT_VARIABLE SYSTEM_MACOS_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
diff --git a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
deleted file mode 100644
index e02fe6c1811b..000000000000
--- a/games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake readme.gentoo-r1 xdg-utils
-
-MY_PN="OpenRCT2"
-MY_PN_OBJ="objects"
-MY_PN_RPL="replays"
-MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.0.21"
-MY_PV_RPL="0.0.57"
-MY_PV_TS="0.1.2c"
-
-DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.org/"
-SRC_URI="
-	https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/${MY_PN}/${MY_PN_OBJ}/releases/download/v${MY_PV_OBJ}/${MY_PN_OBJ}.zip -> ${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}.zip
-	https://github.com/${MY_PN}/${MY_PN_TS}/releases/download/v${MY_PV_TS}/${MY_PN_TS}.zip -> ${PN}-${MY_PN_TS}-${MY_PV_TS}.zip
-	test? ( https://github.com/${MY_PN}/${MY_PN_RPL}/releases/download/v${MY_PV_RPL}/${MY_PN_RPL}.zip -> ${PN}-${MY_PN_RPL}-${MY_PV_RPL}.zip )
-"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="dedicated +lightfx +opengl scripting test +truetype"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/icu:=
-	dev-libs/jansson:=
-	dev-libs/libzip:=
-	media-libs/libpng:0=
-	net-misc/curl[ssl]
-	sys-libs/zlib
-	!dedicated? (
-		media-libs/libsdl2
-		media-libs/speexdsp
-		opengl? ( virtual/opengl )
-	)
-	dev-libs/openssl:0=
-	scripting? ( dev-lang/duktape:= )
-	truetype? (
-		media-libs/fontconfig:1.0
-		media-libs/freetype:2
-	)
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dedicated? (
-		acct-group/openrct2
-		acct-user/openrct2
-	)
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	dev-cpp/nlohmann_json
-	test? ( dev-cpp/gtest )
-"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.2.4-include-additional-paths.patch"
-	"${FILESDIR}/${PN}-0.2.6-gtest-1.10.patch"
-	"${FILESDIR}/${PN}-0.3.5.1-ccache.patch"
-)
-
-src_unpack() {
-	unpack "${P}".tar.gz
-
-	mkdir -p "${S}"/data/sequence || die
-	cd "${S}"/data/sequence || die
-	unpack "${PN}-${MY_PN_TS}-${MY_PV_TS}".zip
-
-	mkdir -p "${S}"/data/object || die
-	cd "${S}"/data/object || die
-	unpack "${PN}-${MY_PN_OBJ}-${MY_PV_OBJ}".zip
-
-	if use test; then
-		mkdir -p "${S}"/testdata/replays || die
-		cd "${S}"/testdata/replays || die
-		unpack "${PN}-${MY_PN_RPL}-${MY_PV_RPL}".zip
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Don't treat warnings as errors.
-	sed -e 's/-Werror//' -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Note: There is currently no support for Disord-RPC and Google Benchmark,
-	# as both packages do not exist in Gentoo, so support for them has been disabled.
-	local mycmakeargs=(
-		-DDISABLE_DISCORD_RPC=ON
-		-DDISABLE_GOOGLE_BENCHMARK=ON
-		-DDISABLE_GUI=$(usex dedicated)
-		-DDISABLE_HTTP=OFF
-		-DDISABLE_IPO=ON
-		-DDISABLE_NETWORK=OFF
-		$(usex !dedicated "-DDISABLE_OPENGL=$(usex !opengl)" "")
-		-DDISABLE_TTF=$(usex !truetype)
-		-DDOWNLOAD_OBJECTS=OFF
-		-DDOWNLOAD_REPLAYS=OFF
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DENABLE_LIGHTFX=$(usex lightfx)
-		-DENABLE_SCRIPTING=$(usex scripting)
-		-DOPENRCT2_USE_CCACHE=OFF
-		-DPORTABLE=OFF
-		-DSTATIC=OFF
-		$(usex test "-DSYSTEM_GTEST=ON" "")
-		-DWITH_TESTS=$(usex test)
-		-DUSE_MMAP=ON
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	# Since the tests need the OpenRCT2 data,
-	# we need to symlink them into the build directory,
-	# otherwise some tests will fail, as they don't find the OpenRCT2 data.
-	# It is currently not possible to override that path.
-	# See: https://github.com/OpenRCT2/OpenRCT2/issues/6473
-	ln -s "${S}"/data "${BUILD_DIR}" || die
-
-	cmake_src_test
-}
-
-src_install() {
-	use scripting && DOCS+=( "distribution/scripting.md" "distribution/openrct2.d.ts" )
-
-	cmake_src_install
-
-	if use dedicated; then
-		newinitd "${FILESDIR}"/openrct2.initd openrct2
-		newconfd "${FILESDIR}"/openrct2.confd openrct2
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-0.4.0.ebuild b/games-simulation/openrct2/openrct2-0.4.0.ebuild
index 4a5b89ba4216..00499e5a15c0 100644
--- a/games-simulation/openrct2/openrct2-0.4.0.ebuild
+++ b/games-simulation/openrct2/openrct2-0.4.0.ebuild
@@ -25,7 +25,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dedicated +lightfx +opengl scripting test +truetype"
 RESTRICT="!test? ( test )"
 
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index 00b683214025..ed4ff7f178f8 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/xpadneo/Manifest b/games-util/xpadneo/Manifest
index 60f2f1dd2ad8..e317c7038b5d 100644
--- a/games-util/xpadneo/Manifest
+++ b/games-util/xpadneo/Manifest
@@ -1,6 +1,8 @@
 DIST xpadneo-0.9.1.tar.gz 1353080 BLAKE2B fc2207e005cae629da50048330cbaa7d27183b0bbb083d35c3c144e91470273b8c7006c4b62d10b947dbe4fd003ca39623630923e477aa4eff3c243405d876bd SHA512 51063d104f165018b8430e26d2ab5a622c214efaaba3f7706cc99892b2054f57667b419672de5c2696189d389401b07024658c36a88343d980de9802789bcb10
 DIST xpadneo-0.9.2.tar.gz 1342249 BLAKE2B de8ed5314d84cb8d4b90c893938f36cc680617ace10eba5d1a86b5acb66747a9c9214896c8375136681c40b988501d9426e1b18eb4ff01d565219c2d7c10c37f SHA512 84470e37e9e44e84a85a91a0df1bca24e109cf2209ae1b131530539202d00242997f1f069989df79a6345387de62c4651c70c641b533deab8ad9a9246841d12d
+DIST xpadneo-0.9.3.tar.gz 1342315 BLAKE2B 040f16e949a301926cc8e4c38212a658ffbc52832e1cd310ce5ae8bc568e2fd0fadad630771812f8b7ff76eaf5ad0f7ea8f158673a834aa1bd4d9407674acea7 SHA512 dd95e4bdbead8c8d93eca7d574989261e12bce232c1845e9bf11b5acdf3b9e47d62afb90f5a4208c788cf02ccaa73e99dc505f35679631119ba014a1f7796562
 EBUILD xpadneo-0.9.1.ebuild 2473 BLAKE2B 1d49b48289fe22271ce39ee5a1fd451b34cd6086ac8f11713003e8b525c321c201058917c31b198a5799abcc3517aeb570977b21fa3016393b3c5cc13929939a SHA512 8fdd8aff6c636b537f562b1d880d5eed9bb8b657eac2b8ddf1b1b2daaf2bb19116ac5d3d8ef230b3ff8924672258d83d33b396897dc74f380076a66b87db965e
 EBUILD xpadneo-0.9.2.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
+EBUILD xpadneo-0.9.3.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
 EBUILD xpadneo-9999.ebuild 2303 BLAKE2B d2fb6917074519884902d2037c2d07259ef1e9c65199f0734c0265d29f432712157e1d2ec7e8aa97e005be8b7c7691d8015ef584111afa2a5f284135c6eae858 SHA512 f63983701cd920e01526a7f01d318dc0d66365b1d79628bcf9e3d88ca65d1d4de324b69e904f179e7d0107dd5a60302ef8168d2ad63bb29a94b5d6673d822552
 MISC metadata.xml 328 BLAKE2B 6511430d43b855d83d42dc94ea83bf20867568e9dbf642240ac279179d9f26d0a315f3fb90bebd4a564d4bc63beefcb8aa24af7acf25a60f9b25f732265de41b SHA512 defbfc601b6b61d10edf8947e2251f96416787a1141fccff1e017a6110eb4d8e8801fcd72cc678f816064eb5a5dc796c9c895ca9f74ad288f1338ccaaf3ee5c8
diff --git a/games-util/xpadneo/xpadneo-0.9.3.ebuild b/games-util/xpadneo/xpadneo-0.9.3.ebuild
new file mode 100644
index 000000000000..b193e5517951
--- /dev/null
+++ b/games-util/xpadneo/xpadneo-0.9.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# pkgcheck note: toolchain-funcs is not unused
+inherit linux-mod toolchain-funcs udev
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/atar-axis/xpadneo.git"
+	EGIT_MIN_CLONE_TYPE="single"
+else
+	SRC_URI="https://github.com/atar-axis/xpadneo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Advanced Linux Driver for Xbox One Wireless Controller"
+HOMEPAGE="https://atar-axis.github.io/xpadneo/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+S="${WORKDIR}/${P}/hid-${PN}"
+MODULE_NAMES="hid-${PN}(kernel/drivers/hid::src)"
+BUILD_PARAMS='V=1 LD="$(tc-getLD)" KERNEL_SOURCE_DIR="${KV_OUT_DIR}"'
+BUILD_TARGETS="modules"
+
+CONFIG_CHECK="INPUT_FF_MEMLESS"
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /etc/modprobe.d
+	doins etc-modprobe.d/${PN}.conf
+
+	udev_dorules etc-udev-rules.d/60-${PN}.rules
+
+	dodoc -r ../docs/{[^i]*.md,descriptors,reports} ../NEWS.md
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	udev_reload
+
+	local disable_ertm=/sys/module/bluetooth/parameters/disable_ertm
+	if kernel_is -ge 5 12; then
+		if [[ $(<${disable_ertm}) == Y ]]; then
+			elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is disabled."
+			elog "This is no longer recommended with kernel >=5.12 to use ${PN}."
+			elog "Can remove ${EROOT}/etc/modprobe.d/no-ertm.conf if it exists, and run:"
+			elog "  echo N > ${disable_ertm}"
+			elog "After changing, may need to re-pair the gamepad with bluetooth."
+		fi
+	elif [[ $(<${disable_ertm}) == N ]]; then
+		elog "Warning: bluetooth ERTM (Enhanced ReTransmission Mode) is enabled."
+		elog "While keeping enabled is recommended for rumble usage stability, it can"
+		elog "cause connection issues without a fix included in kernel >=5.12"
+		elog "If needed, this mode can be disabled by running:"
+		elog "  echo Y > ${disable_ertm}"
+		elog "  echo 'options bluetooth disable_ertm=y' > ${EROOT}/etc/modprobe.d/no-ertm.conf"
+		elog "After changing, may need to re-pair the gamepad with bluetooth."
+	fi
+
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "To pair the gamepad and view module options, see documentation in:"
+		elog "  ${EROOT}/usr/share/doc/${PF}/"
+	fi
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
+	udev_reload
+}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index 2ba161ab9e0a..a2033e0b6a8a 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
index 946371fcc1d5..809e5886bb6f 100644
--- a/gnome-base/gdm/Manifest
+++ b/gnome-base/gdm/Manifest
@@ -7,5 +7,5 @@ DIST gdm-41.3.tar.xz 807452 BLAKE2B ff6a264220c2ddc60c21fb767154bfdc2844a177e404
 DIST gdm-42.0.tar.xz 811200 BLAKE2B 98f39fc4e80bb7160b7da57d5c606ce1fa2f66ea1ab817c82c6db7328df60b91a1e9a829f67a716c67a5e5ada9f9356e4c82e40065b2692f32aa80c545adc616 SHA512 e07a4e9233573069dd5628e7b7e6dbe462e90bd8f30267d3faf1cbe3dcb8b990afe3ad6af1edf5f0ec689c6eb245aaacd4e8565a7e4feea34cc754d43904daaa
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gdm-41.3.ebuild 5845 BLAKE2B c60a6ef2ff2234706ff0c716f94ff383cda89605c1b09c02fcb8ee0f0f9185adf1eeea161b1eb68f3b3af6b0cf83f48a38fd6c492f59db952bfffe08ca937ec1 SHA512 d746306cb63b23c94d96f46a9e79edbcb7058ac4f45d9e01ad1b81cdf2da36bdffc59ade9ff409ce658cc4f9bd33647770dcb0682164d2f727af4d3fae8153ab
-EBUILD gdm-42.0.ebuild 5654 BLAKE2B 42c405ad145740d5590f36c2d9bd119c9871256ac992ca2821530e7bf2a1f1d74931e116bd540556c06d3ca95f2662316e62dfec635755801b72aacdea8f03f1 SHA512 41355763fb752e787a958499b084d677c2575329db3a42861c77b4d5bb43805d38554f68fca3f761fcd422bb13cc91d754cbf03bb9e292620d055b5554823509
+EBUILD gdm-42.0.ebuild 5651 BLAKE2B eb51963b597d368c0ee4a6637dc53c6b394b67aebf40ea19bb842fc500e1868cc37fa50991bb9e39c86ab0026b8aa887e7e79f4be09d0a422a31ce4a97c241a0 SHA512 0a8fd026ba15ee8c52a93804d4a31e8e43c398260194928844a9c03d4da178e754677bbbca9c9a67aae322f83c29c60263def0c4e25105db11142f4f1b8028af
 MISC metadata.xml 760 BLAKE2B ed67837e4caac485dd97f9b2b392c4aa26cb0515a5147a258e197531123f1c92b96900d073e85dca0ffc661aad3efb0d2328434e4554bf3b681ecf3a61eb797a SHA512 40979ee3950ee2cb3c3d67eff9c100f6fb1bc19215daaf4d8e65b8f300f05b71c74e542312780979d7ee31d0234be351496dd2dd7a7ebf3519da2fbb3acbc8dd
diff --git a/gnome-base/gdm/gdm-42.0.ebuild b/gnome-base/gdm/gdm-42.0.ebuild
index a3c6187c29fa..7a16387075ff 100644
--- a/gnome-base/gdm/gdm-42.0.ebuild
+++ b/gnome-base/gdm/gdm-42.0.ebuild
@@ -23,7 +23,7 @@ IUSE="accessibility audit bluetooth-sound branding elogind fprint plymouth selin
 RESTRICT="!test? ( test )"
 REQUIRED_USE="^^ ( elogind systemd )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # dconf, dbus and g-s-d are needed at install time for dconf update
 # keyutils is automagic dep that makes autologin unlock login keyring when all the passwords match (disk encryption, user pw and login keyring)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index ea5c341071cb..9bb7f014e7ae 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -4,7 +4,9 @@ DIST gnome-control-center-41.4.tar.xz 6616908 BLAKE2B 7c1a2692667c0447590d81c17a
 DIST gnome-control-center-42.0-patchset.tar.xz 5932 BLAKE2B 1c9311481be6a07dc2ff61fc9e65f190bc1668026fba2a1e4a8edf9a033e6b2b9019542d89aac4480323ee4802e00b765654008f5252e87040f013a990cb8048 SHA512 b76c1facd3566edcadfe33f81027966da35bb03909bfbae6faad72005b92447e291fa424611196bfae6e1dc5bf5982917f3ae14c36d87206f6bfb4af502bf1a4
 DIST gnome-control-center-42.0.tar.xz 6238096 BLAKE2B 63540c94d64d312ff9ce523cc3ef0023b35b93bbd0593cc6a3f5d671cc70980969617b2436b0c9994b8d225fac972d639b935affac36bc32bf621c4593d490bd SHA512 d8097240444ab45174e89db0f543d6523051829b124933cdbb84b1bc5d2d6809ee810f6d2c09702da51c991fe11496635b3164b490ed1e2ac523481d5466cf3e
 DIST gnome-control-center-42.1.tar.xz 6239960 BLAKE2B ba539267a00bca7218a8088fba1c2790d26239ea57ef45cdbbe6b54b687b30ab15ec4ced0078d9fab48a7d6d8fd9e966ffa3dd92bcae164d99a5e64c458e5852 SHA512 a29df2604d90e42a602060a7042d70238eed9e59c46b500610c6b5842e015ba0d9567528a3dfd6bf365973f274de47ccd4b8f2f50cfa35c8f88bb05cb31e774d
+DIST gnome-control-center-42.2.tar.xz 6240632 BLAKE2B 976a07c1351e629ede3c8dc4f02ce98d93398450ff64af15775800d819c7dcddca43837a4eac6bfb8263a6cd8b2dbe7523a90576dece9959e32a7307f6884e1c SHA512 f8fda1a501939788de62a33d1570e45b95392165d23f90cb4c1ae94c92f61d5f5d72d1e25df1a9fb355ea88abecf7bf38bc67c69fb2b3495d027365deb44f21c
 EBUILD gnome-control-center-41.4-r1.ebuild 6117 BLAKE2B 91a6d1c145971c45330865eb6017546cc4df1d99b87c441ba21edaef1ca3fa2eef9a8ce4396ad741a27557a3fa8e87e11ee54b35fb4d42321e129b5fe55bb742 SHA512 f7db79a7888306f9291c3e90eae254ffb85c7db5deb747b6af9d103a9cc9ea430e4a01642ec1017899fd452f24545031cde765c87c86168744f0973f0b58c588
 EBUILD gnome-control-center-42.0-r1.ebuild 6113 BLAKE2B bf91416360ffea17c708cf9501272d1637ce4275e8ce99548ab70b6ddba4bf0371bd754203658958e42708aeef64c1a93c5c32cb5ca6b3faa7a513fa36048cbc SHA512 86deb32ce02025476ae33f7b73cd0d36e956fdce919f2254f85aa10e772a562566c131ddea677d490356415023200a55e74856f5c06aae1f3757da33af7758e0
-EBUILD gnome-control-center-42.1.ebuild 6058 BLAKE2B 071bc0ef3ca97838a7ae829ee495a3d13c2642f24b9aaed6c354ce1d85dd93b9f18ab929f5d37ad12186f09b12630f3678df704aee916613481268cd448ccf54 SHA512 2d680e74f387f339499dedccdf06a6dd50de680ffc1cf197a12f1b3aac8aaa636c05dfe53a14466ffea49877be9768cb3cf5582a08dce0a9a7b6be54b3cc1397
+EBUILD gnome-control-center-42.1.ebuild 6055 BLAKE2B 370738c28df978c2a34082910b872fcae15084439963fd82e1b37ccf24f9bd6511f819af5c315fb66bdee0e905e2862d623261bcc31d9274799b7a69d139a851 SHA512 b10d5dfff1efdb878a6850eaae0ea7f63e46307bf7bbf3b167311bcbf642307c62bfb55468b59fa349182cbf51e717295d08d9e2bcdc2bb345e2f522161e65a2
+EBUILD gnome-control-center-42.2.ebuild 6043 BLAKE2B f89d7bcff626eea61ce8cf6b84652bbdc88a8a33a4cdc6856dc627b4521d2d9270d1aaf42950cd9680cfd3307b4b1aa2829e7a02191c00557c8d71bae9f3f8ed SHA512 856da1d531f239de09531873b6e7c3a02e2efcea2171e931739e905f5cf806b6504bdf7a6351ae9fdeb25e32549c4a3ed36934c4e17ab58a2379e209d64da334
 MISC metadata.xml 497 BLAKE2B 27aa6d9d725a3ce90d351442da83bdb5680f9931d78e5d6a653a1d2d392df118406e3eab36c77bbaeefc581be3a62c5df13fdfb611b2db27fc9c7440ba4ceae3 SHA512 c44903fa5a9462871c065bc776450c25bcca1dfe2f52d6bf676568f587bc308a0465bd5cb6e095fb0ecaefd0b8471df90df3b96164c7e7de76a86fbbe416a82b
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
index 17e5b231ef47..0108ced00471 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	^^ ( elogind systemd )
 " # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
 
 # meson.build depends on python unconditionally
 BDEPEND="${PYTHON_DEPS}"
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
new file mode 100644
index 000000000000..8a2f037685e1
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
+SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-42.0-patchset.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	^^ ( elogind systemd )
+" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+
+# meson.build depends on python unconditionally
+BDEPEND="${PYTHON_DEPS}"
+
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+# display panel requires colord and gnome-settings-daemon[colord]
+# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
+# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
+# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
+DEPEND="
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
+	>=media-sound/pulseaudio-2.0[glib]
+	>=gui-libs/libadwaita-1.1:1=
+	>=sys-apps/accountsservice-0.6.39
+	>=x11-misc/colord-0.1.34:0=
+	>=x11-libs/gdk-pixbuf-2.23.0:2
+	>=dev-libs/glib-2.56.0:2
+	gnome-base/gnome-desktop:4=
+	>=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
+	>=gnome-base/gsettings-desktop-schemas-42_alpha
+	dev-libs/libxml2:2
+	>=sys-power/upower-0.99.8:=
+	>=dev-libs/libgudev-232
+	x11-libs/libX11
+	>=x11-libs/libXi-1.2
+	media-libs/libepoxy
+	app-crypt/gcr:=
+	>=dev-libs/libpwquality-1.2.2
+	>=gui-libs/gtk-4.4:4[X,wayland=]
+	>=sys-auth/polkit-0.114
+	cups? (
+		>=net-print/cups-1.7[dbus]
+		>=net-fs/samba-4.0.0[client]
+	)
+	ibus? ( >=app-i18n/ibus-1.5.2 )
+	networkmanager? (
+		>=net-libs/libnma-1.8.36
+		>=net-misc/networkmanager-1.24.0:=[modemmanager]
+		>=net-misc/modemmanager-0.7.990 )
+	bluetooth? ( net-wireless/gnome-bluetooth:3= )
+	input_devices_wacom? ( >=dev-libs/libwacom-0.27 )
+	kerberos? ( app-crypt/mit-krb5 )
+
+	x11-libs/cairo[glib]
+	>=x11-libs/colord-gtk-0.3.0
+	media-libs/fontconfig
+	gnome-base/libgtop:2=
+	>=sys-fs/udisks-2.1.8:2
+	app-crypt/libsecret
+	net-libs/gnutls:=
+	media-libs/gsound
+"
+# systemd/elogind USE flagged because package manager will potentially try to satisfy a
+# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
+# libgnomekbd needed only for gkbd-keyboard-display tool
+# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+#
+# system-config-printer provides org.fedoraproject.Config.Printing service and interface
+# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
+RDEPEND="${DEPEND}
+	systemd? ( >=sys-apps/systemd-31 )
+	elogind? ( app-admin/openrc-settingsd
+		sys-auth/elogind )
+	x11-themes/adwaita-icon-theme
+	>=gnome-extra/gnome-color-manager-3.1.2
+	cups? (
+		app-admin/system-config-printer
+		net-print/cups-pk-helper )
+	>=gnome-base/libgnomekbd-3
+	wayland? ( dev-libs/libinput )
+	!wayland? (
+		>=x11-drivers/xf86-input-libinput-0.19.0
+		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+"
+# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
+# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
+	networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
+
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	x11-base/xorg-proto
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep '
+		dev-python/python-dbusmock[${PYTHON_USEDEP}]
+	') )
+"
+
+PATCHES=(
+	# Patches from gnome-42 branch
+	# Makes some panels and dependencies optional
+	# https://bugzilla.gnome.org/686840, 697478, 700145
+	# Fix some absolute paths to be appropriate for Gentoo
+	"${WORKDIR}"/patches/
+)
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	# Mark python tests with shebang executable, so that meson will launch them directly, instead
+	# of via its own python-single-r1 version, which might not match what we get from python_check_deps
+	chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dcups=$(usex cups enabled disabled)
+		-Ddocumentation=true # manpage
+		-Dgoa=$(usex gnome-online-accounts enabled disabled)
+		$(meson_use ibus)
+		-Dkerberos=$(usex kerberos enabled disabled)
+		$(meson_use networkmanager network_manager)
+		-Dprivileged_group=wheel
+		-Dsnap=false
+		$(meson_use test tests)
+		$(meson_use debug tracing)
+		$(meson_use input_devices_wacom wacom)
+		#$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
+		# bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
+		-Dmalcontent=false # unpackaged
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
index 36942d3ce47c..8287136e1453 100644
--- a/gnome-base/gnome-desktop/Manifest
+++ b/gnome-base/gnome-desktop/Manifest
@@ -7,6 +7,6 @@ DIST gnome-desktop-42.1.tar.xz 743032 BLAKE2B 1eda3138e50b0ded50ede12179311ab888
 EBUILD gnome-desktop-41.3.ebuild 1922 BLAKE2B d2d6613309b0adba0b3afba8d8966e368a8ea7fd5c1676ee2f3aaa37a3518af6f861a5aa98ba0611c3ee023901ba5c7838f59eddd1ef43cdee27054dfc94bb7f SHA512 722b7d3f3c6e43c84c7bf37f202263a21021ed0fc3b8275ea1cd207b0d19cb3e7807bbc8eb539a54210a4296468994d677ebdbd1b82023e11514f00ca82c73e4
 EBUILD gnome-desktop-42.0-r300.ebuild 2094 BLAKE2B 15bde2ec3d978dfe8aea8519f7a988480e14e0a4c72e62555be0ed51dc63a5cc659c6b25afdfca0809d59c7b2c0732809ba8c7522143e66b29d0ce8de46f13da SHA512 95b49469f13d3793b745945e7c1a9ffea4b0b5a8cfde63fbb230edaa1d4a0b4de76753c050ea41612bfb58fa5514ca150ac948126ded0cfd343c7bea204d95ab
 EBUILD gnome-desktop-42.0-r400.ebuild 2033 BLAKE2B 61481f5683713a072c0ce771b13bc4975cc538908e57483e4bad79e72f3b12a3c2f23b213602ec2b8d98ee61017b7b7810d01127e4b046bfb0379a4047244ced SHA512 dc2a5ca55a1e0bd61729deb90007aa6f6fa785e792125d8f6f03113a6f874c60cab4e07dff23ee96fc12b877f27bd62fd770edb153eba1f6830315c6e84dd0b9
-EBUILD gnome-desktop-42.1-r300.ebuild 1933 BLAKE2B bd31d5ce6639e07a12a477cda29b4187e0b47e6ee75b4a6154c555373dd7d7f551914fc2f2864e4a4c7527be84f2abba57158385941e49b3c97cc6d062971c79 SHA512 1432bd1e60983bad1c7596090d26cbe7271e4737f6057b69270b8c1d8894f15fec399683786a542bf1ab0de79688a6ed0192f9144be133534b68b610a5f4fc34
-EBUILD gnome-desktop-42.1-r400.ebuild 1897 BLAKE2B 61485a67a7b2c9b05bec3f65fe485225e27caa9405e996bd619db93fdb7b222a66f099058dba928bc2166527a0fce29eaed659e081c5ecdeb302371490e83ab6 SHA512 5e9d4528aa996af4d678dca04b0233d285cbe148926362d835b49270d9762638ed51f258728b43db491508cefee3d186f8efc3e2c2dfd9dd97cd9df0646c9648
+EBUILD gnome-desktop-42.1-r300.ebuild 1930 BLAKE2B 8ff065ab7b72b046349107f4b86a326500a28d64f34fb1b4e95876eb2d6261b1aaa94a2eed2f5ed7dbc863d097a4a75992334f7dd89e47162d7ad0679d994356 SHA512 3a97c4bc9211a9d362291d8dfae6811d2de4424bcfd296eeebde7087c1345d02367464636f628a8e3bb14c82d951c2ce30a7bf6280d77b220f0a8bcabbb7462f
+EBUILD gnome-desktop-42.1-r400.ebuild 1894 BLAKE2B 3f52d48e3318f77055131351ad2d32de9c601ee9ef8227663dcc0c2f43e5aa8d3dee3ae911c3cf0efe1bd92c5044cf8de7af0a0ee036053e8de8931e479fc761 SHA512 c321c9fb0da94b23077be2362cca5d219512cf6f590cdc2f80088cc1f20163c3f81d531aff2f159e72fd7f5acb67473a9d76288a7a4a1a1b7c205fe3160300d4
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
index 1c3c7ed2fd59..c6eef4f66f57 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="3/19" # subslot = libgnome-desktop-3 soname version
 IUSE="debug +introspection seccomp systemd udev"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
index 96fb0604f50c..ce09a049440c 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
 LICENSE="GPL-2+ LGPL-2+ FDL-1.1+"
 SLOT="4/1" # subslot = libgnome-desktop-4 soname version
 IUSE="debug gtk-doc +introspection seccomp systemd udev"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 COMMON_DEPEND="
 	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
index 5d1ffb3fa49a..2c0a2010e0d9 100644
--- a/gnome-base/gnome-session/Manifest
+++ b/gnome-base/gnome-session/Manifest
@@ -7,5 +7,5 @@ AUX gnome-session-3.38.0-meson-Support-elogind.patch 2808 BLAKE2B da7ad139fe118e
 DIST gnome-session-41.3.tar.xz 483396 BLAKE2B b5672868459b362452f62e6b543243df536a2edeaaa75dae09c5dedc9574fa58f6024aea5e0853361ae46cff6dcbfd257e6bc0da7ddfb028c3b0ae58d8ead63d SHA512 a75c038639301ccd1f0abf83f944890f74986e94dc32f45c97c1872ddc09bcebbb94116f7f865b1d9fa40a81133ec14fbfb75d585061750d9809af4abba3aa9a
 DIST gnome-session-42.0.tar.xz 485616 BLAKE2B 0e77ad7fa2403c6cf22d087508d98281900d2f0e83ddbc8e25e6c0905398e04a893049ce90c79aebeddfeaafdcc16d7913c546294d92e488725fe4ec4e751928 SHA512 3d340700958b5800039e3009618709add2cdbaecb58344d9d2f93e4e761a737ef003091c380c68f95386dbb078b3d12f70732f0022611ab4a10e1c1eb988b4fa
 EBUILD gnome-session-41.3.ebuild 3462 BLAKE2B 2202d8a6e5dee7aa3559625101a7a03f0902b688e1ccdd496a267121af8b9ad4fd13c1b189d5458950cf37cbd4c436f5bfc732ca4444fd7a310a9994084dbc6d SHA512 06997a93a0859ab1d4b39a8ffc4ba8c065f4c9da41736efc7640d8f922bf93ab4375fa97cf2051c15455be2333e8ff8832500d548386e38b502ea7b2a5440c06
-EBUILD gnome-session-42.0.ebuild 3481 BLAKE2B db0d6d738d9fe6ef88d7362ff41bb9c5313d5805efab8902ba366ea1ef7047573ef1c2702556bc6adcd5425b3c8fc9c299b125cffccf18ba78b918d695925257 SHA512 3af3a0d0fddbe48b12d1ab564d4e655c27887b06d80f74b252124b5f0960a04fbf7088a143525fe3942f52b9279910aecfda4d901856b9bfab9e3673489c6cc1
+EBUILD gnome-session-42.0.ebuild 3478 BLAKE2B 9b075e93943ac6fa706ffbae578c1b7b18c256f5fe6f94f85cd38ffc888dffd13e8fcfa2ec0d67d8b581b0abe415a389bd388f590b73636d43f1075e4818676c SHA512 eafc83a739ee5331fd3916d40f2036cac287b48ce3c95eed2c919b0b61bec80c38e9c2e916cc87f0dd53c31aed4771da22273ce22f5fc562691750503783425c
 MISC metadata.xml 349 BLAKE2B 675e33de85c98218f36cb44ac7e756e310530782ea6ef1f9e40a08e0ffaea810aaac0a72176a299c13192f92f03938fea5132b9726bce0fc6f50e1b1e42aba07 SHA512 c174185512a6df3648511062dfbeca054184f2357df8fd468553cb87421b72b876fe933161df738a8fa21f0637ad65963747ab761f2ada398061616ffb6f0f8a
diff --git a/gnome-base/gnome-session/gnome-session-42.0.ebuild b/gnome-base/gnome-session/gnome-session-42.0.ebuild
index 7452977b4652..3e7aedbe1b17 100644
--- a/gnome-base/gnome-session/gnome-session-42.0.ebuild
+++ b/gnome-base/gnome-session/gnome-session-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-session"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="doc elogind systemd"
 # There is a null backend available, thus ?? not ^^
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index fc02dd9aed01..41ee0019297c 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -7,5 +7,5 @@ AUX org.gnome.settings-daemon.plugins.power.gschema.override 75 BLAKE2B 1c80bbb1
 DIST gnome-settings-daemon-41.0.tar.xz 1477876 BLAKE2B f17005b03cbee142434f0805e8f590d6d9edad0f09b3226bb40ab7e312ee13bcd46c211efb140303d4a351d8818238a28bd9aa3fe760fb617fb006e97eebde61 SHA512 2c6848a749f84fd0c3a9ade6f4a83ae3ff7464da429b2d73030c9dcbd278b070c40475c678c819e31464941f2bd38d81f11b96f24d0d1fb05271267c3a1ecc2a
 DIST gnome-settings-daemon-42.1.tar.xz 1481432 BLAKE2B d045b2e2a17c6c54f0014db03e1b2d645086d907383b849de82f972af39463acf06ab1207817f171fd3b7a33b60303d058f04495158bb49aab7899da740f732c SHA512 20e87fc2318d77af016ec071cc6070f43ac42eaaf60a1f9bdb4278f59e038268e0a37759f0ab31068d8701b9dc64d142c0a875f0eeaa700ad47e0dbca3b9d141
 EBUILD gnome-settings-daemon-41.0.ebuild 3954 BLAKE2B a1e545560d68d18ed28bf025197b2998756ef08219727acd547e652dfed4573961307741eac8cb3a7021c9edd7adcf18bd281737e8330195457705f4d051fd02 SHA512 b8ef84e4dc1294b9dd4c9e1a0dc24b6406292e78b3e7276c9d407933aeb6d844ed8e67a3ff734e2df1118f75954aa34c3a324e9462e685b60ee44cd0f6571103
-EBUILD gnome-settings-daemon-42.1.ebuild 3910 BLAKE2B 777dcb7e34c39976e3cddfe9ca4e4f5faf22d638c668f7a5af3ebe9c2c44c894524fb61efc0b629163c96adb64189f6314eb31b759b03f62d89e215321958014 SHA512 3c09129d05c6437decf691b07252af19231b3bd9a503b24629e4085b4a398a0a9a2b01822925a80234bb91b0d1cd9593fbec67c68faa457760be70d9a044f74f
+EBUILD gnome-settings-daemon-42.1.ebuild 3907 BLAKE2B 17b1f98a007a8f0fc2963525bc7c9c13732c00b6ce698d17bde31a8791b45ff2a2ae4fb381d3f91f8ef3736878d4427e3e5659a2eb7b045703fdaec7842a92c2 SHA512 ebf63538d7317c8bb81a0191df08d3902033402154b49fc54c4633be3e6e931a08191b09a83c2aae77e9e6c479cd9717fcd41e4c3a974a46e844199ca32040d1
 MISC metadata.xml 547 BLAKE2B ef7c1ef4b899bd7ba6f1d05b725a5c2205e949d03d41ae4922559e740fd94ecf767c25da34a9a45a4da796e336133ed250f675a525fec9db5fb53c4c7df35dd4 SHA512 ddc99a174f19c7c949cee4d130082572bcf71dc9c50d637cd94ea0f3609b9d032ff603552c2b077245cadc6cf03f8726cf81efe89fbf2e8b3e5293dcc572005c
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
index 43fc4b23d465..51c1ef9c0852 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	input_devices_wacom? ( udev )
 	wayland? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 DEPEND="
 	>=sci-geosciences/geocode-glib-3.10
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 5b40b8ccc306..7887de81fe63 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -10,10 +10,12 @@ DIST gnome-shell-41.4.tar.xz 1899464 BLAKE2B 202408be8886bb5eb5615328a774993bea8
 DIST gnome-shell-41.5.tar.xz 1899888 BLAKE2B 73491f382413c313956fc6ab878a54d8a881190ee93cac5d334d169636d8dd21557c78719142f717c94463e02c7ca4eaf12a6e4ca6167e48a002ece9379b6d03 SHA512 b638103528413dcfa12d65d0c7add45716d21334294babbadd0a05e3410ca068ae336b28c30eb8811222b9f90e5efdf0d1a6e0a2e3f104b49061bb28333f066e
 DIST gnome-shell-42.0.tar.xz 1918044 BLAKE2B 742d13ad92795fb71bbe8376a86b8e9a828882288f105f026cf98304ef2e9eae8fb967fa978ec322f5c621303a1798d3490c001bbd63c704b0cddc5db688389d SHA512 39b56d3c09a238d9ca387145fdbddfaa929b124d4006f097b792de2dceb882e50cbce1255b0b4585aea04b522a92a4e7a743367f43a863f95bb6386401e73935
 DIST gnome-shell-42.1.tar.xz 1928924 BLAKE2B c8a1aed79a93d713a52ef0161ff9f06c39f7fb9a762086c78505d220e1e8ec43d7a0e376421f912dc91b33da8fd9394c6a233bb2d9d8b361d63ea2ad0406cee6 SHA512 3d27fdbcf5359f631a71b0fa6495fa50e2b43bb2b3c5c0efd740d9a6a88128ae54fe0ba11ea88990ba10ee2fc9f55211d0a21e60beca250bd197535d944d07ed
+DIST gnome-shell-42.2.tar.xz 1928948 BLAKE2B e263acfc9e6929accfb46b65b91b1173cfa4c778405c0852e93b83d78e1bf3a85e3b5c49b73445f604c0fdecb48f294931ab2403806661013bcef3a71b99f911 SHA512 dd77195772e23d8260e55a2db1103fa6dee8945ad168478c293e43e9971698aa191e17f7f5ef46cf46eeaae5051c34f0eb5df134690f7dc5ca98d6ca747e4eb0
 EBUILD gnome-shell-41.4-r1.ebuild 7395 BLAKE2B 3769ab65768b699cf7394ea80a22274279c3d410da4b3d05ceb7f1ce33d9aa41524a0bb4de2a5b11acf9b540cf11c5c9a23c236e4a2df6e41544a74577a37ab7 SHA512 4af8c66e12a16e05e82389a7a28a7e49ae34ed72e68b6ce373a8c223be207f2fdbc007ec9d8fe57b4a53e5612c41f062225fe47d6851cd5481e3d34051cec2da
 EBUILD gnome-shell-41.5.ebuild 7610 BLAKE2B 52e2009ac7e4ad24ca062608bd131436d7533f7a228258d6a525521fbe23060fecddcc3823fe696f1f5252abfaad765113bc677894647da92dbfbbae273200bb SHA512 27a9f2200200fba82eb6ff9aabddce02533077aa1d5cb64e3977e49b5d07fa085a00810de0f68db59554589502f8537ff9d34ceab354215aacdd26e9f7442217
 EBUILD gnome-shell-42.0-r1.ebuild 7336 BLAKE2B f83be460fcfbd49398804bd30618aab5ac678e676a3e1f46daa7785780d7883af1c4d07614365633d7f48609a0721e0212b09850786cd82a56319fdd7507f434 SHA512 37976b8a9762d017688ab48459ecd091e7c5ef722f392a547e23b422b9cb8aa031db278612cf60ff003e61d9007935e7e83ca95b20826f08e6908b6bc04fed6a
 EBUILD gnome-shell-42.1-r2.ebuild 7405 BLAKE2B 2b30c0f9b99280473dad45d21fb3b47daf217fe65dfa0ae5c398826d077d0bca3e9f20590b91708388584becee0e171e877fe92b7d13d193204a0f13def0a857 SHA512 23c00bdffff4336385502de02daa0de1ff5f2559b679c4788c1a6bfae0c79d2d1ba7f88c753e0edc2c5609ae33dbded8df40355731bf644ffb2426a5e5ee25e6
 EBUILD gnome-shell-42.1-r3.ebuild 7493 BLAKE2B 46810eb4b6e99f68f99f032fe06a37836d71e061f9a781d0fd5edb184a369006c88ed642894135257bb305d171655a7e93b5e1edb7ab52fa1c2f65fdfa7fcc17 SHA512 8b329972a6cefd8fbae0a95428830e30f38509e248c106f7dbae0c9cb640e4b11e7917a20ec8724cb76e347746c04336ce9f58614e21ce0a507bda4986dbe432
-EBUILD gnome-shell-42.1.ebuild 7356 BLAKE2B 11be2d6171e95520dfebadefa926ef69f9c7a0d450fc4402a6c1e8dde93e08d1d7735d1c51c9387091ff84dabd692b7849a87daa3fa917fef65babf35448d208 SHA512 1820a7d815f860eb085cce14f312246b18548e0be767dbdf2d612f86e0a41a40a9a30f77e519f6cb039d06e12812df8ec22a3f735d5bce4eefb61a89e8f47de3
+EBUILD gnome-shell-42.1.ebuild 7353 BLAKE2B 6f9a84055d0e94cd98ee0bee5598f3f827d23969249b8d29ff4f29392699289c0bf23872a6dd74844627df66031b10bdc0157873aa12366fa52a44f437c7a25d SHA512 b274bc62c5869fb8c5dddd42aa93a783fa98f59523d7e5c9342799b14fbcd405650bf5b3b0eee590d8b9ca23869978fe12d1fac63dc4b84be11de4b3912af735
+EBUILD gnome-shell-42.2.ebuild 7415 BLAKE2B c24ed61ad5badba44fde2c241c8051e44a1778bd6db81912c64c2f13c136955fb2a1045140ddede366e28592884f1bb757b6bf2628c553eac0b311dc3abe22a2 SHA512 eaa4d064bdd2f4e9ead120919e51ad7794f60a1cfba23a1c538e89a96098524a363784b96c6ebf0241c9dc322c57299bf0d654a826e813ebd71fdf539d9f05b7
 MISC metadata.xml 1051 BLAKE2B 86f9156deb6546719e6bcd09ad609b2837901743dd390f430521226df6b9e8f54387d2c93411d63d0099261ee0463428fb8854ce2c47463b999827b377807d84 SHA512 f6a3efe242c1726508a56506a7817c3beea3cb17fbe37d2d38403bc6f4f1d11fd366b68b5c9c6ce44f200a21d48da6ccfcf07c9758369481376b5882ea872129
diff --git a/gnome-base/gnome-shell/gnome-shell-42.1.ebuild b/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
index 00a7785b1bb4..b17edeaa6984 100644
--- a/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-42.1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	?? ( elogind systemd )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
 # FIXME:
diff --git a/gnome-base/gnome-shell/gnome-shell-42.2.ebuild b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
new file mode 100644
index 000000000000..fb0f8f85b1d5
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-42.2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer/pipewire support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.68:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.71.1
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-42.0:0/10[introspection,test?]
+	>=sys-auth/polkit-0.120_p20220509[introspection]
+	>=gnome-base/gsettings-desktop-schemas-42_beta[introspection]
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.19
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-video/pipewire-0.3.0:=
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-242
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	gui-libs/gtk:4[introspection]
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated from inspection of the output of:
+#  for i in `rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- |sort -u`; do echo $i ;done |cut -d, -f1 |sort -u
+# or
+#  rg -INUo 'const(?s).*imports.gi' |cut -d= -f1 |cut -c7- | sed -e 's:[{}]::g' | awk '{$1=$1; print}' | awk -F',' '{$1=$1;print}' | tr ' ' '\n' | sort -u | sed -e 's/://g'
+# These will give a lot of unnecessary things due to greedy matching (TODO), and `(?s).*?` doesn't seem to work as desired.
+# Compare with `grep -rhI 'imports.gi.versions' |sort -u` for any SLOT requirements
+# Each block:
+# 1. Introspection stuff needed via imports.gi (those that build time check may be listed above already)
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. xdg-utils needed for xdg-open, used by extension tool
+# 5. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 6. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 7. IBus is needed for nls integration
+# 8. Optional telepathy chat integration
+# 9. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 10. xdg-desktop-portal-gtk for various integration, e.g. #764632
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	media-libs/graphene[introspection]
+	>=dev-libs/libgweather-4.0.0:4[introspection]
+	x11-libs/pango[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+
+	|| ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection(+)]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.5 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+# These are not needed from tarballs, unless stylesheets or manpage get patched with patchset:
+# dev-lang/sassc
+# app-text/asciidoc
+
+PATCHES=(
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/42.0-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/40.0-defaults.patch
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	# Hack in correct python shebang
+	sed -e "s:python\.full_path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use test tests)
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+		-Dsoup2=true # libslot SLOT needs to match with what libgweather is using
+	)
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index d99764e46c4c..000000000000
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX gnome-vfs-2.12.0-afs.patch 663 BLAKE2B 790fc4d85bebee9d3be52a0d6704030c71458477142169879e37c999f31c22866194080956f9fcca33165671df9a5277ccea2209eb9044e6f3bad96e6fcff1ec SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1
-AUX gnome-vfs-2.15.2-headers-define.patch 501 BLAKE2B fed25b67bd1aee253994ec3e16a8dd0f8d5424b7200e73dd3fcc9d2911a57d9e8547bb967557cc3d5b295349bf164767e99cbcdbc041872ff2075650e515569e SHA512 34a66f9467a1ecf77cbf725fc732d9b62baddf68b017a65a2e4ee06f1fca92cbde4c94249fb44eb66c23e338f56fc2b5f314cc75d6e91349a3207c3bd5d74f26
-AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 BLAKE2B f73c2ffc1480ad1e0b94bc476965a1da989635bdcc34aeb65670e6548403bd32abc644b8eed1da0e8d5498484c855b10efe721b04f08b188198002fc49997434 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261
-AUX gnome-vfs-2.20.0-automagic-deps.patch 1976 BLAKE2B cbe4cf70fc52feedacdb2f422c1048b4eb196861040de066d8b16274c826bf369d63068020389f460e1d5631169ac0e2a83e736ea547339feecf5f53c6551786 SHA512 7ef30df523aabe316be0064a82857bd2dafb783857137912ee8d3153dac540cc314920e3f2c7fe49f32c485685cb62a3876ee386b30409600a318ea91c8d24eb
-AUX gnome-vfs-2.20.1-automagic-deps.patch 574 BLAKE2B eeb9a69590a59259a780af60a6b3000be33240a37ea20955ab50c36cf31e02214193da056b1e601f9dc546298a9a13bc17ad0b2dd9b3cb19a266ae65eca1c98b SHA512 d1adfd585d3564c61ac19b98ac57bf387ad938c4197d65971bbe6528fe3246e3260b424e9fa6760eed933a58e9cf2e5df9b8458835d420660735ac43dd54b4d5
-AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 BLAKE2B 9607e8f7641799dbb46e29bfd7623815fa4066685b10d2cb232e556998f76970097d1bda65554c8c85961e729c269b8a7a6210f2532605cbf7cd16c501444574 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96
-AUX gnome-vfs-2.24.4-automake-1.13.patch 840 BLAKE2B fcdd3d1728f95b5b30246fa7471819d00ac2f689d957b665dbd16f2c84ec2e4afb4e2bfac9ca3d3eda4cd42be84c58402aacab1a7e2a503cf9802b5fce5001d7 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639
-AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 BLAKE2B 21ff1b1b0d077f43e15989944c337f94b0ddaf5d69cc966d248404fd19afe2dd3a24eb589fff040a4993ed9f4da3692fda81851c0da4342ba89cee0bded387a3 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab
-AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96385e55ef2d47dfbbcaacd662d327a57f2c04636cfa13971c12cc20c00a681a206515c098464c5956cd736331f0ae10cb0677b06b69ad341ae SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77
-AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25
-AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620
-AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
-AUX gnome-vfs-2.24.4-openssl-1.1.patch 802 BLAKE2B 0bc20796d79df2b720a7ef06139178cbafdd4dc765ed8721d1c0a7ff930b1cd3ecba3bee4b0b074b35b2812ccda0c895824d01296f7aa6212e606bf3af519d13 SHA512 7ec9cdf91d1f9bf51dcf97c47efade87829acd59642bb61c6defc6c7377dfef9e3b0bc8c07a6257e0b55e0184e28e429ff931fcccb48cf6486774916cc8152de
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 3888 BLAKE2B 77d7fb7aa51f81c2eb8f1b1943dd4f9cf77afdd0aae61d6e75d326ad9488e78ad3481c6fbc7da7fc77041c0ce6316a6480e0cf6452121c21151c61f84c1ad076 SHA512 5c03d486027e1a54149a50d7693a1244ec5c9309f42b93d73f3895ea17628d8a1e87407c28b4afab003f38248f9e6d97c686aeab0cf26c0672488c6121a84c0f
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
deleted file mode 100644
index cdc88c24b6a3..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c	2005-08-23 01:34:36.000000000 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c	2005-09-18 20:30:47.000000000 +0800
-@@ -35,7 +35,7 @@
- 
- static struct FSInfo fs_data[] = {
- 	{ "affs"     , N_("AFFS Volume"), 0},
--	{ "afs"      , N_("AFS Network Volume"), 0 },
-+	{ "afs"      , N_("AFS Network Volume"), 1 },
- 	{ "auto"     , N_("Auto-detected Volume"), 0 },
- 	{ "cd9660"   , N_("CD-ROM Drive"), 0 },
- 	{ "cdda"     , N_("CD Digital Audio"), 0 },
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
deleted file mode 100644
index 9d6e9978242f..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -191,6 +191,16 @@
- 
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
- 
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+	AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+	AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
deleted file mode 100644
index 6905060a4f71..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
---- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-07-07 04:46:39.000000000 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-21 11:22:49.000000000 -0400
-@@ -236,6 +236,8 @@
- gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client)
- {
- 	setup_dbus_connection (volume_monitor_client);
-+	if (!volume_monitor_client->dbus_conn)
-+		return;
- 	read_drives_from_daemon (volume_monitor_client);
- 	read_volumes_from_daemon (volume_monitor_client);
- }
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
deleted file mode 100644
index 18d900ac12cd..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -448,9 +448,13 @@
- dnl GSSAPI
- dnl Check for Kerberos installation
- have_gssapi=no
-+
-+AC_ARG_ENABLE(krb5,
-+	      AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]),
-+	      [],[enable_krb5=yes])
- AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--					   
--if test "x$KRB5_CONFIG" != "xnone"; then
-+
-+if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then
-    GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
-    GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
-    
-@@ -481,8 +485,12 @@
-      break
-    ])
-    LIBS="$saved_LIBS" 
--   CPPFLAGS="$saved_CPPFLAGS" 
--fi   
-+   CPPFLAGS="$saved_CPPFLAGS"
-+fi
-+
-+if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then
-+	AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***])
-+fi
- AC_SUBST(GSSAPI_LIBS)
- AC_SUBST(GSSAPI_CFLAGS)
- 	   
-@@ -1077,9 +1085,13 @@
- dnl =====================
- dnl ACL checks
- dnl =====================
--acl_backends=""
-+acl_backends="none"
- ACL_LIBS=""
- 
-+AC_ARG_ENABLE(acl,
-+	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
-+	    [],[enable_acl=yes])
-+
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1102,7 +1114,7 @@
- gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
- 		LIBS=$acl_LIBS])
- 
--if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_solaris_acl_support=yes
-     acl_backends="solaris"
- 
-@@ -1110,7 +1122,7 @@
-     AC_CHECK_HEADERS([pwd.h grp.h])
- fi
- 
--if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_posix_acl_support=yes
-     acl_backends="posix"
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
deleted file mode 100644
index 63be9f95b9dc..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -1102,6 +1102,7 @@
- 	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
- 	    [],[enable_acl=yes])
- 
-+if test "x$enable_acl" = "xyes"; then
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1189,6 +1190,8 @@
- fi
- 
-+fi
- AC_SUBST(ACL_LIBS)
-+
- AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes")
- AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes")
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
deleted file mode 100644
index e76a9837136a..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:42:31 +0200
-Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083
-
----
- libgnomevfs/gnome-vfs-unix-mounts.c |   39 +++++++++++++++++++++++++++++++++-
- 1 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c
-index 51a009b..3eee305 100644
---- a/libgnomevfs/gnome-vfs-unix-mounts.c
-+++ b/libgnomevfs/gnome-vfs-unix-mounts.c
-@@ -40,6 +40,10 @@
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-+
-+#include <limits.h>
-+#include <stdlib.h>
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list)
- 
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+
-+		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mntent->mnt_fsname, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+		}
-+
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 		
- 		g_hash_table_insert (mounts_hash,
-@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list)
- 		}
- 		
- 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
--
-+		
-+		if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
-+		}
-+		else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
-+		}
-+		else {
-+			mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+		}
-+		
-+		if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mount_entry->device_path, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+			else {
-+				g_free (mount_entry->device_path);
-+				g_free (mount_entry);
-+				continue;
-+			}
-+		}
-+		
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
--		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 
- #ifdef HAVE_HASMNTOPT
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
deleted file mode 100644
index 69f470a396a9..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.in     | 2 +-
- test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7335451..7817998 100644
---- a/configure.in
-+++ b/configure.in
-@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION)
- AC_SUBST(LIBGNOMEVFS_AGE)
- AC_SUBST(LIBGNOMEVFS_VERSION)
- 	
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION)
- 
- dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..626bdec 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -65,7 +65,7 @@ TESTS = test-acl	  \
- 	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
--	$(srcdir)/auto-test	
-+	auto-test
- 
- libraries =						\
- 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
deleted file mode 100644
index 45ca015573f0..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:45:21 +0200
-Subject: [PATCH 8/9] Do not build tests unless required
-
----
- test/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..a1aefa0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -14,7 +14,7 @@ else
- platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga
- endif
- 
--noinst_PROGRAMS =				\
-+check_PROGRAMS =				\
- 	test-acl				\
- 	test-address				\
- 	test-async				\
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
deleted file mode 100644
index 2684c92ec098..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:46:31 +0200
-Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089
-
----
- test/Makefile.am |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index a1aefa0..c18f2e4 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \
- 		SRCDIR=$(srcdir)
- TESTS = test-acl	  \
- 	test-address      \
--	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
- 	$(srcdir)/auto-test	
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
deleted file mode 100644
index 93ebd17c7eff..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Debian #529827
-GNOME #574589
-Gentoo #253729
-Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
-
-Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-Use pkg-config in place of gnutls own macro since it's not present anymore.
-
-As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that
-configure checks for it. Use AM_PATH_LIBGCRYPT macro for that.
-
-
-Index: gnome-vfs-2.24.4/configure.in
-===================================================================
---- gnome-vfs-2.24.4.orig/configure.in	2011-03-16 14:07:18.901009688 +0100
-+++ gnome-vfs-2.24.4/configure.in	2011-03-16 14:16:19.317009687 +0100
-@@ -667,15 +667,14 @@
-   if test "x${OPENSSL_LIBS}" != "x"; then
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
--    AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
--
-+    AM_PATH_LIBGCRYPT
-+    if test "x${LIBGCRYPT_LIBS}" = "x"; then
-+      AC_MSG_ERROR([Unable to find LIBGRYPT])
-+    fi
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      AC_MSG_ERROR([Unable to find GNUTLS])
-     fi
-   fi
- fi
-@@ -1045,8 +1044,8 @@
- dnl ==============================================================================
- 
- PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
--LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
--LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
-+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
-+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)
- AC_SUBST(LIBGNOMEVFS_LIBS)
- 
-Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
-===================================================================
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:07:18.861009688 +0100
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:09:17.517009687 +0100
-@@ -61,13 +61,6 @@
- #endif
- #endif
- 
--#if defined GNUTLS_COMPAT
--#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS
--#define gnutls_session GNUTLS_STATE
--#define gnutls_certificate_free_credentials gnutls_certificate_free_sc
--#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc
--#endif
--
- typedef struct {
- #ifdef HAVE_OPENSSL
- 	int sockfd;
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
deleted file mode 100644
index 78942f06ea11..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2010-02-09 14:16:14.000000000 +0200
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2015-04-14 00:01:51.272451668 +0300
-@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
- #endif
- }
- 
--#ifdef HAVE_GNUTLS
--static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--static const int cipher_priority[] = 
--	{GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
--	 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--static const int comp_priority[] =
--	{GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
--static const int kx_priority[] =
--	{GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
--static const int mac_priority[] =
--	{GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
--
--#endif
--
--
- /**
-  * gnome_vfs_ssl_create_from_fd:
-  * @handle_return: pointer to a #GnomeVFSSSL struct, which will
-@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- 	gnutls_transport_set_ptr (ssl->private->tlsstate, 
- 				  GINT_TO_POINTER (fd));
- 
--	gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
--	gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
--	gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
--	gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
--	gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
-+	gnutls_set_default_priority (ssl->private->tlsstate);
- 
- 	gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
- 			 ssl->private->xcred);
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
deleted file mode 100644
index 991286aa4de6..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:41:01 +0200
-Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897)
-
-Thanks to debian folks.
----
- libgnomevfs/gnome-vfs-application-registry.c |    2 +-
- libgnomevfs/gnome-vfs-init.c                 |    3 +-
- libgnomevfs/gnome-vfs-private-utils.c        |   52 ++++++++++++++++++++++++++
- libgnomevfs/gnome-vfs-private-utils.h        |    2 +
- modules/file-method.c                        |    6 +-
- 5 files changed, 60 insertions(+), 5 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c
-index 0b11cc5..051ea44 100644
---- a/libgnomevfs/gnome-vfs-application-registry.c
-+++ b/libgnomevfs/gnome-vfs-application-registry.c
-@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void)
- 						       NULL);
- 	gnome_registry_dir.system_dir = TRUE;
- 	
--	user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+	user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
- 						      ".gnome",
- 						      "application-info",
- 						      NULL);
-diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c
-index e3fd5d9..c07cf06 100644
---- a/libgnomevfs/gnome-vfs-init.c
-+++ b/libgnomevfs/gnome-vfs-init.c
-@@ -118,7 +118,8 @@ gnome_vfs_init (void)
- 	char *bogus_argv[2] = { "dummy", NULL };
- 	*/
- 	
--	if (!ensure_dot_gnome_exists ()) {
-+	/* The first call also checks that ~/.gnome2 is writable. */
-+	if (!gnome_vfs_get_home_dir ()) {
- 		return FALSE;
- 	}
- 
-diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c
-index 7fafde3..7ad8fbc 100644
---- a/libgnomevfs/gnome-vfs-private-utils.c
-+++ b/libgnomevfs/gnome-vfs-private-utils.c
-@@ -34,6 +34,7 @@
- #include "gnome-vfs-uri.h"
- #include <errno.h>
- #include <glib.h>
-+#include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error)
- }
- #endif
- 
-+static gboolean
-+ensure_dot_gnome_exists (gchar *home_dir)
-+{
-+	gboolean retval = TRUE;
-+	gchar *dirname;
-+
-+	dirname = g_build_filename (home_dir, ".gnome2", NULL);
-+
-+	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-+		if (g_mkdir (dirname, S_IRWXU) != 0) {
-+			g_warning ("Unable to create ~/.gnome2 directory: %s",
-+				   g_strerror (errno));
-+			retval = FALSE;
-+		}
-+	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-+		g_warning ("Error: ~/.gnome2 must be a directory.");
-+		retval = FALSE;
-+	}
-+
-+	g_free (dirname);
-+	return retval;
-+}
-+
-+/**
-+ * gnome_vfs_get_home_dir:
-+ *
-+ * If ~/.gnome2 is writable, return the home directory
-+ * Otherwise, return the contents of the HOME environment variable
-+ *
-+ * Return value: home directory if successful, NULL otherwise.
-+ * Do not free the value returned.
-+ */
-+const gchar *
-+gnome_vfs_get_home_dir (void)
-+{
-+	static gchar *home = NULL;
-+
-+	if (home == NULL) {
-+		gchar *tmp = g_get_home_dir ();
-+		if (ensure_dot_gnome_exists (tmp)) {
-+			home = g_strdup (tmp);
-+		} else {
-+			gchar *tmp2 = g_getenv ("HOME");
-+			if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
-+				home = g_strdup (tmp2);
-+			}
-+		}
-+	}
-+
-+	return home;
-+}
-diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h
-index 981c6d9..fe282a2 100644
---- a/libgnomevfs/gnome-vfs-private-utils.h
-+++ b/libgnomevfs/gnome-vfs-private-utils.h
-@@ -124,6 +124,8 @@ const char    *_gnome_vfs_winsock_strerror		  (int		 error);
- 
- #endif
- 
-+const gchar   *gnome_vfs_get_home_dir                     (void);
-+
- G_END_DECLS
- 
- #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-diff --git a/modules/file-method.c b/modules/file-method.c
-index 37e4853..7265e58 100644
---- a/modules/file-method.c
-+++ b/modules/file-method.c
-@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void)
- 	GList *p;
- 	char *buffer, *escaped_path, *escaped_mount_point;
- 
--	cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+	cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
- 	cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
- 
- 	if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void)
- 	cached_trash_directories = NULL;
- 
- 	/* read in the entries from disk */
--	cache_file_path = g_build_filename (g_get_home_dir (),
-+	cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
- 					    TRASH_ENTRY_CACHE_PARENT,
- 					    TRASH_ENTRY_CACHE_NAME,
- 					    NULL);
-@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method,
- 		return GNOME_VFS_ERROR_INVALID_URI;
- 
- 	/* We will need the URI and the stat structure for the home directory. */
--	home_directory = g_get_home_dir ();
-+	home_directory = gnome_vfs_get_home_dir ();
- 
- 	if (gnome_vfs_context_check_cancellation (context)) {
- 		g_free (full_name_near);
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
deleted file mode 100644
index cb1886ef4a29..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
-
-struct SSL is opaque in openssl-1.1; and the SSL_free() man page
-says that one should not free members of it manually (in both
-the openssl-1.0 and openssl-1.1 man pages).
-
---- a/libgnomevfs/gnome-vfs-ssl.c
-+++ b/libgnomevfs/gnome-vfs-ssl.c
-@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- 			}
- 		}
- 
--                if (ssl->private->ssl->ctx)
--                        SSL_CTX_free (ssl->private->ssl->ctx);
--
-                 SSL_free (ssl->private->ssl);
- 		g_free (ssl->private);
- 		g_free (ssl);
-@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
- 		}
- 	}
- 	
--	SSL_CTX_free (ssl->private->ssl->ctx);
- 	SSL_free (ssl->private->ssl);
- 	close (ssl->private->sockfd);
- 	if (ssl->private->timeout)
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
deleted file mode 100644
index 091d812608a2..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_EAUTORECONF="yes"
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
-
-RDEPEND="
-	>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	>=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
-	acl? (
-		>=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
-		>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls?	(
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-			!gnome-extra/gnome-vfs-sftp )
-		!gnutls? (
-			>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-			!gnome-extra/gnome-vfs-sftp ) )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/gettext
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=dev-util/gtk-doc-am-1.13
-"
-
-DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
-
-PATCHES=(
-	# Allow the Trash on afs filesystems (#106118)
-	"${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	"${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	"${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# Fix automagic dependencies, upstream bug #493475
-	"${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-	"${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
-	# Fix to identify ${HOME} (#200897)
-	# thanks to debian folks
-	"${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
-
-	# Configure with gnutls-2.7, bug #253729
-	# Fix building with gnutls-2.12, bug #388895
-	"${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
-
-	# Prevent duplicated volumes, bug #193083
-	"${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
-	# Do not build tests with FEATURES="-test", bug #226221
-	"${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
-
-	# Disable broken test, bug #285706
-	"${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
-
-	# Fix for automake-1.13 compatibility, #466944
-	"${FILESDIR}"/${P}-automake-1.13.patch
-
-	# Fix gnutls-3.4+ compatibility, #560084
-	# always use system defaults (patch from Arch Linux)
-	"${FILESDIR}"/${P}-gnutls34.patch
-
-	# Fix build with openssl-1.1 #592540
-	"${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
-)
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-schemas-install
-		--disable-static
-		--disable-cdda
-		--disable-fam
-		--disable-hal
-		--disable-howl
-		$(use_enable acl)
-		$(use_enable gnutls)
-		$(use_enable ipv6)
-		$(use_enable kerberos krb5)
-		$(use_enable samba)
-		$(use_enable ssl openssl)
-		$(use_enable zeroconf avahi)
-		# Useless ? --enable-http-neon
-
-		# fix path to krb5-config
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-	)
-
-	# this works because of the order of configure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && myconf+=( --disable-openssl )
-
-	#bug #519060
-	#configure script is so messed up on res_init on Darwin
-	[[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Fix bug #285706
-	unset XAUTHORITY
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/gnome-base/gnome-vfs/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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index 9a0e2388b231..650d0bff7868 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -2,5 +2,5 @@ AUX 3.32.0-default-fonts.patch 1386 BLAKE2B 7d1c4a8279b9b8ca752804ea45efed9b61ec
 DIST gsettings-desktop-schemas-41.0.tar.xz 705240 BLAKE2B 2f2eb797fbdb7317666839a4ddffd65405ddcca80724a480bd1decfc164acc4c0db193ca6a3e3bcd71fbeb479fe51c5262c0bcf40fe85cfb2d6bda5b47d5b6e5 SHA512 58f9f60d818f0ddce20ad70e6ca64d3e1fb5a5dfd45b737cc055901f7dd5f1625902451e765a26969bdd72e3b37300dacbd3555a4bc3f33c6667dbf9b1869739
 DIST gsettings-desktop-schemas-42.0.tar.xz 709372 BLAKE2B abe682b32dc3c419a65b3752b9fa6821ed0058f06a4b123728a8d095ff3b6f65b569d9b80d43aac28fa5d79439c316cb628f0c63cd500c7ebc40cc4eff704bdb SHA512 db73988a6b38857d1aa6588ccac42099c57dcc187ef01776567cc7c28aff67dc06d6a8a067e0c69167d03cd865f0c1d58e75469a40f969084bb2537b088f8664
 EBUILD gsettings-desktop-schemas-41.0.ebuild 1123 BLAKE2B e84b22f96f0e9f4c2ad9a89e0fc1a6e6c6d8801e599938740e4a72a892f2acd288ee5904f95627a53b1017a0f079a306bef079aee9da9690fbc1c986196c39bf SHA512 89715cbac35329caeee9486cacfbe3481e1cd0cc104bd6cc530a87d66f80c18a8c76ff005c07fd99ab9cbe71ea9d3cfebd7a752459665b3f8390bc692a67dfb6
-EBUILD gsettings-desktop-schemas-42.0.ebuild 1138 BLAKE2B 0b1af07eda49e9e67c4935f321394daae47d06c19249a0f19df821c2dfefdb1c735285c587f4663aaca7ca6d05b986f283c57d57d8b8350f5ebb3965c168a120 SHA512 ad9adbc960db7509817db023a7bf5f8c8f564f0af5afe4ca507d79753e7b859346e693713593818313d8ec7b3fcb95a1cc16a9f9e938e122a7090c6fd9a2bb5c
+EBUILD gsettings-desktop-schemas-42.0.ebuild 1131 BLAKE2B 3d70a28a8317e0066bd2174e1546b83e5b18e7d41f0795614efbab6af8430a464b5710318c7d9baf7810876915b3b02df64886b000aa6ee91a316f15b9bd3e0f SHA512 cf1a78691405a5bdfa592415fa1380dff3eb83190566e30b421a1ae94093d0fed68d1d45a87ee6e5952c50c3b1cd75bed2afc8ee37e953454aa170ab5ddff58c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
index 2d58c832a8a5..f8d3a3dc38b4 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 BDEPEND="
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
index 3b6608b2d0ca..2fd91c3f0f84 100644
--- a/gnome-base/gvfs/Manifest
+++ b/gnome-base/gvfs/Manifest
@@ -2,7 +2,9 @@ AUX meson-0.61.patch 985 BLAKE2B 39f9a905a69f1cc724a04ce5c994f00ccf4272ac4038d95
 DIST gvfs-1.48.1.tar.xz 1225916 BLAKE2B f2c46d94ba68065fcaef93cfaf25d5d6cc2fbbf4c1842452d30a9fec2ac5259b440fe569411cf3a874d3464f8d001ef2d04a705230a21b381ff1c3abe9c0f16e SHA512 19a642bcfce37eaa0d2d9f509fed6c67abfea0f79f5be9a17074d20e9ba71252a13583a2e08de88718cb141c5e79e34c84c765c87160351fe21291a8f88abe8c
 DIST gvfs-1.50.0.tar.xz 1213456 BLAKE2B a560794677693f449fd71f314d18a8ad8bb38ce6ac6eb312d020fd4ed2b55c9e1939cecc993869b3f489c0ebddfa057bf76af04e6c6f700323dc7b99fa052af1 SHA512 6eea3c59b239fe9674a83db4e182c0ea2ab7d56e29f5d5c4a7af9cb3cb0fd9222721796754f2f502291049c158e8bd3771cbc5262d10bfa684c207cb3281dcce
 DIST gvfs-1.50.1.tar.xz 1214536 BLAKE2B 678c89d08255e577afb3a4999cef341fc5449c5ab615c5e089b14cbd2d0a882830dff71af6ab7a978d8b23a3aaeea197badd21d8c4e702588e626f3b4d917c55 SHA512 7a1ea47658dbd74673e1aea7c344d3f9e8a26fab844a26220cedcb19da6b4a0cac6b369d2b5107f649d6e7b2331894c89df04c6dce3630be4b289e23f56127a5
+DIST gvfs-1.50.2.tar.xz 1214464 BLAKE2B 3fbd461cd640fcb956158e6fce97cb6cb7c30e444c5955ee197f827273271b876de62469daee994586b2bfe6ab7ab41d8a9eb2f346a0b9ed45289d9d516f5bf5 SHA512 980ff8a857ad4dc820685a9331d875274f893aebf8aca406c8ee06e2a25026fc51572515f3ccaa06062314f7f5f8d1982c5813d235bd7d81b975874e1796ca04
 EBUILD gvfs-1.48.1-r1.ebuild 3917 BLAKE2B 06f752d9d82ec7144e6957ee018fc86228952c8c50428e13d9df121455ff1b1d7d7afd3f8bdda4393d30bcdb2e3b6c26f028901269262930d1f59e80aebfbed7 SHA512 0a542600b93a05ccc4ad3f10d20bcdf05d15c0757a19008e524ce5ba0d64a1ce79b33733987794799180f1a957e7d812e092de17ea9056f826a0baae614fc553
 EBUILD gvfs-1.50.0.ebuild 3905 BLAKE2B 4f4815a8cc27343fbfb67b7b04d60a52d121587653d56905f076956a1cf97fdb87bec0825bf9851f89cc74f7140089c6d50aceb4b243833c748119aa13ce10b1 SHA512 d12ec5475e7909f3397e852c20e06e01c2189fdc12625a8fa81ff79b2205323b2e22bd85d799304cca39360ca9097cf6cbbf45d7708f5ebc82d9c8fd9d34cb19
-EBUILD gvfs-1.50.1-r1.ebuild 3914 BLAKE2B 759a0e2862acc26176080572c2bb6a076c0d77fa5b90546745b36d6869388fdc3b02e9d926d3aa9924461ecf2537065a98809f1a62890a83814b9c84b8d3d037 SHA512 b6bf0d4dc941b0398cf8a5dde398e3d14cf4056a6abb5a4ca724edd45afcf7a0cdfebc514422417c4ffdc9f982f1df6bf369507e7f33e10c1bb13dad865059f6
+EBUILD gvfs-1.50.1-r1.ebuild 3908 BLAKE2B 79bdbad25243dcb3377245426f590618099fe3f525254a38a978562a7f09d55ce53bea5e97049809a7bf4f2f2a35d29313aa6b17bbfef0a03973c665f2f486ca SHA512 42c44aff163a14b4353d14185df804472685574163d97a418d4e95b10b861210bed8b2617b691f31d3ce8f460fff75c0ed63868c6787fc5176fa83dbe7bd3ca4
+EBUILD gvfs-1.50.2.ebuild 3914 BLAKE2B 34fa55a841d9f5e6525a2d3fbfc9a7a7e90a6c3e348832198df8bbad3b2c2cbb15a8bf0655bd5028762d24277a90d731b8481656205d200e0f84bc3f67901c29 SHA512 0498fa1a457eaffd43f5701a9b957d6f43e98738ed5ec178e77122b8e5cfcc1db4c9a74c827e384b52199ed6c0146436319e015019d674ab86a1be6b5c56eda7
 MISC metadata.xml 1700 BLAKE2B af3b3595b38c93739128edb4678d17d1166b91abf851098b892c7240bff0f98886bd39a1bd85a218a8378dc9f7df9759e4ced4ce8183b652f6e1d27900e22220 SHA512 7b4f4d8abda474c6670d3ef278801d61d285ba48b07f7023ddee5eaba01ed695edd16ed946afa5c90baf394e87b3bfff6135380e4f3698e188a209f954b6cabb
diff --git a/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
index 645b9038fa02..5dcad1964e44 100644
--- a/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 	mtp? ( udev )
 	udisks? ( udev )
 "
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.70.0:2
diff --git a/gnome-base/gvfs/gvfs-1.50.2.ebuild b/gnome-base/gvfs/gvfs-1.50.2.ebuild
new file mode 100644
index 000000000000..3d0944f5334d
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.50.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit gnome.org gnome2-utils meson systemd tmpfiles xdg
+
+DESCRIPTION="Virtual filesystem implementation for GIO"
+HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
+RESTRICT="!test? ( test )"
+# elogind/systemd only relevant to udisks (in v1.38.1)
+REQUIRED_USE="
+	?? ( elogind systemd )
+	cdda? ( udev )
+	google? ( gnome-online-accounts )
+	gphoto2? ( udev )
+	mtp? ( udev )
+	udisks? ( udev )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.70.0:2
+	>=gnome-base/gsettings-desktop-schemas-3.33.0
+	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
+	sys-apps/dbus
+	app-crypt/gcr:=
+	policykit? (
+		>=sys-auth/polkit-0.114
+		sys-libs/libcap
+	)
+	http? (
+		dev-libs/libxml2:2
+		>=net-libs/libsoup-3.0.0:3.0
+	)
+	zeroconf? ( >=net-dns/avahi-0.6[dbus] )
+	udev? ( >=dev-libs/libgudev-147:= )
+	fuse? (
+		>=sys-fs/fuse-3.0.0:3
+		virtual/tmpfiles
+	)
+	udisks? ( >=sys-fs/udisks-1.97:2 )
+	systemd? ( >=sys-apps/systemd-206:0= )
+	elogind? ( >=sys-auth/elogind-229:0= )
+	ios? (
+		>=app-pda/libimobiledevice-1.2:=
+		>=app-pda/libplist-1:=
+	)
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= )
+	gnome-keyring? ( app-crypt/libsecret )
+	bluray? ( media-libs/libbluray:= )
+	mtp? (
+		virtual/libusb:1
+		>=media-libs/libmtp-1.1.15
+	)
+	samba? ( >=net-fs/samba-4[client] )
+	archive? ( app-arch/libarchive:= )
+	cdda? (
+		dev-libs/libcdio:0=
+		>=dev-libs/libcdio-paranoia-0.78.2
+	)
+	google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] )
+	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
+	nfs? ( >=net-fs/libnfs-1.9.8:= )
+	net-misc/openssh
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	test? ( dev-libs/libgdata )
+"
+
+src_configure() {
+	local enable_logind="false"
+	if use systemd || use elogind; then
+		enable_logind="true"
+	fi
+
+	local enable_gcrypt="false"
+	if use afp; then # currently HAVE_GCRYPT and linkage only used with afp; check it on big bumps (grep for HAVE_GCRYPT and enable_gcrypt); adjust depends if changes
+		enable_gcrypt="true"
+	fi
+
+	local enable_libusb="false"
+	if use mtp; then # currently HAVE_LIBUSB and linkage only used with mtp; check it on big bumps (grep for HAVE_LIBUSB and enable_libusb); adjust depends if changes
+		enable_libusb="true"
+	fi
+
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dtmpfilesdir="${EPREFIX}"/usr/lib/tmpfiles.d
+		$(meson_use policykit admin)
+		$(meson_use ios afc)
+		$(meson_use afp)
+		$(meson_use archive)
+		$(meson_use cdda)
+		$(meson_use zeroconf dnssd)
+		$(meson_use gnome-online-accounts goa)
+		$(meson_use google)
+		$(meson_use gphoto2)
+		$(meson_use http)
+		$(meson_use mtp)
+		$(meson_use nfs)
+		-Dsftp=true
+		$(meson_use samba smb)
+		$(meson_use udisks udisks2)
+		$(meson_use bluray)
+		$(meson_use fuse)
+		-Dgcr=true
+		-Dgcrypt=${enable_gcrypt}
+		$(meson_use udev gudev)
+		$(meson_use gnome-keyring keyring)
+		-Dlogind=${enable_logind}
+		-Dlibusb=${enable_libusb}
+		-Ddevel_utils=false # wouldn't install any of it as of 1.38.1; some tests need it, but they aren't automated tests in v1.38.1
+		-Dinstalled_tests=false
+		-Dman=true
+		-Dprivileged_group=wheel
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if use fuse; then
+		tmpfiles_process gvfsd-fuse-tmpfiles.conf
+	fi
+
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+	gnome2_giomodule_cache_update
+}
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
index d2f88293c9f6..92a91771c165 100644
--- a/gnome-base/librsvg/Manifest
+++ b/gnome-base/librsvg/Manifest
@@ -14,5 +14,5 @@ EBUILD librsvg-2.52.7.ebuild 2538 BLAKE2B 94f34eae9a6ec5584a591ccba117611df6e322
 EBUILD librsvg-2.54.0.ebuild 3077 BLAKE2B 6eaeed128935c3930360e06e70ebd5efd8d832438486e7261c5d4c9d62f5cd5e0d97b0f5537e5f9c856e55d571d811743f9b2492c3d517a9233c80f4c4128931 SHA512 e97f2697e41de6d474ef7c587885d10f20ea2aa25655d468725edf6f6892b7c69c7b0ad34b9197cfed4a58751755a80083aa4bb5cd7ce1f7f3ce83b5f2dd90b5
 EBUILD librsvg-2.54.1.ebuild 2889 BLAKE2B 172441dab4b98ff288eb10c78ed44687e02a892119a0ee8c00e5603c23cf78984b87d3090aee5975d947d8d0bdca5b0a0a42b1aad4a33d3786ee6f9b0df08995 SHA512 cd6686b4266dab735d21d94e9489bdc076def911b7feed2ee043d1d4a031f36e8004585a2b15146221b553508d7c4c5e84c660233d3580646821c226a741fefb
 EBUILD librsvg-2.54.2.ebuild 2883 BLAKE2B 80e5c9edb259a5087518a9b5ed12fdffa7961752d044bf26a4d9e346a97dffec9796792ede660382ff2be0543b4b208e44388c30fb1acca1a8bc7869ed2511f6 SHA512 b9001ed66a0a241db241730c55e675957d312e1f1f9fee1215eb01f4deb698af319f1d4bb2501d5acd98853ba72acc3ad2377f633faff17a5ad2130d5fbcc34a
-EBUILD librsvg-2.54.3.ebuild 2814 BLAKE2B fa064bcfa024c4ee73aded68b3e108376deed4849530bbe96b3a73d87b5b9f55c7974765cc78a5f5430d3f7996db1f0b75870267490a0a535e229ba0cc9a516e SHA512 15cc4a270ab456397188ef2221362d061076e804bf57d52373f49c12dc94311f8d03e2d48c3ff476749c14607427732a7350bc206609fd99f93d1aacf789536e
+EBUILD librsvg-2.54.3.ebuild 2810 BLAKE2B 55a79b6b930f8ceea522cc0e8540596e06f558c5b0861fa5e58ae7fdc042c1fda48d45ef44982c4ecedcd4f0d683cc286431e55a6b74d4b8b60d148b66c8b662 SHA512 354bc1450784b157ef29d416227234e5dd8deaad59a38a772a5fb262fbfbde7427efd06f95bd641ee180b26a0516ebfe51a071b1201807985d174435aa34ebf7
 MISC metadata.xml 312 BLAKE2B 9a8c74fbf88673a6fee588b6c7368d4d40287b3dbb46d591878f5744ce3eaf5fc6b4e711cd50d2ff830e9c0139cd99f629cb378039376dded59373216ec19038 SHA512 0715a267ceda6ecb4d9499951b0d3343b5ccedbfc85441f3001d9293dfdd2d31b214f907c5466676cce899c67f4249cf4b643a46b4d16e1ab6b89ccaac763e26
diff --git a/gnome-base/librsvg/librsvg-2.54.3.ebuild b/gnome-base/librsvg/librsvg-2.54.3.ebuild
index 3b3b249cace9..9065076b5edf 100644
--- a/gnome-base/librsvg/librsvg-2.54.3.ebuild
+++ b/gnome-base/librsvg/librsvg-2.54.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv x86"
 
 IUSE="gtk-doc +introspection +vala"
 REQUIRED_USE="
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index b14f6e8ecd44..f956743a42d9 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,7 +4,9 @@ AUX 42.0-optional-gstreamer.patch 1590 BLAKE2B eb251337ef8f2cba7b0fa9e1643c1155a
 DIST nautilus-41.2.tar.xz 3248212 BLAKE2B be4e4e8fc03751259a1a5d4d1eb726e3026d24376da3fa680c412598219bfb3ced52f9b809004913dffdb9bb1c176dede07288c440c100487b3a337d8eaab417 SHA512 adb14fa1cf37a4797f57ae5162bddcd5b012de270cf955051b69276bc266b1dbfd8027b835f627ae19a1252356b344b1c8a4b7ca79a22512f3138a2c13fd2f3e
 DIST nautilus-42.0.tar.xz 3263108 BLAKE2B 0d06a72cc1ea1a227f6d92ee2841a2fdda9220ccb61bdb43cd5930a8f64393994a746e33a5451d460ca4c15810549c5d94f895ee861efa8ae46b98e25ed20f5f SHA512 c3b182f75f89a31ecb7b4f6b42dfb2f9792e195fdaf0e5f2b1a4dbe0f0d01071cf4ecb8408d6da476aa111ec891462e33c0d139d3423109bd5b4138ae822bd1e
 DIST nautilus-42.1.1.tar.xz 3259444 BLAKE2B 4737c44a6b30c61eeb850dce266f5ee1ed50dd5f2c7da868efb4b407e60a99b1ac0ea2c865a3e4710afabfa8c96c8d29f2dfaab3c56c5ef0236fa0c10a8c1864 SHA512 f8961c41fa2d5109e7011311f79caa1d3b9b71a3cf946a90d1a4dd03a4f0f7daac902e61bc01f6b86c2552255b9dbe0573474dcfe2ea08e0218a3c2bcbc58e48
+DIST nautilus-42.2.tar.xz 3254912 BLAKE2B 303b52fe9bbdb8e437a447004dcd284ee0c66ecaa11db45c52cf8c831f52a764efa03476d69f74840289f200c49b917bc329487bd87d3e776ea5dc1a6ea9b413 SHA512 2b3ba2990b00bbc3abf771b83b9b0a7c1a8b107b1b4955a45879f7d28add713d326bbe84d70056058073edfc3c7b7891547af77b8a34f94fe1b9ca047c76e9c9
 EBUILD nautilus-41.2.ebuild 3187 BLAKE2B 0ef6a93741ea846684150262e296a5775aef7af8395803ecf683ce093fff3d67df20c3786233afcc790d816996b54ac0d8b6c257f866c11edab76b6b980913ce SHA512 523a7f96bf4d2beed2f3906ee4ed8b73bad71de0b7ce6d1fa952778608b45e25cfebabc9674d1cfba875c18a4fcaa963e20da0a2ff238d9f37c85d5d7499e67e
 EBUILD nautilus-42.0.ebuild 3354 BLAKE2B 4b2e0323f3af8387b8f65917e75c30b01ed137423a60709fbd1768c4b67980a7a74b454ff32ecf24bda025b4283e8ed0a289d1dba2525df7156852e9b70e4f4a SHA512 63037e91cd78ed1dd4b73e30530e2014e29cfd3b1a914345ba968c76186d687c90f08e8c65a03bcfcf63c79b9244d41c3270f34c63409daea78162c3ea46d7db
-EBUILD nautilus-42.1.1.ebuild 3343 BLAKE2B 83bdfb0a1369f74746d28f6eae7ef0eb536180d3c029854026458211499a45921bd49b9d1603c0090c565c74167a8af573b336a25115aaa4ab8f973f34e0ed17 SHA512 bf5dd6f560f0f2825d088b69f3ac262143159b770a3fad87ebe8796dd708d3f50c02a01abb8f3509787fb04dbc5fca90aad09ccf9e7ea77cb12af15cd6f517a5
+EBUILD nautilus-42.1.1.ebuild 3340 BLAKE2B f2968baf0c7af84edc0d048a40e4edf84d83338d35d57a146bc6ad8dc10867ca3403c7248d0b1b8b530d451cae7299f35a201dca2b100115073acd79e208931d SHA512 465f03fa321f14ef1b8cef926e2c34b4eaa1f648a13f96e273521f193eca174b8b94539701e377f8de9119a1fa2fbbae8cf733511955db6d674007474872b5be
+EBUILD nautilus-42.2.ebuild 3343 BLAKE2B 83bdfb0a1369f74746d28f6eae7ef0eb536180d3c029854026458211499a45921bd49b9d1603c0090c565c74167a8af573b336a25115aaa4ab8f973f34e0ed17 SHA512 bf5dd6f560f0f2825d088b69f3ac262143159b770a3fad87ebe8796dd708d3f50c02a01abb8f3509787fb04dbc5fca90aad09ccf9e7ea77cb12af15cd6f517a5
 MISC metadata.xml 554 BLAKE2B 80d4d6da040c47ddd01a278a0ca8af3d371f9e88b7c1583a606701bc85331d853d41bcc3a6be73772ce5574a1c50e601b31fa125a5f4c8a6dc39b1308d78af5b SHA512 ad97897d6f8c9be9271c0204fafd3540ac0d798fc8d4a1de1e66503dbb714dfacf0fd4ce23e059044ab7a3a3b687228811aa9adfba16391e6a5dfe2fda11801c
diff --git a/gnome-base/nautilus/nautilus-42.1.1.ebuild b/gnome-base/nautilus/nautilus-42.1.1.ebuild
index c7dab39e1262..8cb207e691f8 100644
--- a/gnome-base/nautilus/nautilus-42.1.1.ebuild
+++ b/gnome-base/nautilus/nautilus-42.1.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
 IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.67.1:2
diff --git a/gnome-base/nautilus/nautilus-42.2.ebuild b/gnome-base/nautilus/nautilus-42.2.ebuild
new file mode 100644
index 000000000000..c7dab39e1262
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-42.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="Default file manager for the GNOME desktop"
+HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="gnome +gstreamer gtk-doc +introspection +previewer selinux sendto"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/glib-2.67.1:2
+	>=media-libs/gexiv2-0.14.0
+	gstreamer? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
+	>=app-arch/gnome-autoar-0.4.0
+	>=gnome-base/gnome-desktop-3.0.0:3=
+	>=gnome-base/gsettings-desktop-schemas-42
+	>=x11-libs/gtk+-3.22.27:3[X,introspection?]
+	>=gui-libs/libhandy-1.5.0:1
+	>=x11-libs/pango-1.28.3
+	selinux? ( >=sys-libs/libselinux-2.0 )
+	>=app-misc/tracker-3.0:3=
+	x11-libs/libX11
+	>=dev-libs/libxml2-2.7.8:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	>=app-misc/tracker-miners-3.0:3=
+" # uses org.freedesktop.Tracker.Miner.Files gsettings schema from tracker-miners
+BDEPEND="
+	>=dev-util/gdbus-codegen-2.51.2
+	>=dev-util/meson-0.57.2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.10
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+PDEPEND="
+	gnome? ( x11-themes/adwaita-icon-theme )
+	previewer? ( >=gnome-extra/sushi-0.1.9 )
+	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
+	>=gnome-base/gvfs-1.14[gtk(+)]
+" # Need gvfs[gtk] for recent:/// support; always built (without USE=gtk) since gvfs-1.34
+
+PATCHES=(
+	"${FILESDIR}"/3.30.5-docs-build.patch # Always install pregenerated manpage, keeping docs option for gtk-doc
+	"${FILESDIR}"/42.0-optional-gstreamer.patch # Allow controlling audio-video-properties build
+)
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	if use previewer; then
+		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
+			To activate the previewer, select a file and press space; to
+			close the previewer, press space again."
+	fi
+
+	# Disable test-nautilus-search-engine-tracker; bug #831170
+	sed -e '/^tracker_tests = /{n;N;N;d}' -i test/automated/displayless/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc docs)
+		-Dextensions=true # image file properties, sendto support; also required for -Dgstreamer=true
+		$(meson_use gstreamer) # gstreamer audio-video-properties extension
+		$(meson_use introspection)
+		-Dlibportal=false # As of 40.2, all libportal usages are flatpak-specific
+		-Dpackagekit=false
+		$(meson_use selinux)
+		-Dprofiling=false
+		-Dtests=$(usex test all none)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use previewer && readme.gentoo_create_doc
+	meson_src_install
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	# TODO: Tests require tracker testutils (e.g. tracker-sandbox), which may need some sorting out with tracker use flag deps
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if use previewer; then
+		readme.gentoo_print_elog
+	else
+		elog "To preview media files, emerge nautilus with USE=previewer"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 112cbb5056f5..972f2fa300f3 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 59bec445a3cb..139449d84f19 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -3,7 +3,9 @@ AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020
 DIST evolution-data-server-3.42.4.tar.xz 4623968 BLAKE2B e2ae0b4dfc6f34fac384093dd52b88fadce70c646d70c7df1758a6d514bcec1f092e8f4d8f28d50651201b45791112f811b94c8083487ca072bd002f6a11b75a SHA512 e2eba6ffeac2924366169cdae4258c7fc7d1172c2aa3a0ced83bea60556627b39ee9ee6f45a64081de232e0c2e801e2cbb19b6fa4a8958ad0f868c87e0b20f4a
 DIST evolution-data-server-3.44.0.tar.xz 4782136 BLAKE2B 1e1a0419eba31b656107c9ce84f8e6cd4fed37e593417009a6466832ed418e12e8069e989b5eff75e454faeb51429373ddd123eae8a4bc544226d456232376ff SHA512 7c4e7fdc25814b03bf5d6bf3a1d368b318cb093f5656c39dbe59a1b85929a5eb3e6f36135cfcdeb7600baa9f5dedf6ac122974818f7e908b282578bc7122b6b5
 DIST evolution-data-server-3.44.1.tar.xz 4782040 BLAKE2B d12c885a2e2e0eaccb54c46c83117e70708322169e55fb2ec3e64d4d094042164e7586964aeee45f4648f6506ab01c3bd92349a5a182ef2e1e5cbcc395de9b33 SHA512 d09a9f79e1b93ae112c9ed58d7f71c5034db5c2bdc3db9b452475f1fb490ce7945afaaec5e4f80de033e4280d86a4f7eb8026bdda5a78d03da1f496dce000e6d
+DIST evolution-data-server-3.44.2.tar.xz 4783272 BLAKE2B ab559d26345a8a42b350a042474084ecfc0efaba73e2ae7f93d350e8edd040c27600df590f25a9059db670ed0ddd3eaaab92518644db805d2f7beaa2a0c53803 SHA512 cf7fefeb00899cddca0fb9abeddead582ae944f41960c815813312ecf9bde5a19bcd41fa7038eddf7d5c7cf568fda51e9dbb0603bebec54284ce6ac1f9c10305
 EBUILD evolution-data-server-3.42.4.ebuild 4376 BLAKE2B 269803dedeea343d5b0993d8a4e700033c2769b7afeea2a32b908b56eeb3494be3a7f4fab31836a1cea2f08599519349ccc0c72257808daf5e98ddf5d272d43a SHA512 523d2bddfe075265398855568ad655fef74fed840ca49837a6551df66c35cae695172e39272861b5ef47d7bbd4ab746af96363a5129e26eecf29dfc082001397
 EBUILD evolution-data-server-3.44.0.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
-EBUILD evolution-data-server-3.44.1.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
+EBUILD evolution-data-server-3.44.1.ebuild 4368 BLAKE2B 3e1521383bba494e35bc00c1bdf5b58f3a45851ab0eaf69f957a55b0eed90268eaccdb0a2cae00f574c52c2edecd5b8d095de49a51b6028dbfa3b1153456a06f SHA512 f0a09b4d83a58414c0c8d920fea6cd6ee90fef21e01a3d4093bf9990ac194ba39aa978be21bb1b482fc1d00735528722185918389504876a679c45ae2c7946f4
+EBUILD evolution-data-server-3.44.2.ebuild 4371 BLAKE2B 6cf0d1f34588ecf9c91e2ed0a4781abbca3b83f7aeb4ddbfdecf8fc0e215a656a2e95976a6afb4378bc31448fe7e2ca2fc73b3d16317bafefcab9f3aebbe4fd6 SHA512 b5a25874a90b8bdbf327dcd21e8b46e55f75ed6ef2f5f936f553f150122975df384e7ed52066ebcfe01d15c12b068a0d8f5dc3560391e32a5e67d8d07ae250ff
 MISC metadata.xml 850 BLAKE2B f3e730c63794d5890e76c1f2c7e388b1d6320fc6ef64fa405365a27e7d3883fd09b9cfd875ef0d774bdd51eae5237fff0fd7bd1e6be81a2e0d9252e0b1263afe SHA512 8657f87116f9ad70c24711f270f7b71a57e48bb4f9a8780900f9f6d3da550d0f7b6ae2da453ff6bb76ffd948935f534fdb4b3545a46b0129fbae68a8d1fcecdb
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
index 768bfb30adc4..1fe248fefe52 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so so
 IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 # gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
 # berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild
new file mode 100644
index 000000000000..768bfb30adc4
--- /dev/null
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake db-use flag-o-matic gnome2 vala virtualx
+
+DESCRIPTION="Evolution groupware backend"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
+SLOT="0/63-26-20" # subslot = libcamel-1.2/libedataserver-1.2/libebook-1.2.so soname version
+
+IUSE="berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
+# berkdb needed only for migrating old addressbook data from <3.13 versions, bug #519512
+# glib-2.70 for build-time optional GPowerProfileMonitor
+gdata_depend=">=dev-libs/libgdata-0.17.7:="
+RDEPEND="
+	>=app-crypt/gcr-3.4
+	>=app-crypt/libsecret-0.5[crypt]
+	>=dev-db/sqlite-3.7.17:=
+	>=dev-libs/glib-2.70:2
+	>=dev-libs/libical-3.0.8:=[glib,introspection?]
+	>=dev-libs/libxml2-2
+	>=dev-libs/nspr-4.4:=
+	>=dev-libs/nss-3.9:=
+	>=net-libs/libsoup-2.58:2.4
+
+	dev-libs/icu:=
+	sys-libs/zlib:=
+	virtual/libiconv
+
+	berkdb? ( >=sys-libs/db-4:= )
+	gtk? (
+		>=app-crypt/gcr-3.4[gtk]
+		>=x11-libs/gtk+-3.16:3
+		>=media-libs/libcanberra-0.25[gtk3]
+	)
+	oauth? (
+		>=dev-libs/json-glib-1.0.4
+		>=net-libs/webkit-gtk-2.28.0:4
+		${gdata_depend}
+	)
+	gnome-online-accounts? (
+		>=net-libs/gnome-online-accounts-3.8:=
+		${gdata_depend} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
+	kerberos? ( virtual/krb5:= )
+	ldap? ( >=net-nds/openldap-2:= )
+	weather? ( >=dev-libs/libgweather-3.91.0:4= )
+"
+DEPEND="${RDEPEND}
+	vala? ( $(vala_depend)
+		net-libs/libsoup:2.4[vala]
+		dev-libs/libical[vala]
+		oauth? ( dev-libs/libgdata[vala] )
+		gnome-online-accounts? ( dev-libs/libgdata[vala] )
+	)
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gperf
+	gtk-doc? ( >=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.1.2 )
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Some tests fail due to missing locales.
+# Also, dbus tests are flaky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare call
+src_prepare() {
+	use vala && vala_setup
+	cmake_src_prepare
+	gnome2_src_prepare
+
+	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
+
+	# Make CMakeLists versioned vala enabled
+	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
+		-e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
+		-i "${S}"/CMakeLists.txt || die
+}
+
+src_configure() {
+	# /usr/include/db.h is always db-1 on FreeBSD
+	# so include the right dir in CPPFLAGS
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	local google_enable
+	if use oauth || use gnome-online-accounts; then
+		google_enable="ON"
+	else
+		google_enable="OFF"
+	fi
+
+	# phonenumber does not exist in tree
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_PRIVATE_DOCS=$(usex gtk-doc)
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DWITH_KRB5=$(usex kerberos)
+		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
+		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DWITH_PHONENUMBER=OFF
+		-DENABLE_SMIME=ON
+		-DENABLE_GTK=$(usex gtk)
+		-DENABLE_CANBERRA=$(usex gtk)
+		-DENABLE_OAUTH2=$(usex oauth)
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_GOA=$(usex gnome-online-accounts)
+		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
+		# ENABLE_BACKTRACES requires libdwarf ?
+		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_WEATHER=$(usex weather)
+		-DWITH_GWEATHER4=ON
+		-DENABLE_GOOGLE=${google_enable}
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_VALA_BINDINGS=$(usex vala)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${FILESDIR}"/calentry.schema
+		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
+	fi
+}
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
index ff500cbc67a6..5adb8fc9574a 100644
--- a/gnome-extra/evolution-ews/Manifest
+++ b/gnome-extra/evolution-ews/Manifest
@@ -1,7 +1,9 @@
 DIST evolution-ews-3.42.4.tar.xz 686236 BLAKE2B f68a3c4c41419eb5d316ce8271a8c8411217e63b951230fb0151d79fca15e82e36248e3bd676518ae5f8a92d7e1d1dbf6a140bbd63dee6dca97fe48f76d502f9 SHA512 5ce1a228414d8c456962ce944a01efbeefb059bc9ff358c95bb7cec72e74ad29cd9476c9aa396b01df35d7c89fff743837dc2f9763129a5f794cbbd14557c2e3
 DIST evolution-ews-3.44.0.tar.xz 688444 BLAKE2B d563137c481dc51f9934fe44a3c563e7204d63ebdac1de7a018da27f8c05cc3d56ddc37848fb57ed909e6bc4d98e2752d401f39e92ccd20b507033404c6b7284 SHA512 0625262e485edf7dc5a0449acae3d65992d4f17dcc64196e449922e3eeb4c8ce57cf0220ecf626bcfcd81b5cea1273ccde18f0dbb9073f56ee923a3cbfb93a83
 DIST evolution-ews-3.44.1.tar.xz 688764 BLAKE2B bf3b5785a533721b6100479a6cd409a49d3aa37055d6a24a5b6d8ca1338f051ab4cb9801f24ab624d4c24dcb3c3cba7639001269514206749ef305ce0723063c SHA512 69d60ebd6e65fae505515b5ade626c867d9272e80f906f55933617c58148441da49f3d36a36205cacdb7f4997da4b90a77f3b9011775f20ac627728a41b210b0
+DIST evolution-ews-3.44.2.tar.xz 690680 BLAKE2B 029083bcb29d8c6883105fb3e5648501f620946fb11aa60e87feb79857c3e92247ae9987e3a40c185552dd60887f6b6aab00fec3d47f8340357aabf51dcfd4b7 SHA512 dac8ddfc04993585de0dad8eb34ec7296ab2146806a49db1ef182844abee7f383187f621f5b8beaddf6ffbab431ea7d811ce02ff64b87448fb2ff324d28a3620
 EBUILD evolution-ews-3.42.4.ebuild 1406 BLAKE2B 2efed5c1908dedf348d557257fa96afca953ca8ce5760c923e3d2ea77ccad02e23304020ea0d2e66a32837b0f177a6a910c040b5d65bc59038d2d13116c28da2 SHA512 deda632646a2586dd54fa80e06f78bd6b10cc8701b2024b4bfbd3cfcc85d76f3063285cac0eebf1d893c40f6be7c801b6f7d67726be3779687955c1b93614b16
 EBUILD evolution-ews-3.44.0.ebuild 1415 BLAKE2B 2be35cc918abc4b827f17fbb62748da42eebcb323cac56c227f647368617704238dcb9d9b33536add9cdc4be01898b8734e4969f67aded88c49d2f829324e4e1 SHA512 75e7e713ca8d846d168cc27713c7c1e4d78e16d5fdb192872e9269d4263298a7f60ddb29b49a550f13da018af5f34fa4ba82312ee5111b1a2b171df91dde48ef
-EBUILD evolution-ews-3.44.1.ebuild 1515 BLAKE2B 7041e1c003effc3fd82a1736651cf4ae19729eb2dee8d6d8c1692bb5b72a7ca1ec2cd1d69f90d37b0a87f78765df747595e4e079254f279a323aa7e657bd8231 SHA512 38c24b68896774d456266760c9c04fc9812ebb4b41abe954db5451b8f8556b7c4dcc9ec9108a6713e6d2d50f80d93bf5339558811e1f54b8ab04209e96bb260a
+EBUILD evolution-ews-3.44.1.ebuild 1513 BLAKE2B 2a75282687e78de16ab8f786332db8886ba8bae3401815209a60320d5a87277d1155d1fa2cf8a0c6d502414fe07e8104b2350544845bc4bbfc6fa5b8838d0174 SHA512 75ed530a0622b572b91980cfb4776b2fe3ceef5367569f73637f78a1fe8757b70b458d9209fc6d19c3a7242c48fed7acb79a478c59bde8108a1a8479af59e538
+EBUILD evolution-ews-3.44.2.ebuild 1515 BLAKE2B 7041e1c003effc3fd82a1736651cf4ae19729eb2dee8d6d8c1692bb5b72a7ca1ec2cd1d69f90d37b0a87f78765df747595e4e079254f279a323aa7e657bd8231 SHA512 38c24b68896774d456266760c9c04fc9812ebb4b41abe954db5451b8f8556b7c4dcc9ec9108a6713e6d2d50f80d93bf5339558811e1f54b8ab04209e96bb260a
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
index 478c6401b9f3..f4ca9c3b5500 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="test"
 
 # libical-glib currently (2020-02-29) oddly behind USE=introspection
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild
new file mode 100644
index 000000000000..478c6401b9f3
--- /dev/null
+++ b/gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 optfeature
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+
+# libical-glib currently (2020-02-29) oddly behind USE=introspection
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.62:2
+	>=dev-libs/libical-3.0.5:0=[introspection(-)]
+	>=dev-libs/json-glib-1.0.4
+	>=dev-libs/libmspack-0.4
+	dev-libs/libxml2:2
+	>=gnome-extra/evolution-data-server-${PV}:0=
+	>=mail-client/evolution-${PV}:2.0
+	>=net-libs/libsoup-2.58:2.4
+	>=x11-libs/gtk+-3.10:3
+"
+DEPEND="${RDEPEND}
+	test? ( net-libs/uhttpmock )
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=dev-util/intltool-0.35.5
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+# Unittests fail to find libevolution-ews.so
+RESTRICT="test !test? ( test )"
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_MSPACK=ON
+		-DENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+}
+
+pkg_postinst() {
+	optfeature "oauth support" gnome-extra/evolution-data-server[oauth]
+}
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
index 1ef795688f31..509abb3df335 100644
--- a/gnome-extra/gnome-boxes/Manifest
+++ b/gnome-extra/gnome-boxes/Manifest
@@ -1,6 +1,8 @@
 AUX 41.3-fix-build-with-meson-0.61.1.patch 1237 BLAKE2B 4f010d12654cbc7d67ddfaa4980f1ed04a46e4161e96d66700b7c341350b1e22122b26a544e7c699f0e8e14ec7612dd800b1ae90922659ad946b4ec396ef5c2e SHA512 79fd82c6edf250384ef4ad73021b3dd77b088fcc7972fedb9beaaeaadcb103e07f53e3e388683ef992e45407f2685284a75a51b5c4ca51bcac3c041f155ab33b
 DIST gnome-boxes-41.3.tar.xz 1614656 BLAKE2B 1d2a53ba833cdf130f1b2a350871344b0fd4c3f223e069d707e8279748a2fbd21e0d618d0cb229bb3bcfaa84e41d32da763df1d84efd7b749d890f28aceae904 SHA512 6aa8daf03898b7ec28397897b054e220bf2eabb7acbf4ea4dab7035bbe24e44c8a75e488c788f2b8cc56d6e72785651574cffa84cc1a06e5c9c7e0772839bfe7
 DIST gnome-boxes-42.0.1.tar.xz 1231252 BLAKE2B e80503c1a2dbc4a4990ff8fb477f7e72fe1a880412a91d42fffd93c68226c91d254daf28301d816e3555f8a88c9b3f27b35df406bde7483a4a8e98dd3e83e756 SHA512 74968525943ff1a695f2d0cbcd3b9066f2b8c87d6b3b7dea5dab2911600fb09c961ee547a759eed2a23636c7b242a86b56e5ee579dc01e9e9c9caac67a845b03
+DIST gnome-boxes-42.1.tar.xz 1235760 BLAKE2B 4de67e369d2135acc2407789c06441840da32c2d13eb329ab874021a56685f64c66fcf47a00a9ddc287a5eeccc2fae799a26147a9ade6ab8b1877a3865407ac7 SHA512 8233c06abe7c6a3e816d599fd2f2729e19b356f130d0ec0cc9d3c47cab0d10ffcc9e8e3f263999ac50c17a7ea63bb417213465cca641fff60ea4bf1c79caaaa7
 EBUILD gnome-boxes-41.3.ebuild 3949 BLAKE2B 56bad55abc79cfb709f4a6bd595353a6022bbbe47da9b67981aba7e58d67209ad1233f1c1e4eaece23c7d435ce824839a7d891b4613603ae769a0af1035d54cd SHA512 3620a1f56bd98e51bd7e67a1f90dc7372af0218bf284f9bff3bd7fe331c5d1e32879b7c6d375ee285d824ebb17c088747b84a4116db756a3cdd0979c9b434fdb
-EBUILD gnome-boxes-42.0.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
+EBUILD gnome-boxes-42.0.1.ebuild 3852 BLAKE2B f077a6d89ead04038dce83f85f0c7ee1d363fc26a0a2e07db5748d65f140cde0d55d2f89e57bd566dbdaefbac9e9dda8fba3173dbd918444d9d05c30b3db01d8 SHA512 6f1ebb0dd036865f817d0c3651b4d6739967814778aecfa7039a1f7e5eb04c9258f030d94924ec2ebb56ad14c42c774b29ea17396fed4d7d68cb3262fec0364c
+EBUILD gnome-boxes-42.1.ebuild 3853 BLAKE2B 9d3dab4e21c33ecdb5ef733afa2614b31bb89117a777fc3ea89bfec730ac046d4ef2c2216bbddcd71844bcfe2a19a270f8bc75286aa5748772479b7c7a26d064 SHA512 ef898a44103bcc5219833dd786702e72aa49aaf40d69a2f5a00981f22065a3a93f4f300a0416eab67150d1a0127e8685979c63c5198ac74bda61ecd61cad9227
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
index 52f6b07c7db3..4d6d803a385d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+ CC-BY-2.0"
 SLOT="0"
 
 IUSE="rdp"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
 # FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
new file mode 100644
index 000000000000..52f6b07c7db3
--- /dev/null
+++ b/gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+
+DESCRIPTION="Simple GNOME application to access remote or virtual systems"
+HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
+
+LICENSE="LGPL-2+ CC-BY-2.0"
+SLOT="0"
+
+IUSE="rdp"
+KEYWORDS="~amd64"
+
+# FIXME: qemu probably needs to depend on spice[smartcard] directly with USE=spice
+# FIXME: Check over libvirt USE=libvirtd,qemu and the smartcard/usbredir requirements
+# Technically vala itself still ships a libsoup vapi, but that may change, and it should be better to use the .vapi from the same libsoup version
+# gtk-vnc raised due to missing vala bindings in earlier ebuilds
+DEPEND="
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.24.1:3
+	>=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)]
+	>=gui-libs/libhandy-1.5.0:1=
+	>=sys-libs/libosinfo-1.7.0
+	app-crypt/libsecret
+	>=net-libs/libsoup-2.44:2.4
+	virtual/libusb:1
+	>=app-emulation/libvirt-glib-4.0.0
+	>=dev-libs/libxml2-2.7.8:2
+	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
+	app-misc/tracker:3
+	>=net-libs/webkit-gtk-2.26.0:4
+
+	>=dev-libs/gobject-introspection-1.56:=
+	>=dev-libs/libgudev-165:=
+	rdp? ( >=net-misc/freerdp-2.0.0:= )
+" # gobject-introspection needed for libovf subproject (and gtk-frdp subproject with USE=rdp)
+# These are called via exec():
+# sys-fs/mtools mcopy for unattended file copying for files that libarchive doesn't support
+# app-cdr/cdrtools mkisofs is needed for unattended installer secondary disk image creation
+# app-emulation/libguestfs virt-sysprep is used for VM cloing, if not there, it logs debug and doesn't function
+# sys-apps/policycoreutils restorecon is used for checking selinux context
+# app-emulation/libvirt virsh used for various checks (and we need the library anyways)
+# sys-auth/polkit used for making all libvirt system disks readable via "pkexec chmod a+r" that aren't already readable to the user (libvirt system importer)
+# app-emulation/qemu qemu-img used to convert image to QCOW2 format during copy
+RDEPEND="${DEPEND}
+	app-cdr/cdrtools
+	app-misc/tracker-miners:3[iso]
+	app-emulation/spice[smartcard]
+	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
+	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
+	sys-fs/mtools
+	sys-auth/polkit
+"
+# gtk-frdp generates gir and needs gtk+ introspection for it
+# This is only needed for creating the .vapi file, but gnome-boxes needs it
+BDEPEND="
+	$(vala_depend)
+	net-libs/gtk-vnc[vala]
+	sys-libs/libosinfo[vala]
+	app-crypt/libsecret[vala]
+	net-libs/libsoup:2.4[vala]
+	app-emulation/libvirt-glib[vala]
+	net-misc/spice-gtk[vala]
+	x11-libs/vte:2.91[vala]
+	dev-libs/appstream-glib
+	rdp? ( x11-libs/gtk+:3[introspection] )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Before running gnome-boxes for local VMs, you will need to load the KVM modules.
+If you have an Intel Processor, run:
+# modprobe kvm-intel
+
+If you have an AMD Processor, run:
+# modprobe kvm-amd"
+
+pkg_pretend() {
+	linux-info_get_any_version
+
+	if linux_config_exists; then
+		if ! { linux_chkconfig_present KVM_AMD || \
+			linux_chkconfig_present KVM_INTEL; }; then
+			ewarn "You need KVM support in your kernel to use GNOME Boxes local VM support!"
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddistributor_name=Gentoo
+		-Ddistributor_version=${PVR}
+		$(meson_use rdp)
+		-Dinstalled_tests=false
+		-Dflatpak=false
+		-Dprofile=default
+		-Duefi=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
index 888cdbb0ef86..6f465ec8c49b 100644
--- a/gnome-extra/gnome-calculator/Manifest
+++ b/gnome-extra/gnome-calculator/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-calculator-41.1.tar.xz 1046092 BLAKE2B 2c9a8757adcb9858f826f303ebcec44b869e3be95f49d2722e57765f187d725f82dda6b1cac1302640d686fdccebbf5c8565c5bbd064d1d647bc5d23434d55ba SHA512 fc0d5c0744c52cd68f076afa29e3028f4998fe04e2e253d267b0350514ebae72172e90a345db69bc13d4ead2c7679416529d7192a34cfd970c7b2773870b9604
 DIST gnome-calculator-42.0.tar.xz 1200548 BLAKE2B d628b1b112a1f4b42e8bbc696cb5c0f5aca969f0fa999a9367e495d93c2e9e01b7a8669dbc057da4aa019d9fa9ce3612210c35949bd9aab2664ebc413324d6fc SHA512 9c28126321fdbd9c60f4d992a37f3081b46de24eaf1a057373b8b905c4ad218145cfeb629b001094b4b137cafee5dcdeaae3920ca95f2ec2d4fbe8ea1ef1b72e
+DIST gnome-calculator-42.1.tar.xz 1199604 BLAKE2B ffb2cd60847aa4365d2624827153bb76f3a142237193c9bb3b924827cca22f7b3fbbd21d02af8e2352bb567fe1bae025e12003769e57716e406b982a6f390563 SHA512 c919322e14fb917b3cb02eb365e806872d0b696f7207b25b0f4eaa192d2994fca83e2470355c20bf119f8fd95734beb9575d0c29e7a7b1bf1a9926c0b5ccf736
 EBUILD gnome-calculator-41.1.ebuild 1721 BLAKE2B 09161f86fba2639d75a60137f7ccf149c427234c5b7872621241b6c065d5618cb8b825a31d516ecb8ea3e07b568f00ea5291eeab6511c6e9cf70ca3f3cb6e03c SHA512 f966f823a9ad5825c8049e0336f5615c7893b1694a2c1333c3ec8731d5dd3f47b8e13a73cc789d7e8971a56c4be65e12eb946dd0581ddf4d0e41979f8cd28caa
-EBUILD gnome-calculator-42.0.ebuild 1674 BLAKE2B 40d5bc4d28d1d4b9482ad3b81b0eb97751849efe57105eac78e5181893290b9bf2dafe8c1cfd549c5301dec5b3897132ffbd7fa522aac9eb0664fdc7201acbdf SHA512 b0e92a8ebed616b605f1137a0943e0141830e47d03e4198fb4e3d56d3a77455f168ce1b1930ff0ddddccb77c7af05ed4da0beb6c5b3d89a14354030b978540b3
+EBUILD gnome-calculator-42.0.ebuild 1672 BLAKE2B c8a76674ce80811f96f15715ae29b4ebdd871a1694762cc9c7996e25dd188cdacccc88b02264a7300c31fb2a390f0e262d36e5ae480169e43317d984d2112556 SHA512 e3fefd896304cdcf0eafdf6691de2bdfee9c25a30eb8bc221f89839da574f31e3357372994da81127b98981e40a9c0139c795601f23da24f427c7daae948f8e3
+EBUILD gnome-calculator-42.1.ebuild 1615 BLAKE2B cc82573c9adde6d2e4b5b35e1edc4fd41722044c77d3a66bc3ecc667a3b420b91b3e2769188846eed12cb9dc81698e6a41659aeb34bf41f2690cde2870aa9973 SHA512 5fd7c36554b0209d317d40f9036801fa064b06ec20a95c47b6971a678cc38262779a8ee07c218b0e7c2c291af252e47bad428e1de53ad64c23a9b5e6f603c96b
 MISC metadata.xml 436 BLAKE2B 32bdac72c16828ca6ef52e23f380603787e6f08829abe8576cc7475cc48fa3e2612d39891e7ece1a1cce1eb4b7e45ca53af8e058de5d68cbc1a9ea4e2c62f133 SHA512 04f0795da8fbdcd87eb4a77a70934bec3c7be51876248782b90fb94c0831ae2ba30e619bcbd078196fcca6164225752a84361964e91f2b74a10a22e75d3fd902
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
index 346e749e13c0..89afc16a63a3 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
 LICENSE="GPL-3+"
 SLOT="0"
 IUSE="+introspection test"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
 
 # gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
 # altogether, thus we need them installed by gtksourceview[vala]
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
new file mode 100644
index 000000000000..4215d0bb9217
--- /dev/null
+++ b/gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+VALA_MIN_API_VERSION="0.40"
+
+inherit gnome.org gnome2-utils meson vala virtualx xdg
+
+DESCRIPTION="A calculator application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+introspection test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtksourceview vapi definitions in dev-lang/vala itself are too old, and newer vala removes them
+# altogether, thus we need them installed by gtksourceview[vala]
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=net-libs/libsoup-2.42:2.4
+	>=dev-libs/libgee-0.20.0:0.8
+	dev-libs/mpc:=
+	dev-libs/mpfr:0=
+	>=gui-libs/gtk-4.4.1:4
+	>=gui-libs/libadwaita-1.0.0:1
+	>=gui-libs/gtksourceview-5.3.0:5
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	$(vala_depend)
+	net-libs/libsoup:2.4[vala]
+	gui-libs/gtksourceview:5[vala]
+	gui-libs/libhandy:1[vala]
+"
+
+src_prepare() {
+	default
+	vala_setup
+	# Automagic dep on valadoc - don't bother for now
+	sed -e '/subdir.*doc/d' -i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddisable-ui=false
+		#-Dvala-version # doesn't do anything in 3.34
+		$(meson_use !introspection disable-introspection)
+		$(meson_use test ui-tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
index 66fcf2229899..0b34ca448862 100644
--- a/gnome-extra/gnome-calendar/Manifest
+++ b/gnome-extra/gnome-calendar/Manifest
@@ -4,5 +4,5 @@ DIST gnome-calendar-42.0.tar.xz 579044 BLAKE2B ab6b7f10b234b277364dcee95aec7b616
 DIST gnome-calendar-42.1.tar.xz 578424 BLAKE2B a9c62093eb89e198bec801aa070d9e2afed87833dce85a55775d4938cda23fc7dd166b9739e208e17d40b82e7dfcf0e76c83c09eb07786f9d79c38fed910d616 SHA512 5f50ab84f98c3ddf4c1e49f9556e47f6590c5eb8a3b598edb76d96d5c8eab48003e957d5b199a94a3955951453e3c3b783745c9b9376aee2d93d14ff95178093
 EBUILD gnome-calendar-41.2.ebuild 1218 BLAKE2B bc4e3fa9635ef8460c292e806a7ceb8658a5a32aec240b0ec574461756682a16475c4fc5993ae7c09fd199f515bd4a27a9b534e4eb82110379ca80a63276922c SHA512 a740044bcc16abf72ee2c52b43cd63c1cb8099ff32d0bacb8708b7961e2da3058659af65d63376c12aedd6dfc165d732bfbc945b42ce87edddd57a3df9293663
 EBUILD gnome-calendar-42.0.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
-EBUILD gnome-calendar-42.1.ebuild 1096 BLAKE2B d92a32cb3cbee8723b892eac246790a6fa3f22c247dc38ec19664a8cf7b1148dc04951fdafcd7b72ad2494d241d9d396fcc5b9a058b6142f9bb0f2f33dbbd46d SHA512 c574b92de73dca21e67988dc4408f9021ab8b9305f2ace73a17992c1432dfae2cc3a4f114b0c4a13a02e3937211370918979560163e50360eec02d4cb370c727
+EBUILD gnome-calendar-42.1.ebuild 1093 BLAKE2B eaa1a3b269addf90f7b23c35586ed606b08811fa24dd0b303e88ff40871fada4d72357e2025acf52da8eda9e2eb6ffcbbc0ac777d37f4dd4b54d6e1fc1d8b6df SHA512 30409e17f23f833624e318cba0881268034f37cafe6c76ad6187df4185b02aeacb12cee6b654b53f735743c4df3aaf8a6a236912cc8bc00701d7af2366191343
 MISC metadata.xml 523 BLAKE2B ac729de842a6c4af26151fe8a6325fd880715ef5bdba87af11d3fa8b39673c13a32d9cfcaf8c13c246640bd63af8391eed13d775840a337b4e5cf85acc779df0 SHA512 0e87a27fdbccd8d5b71a2b0c57a0b1af281f8f4c64da1a7d091825d03ed3bc4897995f705bb2210800c549aee7d038742edcb3874db0fabe2be1e918483f91b2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
index 4a5ef1c8dce0..ed7f77824527 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 # >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
 DEPEND="
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
index d9462599b574..cabad68e59fa 100644
--- a/gnome-extra/gnome-characters/Manifest
+++ b/gnome-extra/gnome-characters/Manifest
@@ -2,5 +2,5 @@ AUX fix-build-with-meson-0.61.patch 575 BLAKE2B 29986accfef997c31c3810781a1f896d
 DIST gnome-characters-41.0.tar.xz 197092 BLAKE2B d903489ed8fc4b722c5635fe5aa57eb00803b5a357405b7fbbe9af844cc3112070ef8fbcf79147578ce99dacafda287e43bfc57a2f5e9cf75dae56e388453109 SHA512 faa76b8ced642d5a1c4641fc4670800f851dd0aae98cd227fd0847c5b930d572f6838e677e11858d62f672a6cabfb1c5aa582a534cd8e37541e9fc1bb16fcc04
 DIST gnome-characters-42.0.tar.xz 561308 BLAKE2B 454d2bbdc5e8486f50b3f21bba4a65aa0920654c2cc3376cdda62070011c1a296f240632ddcd412add7953fccb2780ba37ac3196aef138e9771cdf5a81061441 SHA512 ba6fa07ff90ede1cba0e541f0c4bda63f1d6122c18af44dafa3bfb0fa6f9580a3cd8580d0a12510e2eb95afedb4b0f350accc37eee85c3aa4422a66732dff404
 EBUILD gnome-characters-41.0.ebuild 946 BLAKE2B 9b14d0665331d3018fcec439346d3379f0a792e8000897e2fce554c96617365727397802f6c5182f52908a5b1f8bc26f16234ef64fcaed9f925b8313fe39444b SHA512 92a6dd7d59d18ee1489afc56ad28c839d6fed49e8d3403d82adbd235b44565ae90af01d5f128d1b6b4dc823eb25615bc7a451430dd4ce5e7961e49f7424c1b18
-EBUILD gnome-characters-42.0.ebuild 889 BLAKE2B 65ee1ec9ee99394868ff61373a7ba1ebe88a8325cfcc9ef56ca338ebe189cddc9d526239ed1e3e1c174ab2111304f007a821a7308fe215122cc0e99dd6599666 SHA512 53ef8279032ed5bec03f1ab3b3062397d9b7445e100c324ebdd868282b8fe98e82bbe649b45ee368a65b8524abd9423b7524c96ae9aaec64f0b31ff147fce239
+EBUILD gnome-characters-42.0.ebuild 886 BLAKE2B 8b8dca7593698dc38ede5d17edbed25f9214c77ea9d93782a81ba30240d03cfc43f3dd468945016b2e85ec15375da4f279efa7572571e1664dc55700c3274671 SHA512 683a6a69912d74edac3951c1885f8aac9c46c6cd7c385003553882c66530ec1fb6dd35b5db84f57dd1dc960e786531344591de7087f0fd32c39a5776c95fa80e
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
index ec5ee407a8a9..7faa01532845 100644
--- a/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
 
 LICENSE="GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/gjs-1.50
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
index c168a9da2caf..e669fd1a315d 100644
--- a/gnome-extra/gnome-clocks/Manifest
+++ b/gnome-extra/gnome-clocks/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-clocks-41.0.tar.xz 385088 BLAKE2B d2c83212b2817767f8711cfd9352a642059f1dfbabbed007c04d4ae5c1086152eeaa5f6e4f9e88d3593a67b95212f5ab5817bd6abf9c61f6c880628adc1534eb SHA512 da0d0b487310d63f14c99dd7e4018dfb0779482e9936594641bb26b1d12479d373da5a2652392d6927a16ec072ee7c08515548c347fb7dcc82e32be5c0e626ba
 DIST gnome-clocks-42.0.tar.xz 360968 BLAKE2B de66b802dbce8e57a97594c76e8fe5f7a4d65c1426d3c45217f3eb1e27e553fda9f1484b83827e6f44db10c8623581c7e1cd79f0bd79352966f67345e59fcf30 SHA512 f642cb4a626de2a97ad78c25922bb933bdac917d363097fcf5149310111abd11834410b48bfb4fc9cbae06f0ab30b0a5200d45304ce292b5a9558a90b922edb4
 EBUILD gnome-clocks-41.0.ebuild 1098 BLAKE2B 5d2ff8a0ee8f1f2fa059cd53d6d78504f7c124e4853da5eccacf1896cdda38cf4438352f5c972a4690a037a5df805e90c5886a6fd5f8384b1f8d6308027bdf71 SHA512 7c948fba4cbd1d7af5847f575b4ca4786fe6c767a0502c78444e69c0e74e7b984ad11c30a101c414142cad6c5916305a932dc3fcb24aaa7b795cb32b9b281661
-EBUILD gnome-clocks-42.0.ebuild 1129 BLAKE2B afb41378a0df82ee63cff4b4bbfd8471ffc0d86044c8794f3f30dcff21a79c482545695e9aefa7815a450f22d76ee0ac0865f2446a6fec6b2444836a3e990fb4 SHA512 189de1a1865f4bfc9d1688732dc10752e7b41bd341a102d55372d372abc98c198795e09d7a68784ab4aaec90d3a81932a02a02d521ae31e67532c135acb21fe3
+EBUILD gnome-clocks-42.0.ebuild 1127 BLAKE2B 6530638907264cdfad879c6abac3e75bef414a9dfc1b5ad3ceeb99b832117257caadf3d378522a6213b13e368c5ff28aaa04c4aaed3e6874d1eebb209dfb6113 SHA512 5440eb4f6f7649f7870df3a69fe397385eb1691ede189b376fa90e85550dca82aabd4aaf4f55670c1caa08bbd4be4141449bf609bc947f7b66f42120b5a62e30
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
index 6c59c7f71b53..6c7a31b686e4 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.68:2
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
index a07e3acf0b14..dd21618c88f4 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-contacts-41.0.tar.xz 275248 BLAKE2B c0611a131ce1ebb74b96e96e2e1b9370526b56c49ee43876273fdf5b2f3b333ad2aad85c50ddcebaac85ee8c996037fec3209c6765cab7b37b49ced04a82a7a8 SHA512 310f333c0863d8e58c2280b994071b2655eee7224ab80a468ffc7acc61834d3f6dbb794bbdc5b8d4428226bab96f3ea65b8bed39df79d88704e38b51a8f4b05f
 DIST gnome-contacts-42.0.tar.xz 343312 BLAKE2B a86bc70301a4f04bf7be426802e75d412abfa468555172233c5b540fcc0e630c433607ebe2a5dbffa58d49ab23773deb6099f88fdfa06f44f767d3fce57821bc SHA512 09a0d70a1550136717c4f837f2e4526928559de4bccedb71b34a216d99c36886bfd5786fcc3487198c488b4778046453d0069da55ab283ef87513c2d668a11cd
 EBUILD gnome-contacts-41.0.ebuild 1707 BLAKE2B b2d3dd5685a8ff16f0df0a0296aea2edae198d72591cd65d040da35e635751df938e66a1a56ec2f50fcb671d34544de24e810506267418b983f23c089b6470dd SHA512 fb4109232b8a992fee3e0db88ba17ae201f7082c092840d71fc4ddadc2291d341101035aa9b44fe191b46be518125fff382904017419bd4e6c345737e7673205
-EBUILD gnome-contacts-42.0.ebuild 1628 BLAKE2B 0bcd829e445f436df61530989d0c5067a95d9f6c2534884e9f998168fa338abfbff2835889c5f4cf5bcae4afe49bc20b967c0f43f59ef74eb9541f201f4c0a31 SHA512 34310e85f2a5e84b40168150322ee7417a982ab12029244ea063c7b65c53f8afdd3f86240183094378d73f3fc5057146912f4a995847035658a4b6a8482047de
+EBUILD gnome-contacts-42.0.ebuild 1631 BLAKE2B 845ad45aeb1ce1721f437ee2b6d4b244be719ae311095dfb44d67a0d922d887d3ab963f008c8ff1313e6cfc60509b630a40d3007c4431fdbc7773dbf2043385e SHA512 95f8c01f41e0c2efb8c8a2c5f3837512edae9fe684f5b8762862d61cbe0abb84dcc59a8ebc856f763f4a83e64a5424426d7e87f501160b68f04fa5d9080c8722
 MISC metadata.xml 326 BLAKE2B 2a56fccc6957b8379b65dafdc5e0893083d0f454785fbd96f3c7695fb16bdbc75db3ece95320549158e227a9e82d84f0ad2144d4ed716647b6433081d36c56d1 SHA512 077fb36f1482d3da1c655d653d693368ba35494429a6c28a64f41f8c37705a5e5a5e49acc3caee6207dd6511cb105d020cc6f17a8b89f8fb4d54a7b26feac1f9
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
index 6364b5a5d1e1..a1351affebff 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="telepathy"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86"
 
 VALA_DEPEND="
 	$(vala_depend)
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
index 5fb0802ddff1..eefe2e13aad3 100644
--- a/gnome-extra/gnome-logs/Manifest
+++ b/gnome-extra/gnome-logs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-logs-3.36.0.tar.xz 744104 BLAKE2B 585c39577ff1eba6b3af638d0cd5d452cbb20ce0444386fcd8fbbbc0192e59a7cc9139263ecbfb7ada85f71f044a998c51172cae1a7ba481c14c0a1650817cb5 SHA512 3a4a1f6af63f97a8814fcdbcf6e23e6a89dd150f2a5c5ebce21d8b9b74f6a8985ae5b3789aa37857b1631b33108d5048d7cfe32ebb7c7413d8ce27f25c8a58b8
 DIST gnome-logs-42.0.tar.xz 461520 BLAKE2B 6c4c22b4d9b428d3d90aba851171f7ec96ddc0157ca9d03a46ff84c915d4057f4f6c0462f01285954b4d0a49c26073e03c31ac10bbc862b4a6ab3ebee73f34ab SHA512 94634006148391bf158878e845bf04f1139f90b78bc3d63bb687bb683bb07c8b5fbec9d7c1e9f7454bf5345862578d83226207d3f78611dbf96566994190766f
 EBUILD gnome-logs-3.36.0.ebuild 789 BLAKE2B d94bed94d0e35e647465bb4b2e0d247cbef489cb32cef1137b192b17e9c5d4cc4588af3966ca9c315e906d9985b490b27065feda462f9a1a37a6a23de4a4fcfe SHA512 f918c67c67002169bfac23e55ebe6ba69ded4f9c00295fb9fa8ff10d51a86a9a98372b689844f1757bd4f7861e6d76bcb8a26d3012679d75feb5dd506faba003
-EBUILD gnome-logs-42.0.ebuild 820 BLAKE2B badff9b8506f660083c202ef76f64e215e05f47f3fb85b54cace9a89668b7c7290a3027f721b42216d7dbf696f036fb3c296e527da3d0ee5287107abd4c2c350 SHA512 3957e02be4a3d7871e6fdc5756d551cf4573c30a99f894678923920c257bea13b9d12faa1990d0c9a48b44b0488ec9b07de5f4cdbf2a8519a3024f3d6aeb4d5f
+EBUILD gnome-logs-42.0.ebuild 818 BLAKE2B 108b0b563d1fbb5aeba042ea61022dffe312ee93508286244b978d3fe9fadf845591e86bc78b1a67a26bda13b86aaadae6c2a20c4c32a63d1a303de5159b31b8 SHA512 464b6442ff72d87dd2f78114469254995c20ee4cbcb5effcdc3acae17302f26273260a9cc6bc7c3d3b1d9771ec35f326ae41572d5b7c186560408ca82efe037d
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild b/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
index a77cf4b94132..f0bf9500b3a1 100644
--- a/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	gnome-base/gsettings-desktop-schemas
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
index 2b125bd663a1..f885e956a871 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/Manifest
@@ -1,8 +1,5 @@
-AUX gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch 1164 BLAKE2B e25d1101d5bc70f61404de17762bbb17638b9c9f9ad5d921498fd7292df3858c5aff7c44c8b281aedc87c9d2bdae36908aa2f78a949e91a11e0d8a39d0417309 SHA512 16a5794abf382ed9a5c63b35b100d654a1790a5bf4aecd33f65b6b21475cf881444bd8ea6d18e2b86dd68d8373fc42932d5544095df876e8c77f3c490a4f3c2b
-DIST gnome-shell-extension-alphabetical-grid-19.0.tar.gz 288661 BLAKE2B b3df5594422f7d5ba249ec5a3eebf178e845fc2f36f838f61c86c0aa1918f9ca7e942a6af358e3f1744ce7f25a507f3e97bac71848cf6c0bac6339139ffd0d3d SHA512 139f1d06ebeef3b76ac84f71190cf77ebc77571ff3b489bb86f578cfa01ce7de47e53798fece93cb6c45bd82cb6b2a425ba255c1485d5b8739da28bd9959fce8
-DIST gnome-shell-extension-alphabetical-grid-22.0.tar.gz 208959 BLAKE2B 08ab108c0e51249531950ecdec18cdf9b205c0727aeb3e359fd8fb0a1ca9c0d4afec7c3a54b4ee130bc9b63ad58d6619e2d15d17622ccf68172aed38fcc5b97f SHA512 ae8cc174d5c003debe7e78ff415fbde66b495d93ea7130b2aef459ce42b6e7970c4c14221ec7f5febb3f6d2ff05365b738c92e7bc2357867495185e05a82ffea
 DIST gnome-shell-extension-alphabetical-grid-23.0.tar.gz 209076 BLAKE2B 82fd5fdd4d10cb134bd47221d0ecdf651f86e7c77872373a27489aec526df715eedd3d7e4407fc4c53617d14984d2690ff0fe6db5ba3c92dabf13d175f0d7a21 SHA512 6c932216956f421838c608fc8e6426039761e6233305dfb1ea0a0bf6c8afc65632983fed12d3f5a3605ff1ef73f8ebc11715ff47ac7570960ff2361e436760f8
-EBUILD gnome-shell-extension-alphabetical-grid-19.0.ebuild 1422 BLAKE2B 71bca6a4078f41a08c2a2b3291acad0440c60262b9a6b5c05ffea13485dfa3958aa665395f72b996568fdff222f68d28b36ee715949e9fb2a24434393250d271 SHA512 00ebf81e517bcafb935f061cb11162d3dd99dc13398a9d44eec08f951f22e42402b7f72ae0885d99d72524cf101fffb53db3959756520b2c1bdf43f3f728608e
-EBUILD gnome-shell-extension-alphabetical-grid-22.0.ebuild 1434 BLAKE2B 1deaa43cfe9d041f62783e1f9daebd0293061aac412469539f8feffa80221c113728ed84971db83607a0f17652179704ffc7551241d682dc6f5c6febf8eb8dfc SHA512 bdc37596751fbce2d96cac831291bb7f0d80485eef816971ef44fd6dfdd6a5d09437cde3a1e6e30d442afca932a97898ab7759d34ed6061f7ee66da226510e1f
+DIST gnome-shell-extension-alphabetical-grid-24.0.tar.gz 210398 BLAKE2B 6b782085328ca9d61f9aa7406db1f586d35abe50b20e8c2fd06e534166985b1be688b930d4b4f19cd460a69fc4fd5004cf49600fde9a435c7c592d101191f2f6 SHA512 b54ac0b00b4c538ab4064c6bcc197fa65c730e732a80c23e23ed78915e53a8211634f68b842b2f00935b3d48669a19e66ac0eb1d43bcd34955967108a570ebaa
 EBUILD gnome-shell-extension-alphabetical-grid-23.0.ebuild 1385 BLAKE2B efb9b1538244fd377e7f352cc17c68c668d4baecafc8c0ca90d52c9e22653876aabc2aad98aee489a1d6152a4fd2d04b9056dc3b3c5b91b04050966f9e41e0eb SHA512 2b7a39796b6ba90f538d6ef6225fd7d327240f63828f1d40ff65ebd80f754784a58154431a65a5fdeb6fdb46e514ec13dc9343f739ed3b4eb655075407c7602c
+EBUILD gnome-shell-extension-alphabetical-grid-24.0.ebuild 1387 BLAKE2B 66acfb635b5537f8ee83127cf7dbad393c655409748899053872010b341f2b035106f39666acddd424e50661fc391236df89306a14bfbdd69f569d7138416979 SHA512 f011b5ad3f59ce6ef68bc548682e2cd60e47eca862022b95f84c597fc0c60d0d573db35f0e892ba29fc0df44e5e27714dfe1baedce8b0873b7b9f474fb243615
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch b/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
deleted file mode 100644
index 7010a11735ef..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/files/gnome-shell-extension-alphabetical-grid-22.0-redisplay.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ae8d9c55ede615c244729e1dd0bd20de3f09e386 Mon Sep 17 00:00:00 2001
-From: stuarthayhurst <stuart.a.hayhurst@gmail.com>
-Date: Fri, 8 Apr 2022 16:06:10 +0100
-Subject: [PATCH] Call original _redisplay() once to setup, respect internal
- pages updating lock
-
----
- extension/extension.js | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/extension/extension.js b/extension/extension.js
-index 2c8cc71..7f6b4db 100644
---- a/extension/extension.js
-+++ b/extension/extension.js
-@@ -23,6 +23,7 @@ function enable() {
-   ExtensionHelper.loggingEnabled = Me.metadata.debug || gridReorder.extensionSettings.get_boolean('logging-enabled');
- 
-   //Patch shell, reorder and trigger listeners
-+  AppDisplay._redisplay();
-   gridReorder.patchShell();
-   gridReorder.startListeners();
-   gridReorder.reorderGrid('Reordering app grid');
-@@ -93,7 +94,7 @@ class Extension {
- 
-   reorderGrid(logMessage) {
-     //Detect lock to avoid multiple changes at once
--    if (!this._currentlyUpdating) {
-+    if (!this._currentlyUpdating && !AppDisplay._pageManager._updatingPages) {
-       this._currentlyUpdating = true;
-       ExtensionHelper.logMessage(logMessage);
- 
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
deleted file mode 100644
index 6a8af9a70239..000000000000
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.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
-inherit gnome2-utils
-
-# Useful specially to prevent
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4684
-# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3180
-DESCRIPTION="Restore the alphabetical ordering of the app grid"
-HOMEPAGE="https://github.com/stuarthayhurst/alphabetical-grid-extension"
-SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.38
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/alphabetical-grid-extension-${PV}"
-extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
-
-# Tests are only useful for upstream
-RESTRICT="test"
-
-# Not useful for us
-src_compile() { :; }
-
-src_install() {
-	einstalldocs
-	insinto /usr/share/glib-2.0/schemas
-	doins schemas/*.xml
-	rm -rf README.md LICENSE.txt Makefile schemas || die
-	mv -v ui/* . || die # Searches for these files in parent dir
-	insinto /usr/share/gnome-shell/extensions/"${extension_uuid}"
-	doins -r *
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
similarity index 95%
rename from gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
rename to gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
index 75bba270503a..435d2222d99b 100644
--- a/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/r
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -29,10 +29,6 @@ extension_uuid="AlphabeticalAppGrid@stuarthayhurst"
 # Tests are only useful for upstream
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/${P}-redisplay.patch"
-)
-
 # Not useful for us
 src_compile() { :; }
 
diff --git a/gnome-extra/gnome-shell-extension-appindicator/Manifest b/gnome-extra/gnome-shell-extension-appindicator/Manifest
index c901fcce4263..1599c54ee8f8 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/Manifest
+++ b/gnome-extra/gnome-shell-extension-appindicator/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-appindicator-41.tar.gz 52835 BLAKE2B 0d0bdc73bc10057ea012d26bd640c7ecd8005a7b36e7316b7d616e28a429e43f3b36ab2615ac4d6227dd5176b3a4f629a70c960e8f8961063c6979d5b04e5005 SHA512 8c67011884bc4cf6e4ddfc3ac0c191830775050d07cf3f8d7462ff4e0050cea00fd3f8372b1c75211e433344c64fea9903982769bc4d0428b51161efd275f5d9
 DIST gnome-shell-extension-appindicator-42.tar.gz 55122 BLAKE2B 995711c1f70105ab0b74ad61d567cb0efbf388df94097a4fb7dd59594a2df5ec22f6e24ff93999177ac845953ad392d7f27e7176fa47ff045eae056dcea49232 SHA512 a4c392a65afafc8e963539f87489eca604863a9e55a2e5fbcc905da144e70e3805a7ff8c1c40302a925a8cfe8dd5431fbc675ac127a04304fa5c3a5ea39beab0
 EBUILD gnome-shell-extension-appindicator-41.ebuild 943 BLAKE2B 126a39b88acf2f64dc97a782575d1a7963178f80273abc725adbdf0f2f7589a6ad535b975cbe2709e460607050554e78be64f20b6383d10eb821e3191e2c7074 SHA512 2d0e5ec7d85894b7087529842a0b2f4ac9a92ed89e2352467b752528c409f8ef87f9f914d9bfc23af09873715e42371f40ded5e2e717e819e370b02e670c4203
-EBUILD gnome-shell-extension-appindicator-42.ebuild 928 BLAKE2B c4dd7290ebda7e84a4604d18b2ebfd85e0a86eabdef5b7339d1ea73142f4734e7f7dbd40e6afa0ca25907cc4ab6636938882ad0c4461a4d25b1853deca3af8e6 SHA512 2aa88a96ef6877fce354df20b2b99a8d594edfc8e08e975b105842bff6442ea6695223300c82c7bcb923eded622458efa76eb5352ab5c746235a90959d0db82b
+EBUILD gnome-shell-extension-appindicator-42.ebuild 926 BLAKE2B 4e414ca60c66cd2fb9d9e0bfbe538b604853a87d5d30a87df15340c66a6f3bb4133f765330824ad0d1c0599f9c310a86d6b39d05e15e6acb5e2f13b51054c750 SHA512 a1ed94588838a4c5ef271466aac635d2f7b135a69fce1114fddfd18924a66dcacbe9c44f34e9db55581be872c3ecb5ad59946e1e626f720d388f50f9f845c475
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
index e8439a3ef588..5261f65d1d5b 100644
--- a/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
+++ b/gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
index 34d10d9032c7..c4a2b6731b8d 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-shell-extension-applications-overview-tooltip-14.tar.gz 27058 BLAKE2B 442e1b144358c40c6132ab2a067bb29439e826ccd540583a6e95d35841bca3eda53ac9b6004285c8ab63006d9e71dbdb46f0fb77310366cf976381bb70b50223 SHA512 6e5805f720e262181e4519ec8a19cf57dae41e3dcff3da4a4a1bc4a132bcc23aae575cc15aa0a0f5f04fe1a25a9ff3e03d5bcacb326c7bbc8d0b28351e0ecbfe
 DIST gnome-shell-extension-applications-overview-tooltip-15.tar.gz 25388 BLAKE2B 66efa481ac9fa10a74e5d57d309ed5a3ab8b6a11bda59273252f452b79086ab2bdd4da07ebaf7b152407409cb452bf9b3dcdceec94662c0c6d643002b1fd1f35 SHA512 34d4be856f21318c17d1675e8c097d8e2e5331b32e018d7c07a8c025ea4b9fdffa52ca491d75d4a182a2e4b63beea746707c5581e0d10d25280ec5627e92f882
 EBUILD gnome-shell-extension-applications-overview-tooltip-14.ebuild 1148 BLAKE2B 6c41570b1705b7137c62146fd731840f8405c7fdad3faa9165e03d5eeff9d11dec837623d48b15f670631f486bfbbeaf9c34cbac9a7c0ace93cac2eceee914de SHA512 3d1466567c72b19298d2d9cca10ae2b1785492fa244afad59e39625cca35f014b4b5a9805f7b6a261ca3954229c833f85b37a3011f19dfe47f4a816dd669c84a
-EBUILD gnome-shell-extension-applications-overview-tooltip-15.ebuild 1150 BLAKE2B 67842ad993a0376d00b41a9662c99aee9db328b95d88951526c2873160083b2bed5ae1616e8b353519f4ae22720cb1ddff2379e198878ff37a89a6de7ebe3460 SHA512 91175cf1f726238a17212d9a58f6f1a5b6aa74f10b2cd587c3b082485ede22ea53c3fc720e2ebaa84f6d26e6411d775c4e16732cc5562ad8d5250076096de88b
+EBUILD gnome-shell-extension-applications-overview-tooltip-15.ebuild 1148 BLAKE2B 77d87558041e1337fa12a213744818797b02c2f42386ccea5c529409bcaf92c9bb5be2503332e97347c2b3a3a57e4575cd14e9d3ae39283c2672cc155d7a62a2 SHA512 5fa881869449d38d3ceb22e710d3f76c8d1cd0be6ea00a74b53d7f9c76bb50ecd4304aab4df4ac33507f01fe7b89d9b35a5647a851c60a1347dd7799e2496a14
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
index 26b68add6dc1..c94e4e1956e4 100644
--- a/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
+++ b/gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/RaphaelRochet/applications-overview-tooltip/archive/
 # https://github.com/RaphaelRochet/applications-overview-tooltip/issues/7
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
index 74975f7e720a..252e92c69f89 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-bing-wallpaper-39.tar.gz 6802966 BLAKE2B 262db45ef1ee
 DIST gnome-shell-extension-bing-wallpaper-40.tar.gz 6809128 BLAKE2B d1fa68367238ef32a83c85c525ba1d032e44a67a993ab85672e48803fb95149057de4877fa10e0daefca2cf0154b24f232ca1da13ecae5058c4d06928c53a45b SHA512 0715c690c9ae33d640b468156d9dbfe81f7e9618b77f2feddf6d5697445200bdd44b77f8b12f7134655c3a9ab3eae128607b642b8a3865f158e5960edc84a096
 EBUILD gnome-shell-extension-bing-wallpaper-37.ebuild 1103 BLAKE2B a04fc6a3b3e7f4b8e4e8b049017a52d30b1b8d442f4806e5f67966f6ff7fcb05435285c9a46c238ce08623f8da65031a1a41742622b87a2c29ef835d045ffb80 SHA512 d2d83659ecac676bfb6cb88287e8b6d79caebf04fecd813182ca29868976c2aadcd7b277da8026e42afd15c19df45f9e9632aa4122aaad803956f39433ec6e3e
 EBUILD gnome-shell-extension-bing-wallpaper-39.ebuild 1105 BLAKE2B b29fe359d92f2543cf6fd044a304892e241fccbf1c82840e7e072f8c86ccbbf7c15cf815ef51e308dae65479dd2ad826563c5bcc369bcd2a604890995e3e4d0b SHA512 19ad9cf77a5ee0898369f8300d2d56e304b9ac3541ca07305b0d093c599b9f08c5b35fb4cbccfd8a37ea7ebd409f48ea7f54d21761daf743d28c9c89c6c35924
-EBUILD gnome-shell-extension-bing-wallpaper-40.ebuild 1105 BLAKE2B 558223641c900bcb8f1e3b7bf810d7c77e3b37b4f6a51f67d5fe4e48261d8d29e5a08148aed12fddf6c5e867c13b7159b10406457d6ad2c73609c8426bd4bbc8 SHA512 5d7d4e0e5f04dcc2850edcb790bf3d89af915bcd3dc52fd2cc44bb7e42b8a6d31a47c083f24dab32fdfc7ad82f51e380df92e140d4eca67aa64c6a4672dd453f
+EBUILD gnome-shell-extension-bing-wallpaper-40.ebuild 1103 BLAKE2B e9cda5380f55468bcedd9cbde7bb1f1f0f0f2394fa30d1714933e6085a7d68b40a226b141c305a56a1f52adf47dbc0b599f23283b0b2f355f3af897cafbf6fce SHA512 f676ba686cfc6f60657600b103683d0f36b9de086ee4feac3ab7cf68af82dc5efef1b62e99f30423216a2058cd7c157a2ff831346619c2433a95ff868f874057
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
index c57276c6cfd2..9d0bf9746e94 100644
--- a/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
+++ b/gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
index 353e6edc321f..f21481bbb07a 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-bluetooth-quick-connect-27.tar.gz 22088 BLAKE2B 332a2
 DIST gnome-shell-extension-bluetooth-quick-connect-29.tar.gz 22626 BLAKE2B 9bc2e08b9fe04f742431a61a84846b09fea43d7735ad907bcbff0e9f5456f4068dbc999d407152965ba07dcbea609fb2c6f3bf14ab209f40beb65c2dbfc83f33 SHA512 01efe1eb9e2982da9c75119268c3748af5f25ceb21bef8aeffe322429572eae871b148fc92668a211739761f42691731815fd74eaf91870bd14e55f3ee557256
 EBUILD gnome-shell-extension-bluetooth-quick-connect-26.ebuild 1243 BLAKE2B 87ef0a12ae87b7c8805b7e0f6b6f3894ecb9d40a9f674899b1fe7d0b56bb94a6ac3a7164c763b8f00ffb643548de24e942c88dcfdad688eb3baef3f909c98a59 SHA512 5d9a5c25adf8dfb79be4b19d67b5fd1852abf3621380aa6ff8147f2ba4de2e8fdbd80abba99f5abf973514ab5868075de95e7f8986306a12d9e3ca4e6dc0785a
 EBUILD gnome-shell-extension-bluetooth-quick-connect-27.ebuild 1245 BLAKE2B 0772818f0400803915cf662d8b3d9e41d6ac9f007e2408d1f773ea3df6f877113f66842369f9cd041327fe86e47764a872179e9acca77f563272329014a9bd29 SHA512 cc80f5560a9b7fc667fa30e4c474bfddedbcb2fad524bf18d6f752831154f1bb9b8ac54ed124c5ca9ce69435f6bf700b5bfaa61269fb1d70039e87c1e2d673f6
-EBUILD gnome-shell-extension-bluetooth-quick-connect-29.ebuild 1245 BLAKE2B f1f6416c8dc95891a22f3b678b2bd89238f0fee18f4d98ad3fb65e33f6b0e4738b10d5b2fb4e6599c58cf6078fed7a9b88096c684e232a7f052503df6f9ff5c1 SHA512 6371e394c269eb671b0b4df8a1046f5c071f864ba1a8c4e35b0f6f942e17004c9bd41de1b0ad5e91afec282aff98f6076873132a22f1b3dee15923a049947392
+EBUILD gnome-shell-extension-bluetooth-quick-connect-29.ebuild 1243 BLAKE2B 50870a61acc9a684aead504b1e9278fe288f1545844a587e4dbfea19e617949c55872828301d2a0cbb1f7e2f98f1eaf244569dee248ffd570a1f84fe09dde776 SHA512 f0687ff3eeeeeed9c3c6496cdc1a544b72df06daa4b875e577d72d6d7d546cd3894cce822ce2810be22f5e2cb7b18acf991c45f9a18d3fe3d26ef823d9f8cbc5
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
index a485c63f1867..e19b94a25c9c 100644
--- a/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
+++ b/gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v${PV
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
index cde5a2f5d1a5..ada1417de364 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.tar.gz 26
 DIST gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.tar.gz 2618 BLAKE2B 050f801bcc1ced63647c49badb779ce60a7de329ecebfef324cb8d1992e992933524a5e0e08272cf93bd9e24c9be72ba3b1365721b7954422ae0dfab7c1448bf SHA512 c13bff5676d5cf5ad6c932c6f19f1229fe65b3c4c0bcad6d0f3dfbce5bb763ebbd5cea7140e7b3ad5417819ee27e4e49369740d634b13b7f037fa4dc324dbced
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild 1320 BLAKE2B c435fec4b1344e1c5675669b67f29e3a540159bdddaa7221de38ab77dd29dbe213064b9932ca3dda3b646a307ceb98f322270e1c64303e1b501285959076d9dc SHA512 501c53f9cd9b5a20555a918fa3bc8b5f68ed5d9ccd453060fb49029b0cbd02e502d6e9678b4aaee32236234ce45f22fa53cac80a5c6676fe77eeb28c7f1f5f07
 EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild 1315 BLAKE2B 61ba8106064e68f49f75828e7b48a651fcf22483545933a2250f3994b159ebe04642042ff32388e446cc065281545ad73696918c9c94ce1cdec2c600b7289a03 SHA512 8c0339e817c1407846f098e66487ec5a43a0280a087cdb917a113be67bf6f1d91b932ee2b8810c84980f2eab2bfe63216a7908fb0da9b8daa384702423c28ee0
-EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild 1317 BLAKE2B a854d195f16ff93212be8462116cb40e77fc1cc450185d8abef6726a5b40ac562e78d445b04ebc10ffaf0c5c32ea144d1fefe56fb58d2a39942dde54be13d7df SHA512 e8e973b075d3d60492b44d9948ce2ce62f4b1b0fe269222305d3d4a9c7e2f374179962dc28fab58a7979a8b0ab8160ea8733bd8ae341e9c86d93dbfd92a850e0
+EBUILD gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild 1315 BLAKE2B 4d0f829bde6be46cc8e8efcc13e06931c9c0447e60a49149dca05ccb797177b8fe6ea33ec4dd9dc7564bcb9f63065f644fed6989c6a8a0b9e5b0f2d95d282c45 SHA512 c7de0a13490579dc1721ffe38816cad742bac5b2a85658383ad3e5884d1bd4471f92bdc4f0fb7a3fe982df5eed902548a6e283d130b3016cfd06f9289a9922da
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
index 759a266978ca..334817d3669b 100644
--- a/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
+++ b/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/arch
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # glib for glib-compile-schemas at build time, needed at runtime anyways
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
index b25351819544..ddc7aa1dc825 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/Manifest
@@ -5,7 +5,7 @@ DIST gnome-shell-extension-dash-to-panel-47.tar.gz 21165567 BLAKE2B c776b7185bdc
 DIST gnome-shell-extension-dash-to-panel-50.tar.gz 21167530 BLAKE2B 2caad505593bc037ff17c428b238ac8f8f81f0e70cd09cc76fb3ca57f285321a0921e509fb74aa82dc07964ef8d999f48334b271a9fe08a221e0e1537a93395b SHA512 d8e52dfe1159107376fb74e672a821b3dc7d524ef7d8091b213dac725e876c022cf4caa4690c63f288a1ffaff613718f703dd244db9b5ce6719c3f2b927fd8a2
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD gnome-shell-extension-dash-to-panel-45.ebuild 1831 BLAKE2B 77d6a9b5879fd3d984478fb2809c4f28c0ebace7fe1f930b043be47388121fa013ced6a482c49f9ffca2cd2f4afbbdc81b0ec7cbc78f16e4000bb24df6607b83 SHA512 c5d8224195d66280e3ba37e1b6e75e0c13fc538cb035b651682c4e87afa9c045eb817c58e7183009fa8aa0d88dfdfd438bda2c0a2cfe9bc835b7103f93f0cb6b
-EBUILD gnome-shell-extension-dash-to-panel-46.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
+EBUILD gnome-shell-extension-dash-to-panel-46.ebuild 1831 BLAKE2B b95e33936528d9d09abf6de9830e0c57e6abae252a9f264c657850d9987203c82342a33072cda794f159bcecfb9865792feb0e25c5747f7b2d00bb07ee160f21 SHA512 9e22c63ee872b4fcf2a59c0960f03524d4fef6a6a893515b4bed1487dab40513733c596406def66cfa335bb32b451da46206d754fe6982a2de068e9684077c3d
 EBUILD gnome-shell-extension-dash-to-panel-47.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
-EBUILD gnome-shell-extension-dash-to-panel-50.ebuild 1833 BLAKE2B 1988fb4ff96e0503ed61192fb8a0b0a9e893efd8279ed36566c4380dbbe5fa757697c5dde703e69a3d0f792a1d64a51843d077e170d00230dd910b661fc4b948 SHA512 718fb48aa881f72c07da9d137842544806e7ca4df85d65c7c5492f88e8997e5a04c1602255b89a626f98cea4b9be54469205261a0c97001e524214228e83e6b4
+EBUILD gnome-shell-extension-dash-to-panel-50.ebuild 1831 BLAKE2B b95e33936528d9d09abf6de9830e0c57e6abae252a9f264c657850d9987203c82342a33072cda794f159bcecfb9865792feb0e25c5747f7b2d00bb07ee160f21 SHA512 9e22c63ee872b4fcf2a59c0960f03524d4fef6a6a893515b4bed1487dab40513733c596406def66cfa335bb32b451da46206d754fe6982a2de068e9684077c3d
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
index 68b544af2082..ce6cf7c2a060 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
index 68b544af2082..ce6cf7c2a060 100644
--- a/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
+++ b/gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="branding"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
index 1c50d26087ed..6c6551133a40 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/Manifest
@@ -5,5 +5,5 @@ DIST ding-45.0.tar.xz 127368 BLAKE2B 28d77192adf83d47e382ce647d2b4fc635bf3ebdd97
 EBUILD gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild 1001 BLAKE2B 40bd684e478a1136a284a2da08222cfe99eeeb06835989d6a1882d55239c2ffba030f38e593388c316c1c25c7beffbb53296760f29b0d9ba2840e6454b3be28a SHA512 01032de352d6ab9f3354cde22b4d0c90b4df3f6971085b4e493ef0fd54878fc586329d19c2e7fb36264462c65bed62b8ef6b3f65644c9bc108001108e5dbf74a
 EBUILD gnome-shell-extension-desktop-icons-ng-38.0.ebuild 1001 BLAKE2B 5090f816926d836d32712659f88d0bd8c3a86b9b106f6a49bed69981f877ca574878da3eccd9c21083fe5e9297b6e2df4374b6de393dd367d2503f31600e8b90 SHA512 47dd6b467409a9126639f81425ec6a601fae1c6f7da1aea4a42eef98a80f6b0002d7392fce1c708843908fa43712c07cd486040d05e61f83c941fd8e94be065b
 EBUILD gnome-shell-extension-desktop-icons-ng-43.0.ebuild 1003 BLAKE2B 51154343a9ed9226e6e56ddd4fb5a40d4a2a65a284cf33e97233cff10004e6edd08b1f019ab5acadf514cfddea29dbf67b91e0edbda0d95d267fda0e93d77918 SHA512 9502e8e6a765d0f9d1bc4b91876ab01aefeae1420faeac80a9d3fbad0013ea965241dfbd3485ee1c949e487cffdae8c3fb3ccaafacb1c4885b753349737c6985
-EBUILD gnome-shell-extension-desktop-icons-ng-45.0.ebuild 1003 BLAKE2B c92050f889cd1b25987aec0a12ed3cae75a508d4332c5d4c69d6076e53f5ef26d2d336d89a38da797529ffde5616e523def3cbc8ffc4b2b3c1633275203f0e46 SHA512 8d5650a77b395b702c60c9beb492c1376c6467ee5f15d9c641174546eda76c6059f60926ad620e0c8eb7d04b3ccdfe492fc0c0a3bfa3d309600fd4dcdd0c476e
+EBUILD gnome-shell-extension-desktop-icons-ng-45.0.ebuild 1001 BLAKE2B e9393d867bdbdeeb2abb6103c09a8379dcb6996664ab90bda14303f6dff7865446424b3fd509cf1e9c74f2fbdd8c839400690df8da76f8edd10f620a21d19da9 SHA512 f60215df7f025e1f4653025bdd68e3dd440821acc52e64e6018a59e220cd58200fc9d6cb998fbd1e11ba03faa3afaab497027ad22582e1b0d1847e132629c947
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
index 80654c86f352..3951dfa41ade 100644
--- a/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
+++ b/gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/rastersoft/desktop-icons-ng/uploads/${COMMIT}/${MY_P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
index 47fe68870ad9..831231a283ce 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest
+++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-extension-gsconnect-49.tar.gz 852895 BLAKE2B 21822c3bd724638be0
 DIST gnome-shell-extension-gsconnect-50.tar.gz 852893 BLAKE2B 2da626ac3a2c6a06b01a6d502a63a208c0bd603ba2d989b254c57d4feaaf693134b5fd176449eb2465be1d910eb8bddd5398dbe2fb00b9bfe0bec6a428f074af SHA512 39edad97388f8c228d9698c7f2fc51ea04d74f5e3bdeb16f387dc2f5bae87966c6d1a3d7eaf06cc1d095638df1254c3b796875d403912d0c39424965b395cbc8
 EBUILD gnome-shell-extension-gsconnect-48.ebuild 1613 BLAKE2B 5e28e0f1fbdd6702d852005824323377be862563e2b8665c8f702eacde65af657a90c0c1d1aebc9c9f5863bf4a34b7ff108b6b938b5729a43468b6c5555326fb SHA512 a6c936a108d23de5df14fd53ecb378b8e31ecfc16eacc0443a2a0cb5df99288c08bfe299c0a2883df275979ce7475e045253ced5ddc6d9318a18963b43be9d1b
 EBUILD gnome-shell-extension-gsconnect-49.ebuild 1615 BLAKE2B 1ddab322dbb2d81db604ccaaf5953df0b26dce2fcc1f9ed0688fce8d4d844d0f08f3752a668138ba7ae06db21c36315de9be670a1474579e14a86db4c56087c1 SHA512 222a8ba4f2666eb05f92f4793fc895d1967ae2adcb43de4014fe507894c3b649afb673fbf07817f801a689663bb78f403b2895cc5aa449a12e7aa926b01657f1
-EBUILD gnome-shell-extension-gsconnect-50.ebuild 1615 BLAKE2B 69695289e41dd33461542337fc4342d73e20cef6dd474c77141778db02792363f284c0111396a2a1b264271307c0a00f31585a12865dd3a7a10d68fc844244b9 SHA512 89f7588f079885b71b2a55aa686521b2b2c62aaa67e4b15b11ae5bb85105aaa8b3f0aee85b0c4cc6ae1fa3e1510b9edefbe0bdce1764647861cc83f3cd880bad
+EBUILD gnome-shell-extension-gsconnect-50.ebuild 1613 BLAKE2B 6ba214ae5266706cc8cd9336436eb91904397ec0ee66a1b43d473381216b567e107161bf3cd4d42e8c93b282929d3aba6e0ab71dd2b13efbeb854b2e84fee2cf SHA512 590407aa5ab7eafabc96a9022e2a1badddbfe218df48c55661bc081b1d1a438d7387e2beb45b78bffcb5b79b8329564bce22003bbe417dddad1ccfc77f68617c
 MISC metadata.xml 346 BLAKE2B d1e2c79cae69a58f7af962316046f4620238b88d42e0f211a28ba271633993bae4df79956ab9dde4f4e94e7e77233288657d5b3c1876c9192118a11ee5ee678f SHA512 00b2e45892280f1a042b3ec03d66c3fcc7a2b95f94534d22fb8df936976384bb78433337b339ae023ae9850f2e4c0cfb8b12fae28ae7863d2ebe93a47784a77a
diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
index 458473b6871f..18fec91712f8 100644
--- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
+++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/GSConnect/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nautilus"
 
 COMMON_DEPEND="dev-libs/glib:2"
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
index 37972ade7b45..327b1312b35d 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/Manifest
@@ -2,5 +2,5 @@ DIST gnome-shell-extension-weather-in-the-clock-20211108.tar.gz 127000 BLAKE2B 9
 DIST gnome-shell-extension-weather-in-the-clock-20220504.tar.gz 127002 BLAKE2B 38ad139e29660f8c91629048140c4a2ed7578376ad5e13c8138eda8c487ccfdbdd7fd1a3b1ce7d85407d0a2486c40e776f665cf11c897b218477c8e6d17b187d SHA512 27109e25e0e630233a895576e691c5daa550bb032bd748f6105560553ed05f5a8a47a3eb27ae90eee24dbff2508fed5420d1f81ceb4879f11ef0a98c63616923
 EBUILD gnome-shell-extension-weather-in-the-clock-20211108-r1.ebuild 1292 BLAKE2B 993d4bdfd1447eb713aad9a58435ccacb2de0cc884c10d1e7a92d411fe345024b80ac7cb440bb022c32dcb6656a72cd1223e8569fb745e0fabba13b2e1fe0238 SHA512 b8dd5777401b9eb8a1ab10343adf71d1999078595ab6a0a705d050e0a4415b5d56801e8857bff7d7a2ac34cec3760d74833fc3a9666b59238d74c8e5283c99a4
 EBUILD gnome-shell-extension-weather-in-the-clock-20211108.ebuild 1082 BLAKE2B 0b56378521ac77b3d9e81c957bcb222f7af18e1136ee42203b8245032e7306aee8042e79cedc5574c986e933e7457d9268fe101770d285542ca4951543352e3f SHA512 faa2b5e9a4cc6ed0b6c0e5aba5adb0b9d65bdee68d933b25bce7eda9c718d7c6e47495441f27aee16244dee1eec6224d51e587ec9a11c7d1ff9352722adc2dfb
-EBUILD gnome-shell-extension-weather-in-the-clock-20220504.ebuild 1084 BLAKE2B 0411d3df3caf2b3e0bcf139ca457ef1dabe2355e5d9d7a34702ec13138288a69b6b36fcc9be65c550a2bf306f53a83a5aa8c0ee2b80bdb41ee2100bb200211dc SHA512 6235449b926d94cee3b6075354bfa59d9dbd7c8e7c0580c25fa6d37522d161aa0abd5825e022d844c9873ad1dd8513e491a684d26f681d2d7408130f5f2621bc
+EBUILD gnome-shell-extension-weather-in-the-clock-20220504.ebuild 1082 BLAKE2B 11638e96c13e231bf39977561aff843abd83cec3fd5beb2a8b862086809c5d2489ee42d473caea53c07fcc5826912ecd1c1d8f3d4e0d8d2b4840b0f21d12ce93 SHA512 6df67d5e70a34f1ffab2ac728a227e6789b5eefd7120b43a8f5b3842130c729bceff3bb949b8513f7d65aecf9265f435fbf02a6e9988d1719555507517dc54e8
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
index 063eb74bb8bb..5f762465f788 100644
--- a/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
+++ b/gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clo
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
index 110b7a40b03f..6a76823eba20 100644
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ b/gnome-extra/gnome-shell-extensions/Manifest
@@ -2,7 +2,9 @@ AUX gnome-shell-extensions-41.1-meson-0.61.patch 383 BLAKE2B f40a994294b3a6fe1aa
 DIST gnome-shell-extensions-41.2.tar.xz 222528 BLAKE2B 132fdbc1e1c81a886dc250dabd44721aeeaefed5939f30274e2484ec6a8dfff25fd0c481a04edf47f732ccb34b9c8d132d106a45d862db07fc9fb8d835fee6de SHA512 3b581dbc289f630bb85b0285a2f5956142a412e124d15e085770a578a9304211b1868f4eb940b79637b9cfa78b0da5973a717ee5866d75e9d15f38e91d4f414f
 DIST gnome-shell-extensions-42.0.tar.xz 226240 BLAKE2B c0c13ef58f632e3a8449580af52c40677b979c9f81fa037d936d31ebb693bc070bea5f0ec7a4715ff3f19480cc12d4ec471efa1d6b684e2924a5fbdd943e381c SHA512 d413f8a7c12c9e4c71a51b4f5c3cc8e0145b57eec24648e928f02ccdeb4a02b44ad3adf9668f3ba65870d772490f2389582f4f5e8f4037da3ab88a0bb5958f5d
 DIST gnome-shell-extensions-42.1.tar.xz 225068 BLAKE2B 9041259a480be745476278f638be20ae6ac0b86019d01609cf6b0ba3fa129dac74d56851d0301a6e1b8a0b172b6d375aeeb2f2df389f3c0dfe0e01384248b5d8 SHA512 b139400d239be2dbc7685afc666d0b17ab187b68fa2631b586b0e04bf05de3d59ac70d2f692ade8e0003fea99f207b05871deab3898ba34586521dda747970c3
+DIST gnome-shell-extensions-42.2.tar.xz 225040 BLAKE2B 992207185af12ee8f41e888891d3b60536ce0f70359abce58c57ca372823925d948d23372fea7dc8d09e2734549044cd89e7a644e3815e985c75ee64eaf34992 SHA512 175cf5dd7cdd29ee30857e4960355ce164f2ae8c038473409b26e0f201f0b19782924ffc532a05d58cf76ade332ab87afffa52512cb9b8ff69fa36b78da293c9
 EBUILD gnome-shell-extensions-41.2.ebuild 1830 BLAKE2B 5035f1592b076b4246143c32a6cd2364cfc61c7d20152dd05aed60950e8da92802820e9f841200cba0d431f449fb45f406589339b1e56469ff7e0ca526c15629 SHA512 6d00475aab927daaff770203eeb9e719440c47013f98644cb0a44f95e1b6315242dfa3f560ca6a9b3bf1ba6d73fc96fac612abcbb3fac2684e9541333fc07eaa
 EBUILD gnome-shell-extensions-42.0.ebuild 1777 BLAKE2B 08a538766888b93b71bcae8055851d218d66b4a3664e9e561cc5dd13e5178b84de178a1c8b253f41141c86fd7a8d06e9781d68c79f6dd357694e1c2d549922fb SHA512 7beda3a2f8db19ebe4231f74ebc81e6526776e30b1ed86e0a735b346a86445d0305987eb8c927c8180ae1bdf4268b1a60ecc44d5c2280c30ccb4bddf2c1f01cc
-EBUILD gnome-shell-extensions-42.1.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
+EBUILD gnome-shell-extensions-42.1.ebuild 1793 BLAKE2B 154b897688f44ce9666a2ed25b5d79e4e98020f4147532ddd0325ad18a161712f724e5391a8fbf4bd1d78a66590395c2bbb81e568335a5940139879c6272e10d SHA512 dc2527a2ea9e53682c0057712c1bc183e9365f262c5838e5bfab8895a7c887583ec794a91440ff69cba0cc559ed8f03f5e6750433585ca4840cbfc4ed3f9a774
+EBUILD gnome-shell-extensions-42.2.ebuild 1796 BLAKE2B 05aa950938c17dc8d784c40e27592c3af938d229933cbc73a62c69f96b898621ecfc5f0da95a30ae70a4d041b42ab0bf984eb771fe58ad0b073ff0a08022b597 SHA512 4693587edd6aebebbf3920828f521e013b26655aedca454c476a4488bea82244b2079b897645a2b3650d7f76b2c3a767c84fcb0ebcf97602559d22f542705244
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
index 763ce0e49faf..c9a61b00860a 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
new file mode 100644
index 000000000000..763ce0e49faf
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org readme.gentoo-r1 meson xdg
+
+DESCRIPTION="JavaScript extensions for GNOME Shell"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.26:2
+	>=gnome-base/libgtop-2.28.3[introspection]
+	>=app-eselect/eselect-gnome-shell-extensions-20111211
+"
+RDEPEND="${DEPEND}
+	>=dev-libs/gjs-1.29
+	dev-libs/gobject-introspection:=
+	dev-libs/atk[introspection]
+	gnome-base/gnome-menus:3[introspection]
+	=gnome-base/gnome-shell-$(ver_cut 1)*
+	media-libs/clutter:1.0[introspection]
+	net-libs/telepathy-glib[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-themes/adwaita-icon-theme
+	>=x11-wm/mutter-3.32[introspection]
+"
+BDEPEND="
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="Installed extensions installed are initially disabled by default.
+To change the system default and enable some extensions, you can use
+# eselect gnome-shell-extensions
+
+Alternatively, to enable/disable extensions on a per-user basis,
+you can use the gnome-extensions-app (included with gnome-shell),
+https://extensions.gnome.org/ web interface, or modify the
+org.gnome.shell enabled-extensions gsettings key from the command
+line or a script."
+
+src_configure() {
+	local emesonargs=(
+		-Dextension_set=all
+		-Dclassic_mode=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	ebegin "Updating list of installed extensions"
+	eselect gnome-shell-extensions update
+	eend $?
+
+	readme.gentoo_print_elog
+}
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
index c10d06245284..7d13a82e8745 100644
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ b/gnome-extra/gnome-shell-frippery/Manifest
@@ -3,5 +3,5 @@ DIST gnome-shell-frippery-41.2.tgz 82737 BLAKE2B 11bce1943e651e95c0466123c5f0bb2
 DIST gnome-shell-frippery-42.0.tgz 78792 BLAKE2B d7195fa6bad1be93d5a247fe091e49debe5c53d5f701cae327e33774c69587a9eb0d0d1e5f42891834e8da1d22bdd40bb3066dd85d986dd82fd145f2ada2e327 SHA512 b71f7183befef0f8a1334ede7dca31ebc9437e0bb2415cb4b52e72859e3dfa760b26a118f3ccbe1b05c956342bf2f342ac0350f921f79be2ed5a849c3bca4237
 EBUILD gnome-shell-frippery-41.1.ebuild 968 BLAKE2B f44d082d81e53a08ddcba5797aab92df5df32a4f7670370f92c8599818ce093a9bc4acd768114566a82d841b47f4e43aef896cde5afdcb3376d7669b68e3b5aa SHA512 555266695ba4875e2c7008efcd3f43bad5514b230f1be3fe7bdd673495f9141afa4c0d97435822da54a62e560034fae5d1feb3d7d4634c69228e98ba7e664732
 EBUILD gnome-shell-frippery-41.2.ebuild 922 BLAKE2B c4c09946b71a3edd412f644ec0c65027218f4ad9d7712ad1d10215fd36bd00344fe113dcf9fc1079e3f591f397426f735cd4acd4dfc75d40b379ffedfb1c0825 SHA512 6f6dce2c9295a32c9581b39e9aedafea8c5824ecedce2bd76275cb564de53fb12658cf8e9333db543188c67ee25d35376f6bf21785e53e3b914638efee1df436
-EBUILD gnome-shell-frippery-42.0.ebuild 922 BLAKE2B c4c09946b71a3edd412f644ec0c65027218f4ad9d7712ad1d10215fd36bd00344fe113dcf9fc1079e3f591f397426f735cd4acd4dfc75d40b379ffedfb1c0825 SHA512 6f6dce2c9295a32c9581b39e9aedafea8c5824ecedce2bd76275cb564de53fb12658cf8e9333db543188c67ee25d35376f6bf21785e53e3b914638efee1df436
+EBUILD gnome-shell-frippery-42.0.ebuild 920 BLAKE2B a7a42dafbe44fdc3aad834c3c465dc92d916d0d5ace6dc60235d15ddaadcfa572859dad716720c1a4475df1a5c684b86f0ac29b8fdef26a9ffb89b2d9d5c680e SHA512 e5e136487900da2ed67a8024e70ee239ce2814ac752a26a20888ca0854e90bbf665383cc258440c2666a7091cc03890ee597ec36a86c726303d9d7ee84f8c467
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
index a3bc5335896c..82756793fb9c 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	app-eselect/eselect-gnome-shell-extensions
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
index 053172ab2a8e..9c7bb7e2fe6d 100644
--- a/gnome-extra/gnome-software/Manifest
+++ b/gnome-extra/gnome-software/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-software-41.4.tar.xz 3243380 BLAKE2B a8511c776d902639a01b1194e7dd23f22e98c6fa5fd0624cf9d7b7ae96f0ca313eb139a396e4bf8c7b2ec94db66a3f6ef89a8d77cbd1820291f01cd6c70ec2db SHA512 97c51fd21bd5fd2f7d11e00811747992ff0e404380f84cda07e5c7cae3962034c9169ebad95f875056233c9b1d44347a0c15c61e0f018bb3128e7c7d5d3c74b2
 DIST gnome-software-42.0.tar.xz 2266316 BLAKE2B c672ecd32d80168aca9b651beb1f58562fb2874656f3c400c9301a0ed87e19cdd74554ef5995daec7f435cf689ad9dc3404623cab4dbb1e00602aa8b191ed996 SHA512 f630232d164d1a7adcf9a91133769c6fe4ce62cdaeccd49b991330682eeccfddc8f83c7326802aaabdb4fc537243c0fd19741c702f4d23d75ebd71e9abb3da92
 DIST gnome-software-42.1.tar.xz 2266468 BLAKE2B 9dfe336184e2a1ffc244ef37d31b006831e18e399e6393013842d25492062d2093210117182f6fc7521892f25864056244200c7f9a88f65da86e99373bc40daa SHA512 292a17e94c7409198fdff4250a88cb240a126c3d77a9cfee1ea8608fdc482d75af6f8fc91c5c6c068b474edea6dcb197f88ec09081a8b270d5f3eda67db755ad
+DIST gnome-software-42.2.tar.xz 2274824 BLAKE2B 0c971bbe8f7e074ddc23923f14aeca4e95a0c305d016548d69bc51100859dfc30fcfcfbfe88189b6a0e4d2531c8223822aa8f16bee5bba6046266077e7c26eda SHA512 2b231afbedb241b8957fa902c37cd85734cdb8b2071cd32ac75ae2e9e064483fe1e9e8d49f2e6df478fdd01e9c6225a85887ba2af1792a9150b89cea75ef8bb4
 EBUILD gnome-software-41.4.ebuild 2833 BLAKE2B de6ab68841f924484e15ea7b899f3c2b82177bf1f0fc0420dd5bd2c97b4a600bcb623415d5ac12dcd6c40058f06f9dc66f89d39c7e34de1154104bd001df4fe1 SHA512 5151920c8cf7a9ec7f235b0b267b72857a76c42d8a372cf94d7717d29a1b777a04bf406495a6ea5a6e86d7ddfe4e54c0946666810b70f5d0a795f51a5c39ea1b
 EBUILD gnome-software-42.0.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
 EBUILD gnome-software-42.1.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
+EBUILD gnome-software-42.2.ebuild 2754 BLAKE2B bdddbf59bb104e86ddd954e47f6d6275c1ac2caab95a7cafb701eb44f6f49cffaf4473cbbed0361cb099f8bd60ac8dc41a48e8e4d288348526261f2ee9db2b79 SHA512 f1e6e33e06324b670583cfc88a59c3d21da8bb68ba2dd28f9add19f68310fc886dc9cea571e7b304697d558db6c762ae31ee96bdc8767f98bff1866b63c3719a
 MISC metadata.xml 579 BLAKE2B 4ac8aea21122da6a03605961d9f47721a06a4c49ffdc1ffa16eee5a473f5e5957c69760ee7d19e087688fe2b479a16f4cf417cbe0e2d3e149b0339881fecd2fc SHA512 3f783e0f7fbec5a95f498d622885de19babf8f786a66af2d3755907d242df0433a910b07c2628854ed1038920417d7d28c35c10f18adfcbd37e8922aa3c9253d
diff --git a/gnome-extra/gnome-software/gnome-software-42.2.ebuild b/gnome-extra/gnome-software/gnome-software-42.2.ebuild
new file mode 100644
index 000000000000..8ef94587b026
--- /dev/null
+++ b/gnome-extra/gnome-software/gnome-software-42.2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson virtualx xdg
+
+DESCRIPTION="Gnome install & update software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Software"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flatpak +firmware gnome gtk-doc sysprof udev"
+RESTRICT="test" # See TODO below
+
+RDEPEND="
+	>=dev-libs/appstream-0.14.0:0=
+	>=x11-libs/gdk-pixbuf-2.32.0:2
+	>=dev-libs/libxmlb-0.1.7:=
+	>=gui-libs/gtk-4.6:4
+	>=dev-libs/glib-2.66.0:2
+	>=dev-libs/json-glib-1.6.0
+	>=net-libs/libsoup-2.52.0:2.4
+	>=gui-libs/libadwaita-1.0.1:1
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 )
+	sys-auth/polkit
+	firmware? ( >=sys-apps/fwupd-1.5.6 )
+	flatpak? (
+		>=sys-apps/flatpak-1.9.1
+		dev-util/ostree
+	)
+	udev? ( dev-libs/libgudev )
+	>=gnome-base/gsettings-desktop-schemas-3.11.5
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+"
+# test? ( dev-util/valgrind )
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	sed -i -e '/install_data.*README\.md.*share\/doc\/gnome-software/d' meson.build || die
+	# We don't need language packs download support, and it fails tests in 3.34.2 for us (if they are enabled)
+	sed -i -e '/subdir.*fedora-langpacks/d' plugins/meson.build || die
+	# Trouble talking to spawned gnome-keyring socket for some reason, even if wrapped in dbus-run-session
+	# TODO: Investigate; seems to work outside ebuild .. test/emerge
+	sed -i -e '/g_test_add_func.*gs_auth_secret_func/d' lib/gs-self-test.c || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test tests)
+		$(meson_feature gnome gsettings_desktop_schemas) # Honoring of GNOME date format settings.
+		-Dman=true
+		-Dpackagekit=false
+		# -Dpackagekit_autoremove
+		-Dpolkit=true
+		-Deos_updater=false # Endless OS updater
+		$(meson_use firmware fwupd)
+		$(meson_use flatpak)
+		-Dmalcontent=false
+		-Drpm_ostree=false
+		$(meson_use udev gudev)
+		-Dapt=false
+		-Dsnap=false
+		-Dexternal_appstream=false
+		-Dvalgrind=false
+		$(meson_use gtk-doc gtk_doc)
+		-Dhardcoded_popular=true
+		-Ddefault_featured_apps=false # TODO: Will this be beneficial to us with flatpak at least? If enabled, it shows some apps under installed (probably merely due to /usr/share/app-info presence), but launching and removal of them is broken
+		-Dmogwai=false #TODO?
+		$(meson_feature sysprof)
+		-Dprofile=''
+		-Dsoup2=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
index b0c97455ef24..a92d9840e836 100644
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ b/gnome-extra/gnome-system-monitor/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-system-monitor-41.0.tar.xz 774644 BLAKE2B 9aafaaf77b414435301eebd8bc84f04faa171139a7d9e6e71ad9bae8f097eaf6d637502ab64f0868636f7964a2b76353364ad27ee2b56c3d8f9131e0a7ee1df2 SHA512 1eecddc479f0d9e986f1821a8c4b72246a6995f7853a6b35c8435d1aaa1afd7bc1df0cc0b9748785e4581563985652be19beb12b193ee17439ba4564febf5d20
 DIST gnome-system-monitor-42.0.tar.xz 978208 BLAKE2B ba52048e643eef1dd556dc833fc5ebdf6a07559551c5e28dc46c3d143676571f7704667263f9974d87d6ed3679c15c955178a02e9ed5f69b4bc25c78d9b32e4e SHA512 880093fd75a87993ff8def1db9f6f090edaad43c6dc08564f61b9dbfa8c10df5e6d6a9a9072737d802503b34ba70de7bf7ef5aab2bf055ea68e795ec11a48bdd
 EBUILD gnome-system-monitor-41.0.ebuild 1218 BLAKE2B 4be801cd19ce9f284a58bdd8ec60bda0a0c3a21b901445d1884d03f3f663221b1184a92e7897418c18a75a68c9f73c7b789968db23b8cfe0fbc35766721fef7c SHA512 0f54159ba0465b192b322cb472f9e8495ad871097cb990daef3bd2b6522ad3896cac0d4f7cdad2485bceb98d578ba92c056167f3a097fd50fd0fc89c6ff1da84
-EBUILD gnome-system-monitor-42.0.ebuild 1221 BLAKE2B 14ed66e3bce5d62a25261a3860879a11764b9da7943e97e73a2a3794c357a562988a63a450ee6f17a62b22dcf4a7e175ac27a709947f2bb514c85eed7a85e40d SHA512 937096d0ce6d72120aacd88633044864eb84a0a6b2422a998ae2bf888fcd3f81f0202f97c28b13f8859a316d7eb977b44fe1587a5c50adb669c9de8ceb798ca6
+EBUILD gnome-system-monitor-42.0.ebuild 1218 BLAKE2B 0b4d68985ed1f90aa1a73e5cb97835de80700d2b3ae97391a5d4d5e3951cb36a954f12499b98a14206c0a777de93c6967eb6cac5e0a94b18e683dc960d5a8e77 SHA512 1c0de5dd10e5e3bdf794397d9475df7a07fe3cc62462d19cf04358793e55d6d95b7c5785c7a9c681a00318c81676c719085c9b2d139e4bbbadc8af9052d53097
 MISC metadata.xml 379 BLAKE2B 6427637b2adc503ee411ddf8897458780db85a500e2cf7ec23c96640cb01ba718a2adba649cd112fae3e8405ba89539dc712d4d955f5e36f0b1719ce4afdada1 SHA512 0b64ee41da44fb823f9e34f2571e26c04d901709ca2b1242e27daae3ca7c7767e5df8f809f20316a135a72debd81bc629a0c218860d3288e4636bc3e3681d248
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
index 76f02b713576..5ba7db4040cb 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/stable/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="systemd X"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-cpp/glibmm-2.46:2
diff --git a/gnome-extra/gnome-tweaks/Manifest b/gnome-extra/gnome-tweaks/Manifest
index aeb18288d40a..9fd13bf24b0f 100644
--- a/gnome-extra/gnome-tweaks/Manifest
+++ b/gnome-extra/gnome-tweaks/Manifest
@@ -3,5 +3,5 @@ AUX gnome-tweaks-40.0-meson-0.61.patch 944 BLAKE2B b7ecf7ec1a492610fb7001721e8c1
 DIST gnome-tweaks-40.0.tar.xz 251908 BLAKE2B 4280e7565da3f95d7bcd81ba874d2f15e8c3834ab052cb4cf7cde8060eaea016670acf6f441d2cbce4b7566ba0bb7a7f9666b257893bc7b22b1cdc4d5a0edee2 SHA512 c3467f40af6bb79c2b10cb429e93aa29261066c2a5fd744bf2801c4e596cc270d45302ebfa942ee0c40067849c12e1ccd404c40e7f594bcff4c44cfe3f90bb97
 DIST gnome-tweaks-40.10.tar.xz 251712 BLAKE2B 7e9e04b86ffcff25cafd2a6dfc0c7be14c8caa4ae003369c34ed2c40c36ce857b05de9994f7c2187cbdd535f464b92f782ec91b835318c2b5d2219ad817fbe56 SHA512 1247933ad2f93bd7817af367d715468591840df4840d45641033ca19ea26c64239828ba3e24fafb8694014a98024b911266c314172ba8e37d6c4165e7e6e8a29
 EBUILD gnome-tweaks-40.0.ebuild 1392 BLAKE2B 78eb50a92f55665a95e11d08b4770c5558690f0ec9868432de4225b14c6d831ac3480cf5c3afadda2fdfcd0f403e5983ce8daa04866e757dbd31fafa80994aef SHA512 ccff3f0cc0aaffc9f994ef971222c0ac2813366553a2d5c4925308609d037d83e12a30cfa14669842931deeed3dd3f3ef2088a275b396e402bfee392171b66bd
-EBUILD gnome-tweaks-40.10.ebuild 1351 BLAKE2B 7e48ef65d327c8516e9efc04329f0786e0972ac44e2dbfa74cdbfdd93c06a6441eaaf729ccfac746f6f9f68bf5b12ec8c605646138ef782e95b6d00e3c72201d SHA512 5787088aa284ed5f3c3c41ae1994954c2aab1e568690a76f2c43f0cc926ca202199d9a552e767d5eba72d51b39c18c36d0462fe58d635ade871f59ac9dcd28d4
+EBUILD gnome-tweaks-40.10.ebuild 1348 BLAKE2B b8e170da11721de60b5305efbcfdf03d7f611d99ee3bf49fc7063e70515cf4e93959b7fade4ad539e5dcaa5216b81c711b30a3dc5f268dc774b18bd232c66072 SHA512 40d9e6f3f39c4fd5266403828213f991258e6c5910a16502dda48ca7d82ec8daaa45ee1d618c7600a5646dd51566c4627155e5a53de04c753741e1cce227668e
 MISC metadata.xml 557 BLAKE2B 377b3b95f3dfade66ceb83a955bae45820c7db9cb286fbc9fb7f597909d6e58b3ccbdde1acc5bc01bda97bcde90a062a8e4676c8593edfc95c46f27c311ca83e SHA512 9a24c8eedb00ba7ceaba017cfeef778a7def43d7baf62c23067376f7648fad3b333e16a9dc4f8c41f66279b4bbe8acf54844ab5460d56366d32c325ea5d06e2d
diff --git a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
index 30feae50500c..883e664b39ae 100644
--- a/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
+++ b/gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}"
 # See README.md for list of deps
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
index 2c8309800a8d..61cceb9adbca 100644
--- a/gnome-extra/gnome-user-docs/Manifest
+++ b/gnome-extra/gnome-user-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-user-docs-41.2.tar.xz 9407232 BLAKE2B 81c6d638e6cf3011cf4f2ee835c293fd0152435d2f4d07e7bc403882e378d140d7e03fbaca7f87e23f6c65d104dc7be4a2bc0902a3e1a5ab42815ceb250ff4b0 SHA512 982fa4c491a530df0067c3f437c961f84c393f1f95895e86f348609fa0407ffa6a33dbc961c87c5083180d4ad1a069ec2886d0ec841e9c965f21cb0b55322f4b
 DIST gnome-user-docs-42.0.tar.xz 10273312 BLAKE2B c3cc30d75f686bacae2f4f3789215ac6cb505483a2c2ae1bf8766e7767ea7a5d7ef922fe6117e9b6a773771ee83f32f113bc18f4056dda66848c17ccbc256c77 SHA512 524dfeaf0ca77c19906395f81f45ac2a7873fc116a6794bae53130b32c1fcdd063566ee0ec4f3e51cfc18e12db8aed5219fd8817a7de3cae6d6a68f228212905
 EBUILD gnome-user-docs-41.2.ebuild 942 BLAKE2B 978c25c4ed533255a16ee88e7f670ee92c8e838c9b0c884645fd1477e91f1e63558c5e2cc21ca2e407098b97bc5e18dfd70b422614a7999221022fe767dbcc2b SHA512 72898d7193955b3d5bac304e4bbd2283de883ec8b4d97bc8ea8071b05d6be6a790e3255c29a89b03476db7459515e85c7dacf997b4e78388e5fb78a32d73dc45
-EBUILD gnome-user-docs-42.0.ebuild 945 BLAKE2B 0d43c04de9a5c75bcddb3b11758fa8dee8d15f6399bcc81e3d93b0a4c34bdbdfb08bf531854c4da527c68e9ed69aec12e0134f7a6dea14af686e2181117c310f SHA512 eee2d128b0676f56ff54b6b9d78f49d15fb83956176404401bd9a0f462a1ce5817541a96ad103e8d84ec4ecab0d84779a60126c877c47b5bedeb2ca3225b9266
+EBUILD gnome-user-docs-42.0.ebuild 942 BLAKE2B c4811c7f2a17bb92457dd928ad91bcd5e09965652bdc1cd612f3bcca78e3b7420501af5a5db00f3e0fd7f9e0d4ba1104f26f779e1991011cf7963f157d372d5d SHA512 e613d016928f092efe90d5201cee9192ededa9d05b9f15b7b7a52530efd038ce71698928c6777aca4e773a0269ed8a938198c4518605655c64898a045f45a333
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
index 889d05a30d13..69360df4152a 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-user-docs"
 
 LICENSE="CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 BDEPEND="test? ( dev-libs/libxml2 )"
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
index 939fcaed8fdb..f02095e0ccc3 100644
--- a/gnome-extra/gnome-weather/Manifest
+++ b/gnome-extra/gnome-weather/Manifest
@@ -2,5 +2,5 @@ AUX gnome-weather-41.0-fix-meson-0.61-build.patch 706 BLAKE2B 9023904ae76060fe81
 DIST gnome-weather-41.0.tar.xz 943500 BLAKE2B a349360f001bc8a3246227fcdad51bdb115db382650ead36e9768c002f0d7892296610320bf90bb569915c72c48492002268f8aa049055ebc687dc08052d6170 SHA512 f625a83ecfffe1ad58aa268b6ab3009504f839f3d56e52c642bc23ee32c0b51638888de17a1b4bc0990b2fd6718a7266fe5cd79230594a06ae58a816308b2b99
 DIST gnome-weather-42.0.tar.xz 233552 BLAKE2B 64cdefbcdc93359518b4e08564eafc3235d7b2ab92d69d79b558c5d4f5ce03425d87fb8e7e351165d00983eab5807ebc05aa7c0eb604a618d135afb66170c8ff SHA512 10471a32adc148fad393e03098396a3cfccc75d1cd18985cdd2c287927213aeb493f2878ea986e1d3a3af4b1d3f439afcdb96833d849bbd5fbe7aebb1d1992e6
 EBUILD gnome-weather-41.0.ebuild 1438 BLAKE2B 8d9d61fba786d3a290ab7f32ee524dc10f915fe052310600a59af893f231d5431f98f35b1816f8653ae5c7aaa16e66962116cbc0a6c0ad57abcc98385dc2ab89 SHA512 48488d4616a23d69ac6ea37c84c360509341183b65cbedf5471bc62c87b985af5569269c213f7368b71e90b3afa41977ff2a1db5d4a47368f5e8b13c948c060c
-EBUILD gnome-weather-42.0.ebuild 1385 BLAKE2B d356d9a73c0dabefd19231ca7c505678dfc1a5226a5322b1f8dce9c040b80e97f319629bf5ab6aebe3792e4ecf1e0d67c5d0dadb24426670a1540da0af6d25d4 SHA512 2bca241744fc08a0ae8c8236b1e5187a309c1b0b5dfdbd57213ea9c87ea776582fa5fe0465e7052e4f86f3aeaf8ad325469d416c39a5b4f0841aa03c2e922196
+EBUILD gnome-weather-42.0.ebuild 1382 BLAKE2B 069122582d8254035b83a6a8e10158b7cf839ed92c6034f3fb50270071d86753b5179917eb6a60cebbae09c3605a7e6ce7403855b0acdb8e86116ed94e53312c SHA512 eb1ea4938a0854d35ea6179b673c0230367c9c8a272f42544a5c242f5961ef0cddde6061a6ea95bdedb8891095b2a6b27d77d319cc3ad0f9d842b64937860511
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
index 82a788f80ae0..0012f418f914 100644
--- a/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.32:2
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index 276c6bd6d127..1a7f405b9cb9 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -5,6 +5,6 @@ DIST gucharmap-14.0.2.tar.gz 1925142 BLAKE2B 3936c187ecdc104534b80830f9089417e8c
 DIST gucharmap-14.0.3.tar.gz 1931686 BLAKE2B e72b46450ad97a49519014882cbfd5792a07daf782fdf0d80e4b9221537548a57d3b43dc2b421f3f72d3b0adfee6f11c53304b4468c78b766ffee9536efebba2 SHA512 cb43265a2b54231c15331c299ed10bba8bb83bdc1860ee50764bed8a40ce1421f49edfeb7fa5814c8aac6c23f80936a966346849db83ddf7f94a370adeffc6c8
 DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
 EBUILD gucharmap-14.0.2.ebuild 1659 BLAKE2B 5bd582b14249e249fbb70dc653196dec4b894381ea95323b7e51a43893587f18d908fd2176600fc832d95bed70e9e59084ffc5b63309424563a792c9e1c6ac94 SHA512 b095807a056006c37da95a83d2a165e02e2c201eee0f634d14d67bb3926c3663095d9ab1b26a402cc96aa45eaaa0577aa14ee34366c2b526333ca4b9a858c7ee
-EBUILD gucharmap-14.0.3.ebuild 1708 BLAKE2B 9f27eb9f913b1849cfa9e51a0ac3f2988efd66fe42aba02cda43c89980838facea1f5251b6447f1f3c10ccf344624be2b50a3042b118d7c0c6c87ae265e29de0 SHA512 acf13378e8913e6425a5cc66149285710c8e8e9aec020fa8cb3791ac11e523d897a257f794ad3f71c19db88fad2d67b3ae3040dbcdbc0e25fbf29ae09fc3c575
+EBUILD gucharmap-14.0.3.ebuild 1702 BLAKE2B a101a882f7b9670e47dc0b6d4bfdbb818d5637707ba737b91abdf76791aa90b9ae103fc8a162e3ffc00c0a4da1f085a2d8c85bada262171d217b3eedf2007fe3 SHA512 b058a6a028dcb5108139298912dfa4b112a629fd5e6336caf9c87fc4e2c413934744c4ae3dca33b652de8c6c9d4839898212e6d4f95ce78ee95123abba8da088
 EBUILD gucharmap-3.0.1-r200.ebuild 1477 BLAKE2B 4ffe6feb86be5711b4850d4c1233bd79e2cb9cbca765977ac15b7a335c3b3f80beffe2119835a73024d38a22e4623037755c8672f77edb6016b818047b8c2256 SHA512 b0313be9418955ebfde4547603d66c8121cb36b7cf390e23ee9b536ea9ff21b4760bb9d9e0d843bd49fcb63db28b173d8536a6d5a5b72de1eef76a87bed769dd
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
index e8739e727c8c..babeb6a8574e 100644
--- a/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 UNICODE_VERSION="14.0"
 
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index e7c4acf3b4d1..dcc4d1091b15 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -2,5 +2,5 @@ AUX 1.14.49-skip-valgrind-tests.patch 716 BLAKE2B 2a65162dc1448f673afd30153d3d7d
 DIST libgsf-1.14.48.tar.xz 701760 BLAKE2B 762fe424ad45ac9739e1ea2cd9971f80f9c4d573147c6043c6bbf7b416a6c69c3b0bbfa42f6424176a545f7f9e7257d33e62c92482945786bb142063390a9d08 SHA512 6efba54c1427f9bdf71203b265ee4cdaa7366f78f299d38deffb657198244fb6436ab4e077a010079a28832539cdef08796e43feb76450ab0420da56016cd95e
 DIST libgsf-1.14.49.tar.xz 702644 BLAKE2B 05ee17200d5170380138a7996dd37d5473eb9fe9a13cfb06b68e17470525d9640a4921d111e83963f245ecf6b669116322d9358d9a0b473c8149c56ff9c983ba SHA512 a847a3c7fe26865e110bb87cb7ed74c477fdaf41fdec1c97cd3ea85ab3ba2f618e609a38fb4087a2c9b58d8d4b430c2148c93cbbb8425af41b6c751efef3298e
 EBUILD libgsf-1.14.48.ebuild 1053 BLAKE2B f64d22b99dcf1c4336622707fc389af1c8bc50e286d41505616160c7f8515f4440d0c455bc26ac5a966c1daedfca19e10ac25aa11565c64ae4e90d472b491a5c SHA512 1f26d57a919ffce788887545d808ff4b97b4ba1500443f2e0da58e7ff27d01bca4d5b4c8bfd3c3056f35c5fcb355bd9f703be7a1c2ff25203676634a8a2c37ab
-EBUILD libgsf-1.14.49.ebuild 1122 BLAKE2B 264c70c8d71770c4f280c29449525f239cae078a740decb48a0d75c5564d3998265709b9a05b9d542d7aff15586cc9b52954ab4076bb370462f77cd1723b5f6c SHA512 1031b7aaf5d823ed9e8dea73547f5c4e6d810ffaca483a59174ac1d300c87c2c4a9916907282139b3d108f96acb85d098e219fbc9eac8f9346eab02218b17938
+EBUILD libgsf-1.14.49.ebuild 1116 BLAKE2B 3768641ab646b774655c5bad8cae2ea56b8954966be9e8fdfb4d85e4c022cf2f57bda168c69a474dc993458efb43977be420e92293b07f249d7bb488e2a0ff14 SHA512 5fddf926ec557b7151197e896e1184d0d70f228eb5bb0f11aa1555675f5f3026746047908b5b946a0ffa5f6b3f3f1f7ea50fe645af8181d25575ae09b2b648c0
 MISC metadata.xml 321 BLAKE2B 0d1e16740ce0beddcea428308ea06e6a4201a312764ae81ce6cb8e2770319416ea0ab98ac536d85b38ce548a0bf9e2e03319b7aad0b672d1ee3b8f22d932af33 SHA512 64fa3ad72c8d27f271fcef49f9657fd2988f73eb2136c1ef84813b459dfe5bc0a40566efd9c8f0684f0da8c8eb56fcd78586f5947e02664f7663a8d8fc2a1148
diff --git a/gnome-extra/libgsf/libgsf-1.14.49.ebuild b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
index cc9401e319aa..ab19e98ddf7c 100644
--- a/gnome-extra/libgsf/libgsf-1.14.49.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.49.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgsf"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 gtk +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 2b630cca1c35..6f2927a6a2ac 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -2,5 +2,5 @@ AUX meson-0.61.patch 998 BLAKE2B e97d3460c28892df096d50a815826560eba89f050e36166
 DIST network-manager-applet-1.24.0.tar.xz 1903280 BLAKE2B a969ab18e2d2d85d378d9964e635281cfcd4bc46e0542ec94e187cbe7e740c5fad8e10b3d7d3ae3b85352ba5368787650f933b89740d05ee06d78057e1c31712 SHA512 7b91bd54d53b1b485bc5e401f83c683804175900557a7a4bc40a3f759fa9d4ca1c42b193bcd56a39a8cb79ec5b0c6f7cbeccfc08200099c08d933650c92faecb
 DIST network-manager-applet-1.26.0.tar.xz 1971896 BLAKE2B ab87b0e5f8b1c293ac3f2e36c8f834e645fb647e46ce1bf22ac94ed33e6f2f7f8aca5ed43ed46029a281545595978c145773102f06de9b42e579efb8d3e631c3 SHA512 ae3c4f8e55a2cd13093161e1e28873d3cda1c531168ee18115f3f710816f1bdfcf669cd2f796bd38f226d3f6be76407fccbcb19cf9c994b99969b688397b2c71
 EBUILD nm-applet-1.24.0.ebuild 1268 BLAKE2B 54412fc36e950cab4cf3eed2640164a9386260ffbf47143eef1cd0e115de11e304212307b6d8633d9579bc9d4e1f481e3a678ab00f74afe0a590b7d223b9129a SHA512 72be709f6ee2709d855982a00dcc26bb2b26a766ae98f498a9bdccc6f91104a0d1ff1d471ada91fbf65f43546782d16e7ffbaef3b514cbc216e96652fa2b457c
-EBUILD nm-applet-1.26.0.ebuild 1228 BLAKE2B 2e926b722629952460cd4175207fe0191062decb0d0fc00c1dc244e13504133943e83b2d6c47e49eb2c1dae24dda923240400e5ab7311c5e8b2e3cedfc57574e SHA512 eb999bc7e4935046eed8581931954f59595b7ef80b4162fe91ca8b24c43d897a27ad281f8f0afcd82c67b224d1e01a987f7e96070013d09aa9b863e5ab5d0f53
+EBUILD nm-applet-1.26.0.ebuild 1223 BLAKE2B c67727dbe73053679a6aac7de738726dafa2ccf636101ccbaaadc9300e9f86f15bc42380f351d5091a3b57d83b4b6a1f93cccc44558662dc243bb8b390676539 SHA512 06d6c0be362e98a060810bdfa30b8ecc69707bd1cbe56fa9f0ffcf24ea002886e58f7ab08efa10f2f37cd3422537fa52a66a4cec09c3d4004558fc0c17b363e2
 MISC metadata.xml 452 BLAKE2B b17e0338356cd0b24f3de4e1e4d8c13ab7b551707f0309c7a233c28b92cf7b27ef66b36f58717228a11cb76dba2892f23455f50f9dcc6fe7905f312b848f1695 SHA512 2e4fd5feb6f4b6fb8a503b26ac5ef1c388ea699a873ff70ec5144b796b2ff75b7e572a5de5efab60a7844a9bc2d639f6296db97260a0c38f9b37d46c33543d40
diff --git a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
index e49a7e278547..ed87d65be2df 100644
--- a/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index eec4ae28189b..7dc85ec792ec 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -3,5 +3,5 @@ DIST pch-session-41.2.tar.bz2 3610591 BLAKE2B 0a3dc1a60ed29bb59cd30756039c4d9912
 DIST pch-session-42.0.tar.bz2 3610664 BLAKE2B c14529dd7be8854e4d24b4b4c3335c44ebd714b4dcd8ada8bf6e8da6236d962c57fb537b4a651118e8f719b7da87141a8c1512bf6a360c7998f23384ed06b14c SHA512 63a73a753cc95dc8e152a4d535674d420861e87a57a9c47b1063b9bdad410ad4c93e2ed2a5e547fae75f9e76b0f640ffc8d0f3116195afbaa18e6a2fdb9c5ae7
 EBUILD pch-session-40.2.ebuild 1238 BLAKE2B 4aafe0c2a9284939b83b167f9f4e564fdc708af7c2f2a191986f85ffd77e9798e7ef620556e96769f01d9830f9839f06b44e97fcec0fa527b0b23f0ca60ff9e9 SHA512 219b7d308693da99310c9ff10d06009c1e6b52b1bab9ba40c225df30782191a8ce0aa22b286a11876ed64b9d91fa6c52e80ce515854ee358a66e0b50ae7d21e2
 EBUILD pch-session-41.2.ebuild 1433 BLAKE2B 872ce0c6153768fc2dd317740c9b0f128f48df4b51c81874dacd5857097d6507c8d62a495dc2c6cbfb8b707841be2dc7e7b721c3fc24222e5f86667cbcf48744 SHA512 25ddd36d35cc7f5b819deed592fac5efeb6706683bb36fb81ca7868bb56e5508ce1bfc2f9b9971c22e56c09188427e5d12881ddf8aa121740f67d155ae696627
-EBUILD pch-session-42.0.ebuild 1727 BLAKE2B 14efd1fab235a8df8d4bd8205da21556f2bd2345cf3b7bf7a94337b08b385fe787422bf98028739c92dc61ff2ba7b17c434249c1ad6d2b0bbb442770460baa1b SHA512 9832c5b1abf92191e50763a0b69cc57ceca2139bafe6de3e510015800b7778a82b0591d8be9e063275ac2da28ac76af1a811c33225def8286f71926172fcbe75
+EBUILD pch-session-42.0.ebuild 1725 BLAKE2B 768146feb544efe7b7b02d5e007a7fb5f5915029d88905c4b8aab24cf70f6bd60c6b5dbec97bcce33ea7563f7f7d74852b41a3c8583508ee51e703cca2d52519 SHA512 61c663f9e2e8889c8fd2e6bc0bde00193fb43f20cd43f68714f213cd3bd6c6abfe2b87b2bd646c6483e43562cd51846ea993f2a5dbc3d4f77e26c8f6970c0492
 MISC metadata.xml 241 BLAKE2B cb0374238d11e2a3f28f23b7049da09babd4310a99862738acfb7ba554f7758ac68cd09d1eb7a29068195c27010a846a540ed2c09b88fd043b37fb4f0762150f SHA512 b2c1d3e2cb6760ed4682da82af5370adcacd48afd558efa1abf84d955067b2ad32eda034af8cef95c71409622f97fa0113f2e07bee328f2d03512908ae931050
diff --git a/gnome-extra/pch-session/pch-session-42.0.ebuild b/gnome-extra/pch-session/pch-session-42.0.ebuild
index 111755a3ad87..029b1ff13167 100644
--- a/gnome-extra/pch-session/pch-session-42.0.ebuild
+++ b/gnome-extra/pch-session/pch-session-42.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitlab.com/pachoramos/${PN}/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bluetooth qt5 webp"
 
 RDEPEND="
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
index 177fe1d0d79d..b5b096ca105e 100644
--- a/gnome-extra/sushi/Manifest
+++ b/gnome-extra/sushi/Manifest
@@ -3,5 +3,5 @@ DIST sushi-41.1.tar.xz 81228 BLAKE2B 8bff3ed2b70be8335139499fb982efc89163ab1ec95
 DIST sushi-41.2.tar.xz 81252 BLAKE2B 811b02e0738aa3aba22d71545e888ec0334779591a56d6a28f3942d5d79fb9fece2fdffe0203757ba0806352584a50228b669fc0969f7ad75265fc40a3a1cd67 SHA512 c47b22a013fe31de6943d8af0f333b8050a8f0ecb0e827ea71666cd0175d5cc99336eb7ad96b21ba7aaf87f23d01b4f37a1ca8c0fc644fa89aa8960699b61f43
 EBUILD sushi-41.0.ebuild 1303 BLAKE2B b3266138ec01f3ce8af3acdfedddcaa603e497e26c5d8a5e68b6113c588e5ba51eae51a4edccd925ae82caf2837f0d6eec00219e85a55634a0072ed6b7f1fc77 SHA512 e0472db272aef64e1434ec7897a26222e10cd2aa1f7d82d89600c11028452eca374bc934925f0e9c460823422389b9e9d8ff8221aed59539048f2000df977400
 EBUILD sushi-41.1.ebuild 1354 BLAKE2B fbf5e36f0fa4298a965d6d6458ab6753efa25a6b08d6efd5bff4932e6dfb3e9237723c9166c299855680b933b090fea281604a6e2873d01e9eba60dfa1566167 SHA512 cea5a9f2f8c79da7975e56570201b3ab302d1cc13852a71a5ca4461bd76389514dff977c609cf4270aea74e58d5dde4def857313990b3f72454412b329f5a3f9
-EBUILD sushi-41.2.ebuild 1354 BLAKE2B 3ddf0774aebbb1d71354b5c1e49a1d6dc88393715c0aa6f021e63e1e2095741aeb473e5da8dda744cdde3419bc78bb238106ae72c8560e2da157e7e4abeb9aaa SHA512 c5715e84990188dea90ee0df90a076c7431c0f46d2d6add4c87b6fcc56f5cf6d0b37ec245fb5b8d97eb7d05bab6a8913756db44d000e9c97196ac005d0d2689d
+EBUILD sushi-41.2.ebuild 1351 BLAKE2B 34a9d481054c67c915bf0315fc554b7e50134238140259656e5f1d7da04c1d0484de1cd2dbe74dba993c46ff71e9abb51a3b7b7c4a76a1c55513572c8f04081a SHA512 3324cd7ef6c1bad685354e6e1a4bc6a04fd99a007f9b842e626bf9b400954b6cff5298ba14d73967b9aefca3eed73bb9b6e2f5c75856ada4408c96cab405442b
 MISC metadata.xml 385 BLAKE2B 8b38e81530f0280af7c0d773ae60a0cf4144d3a7d876b30574da186bafb023da5da9abd75471543d528f0e6aa9664ba787aeb45bc46dab64077f3a1a0c8bc932 SHA512 d5d35182551e497f3ac5a89734387a1a6e03848ce02f017c6982d5261edbdc72ee342ec7ccc9304f08918f3bc81548bbc26039d7c88a397a627c4a37215808e0
diff --git a/gnome-extra/sushi/sushi-41.2.ebuild b/gnome-extra/sushi/sushi-41.2.ebuild
index a9e7cb992539..45d17675ad3e 100644
--- a/gnome-extra/sushi/sushi-41.2.ebuild
+++ b/gnome-extra/sushi/sushi-41.2.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/sushi"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="office wayland +X"
 REQUIRED_USE="|| ( wayland X )"
 
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 29a352caf361..f241d0b7e54a 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1,5 +1,5 @@
 DIST yelp-xsl-41.1.tar.xz 661572 BLAKE2B d7a0ab809722d7159d587a0fa761f69c0c73c7336caabad85e685a79e541d87b9aec9cabc474376f55596f92dc0dbbb146fcbe885dbc0377641312549d8eb5a3 SHA512 1ffdf2feb5ca69824efdb86c3e290ebbe639c41f3cef7bd5af3550ddf1667e9e347ecc20d66cbd6f5860ae9245ba34d359d1fdaf53fa3944fd578d9ac5652a59
 DIST yelp-xsl-42.0.tar.xz 663824 BLAKE2B bf1ceae255a6166cda81be57e0cae14c25e4668d70e16bafb3aeaf0958b2393c4c6be8a4575b24fc7560fdddd60c3790b89890015d13f4124445f037549781de SHA512 70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda
 EBUILD yelp-xsl-41.1.ebuild 570 BLAKE2B e80515499a859a01d6370ac836d833312ff18a3566ac2d1426e201cfe2850371ba72bc80e0e160fce156be7ef708c4d3e43e2ba835e0d056d5cc201a2cae536f SHA512 a6dcb834dc8dfac61b4a8de203139bb2de9163f6803abec1039386c96916a0e9414d09621cdeca4a18aeb8987278a8dce68ca735356b64cf5b9cbaac53d0a329
-EBUILD yelp-xsl-42.0.ebuild 577 BLAKE2B 85d66401b99001033e677d93b478fb3bd2d25b7a1a3c985f1fec4974225ed9c35be3870fcb2d7c483a328594d4dad65977955049fcc5e652d3f124ac95c44d7c SHA512 d4d0175bb715acaff11e24f357f01bb4443890628af854271bfc872405d30fa88cb6248b544f29ee093aea9c451752813eace3bb35208b4dc174cbd8e27e1acc
+EBUILD yelp-xsl-42.0.ebuild 571 BLAKE2B 955a82ebb7e5f4a9b0bfbd5db7304e0a266b8fa48981e79ae2e0f71bb8180b6e0b654d1d0589a19cfaf6ed09c9f9772853eb2865cfeb724c32cab7e17ccbc83c SHA512 e1651a7a547fa43c414d3654f38138008bc1f3bf7b32ded49965f4e1a8011663dee9d4cda1c4a0388264b89f3252a5b72fa68c04c71cb277cf64881b5693c2e5
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
index 382c6415e10f..907fb80e719b 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
 
 LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 0f20ba7e78ff..46c208ea2d9d 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -4,5 +4,5 @@ DIST yelp-42.0.tar.xz 1512792 BLAKE2B f8a24849e9fd2d4fb5e10bb4449ddded77e2548313
 DIST yelp-42.1.tar.xz 1512620 BLAKE2B a0ba02a560c19e516c42f77a34f3296dd6dd9d3dba9b34b2243a2c7689b7117cd82dea8e169ec7001ba15860c74f1c7ace061094516391b38f5054b566e613b2 SHA512 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db
 EBUILD yelp-41.2.ebuild 1243 BLAKE2B 5dfc26d807817829f4d45186b71bc664b026a42f8ce09c55e6153174dfcad12b48c805df5e63d0b025352dde689de57fe64ba68c985b3c9d3c6993b127a8f521 SHA512 b7ac32f2d3f306c47b040827cc5117152355e7364cc62cd7f853b65093675208a451be976a43d9e4bf9425b64cf39464f98992ca518d1a22fe761e1662c7b641
 EBUILD yelp-42.0.ebuild 1275 BLAKE2B ab8665b75eb0c49e40371d06865da247b5b96efc249d257fc69fb4aef72cd690c511718aa3bd4205284b2d3d7b68410f6479945b97653d34e194cc3202468c46 SHA512 aaa1d9152331d24cbd10d3fb4ae686131d18837125ab9cfc0ddf59511eace5421aa978eadec16427d2d20199149fb6555480ac502e7d1cd2d89df9671b4ac3d3
-EBUILD yelp-42.1.ebuild 1275 BLAKE2B ab8665b75eb0c49e40371d06865da247b5b96efc249d257fc69fb4aef72cd690c511718aa3bd4205284b2d3d7b68410f6479945b97653d34e194cc3202468c46 SHA512 aaa1d9152331d24cbd10d3fb4ae686131d18837125ab9cfc0ddf59511eace5421aa978eadec16427d2d20199149fb6555480ac502e7d1cd2d89df9671b4ac3d3
+EBUILD yelp-42.1.ebuild 1272 BLAKE2B 626fa34fbc4832e188afddd5e9e72aefffa33f45e1789ce3733611f9b994b9989101a002700618483c7b31822f4cfa55188afcaeb9d433d67484500a03e05f18 SHA512 6be9e23ad264d1ba8f132ceac58e7fc0ec29927ab0b1c8497e6a821933a4a369c407bd87a6b3e5f50b713d0c5908162367a55686e046061a3698e0803e98b70c
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/yelp/yelp-42.1.ebuild b/gnome-extra/yelp/yelp-42.1.ebuild
index db120a9de577..e87454464d17 100644
--- a/gnome-extra/yelp/yelp-42.1.ebuild
+++ b/gnome-extra/yelp/yelp-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="
 	app-arch/bzip2:=
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index d4f7376d63e0..6223dbbe9747 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -3,5 +3,5 @@ DIST zenity-3.42.0.tar.xz 3091448 BLAKE2B 0a2f595164f5f9e8ebfa800855b15b116ab453
 DIST zenity-3.42.1.tar.xz 3091752 BLAKE2B 7364ce9175efb7d4954956c1c2bd347ffd8060f02be3c21ec65525ee84e082eeffd8af3cb72b3f051f401a9ff90595c0a015223efcd96b6069e9bc3d276de16e SHA512 a8239e7dde351f3d3f75a59c95588f672c69333d4a53d50465d05fb73e61d1bbff6aca89acffc35a8d6802f465048ad2cbd7421bc3e3200a5a393ee3c9319106
 EBUILD zenity-3.41.0.ebuild 1175 BLAKE2B a9f24605f1504c439a8aed8b288103e5f76740094e9862a378f6d71bdf3403034285ae67ecbd678fde4549c752cd03f37b50c27d06f28d1a59e84a4107299caf SHA512 ff77d8bc6564c934e16ae69bbce8920fb0b03f55bb91788fdabc4e9a8470e0359c80343d3357f227181d5374fb0a6b30fc28f6516fd40e0cc7fb42494de2fb54
 EBUILD zenity-3.42.0.ebuild 1178 BLAKE2B 64c8330e520726cc52b09f3ff524abc7fae3193d24dd5d51cabae094a99d3ebb7cbebaa7769b933ae9e9cf6c11662d9473baa12403a08020ef967e35b0924fbf SHA512 348d67d796772a328321641411bad741d629259f2c31fafd2188c33c1629f0b2b613852949f512abc8f4e1344025da788ebcdf2781695443ea665b9e6e59e0c4
-EBUILD zenity-3.42.1.ebuild 1178 BLAKE2B 64c8330e520726cc52b09f3ff524abc7fae3193d24dd5d51cabae094a99d3ebb7cbebaa7769b933ae9e9cf6c11662d9473baa12403a08020ef967e35b0924fbf SHA512 348d67d796772a328321641411bad741d629259f2c31fafd2188c33c1629f0b2b613852949f512abc8f4e1344025da788ebcdf2781695443ea665b9e6e59e0c4
+EBUILD zenity-3.42.1.ebuild 1175 BLAKE2B 8d59004c1e8072d115915650e5eb7844d67e6b3a97587682a24f66642efc2036e23b216dde126f2b3094c36b46eb79c51e5daee0d9de11829774e3f3974e4fa9 SHA512 75d0d3cfb8b5448aa98078c852d8fb64cd621425086296cff15c044ed7d3541e0e26fb2f5d7c0725fca307829fca865c0f3c97cf21b01d43c442eeb687026b11
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gnome-extra/zenity/zenity-3.42.1.ebuild b/gnome-extra/zenity/zenity-3.42.1.ebuild
index e81d45b27ae7..06f32091999a 100644
--- a/gnome-extra/zenity/zenity-3.42.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.42.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="libnotify webkit"
 
 # TODO: X11 dependency is automagically enabled
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 99c8967c28b3..19afc2294aeb 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/amtk/Manifest b/gui-libs/amtk/Manifest
index 5914d9ff9487..b0fa8c467104 100644
--- a/gui-libs/amtk/Manifest
+++ b/gui-libs/amtk/Manifest
@@ -1,5 +1,7 @@
 DIST amtk-5.2.0.tar.xz 381328 BLAKE2B b97a4b27d33bf49a97d585ecbecad04c3f2ea4e08e378d02218be5bf4aed2fe26f260ed1fd1eaa09a5b9f0e30e49901ddf860087fc630794aaa25ecda353b118 SHA512 520c9e762bdef96907320ec8dd4d3a005f262064ee402527c1087652af91c61657868189be8aedb7c0bd17758cf6d7e976da4ce941eb8a54e2d3e10ce55dc9eb
 DIST amtk-5.4.0.tar.xz 57144 BLAKE2B 835ffb28ffb448cc176e0d30b4bce6ab7a03c671a2a40d21aa10e3879140886460f1917c862d071d082d123382403cfa1dfd60db436b66e62c51c4855f7478f8 SHA512 2bfa3335b881f88d3da33fe3df5e599ed315844bd1ef956d7eb1b97620099aa2cfc2b47013c4ac4721f0c08c554ea87f3811c55bd0cb0a6a8b4a8ac30a115049
+DIST amtk-5.4.1.tar.xz 58024 BLAKE2B aa65a5b8e9e4105d0ba699eef7e505ba3acb95a7014da1217b9569b68cb1ae7e7abf6debc1bd79935baa376e5a36ef197add3c3d326d97e89c7107c42ff4e582 SHA512 6257295c9c4756de622df48dd915cb591e5f3bf2d5d17dcb26f835e69c885d50e48a2634d8f7b9537638e7bdc531462670697823301ca2d257403192f6f8062c
 EBUILD amtk-5.2.0.ebuild 767 BLAKE2B a44fed3f088fb4c961a686ffd0ae2748877048a124f8682441271c9dc77f3ec76c73a9b6db89113b54e103f25da4585e8d8a3d23cf1d41aefb64e184d8b747e2 SHA512 51deeb352f23af2ab0ffaac366d0b18d35393a413b8d0bb8ce20e296f7fedb69ebb15feb34d90eb9e52d51f2b14eca83e7bf54263fadd4c6af72f0dc2852070d
 EBUILD amtk-5.4.0.ebuild 863 BLAKE2B 3f2df3a46278da00cf839d1cd8d2a3768d81f9ae45c443ac3d4b3eb9d0c46244f15d666d346f816527f18b8ce113446c4194d797c49bc843fef9ac1c49719a90 SHA512 9367f2db83f8e3e1c91f2c4324c8478685bb9e74a4e1ccf5416beee48c956aa3d7ecd8f67a95fd8924c25c27b30bf6825270880fd9c9c9f1d3b54054f40fd1fa
+EBUILD amtk-5.4.1.ebuild 863 BLAKE2B 3f2df3a46278da00cf839d1cd8d2a3768d81f9ae45c443ac3d4b3eb9d0c46244f15d666d346f816527f18b8ce113446c4194d797c49bc843fef9ac1c49719a90 SHA512 9367f2db83f8e3e1c91f2c4324c8478685bb9e74a4e1ccf5416beee48c956aa3d7ecd8f67a95fd8924c25c27b30bf6825270880fd9c9c9f1d3b54054f40fd1fa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/amtk/amtk-5.4.1.ebuild b/gui-libs/amtk/amtk-5.4.1.ebuild
new file mode 100644
index 000000000000..47069d63e4d7
--- /dev/null
+++ b/gui-libs/amtk/amtk-5.4.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson
+
+DESCRIPTION="Actions, Menus and Toolbars Kit for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/Amtk https://gitlab.gnome.org/swilmet/amtk"
+
+LICENSE="LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22:3
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection gobject_introspection)
+	)
+	meson_src_configure
+}
diff --git a/gui-libs/gdk-pixbuf-loader-webp/Manifest b/gui-libs/gdk-pixbuf-loader-webp/Manifest
index 84d2842467f1..e9d528a4be8d 100644
--- a/gui-libs/gdk-pixbuf-loader-webp/Manifest
+++ b/gui-libs/gdk-pixbuf-loader-webp/Manifest
@@ -1,5 +1,5 @@
 DIST gdk-pixbuf-loader-webp-0.0.3.tar.gz 8605 BLAKE2B bd10b383320b3bc31d3184f29f7d7e308fd400a5691a698d1a9780626ed6c301d5399dbbfebc16dbc2a7b754dd8a3aa60301fd40b48aae690d9cc6287a5dff5d SHA512 38f5ee077add39860e75320417769dc55f044a1adcb9ef9a26f6d9642d5b22bda0e1fbbcb029502d7af1f4da3c235da130de0109370440ee43439982f55c8790
 DIST gdk-pixbuf-loader-webp-0.0.4.tar.gz 23252 BLAKE2B d57aec7af7a5077caab054399a7b69b828680d16adc043ad420ea24648ae07c4879063479e5317cc35929f0b1f31fabc97a2ec32cda9d80f5ad64f07ad99c987 SHA512 2d67a0d56f248ae48b3f3500859cccf8fd358d0377c3a65e17018f849d77d28ac9ecc471709a84502baf26284e4dd5d9ef3045270de60de6be8e276eb4e54780
 EBUILD gdk-pixbuf-loader-webp-0.0.3.ebuild 1065 BLAKE2B 24222914e805d2ed3f43ff0b01306a73ca73bef80d09b7497cbe0b78315b184b3a12967e6c5a53d0bafebef12879eb7099eae52e5d9123e59d21150387926a2e SHA512 171462d7b5a415c5b3823e706e8e27396fa908bffaa4f4b87edf8a48b88c6514d299a46cbd3200b9f676ce42a481e7d38642ffb18800bcdf02a84516cf2e349d
-EBUILD gdk-pixbuf-loader-webp-0.0.4.ebuild 1074 BLAKE2B 0b7f02e5edd014aaa0d25db089d846a78e98a2164d566f198bbdb2d9aec3d4e78acf0af99a65674dca2f3aa73878b1690543a3dac1d1d7d1af754202dd76426c SHA512 d536d0fdaaf11e8dc9d244692881eebf5a595183057e34d1570a57e4e2c86a5b7a2bde48eb6a790959ee349dcff4aed8640dcf4a4a5f1a905a86292e56fb8ad2
+EBUILD gdk-pixbuf-loader-webp-0.0.4.ebuild 1069 BLAKE2B 85c0873445b999f8c4804f594c9796bbe9d1cd38a53669bc41f9d7317a1566335a57c6a4a1bfaca2494c898f7a0c12eb17bcb10f20555e0e6c5715b29cf60ba1 SHA512 e0be6f9f78108ceed479aab1ded12e29cf266b6d907af146c29b6a66fd71eb89a70d2478383d1e9f7072d1d97f8ffcd80fc26ea11e8da7b5fe5c6b492627399d
 MISC metadata.xml 343 BLAKE2B c0eee217ce892c71a14f8960f96d2be35bb4dbdd0592b193d8a6c5663dff8b7a849b676ca0d54093c8b9932c4c0fdaa89c713c878a40d58629170f004493dae9 SHA512 4aff98d342ab95dd3d577dd87bc7e3f2a3177478b7b167488c6156de55b57c9e02c29e4d6d0975bd6023b189fce1a51c7c09fe9cc0eb4b550b9576a65b1c6a6d
diff --git a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
index 665ab72f88ad..a45d61dbab87 100644
--- a/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
+++ b/gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/webp-pixbuf-loader-${PV}"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index e3939680166d..f19826d2cd0f 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,11 +1,6 @@
 AUX gtk-4.6.4-update-shadow-size.patch 1128 BLAKE2B b21dc510effcaaedd196ea586b06a1150798fc58d529f337af3d072cf8b4ca2f5df1a1f0104caa9095e79fc9a0f3984f961bc86a72f9c47e190bea48cdba5fdf SHA512 31f2a10d29721c7321315c10a75ecc0fd47d410debebe60205341c690ae03f7742ae92c4030d78d3e2ed3bfd79e73b8f7fddcb862414052ef1b1c624c2c01dca
-DIST gtk-4.6.1.tar.xz 22882528 BLAKE2B 921f57124af67523e9d820427b1f5a099d8dfe14982630437df9a821b9ba25eb3db6aa494e71aea26cec3dca4d76e958e150c515d128bdda51b1812bd7801c2c SHA512 7184c3a541172bcc712c00c0093426c5ff5cc54ad2de8529cfec17f8185966718b18b46cfb6c3d8067535909eb0275cd57e8887d2be7a2af459d14f5efb4d03b
-DIST gtk-4.6.2.tar.xz 23060652 BLAKE2B 7cc3d5f06826c6f6d5c66ad251381dc34543672c778254c9044b7f58acfff9f7d0f44cdb0c124177cd0121a844a6168a46b8094d97565ef71c6ecfc9dc018865 SHA512 220959085b43c5a0bc496cb3d67213b73e1c597d6c799e5d788d0b75b664adc573b21c449850c7c0fbb7cbfafd77528c910f0e5eaa75a8fa59bff47e04c77f33
-DIST gtk-4.6.3.tar.xz 23060172 BLAKE2B 6ca25528fea54c9be2b8961790bbd8bcb933966c0c5faa203da7d9740a86561954ab595edf31db01df22008f4384648ec748d643369574eae4c4cc54cd06e7f7 SHA512 0e96b39a8171ccefc24808d1af8af8e3cbcc9b403c1bdfd85778ed2e824c93e3687b7baa1237b05fa35181d300eacfd6cc9f79c7a6eef70b365991f0a2769f71
 DIST gtk-4.6.4.tar.xz 23074696 BLAKE2B 90368cc0023dcdba63f2412e67a65a0f4238f1c29e9faee969ada897c3fe21f55e7eb0f5470fc025692b4ea3af2956a32140db060663591b149186c2888cccc6 SHA512 ef18e3d084757a627f09f226cfe8da18634466575b726dd6200b74e65e0a7fc33fa8d8f609c2de09a907dfd6ca90af66e15015612675dc89d43de6e711b173e6
-EBUILD gtk-4.6.1.ebuild 5319 BLAKE2B 9fe1b72fe22ce3ed8fc674dd1ec43e0ecde84273b7896b0813614fa59cdea5f72d62c76495f6b75500c1a75af37c2e7f5af3d9d6d17cfbd8854aced61667eb14 SHA512 d99383b49855da69ae30947db773467581dfe0b369c6197c7228dd5fe0b973125ca190fe7ec507b42bec4acc01d40496db6d8c289791beeba29340daa02a755e
-EBUILD gtk-4.6.2.ebuild 5694 BLAKE2B a093c6dfb79ddf7cafc1efab41af9e766dbb65753762441da54c78d92be0d068adcd4c6f8bc7af5f68e7c81972875b9bb13aeec1ac8cae992bb63585d3ac18ce SHA512 ecce4981adb2de853408474af4497c3acf8271e6034ea98ef993037b2c059feaf0a6e6e81a6574a9b7cc629d685cb7e95e4e035a1bddab4d51fe15234add488d
-EBUILD gtk-4.6.3.ebuild 5717 BLAKE2B 617efb0a8b1184de2da3b1386191fd398734ad2c519cf6b2d4915be4492c9374b593d5046d58b2fc5462748ee0db080917fcff803717828c14aaf8d43978ccea SHA512 ff120b8fd741f798c0117fd82bc06cfc9a29c61d1a46a5c8f70392df703ccb6d3b667e12ec60612794af2286e38138b8757f018a5cb60921f402943f1cd3fa39
-EBUILD gtk-4.6.4-r1.ebuild 5861 BLAKE2B d6371051138eae705d389e50869b8dcc0e19e4d8c2fe8bfb9c49f9d7e710c20f0ec577b0921a5a8c281da9ea0d13a43d92ee402568e24d168e89a9c42c2e7539 SHA512 254bdbf58749011665aea755850cbd3a88a06948e89bbe0228cfb95fb18ebadf2c567bb59bbe509ba120a0d9eb45aa6250a7296e04e0c9e2c758f1408c620a49
-EBUILD gtk-4.6.4.ebuild 5747 BLAKE2B efe18f61fc6944382434fc8761b74b7e9d362f4861a30225cbfe9093d3d8088432d8be6d0dbf19ea46e0019e1a77f6b697d3ea3d03169d4e4c6668bb4144d801 SHA512 8f54f89c7804186b5dbc201bf5b50c82871ad4629e216f0013961ebaa66dcffd8a787925003161381cdc68da561fb00535308887fd5c7171fb454f12525f3091
+DIST gtk-4.6.5.tar.xz 23082944 BLAKE2B 18855d5002a544a66b6129514633f9b560b224f7c654859aa3a545142879d6aa8835edd2373706ade3f701846e9cae3653237860bd07c45d81642bc67b6ef9c2 SHA512 a7bf28f6b9f5259fe1333432c205aeb8673f5f32ea0b1878c0724676f148e2d1680fe63ed9594ab5b92120d3497f06cddc5cde428247b3fc876e5785b3dd47ca
+EBUILD gtk-4.6.4-r1.ebuild 5856 BLAKE2B 7d60d090f2c80ec690c2f6ba6ddfb95fff8e741b97d3be7dbc7275307f16f9805aeb4e2fe5f29a470f7c0fe98ef0c3db3c8ebdb2459c3b09a0fb949380b68ebe SHA512 79dff55e0062c7ff409a096a6383d2e0d212e6b3f223fc1c359825a972b20633d91f8aeb13f014e4c55f6358e85d040618dd36bbdcd1f0c1aa60a051c79a9a26
+EBUILD gtk-4.6.5.ebuild 5751 BLAKE2B 86ced14f38da4d73952ba9696731fbb320ca0aeb982f10d94d59431c45e7f085a4f8b42eeb86ebb8a92b054e9692168ce10daf0cf95d3f079f1962325186fa21 SHA512 4c57a850a9aafe4a8f48c88d7a97d0652fbdbbda2cab4689fe6f5665526f54067c1212aeb9261c2f471a26490b602ee396ff6d7ce376021d3bc0c3b676da1fb6
 MISC metadata.xml 690 BLAKE2B 4ae68aa63a0aea931c3584ac288ac62226bc1a78395dad3e7401f1988d4ab45d3895eb8149f1c06a849e1e27926097d8aa09dd5a33a2bf8b4ce52e4e1694b1e0 SHA512 ff6bd9799fe0f9e3e922744ed78cc9db278801e6e2d309fbf146535b061670f5f9162946ddf76cdf3d0e4defca16657ba39b3af81e5bcf2423385c74fc299779
diff --git a/gui-libs/gtk/gtk-4.6.1.ebuild b/gui-libs/gtk/gtk-4.6.1.ebuild
deleted file mode 100644
index 9950bcb1a49b..000000000000
--- a/gui-libs/gtk/gtk-4.6.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org gnome2-utils meson optfeature virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	virtual/jpeg:0=
-	>=media-libs/harfbuzz-2.1.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 )
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.20.0
-		>=dev-libs/wayland-protocols-1.23
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	dev-python/docutils
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-src_prepare() {
-	xdg_src_prepare
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
-	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
-	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		-Dgtk_doc=false # we ship pregenerated API docs from tarball
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.6.2.ebuild b/gui-libs/gtk/gtk-4.6.2.ebuild
deleted file mode 100644
index cfb36b206d83..000000000000
--- a/gui-libs/gtk/gtk-4.6.2.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	virtual/jpeg:0=
-	>=media-libs/harfbuzz-2.1.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3
-		>=media-libs/gst-plugins-base-1.12.3[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.20.0
-		>=dev-libs/wayland-protocols-1.23
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
-	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
-	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		-Dgtk_doc=false # we ship pregenerated API docs from tarball
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.6.3.ebuild b/gui-libs/gtk/gtk-4.6.3.ebuild
deleted file mode 100644
index 03001840a3c5..000000000000
--- a/gui-libs/gtk/gtk-4.6.3.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
-
-COMMON_DEPEND="
-	>=dev-libs/fribidi-0.19.7
-	>=dev-libs/glib-2.66.0:2
-	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
-	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	media-libs/libpng:0=
-	media-libs/tiff:0=
-	media-libs/libjpeg-turbo:0=
-	>=media-libs/harfbuzz-2.1.0:=
-	x11-misc/shared-mime-info
-
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3
-		>=media-libs/gst-plugins-base-1.12.3[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.20.0
-		>=dev-libs/wayland-protocols-1.23
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	test? (
-		dev-libs/glib:2
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	xdg_src_prepare
-	# dev-python/docutils installs rst2man.py, not rst2man
-	sed -i -e "s/'rst2man'/'rst2man.py'/" docs/reference/gtk/meson.build || die
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i -e '/gtk4-update-icon-cache/d' tools/meson.build || die
-	# Workaround RWX ELF sections, https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
-	sed -i -e 's/^ld =.*/ld = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-	sed -i -e 's/^objcopy =.*/objcopy = disabler()/g' gtk/meson.build demos/gtk-demo/meson.build demos/widget-factory/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		-Dcloudproviders=disabled  # cloudprovider is not packaged in Gentoo yet
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Documentation and introspection
-		-Dgtk_doc=false # we ship pregenerated API docs from tarball
-		-Dman-pages=true
-		$(meson_feature introspection)
-
-		# Demos and binaries
-		$(meson_use examples build-examples)
-		$(meson_use examples demos)
-		$(meson_use test build-tests)
-		-Dinstall-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.6.4-r1.ebuild b/gui-libs/gtk/gtk-4.6.4-r1.ebuild
index 4abc0da0b05b..75580601f593 100644
--- a/gui-libs/gtk/gtk-4.6.4-r1.ebuild
+++ b/gui-libs/gtk/gtk-4.6.4-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	test? ( introspection )
 "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
diff --git a/gui-libs/gtk/gtk-4.6.4.ebuild b/gui-libs/gtk/gtk-4.6.5.ebuild
similarity index 98%
rename from gui-libs/gtk/gtk-4.6.4.ebuild
rename to gui-libs/gtk/gtk-4.6.5.ebuild
index 8203157779b1..5901072e16fc 100644
--- a/gui-libs/gtk/gtk-4.6.4.ebuild
+++ b/gui-libs/gtk/gtk-4.6.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
 
 DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
@@ -23,7 +23,7 @@ COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7
 	>=dev-libs/glib-2.66.0:2
 	>=media-libs/graphene-1.9.1[introspection?]
-	>=media-libs/libepoxy-1.4[X(+)?]
+	>=media-libs/libepoxy-1.4[egl,X(+)?]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
 	>=x11-libs/pango-1.50.0[introspection?]
diff --git a/gui-libs/gtksourceview/Manifest b/gui-libs/gtksourceview/Manifest
index e67539be824c..27e02354831c 100644
--- a/gui-libs/gtksourceview/Manifest
+++ b/gui-libs/gtksourceview/Manifest
@@ -2,5 +2,5 @@ AUX 5-gentoo.lang 3898 BLAKE2B a47c411fa650a53cb9176c3b670b5189ea9ee0c268d09444e
 DIST gtksourceview-5.4.0.tar.xz 1259684 BLAKE2B 1561984d967dc6ab06e02d0da6b0a90573f5bc40670cbc189cef0b56ce7be9f84b0a82ccc2cd73ff3e2fb35218785e183a83a0ad5dd5ba85b023ac221820b88c SHA512 0a84e2012639aa29613896e36bb8e73656661dbd9c045507cae3c0d9863dc1ed0390432091d2d2e62fd4a9a0f1853820a2edb406ef2deecd0996b202c7b741c3
 DIST gtksourceview-5.4.1.tar.xz 1258668 BLAKE2B 588dc30093f9300c96aabdabd5bccc84a4fe93ebdcfab61f72a33113ec3f53826022d730a79e7b467a392d4467a0370b2fd3e6edf5cb2f31525b7c3d18e52107 SHA512 5270db969455ad29498a02a851802228575c9b4b6cf6d4f9736bff95f869f1052550034fe6cc4f0c8d29174559d147068dcd088ab09b2008399f7a717aced298
 EBUILD gtksourceview-5.4.0.ebuild 1775 BLAKE2B 4b15151325c48c8df9a0686a78da1ec824feb736f2ab2eef8858a2f9f65482d93a1473405d3e035d26b5d622fafa346a8d0da2f14726ab9d0e903c094774678e SHA512 5ed518c16b45fe5b223489ed4d46faebd2e51759fc5dbe373814240f32e93fc4a92727f9e12e33f44dfa95b23b8467eed62c1320020d73d23266ac3a132f8ce4
-EBUILD gtksourceview-5.4.1.ebuild 1835 BLAKE2B d79b12bf32fedf9e677aaebe04fac1c8c7775d39aeb2868e4a152b9ed3343071f5761ebca383e67e84b977f7f71ee9b37d7a2770677e2314a568137104ed2885 SHA512 32082e202473b54b2067552ea3746ebdde75f80dc8353d87a33e11e0ba73722e058345de0b4c268e37950609258adee41b24119304d31b6942dac70cf3b77ec3
+EBUILD gtksourceview-5.4.1.ebuild 1837 BLAKE2B 9d0e8e7e9c1c70f23fa4a084ca6ffc889852f6089a65a77b5c2f01824325eb4d46df77b0f19e5fdc3c8ae8b5b024f8550e218bddc0e383d0e8f9def708153afa SHA512 9b8046f6adbc152d196cb61da8d030fd5695780498d37a28cfafa300358a8ca81885a8d6cb42d45a683e5b9b59dcbb74b76ed9546c8d3d6b77cbb6b42226dfda
 MISC metadata.xml 372 BLAKE2B b688307985302494fc956df801d7ab8e4ac52ede6baec476031c31cabc013df8f0846ca3a0d67b613d4f3ba80edf69631f4d15bb43cadba82ecb1468b558651a SHA512 33dbeb75d42b8d42953d1db99e286baa90b0c7a2e6a93e945e2c1e2cb0287445aeef287bc41d44a53fcc243529880c237cf1acedc4962ee5ef5cc1e6424e102c
diff --git a/gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild b/gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
index eaf86bb5472c..110ffda6d7c6 100644
--- a/gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
+++ b/gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
 	gtk-doc? ( introspection )
 	vala? ( introspection )
 "
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.70:2
diff --git a/gui-libs/libadwaita/Manifest b/gui-libs/libadwaita/Manifest
index 5370779369ae..47394d13d61b 100644
--- a/gui-libs/libadwaita/Manifest
+++ b/gui-libs/libadwaita/Manifest
@@ -5,5 +5,5 @@ DIST libadwaita-1.1.1.tar.xz 2731088 BLAKE2B 0f1106cccd37200a5566fad9aa1becfb4d4
 EBUILD libadwaita-1.0.1.ebuild 1453 BLAKE2B db91a232fb42d2ccad9f07d18daf27ee9ceacb32c1e96c3942f89512cd9bd711f394e909286e01d74b35eea074c1e06dfffe73a65d854292d36845ec52200ea6 SHA512 461f5dc5a80846843d9e6586665457b6d3266840c7e0b474b1e0cd9f022ea248b92d537aba2025a8079ce2a3d08c8182662bf811e08b3e4bf61e849056ccc450
 EBUILD libadwaita-1.0.2.ebuild 1459 BLAKE2B b50bb9974dc44553a0d33d154c272407ad57ef3775e3d524b1c667564bcfb51fad9fb21b63b6e9fdf4aa5c974435f1ee8bff83be44c4d3447e38c34d596aae8a SHA512 1cba1098c5bf0d6abb79762ddfa958c8e22852bc4af1786eb3032bc72d67643b4e439697e486becca49f118971ef777f32d64cdbb83b62f34a6f96785c067d23
 EBUILD libadwaita-1.1.0.ebuild 1459 BLAKE2B b50bb9974dc44553a0d33d154c272407ad57ef3775e3d524b1c667564bcfb51fad9fb21b63b6e9fdf4aa5c974435f1ee8bff83be44c4d3447e38c34d596aae8a SHA512 1cba1098c5bf0d6abb79762ddfa958c8e22852bc4af1786eb3032bc72d67643b4e439697e486becca49f118971ef777f32d64cdbb83b62f34a6f96785c067d23
-EBUILD libadwaita-1.1.1.ebuild 1484 BLAKE2B c32e9f3c153d5174ef1b006ab0f6b742230e627952fbaab55dae556fcbe9515e0da8a57fed61e39107ca7e24e4f6b06e8276badb750b2873aaf36f8dd208a80f SHA512 90c2c99d79d6828ceb486ae47e537dda2560afd69de6a29c35f338331c276c879541bb503ad3f90aad68bdf5aa894e401f4eabda8b0e8b129a72a2832345fbed
+EBUILD libadwaita-1.1.1.ebuild 1481 BLAKE2B c35cf9b03a4b089ee9ed676212eddc0f2b581d265f9a32034653be48a938fbd2c54e51ca6ff5b4a964636ef4b840c1a34372f3dc4101786ce6a6e22148fa5aed SHA512 9e35ad8d6788340e78e3d61ced1b40803c9b1bf032823ee8eb09bde8f28c9fe5000c7ed3c412b94f85ff16b670650efd521ab17d5b106cc2cd3815c88d305650
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/gui-libs/libadwaita/libadwaita-1.1.1.ebuild b/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
index 350b58bd8cad..240720a09fce 100644
--- a/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
+++ b/gui-libs/libadwaita/libadwaita-1.1.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.66:2
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index afcd2212c8a5..0084825a9468 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -3,5 +3,5 @@ DIST libhandy-1.6.1.tar.xz 1781604 BLAKE2B 87f33662397d569fbb58e04b3e61e282fdeed
 DIST libhandy-1.6.2.tar.xz 1783660 BLAKE2B 4819ee8917d324f795b5f983ba69a3a5e5e77addf45c83b63ab676407aadb335f1130d02f011a6fb479f7ab71fdac7030b6fadb42dea92ac2fa949ed6d240844 SHA512 482a848ec5b085e2c5dcc94a1a9be618de22f779dc8c8cc07945f6269d1061e96009700ee9e3ddf0ccac0ce2ac01ccb4da3a8d366f1b3b9ceecc282a46021a6d
 EBUILD libhandy-1.4.0.ebuild 1252 BLAKE2B 7e085a1d6e8a6eb7d320923acaa6820bc4a146e4667161632dd40bb526b4c010685f7d82936812cde252e43bbfbf518f2319dc90130fc38f33ca149b66389ec4 SHA512 df6a30d14cc1216cd6ae7eff100d191ff2369dfd52251d24507dabbcc5f7b8323a8841e1dddfb5ffa1767c68718737c080453b90b82bab143b759b2a300b2a27
 EBUILD libhandy-1.6.1.ebuild 1268 BLAKE2B a724854ce5dc45197b3b5d9a596d18c55471c77f176c2cfc04d469765b06f6a910b83c4d110f2e7716239f0ec8ce8ac17421d694eb0a82914736f198e5fb9895 SHA512 8bb1aebc01a38e3813e2f310e90f967589d4fbac844d7299299ce23fe28c099155dae09d07d321eb7004c0c513150b7bcd4af90be2aa46b77a81deb170b6b903
-EBUILD libhandy-1.6.2.ebuild 1268 BLAKE2B a724854ce5dc45197b3b5d9a596d18c55471c77f176c2cfc04d469765b06f6a910b83c4d110f2e7716239f0ec8ce8ac17421d694eb0a82914736f198e5fb9895 SHA512 8bb1aebc01a38e3813e2f310e90f967589d4fbac844d7299299ce23fe28c099155dae09d07d321eb7004c0c513150b7bcd4af90be2aa46b77a81deb170b6b903
+EBUILD libhandy-1.6.2.ebuild 1263 BLAKE2B 6f31b148d3a0f77bf7cf9103615c53e12999398a8c63b6faebe8b20523b43af14fa7edad32bf2708bd9aa2cc8597a8d53a463ea839872c1ce232833fde3a242b SHA512 0b0d31e8344e39ba0a5ed3de956eb0bdddc9040a0619e8b76490fc2784b80595ba525adba238c1803c2920fe77c4341ceb47be108db0dd02881016dfa31d3454
 MISC metadata.xml 354 BLAKE2B 878f8199cb6cc83b1ab56f64fad507be89b9206e64a76182eac19eecd24e132674dacc223953a80635c61a7d59fb571138f44a56409ca97b2f192d304957c082 SHA512 1e2a3b1466ed49ab71e8a2c18def2b984b42b38936811ed170b47f9c6c925feba076eb671110801ae805f7c1eb175f6ed4db4d6a87e83a9e024e0b519cc45170
diff --git a/gui-libs/libhandy/libhandy-1.6.2.ebuild b/gui-libs/libhandy/libhandy-1.6.2.ebuild
index c396cac2d01a..219cc2a15217 100644
--- a/gui-libs/libhandy/libhandy-1.6.2.ebuild
+++ b/gui-libs/libhandy/libhandy-1.6.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libhandy/"
 
 LICENSE="LGPL-2.1+"
 SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="examples glade gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/tepl/Manifest b/gui-libs/tepl/Manifest
index d0355c9409c2..75222955a1b6 100644
--- a/gui-libs/tepl/Manifest
+++ b/gui-libs/tepl/Manifest
@@ -1,7 +1,9 @@
 DIST tepl-5.0.1.tar.xz 126068 BLAKE2B 2c3038326660f6326c5030cb944f8cee885b794a481f6d8f1b5d87a8ea7121ded381d28b36246a99b57bbea5fd9e6d2d4f65f9dfc54d8154ee8aabbccd7e3cb5 SHA512 f363d182185976447d235cf1201148e5201cdabd1fa8b88d7a763a965896f87bd222a0161c11e93662afaf4e474bbd0308643d28559aadc27b9d48974f4c458d
 DIST tepl-6.0.1.tar.xz 142884 BLAKE2B 7da51ecd3b1a74fc22e98020ad6b73c98524c97384c26c9cc0ef0a972214afcbb8c2bd4976904cea91784f815e626c501cf68d85d876b764af3b8bd182848694 SHA512 31d7a6e5f66e66f380f780089c13ccb938052237acf514713a731b374afd6871fb8d0685db2137fa2c62548dd3ae85a198ce3bfc3148ec30feb0cb0f10c78114
+DIST tepl-6.0.2.tar.xz 142916 BLAKE2B 584d4ccec446f94590020e569f1a2b28d4b10a2452479c2c521c05927a094d01b28d81e2271dc8f4e1aa0a66976df64cead357f5487f78944c20ceca5c542742 SHA512 8b12418ba9e18a3aa1772692d196583353d98d73a007b35d93d2c605efceb5064e556968e5612f326f6b447ced0cdd66c130b6840c98ec067e1ba7da930fa4b4
 DIST tepl-6.00.0.tar.xz 141908 BLAKE2B 200693a8cf760d18e1c53647abb8156f7e067557b4cefbd05b03c5a3ec83c3c5807ab93e0464178b68fc9f2572c3175fbf9355f4131df1fe7f79b5e2deb3961e SHA512 e36877b9f33943715a50546d82ed61e65fc07b71dca2c85ff350a305767e96eda74dc14f30b2a430e14deacd4ee8d49697fe01df1f5023afab3747e5e9c95e2e
 EBUILD tepl-5.0.1-r1.ebuild 929 BLAKE2B b919d3aefac8169ec2412485a219331d79ed0748f578183e5145755b3b6c038dad19e84780dfa73e0da2eb0a4b923d58fad9e0611630310400d0faa122da1021 SHA512 4a6caadaf99b71899edec65ad36499be8867444f46e63ed037258ba5067c4ba8d9d32411522ed07456cde904d21bd0866631c4e0955602a839630c77ccb02144
 EBUILD tepl-6.0.1.ebuild 1059 BLAKE2B 2e327c65781d132f44589f7f92031ed99304d4cf4dc050e96dd510a425a168ecaec6bd04f80515fbcdbd5d49cb919286a7159529723b77187b785c9511d0ecb4 SHA512 deca3ad70e7709733e0b8a0953c9a5b631fb1b7fa5120ea510af27874f91462ebd71960b812fb5e259f0c259ed1d067fea8a0693b5972267fd9534803cdd83d0
+EBUILD tepl-6.0.2.ebuild 1022 BLAKE2B 61b73ebcd899cd13f14d883f94ebf714f89e4bb3c9e9435daecce18f85fb68f9306c941917538264b57e0669f92dcc71182545a6393f67201a871022025197d3 SHA512 a70963392278cd7672220cf8c7b50d02a0427def6a9518f05824d0219c361c52e32a135dabdfa12a8267a95aa1ca412a42a07966c2b25ff7ca97818f639d39a9
 EBUILD tepl-6.00.0-r1.ebuild 928 BLAKE2B 666df259f69368bad83aa92e2e6289a1f05254a81a831d7443625a14e511a090909ad2da868b11a18a00913bb95d0a399a221a62bf621d951e856c7f463fc409 SHA512 6800ee436f0971678d9c6b58e63181c82738e47469893a781adb910a68da726b33b9915b033fcea7c35ff0070892bd563c0d4d32eba8bc70bb4358c9b7d59895
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/gui-libs/tepl/tepl-6.0.2.ebuild b/gui-libs/tepl/tepl-6.0.2.ebuild
new file mode 100644
index 000000000000..7b36b106c694
--- /dev/null
+++ b/gui-libs/tepl/tepl-6.0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson virtualx
+
+DESCRIPTION="GtkSourceView-based text editors and IDE helper library"
+HOMEPAGE="https://gitlab.gnome.org/swilmet/tepl"
+
+LICENSE="LGPL-3+"
+SLOT="6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection gtk-doc"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.62:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=x11-libs/gtksourceview-4.0:4[introspection?]
+	>=gui-libs/amtk-5.0:5[introspection?]
+	dev-libs/icu:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection gobject_introspection)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 42b958f96496..ebf690a64142 100644
Binary files a/kde-frameworks/Manifest.gz and b/kde-frameworks/Manifest.gz differ
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 24f660540561..99176de1fa90 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,7 +1,8 @@
 AUX knewstuff-5.92.0-KDEBUG-451165.patch 2700 BLAKE2B 0478eb83efc569151a0ecc043ce28f26e14a3803019e71039634fbac095204882c45a43d4f0520d8199c037a4cb291e543ec61c5667e84f52044a50877996f3d SHA512 170f6155f78b1386b4a807bcec1765c9bc8c7aec589a7ed364159597e324eacca390cef63152ddcb9f6d81b175089ece8628c6f861a4e3089cad2978188729b6
 AUX knewstuff-5.92.0-fix-valid-tar-recognition.patch 1123 BLAKE2B 6febe01e614eafc88b1c29c327d0c5906347d8d3db518126c0950134e8764b31d5145501c2068489fa0435b6263bdfc6899a567bfa6f82317b50b56e312cfa13 SHA512 4a216fc24709fb602ed2a7d7ed6d9e9bce66dedd9eb64f41f2d5e3a6363f916602c8adb4588cd3781c0383cb3f4732c332fd82adce8abac76ad2507b8c7be0f0
+AUX knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch 1752 BLAKE2B 97b1966520d301111d8f40c5b8497a4d4574ae8cc6b4465b095d1f1f41b3965953e8c34c0eb12a50b447821315fdd4e13d43fc5694ceb68dbe093065aca874db SHA512 5c73d39a78658899f4e7b2526608498ff63bf4e6f9b730b0f20f3205017e77fe4a9a96e3ab9e42f0789234a3e0658a89f646bc040488465f07689bc9629105fc
 DIST knewstuff-5.92.0.tar.xz 1155052 BLAKE2B ee3485c1e3371c139019bb1889aedb112f40c0bb0ee1c92c159b3a6b8a84208d53de10fb1d368852927b7a65e6e1cee3afcf99aa821e8468c67f8b0ac49db79d SHA512 689089724f53ecd59bc79e046bb0b3f64e7a3bd7c8d9a5cd8be15d13bdc045e0484e05a2e0a87ab0134744da829becf8fc669a9e17b7668dafec3fff8e62a2a8
 DIST knewstuff-5.94.0.tar.xz 1154916 BLAKE2B 668ed799cb34470e5f8132a49d47261b1e571c30106e7a4b623513f16c0ddcbeea5a7011bb637438326758b5b54019004c6a81ff66d1b7155eda4b47ad19888f SHA512 6269614a0df2616bd5bd1a8e9c3f8dc16920bbd4cf8fd18a5ccc1e818c292d90533de3dc77ce8fbbb183388ad6fed72a30b78177eddd87624499b3c75d55a226
 EBUILD knewstuff-5.92.0-r2.ebuild 1391 BLAKE2B 013cb64dc992bfe6ffe2f2746acfe5e393a545f84ea4cd7996c1deb68924e1546029102141bb23893e8fd50d139643bd1c81d96337eb140e787a27d1046bc4bb SHA512 4c0a9a07e57946f26aebc7f2125cf28ba18b55ab63a0f326115082df3d223635b292d870c5da1c14c6f9b91f36ee0e20bf0e779ef87f8e0a9192752c12272834
-EBUILD knewstuff-5.94.0.ebuild 1272 BLAKE2B cf40d389f151bb8e07b2cce100d668c3bbe5da4ff07333f1c464b7efe892e263953a836c9e0888061f70c9bbc922699880cafd4b5f908510893a13f3da1f42a2 SHA512 a520b24f121aae2d4b561c1751b9913775f12ac6538ecc6e8f0fefef4f6e03d4ed0831f4a99257186d293543bd03a35bd27240deda74ffe0ad4dc7272f2dd464
+EBUILD knewstuff-5.94.0-r1.ebuild 1364 BLAKE2B 123e9c9be9e4ba087d01d181a6cfa1a9291e90278d131c14cf7043f71f7f4897df84f36698a76ae8aba824103f6abdea0ef387dc0a345eb6801e594d1e3d68f1 SHA512 16b119487a6cfedb5920dcf4372202bed7590fedd0ce0205cb432e1330ebb98c0fef55d9385bb6db08edb11e917c60d452ec4a263467107d08c8048753d6330e
 MISC metadata.xml 600 BLAKE2B b9dafdddae4fb5f9969ca845f02690b096f81f6b3c1f76fe877f2886697c0636b8a3b4498aa5cbf903f1b6ee14f3de51c10ce88b37a9780f91ce23bd841f5fbe SHA512 5f3710e9d14cb62c66fa6b21f70691f276fb1fe030b3b2eb92f206a55bbc10dd998dd522e478c883c36d7f811d7f163602e3a2af7ff92e6dd79fa28a1fa32b85
diff --git a/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
new file mode 100644
index 000000000000..002d4c182b28
--- /dev/null
+++ b/kde-frameworks/knewstuff/files/knewstuff-5.94.0-fix-QtQuickDialogWrapper-for-konsole.patch
@@ -0,0 +1,54 @@
+From b634b65dd081746ccb8bdfa9bf2d878d13e2c0fb Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Tue, 24 May 2022 12:58:54 +0200
+Subject: [PATCH] Fix QtQuickDialogWrapper dialog not being usable in konsole
+
+Patch provided by David Edmundson.
+
+```
+Issue is  QGuiApplicationPrivate::showModalWindow
+
+it marks every other non-modal window as blocked, including new windows.
+
+when we focus the new dialog at a wayland/X level Qt gets it, but in it's own internal dispatching ignores that and sends it to the modal window
+
+Qt is smart enough to handle child windows appropriately, but only if it knows about them. Having a transient parent should take care of this. We should have this anyway as that will fix some window placement bugs.
+```
+
+BUG: 452593
+---
+ src/qtquickdialogwrapper.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/qtquickdialogwrapper.cpp b/src/qtquickdialogwrapper.cpp
+index 4f22b650..e31e8d80 100644
+--- a/src/qtquickdialogwrapper.cpp
++++ b/src/qtquickdialogwrapper.cpp
+@@ -7,10 +7,12 @@
+ #include "qtquickdialogwrapper.h"
+ 
+ #include <QEventLoop>
++#include <QGuiApplication>
+ #include <QQmlComponent>
+ #include <QQmlContext>
+ #include <QQmlEngine>
+ #include <QTimer>
++#include <QWindow>
+ 
+ #include <KLocalizedContext>
+ 
+@@ -70,6 +72,11 @@ QtQuickDialogWrapper::QtQuickDialogWrapper(const QString &configFile, QObject *p
+ 
+         // Forward relevant signals
+         connect(d->item, SIGNAL(closed()), this, SIGNAL(closed()));
++
++        // Otherwise, the dialog is not in front of other popups, BUG: 452593
++        auto window = qobject_cast<QWindow *>(d->item);
++        Q_ASSERT(window);
++        window->setTransientParent(QGuiApplication::focusWindow());
+     }
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
similarity index 93%
rename from kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild
rename to kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
index 48c5aa614b68..73336dd92ec0 100644
--- a/kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild
+++ b/kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 	>=kde-frameworks/kirigami-${PVCUT}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-QtQuickDialogWrapper-for-konsole.patch" ) # KDE-bug 452593
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package opds KF5Syndication)
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 46e10ab68a0c..bd60f9d42152 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 6a66143a606e..99bc2dbf6d8b 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,5 +1,3 @@
-DIST bluedevil-5.24.4.tar.xz 173188 BLAKE2B 5a576132bdc2b96960bb5e374f84cf0e4653f8b1973147ebf31a432d4a0246ef0e4038ee4de3b0c4bc37e06946e094fd6452d1c8f35ea7fb7ec91877572770ef SHA512 90501c9b71a2a509275d105b3d29b397c9845ce6c66239168f38fb54e89909744210243cab41ac24dcdb38e5988429b94622bf05715537edcd011508b6bf5957
 DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757
-EBUILD bluedevil-5.24.4.ebuild 1118 BLAKE2B d26804c3b4b6843bd9e3c1cc2aa579bbbfe6fa502c07bffcc08dcda60c4513c296fb7dd079b946972c305e9d4ca5c06aa48c7a9cbddecc16fd03137d0ca1b54f SHA512 9b451976eb958bc7b8a26fad822ff7d14b9ee85ab6144ca7ce529693fb53b427f8b13a92478c71d487f85ee709f30b83e3982c260bcb416b0f1488d1eeec0e25
-EBUILD bluedevil-5.24.5.ebuild 1121 BLAKE2B 80eb20fbbc3cbdb123bf67b236e13e70c0c1d8a958c877cafc374d0f92eafa53a06bdab0738b932c60230fa4444f268f8764cd5056670ab8128ec5ca0c5b4513 SHA512 795fb78afe25ab7be0a92b776c9f2d4df8da9b0f2d66815ce868568d959a6ca0a3b2998668e93b1ec54711f13d3a8b3e68684375e8f84aa8433557ec2b25ae7a
+EBUILD bluedevil-5.24.5.ebuild 1118 BLAKE2B d26804c3b4b6843bd9e3c1cc2aa579bbbfe6fa502c07bffcc08dcda60c4513c296fb7dd079b946972c305e9d4ca5c06aa48c7a9cbddecc16fd03137d0ca1b54f SHA512 9b451976eb958bc7b8a26fad822ff7d14b9ee85ab6144ca7ce529693fb53b427f8b13a92478c71d487f85ee709f30b83e3982c260bcb416b0f1488d1eeec0e25
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild
deleted file mode 100644
index b556abdcbb05..000000000000
--- a/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Bluetooth stack for KDE Plasma"
-HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/bluez-qt-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
index 0f52e59f206e..b556abdcbb05 100644
--- a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
+++ b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/bluedevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index efc821a1bbbb..749bca006df4 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-grub-5.24.4.tar.xz 3143308 BLAKE2B 522acf1644e325b9bb965dabaa49a257b7eff12351a483dc9acff4f7565f0f6d8fb9ea2b808aa869a54422161c8abacd9e3d38531c87c622a4ee0a29ddace3b7 SHA512 0275e69f046ac61c1b159cc4f4eb78a605fffa9be809fd3b9752fa928906e94ff7af085a1ed917b2973ac626c260c2f3528b17afb2cd07171a650089bad26425
 DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355
-EBUILD breeze-grub-5.24.4.ebuild 401 BLAKE2B 20910cbcadbf83d7eaf70222302513f94e3f026b30ce409fb86867837151a11ab6099d08a87ea6238cd2af876cf9e366d063e58be3ac3ed1d13cabb26528d3d6 SHA512 377df5a61397f1390119dba44b82f90ce80ce58cf17380e21ff455d410849d142ffa1672b8e91415a0d915427d34c6dc2c4bc2712791ca3594460e3f57f3232c
-EBUILD breeze-grub-5.24.5.ebuild 411 BLAKE2B ea43466aaae3bcb2955cf29f9f3d44cc7dc88294c02ec4753642f0fbf5da2fde580432e153d58176d7e3eda51cd97592c9fd640e95343b4ec592d482925c519e SHA512 a35717f5c22e7883401d37b496680a5add848033e1ae936f0f03d5d85fa015b02437b563318f00deec77100022a76539852fe7d72b4b0314dd9b3fe45247aa14
+EBUILD breeze-grub-5.24.5.ebuild 408 BLAKE2B dc72176e505ec1930f82e9385ff72d0fe7baf572566f839a17410ab96279febcec0fe22ba820856ff4b6b8650153a8ad9033ad79b4eb0b4cb618176442bf5c2f SHA512 0dc9f121b7a0fa74bbea82a80352dfb47bfc4cf72f05f7055a8fd514238c9138417b55ea7f66fc13a6b8ab48c98233780f138a5d7fa199ddadbec8999445b93b
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild
deleted file mode 100644
index 7551a15b6314..000000000000
--- a/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-inherit kde.org
-
-DESCRIPTION="Breeze theme for GRUB"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_prepare() { default; }
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/grub/themes
-	doins -r breeze
-}
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
index af842b702646..dfc1b0a3ae8b 100644
--- a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
+++ b/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Breeze theme for GRUB"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 src_prepare() { default; }
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index dc90fef5ea20..23a6d604ac03 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-gtk-5.24.4.tar.xz 43796 BLAKE2B 2aa910eecd6030d10dbfa91cd8011386512fe7afb491aedd289acf2b69f5a4c6af4feb236e9ca92a51c4f90d705b470bbae299776bc5a9bef910512d548a27e7 SHA512 f131efd7405cbfbf8e577bd2fa9f499963809f9a4fce003add737523b758e062f4735ce8969a60c1641d97445a141d05bfe03dd7785106c372bbc78ebf6c1602
 DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29
-EBUILD breeze-gtk-5.24.4.ebuild 774 BLAKE2B f7317ba951ef51433cad9874538628861268178de42f5cbd3419ce9c5f2e6fe3761205a9f98070e0b7ccc3f1c746cbf3fed711f076410c14b5b715bf43d3a466 SHA512 27c4710882b5839a6b97fc9e56719e934c7564f08808dd0f112dad0389c13f66eaba9cf25a0d66d36fbe864710fad12fcf8c31bed995d06eced65834c2611bec
-EBUILD breeze-gtk-5.24.5.ebuild 777 BLAKE2B 3811af6687eb8faa098dbd17796da00bcdebe2d2b9adcdf5cbdede1ba00924c0c1f3de9190b7a937dfaf673d5c49f15b54e1398afb09ee50ed3899deb10d2f51 SHA512 0b817f0a309129d39eb7c2fc7a8c3ba503ff98d95f69fd469e7982c1afffef60d3c6f8ee38b58e44666a894e885baef132f87775b824d77ca6ca82f839166291
+EBUILD breeze-gtk-5.24.5.ebuild 774 BLAKE2B f7317ba951ef51433cad9874538628861268178de42f5cbd3419ce9c5f2e6fe3761205a9f98070e0b7ccc3f1c746cbf3fed711f076410c14b5b715bf43d3a466 SHA512 27c4710882b5839a6b97fc9e56719e934c7564f08808dd0f112dad0389c13f66eaba9cf25a0d66d36fbe864710fad12fcf8c31bed995d06eced65834c2611bec
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild
deleted file mode 100644
index db378cc0e98b..000000000000
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-PYTHON_COMPAT=( python3_{8..10} )
-inherit ecm kde.org python-any-r1
-
-DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style"
-HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/sassc
-	$(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]')
-	>=kde-plasma/breeze-${PVCUT}:5
-"
-
-python_check_deps() {
-	has_version "dev-python/pycairo[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
index 325c2a0fc59f..db378cc0e98b 100644
--- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
+++ b/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 977ef8275417..4f8424b90b41 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-plymouth-5.24.4.tar.xz 110792 BLAKE2B 4a8e7f9328e20a0c5d0fe182be0af32ee009ed8210c50adff7e8ff25956dc17309e92c9d3ac64a6b2b79826bd00f74a30d6d49a68bf88d6744db6894e9220592 SHA512 b5cb5b845a28c3bb2eb39df5896f95fe46f280cd7d736bba11cebe52c43f77f989e96200d7cb861d57067ec908da34126d44b6f1847507135a1190812fb14436
 DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f
-EBUILD breeze-plymouth-5.24.4.ebuild 515 BLAKE2B 01f3115eab8ab511646798d04b5a52c2bb1f0156298b5aef542c7aa92e49cbd285eca4cd704e2f9081faea5c692f6bb975dbf41db1a27fec56433301e2374c70 SHA512 9723eeb675d4376c47a03a5bdbb1a9b0edb535bf5da6f138bcf1e5a1dea88fd83f629aaf4f345e6744438a811f370ad4af3cd5d2f50c2b7d3ee720cfe972fdf1
-EBUILD breeze-plymouth-5.24.5.ebuild 518 BLAKE2B 0efff2324951a65ae4aff73fbb2dca0768a08606d7778ec62e0291449167f529c01121c860db6ed8f1a0e0c24cd6b339f2556ee31e775f226e97300274ca2110 SHA512 74fa5fc559f525b62da012c1d3bbaa8767b952f470525efb8247b64468a61a85d8505c25106aca77292aaba093db9e01a75702d8dac29f59ca6f4f78ffdb2504
+EBUILD breeze-plymouth-5.24.5.ebuild 515 BLAKE2B 01f3115eab8ab511646798d04b5a52c2bb1f0156298b5aef542c7aa92e49cbd285eca4cd704e2f9081faea5c692f6bb975dbf41db1a27fec56433301e2374c70 SHA512 9723eeb675d4376c47a03a5bdbb1a9b0edb535bf5da6f138bcf1e5a1dea88fd83f629aaf4f345e6744438a811f370ad4af3cd5d2f50c2b7d3ee720cfe972fdf1
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild
deleted file mode 100644
index 188483457ed0..000000000000
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Breeze theme for Plymouth"
-
-LICENSE="GPL-2+ GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
-DEPEND="sys-boot/plymouth"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISTRO_NAME="Gentoo Linux"
-		-DDISTRO_VERSION=
-	)
-
-	cmake_src_configure
-}
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
index 9f8cb32ddecb..188483457ed0 100644
--- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
+++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Breeze theme for Plymouth"
 
 LICENSE="GPL-2+ GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5"
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 19eebc9d6c88..3b01d537eb2d 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,5 +1,3 @@
-DIST breeze-5.24.4.tar.xz 43037332 BLAKE2B 2ce9d430291610f58aec732b7dcf8dc36c591a17ba0481f891faf18c7b2b2bbe3dbc0ba0a519a25c7b083de75d899bbab95886fed3b3b3c51ad8b300f1caffbd SHA512 476d01b61696bc0886c172b883df382ca9cd9128b81fadbcf3135e0f2e70789faa96a536a998267074f31e9145b4b2de4c62e47e8752b352f2702e797023e6ce
 DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0
-EBUILD breeze-5.24.4.ebuild 1233 BLAKE2B b78a0cbfd6149999b9defd19e5730d5d3350e17ec5517f9bbd8feff0781003c3b353cd676fa847bc84a4542a083a2e1108201ee691d34a7044d630259f78a70c SHA512 d369d733f9cfc2b4b3ef0ef52920f3094dae7bb428a12bef4634f5e606debbda9b5356b70b927a63b3d083a8dc45edb9332282965a2c2aa9ddbc80f4aed2d7c8
-EBUILD breeze-5.24.5.ebuild 1236 BLAKE2B c2066770a6017b9dc0035a4412b3a6c784caf81ba1c5cf0035c0dc27c7cd5cc364967ffacd21266a01c3da1d34b95a5c55c5553aa96466d68a4d5afbdc5b0c90 SHA512 3f7dd6e088de3e8e9a3db3c4c4c84352d07264871aa36eb9ea7cef54a32fcf1fc22624e89a913e16ad94abbd9a3cb3468c6ee7a00d801671001c769e9214252f
+EBUILD breeze-5.24.5.ebuild 1233 BLAKE2B b78a0cbfd6149999b9defd19e5730d5d3350e17ec5517f9bbd8feff0781003c3b353cd676fa847bc84a4542a083a2e1108201ee691d34a7044d630259f78a70c SHA512 d369d733f9cfc2b4b3ef0ef52920f3094dae7bb428a12bef4634f5e606debbda9b5356b70b927a63b3d083a8dc45edb9332282965a2c2aa9ddbc80f4aed2d7c8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/breeze/breeze-5.24.4.ebuild b/kde-plasma/breeze/breeze-5.24.4.ebuild
deleted file mode 100644
index 3d50e72e704a..000000000000
--- a/kde-plasma/breeze/breeze-5.24.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Breeze visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/breeze"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="X"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	X? ( x11-libs/libxcb )
-"
-DEPEND="${RDEPEND}"
-PDEPEND="
-	>=kde-frameworks/breeze-icons-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package X XCB)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/breeze/breeze-5.24.5.ebuild b/kde-plasma/breeze/breeze-5.24.5.ebuild
index 85267450136c..3d50e72e704a 100644
--- a/kde-plasma/breeze/breeze-5.24.5.ebuild
+++ b/kde-plasma/breeze/breeze-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="X"
 
 RDEPEND="
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index acff9993b365..51ffb91ba3d8 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,4 @@
 AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d
-DIST discover-5.24.4.tar.xz 8260620 BLAKE2B 3e908ee51eaac93254ab11be2f5961ad7f1fd0162335c855db412067db489e1c47846f089e61ff13096bc567b94329a18bedbcbf18712b68f0119c353a07c5c5 SHA512 d11fa406c9a44047de94b1e4047367205d35a142aecda79df934603a0c2cf04b761054235b3acd28030d6ee48f64005b44baf154ca4a279b5396268f75fc7191
 DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518
-EBUILD discover-5.24.4.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
-EBUILD discover-5.24.5.ebuild 2444 BLAKE2B b9dd77a480f8dcdf22eeeeb39f04a20d8773da6b906d4e8fe6d231a198d05a66a52b092ebe38fae9338b9c7a1dbe613077de088bbf4ceab5a0fb6d0120103a18 SHA512 d9f401154542d249f5f2e37ff99b3ca397a3d7d7e888e54647a23c9768f96afdc7d57ab599c3bb8fb872199c45102e5b0f1e0460025cd85e459e434dc0885ae8
+EBUILD discover-5.24.5.ebuild 2441 BLAKE2B e574eb16382569c5104c9ce2ef40cd1a38272433a9f217216f1d18224a8faec2d129952e95d220de0b18a2aaf76ba95bd8791ce0ba056c9c24da3006ea0e5d09 SHA512 97da5345edd4c4725bd2918e2b399491c79f7ba2194eebb9585c077547023b78dbf661548a4a007147ffbc96dd616fb8c609110aa74533555902fe050a05ed28
 MISC metadata.xml 537 BLAKE2B 3f8ef5cff5aba41680b677214f13254460b589b01380bb7c569f0f4cd011d046f76efaab48eb3f36bd0f13ace05845e670223e34b12519c3add4f0412443c792 SHA512 68b34b02c8f1b9a4c41f4aa5b2c2ced838bf65854b7cf15286ee426290f80fff4065ed8fe86db1aec62329778f425b0f9dc0e69c08db029910cd43136aca1d9b
diff --git a/kde-plasma/discover/discover-5.24.4.ebuild b/kde-plasma/discover/discover-5.24.4.ebuild
deleted file mode 100644
index be46b5a49318..000000000000
--- a/kde-plasma/discover/discover-5.24.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.90.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma resources management GUI"
-HOMEPAGE="https://userbase.kde.org/Discover"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+firmware flatpak telemetry"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	firmware? ( >=sys-apps/fwupd-1.5.0 )
-	flatpak? (
-		>=dev-libs/appstream-0.14.4:=
-		sys-apps/flatpak
-	)
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
-
-src_prepare() {
-	ecm_src_prepare
-	# we don't need it with PackageKitBackend off
-	ecm_punt_kf_module Archive
-	# we don't do anything with this
-	sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \
-		-e "s/^pkg_check_modules.*Ostree/#&/" \
-		-i CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON
-		-DWITH_KCM=OFF
-		-DBUILD_FlatpakBackend=$(usex flatpak)
-		$(cmake_use_find_package flatpak AppStreamQt)
-		-DBUILD_FwupdBackend=$(usex firmware)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 686392: needs network connection
-	local myctestargs=(
-		-E "(knsbackendtest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-5.24.5.ebuild b/kde-plasma/discover/discover-5.24.5.ebuild
index 67d530c388e1..be46b5a49318 100644
--- a/kde-plasma/discover/discover-5.24.5.ebuild
+++ b/kde-plasma/discover/discover-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/Discover"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+firmware flatpak telemetry"
 
 # libmarkdown (app-text/discount) only used in PackageKitBackend
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index e848578fb494..48a6367d7ad6 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,5 +1,3 @@
-DIST drkonqi-5.24.4.tar.xz 795152 BLAKE2B 8dcd661657a529bbfbdac60ddd71fbb424c6646122945ac3587c29e7f4667556bf6e4730c25a4658279308b4b109cefe2663d5a9612cfe4cbc7d16cf23a935c2 SHA512 9b0fb85a7df964e670761d4a1e9ea8601c64a478247ada2ec7a1a8d420a64f33b85b94f2d7f6db20365f499656653644cfc703bf8f10311fefa42fdebeaac9f1
 DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405
-EBUILD drkonqi-5.24.4.ebuild 1335 BLAKE2B 6d59f4354ae7e37e3bfcdcfb675c4593dc6ae407c48a0a05e30a51cdfad2c6315c3af98d868d7dcb6fbd9bfb8ad1275c8453c1629675a9c6f56c9d7cb82de61b SHA512 65dc548bfc61bdbf5ae1e72c72e89c3333e9ac8be2a8ab98349a9275de172f2008fe5969cf72d7cfd2153a103a37a2106bcfe3cb57bc9e0043975bbae3dd51e2
-EBUILD drkonqi-5.24.5.ebuild 1338 BLAKE2B 04b63008e2a85730ff78060910a1555a6067470dc7433a0b67d896fc4ea123c5b2db9242c42f3ef01df50d4007ac2b87db0657f2a542dac5ccbe7b5a7100eee6 SHA512 043d7997b42c44ffb5a6777cf955042ba8459beca88baf9e017b517ab25069fb25a03d09bec0da6f60faf04589547a21485fbfcfa808488085f9d97e7b3f17ec
+EBUILD drkonqi-5.24.5.ebuild 1335 BLAKE2B 6d59f4354ae7e37e3bfcdcfb675c4593dc6ae407c48a0a05e30a51cdfad2c6315c3af98d868d7dcb6fbd9bfb8ad1275c8453c1629675a9c6f56c9d7cb82de61b SHA512 65dc548bfc61bdbf5ae1e72c72e89c3333e9ac8be2a8ab98349a9275de172f2008fe5969cf72d7cfd2153a103a37a2106bcfe3cb57bc9e0043975bbae3dd51e2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild
deleted file mode 100644
index 0489a66fa83a..000000000000
--- a/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		sys-devel/gdb
-		dev-util/lldb
-	)
-"
-
-src_test() {
-	# needs network access, bug #698510
-	local myctestargs=(
-		-E "(connectiontest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
index 7b77a04bebbb..0489a66fa83a 100644
--- a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
+++ b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index 50c069f79588..71e3c8b153aa 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,5 +1,3 @@
-DIST kactivitymanagerd-5.24.4.tar.xz 105184 BLAKE2B db0a37ec38410352c5ebbda15be0b4c3502626841cfdaf998df7af0cfd64345244e2d0aa4aa34826affac3a1deb72c50be80e49ad981da5cb26ec8f165231c72 SHA512 8d088d018db467fe838104a0217d23fe0649f863b66e72d7c75947d77f71204270f682bfd7dfd6c7ccf2aac4d3591f02dca9ebd3c70a2fc184ef9fc5689cd326
 DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c
-EBUILD kactivitymanagerd-5.24.4.ebuild 916 BLAKE2B 9760098563a4ae6c5241618e29c24908fd33afd8afb83cf7b3f2ca692a10c802ff975aedc93eedbf363e79bbf5ea47c5407f22c7435421f87b4ceb3465fc17a8 SHA512 ef63d5a7a6387a808fe4b91f31bc5eb2ee586a66f80e1f00fafb7f731deaadbf9e5faf23599befd36670be86361824092c0967298d84c46b7589caa561d672e5
-EBUILD kactivitymanagerd-5.24.5.ebuild 919 BLAKE2B 5cb2c7420edcffd290ade756e551cb876f27aa0babe72be219df2849772ed9d1025815e77dada3e5bd533d332a04469f374b2cd5365ccd3595c130c0abe3a9d7 SHA512 1409872de5a639e4130885cd783121238d0f2f1149034a19e6d185f3fee4cea1d5b2db670f97808dc97a24aebecb6510f040a5fe45fe02010529cbcbb97e20a1
+EBUILD kactivitymanagerd-5.24.5.ebuild 916 BLAKE2B 9760098563a4ae6c5241618e29c24908fd33afd8afb83cf7b3f2ca692a10c802ff975aedc93eedbf363e79bbf5ea47c5407f22c7435421f87b4ceb3465fc17a8 SHA512 ef63d5a7a6387a808fe4b91f31bc5eb2ee586a66f80e1f00fafb7f731deaadbf9e5faf23599befd36670be86361824092c0967298d84c46b7589caa561d672e5
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild
deleted file mode 100644
index a2e2bf34c5d2..000000000000
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="System service to manage user's activities, track the usage patterns etc."
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
index 87126d8750aa..a2e2bf34c5d2 100644
--- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
+++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="System service to manage user's activities, track the usage pattern
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index 158cf8301351..8864dc253f13 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,6 +1,4 @@
 AUX kde-cli-tools-5.12.80-tests-optional.patch 345 BLAKE2B 19415ec444e631602193daf715a94481a672447f0e262a78787a23d7c352bb18cb775e5054986019e5b21796ae24ace44ab92f337160a11500330fb03c3c75c6 SHA512 bb15a8b6e65298cab07e5a7ea9e834b2d565b2689a0c8d06c0b257fae9bc8a18f7af3922404ae4c13518c6be63fcb7581f0d50ec93d3ba9a64310fd901e2f461
-DIST kde-cli-tools-5.24.4.tar.xz 632548 BLAKE2B d98bb0bfea948812f119d3f500967fe4bc4288bf2f74fa06c6ea967e52ef94fefce052c4b3aa35e5dfa9545f0981ad5f1940ff4b72116a4634c78ceef97f32a3 SHA512 3526ebf755475f6f32d1d74c74f1808fba36945891f2af2b113c95279508cf4576c72e445fe79e7a054fffc8b5be16c5952935f4f3557c17775e4266549b7b6f
 DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844
-EBUILD kde-cli-tools-5.24.4.ebuild 1727 BLAKE2B a25e3f88cd5e607c9ed97860460790750dd420a6a947337a274791ac3b3c16347e83f2be2a15ff3bd26a192adc40563d5dc5dab7c41e17acf207c931da10ad52 SHA512 0a55eb213afc4f3ba1a68a527c8acba99debdd383a5f12ca5cd1a8a2204a6dde6d035298bc41d0d7ecc5764878c8d53a29574423de6a5f1826251aa5c83889d0
-EBUILD kde-cli-tools-5.24.5.ebuild 1730 BLAKE2B 6ec83d052d402bdc84ed7667636cda7e99ebd9e503a241a9ad99c85d418a6242a1570eb051fb72524351f22e3858a0f78d00cb4b408cc4a9878c85994ae02f8d SHA512 48f047ed9f3a92d4e435a25c3f9587a1c7ba1bde98be33c13ca68f6133d220d1b498fb92282f4528023ff5350a1088a288dd0ba95321db27cf6da4de3ba58ad0
+EBUILD kde-cli-tools-5.24.5.ebuild 1727 BLAKE2B a25e3f88cd5e607c9ed97860460790750dd420a6a947337a274791ac3b3c16347e83f2be2a15ff3bd26a192adc40563d5dc5dab7c41e17acf207c931da10ad52 SHA512 0a55eb213afc4f3ba1a68a527c8acba99debdd383a5f12ca5cd1a8a2204a6dde6d035298bc41d0d7ecc5764878c8d53a29574423de6a5f1826251aa5c83889d0
 MISC metadata.xml 422 BLAKE2B 6c7e36778e4ecaafce86d11fa6e70a86c064c654de467a57f9b5d181d720bf0a90c02655131be794fc271f6664764fe79fb7e29df622cdad67cd69bf67c3d39c SHA512 41cfaa9753dba1b53c1a2fe0cba54c1bde6982180d96841c057f2a56ecbbe4000d702141ecef493ab3d1a80c53520363a28d0024ad2619b5642e740927c7e4f1
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild
deleted file mode 100644
index a004399d626b..000000000000
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="optional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system"
-HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="kdesu X"
-
-REQUIRED_USE="kdesu? ( X )"
-# requires running kde environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-RDEPEND="${DEPEND}
-	kdesu? ( sys-apps/dbus[X] )
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package kdesu KF5Su)
-		$(cmake_use_find_package X Qt5X11Extras)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-	use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu
-}
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
index 01626b69fa9a..a004399d626b 100644
--- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
+++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="kdesu X"
 
 REQUIRED_USE="kdesu? ( X )"
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index 4bb6b5504c07..fc10b77962ce 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,5 +1,3 @@
-DIST kde-gtk-config-5.24.4.tar.xz 71580 BLAKE2B 438334ecffacd6ec3c1dbb130b64fa566d509f96e81920205278d0928c47196cde62bca34602041bd05594ea79548f633733d711b9501e722c0091e731b7b7c3 SHA512 ac2df456007925879027bb44b28aedab50d1cefd3c493e3688764dad90536958fb27990cc340e1956434bf6fd1440f46bc5e8a95f7f9f5b7e33420d4c32e42b1
 DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d
-EBUILD kde-gtk-config-5.24.4.ebuild 1281 BLAKE2B ecb8a58774aaa1baa902ae1843603600b10096044452b160a30f8efd3deea29b475ca460969350020f3bda2dccf6650edb7eb282ed9923bca60ff9c5dd430f0f SHA512 bfe3a4fe3c3718d8d215c4e7bbd0ff78f082a738f50c15e65b43e4e8ac17b13e820cd5352c1db5b37ebe72148600446e80f035d1fddf5f09a4e0956cd762e387
-EBUILD kde-gtk-config-5.24.5.ebuild 1284 BLAKE2B 31b3f60229126a17117ec5269f4621b525f593f3dda2219c46eba8228f38de5f1afdac4c1a1080c543ff94f7b4d5c2347a6080c4f0d790e1f0507fa7c62cbb3b SHA512 ca48ea607f08372f249146716dfd720ac6250bf739d9e0b581b9c6bdcd7ac65487bba548fcf19c97e19fac38e01b23ee7ef3e2633475e51da2185626d600e091
+EBUILD kde-gtk-config-5.24.5.ebuild 1281 BLAKE2B ecb8a58774aaa1baa902ae1843603600b10096044452b160a30f8efd3deea29b475ca460969350020f3bda2dccf6650edb7eb282ed9923bca60ff9c5dd430f0f SHA512 bfe3a4fe3c3718d8d215c4e7bbd0ff78f082a738f50c15e65b43e4e8ac17b13e820cd5352c1db5b37ebe72148600446e80f035d1fddf5f09a4e0956cd762e387
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild
deleted file mode 100644
index 8bbe52c868c7..000000000000
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications"
-HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-cpp/glibmm:2
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	gnome-base/gsettings-desktop-schemas
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/gtk+:3
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/xsettingsd
-"
-BDEPEND="
-	dev-lang/sassc
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share"
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "If you notice missing icons in your GTK applications, you may have to install"
-	elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk"
-	elog "for example."
-}
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
index 0292f04f0263..8bbe52c868c7 100644
--- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
+++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config"
 
 LICENSE="GPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 04837ef6b50b..c74338fd5bc7 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,5 +1,3 @@
-DIST kdecoration-5.24.4.tar.xz 48784 BLAKE2B 0714c129101481aa19b134bd04f6dbbbf41436513cd513097ee45e131818f75bad454b66baf9e9b3defc0239fe07f85a21d3b9b59bcb90d0e08be2944e223857 SHA512 2c8d3a276c71be757b333de58aa5b667cf182b606e8553f75db51414c51a5b38adc140da9c11b9753b1c0ba438ca267d3c32023d9c3c4eec43a2ed88c9fc56a8
 DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a
-EBUILD kdecoration-5.24.4.ebuild 527 BLAKE2B 2e728e99de475fe9a8d711be620bffaa5c54d5143433b66cd4a74bf337e76a2979b78311245e3fac6babcac5040088ca2f2e30bb512b99e8116cc159b3cb73ca SHA512 bbea4118f9acb752fc40d918c8e26577eb718bddb7437ac4ed8ad41e4a4a3af87919436bd8b1b8a1245a50237c564dc2729a73bc4b4429223935bfc8d44c5064
-EBUILD kdecoration-5.24.5.ebuild 530 BLAKE2B 5e883002eb95e56f2859299aa64ff06450029885f04186e02af14e6958ff4c3b8e1d067e6901c30a107c8773860dc331b20dd5619e7a616574acc72c3c30c7c6 SHA512 3af8e3ba15a635af73b27eb6b6495d2d6c1d421b7cc7b43a1a0dc3c666da17c78dc889c54d78247e3f886e5a438d1443ee85d9488d2827d27d337507da578270
+EBUILD kdecoration-5.24.5.ebuild 527 BLAKE2B 2e728e99de475fe9a8d711be620bffaa5c54d5143433b66cd4a74bf337e76a2979b78311245e3fac6babcac5040088ca2f2e30bb512b99e8116cc159b3cb73ca SHA512 bbea4118f9acb752fc40d918c8e26577eb718bddb7437ac4ed8ad41e4a4a3af87919436bd8b1b8a1245a50237c564dc2729a73bc4b4429223935bfc8d44c5064
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild
deleted file mode 100644
index dd18504d63bf..000000000000
--- a/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin based library to create window decorations"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
index 8b05ae4be600..dd18504d63bf 100644
--- a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
+++ b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Plugin based library to create window decorations"
 
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 732944e4f3ee..0396f42ee885 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,8 +1,5 @@
-AUX kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch 2073 BLAKE2B e6ec7fe2195790358a0ffec03ff989063758f21d3412563fab7186c45545c541c01863367498c93794223d5c8af21dadbd41b69a48ca2901529985291252ee94 SHA512 f6070f0663a23083d722a5e0a47954a460090526691b8ef581ce5b1b99e9cabab229661f96f242eff3d32c235ccf9d2efec127b44b7a1e6b49dc0d20aa0328a0
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch 1452 BLAKE2B 99ac3c730ce06f5aceca01440c8b6afc5bf5bacd51bca500c424b95aebd74be2d21ec64b2d182815daa58310ebf62eb18686b792d630627250b374ff0174486e SHA512 0f95e4a4849e4c42407fa4400aaf52c64ddc39b66d77565727d50b37416a571ce0e2ce70844bda820a20e45e7c20a6c791255df00bb78ac06bd747d96d83b2a9
 AUX kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch 1511 BLAKE2B 6d7cb8b130028aaf32a961bb442e9fd9c2a215904f3a801a16283b35afc84b2ca9f9eb87a04193f5d511f687c6a8117409dac9c496875eb0e85dec25e46be4d9 SHA512 3ea620b46fe851ff055b6847c8e91881a7c5fb88a0c013bdd72b7f4649e005e4871fee9a3855e9f00be8b003ddbc6c8479ee49111970b5272ed9984a8fdb8d7d
-DIST kdeplasma-addons-5.24.4.tar.xz 635392 BLAKE2B 5297560f822a44d3bfe2e73517df64c80f0f7917f25f955b6964dd36e422d9015854fa94c19d347a0859938691ef1b99e61a2a360371e3e9c9747966899ab554 SHA512 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4
 DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669
-EBUILD kdeplasma-addons-5.24.4-r1.ebuild 1976 BLAKE2B 483e5bf31034e6f28c658156a5c140501fd7a3e4947049a17b80c3d6a7376dbd08e4da60d030be8d30897c00cec4a92fa327836387a82acab9bb83863fece70a SHA512 c06030403d895f2ee1ac89a77caf56fabf8cc8b1090854d01d1241d675dcf2208fd38628a39c4c3fe68f771ae9cbaaec526c17cf40d12611d38d23223a23c369
-EBUILD kdeplasma-addons-5.24.5-r1.ebuild 2006 BLAKE2B 5dbe91f1ed412513bf4aaae1b9eeb5240ab618c9d2049047e46651a553398dc20f56305279c9d128845ddf065c2e1c82d71f6916669e71fb496e79c5fbdb519d SHA512 e736eacbed0341f4551d07d7bc9aeb7f5aa6ca0debd908c50daa1c3880f39cddbac1f066f2acd5112e0d7eb1dde37d2dbe9a94859dd63456a706524d35d3c452
+EBUILD kdeplasma-addons-5.24.5-r1.ebuild 2003 BLAKE2B b6d3e843ddcea8bfb1164056f5ccb8e687c188ece4f4b103687ec683f9b69935cca482ed3eb98269b3223788b4e87a5e55322e8ad98687dfe76a7cec8395310d SHA512 3cb6cac24611101a47a0dab6d7d3f35700142b261fb67f4584375d2fd423ab35121d836f1973af4121e3a574eb780ff316b6822ea71fc1fcaa48c31c783f8c0b
 MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
deleted file mode 100644
index 4cb01a05ba84..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-https://invent.kde.org/plasma/kdeplasma-addons/-/commit/27710b95a3fd53019b4b053cbdf720354fd939d2
-https://bugs.kde.org/show_bug.cgi?id=452596
-https://bugs.gentoo.org/840755
-
-From: Alexander Lohnau <alexander.lohnau@gmx.de>
-Date: Sun, 17 Apr 2022 06:26:35 +0200
-Subject: [PATCH] Remove unneeded check for comic Dataengine being valid
-
-BUG: 452596
-
-We do not really care, if the metadata of the plugin is valid, as long as we can
-properly create the dataengine from it.
-
-Test Plan:
-With plasma-frameworks master, and this on Plasma/5.24 based revision, the dataengine can properly be loaded.
-
-When intenitionally exporting a defunct plugin:
-```cpp
-class Dummy : public QObject
-{
-    Q_OBJECT
-
-public:
-    Dummy(QObject *parent, const QVariantList &args) {
-    }
-};
-K_PLUGIN_CLASS_WITH_JSON(Dummy, "plasma-dataengine-comic.json")
-```
-The applet does not crash.
---- a/applets/comic/comic.cpp
-+++ b/applets/comic/comic.cpp
-@@ -465,7 +465,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
-     const QString id = mCurrent.id();
-     setConfigurationRequired(id.isEmpty());
- 
--    if (!id.isEmpty() && mEngine && mEngine->isValid()) {
-+    if (!id.isEmpty() && mEngine) {
-         setBusy(true);
- 
-         const QString identifier = id + QLatin1Char(':') + identifierSuffix;
-@@ -485,7 +485,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix)
-         slotScaleToContent();
-     } else {
-         qWarning() << "Either no identifier was specified or the engine could not be created:"
--                   << "id" << id << "engine valid:" << (mEngine && mEngine->isValid());
-+                   << "id" << id << "engine valid:" << mEngine;
-         setConfigurationRequired(true);
-     }
-     updateContextMenu();
---- a/applets/comic/comicarchivejob.cpp
-+++ b/applets/comic/comicarchivejob.cpp
-@@ -80,7 +80,7 @@ bool ComicArchiveJob::isValid() const
-         break;
-     }
- 
--    return mEngine->isValid() && mZip && mZip->isOpen();
-+    return mZip && mZip->isOpen();
- }
- 
- void ComicArchiveJob::setToIdentifier(const QString &toIdentifier)
-GitLab
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
deleted file mode 100644
index 2005be239a27..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="share webengine"
-
-RESTRICT="test" # bug 727846
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Disk quota applet" sys-fs/quota
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
index 9a10ede0eccc..a5195e5682e3 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="share webengine"
 
 RESTRICT="test" # bug 727846
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index 00bb9f05f47a..99899910c9d0 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,5 +1,3 @@
-DIST kgamma5-5.24.4.tar.xz 83524 BLAKE2B eaf9d141212b7ac00abeb2a65e18b733f437237c9383cb05fa7088364326ecded1311666fbcc229fea1833ecb28d54539fb5defcf4bd127b3507984d407a2bfd SHA512 ea8d6c064aef3d89b80b5a8f1f83993eccda65e473b2da81ae55709407e0fb146e0b61d8dfcc940374a908de73cafc4c395c3d9f898d5cf0d5744b965f8c010e
 DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f
-EBUILD kgamma-5.24.4.ebuild 684 BLAKE2B cfe49bf4b44237355e1b242ec27bd09bc10798fc6b3d9091385ff8b44bf2a7f5985b40425d4ce6b3fd622436614182d686f724e514afbc6c4f5a474d84ac4b2d SHA512 e543d54fe2afbb76164a775031776e435289c7e458c1f07f4959f7d8c9676bee8159d72a1aa086e580bd1bc9f17f4a10dafb05bf667941fa61db9f85fca738f6
-EBUILD kgamma-5.24.5.ebuild 687 BLAKE2B 77de18207f6c56cd554fa4d0c04bca1d898c5200488b7ea4548857e2cb087811dc4294662b2d9b49d5f17f154443a110408eb7b7e09cb71b83a0dfe2b96d0cea SHA512 cd02c41e234482511141eeffd28800b7529405fafa473240847b7abbe31a0755b5f3e2e943ba608881a75e0e5d80ff31d52578fa22addd502bbc0e991221c911
+EBUILD kgamma-5.24.5.ebuild 684 BLAKE2B cfe49bf4b44237355e1b242ec27bd09bc10798fc6b3d9091385ff8b44bf2a7f5985b40425d4ce6b3fd622436614182d686f724e514afbc6c4f5a474d84ac4b2d SHA512 e543d54fe2afbb76164a775031776e435289c7e458c1f07f4959f7d8c9676bee8159d72a1aa086e580bd1bc9f17f4a10dafb05bf667941fa61db9f85fca738f6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kgamma/kgamma-5.24.4.ebuild b/kde-plasma/kgamma/kgamma-5.24.4.ebuild
deleted file mode 100644
index 30f59eedc23c..000000000000
--- a/kde-plasma/kgamma/kgamma-5.24.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KDE_ORG_NAME="${PN}5"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Screen gamma values kcontrol module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
diff --git a/kde-plasma/kgamma/kgamma-5.24.5.ebuild b/kde-plasma/kgamma/kgamma-5.24.5.ebuild
index da312bb63954..30f59eedc23c 100644
--- a/kde-plasma/kgamma/kgamma-5.24.5.ebuild
+++ b/kde-plasma/kgamma/kgamma-5.24.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Screen gamma values kcontrol module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 63be9b310c47..fa18bbae8324 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,5 +1,3 @@
-DIST khotkeys-5.24.4.tar.xz 1852708 BLAKE2B 9de6c96a3638ca739f198233e9fd0ebb56a44da2f64fee7e6a0eb39807c5ee1f9b13dcd42acd8e8b2bd08c2489f5bbf1a1c7f420e3fe8972805ae2e1437d5e05 SHA512 8c2b436a541b9be707081118aa69f1a2b6e45ea2be07e87abe736d932bbe456bdbf0be7cdbae4ca34c942311bc991447904eda09ec7da1199ab51e88d2963c5f
 DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876
-EBUILD khotkeys-5.24.4.ebuild 1353 BLAKE2B adb5048ae592e5f7f04c6c092ab5182258e796dc49f3c5029e9f2ca421e7cba243ae3031d8c66a42f8e505081a372faccbd4b2a2b8961a304c912dbc9b84a46d SHA512 db1736e70d720c54a1e4513d48349745568aca0e8b60a6fe75bb674a9489b54e295843793054b7b8764bf808d6fff43a9146472c64d3644cc2d9e7f6854f5778
-EBUILD khotkeys-5.24.5.ebuild 1356 BLAKE2B b7ba51e7656f53303278da83e86772a5351b4157afce65e2ef60e9bd56e72c02ccdbdcffd3df3f845e96fe7f9fe5f07f043f1e1aa58c157912cec723697ca2ea SHA512 b1cc5b1228381fa5cf3e4f00703e1d974a0255607ba8ff7c5a81cff3a290da09c1adb9b1da769ec584625f18287c8c5e48c943514b6ac2b869f422fa159cde2f
+EBUILD khotkeys-5.24.5.ebuild 1353 BLAKE2B adb5048ae592e5f7f04c6c092ab5182258e796dc49f3c5029e9f2ca421e7cba243ae3031d8c66a42f8e505081a372faccbd4b2a2b8961a304c912dbc9b84a46d SHA512 db1736e70d720c54a1e4513d48349745568aca0e8b60a6fe75bb674a9489b54e295843793054b7b8764bf808d6fff43a9146472c64d3644cc2d9e7f6854f5778
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild
deleted file mode 100644
index 09d090616a7d..000000000000
--- a/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace hotkey module"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5[X]
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-RDEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
index 5957d8997942..09d090616a7d 100644
--- a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
+++ b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma workspace hotkey module"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 0c87ab1d1563..413f7a9c81bc 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,7 +1,5 @@
 AUX kcm-about-distrorc 108 BLAKE2B 9324829040a699d8858a739b228b14035f8a33d4cc5e19af30545a6eb9780808b3350ca12c82a44a1868c32acddd76dcdb4e7b25e5792694b55fbb38ed23db8a SHA512 72f1dcaa04bfe435e64c8e584914eb56a15b63f7c6086f5e025f0c497b4fd5b9592d54aafd335f55d303790af274c9cbfa29c6c7ff87875da648ee16d7717467
 DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
-DIST kinfocenter-5.24.4.tar.xz 719404 BLAKE2B fb79a2c3ab6b6a7d7411a3c601b5e7e32b9c09e153baf15a76ff562570016b8d981f717f1866b5e23293537f85bc79ba335291751be7460dc0ed1700291739a3 SHA512 91fffdeb61e2dc67ab2abee6b1f0db9e7a9dcbd71005f27d644d654dbcd806e60fb1a4a54530477fb9a1eb91cea006a05575c4dc3e9461e8b8f18830d957f187
 DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883
-EBUILD kinfocenter-5.24.4.ebuild 2256 BLAKE2B 173f95f1b91d4d31be1e1ddb0d48a0fb0026bdc4d63159b5e7aae5e76bfc7f6bd5e48603f4854d7e7307940f7a8d71eceb4c12a0bf86c31def7ba3f453f77c7b SHA512 96ca6c69890ef04c3af536f66c3570c9616ff402cf348b98ced451315ad26c8c27f0efc027cb0a7e8c5592a5b0ef63758b8cf35f344e6eabda62ec5a617d6cbf
-EBUILD kinfocenter-5.24.5.ebuild 2259 BLAKE2B 4870f4a79fcca18503288a19f6e9ea6562deb82b2c49b17a6d70c43b89f9afd730e8296daf98787153730ff23b1cc5fb3b9b4ec1ce62893c7d567abee72981f9 SHA512 50ade075252c619f5a5b42c8359c721867142b454fcd0d34238d4d3b519e51cf9f6b820b6b76a1614a360c8e7cac4189f9792fc6ef36f7630b3aa6ef5a7a80ab
+EBUILD kinfocenter-5.24.5.ebuild 2256 BLAKE2B 173f95f1b91d4d31be1e1ddb0d48a0fb0026bdc4d63159b5e7aae5e76bfc7f6bd5e48603f4854d7e7307940f7a8d71eceb4c12a0bf86c31def7ba3f453f77c7b SHA512 96ca6c69890ef04c3af536f66c3570c9616ff402cf348b98ced451315ad26c8c27f0efc027cb0a7e8c5592a5b0ef63758b8cf35f344e6eabda62ec5a617d6cbf
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
deleted file mode 100644
index b08d48776b71..000000000000
--- a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Utility providing information about the computer hardware"
-HOMEPAGE="https://userbase.kde.org/KInfoCenter"
-SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="gles2-only usb"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[gles2-only=]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	gles2-only? ( media-libs/mesa[gles2] )
-	usb? ( virtual/libusb:1 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/systemsettings-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package usb USB1)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# TODO: Make this fully obsolete by /etc/os-release
-	insinto /etc/xdg
-	doins "${FILESDIR}"/kcm-about-distrorc
-
-	insinto /usr/share/${PN}
-	doins "${DISTDIR}"/glogo-small.png
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "NFS information module" net-fs/nfs-utils
-		optfeature "Samba status information module" net-fs/samba
-		optfeature "Vulkan graphics API information module" dev-util/vulkan-tools
-		optfeature "advanced CPU information module" sys-apps/util-linux
-	fi
-	optfeature "Wayland information module" app-misc/wayland-utils
-	optfeature "OpenGL information module" x11-apps/mesa-progs
-	optfeature "PCI devices information module" sys-apps/pciutils
-	optfeature "X Server information module" x11-apps/xdpyinfo
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
index ecad66875ea1..b08d48776b71 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gles2-only usb"
 
 DEPEND="
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 47e496bc12c6..ae1d29b0f6eb 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,5 +1,3 @@
-DIST kmenuedit-5.24.4.tar.xz 901428 BLAKE2B 02dbb6b3c02dae6d9f51bc2c1e1a5ccd0a82e0e789e2497d250bc0cf3d14c69c8b52b5ec657cffdb48a89acd946a199e648a8d6601f2abe23555f55c374bd575 SHA512 cb6af1b86695895324b1011ae5dcfe33d57ed9df176f5a454ea2274a0ce26291cd23e5d9583250cbd1ab753b98da91cb089d270e17625d18ff7b6193b0dc0c66
 DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759
-EBUILD kmenuedit-5.24.4.ebuild 1067 BLAKE2B a397c3bd5c1a3eacf48e352583cb8393681f14d71c0cb96a97a771f67c27f4aa99b558276700b181117c98d4010c19691789b3f492397e4344e6f4e0a000d515 SHA512 a0221f6252ebf7b2daf09e89b83dd0d665410d4cf66e4188d2f630e3ae9bb9c430b413bfb7e25cc125f0e0210548c79f00f02940b41371f5b259d4a516c733b7
-EBUILD kmenuedit-5.24.5.ebuild 1070 BLAKE2B 1674d4376b5c686e6236b8ece8341a4828d71c5273d2931e7fa44aaad9d126d959ad8e1adb1babec48ed0b4cec1dd24366625e4767fcdd2279e4db5c1ea91872 SHA512 576be469982389c6e51a1194da71183b669ece7a796f71f57b75c9d426f4feaf83c38d9e51464207bf8713fc27dbc8b895b511d625580258c8f2606f1400d3f3
+EBUILD kmenuedit-5.24.5.ebuild 1067 BLAKE2B a397c3bd5c1a3eacf48e352583cb8393681f14d71c0cb96a97a771f67c27f4aa99b558276700b181117c98d4010c19691789b3f492397e4344e6f4e0a000d515 SHA512 a0221f6252ebf7b2daf09e89b83dd0d665410d4cf66e4188d2f630e3ae9bb9c430b413bfb7e25cc125f0e0210548c79f00f02940b41371f5b259d4a516c733b7
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild
deleted file mode 100644
index ec4bfa6adfbb..000000000000
--- a/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma menu editor"
-HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
index 96a6d5d9342b..ec4bfa6adfbb 100644
--- a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
+++ b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kmenuedit"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 2fdccda03c9c..b39452ccd536 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,8 +1,8 @@
 AUX kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch 1083 BLAKE2B bf328a411422ac4b0e1dad704c0faadcf867710595c9e29fc09ea7a336fc453d38e55eb3e24803cc1ffe9432b59985e87737eb5756565e3358a03a14ac7c02ca SHA512 c0290233ceb525f4c8d4c2698577c224c7a9196407673d119d6d3529fd308c3159ebec5e6067109133c6cac54ca1bf0bb6e3023e72757e05ec6704d76247ad17
+AUX kscreen-5.24.5-fix-kded-xcb-resources-leak.patch 1907 BLAKE2B 3d35c3f3b0bf5d2d3ded94ab09b7e0083677b20d1c627f29392dd4aec7cda8f39d2673fbe3f426689c2091e989e9cd4173c08020cf08a0dccbb910d5135d3010 SHA512 5290909d402845c51b3b5556fece12c769f8e2353014001c6f7ac411a05e044bea8fc3f8d4f15780890e620547080835177a206031e69f41598d92bda8bf6a2f
 AUX kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch 903 BLAKE2B 73e08bf9843f51be102eb4f3057641fde12df955aab01c9997a34a66e6bb673277f1fe0fcdd21fa6d7b3a83faa6e2c12288c06e659f82482190c8552ec3f761f SHA512 67aeb93bafb4a13bd7d19356338c86fd5e1df07cb1ac030d6b1f81d9d683f52ff036c5c4eba0c9ce1599c9273c0ea769b2add3516ced4b2128dbdd4b7c07fb7b
 AUX kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch 1080 BLAKE2B 7ff3fc46e9644635f59541ebf063cdc153010f09c1fa7b90ca92140fba1e0805e9991042c788454662d7ae9917ecf3f10a25e6c2dcdc704945f91071d24adf66 SHA512 61aee0523a65f2ef448c7998df0fce82f1dd91d241c4c922c86468873ff69873852b31682cd2c531285312316cb25ad21da318c0cfe78ab07e7bc60cf9b4be08
-DIST kscreen-5.24.4.tar.xz 137288 BLAKE2B 9cb6efcb1ac2d8fffbee75c5f486f0f19bcd793bd4b9ada2020fe3b835ba92f797eea59fbe94e891136e67de2f6d1bc9024dce68a326fe243eb3a81427018482 SHA512 d3a395a92a4569aed3dc69b8a5b90be5fca30d7348f148161a6eed71ab882c2ca3066cadf8edb41111e8ad4cea97ca39563e34acca760fe24012b2036e6ad63b
 DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97
-EBUILD kscreen-5.24.4.ebuild 1230 BLAKE2B 4c8021d9f5cbbe8dbdf1f433b19753d2e2dc5ee383e69eb65c45ef3ae0b7110232aa607a62110a1e58ff1bdc71b38e9b214b06dbe7d970e2f39c5d039d1b009f SHA512 5f1c3737fb0e7675a60410b464839552fdf829d8a3f1491460e5c828a1bb7cbcd3320354b11de079221391030bb7d069de735f63340145c7830505435130198f
-EBUILD kscreen-5.24.5-r1.ebuild 1460 BLAKE2B 7351d28435062203312c3f835b35cba34b5f92a789f2a8470caac935aa8f3263fbad777d367c5737d5eb8c35c710289bfb70737eca03e94fb968e18197775ecb SHA512 30fd39aca90be40c6c571cefe4ca37c894fd82127ca19f6f4ebfdc1f2b9926874e5aac2e85ddfe23ac92d048e34229e0324a3560b3558719b07523fd6b9ea6ca
+EBUILD kscreen-5.24.5-r1.ebuild 1457 BLAKE2B 1f6d645be9f5c890956b1004b35c1662604303bba9b28a92ba20ec7ee74e8986a0e3e3eb91ecb6591ffca63ce493235fa9014e0d25027867eb0ed0f50bb32c90 SHA512 8dac356cb6a6da83864b677a792038aade000b71a7bb16d14529a7d7066e799d4dbf7897f2bcd7ebf54c714231a17b6b14dc89093063159dd22ef1e03ee7f5a4
+EBUILD kscreen-5.24.5-r2.ebuild 1531 BLAKE2B c33b2a21ebd91162f7510798043d2958a9351a4e88dd3190d5cef99be5a4071f5b7b899de1f5d14c6002cac6b378cb0858299f3d958d62207b16103c2d56f0bd SHA512 0bcf7cb987a7e20895e6ed8c627b77c5f0a5e6eaf40733496b48be0642fda2f71b55a712ba35bf3f987baad6a06d29deaea3df928138fadb5a331ef04fd90f03
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
new file mode 100644
index 000000000000..ecba1664c51c
--- /dev/null
+++ b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch
@@ -0,0 +1,61 @@
+From 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1 Mon Sep 17 00:00:00 2001
+From: Stefan Becker <chemobejk@gmail.com>
+Date: Sun, 29 May 2022 23:33:55 +0300
+Subject: [PATCH] X11: fix kded xcb resource leak
+
+This fixes commit 579358f501ae978aa527a25eb3ef9dd42557db46
+
+XOpenDisplay() internally calls xcb_connect(), creating a new XCB client
+connection. This means that on every KScreen configuration change event
+the kded5 process creates a new connection until XCB runs into the hard
+limit of 256 of clients, leading to the dreaded "Maximum number of
+clients reached" error.
+
+Re-use the display from QX11Info instead of calling XOpenDisplay().
+
+BUG: 453280
+
+
+(cherry picked from commit 0270a49328aa70b14dd08e2ed5a425ca3f8e4fd5)
+---
+ kded/daemon.cpp | 17 ++++++++---------
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/kded/daemon.cpp b/kded/daemon.cpp
+index e8ed4ac..443d98d 100644
+--- a/kded/daemon.cpp
++++ b/kded/daemon.cpp
+@@ -361,6 +361,14 @@ void KScreenDaemon::alignX11TouchScreen()
+     if (qGuiApp->platformName() != QStringLiteral("xcb")) {
+         return;
+     }
++    auto *display = QX11Info::display();
++    if (!display) {
++        return;
++    }
++    auto *connection = QX11Info::connection();
++    if (!connection) {
++        return;
++    }
+ 
+     const QRect totalRect(QPoint(0, 0), m_monitoredConfig->data()->screen()->currentSize());
+     QRect internalOutputRect;
+@@ -411,15 +419,6 @@ void KScreenDaemon::alignX11TouchScreen()
+         break;
+     }
+ 
+-    auto *display = XOpenDisplay(nullptr);
+-    if (!display) {
+-        return;
+-    }
+-    auto *connection = QX11Info::connection();
+-    if (!connection) {
+-        return;
+-    }
+-
+     auto getAtom = [](xcb_connection_t *connection, const char *name) {
+         auto cookie = xcb_intern_atom(connection, true, strlen(name), name);
+         auto reply = xcb_intern_atom_reply(connection, cookie, nullptr);
+-- 
+GitLab
+
diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
index 0fa224e22205..424f48214a77 100644
--- a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
diff --git a/kde-plasma/kscreen/kscreen-5.24.4.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
similarity index 77%
rename from kde-plasma/kscreen/kscreen-5.24.4.ebuild
rename to kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
index 631a5b4e57a0..400f3ae8d7a2 100644
--- a/kde-plasma/kscreen/kscreen-5.24.4.ebuild
+++ b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kscreen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 # bug #580440, last checked 5.6.3
@@ -44,3 +44,10 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392
+	"${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch"
+	"${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch"
+	"${FILESDIR}/${P}-fix-kded-xcb-resources-leak.patch" # KDE-bug 453280
+)
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 03687ffac50c..2b465e762b75 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.24.4.tar.xz 119424 BLAKE2B ff054103476d908e9c66a3408587788bc0b871a12ddee418c4a67f801123c544f52f8f61ac1eeed5e4b593dd06a707bb1fb8c2fa85a08496c1bf76f4306adc7a SHA512 410402d131311867206cb015fbbc085960a2e6988d8a15675abfad663a3e667c697fe44f5625e4ae40ce3554104e0d11fd895e3b364820371faaa7e58e0b17dd
 DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83
-EBUILD kscreenlocker-5.24.4.ebuild 2261 BLAKE2B b35db06005d91b2e1a191cdad60c4b169a23d534563912ecdd6d37ccaf07d282e7779fe9ae1a30e0b079d83884d01835c23aebac92d17383afa432e0c9d86f4a SHA512 2a39d85a8c3988989afb4afe77143ec932f89b019b962f1220577ee075eb6c2f497dab452db28abf39e24201e84897b3c2fa0692fc743b051a0af0c8fa6abcd3
-EBUILD kscreenlocker-5.24.5.ebuild 2264 BLAKE2B 8f11506dd89adb9814bcf3a8bcacf3ec8dd976bc49eb5507aebe087012542d1ebca06ac3a5a295a00a82e6cb3bf919d807730eb018aa3b343b5f8ca991bc7b16 SHA512 6356a73d555fbb005eeb14b334c5c0dd775c712a13983b09b0c2b9a4c0c4cca36b34ddbb7f5e9bf5d8c640dce807bbd06513131ea336f8ff5df27534505aff5e
+EBUILD kscreenlocker-5.24.5.ebuild 2261 BLAKE2B b35db06005d91b2e1a191cdad60c4b169a23d534563912ecdd6d37ccaf07d282e7779fe9ae1a30e0b079d83884d01835c23aebac92d17383afa432e0c9d86f4a SHA512 2a39d85a8c3988989afb4afe77143ec932f89b019b962f1220577ee075eb6c2f497dab452db28abf39e24201e84897b3c2fa0692fc743b051a0af0c8fa6abcd3
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild
deleted file mode 100644
index 5ebb504f19e5..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="+pam"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( sys-libs/pam )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-BDEPEND="dev-util/wayland-scanner"
-
-src_prepare() {
-	ecm_src_prepare
-	use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_install() {
-	ecm_src_install
-
-	if use pam; then
-		newpamd "${FILESDIR}/kde.pam" kde
-		newpamd "${FILESDIR}/kde-np.pam" kde-np
-	else
-		chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
index 55afaed895ad..5ebb504f19e5 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="+pam"
 
 RESTRICT="test"
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 1a5c76d93532..0ce3df3a2183 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,6 +1,4 @@
 AUX 05-ksshaskpass.sh 42 BLAKE2B 2fcef93ed56ab90d98078017924ccfcf3892914e0fc45c6733b538634743a79ae1603da4aabed1c9641750ceae24e167591989290427f6efa4a03b4d69008362 SHA512 780f4d0467bab82295f894f0547ea59c36e8f05cff51c4e64db8a7e8e4215e2d6363550fed16a4336019b2102e5c5bdcfe73524761ba04db3704ddec6efec669
-DIST ksshaskpass-5.24.4.tar.xz 24720 BLAKE2B fc204675ed6590e263b97b10490b1d5e60e97cdabf76c3bd7effa8c9106182740f90e400232a865cd12dd9db2d246a5f59288d3e69e6cdcb48c04fe2e68a1138 SHA512 181788f8b8ce72f3d0e17d2d8cf46eb5ca31eef5533d275f86b8f573c3b1365eaea48a9fb940177c701b071caf241ab4ca7cbf1d0e2bda29e0d153b7574cf79d
 DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457
-EBUILD ksshaskpass-5.24.4.ebuild 1440 BLAKE2B e5d18938737f9db2569b7176315a1070f16bc314c57fbb9e53a793c914569ab2a0e5b1db663b4f3b008e8d2f2f5005443cb9543ba8dba6921c9943206acc7cd5 SHA512 15a2d3b0d818212d114f8b3f9778f4d040abd54440b07811a2ba55c58220acf1f4212cccc3a048242b242692620c4e377d779830d3703f0bff34876f57204642
-EBUILD ksshaskpass-5.24.5.ebuild 1443 BLAKE2B 8901cb27dbf618fcaeda7ed7a8f7607ec345c3efadd7e00cd7c0b9a33d5e743521f25844a3f6db47e91b873f36d56991b57adae8d3b647a2e7052b4324509747 SHA512 af0a67a17b7987edb24ff7b2981bcf2658f7afd42db7fb1708cbe189504fd2c81597460de8940b16ae3f8b270add882c8e29755544a885d0e0425636ef2a6740
+EBUILD ksshaskpass-5.24.5.ebuild 1440 BLAKE2B e5d18938737f9db2569b7176315a1070f16bc314c57fbb9e53a793c914569ab2a0e5b1db663b4f3b008e8d2f2f5005443cb9543ba8dba6921c9943206acc7cd5 SHA512 15a2d3b0d818212d114f8b3f9778f4d040abd54440b07811a2ba55c58220acf1f4212cccc3a048242b242692620c4e377d779830d3703f0bff34876f57204642
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild
deleted file mode 100644
index e198cd959e39..000000000000
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration"
-HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	ecm_src_install
-
-	insinto /etc/xdg/plasma-workspace/env/
-	doins "${FILESDIR}/05-ksshaskpass.sh"
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	elog "In order to have ssh-agent start with Plasma 5,"
-	elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and uncomment the lines enabling ssh-agent."
-	elog
-	elog "If you do so, do not forget to uncomment the respective"
-	elog "lines in /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-	elog "to properly kill the agent when the session ends."
-	elog
-	elog "${PN} has been installed as your default askpass application"
-	elog "for Plasma 5 sessions."
-	elog "If that's not desired, select the one you want to use in"
-	elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh"
-
-	# Clean up pre-5.17.4 dirs
-	rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null
-}
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
index 6cc8bba6f520..e198cd959e39 100644
--- a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
+++ b/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest
index 7b7c970cfa52..61ec18559d01 100644
--- a/kde-plasma/ksystemstats/Manifest
+++ b/kde-plasma/ksystemstats/Manifest
@@ -1,5 +1,3 @@
-DIST ksystemstats-5.24.4.tar.xz 94616 BLAKE2B 4daaff46dd7f3d18a680219fa2f60a8d8915fc98724dab5be67fbcb47d80c9b32c8ffe119d4f9650b6853edbd46790db7ce8c67fb58793bda4e8cc0c536cbb8b SHA512 0238815273ac1a939b25e31ec727df71d1fa1a060d5334068f87b1a75ae0016c2c508c853b49998e35a868d080849d372df74a8bfa395095065223614fa36be2
 DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969
-EBUILD ksystemstats-5.24.4.ebuild 1045 BLAKE2B 2423236465275cfdbe00ca854f91200f20070ccc1b99b40f236fcdbc8c0735872b578550cd45ff94271a08a420cb5bfd4612ad914c2471250449d938223dff72 SHA512 e1b2a526edd2ed6dd985722fa045082a2e9f7a295451e7f25346bd0122df656f069211543e9f78318c98e8c617e6476d15c3cba8c02f42b5eecb156cb09b372c
-EBUILD ksystemstats-5.24.5.ebuild 1048 BLAKE2B 1fd25e77d53e3d9283c529ef2f9841947aad619e6b15057acf51e15f1a240c217306aa4d1b2903dfd1b695fd1a0f87943c50d5c3d84cba636dabb4878113959f SHA512 fcd70568d2b589cf44a7cecd39c85c4ffb19ed249b38aaabfccd554c971140ba51fd1de0ab48fb5a86026fba0250131f7abd760df1dde7bc35f508d0d8a700c4
+EBUILD ksystemstats-5.24.5.ebuild 1045 BLAKE2B 2423236465275cfdbe00ca854f91200f20070ccc1b99b40f236fcdbc8c0735872b578550cd45ff94271a08a420cb5bfd4612ad914c2471250449d938223dff72 SHA512 e1b2a526edd2ed6dd985722fa045082a2e9f7a295451e7f25346bd0122df656f069211543e9f78318c98e8c617e6476d15c3cba8c02f42b5eecb156cb09b372c
 MISC metadata.xml 467 BLAKE2B 61ac6047a4cb3d54d26f963b75c94022a501fd1b1b9ee227cce16023fb40b101ba40c6ff99e02c5913137b191bd9c516249387b0310f6558c9800b10f52e780a SHA512 0ad261d9d2e7a45d01b06a15270346bf169a3a8d827b409616e3801e4357910fe196813dd87ff4bea34e61cce3931443d9b617ef532230448f54048d1ed84f4a
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild
deleted file mode 100644
index 84530f541465..000000000000
--- a/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plugin-based system monitoring daemon"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="networkmanager"
-
-DEPEND="
-	dev-libs/libnl:3
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	net-libs/libpcap
-	sys-apps/lm-sensors:=
-	sys-libs/libcap
-	virtual/libudev:=
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	!<kde-plasma/ksysguard-5.21.90:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
index 3d7f191dca31..84530f541465 100644
--- a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
+++ b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plugin-based system monitoring daemon"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 80c1109084fd..b8383bd9f063 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,5 +1,3 @@
-DIST kwallet-pam-5.24.4.tar.xz 20480 BLAKE2B e54dd5271f9bbca2167f3fed7a7c96f92164d8a6c833f2a69976344918d03537b0300c1ec5b23213a82f7a946bf77cf067a42485df29265a40f3e8fb2cacf997 SHA512 e9da7f2b5c390bfc9406d9e2511689fc42313643a519ebc146cf3a79e2701625aa841dc40c6ad457ee73520d55bc66dc7e7a617c0f90b9f8d3314eaacfd8a759
 DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740
-EBUILD kwallet-pam-5.24.4.ebuild 738 BLAKE2B f283cb8eca9cddd6e6b460a51dec6d4f3d141f711cdca53510ded606cf24079f56bae785a9c1b04e6b921694d54df49e88727e2e37ac8a8c44b22f6808e2d40f SHA512 6c1b13dc54699116d043afa65210f3b317d289f233a88f380e1bb2e03d29a3e8abae1783be444981ad8be797e53d61800bec9abf76f72a6c1cd1f2e9041e12c8
-EBUILD kwallet-pam-5.24.5.ebuild 741 BLAKE2B 9c28b95880414f122f25fae53271450ff1644252a3482608323d77a7ce18a3a3dd5a55ca6e4247c66146ec842bc4bb7d99df675a86d92b5bc465554af80e5558 SHA512 7269bcf894361b609a957aac007aed5afa5c1bc3d573096aebbfaa19ca16cc2f488c3c2843de0cabb5d85654219f3f322cf525a81a75f6fb2dcfd33e0c95a73f
+EBUILD kwallet-pam-5.24.5.ebuild 738 BLAKE2B f283cb8eca9cddd6e6b460a51dec6d4f3d141f711cdca53510ded606cf24079f56bae785a9c1b04e6b921694d54df49e88727e2e37ac8a8c44b22f6808e2d40f SHA512 6c1b13dc54699116d043afa65210f3b317d289f233a88f380e1bb2e03d29a3e8abae1783be444981ad8be797e53d61800bec9abf76f72a6c1cd1f2e9041e12c8
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild
deleted file mode 100644
index 8ddb3f24688e..000000000000
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-inherit ecm kde.org
-
-DESCRIPTION="PAM module to not enter KWallet password again after login"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	sys-libs/pam
-"
-RDEPEND="${DEPEND}
-	net-misc/socat
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_LIBDIR="/$(get_libdir)"
-	)
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	elog "This package enables auto-unlocking of kde-frameworks/kwallet:5."
-	elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking"
-}
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
index 940910a2e750..8ddb3f24688e 100644
--- a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
+++ b/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="PAM module to not enter KWallet password again after login"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index c97dcaa665cc..8e43892485c9 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,5 +1,3 @@
-DIST kwayland-integration-5.24.4.tar.xz 24828 BLAKE2B 54eccc48b640118adc558eca19a92473ade03b9481ebafdfa7c4597bd64f846ace567038b44c601b76712b883f8cc7c54fdcc827dfbd9fe92af07bc6155c41d7 SHA512 0a3a0404fd895a87d44bed4a3d12d7627207c5b28aac979327b85e1cb5de70292129df54b8d7ca259566afde79393ab21c72a77f5c818d5b26db66192956e536
 DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac
-EBUILD kwayland-integration-5.24.4.ebuild 1194 BLAKE2B c3c252ed8f0d9b5da751851f7a10cc572d3b82932c82d8467c11a33f3b8e1c49be65c223707bfb034255b43c92e9f4f1890dfe168b21dce52e6cd7c96fa2783a SHA512 a6a691080c65e4f4c5f83e588b55e454116d6471e60cae16f4f468f90e1860f82825b54bd96624c2634dd5e7bc81419601a4b8c6135cd135b90afdaf457ea7db
-EBUILD kwayland-integration-5.24.5.ebuild 1197 BLAKE2B 253bb7739b73353608ac28fef57741e892562e4ef9f424b1fc0935fd354f54a638a842e0a062809107fe47ff55fbe2080e93c64b2b14a3754856ab54169064fb SHA512 e917794fa1c4451b874b5b2c4c629d91ff5f080813118851702007d71f9eeb4d8436f6ecf8e69c92dea718c043ed1f335691b5007e2c3ca63363692ef0c919c1
+EBUILD kwayland-integration-5.24.5.ebuild 1194 BLAKE2B c3c252ed8f0d9b5da751851f7a10cc572d3b82932c82d8467c11a33f3b8e1c49be65c223707bfb034255b43c92e9f4f1890dfe168b21dce52e6cd7c96fa2783a SHA512 a6a691080c65e4f4c5f83e588b55e454116d6471e60cae16f4f468f90e1860f82825b54bd96624c2634dd5e7bc81419601a4b8c6135cd135b90afdaf457ea7db
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
deleted file mode 100644
index 7ea29d557359..000000000000
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RESTRICT="test" # bug 668872
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot ops:
-# dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff
-# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h
-# kde-frameworks/kwindowsystem: Various private headers
-DEPEND="
-	>=dev-libs/wayland-1.15
-	|| (
-		>=dev-qt/qtgui-${QTMIN}:5[libinput]
-		>=dev-qt/qtgui-${QTMIN}:5[X]
-	)
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=
-	x11-libs/libxkbcommon
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	virtual/pkgconfig
-"
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
index 84eca0211ad6..7ea29d557359 100644
--- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
+++ b/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test" # bug 668872
diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest
index 7a512f25e528..7c6e29f25abf 100644
--- a/kde-plasma/kwayland-server/Manifest
+++ b/kde-plasma/kwayland-server/Manifest
@@ -1,10 +1,4 @@
-AUX kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch 4276 BLAKE2B 4620ba8b9469fb04e83feb0e6c898f3015652859878e238c8e5fad6390eda2d047d56e65f62748f13cd446abe39f127496d823216a314f8185ecdd1eed0a8700 SHA512 431b3da95dcd79b38deeff2b111e60af9b5c28ebedca682804572b79835840ce967e7125367c97b85bebf7001591df3dd7cd381cfe6ad6cd7b13a279be18f4b6
-AUX kwayland-server-5.24.4-fix-layer-shell-reset.patch 1974 BLAKE2B 16041ba840f43e137ed2143c7d0abb0a2b70cee49ab6e2a8d3e077382a09837c47dd68a5285ee4400b9c21860db203ee5604f297ed567d9b3ca1237f1351435f SHA512 89f000937a3b7aaa366043948200ea8fa01e70cdcfd42e499c7dd10097486dbd36852ac702cc79a9d5f7d8d643cea8de4a23f3bf2f600a266e6edb96fd569d92
-AUX kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch 2774 BLAKE2B 87e647c2404fa778967bd26ce5d6e8964f29d11417ab742694d31c35e0b9fed4f8f22f2c4353e6464231366cbc320cdb5a62d29e782526b212691b726c8f6285 SHA512 f11c0925df3a90c72a7d867129e09c2ad747d9c294f7704acdd144f97ac55ec436b9d1ce70f6fc0683baf40b6293cb203a0819cb9b86ec166e77d5124e6e288a
-AUX kwayland-server-5.24.4-guard-subsurface-parent-access.patch 1324 BLAKE2B 60d40a919cc68c340e7e67e4dc0701fddaa375fde87f4feacc03c97c1a3fb9c7b3b9f981a4363db9759af45e0bc136162cf7490035d79b82b2357a2412547872 SHA512 449f3c5f7ff7826110307f7d5938bf8bdc132d9057f39764d39fedd2487877bf1611502ba983e5723ee94e4cea18732b9162587f6567d042e74becd22de20e4c
 AUX kwayland-server-5.24.5-fix-supported-action-init.patch 2129 BLAKE2B b9e701a6dff6fd37aef7d30977af95d64de1c508aea5ce94d2c3c3c3a725c60a843945b6cc1779250f5ddfabe05d9921d1b42e17b8b220eea2bbf67e065ac408 SHA512 8369e5007c90fa714adf93c3ccbcd92955b2a8851b4fe46377faafa392e4306014b1e53400fa682aca779cd4577b403e50902e292f3d2263b4b2e94fdded3dd0
-DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640
 DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5
-EBUILD kwayland-server-5.24.4-r2.ebuild 1145 BLAKE2B 4ab94886b75eeb9e36fb5d15c37679f8e3abb98cb884e550b194a6af1dabb191eddd391abbda415135b1883994c9c4fdbcd03495c8eb70378baf6c46ffbd1a93 SHA512 5717c3b13a6e7b66ab49fe8ecca55e84bb3fc36c4ef44fb8d897774d05e2cec1229e6a5154a571a1ef17ef6b12236d9122a4e6f315adbb7e0f4d0a520c629785
-EBUILD kwayland-server-5.24.5-r1.ebuild 931 BLAKE2B d1f502cc4e9a3e9f3da4fc21d748ef971a38c8c697f57acc822056881e3298ef9cdf908a5951564e7e7c549694817d6da01fc495510de1766a3c9730bed7d8f1 SHA512 ff9877b857df2f4ea636be13a4183cf90110c985328e9f6ba5bba091022d8dac00a685e5091783fde363e1c400c29d1ab124116790e266dca56451a58775c88d
+EBUILD kwayland-server-5.24.5-r1.ebuild 928 BLAKE2B 141781ecad6b2ba5f0859b54fe97a59efce2f95c345bb9c709ed342608342b0270ab605a66bb0c271decfe5c05f3e69541069ca4ddf67069c448d1794af9871a SHA512 70ee7b463b76f15d4662110e628eb04c48a7c6c8eea600e7dafa87c9721c6ece1cfc4112f68029a45650caba91f482e10b97767b5861d5426ebb752bbfb4bcaa
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
deleted file mode 100644
index 4ddd9737e759..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 40364d2ee670a5a74318ef96c643762293ca95f0 Mon Sep 17 00:00:00 2001
-From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
-Date: Fri, 8 Apr 2022 12:44:33 +0300
-Subject: [PATCH] Simplify code that announces available modes and current mode
-
-If no mode has the current flag set, the first mode object will be
-announced twice.
-
-There's also no benefit from sending the current mode as last. If the
-current mode changes, the compositor will send the current_mode event,
-not the mode event.
-
-BUG: 452318
-
-
-(cherry picked from commit b40c4e3f4108b9a0be9b4f5d437e72f7c2aa3fea)
----
- src/server/outputdevice_v2_interface.cpp | 35 ++++++++----------------
- 1 file changed, 11 insertions(+), 24 deletions(-)
-
-diff --git a/src/server/outputdevice_v2_interface.cpp b/src/server/outputdevice_v2_interface.cpp
-index 31ab16ca..9093bd2f 100644
---- a/src/server/outputdevice_v2_interface.cpp
-+++ b/src/server/outputdevice_v2_interface.cpp
-@@ -31,7 +31,7 @@ public:
- 
-     void sendGeometry(Resource *resource);
-     wl_resource *sendNewMode(Resource *resource, OutputDeviceModeV2Interface *mode);
--    void sendCurrentMode(Resource *resource, OutputDeviceModeV2Interface *mode);
-+    void sendCurrentMode(Resource *resource);
-     void sendDone(Resource *resource);
-     void sendUuid(Resource *resource);
-     void sendEdid(Resource *resource);
-@@ -180,7 +180,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode)
-     const auto clientResources = d->resourceMap();
-     for (auto it = clientResources.begin(); it != clientResources.end(); ++it) {
-         auto resource = *it;
--        d->sendCurrentMode(resource, d->currentMode);
-+        d->sendCurrentMode(resource);
-         d->sendDone(resource);
-     }
-     d->updateGeometry();
-@@ -257,22 +257,10 @@ void OutputDeviceV2InterfacePrivate::kde_output_device_v2_bind_resource(Resource
-     sendName(resource);
-     sendSerialNumber(resource);
- 
--    auto currentModeIt = modes.end();
--    for (auto it = modes.begin(); it != modes.end(); ++it) {
--        auto &mode = *it;
--        if (mode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
--            // needs to be sent as last mode
--            currentModeIt = it;
--            continue;
--        }
-+    for (OutputDeviceModeV2Interface *mode : std::as_const(modes)) {
-         sendNewMode(resource, mode);
-     }
--
--    if (currentModeIt != modes.end()) {
--        auto modeResource = sendNewMode(resource, *currentModeIt);
--        send_current_mode(resource->handle, modeResource);
--    }
--
-+    sendCurrentMode(resource);
-     sendUuid(resource);
-     sendEdid(resource);
-     sendEnabled(resource);
-@@ -296,9 +284,9 @@ wl_resource *OutputDeviceV2InterfacePrivate::sendNewMode(Resource *resource, Out
-     return modeResource->handle;
- }
- 
--void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource, OutputDeviceModeV2Interface *mode)
-+void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource)
- {
--    const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(mode)->findResource(outputResource);
-+    const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(currentMode)->findResource(outputResource);
-     send_current_mode(outputResource->handle, modeResource->handle);
- }
- 
-@@ -506,12 +494,12 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
-         d->modes << outputDeviceMode;
-         outputDeviceMode->setParent(this);
- 
-+        for (auto resource : clientResources) {
-+            d->sendNewMode(resource, outputDeviceMode);
-+        }
-+
-         if (outputDeviceMode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) {
-             d->currentMode = outputDeviceMode;
--        } else {
--            for (auto resource : clientResources) {
--                d->sendNewMode(resource, outputDeviceMode);
--            }
-         }
-     }
- 
-@@ -520,8 +508,7 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface *
-     }
- 
-     for (auto resource : clientResources) {
--        d->sendNewMode(resource, d->currentMode);
--        d->sendCurrentMode(resource, d->currentMode);
-+        d->sendCurrentMode(resource);
-     }
- 
-     qDeleteAll(oldModes.crbegin(), oldModes.crend());
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
deleted file mode 100644
index a3a0b2067f5d..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 97df88c6c8af925382bb1f59b7c6ad75f28142a0 Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 5 Apr 2022 13:26:26 +0100
-Subject: [PATCH] Fix layer shell reset
-
-In the current form any client committing multiple times without
-attaching a buffer would unset the cached state and trigger an error.
-
-It's legal (though weird) to commit multiple times before attaching a
-buffer.
-
-We should only reset the state if we commit an empty buffer after having
-committed an existing buffer. This brings us in line with XdgShell.
-
-
-(cherry picked from commit a5c55b68589a8771cde0bf4ce552702da6fca41c)
----
- src/server/layershell_v1_interface.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/layershell_v1_interface.cpp b/src/server/layershell_v1_interface.cpp
-index 17086334..19fcd68e 100644
---- a/src/server/layershell_v1_interface.cpp
-+++ b/src/server/layershell_v1_interface.cpp
-@@ -69,6 +69,7 @@ public:
-     bool isClosed = false;
-     bool isConfigured = false;
-     bool isCommitted = false;
-+    bool firstBufferAttached = false;
- 
- protected:
-     void zwlr_layer_surface_v1_destroy_resource(Resource *resource) override;
-@@ -290,8 +291,10 @@ void LayerSurfaceV1InterfacePrivate::commit()
-         return;
-     }
- 
--    if (!surface->isMapped() && isCommitted) {
-+    // detect reset
-+    if (!surface->isMapped() && firstBufferAttached) {
-         isCommitted = false;
-+        firstBufferAttached = false;
-         isConfigured = false;
- 
-         current = LayerSurfaceV1State();
-@@ -303,6 +306,9 @@ void LayerSurfaceV1InterfacePrivate::commit()
-     const LayerSurfaceV1State previous = std::exchange(current, pending);
- 
-     isCommitted = true; // Must set the committed state before emitting any signals.
-+    if (surface->isMapped()) {
-+        firstBufferAttached = true;
-+    }
- 
-     if (previous.acceptsFocus != current.acceptsFocus) {
-         Q_EMIT q->acceptsFocusChanged();
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
deleted file mode 100644
index 1799a711b472..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From dc09ce85f00b3a790e2817888067c3826280dd8e Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 16 Apr 2022 00:01:12 -0700
-Subject: [PATCH] Fix race in wp_drm_lease_v1.
-
-Basically this is a well known issue in wayland for globals. If bind
-comes after destroyed, it will raise a invalid global error. The common
-practice is to delay the destroy of global. Similar technique is also
-applied to wl_output.
-
-CCBUG: 452435
-(cherry picked from commit cdc9dcfb0a1f0445c46ee2cefa114329a2408555)
----
- src/server/drmleasedevice_v1_interface.cpp | 14 +++++---------
- src/server/drmleasedevice_v1_interface_p.h |  2 +-
- 2 files changed, 6 insertions(+), 10 deletions(-)
-
-diff --git a/src/server/drmleasedevice_v1_interface.cpp b/src/server/drmleasedevice_v1_interface.cpp
-index bffd22cd..7e338022 100644
---- a/src/server/drmleasedevice_v1_interface.cpp
-+++ b/src/server/drmleasedevice_v1_interface.cpp
-@@ -84,10 +84,6 @@ void DrmLeaseDeviceV1InterfacePrivate::remove()
-         request->connectors.clear();
-     }
-     globalRemove();
--    removed = true;
--    if (resourceMap().isEmpty()) {
--        delete this;
--    }
- }
- 
- void DrmLeaseDeviceV1InterfacePrivate::registerConnector(DrmLeaseConnectorV1Interface *connector)
-@@ -144,6 +140,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_release(Resource *
- 
- void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Resource *resource)
- {
-+    if (isGlobalRemoved()) {
-+        return;
-+    }
-     if (!hasDrmMaster) {
-         pendingFds << resource->handle;
-         return;
-@@ -161,12 +160,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Reso
-     }
- }
- 
--void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_resource(Resource *resource)
-+void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_global()
- {
--    Q_UNUSED(resource)
--    if (removed && resourceMap().isEmpty()) {
--        delete this;
--    }
-+    delete this;
- }
- 
- 
-diff --git a/src/server/drmleasedevice_v1_interface_p.h b/src/server/drmleasedevice_v1_interface_p.h
-index 4bef36e4..085aac85 100644
---- a/src/server/drmleasedevice_v1_interface_p.h
-+++ b/src/server/drmleasedevice_v1_interface_p.h
-@@ -44,7 +44,7 @@ protected:
-     void wp_drm_lease_device_v1_create_lease_request(Resource *resource, uint32_t id) override;
-     void wp_drm_lease_device_v1_release(Resource *resource) override;
-     void wp_drm_lease_device_v1_bind_resource(Resource *resource) override;
--    void wp_drm_lease_device_v1_destroy_resource(Resource *resource) override;
-+    void wp_drm_lease_device_v1_destroy_global() override;
- };
- 
- class DrmLeaseConnectorV1InterfacePrivate : public QObject, public QtWaylandServer::wp_drm_lease_connector_v1
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
deleted file mode 100644
index e40189ab2744..000000000000
--- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 6dcf73adaafeaa40c05e22df5f1c10af88df362b Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Wed, 30 Mar 2022 14:57:12 +0100
-Subject: [PATCH] Guard subsurface parent access.
-
-Whilst a subsurface must have a parent at the time of creation, the
-lifespan is not guaranteed afterwards.
-
-It's a weird thing for a client to do, but we need to not crash
-afterwards.
-
-If the parent surface is destroyed we should consider the surface
-unmapped.
-
-BUG: 452044
-
-
-(cherry picked from commit 1d2424a56a13dc55aeab699a38234a7cafa091d8)
----
- src/server/surface_interface.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp
-index ef2584f4..8bfac95f 100644
---- a/src/server/surface_interface.cpp
-+++ b/src/server/surface_interface.cpp
-@@ -678,7 +678,13 @@ void SurfaceInterfacePrivate::commitFromCache()
- 
- bool SurfaceInterfacePrivate::computeEffectiveMapped() const
- {
--    return bufferRef && (!subSurface || subSurface->parentSurface()->isMapped());
-+    if (!bufferRef) {
-+        return false;
-+    }
-+    if (subSurface) {
-+        return subSurface->parentSurface() && subSurface->parentSurface()->isMapped();
-+    }
-+    return true;
- }
- 
- void SurfaceInterfacePrivate::updateEffectiveMapped()
--- 
-GitLab
-
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
deleted file mode 100644
index 466f2ec10616..000000000000
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Wayland Server Components built on KDE Frameworks"
-HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
-
-LICENSE="LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# All failing, I guess we need a virtual wayland server
-RESTRICT="test"
-
-RDEPEND="
-	>=dev-libs/wayland-1.19.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5[egl]
-	>=dev-qt/qtwayland-${QTMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	media-libs/libglvnd
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.6.0
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-layer-shell-reset.patch
-	"${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # KDE-bug 452044
-	"${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # KDE-bug 452318
-	"${FILESDIR}"/${P}-fix-race-in-wp_drm_lease_v1.patch # KDE-bug 452435
-)
diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
index bba4549022b8..8950843499dd 100644
--- a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
+++ b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://invent.kde.org/plasma/kwayland-server"
 
 LICENSE="LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 36559298a18d..0c29148e9bef 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,13 +1,4 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
-AUX kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch 1143 BLAKE2B cf2957ffe9739826f31b4d9cb3657d4fa3eded789ba1bc3125c54a5d8aa6d32438c85d7305b64cbcc0e5e05220725001e5af3afa892ec06d6622cdca35b3de38 SHA512 fef2abe755ecf613df95fa85c3e12a083afa04d56262564c90c4a9a6f088f32986056bf9b4b85ff9ecc407c223d4f1f480c84394321a087048f58c72a71a557b
-AUX kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch 8361 BLAKE2B bbf3478d265290fd50597e063205404551243e30f157fa58a448e1b6b644f39c55a7b526d125fc399487e9cc36795e27e9ba793d1cd5ba19899a9eb56c1b0fd3 SHA512 28d981819f0d81e6498ad8c92cd9bd96808ab5b11cba946cef5318da273b4f107e0fcdeffc80bb46e5865d69a8bf50eb5febc3d2eb1ec3ac716495af3a030091
-AUX kwin-5.24.4-dont-send-geom-to-text-input.patch 1119 BLAKE2B ff8b13dfca5be2d0a3603599e80ed3b666ea61bfaddbcc19af57b70a82077d41736e0a3919a9c386e8d76233abdf6a9ddbc87e1a46a564c07dff98a2c60ee4bf SHA512 9388a6dac9c9c2a35c9eb6093571ff0f275a1720ac9a703c1dc134f06dfb7be4e0806ef26765b7cd3be4d53fef342345f2bba0980bfebf92fe8c5368c915d20a
-AUX kwin-5.24.4-dont-use-xcb-in-wayland.patch 1593 BLAKE2B ddee202fb073af4331c77ea1013cb3b779a4ce8c6d5a6adeae9035edf051b1b6cce708ac64719e6d04c0cfa3a7e76599e233714c7137f05d8c9480293b95d6e0 SHA512 62a99855da7ec06ac35bd790d5d5bcc40c7e91ef5c66d99dae8bf8015742b9c9de60a52f565a0872cfa3e89ccfa26d2a62a223ec1d07fa97983e1ef508937b93
-AUX kwin-5.24.4-fix-current-VD-always-added.patch 1904 BLAKE2B bc8fbc8548e9e379281736ae2e388f81e11a61a7e881fd3b0bc87781cbd0d2dac15baa62a8a0ed501a3b92468f4bb729ce582b07953625e607bea1317ffdb17f SHA512 96ab4ebd818dc89055a66327c63cc8beca46d0797911d59c03125bfa0a07f602cfcefbf76a34648050c44e054dcc2b6f0c01f4531155438e504096436f806695
-AUX kwin-5.24.4-fix-unlocking-wayland-sessions.patch 1353 BLAKE2B 23dc90586cb7743a5009f5d4c7ffd4473a1df0ba62da8e55c3eb883dfc609b4d58483397b5f529e50e7beea4244416a32cf8bd2bf4220da1c9a1939b06385dbd SHA512 62e57a20a7de142f8ac8c4007a92f4cfa5fdcef7c06e5b2a706b610aa91d1268b9d88f725166477ba5438651787db37546b173e3b18fbe28f2dd2480e3ce564a
-AUX kwin-5.24.4-waylandserver-lockScreenShown.patch 3721 BLAKE2B 70b8cd4bf8a571190c51e6b47427d875319726e1459f0084349d66adb77691b0cd6612192d8103e18e1b6f17335ac8e787c2a029703a44d5899c84d377914ad4 SHA512 5e30c5bfdc2fad74944f87d1e09d1a8a2bb4a64b31b1e8920814e3c680b6d5372b14f6abc356bbcbab77d8aaa6a4838549c881c7000e2b856138bf1fa765ab1f
-AUX kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch 1306 BLAKE2B 5511bb0c43c60df298cefe4ed53b76c906fb9935054cfbdc4c628425d3111e727d85b16b222e4d4b8a55908aec898536696594d929b56db23d8fe4cd1bcca82b SHA512 e672bf722b19e339b159710d3775f22f3d081c96b80a30d0f58d1bb078ddd4279aa402e1111b0612cbbeed36907d021755bd80fe7753aff1a67276681e390ea5
-AUX kwin-5.24.4-xdgactivation-demand-attention.patch 1235 BLAKE2B 49b7bca6c6009ffd1c9d94de6caab874f45a54f846f813c659bb63a3775aea2f5280f0f2728fcdd4e8d90a28c49b46dedbb5289e3d41c110a7ccbb480f465076 SHA512 35ecb28484b0f07b026d8875b4c5cabfb05f563259920c76d6bb1c0cd2339891540c6aab8f763e034d52c90e45bafb5c607fd18e602791d75f9e92fef9162a00
 AUX kwin-5.24.5-effects-overview-hide-panels.patch 2059 BLAKE2B 1f5477757d7c56e2c862d35c0052c53ac6295ba17b0a16a20bf15f80df09756011429d3ffb589dc8a367e468b55672e2de42e79d5b6c4445d7835d271ddbd483 SHA512 d5410cde9f264bb3a2fc5cc5583c9655afa51af42eec056ff04adcd9a2102be9972052f9ce5a93709adfe8cfec9079f28c9e51cf1bd9c1fc322738e8fc0c634d
 AUX kwin-5.24.5-fix-multi-gpu-double-copy.patch 1762 BLAKE2B 45e37e6f6b7a134284d5c4c63ba63f2657be6921e37ff7b49d52c09f87174ff7dd0e0860dbc487d217ea236f4622a15e350684919b7efb9728cb0b9a7ddf0622 SHA512 b3954c5c6a64c7c3e3a5ee78d80b6c7b0a053ab91686363035e4e730d29449c98d2beb4fc23aeac2e678e09de0a3771ed72da7eeec2f2f7bfe9354fc1a8157ce
 AUX kwin-5.24.5-fix-nvidia-render-glitches.patch 1674 BLAKE2B ef1db8231b6931857c53d24b21a6dc0fb54257d62c171a1717c65569fc93f788479b3389fdb3d455b0e3e22baae899e6f8c80a44a4d4969cf05e831c286aa176 SHA512 f4905d81d03596b9d8a56d5ed580c6f1291f160ab39b20fbf06c70a2ac4d2de08a137e5cb13bf2fd4532adbbe89fd906a18dc0c51ba52f51a8b5c68186b08f29
@@ -15,9 +6,7 @@ AUX kwin-5.24.5-fix-plasmashell-crash-1.patch 11170 BLAKE2B 0e7877953d8a9c35c4d6
 AUX kwin-5.24.5-fix-plasmashell-crash-2.patch 982 BLAKE2B dbb3bc31d65384ec14164f7af58254482e0c0bcbb31b06386ea1981bb886a220cf0b727aa7b2b963eaa3c44454344801b0c7fcdce7929c2ffddc6bee6e30cdca SHA512 604ccaab296defceb37ed0bffb5ba6e2c40563bbcf8b4fb2d899c0669de5d180a59ca73fb16f8a2e7939f00ba54c2f4daa96d33b99a4543b88957926d574a3fd
 AUX kwin-5.24.5-tabbox-dont-dismiss-popups.patch 1111 BLAKE2B 017199e01456961ece0335f54d42e18162c703868e7a7f95e84ea1440014ceaaed798e7668dbba4e7392492d82171e29d5453a554f669a789eb8b52a15f47c88 SHA512 538b79201b70eaf162ec75a37dcc40c264b5f1021c6a940ab67274c9e33566962053867f11b45f309d1dfe35d30573139419f666333e06bfd4a5d1c08ca97e6a
 AUX kwin-5.24.5-update-device-outputName.patch 959 BLAKE2B c39d0a94210ea82fa4c7292cb29d5fd93aa793d74e3743f23b3a86462a898594e17798a7beb272cd8462e557875560a05ae642463cee78d7d2a35ee0cd11e576 SHA512 fc4ec093ea882b9d73ef11024d4279d566faeee1979a7fb0f8f29c5e89c658f32b89a3f40faee286c428ac95297dde684ceefcc5e0d3276cdd8d512084f02a19
-DIST kwin-5.24.4.tar.xz 6448844 BLAKE2B 3e58ae22d2ff254f4c08a8c6662702e5dae97dd207ca8d1d51cc203826d4b68a5eecffea69cd6eb4de5894e09e73340cda540e41db3753873cab72a76936e6d4 SHA512 2e1389a68e373791bd397294c834fb1cdbab24f32253eeaf505bb1878b8a8a5cd02d1250cae181c00dc73d6a524ff44cd1fbf2e101f13adf915f30f15c738df3
 DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089
-EBUILD kwin-5.24.4-r1.ebuild 4603 BLAKE2B 25641eac46f94b51f9f7e5219cdcc0318f4c2af271ff1c6931cca5d6a420ad6bea85008ecff4004710e7ba4adcfe32f15456f68ee7d45aaa25089f92da8c2676 SHA512 e2581f0c225ea409a480148c4e083b7c6ca849de78a98cab104844f0fe7b73562e4d53a69b349094bc53303c7207d2115693670a6bc12c4a8d94fbdfff055749
 EBUILD kwin-5.24.5-r1.ebuild 4276 BLAKE2B eaad1e84aa5336af586a495d521f4f67f3fdd2e6312311284332021a994c88a7acbf24e79f21519b276fba2f68820656d5e2dd175a30f521e81ccce20d5736c4 SHA512 7b62a4c752a88387f2b27b591b3b3d01318e8b4c89b25609f79b6ac7f30adc8f49efaf2a154d8e148102cee419a1a07cb4c551e7e9d61fc077740811d19e5aa3
-EBUILD kwin-5.24.5-r2.ebuild 4424 BLAKE2B 8c6969d77ec6b769af084a5ba2d8e7826a4e8786526a3ff2ac47e695ad1e9566b8cdde531f78b2cc00fd6aa546dfed4fc7a5358f5b401dae5ed4a0610bb92cb6 SHA512 2fecce9c2253ebff6637d96c4f1cbd2ebe0a7aa670fb252eb9abb729b8d7a9d252ad7897c76bc56ca85c116837909b10ccd5981c5e51b8911e0a962d061c58f8
+EBUILD kwin-5.24.5-r2.ebuild 4421 BLAKE2B f9a50bba822c9da8867b4a5cb3fab9c9bab2ab75d93f20f3cfd467672c425fcb6cc9da401f49c444726f7bb3fed7de636c3bc696fffa949c02c133125a4f4311 SHA512 32eec4d57c7525e27ef2c1cd5b0aed37a6eafaf459146ed6170763773f31805a89b9b7d7d8cc9e22230236c9936a21624cf089a0b0f9923c148a73f16cc8359f
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch
deleted file mode 100644
index 38d4771c2345..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a5404234dbd26e170acb97789599fbcd705cf6cb Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Fri, 8 Apr 2022 17:47:09 +0200
-Subject: [PATCH] backends/drm: don't permanently disable VRR when the test
- commit fails
-
-In 5.24, the same code path is used for testing direct scanout, so that
-causes false negatives. Generally though, the user setting shouldn't be
-touched, it's not really proper feedback for the driver or KWin having
-problems.
-
-
-(cherry picked from commit 2ef6215a517e4220f147f5327e7ecdad02762b64)
----
- src/backends/drm/drm_output.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp
-index bd08631cf7..048803883b 100644
---- a/src/backends/drm/drm_output.cpp
-+++ b/src/backends/drm/drm_output.cpp
-@@ -337,7 +337,6 @@ bool DrmOutput::present(const QSharedPointer<DrmBuffer> &buffer, QRegion damaged
-             m_pipeline->applyPendingChanges();
-         } else {
-             m_pipeline->revertPendingChanges();
--            setVrrPolicy(RenderLoop::VrrPolicy::Never);
-         }
-     }
-     if (m_pipeline->present(buffer)) {
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch
deleted file mode 100644
index 16c7756d33e2..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 82c2324b5675ea2d5e3b962f270bda1d186e7326 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Mon, 4 Apr 2022 20:19:05 +0200
-Subject: [PATCH] backends/drm: fetch immutable blobs in DrmProperty
-
-If the blob is fetched while there is no kernel-visible reference to it,
-the driver may re-use the blob ID. When DrmProperty is created or updated,
-KWin holds a reference on the blob via drmModeObjectProperties, so this
-should prevent any possible issues.
-
-CCBUG: 449285
----
- src/backends/drm/drm_object_connector.cpp | 13 +++-----
- src/backends/drm/drm_object_plane.cpp     | 39 +++++++++++------------
- src/backends/drm/drm_property.cpp         | 27 +++++++++++++++-
- src/backends/drm/drm_property.h           |  7 +++-
- 4 files changed, 54 insertions(+), 32 deletions(-)
-
-diff --git a/src/backends/drm/drm_object_connector.cpp b/src/backends/drm/drm_object_connector.cpp
-index a0045290df..0cdbd70b4f 100644
---- a/src/backends/drm/drm_object_connector.cpp
-+++ b/src/backends/drm/drm_object_connector.cpp
-@@ -337,16 +337,11 @@ bool DrmConnector::updateProperties()
-     }
- 
-     // parse edid
--    auto edidProp = getProp(PropertyIndex::Edid);
--    if (edidProp) {
--        DrmScopedPointer<drmModePropertyBlobRes> blob(drmModeGetPropertyBlob(gpu()->fd(), edidProp->current()));
--        if (blob && blob->data) {
--            m_edid = Edid(blob->data, blob->length);
--            if (!m_edid.isValid()) {
--                qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this;
--            }
-+    if (const auto edidProp = getProp(PropertyIndex::Edid); edidProp && edidProp->immutableBlob()) {
-+        m_edid = Edid(edidProp->immutableBlob()->data, edidProp->immutableBlob()->length);
-+        if (!m_edid.isValid()) {
-+            qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this;
-         }
--        deleteProp(PropertyIndex::Edid);
-     } else {
-         qCDebug(KWIN_DRM) << "Could not find edid for connector" << this;
-     }
-diff --git a/src/backends/drm/drm_object_plane.cpp b/src/backends/drm/drm_object_plane.cpp
-index 6967fdd50d..c4dcca96d4 100644
---- a/src/backends/drm/drm_object_plane.cpp
-+++ b/src/backends/drm/drm_object_plane.cpp
-@@ -73,29 +73,26 @@ bool DrmPlane::init()
-         checkSupport(5, Transformation::ReflectY);
- 
-         // read formats from blob if available and if modifiers are supported, and from the plane object if not
--        if (auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && gpu()->addFB2ModifiersSupported()) {
--            DrmScopedPointer<drmModePropertyBlobRes> propertyBlob(drmModeGetPropertyBlob(gpu()->fd(), formatProp->current()));
--            if (propertyBlob && propertyBlob->data) {
--                auto blob = static_cast<drm_format_modifier_blob*>(propertyBlob->data);
--                auto modifiers = reinterpret_cast<drm_format_modifier*>(reinterpret_cast<uint8_t*>(blob) + blob->modifiers_offset);
--                uint32_t *formatarr = reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(blob) + blob->formats_offset);
--
--                for (uint32_t f = 0; f < blob->count_formats; f++) {
--                    auto format = formatarr[f];
--                    QVector<uint64_t> mods;
--                    for (uint32_t m = 0; m < blob->count_modifiers; m++) {
--                        auto modifier = &modifiers[m];
--                        // The modifier advertisement blob is partitioned into groups of 64 formats
--                        if (m < modifier->offset || m > modifier->offset + 63) {
--                            continue;
--                        }
--                        if (!(modifier->formats & (1 << (f - modifier->offset)))) {
--                            continue;
--                        }
--                        mods << modifier->modifier;
-+        if (const auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && formatProp->immutableBlob() && gpu()->addFB2ModifiersSupported()) {
-+            auto blob = static_cast<drm_format_modifier_blob *>(formatProp->immutableBlob()->data);
-+            auto modifiers = reinterpret_cast<drm_format_modifier *>(reinterpret_cast<uint8_t *>(blob) + blob->modifiers_offset);
-+            uint32_t *formatarr = reinterpret_cast<uint32_t *>(reinterpret_cast<uint8_t *>(blob) + blob->formats_offset);
-+
-+            for (uint32_t f = 0; f < blob->count_formats; f++) {
-+                auto format = formatarr[f];
-+                QVector<uint64_t> mods;
-+                for (uint32_t m = 0; m < blob->count_modifiers; m++) {
-+                    auto modifier = &modifiers[m];
-+                    // The modifier advertisement blob is partitioned into groups of 64 formats
-+                    if (m < modifier->offset || m > modifier->offset + 63) {
-+                        continue;
-                     }
--                    m_supportedFormats.insert(format, mods);
-+                    if (!(modifier->formats & (1 << (f - modifier->offset)))) {
-+                        continue;
-+                    }
-+                    mods << modifier->modifier;
-                 }
-+                m_supportedFormats.insert(format, mods);
-             }
-         } else {
-             for (uint32_t i = 0; i < p->count_formats; i++) {
-diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp
-index 28af8ec07f..8ab0dc0e5a 100644
---- a/src/backends/drm/drm_property.cpp
-+++ b/src/backends/drm/drm_property.cpp
-@@ -24,6 +24,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val,
-     , m_next(val)
-     , m_current(val)
-     , m_immutable(prop->flags & DRM_MODE_PROP_IMMUTABLE)
-+    , m_isBlob(prop->flags & DRM_MODE_PROP_BLOB)
-     , m_obj(obj)
- {
-     if (!enumNames.isEmpty()) {
-@@ -35,6 +36,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val,
-         m_minValue = prop->values[0];
-         m_maxValue = prop->values[1];
-     }
-+    updateBlob();
- }
- 
- DrmProperty::~DrmProperty() = default;
-@@ -110,7 +112,10 @@ bool DrmProperty::needsCommit() const
- 
- void DrmProperty::setCurrent(uint64_t value)
- {
--    m_current = value;
-+    if (m_current != value) {
-+        updateBlob();
-+        m_current = value;
-+    }
- }
- 
- uint64_t DrmProperty::current() const
-@@ -122,10 +127,12 @@ QVector<QByteArray> DrmProperty::enumNames() const
- {
-     return m_enumNames;
- }
-+
- bool DrmProperty::hasEnum(uint64_t value) const
- {
-     return m_enumMap.contains(value);
- }
-+
- bool DrmProperty::hasAllEnums() const
- {
-     return m_enumMap.count() == m_enumNames.count();
-@@ -166,4 +173,22 @@ uint64_t DrmProperty::maxValue() const
-     return m_maxValue;
- }
- 
-+void DrmProperty::updateBlob()
-+{
-+    if (m_immutable && m_isBlob) {
-+        if (m_current != 0) {
-+            m_immutableBlob.reset(drmModeGetPropertyBlob(m_obj->gpu()->fd(), m_current));
-+            if (m_immutableBlob && (!m_immutableBlob->data || !m_immutableBlob->length)) {
-+                m_immutableBlob.reset();
-+            }
-+        } else {
-+            m_immutableBlob.reset();
-+        }
-+    }
-+}
-+
-+drmModePropertyBlobRes *DrmProperty::immutableBlob() const
-+{
-+    return m_immutableBlob.get();
-+}
- }
-diff --git a/src/backends/drm/drm_property.h b/src/backends/drm/drm_property.h
-index 48bdeafdc2..1ae547f41e 100644
---- a/src/backends/drm/drm_property.h
-+++ b/src/backends/drm/drm_property.h
-@@ -9,9 +9,9 @@
- */
- 
- #pragma once
-+#include "drm_pointer.h"
- 
- #include <xf86drmMode.h>
--
- #include <QVector>
- #include <QMap>
- #include <QByteArray>
-@@ -59,6 +59,7 @@ public:
- 
-     void setCurrent(uint64_t value);
-     uint64_t current() const;
-+    drmModePropertyBlobRes *immutableBlob() const;
- 
-     uint64_t minValue() const;
-     uint64_t maxValue() const;
-@@ -78,6 +79,8 @@ public:
-     }
- 
- private:
-+    void updateBlob();
-+
-     uint32_t m_propId = 0;
-     QByteArray m_propName;
- 
-@@ -89,6 +92,7 @@ private:
-     uint64_t m_next = 0;
-     // the value currently set for or by the kernel
-     uint64_t m_current = 0;
-+    DrmScopedPointer<drmModePropertyBlobRes> m_immutableBlob;
- 
-     uint64_t m_minValue = -1;
-     uint64_t m_maxValue = -1;
-@@ -96,6 +100,7 @@ private:
-     QMap<uint32_t, uint64_t> m_enumMap;
-     QVector<QByteArray> m_enumNames;
-     const bool m_immutable;
-+    const bool m_isBlob;
-     bool m_legacy = false;
-     const DrmObject *m_obj;
- };
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch
deleted file mode 100644
index acd7bf4149ab..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a35e3075a7aa4616c8930ccd3869dc4cca5d287e Mon Sep 17 00:00:00 2001
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Sat, 9 Apr 2022 07:25:44 -0700
-Subject: [PATCH] Do not send overlay geometry to text input.
-
-(cherry picked from commit 374e94918238f3ddb9d00c542f281d3d8a309efb)
----
- src/inputmethod.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp
-index e7951d9580..5b8e54efbc 100644
---- a/src/inputmethod.cpp
-+++ b/src/inputmethod.cpp
-@@ -615,7 +615,7 @@ void InputMethod::updateInputPanelState()
-         const bool bottomKeyboard = m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay && m_inputClient->isShown();
-         m_trackedClient->setVirtualKeyboardGeometry(bottomKeyboard ? m_inputClient->inputGeometry() : QRect());
- 
--        if (m_inputClient) {
-+        if (m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay) {
-             overlap = m_trackedClient->frameGeometry() & m_inputClient->inputGeometry();
-             overlap.moveTo(m_trackedClient->mapToLocal(overlap.topLeft()));
-         }
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch
deleted file mode 100644
index 667b91b8dc5c..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7a26f93cb579cf6b1cbc1e32790f93be70013157 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Tue, 12 Apr 2022 15:45:52 +0200
-Subject: [PATCH] effects/kscreen: don't use xcb on Wayland
-
-BUG: 450564
-FIXED-IN: 5.24.5
-(cherry picked from commit db3f27336f2172fd70be3411874d9bbeb3db6a24)
----
- src/effects/kscreen/kscreen.cpp | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/effects/kscreen/kscreen.cpp b/src/effects/kscreen/kscreen.cpp
-index 9484399756..0673915aad 100644
---- a/src/effects/kscreen/kscreen.cpp
-+++ b/src/effects/kscreen/kscreen.cpp
-@@ -44,15 +44,15 @@ namespace KWin
- 
- KscreenEffect::KscreenEffect()
-     : Effect()
--    , m_atom(effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this))
-+    , m_atom(effects->waylandDisplay() ? XCB_ATOM_NONE : effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this))
- {
-     initConfig<KscreenConfig>();
--    connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify);
--    connect(effects, &EffectsHandler::xcbConnectionChanged, this,
--        [this] {
-+    if (!effects->waylandDisplay()) {
-+        connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify);
-+        connect(effects, &EffectsHandler::xcbConnectionChanged, this, [this]() {
-             m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_KWIN_KSCREEN_SUPPORT"), this);
--        }
--    );
-+        });
-+    }
-     reconfigure(ReconfigureAll);
- 
-     const QList<EffectScreen *> screens = effects->screens();
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch
deleted file mode 100644
index 195d33b1f3a2..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c1d7919ad7cc8a7e55f5b93ec84de63547bc53b9 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Fri, 8 Apr 2022 22:53:08 +0200
-Subject: [PATCH] AbstractClient: Fix the current VD being always added to the
- plasma interface
-
-When setting-up the plasma window interface we need to call
-`setOnAllDesktops()` after the actual virtual desktops have
-been set.
-
-Otherwise, the current desktop would be always added to the
-interface (as if the user were unsetting the "onAllDesktops"
-flag) and the plasma interface and KWin can get un-synced,
-specially if there are specific window rules.
-
-BUG: 452171
-FIXED-IN: 5.24.5
-
-
-(cherry picked from commit 4c8711f121430caa658f9848070e4e25c4a12208)
----
- src/abstract_client.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp
-index 7e8a7eec04..0714b9ac3f 100644
---- a/src/abstract_client.cpp
-+++ b/src/abstract_client.cpp
-@@ -1488,7 +1488,6 @@ void AbstractClient::setupWindowManagementInterface()
-     w->setKeepBelow(keepBelow());
-     w->setMaximized(maximizeMode() == KWin::MaximizeFull);
-     w->setMinimized(isMinimized());
--    w->setOnAllDesktops(isOnAllDesktops());
-     w->setDemandsAttention(isDemandingAttention());
-     w->setCloseable(isCloseable());
-     w->setMaximizeable(isMaximizable());
-@@ -1620,6 +1619,10 @@ void AbstractClient::setupWindowManagementInterface()
-     for (const auto vd : qAsConst(m_desktops)) {
-         w->addPlasmaVirtualDesktop(vd->id());
-     }
-+    // We need to set `OnAllDesktops` after the actual VD list has been added.
-+    // Otherwise it will unconditionally add the current desktop to the interface
-+    // which may not be the case, for example, when using rules
-+    w->setOnAllDesktops(isOnAllDesktops());
- 
-     //Plasma Virtual desktop management
-     //show/hide when the window enters/exits from desktop
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch
deleted file mode 100644
index 9e9a4dabc998..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From ee625b2d8acad2ba81693107740a12d8a03863c0 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Mon, 28 Mar 2022 03:40:12 +0200
-Subject: [PATCH] Fix unlocking wayland sessions
-
-We were never issuing a repaint which confused thoroughly the
-compositor.
-
-BUG: 447705
----
- src/wayland_server.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
-index eb3600f824..9e60787465 100644
---- a/src/wayland_server.cpp
-+++ b/src/wayland_server.cpp
-@@ -15,6 +15,7 @@
- #include "inputpanelv1integration.h"
- #include "keyboard_input.h"
- #include "screens.h"
-+#include "scene.h"
- #include "layershellv1integration.h"
- #include "main.h"
- #include "xdgshellintegration.h"
-@@ -610,6 +611,7 @@ void WaylandServer::initScreenLocker()
-                 connect(seat, &KWaylandServer::SeatInterface::timestampChanged,
-                         screenLockerApp, &ScreenLocker::KSldApp::userActivity);
-             }
-+            Compositor::self()->scene()->addRepaintFull();
-         }
-     );
- 
-@@ -627,6 +629,7 @@ void WaylandServer::initScreenLocker()
-                            screenLockerApp, &ScreenLocker::KSldApp::userActivity);
-             }
-             ScreenLocker::KSldApp::self()->setWaylandFd(-1);
-+            Compositor::self()->scene()->addRepaintFull();
-         }
-     );
- 
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch
deleted file mode 100644
index 4defd5ae5945..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 9d38f57d84fb9a6f2c4e60f7051f685842f34e0f Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Mon, 28 Mar 2022 18:08:59 +0200
-Subject: [PATCH] waylandserver: only signal lockScreenShown once it has
- actually been shown
-
-When the system goes to suspend and screen locking for suspend is enabled,
-suspend is inhibited until ScreenLocker::KSldApp::self()->lockScreenShown()
-gets called, in order to make sure that the lockscreen is shown before the
-system goes to standby, and thus also when the system wakes (instead of
-potentially sensitive user information).
-However, signalling that when the lockscreen gets mapped can't work reliably,
-as it's then a matter of timing whether or not KWin actually presents an
-image with the lockscreen before suspending. To fix that, this commit replaces
-that logic with only calling lockScreenShown once every output actually got a
-lockscreen presented.
----
- src/wayland_server.cpp | 25 +++++++++++++++++++++----
- src/wayland_server.h   | 10 ++++++++++
- 2 files changed, 31 insertions(+), 4 deletions(-)
-
-diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
-index c850a1b697..6d5e1206a5 100644
---- a/src/wayland_server.cpp
-+++ b/src/wayland_server.cpp
-@@ -213,10 +213,6 @@ KWaylandServer::ClientConnection *WaylandServer::inputMethodConnection() const
- 
- void WaylandServer::registerShellClient(AbstractClient *client)
- {
--    if (client->isLockScreen()) {
--        ScreenLocker::KSldApp::self()->lockScreenShown();
--    }
--
-     if (client->readyForPainting()) {
-         Q_EMIT shellClientAdded(client);
-     } else {
-@@ -623,6 +619,8 @@ void WaylandServer::initScreenLocker()
-                 m_screenLockerClientConnection = nullptr;
-             }
- 
-+            new LockScreenPresentationWatcher(this);
-+
-             const QVector<SeatInterface *> seatIfaces = m_display->seats();
-             for (auto *seat : seatIfaces) {
-                 disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged,
-@@ -797,4 +795,23 @@ QString WaylandServer::socketName() const
-     return QString();
- }
- 
-+WaylandServer::LockScreenPresentationWatcher::LockScreenPresentationWatcher(WaylandServer *server)
-+{
-+    connect(server, &WaylandServer::shellClientAdded, this, [this](AbstractClient *client) {
-+        if (client->isLockScreen()) {
-+            connect(client->output()->renderLoop(), &RenderLoop::framePresented, this, [this, client]() {
-+                // only signal lockScreenShown once all outputs have been presented at least once
-+                m_signaledOutputs << client->output();
-+                if (m_signaledOutputs.size() == kwinApp()->platform()->enabledOutputs().size()) {
-+                    ScreenLocker::KSldApp::self()->lockScreenShown();
-+                    delete this;
-+                }
-+            });
-+        }
-+    });
-+    QTimer::singleShot(1000, this, [this]() {
-+        ScreenLocker::KSldApp::self()->lockScreenShown();
-+        delete this;
-+    });
-+}
- }
-diff --git a/src/wayland_server.h b/src/wayland_server.h
-index bf1ba6eee5..58dda9a7a2 100644
---- a/src/wayland_server.h
-+++ b/src/wayland_server.h
-@@ -243,6 +243,16 @@ private:
-     void handleOutputRemoved(AbstractOutput *output);
-     void handleOutputEnabled(AbstractOutput *output);
-     void handleOutputDisabled(AbstractOutput *output);
-+
-+    class LockScreenPresentationWatcher : public QObject
-+    {
-+    public:
-+        LockScreenPresentationWatcher(WaylandServer *server);
-+
-+    private:
-+        QSet<AbstractOutput *> m_signaledOutputs;
-+    };
-+
-     KWaylandServer::Display *m_display = nullptr;
-     KWaylandServer::CompositorInterface *m_compositor = nullptr;
-     KWaylandServer::SeatInterface *m_seat = nullptr;
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch
deleted file mode 100644
index 0607e2ff3030..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 388402c3b1b37d9f72597aae8d6670e8c0edeb14 Mon Sep 17 00:00:00 2001
-From: Xaver Hugl <xaver.hugl@gmail.com>
-Date: Wed, 6 Apr 2022 21:08:25 +0200
-Subject: [PATCH] waylandserver: move LockScreenPresentationWatcher to the
- correct place
-
-CCBUG: 452334
----
- src/wayland_server.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
-index 6d5e1206a5..eb3600f824 100644
---- a/src/wayland_server.cpp
-+++ b/src/wayland_server.cpp
-@@ -603,6 +603,8 @@ void WaylandServer::initScreenLocker()
-             }
-             ScreenLocker::KSldApp::self()->setWaylandFd(clientFd);
- 
-+            new LockScreenPresentationWatcher(this);
-+
-             const QVector<SeatInterface *> seatIfaces = m_display->seats();
-             for (auto *seat : seatIfaces) {
-                 connect(seat, &KWaylandServer::SeatInterface::timestampChanged,
-@@ -619,8 +621,6 @@ void WaylandServer::initScreenLocker()
-                 m_screenLockerClientConnection = nullptr;
-             }
- 
--            new LockScreenPresentationWatcher(this);
--
-             const QVector<SeatInterface *> seatIfaces = m_display->seats();
-             for (auto *seat : seatIfaces) {
-                 disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged,
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch b/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch
deleted file mode 100644
index 8efa6b637222..000000000000
--- a/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5390a4978f3a3903ede15ecd94a750b37931fbd2 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 6 Apr 2022 00:33:21 +0200
-Subject: [PATCH] xdgactivation: Demand attention when a process fails to
- resolve its token
-
-In xdg_activation_v1, if a process fails to negotiate activation, at
-least decorate it as demanding attention.
-This will give apps ways to indicate attention is required. It can can also
-help detect clients doing weird things.
-
-
-(cherry picked from commit 52035f43b90738e2efb4fd7b482719c1ea458578)
----
- src/xdgactivationv1.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp
-index e2270a3393..97f8575c29 100644
---- a/src/xdgactivationv1.cpp
-+++ b/src/xdgactivationv1.cpp
-@@ -76,6 +76,7 @@ void XdgActivationV1Integration::activateSurface(SurfaceInterface *surface, cons
- 
-     if (!m_currentActivationToken || m_currentActivationToken->token != token) {
-         qCDebug(KWIN_CORE) << "Refusing to activate " << client << " (provided token: " << token << ", current token:" << (m_currentActivationToken ? m_currentActivationToken->token : QStringLiteral("null")) << ")";
-+        client->demandAttention();
-         return;
-     }
- 
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.24.4-r1.ebuild b/kde-plasma/kwin/kwin-5.24.4-r1.ebuild
deleted file mode 100644
index 354b862b91c3..000000000000
--- a/kde-plasma/kwin/kwin-5.24.4-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="accessibility caps gles2-only multimedia plasma screencast"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=dev-libs/libinput-1.19
-	>=dev-libs/wayland-1.2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5=
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5=
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwayland-server-${PVCUT}:5
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/lcms:2
-	media-libs/libepoxy
-	>=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X]
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libdrm
-	>=x11-libs/libxcb-1.10
-	>=x11-libs/libxkbcommon-0.7.0
-	x11-libs/xcb-util-cursor
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-wm
-	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	caps? ( sys-libs/libcap )
-	gles2-only? ( media-libs/mesa[gles2] )
-	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtvirtualkeyboard-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	sys-apps/hwdata
-	x11-base/xwayland
-	multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/designer-${QTMIN}:5
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	x11-base/xorg-proto
-	test? (
-		dev-libs/plasma-wayland-protocols
-		>=dev-libs/wayland-protocols-1.19
-	)
-"
-BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-waylandserver-lockScreenShown.patch
-	"${FILESDIR}"/${P}-xdgactivation-demand-attention.patch
-	"${FILESDIR}"/${P}-waylandserver-move-LockScreenPresentationWatcher.patch
-	"${FILESDIR}"/${P}-backends-drm-dont-perm-disable-vrr.patch
-	"${FILESDIR}"/${P}-backends-drm-fetch-immutable-blobs.patch # KDE-bug 449285
-	"${FILESDIR}"/${P}-dont-send-geom-to-text-input.patch
-	"${FILESDIR}"/${P}-fix-current-VD-always-added.patch # KDE-bug 452171
-	"${FILESDIR}"/${P}-dont-use-xcb-in-wayland.patch # KDE-bug 450564
-	"${FILESDIR}"/${P}-fix-unlocking-wayland-sessions.patch # KDE-bug 447705
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch"
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package accessibility QAccessibilityClient)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package plasma KF5Runner)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-	optfeature "color management support" x11-misc/colord
-	elog
-	elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised"
-	elog "windows to the end of the list was changed so that it remains in the"
-	elog "original order. To revert to the well established behavior:"
-	elog
-	elog " - Edit ~/.config/kwinrc"
-	elog " - Find [TabBox] section"
-	elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\""
-}
diff --git a/kde-plasma/kwin/kwin-5.24.5-r2.ebuild b/kde-plasma/kwin/kwin-5.24.5-r2.ebuild
index c4afd02c8fc6..8e56a5025394 100644
--- a/kde-plasma/kwin/kwin-5.24.5-r2.ebuild
+++ b/kde-plasma/kwin/kwin-5.24.5-r2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility caps gles2-only multimedia plasma screencast"
 
 RESTRICT="test"
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index 6b8e03428b94..71054532c6df 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,5 +1,3 @@
-DIST kwrited-5.24.4.tar.xz 20920 BLAKE2B 82d55a6d16cb4ac81180eee7a9b4a52f85421008f4a71c816b6258cbde446e9ef3e56ab1a1c67b3dcbdb95ee5e1648530df713ac68510e172306e4c7625f4cb8 SHA512 ea2903fa66404beed68c7485edd88e85fcb6edc357ec1044a781895bf338fdd376edcf2d9662f5170615f5c2d729f1e642b70086a568501ca714c86842dac152
 DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4
-EBUILD kwrited-5.24.4.ebuild 599 BLAKE2B 5b6f58ac95a6469c9a67af2e7994132974f772daba7a6be62b400463caa2309a63c2b068e02456c3331b8f5034fefb940c5f7293bf25cbe7f78749ec7e26148c SHA512 9e56dc5f66cca76e2f8349a31bc924327e18317d64c94397cc30beefdc3b6c548138c37a4fdbcf1bd635102637f5e7185b5493b96398421ee056ffc87bab9667
-EBUILD kwrited-5.24.5.ebuild 602 BLAKE2B e80ec05248fc7b7b8626f3aff1174d20bfa5995af8f09a2ffa223dda1647f572d6879c475e34b5678479ebd2e7b86472e953f6772270f7759ccffb89604a73ee SHA512 2c3db5ff1a3ae8564a693d6c403f65889406a53b519bcb220b4aeb7aa0268c31b66fdc4ff623886d09e5a69b8d2daf14afc7244cb949fedef8dc82a27e76802f
+EBUILD kwrited-5.24.5.ebuild 599 BLAKE2B 5b6f58ac95a6469c9a67af2e7994132974f772daba7a6be62b400463caa2309a63c2b068e02456c3331b8f5034fefb940c5f7293bf25cbe7f78749ec7e26148c SHA512 9e56dc5f66cca76e2f8349a31bc924327e18317d64c94397cc30beefdc3b6c548138c37a4fdbcf1bd635102637f5e7185b5493b96398421ee056ffc87bab9667
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/kwrited/kwrited-5.24.4.ebuild b/kde-plasma/kwrited/kwrited-5.24.4.ebuild
deleted file mode 100644
index 7292d7ecfbba..000000000000
--- a/kde-plasma/kwrited/kwrited-5.24.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/kwrited/kwrited-5.24.5.ebuild b/kde-plasma/kwrited/kwrited-5.24.5.ebuild
index 638d75a36625..7292d7ecfbba 100644
--- a/kde-plasma/kwrited/kwrited-5.24.5.ebuild
+++ b/kde-plasma/kwrited/kwrited-5.24.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Plasma daemon listening for wall and write messages"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest
index 06db89836c4d..3c0726a16d43 100644
--- a/kde-plasma/layer-shell-qt/Manifest
+++ b/kde-plasma/layer-shell-qt/Manifest
@@ -1,5 +1,3 @@
-DIST layer-shell-qt-5.24.4.tar.xz 17876 BLAKE2B 42132f550ed135dd7d8c9d7b9fca1265c288ceb1f4dffb72e7db95697d475c6175e033cbda11b3557b19771d95f549b62f5cc22a5e7d24df1726e34b5ce0185a SHA512 6ed294219947d27cbf71777f4f1df7a2a2b0f67369b1e7bb018d2a0c3d464aecf6f62cba3fe8dc45c090a441a503648950198ae6eb681b200ab416274578ff9d
 DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc
-EBUILD layer-shell-qt-5.24.4.ebuild 812 BLAKE2B 3f15abb0714bbd956e3f8f40badf24c2bc751001b3303e3e129b834d2bebb04c6e8a442e0417ae5c83fd521100ffd808e78ac75912f5e6b1345456fd49a947a7 SHA512 be655b51a95c9188c365633fee1920ca0a3c3d83c95fe63d8271592125934f4a7b2563cb9833ef7128057ca06cdf25f86540441a3b833ac9a16cfad593144a48
-EBUILD layer-shell-qt-5.24.5.ebuild 815 BLAKE2B a5d70c550d300034f1efb5dd517b9103ca19313969377e9f121befd3364989400f74954476c96056eb5eb29533f08fdee78ff89d5134f6eaf7d55f5c737e5c6e SHA512 c4009c003ac5a8880cf5cc2b578da3bb56f2706c62f542b42b638475e9a71c2516103934852693c6df40766bb843b8fcd6fc5ae460334dbc0f376370aebbe633
+EBUILD layer-shell-qt-5.24.5.ebuild 812 BLAKE2B 3f15abb0714bbd956e3f8f40badf24c2bc751001b3303e3e129b834d2bebb04c6e8a442e0417ae5c83fd521100ffd808e78ac75912f5e6b1345456fd49a947a7 SHA512 be655b51a95c9188c365633fee1920ca0a3c3d83c95fe63d8271592125934f4a7b2563cb9833ef7128057ca06cdf25f86540441a3b833ac9a16cfad593144a48
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
deleted file mode 100644
index 3b6ca14f2ea1..000000000000
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-# slot op: various private QtWaylandClient headers
-RDEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	|| (
-		>=dev-qt/qtgui-${QTMIN}:5[libinput]
-		>=dev-qt/qtgui-${QTMIN}:5[X]
-	)
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	x11-libs/libxkbcommon
-"
-DEPEND="${RDEPEND}
-	dev-libs/wayland-protocols
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
index 853077c48cf6..3b6ca14f2ea1 100644
--- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
+++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-she
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index d2a103a1e84b..ff49fdd43ac9 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,5 +1,3 @@
-DIST libkscreen-5.24.4.tar.xz 99476 BLAKE2B db545a542a77832d5ac877c953cd7a36dcc3b4df4495768543570deb2973e1aee6572942a9fecd17746e6f8708b4c1016cca57bb65151cd7246f8802d2b23706 SHA512 72be6b77f5fe4d77ef29c07d8bab2d1c5a94cd9aa31a324cf6d883a2e6132ee923c0fa02a4bc2432df7da4171dfbdd3a608117eeccfafe9155002cc8d50b3020
 DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370
-EBUILD libkscreen-5.24.4.ebuild 791 BLAKE2B f778ba83473c6d0c703e6b809d766b959fbb9b9e53c0f5736980895ab1cb32f9f4b61563e9d45baa94e93158162b72953521373de08c1ac01668af59426c6527 SHA512 b29e1a3485815142d9e5ab2a6936a9706f75d29b33727aac477d775db740b74c8504d25175cd92917a9b20d34ddb30155d394305124066a727202f36ed947762
-EBUILD libkscreen-5.24.5.ebuild 801 BLAKE2B 355157379d24f543d34dc9772a04522b767d2e19a9b853c8c34bdf64a68016a3b8491611befa439b8ca8d6291f746405cbf26801a8afc2c32f8c359663fa944a SHA512 a552fb403a24ebb967baecfa2bf24c0336aaa0f8ee3ab4cbb3dbc6fe3d41c3ddd6c94a44eaf60aeaa0318d408724b3e37459e8051723865722c30162b4a022e9
+EBUILD libkscreen-5.24.5.ebuild 798 BLAKE2B 4dd13c972dce968f4d628bac5016e1c820793fc4f39789146a35c7064903ca2904149f7426c22c38be506a2acaa9c7e5f639a99d71ff70ba5b0e41780eeafd50 SHA512 2378cab9a98a257417c5c6fd4df65bea78db5a550590dc236e703247a1919866b51b84e9b49c545c0381de07e70baa17e2a81400a07691a4ce698603427bca93
 MISC metadata.xml 406 BLAKE2B f47c4d7eab804ce88be47f9723f0610045c62b51883ad7877b00388cff9c2a6cd1e72afa24076c1c9affae154d6cc881f33eab04b862c4e40f708fde341a4883 SHA512 47370335bdf14118dacfa8189bcafd2089a2ec131c62d2c07a21ea4db32d837de1f5765be2907fd709b263f5fd3c3b2c5f12da1646ad5d9ff6d2b9ea9f99ebf7
diff --git a/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
deleted file mode 100644
index e1bbeb4e5445..000000000000
--- a/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_QTHELP="true"
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma screen management library"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5/7"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# requires running session
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/wayland
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.6.0
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	dev-util/wayland-scanner
-"
diff --git a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
index 6758baa1b3a6..102411807edf 100644
--- a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
+++ b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Plasma screen management library"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5/7"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires running session
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 2ea69716b545..845edcd8014e 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -2,8 +2,6 @@ AUX libksysguard-5.22.80-no-detailed-mem-message.patch 1091 BLAKE2B 1c15fbea7e0f
 AUX libksysguard-5.24.5-fix-missing-gpu-sensors.patch 1276 BLAKE2B 530cef6db80e2553f54209fcc744161574a1a0f59801e9a6c7660360e858ea86fd0677b6f9c0cb38219d7e76fb637e6ce45701ff25175ccc926615f9197710eb SHA512 9db1f22330b8efba830f0e03288cfb6563adfdb86aa6f4aa668a9527ad326f7eb9f9e3284343a97f64622e244358f59445c2c820aaab5a2e8b166b129819a19f
 AUX libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch 1363 BLAKE2B e2d793bd5ee679a8ae28bb80570381d598db3c8d9b20b2198a3391c844b0f0e27f3863596bb2b08db715e5cd58ea5e02a50f470eefd0de55ffef43cb875095f7 SHA512 c00f77cab757a6fb7c8d09e0aea0b295370ef2b0ba7568f9945144e593a46e57811dfc4ae406479d8cf040e64419ae88ea21e24efd074eb02f2a2f1b2158f6a0
 AUX libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch 2454 BLAKE2B 7c0913db01d4e10491688a5b4ec5ccb26130781f7dd140aed0b6dbd356c52456b0e919f2441df91573a9b1153350c3a5abd38b0f05356d5df227289c5fd4cfa3 SHA512 f8054ca9558dad76c2c125ffb6237c1c492fbe2a4eb08b25a822f96b7abb50105954e7b627a662552941a8a6b97d2eb1b01166938848bbe86a6279ae67edac19
-DIST libksysguard-5.24.4.tar.xz 767300 BLAKE2B cfb42c1da82bb90c33ab14d87351e009759afd294b3cd44ab98f2310f0dba520f421c26d3db4f1031d8d8c6086e63b14eebcc3ceaa4db2d9479d6571c409450b SHA512 a43c10109ee36d4840fae30ef73209e0a0bf43c076e94d57642aa6f89aadb95928751281342e52f01357b2b1dde788c5d034c595e22f5fc6ce1c2da3979dc5c2
 DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5
-EBUILD libksysguard-5.24.4.ebuild 1827 BLAKE2B 70090e9b3a9d6a660c5a11673d850b7e947097174fd8fdf365d2c0d3cd58784f775e3124b47baaa2153ffdfc8ebdd6f369712682c0ceffd2ea558f35fd3ceaa8 SHA512 3ba7cf70b9c453c28deb1e4caa957c0a102542951eb02357ce3c03c1a09d228a4468033f4d580037d09f0daeffc69b3aef1eae98afa7e01818264347a5dc9462
-EBUILD libksysguard-5.24.5-r1.ebuild 1976 BLAKE2B e62676ef6029a181d229449dc1667682aac7f945ad751998e31e83e3dec7cc159fc146712d460e3948e89afec3c1a23b88cd4a748c61b6873d45c97a8e3be208 SHA512 93a6f20b3f3aec08b84d0ad854e9e942f1620662f94dc6e99774efff5daef663fa9175d9f9d47eb5ec299895eb4a28cbeb5502253b3a7411ab875b99e0a079d1
+EBUILD libksysguard-5.24.5-r1.ebuild 1973 BLAKE2B 709a4f85d07feecfd53109205d4aa660fc923bbd41ebf5c24dc08808037b365147574d91db7089f2dcfc6b591bc32c496c34b9a7e88548944cdb4985cf6d6aea SHA512 08f5cbae335dbb86bd979f2b9d99cea20b17f3d4325ed6db89b87914179c7a26c6030456327226fe1d39a585d7ee0177f4c8175c1566a231a658497f48a79c54
 MISC metadata.xml 611 BLAKE2B 7e821b5bc0966b855561677eb598ec5eca351955c79f40e2f8622981eb02a206a07b47aec23db6efea5e08edfa2546a01f7f953ed7c7c3dae46ac1fa3f8cfeaa SHA512 ebdb86fa4d523efa0fd614acd9b2275284fb8298a75532d6afb272fe92cd927486044074121811f34ec8096d6de331934413347d1ca6f0f137e5beda0cdfc302
diff --git a/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild
deleted file mode 100644
index 8a5ba3fd7afa..000000000000
--- a/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_DESIGNERPLUGIN="true"
-ECM_TEST="true"
-KFMIN=5.90.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Task management and system monitoring library"
-
-LICENSE="LGPL-2+"
-SLOT="5/9"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="webengine X"
-
-COMMON_DEPEND="
-	dev-libs/libnl:3
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	net-libs/libpcap
-	sys-apps/lm-sensors:=
-	sys-libs/libcap
-	sys-libs/zlib
-	webengine? (
-		>=dev-qt/qtwebchannel-${QTMIN}:5
-		>=dev-qt/qtwebengine-${QTMIN}:5
-	)
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-		x11-libs/libXres
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/ksysguard-5.21.90:5
-	!<kde-plasma/plasma-workspace-5.18.80:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package webengine Qt5WebChannel)
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package X X11)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	LC_NUMERIC="C" ecm_src_test # bug 695514
-}
diff --git a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
index 5e70bb4448e2..664a0d856123 100644
--- a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
 
 LICENSE="LGPL-2+"
 SLOT="5/9"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="webengine X"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest
index 37c188048484..b66a51237e38 100644
--- a/kde-plasma/libkworkspace/Manifest
+++ b/kde-plasma/libkworkspace/Manifest
@@ -1,6 +1,4 @@
 AUX libkworkspace-5.22.80-standalone.patch 4984 BLAKE2B e0f5c36ab657600326d0cbd29fe51c5ac6cf264caa7ec4c04473a2c5bf88113d8496b45618db103dd2e078efc1350b9fc613b25aeaa58bf0957d22ca4d37e5a0 SHA512 20c790d4860aec20b415c5c236537a5d8caf5666432c513adda0782694548320dc918c0d093ee0b716943df1fdab56c03a56f18ec691b0fc517443c35d0335ff
-DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
-EBUILD libkworkspace-5.24.4.ebuild 1323 BLAKE2B d9ab9b5cfc16e0bf7cd166e397a8d2cc7943da467bcca451ca51575a9615c028fe29ca8c2ecc340c5a7b364addc7e26749da9434e919a9e21cc9f818885e7108 SHA512 c3b583cabc1e62bee0f9c4cd8476d3ab523f4566ec3412035eb429a54b91479b953287e65f1d0203c4d77b2feb2400697d0f7b5333e2f2e7231a72dc652c16f4
-EBUILD libkworkspace-5.24.5.ebuild 1326 BLAKE2B cb4ff766c38da76d2911d83742d71c8374e6f1330a4729c708423b1ff14a25b5f0c87a9f31fda7354382d4522a8437a8c921f62e7bc8a3438c676f1977124e0c SHA512 cda025d5ee5821c0f4322471c6cc941679f72659a46a1b0c0190ea0c7c3c2c6bd844ea7e706e63090596dfbcedb903ff23fd0f4a52ec94773dd2218cc15b4570
+EBUILD libkworkspace-5.24.5.ebuild 1323 BLAKE2B d9ab9b5cfc16e0bf7cd166e397a8d2cc7943da467bcca451ca51575a9615c028fe29ca8c2ecc340c5a7b364addc7e26749da9434e919a9e21cc9f818885e7108 SHA512 c3b583cabc1e62bee0f9c4cd8476d3ab523f4566ec3412035eb429a54b91479b953287e65f1d0203c4d77b2feb2400697d0f7b5333e2f2e7231a72dc652c16f4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
deleted file mode 100644
index 14acef8df3b4..000000000000
--- a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Workspace library to interact with the Plasma session manager"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-"
-
-S="${S}/${PN}"
-
-src_prepare() {
-	# delete colliding libkworkspace translations, let ecm_src_prepare do its magic
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die
-		rm -rf po/*/docs || die
-		cp -a ../po ./ || die
-	fi
-
-	eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch"
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die
-	cat >> CMakeLists.txt <<- _EOF_ || die
-		ki18n_install(po)
-	_EOF_
-
-	ecm_src_prepare
-}
diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
index 7b3149edc1d7..14acef8df3b4 100644
--- a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
+++ b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Workspace library to interact with the Plasma session manager"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index 9cd5dcd0b83e..0b1becdaeb56 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,5 +1,3 @@
-DIST milou-5.24.4.tar.xz 48236 BLAKE2B 286f746a3fe632098531f03557b763f636390eb73e94c31bbb8e5aa70b7ec67066121544d327fdc5e2f669ffba9930bc6d1d3a546fb216e9bb7bf2493eb4bcb9 SHA512 ef41d274970e38f45e26bc986948e3ba49d0ef54a907e64fc36f15ed9369d3c4cd5e2566b25a2d3499b123cb0ec20eca9c777ab3a66248e6a5a824d7b7c4ae96
 DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c
-EBUILD milou-5.24.4.ebuild 830 BLAKE2B 3de1fe469638e9e1f85c24fd74267e1833236dc76049c643142c97e27537b236e5b62f437ec060048128cda39b5f6ec20051644c76c21ae7c1f8b82760b8bd13 SHA512 585c8a8364c845a66112cbb6285d5b34e6f271da84275861b51423345fdf392121c16e9d2da76f8e7bccb260d05026f29d3f26a880ad3229c252946f4117a8ca
-EBUILD milou-5.24.5.ebuild 833 BLAKE2B f9be933a514473f16973de6b3c70b4ede362e031c17497d6b87d1eeeb672f64cf41e3fa5e60908d3c21c60bb6ebef7e713cb6cb3f721d243b096afb66b7d9dd4 SHA512 a92b3df6f7b75611e45727685ec190f8f8fac63bdf806a60e08973b70af9bc1a99e38247f6d4a001ea540864bf00061dd45f8b1528e1258c68be45a6d9be8289
+EBUILD milou-5.24.5.ebuild 830 BLAKE2B 3de1fe469638e9e1f85c24fd74267e1833236dc76049c643142c97e27537b236e5b62f437ec060048128cda39b5f6ec20051644c76c21ae7c1f8b82760b8bd13 SHA512 585c8a8364c845a66112cbb6285d5b34e6f271da84275861b51423345fdf392121c16e9d2da76f8e7bccb260d05026f29d3f26a880ad3229c252946f4117a8ca
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/milou/milou-5.24.4.ebuild b/kde-plasma/milou/milou-5.24.4.ebuild
deleted file mode 100644
index f74c41e92e5c..000000000000
--- a/kde-plasma/milou/milou-5.24.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Dedicated search application built on top of Baloo"
-HOMEPAGE="https://invent.kde.org/plasma/milou"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/milou/milou-5.24.5.ebuild b/kde-plasma/milou/milou-5.24.5.ebuild
index 5aa3ceefc899..f74c41e92e5c 100644
--- a/kde-plasma/milou/milou-5.24.5.ebuild
+++ b/kde-plasma/milou/milou-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/milou"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index bb4de3137eb8..50374d9c9856 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,5 +1,3 @@
-DIST oxygen-5.24.4.tar.xz 4615036 BLAKE2B e6a6aea36d9de13ebf5bbbcb02be1631a86d415d7e838fd5d389bca8c6bc8ad34257f30d1bb040015bb1f0cf20611b54012072fb6ffe99aa0a3f4149d3028906 SHA512 dad2ef40a6daacf36e37bc6f5285229917b68e66c986cd4e73998a1caadfec0b078a2751ad59aa20d41f5a9ac3ebc1b94e5f5a89eba02523fdec3f28b21728cc
 DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2
-EBUILD oxygen-5.24.4.ebuild 1293 BLAKE2B 79bead91acf50c8451155d876ad12d1d93beb449992fe9ab127f28ef5803905d615a3c072052459f01ad22905603f80a339050c62896842dea62523ef38a2c31 SHA512 b779933fff22ea74877be1228ef8bfc51cc0d5ccc3dc582759fe252aea60883fdbdc96b0b6b201c9a05b4ecdb69c9e3fa831158d35f1d24d508404cb917edd00
-EBUILD oxygen-5.24.5.ebuild 1296 BLAKE2B 19666bf50571578887bf1a7986cc43323a83ed1a8872172edb94dbcf5f642c58f896bee017031062b9ee7a8e5d3819f73fc046c4c93dc73e71de3e9a554dfd53 SHA512 fd0e12c337f22bc4f1447c6e2b252398b8232a5f6d72a8db46bb01a463a0834820c2e97c4940e7fded27dd65f4c8b3bccec8826e0b8afa18b28c20c930dac989
+EBUILD oxygen-5.24.5.ebuild 1293 BLAKE2B 79bead91acf50c8451155d876ad12d1d93beb449992fe9ab127f28ef5803905d615a3c072052459f01ad22905603f80a339050c62896842dea62523ef38a2c31 SHA512 b779933fff22ea74877be1228ef8bfc51cc0d5ccc3dc582759fe252aea60883fdbdc96b0b6b201c9a05b4ecdb69c9e3fa831158d35f1d24d508404cb917edd00
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/oxygen/oxygen-5.24.4.ebuild b/kde-plasma/oxygen/oxygen-5.24.4.ebuild
deleted file mode 100644
index 1f0f9efb675b..000000000000
--- a/kde-plasma/oxygen/oxygen-5.24.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Oxygen visual style for the Plasma desktop"
-HOMEPAGE="https://invent.kde.org/plasma/oxygen"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="wayland"
-
-RDEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/frameworkintegration-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-plasma/kdecoration-${PVCUT}:5
-	x11-libs/libxcb
-	wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	>=kde-frameworks/kservice-${KFMIN}:5
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package wayland KF5Wayland)
-	)
-	ecm_src_configure
-}
diff --git a/kde-plasma/oxygen/oxygen-5.24.5.ebuild b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
index f5157fff7655..1f0f9efb675b 100644
--- a/kde-plasma/oxygen/oxygen-5.24.5.ebuild
+++ b/kde-plasma/oxygen/oxygen-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="wayland"
 
 RDEPEND="
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 6d95e2f068bd..74b43fe8b7dc 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-browser-integration-5.24.4.tar.xz 222496 BLAKE2B 098422fd62b8fc80c722a43d8c6854f35e651797d949a38741daa19512171988146db7fb5b9ef2a26001cec3ed3aef99d9109ecc2f09100c942e8d362239dd05 SHA512 999991a300676bd90a85bc4cc1f8364c351a62146876a8bef499ebd481cbf204ef712443960cf4aa8cfa1246285106a3a4eeb4d320c959afae109da79dc83871
 DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497
-EBUILD plasma-browser-integration-5.24.4-r1.ebuild 1159 BLAKE2B ec63dfd969d63f1b50be64e4a45de9c181fbbe5993f738eb9ce791c450edf4d7823dc9ad4863cb474b3e22eb685e5c06affc61890663116953139c9f9a60c831 SHA512 a1ff238f6724d44b38344dcabffcb15148b8e2f15d7466d823f30e4dc5f2fb88df6293cad009bf9605c1c9c20915aabb1506e338a2e220ac0d882c56bb6e3ed2
-EBUILD plasma-browser-integration-5.24.5.ebuild 1162 BLAKE2B 85c4f494c46d02492867055985cfdbf0bfbe69a4cbbbe9543cc410369a2c1e4c8c9f88760ca9358018f86cb62f934cdafa0bcfeda6314ddefa93e713b56ed6c7 SHA512 3180c24ded7ac967ac8c2582d03cefe7db391530a03070c5ed33c9441646d60841a5f0577364ece286a9b7fd47ea451ac7d21f56a9448e09bd419b043d6c4215
+EBUILD plasma-browser-integration-5.24.5.ebuild 1159 BLAKE2B ec63dfd969d63f1b50be64e4a45de9c181fbbe5993f738eb9ce791c450edf4d7823dc9ad4863cb474b3e22eb685e5c06affc61890663116953139c9f9a60c831 SHA512 a1ff238f6724d44b38344dcabffcb15148b8e2f15d7466d823f30e4dc5f2fb88df6293cad009bf9605c1c9c20915aabb1506e338a2e220ac0d882c56bb6e3ed2
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild
deleted file mode 100644
index 15e44d6aa3de..000000000000
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions"
-HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
-
-LICENSE="GPL-3+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla"
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
index fe7f9aef2a63..15e44d6aa3de 100644
--- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
+++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration"
 
 LICENSE="GPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index ed59724e3b2d..987628947428 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,7 +1,4 @@
-AUX plasma-desktop-5.24.4-folderview-icons-per-resolution.patch 4738 BLAKE2B 115a79699c3508224a7c7cd4e8156ae8303a30f7d830e5a01b8ce3acba31778ec06818a6b338611172a5a6c76d57694d29e6baf673de24d197b7b65c4037519a SHA512 95e1234f6ccd170082705f7a71e7aad95136849e45ed36949cbfc0ddbaaa4433bad96abfe1fc4a9544d9be9105cbcebb197ba57e2aea3f081ccea0d7185a1b4a
-DIST plasma-desktop-5.24.4.tar.xz 6239980 BLAKE2B 0b8af5d596e277d202a9c088aa561ce3f0c3602ca781c807b4082f37da4269176429946edf0665ebd9bc6046cd6b0a97baf5a67ec3c0194c23d6fe237a56c18d SHA512 9d6a8c50a85d7f59b89a13753d9a7072df5e8bd1e726bf1037c4cf8d4d43046c2076c8993dffc1f5cec7f7a113832dd14f836e9b47b879f6352f3c30f4b5c408
 DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.24.4-r1.ebuild 5268 BLAKE2B 0345d026a9a0198c3e914420ebdf127c427ded81dde62edb1de8a0e7375dd90cd339962fbc25f17013fe1a2bc83b7e7236c92838e93e00ed1494c278681fbcd0 SHA512 e74cfa92e9d93f01cb15050fc7933dd9eaf0700032d06a3056ff86b49f3aca7c6d9be309644ef8d3a7af183d2a79a5d276c4298c70b065663481600282f8b454
-EBUILD plasma-desktop-5.24.5.ebuild 5188 BLAKE2B 9edcb388467c24bef79ec2d7529d0d4b7572c4d0d00e3680ab171372d0ae40dd874db98dad23f3a4b270436c4ffe46b1518abc2a0e2b516403d3ea07b4b1bf71 SHA512 c42dcbc58beb412604860918369287caef1a5aa0551de3602f65866ae42ba94a3f5ac92b4d7c4255791c1745075216e1f2c898d887e929a2d08122a76098803d
+EBUILD plasma-desktop-5.24.5.ebuild 5185 BLAKE2B 1cbc7280829c1b8f7de67dae950d14cf0eda465d255e952f1121bc8fd5116d44bfdc2e5849079346152a6c8fbfc3988ea785df0844b5d02bdf86aa9615e83e7d SHA512 e323a68fde0cfef29cdfc5b6cc8a64f7a8bca9ca224b895ead0eb620ae1c163b292717df0ba3359cb84fb77dfc5316f520bd43aa4013b31cafdb5caec8f884b3
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
deleted file mode 100644
index fce29f49536a..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001
-From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com>
-Date: Tue, 12 Apr 2022 15:01:15 +0000
-Subject: [PATCH] Folder View: save desktop containment icon positions on a
- per-resolution basis
-
-BUG: 360478
-BUG: 354802
-FIXED-IN: 5.24.5
-(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772)
----
- .../package/contents/ui/FolderView.qml        | 15 +--------
- .../package/contents/ui/FolderViewLayer.qml   | 32 +++++++++++++++++--
- .../desktop/plugins/folder/positioner.cpp     |  1 +
- 3 files changed, 31 insertions(+), 17 deletions(-)
-
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index 218a3da77..72ae4903a 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -30,6 +30,7 @@ FocusScope {
-     property alias currentIndex: gridView.currentIndex
-     property alias url: dir.url
-     property alias status: dir.status
-+    property alias perStripe: positioner.perStripe
-     property alias positions: positioner.positions
-     property alias errorString: dir.errorString
-     property alias dragging: dir.dragging
-@@ -828,20 +829,6 @@ FocusScope {
-                     }
-                 }
- 
--                onFlowChanged: {
--                    // FIXME TODO: Preserve positions.
--                    if (positioner.enabled) {
--                        positioner.reset();
--                    }
--                }
--
--                onLayoutDirectionChanged: {
--                    // FIXME TODO: Preserve positions.
--                    if (positioner.enabled) {
--                        positioner.reset();
--                    }
--                }
--
-                 onCurrentIndexChanged: {
-                     positionViewAtIndex(currentIndex, GridView.Contain);
-                 }
-diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml
-index 3f9b29937..f2044e1b0 100644
---- a/containments/desktop/package/contents/ui/FolderViewLayer.qml
-+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml
-@@ -29,6 +29,8 @@ FocusScope {
-     property alias overflowing: folderView.overflowing
-     property alias flow: folderView.flow
- 
-+    property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height)
-+
-     readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons")
- 
-     focus: true
-@@ -178,6 +180,26 @@ FocusScope {
-         }
-     }
- 
-+    function getPositions() {
-+        try {
-+            var allPositions = JSON.parse(plasmoid.configuration.positions);
-+        } catch (err) {
-+            var allPositions = {};
-+            allPositions[resolution] = plasmoid.configuration.positions;
-+        }
-+        return allPositions[resolution] || "";
-+    }
-+
-+    function savePositions(positions) {
-+        try {
-+            var allPositions = JSON.parse(plasmoid.configuration.positions);
-+        } catch (err) {
-+            var allPositions = {};
-+        }
-+        allPositions[resolution] = positions;
-+        plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort());
-+    }
-+
-     Connections {
-         target: plasmoid.configuration
- 
-@@ -211,7 +233,7 @@ FocusScope {
-         }
- 
-         function onPositionsChanged() {
--            folderView.positions = plasmoid.configuration.positions;
-+            folderView.positions = getPositions();
-         }
-     }
- 
-@@ -241,12 +263,16 @@ FocusScope {
-         }
- 
-         onPositionsChanged: {
--            plasmoid.configuration.positions = folderView.positions;
-+            savePositions(folderView.positions);
-+        }
-+
-+        onPerStripeChanged: {
-+            folderView.positions = getPositions();
-         }
- 
-         Component.onCompleted: {
-             folderView.sortMode = plasmoid.configuration.sortMode;
--            folderView.positions = plasmoid.configuration.positions;
-+            folderView.positions = getPositions();
-         }
-     }
- 
-diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp
-index 859c16754..3b2df8c5a 100644
---- a/containments/desktop/plugins/folder/positioner.cpp
-+++ b/containments/desktop/plugins/folder/positioner.cpp
-@@ -854,6 +854,7 @@ void Positioner::applyPositions()
-         }
- 
-         if (pos > m_perStripe) {
-+            qDebug() << "Some items did not fit, rearranging";
-             name = positions.at(offset);
- 
-             if (!sourceIndices.contains(name)) {
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
deleted file mode 100644
index 5fedd708f1d5..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-1"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
-
-COMMON_DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/attica-${KFMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kdelibs4support-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	x11-libs/libX11
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb[xkb]
-	x11-libs/libxkbfile
-	emoji? (
-		app-i18n/ibus[emoji]
-		dev-libs/glib:2
-		media-fonts/noto-emoji
-	)
-	ibus? (
-		app-i18n/ibus
-		dev-libs/glib:2
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	kaccounts? (
-		kde-apps/kaccounts-integration:5
-		net-libs/accounts-qt
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-plasma/user-manager
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=kde-plasma/oxygen-${PVCUT}:5
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	x11-misc/xdg-user-dirs
-	kaccounts? ( net-libs/signon-oauth2 )
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use ibus; then
-		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
-			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
-	fi
-
-	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
-		cmake_comment_add_subdirectory emojier
-
-	# TODO: try to get a build switch upstreamed
-	if ! use scim; then
-		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
-		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		$(cmake_use_find_package kaccounts AccountsQt5)
-		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
-	fi
-
-	ecm_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# test_kio_fonts needs D-Bus, bug #634166
-	# lookandfeel-kcmTest is unreliable for a long time, bug #607918
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "screen reader support" app-accessibility/orca
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index 302d9b8d656b..ae1f627cb572 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest
index 6e12c19f4caf..bcd3dccfc6fb 100644
--- a/kde-plasma/plasma-disks/Manifest
+++ b/kde-plasma/plasma-disks/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-disks-5.24.4.tar.xz 88244 BLAKE2B 71035d47373eb97cff2355a6fc22faac149874d922d6f857ab6f669af2f36ceb750194d9d4679c8218e85b2e5f7b3e293b48c0fb2838d3ca15029ca66f3ec789 SHA512 735d28c6c50515ae7af7a3df4f2ba586d7273d11e8ba96e6546685f6dbf29917001854ba9fa8f298b15f50ec8b26d51d04771874074eeb808f29f5112d07758f
 DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe
-EBUILD plasma-disks-5.24.4.ebuild 1037 BLAKE2B 30fddeded7e8210e906c063c2c3aa4c48d5db4c3d2a335efb03c37b8ed6534f1fc4c347922729a6ccb6279dd16b8a7208d66af12feb4d183a105e10cf03153f0 SHA512 ed5de773284167c2fc7e6b0f9d628126596480e831d9d7bd5be5a30f6972d71b19e7ad945660be20c0152ab25e5586dec69d7fce0ea837af571da13410670a3a
-EBUILD plasma-disks-5.24.5.ebuild 1040 BLAKE2B 9fd7eda16b7045a7abb5a8c02ecc17e65df2d8ca9a85da5791b8839805c7c15c28d8976b0cdb6c85cc94cabdaa28b8424c65fc8071115202ade1d0f4e3672630 SHA512 2515028289a9eb3d8f916c190047fdcc675d8a721c39471620eccca711597df7e75fd0602ac1c4374d17b65a78a9a44f50e6e00abf24e9d3d51e2a4de1022b5f
+EBUILD plasma-disks-5.24.5.ebuild 1037 BLAKE2B 30fddeded7e8210e906c063c2c3aa4c48d5db4c3d2a335efb03c37b8ed6534f1fc4c347922729a6ccb6279dd16b8a7208d66af12feb4d183a105e10cf03153f0 SHA512 ed5de773284167c2fc7e6b0f9d628126596480e831d9d7bd5be5a30f6972d71b19e7ad945660be20c0152ab25e5586dec69d7fce0ea837af571da13410670a3a
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild
deleted file mode 100644
index 857b4e21996c..000000000000
--- a/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="true"
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	sys-apps/smartmontools
-"
-RDEPEND="${DEPEND}
-	kde-plasma/kinfocenter:5
-"
diff --git a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
index e6d4c37ca87b..857b4e21996c 100644
--- a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
+++ b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-disks"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest
index df8615a7cee0..a6ddf8557e44 100644
--- a/kde-plasma/plasma-firewall/Manifest
+++ b/kde-plasma/plasma-firewall/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-firewall-5.24.4.tar.xz 346676 BLAKE2B bbd7e460910b6437c29871814c11c08bb2cb36976a92c70cb7afafbf865d99db73d6ef2c0f0502d990df6c4c72c789f5153ceecd732b2dcb994db330035448d5 SHA512 320066a2339eae7113a3a8b50a01d8ef11c4ba2e9bed48a4f919cae0d1964246ad0beef02f3bc26c8e7ea63214037683552c1004d8b98cfcece52e2ee131b3cc
 DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1
-EBUILD plasma-firewall-5.24.4.ebuild 1591 BLAKE2B f7098d219faab90a6df6fbd3011c9a976f9d8133df55f2c97899afd2bbb690872bd2388139dcb1ce43427088eed3f4aea231d5139b35bfc955205544595fda89 SHA512 34fd88f2f9f59473dc0545e176ecc405ac8a82435af488a79d1cda0bdeeab6a712703c36a3057a1bf660d5bbdca59624fc7d196f77c8e1080e1d3234d318ef4c
-EBUILD plasma-firewall-5.24.5.ebuild 1594 BLAKE2B caeb1be61fca345443e8dce1aa242885d70cea8d99fa6e9b6a8a4befab2bbc948f7afeb772774e9975044f84ed76fae933efe20215a4949d3a040ed4468feb87 SHA512 9253882d963e67a3d33733037d615deaad6ad5c46774eb83a5742e869e0f77a644452fb4512066ac51a042735c2dc255f055dfc03bdd3cced9897bef926490b3
+EBUILD plasma-firewall-5.24.5.ebuild 1591 BLAKE2B f7098d219faab90a6df6fbd3011c9a976f9d8133df55f2c97899afd2bbb690872bd2388139dcb1ce43427088eed3f4aea231d5139b35bfc955205544595fda89 SHA512 34fd88f2f9f59473dc0545e176ecc405ac8a82435af488a79d1cda0bdeeab6a712703c36a3057a1bf660d5bbdca59624fc7d196f77c8e1080e1d3234d318ef4c
 MISC metadata.xml 481 BLAKE2B dccce364cb3100483c9d5932a250f05575badc6c66a0868a706817c3da4be16fabfdc584fea5d6fe45284da282b2123b1b7985e7813264d27a0338dcb76428ec SHA512 f3925caf241daf159b2b19ea70c4a177f023487ba3fef866e7fc529563b045664debaafb0a9978d05882b69457d9dada314c3109803eaf2e8bb244ac5f9b8f3d
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild
deleted file mode 100644
index 5093bf4f5120..000000000000
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org python-single-r1
-
-DESCRIPTION="Plasma frontend for Firewalld or UFW"
-HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="firewalld +ufw"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	firewalld? ( net-firewall/firewalld )
-	ufw? ( net-firewall/ufw )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	# this kind of cmake magic doesn't work for us at all.
-	sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \
-		-i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_FIREWALLD_BACKEND=$(usex firewalld)
-		-DBUILD_UFW_BACKEND=$(usex ufw)
-	)
-	ecm_src_configure
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	if ! has_version sys-apps/systemd; then
-		ewarn "${PN} is not functional without sys-apps/systemd at this point."
-		ewarn "See also: https://bugs.gentoo.org/778527"
-	fi
-}
diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
index 5ac26b7e39d1..5093bf4f5120 100644
--- a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
+++ b/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/network/plasma-firewall"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="firewalld +ufw"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )"
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 9decb20523aa..43384daaa621 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-integration-5.24.4.tar.xz 83744 BLAKE2B 4784ccde0eb5f9075cc47c1b9c718971a36b025f9e7a2c404af96dad07d71300ca1b7a0bfdf9a2c30391526f8fb2a2156d4a96e9cf098d09a649f94e665366d7 SHA512 a4262cca85bac798c5afd29543cae7a670b346347f00f29a693d3263cde669931fdf981fa64c8632bb0ab447b758a24795c343b99b5b7acc166da14db66543a1
 DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348
-EBUILD plasma-integration-5.24.4.ebuild 1240 BLAKE2B d6cfe8f198ecbe44950e298c352f51950624edae46835690e1bd435b8eff08507031dccd0a85bf2f9370e52de4a81d819e1764c3db81b0a78100953caf4ab5bd SHA512 1e5e77fd4c53ddead9558a6845d9eac6f3d22bdfd3c3d713a07b3dea57da8e5d4a797254310ebe7db9bdda6f059fd3974df34955ee464475c2cda65a01c2768f
-EBUILD plasma-integration-5.24.5.ebuild 1243 BLAKE2B f68ae920d8e9692be70d0c47c7b316380ae644960e9168a948e20f80c221b8928f98e195ad8382c06a512a6371cef8a7729b9c5e60ec1fdc8f5fe105c97bb5c3 SHA512 163818240a34f078037807c672ba50a0d7f198a6313b511d179383cb2c075fcd99fd2afcae666fd2ea2fe7ebe4930412f378eca2eacb8ec06cd3866fe1746ac4
+EBUILD plasma-integration-5.24.5.ebuild 1240 BLAKE2B d6cfe8f198ecbe44950e298c352f51950624edae46835690e1bd435b8eff08507031dccd0a85bf2f9370e52de4a81d819e1764c3db81b0a78100953caf4ab5bd SHA512 1e5e77fd4c53ddead9558a6845d9eac6f3d22bdfd3c3d713a07b3dea57da8e5d4a797254310ebe7db9bdda6f059fd3974df34955ee464475c2cda65a01c2768f
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild
deleted file mode 100644
index d598ad5a2941..000000000000
--- a/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-# requires running kde environment
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[dbus]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	x11-libs/libXcursor
-	x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
-	media-fonts/hack
-	media-fonts/noto
-"
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
index 3e4edfe68b7a..d598ad5a2941 100644
--- a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces"
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 # requires running kde environment
diff --git a/kde-plasma/plasma-meta/Manifest b/kde-plasma/plasma-meta/Manifest
index 7e87de19c816..400d80d59698 100644
--- a/kde-plasma/plasma-meta/Manifest
+++ b/kde-plasma/plasma-meta/Manifest
@@ -1,3 +1,2 @@
-EBUILD plasma-meta-5.24.4.ebuild 4036 BLAKE2B 7b64ff63cef53f7b5618c9268d65eb6209aeeb65996cd886e35401bfc83a6097d261bce9cfc3f4229615628583260623b877feb69883839fcf8701544fba441c SHA512 91b8220e579867a7b7ddf3e4d2c358998e00cf8ffce9bab260f2a12ef3764d50c4b54c6300dfea84a0735feed6e1a84d94b4eb162486ce0ada030ce64e264074
-EBUILD plasma-meta-5.24.5.ebuild 4039 BLAKE2B f715e80fe1e1e3c4e81dfbdabe5ef3f3db7c9eddafeb271d941b7966af63770ddac4278d8722249360a4ec547006e6903e68c1444eb963d3375924fea356ddb8 SHA512 7c287864ff69a0eacf2ef013205cfb7af76c0986d129a0dd119bfae779f9f63a89cd8b28dd2c9551790698135867580202ea9a8073db1021019dd20267647870
+EBUILD plasma-meta-5.24.5.ebuild 4036 BLAKE2B 7b64ff63cef53f7b5618c9268d65eb6209aeeb65996cd886e35401bfc83a6097d261bce9cfc3f4229615628583260623b877feb69883839fcf8701544fba441c SHA512 91b8220e579867a7b7ddf3e4d2c358998e00cf8ffce9bab260f2a12ef3764d50c4b54c6300dfea84a0735feed6e1a84d94b4eb162486ce0ada030ce64e264074
 MISC metadata.xml 2254 BLAKE2B 77d3bf75c22304a0b40847f1e7057d800ad92ddbfd5950f3c1fa5354b803d23c108333f07e2e5ffe552a951ae598d6d750e5060b0a05d9245b8518c7a0179f8d SHA512 fdcb3f598bd4cec4d67b9be27ae6cca4fb49ac9292eb3e74a0990654ec74f1aa180f83ae0682049bda231c1ffd4d62e8390f15cf33e78b24116e84237bce8932
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild
deleted file mode 100644
index 28ee1d06a038..000000000000
--- a/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Merge this to pull in all Plasma 5 packages"
-HOMEPAGE="https://kde.org/plasma-desktop/"
-
-LICENSE="metapackage"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
-+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
-+kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
-systemd thunderbolt +wallpapers"
-
-REQUIRED_USE="^^ ( elogind systemd )"
-
-RDEPEND="
-	>=kde-plasma/breeze-${PV}:${SLOT}
-	>=kde-plasma/kactivitymanagerd-${PV}:${SLOT}
-	>=kde-plasma/kde-cli-tools-${PV}:${SLOT}
-	>=kde-plasma/kdecoration-${PV}:${SLOT}
-	>=kde-plasma/kdeplasma-addons-${PV}:${SLOT}
-	>=kde-plasma/kgamma-${PV}:${SLOT}
-	>=kde-plasma/khotkeys-${PV}:${SLOT}
-	>=kde-plasma/kinfocenter-${PV}:${SLOT}
-	>=kde-plasma/kmenuedit-${PV}:${SLOT}
-	>=kde-plasma/kscreen-${PV}:${SLOT}
-	>=kde-plasma/kscreenlocker-${PV}:${SLOT}
-	>=kde-plasma/ksshaskpass-${PV}:${SLOT}
-	>=kde-plasma/ksystemstats-${PV}:${SLOT}
-	>=kde-plasma/kwayland-integration-${PV}:${SLOT}
-	>=kde-plasma/kwayland-server-${PV}:${SLOT}
-	>=kde-plasma/kwin-${PV}:${SLOT}
-	>=kde-plasma/kwrited-${PV}:${SLOT}
-	>=kde-plasma/layer-shell-qt-${PV}:${SLOT}
-	>=kde-plasma/libkscreen-${PV}:${SLOT}
-	>=kde-plasma/libksysguard-${PV}:${SLOT}
-	>=kde-plasma/milou-${PV}:${SLOT}
-	>=kde-plasma/oxygen-${PV}:${SLOT}
-	>=kde-plasma/plasma-desktop-${PV}:${SLOT}
-	>=kde-plasma/plasma-integration-${PV}:${SLOT}
-	>=kde-plasma/plasma-systemmonitor-${PV}:${SLOT}
-	>=kde-plasma/plasma-workspace-${PV}:${SLOT}
-	>=kde-plasma/polkit-kde-agent-${PV}:${SLOT}
-	>=kde-plasma/powerdevil-${PV}:${SLOT}
-	>=kde-plasma/systemsettings-${PV}:${SLOT}
-	sys-apps/dbus[elogind?,systemd?]
-	sys-auth/polkit[systemd?]
-	sys-fs/udisks:2[elogind?,systemd?]
-	bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
-	browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
-	colord? ( x11-misc/colord )
-	crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
-	crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
-	desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} )
-	discover? ( >=kde-plasma/discover-${PV}:${SLOT} )
-	display-manager? (
-		sddm? (
-			>=kde-plasma/sddm-kcm-${PV}:${SLOT}
-			x11-misc/sddm[elogind?,systemd?]
-		)
-		!sddm? ( x11-misc/lightdm )
-	)
-	elogind? ( sys-auth/elogind[pam] )
-	grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} )
-	gtk? (
-		>=kde-plasma/breeze-gtk-${PV}:${SLOT}
-		>=kde-plasma/kde-gtk-config-${PV}:${SLOT}
-		x11-misc/appmenu-gtk-module
-	)
-	handbook? ( kde-apps/khelpcenter:5 )
-	kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} )
-	legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} )
-	networkmanager? (
-		>=kde-plasma/plasma-nm-${PV}:${SLOT}
-		net-misc/networkmanager[elogind?,systemd?]
-	)
-	plymouth? (
-		>=kde-plasma/breeze-plymouth-${PV}:${SLOT}
-		>=kde-plasma/plymouth-kcm-${PV}:${SLOT}
-	)
-	pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} )
-	sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} )
-	smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
-	systemd? (
-		sys-apps/systemd[pam]
-		firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
-	)
-	thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
-	wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} )
-"
-# Optional runtime deps: kde-plasma/plasma-desktop
-RDEPEND="${RDEPEND}
-	accessibility? ( app-accessibility/orca )
-"
-
-pkg_postinst() {
-	has_version sys-auth/consolekit || return
-	ewarn "An existing installation of sys-auth/consolekit was detected even though"
-	ewarn "${PN} was configured with USE $(usex elogind elogind systemd)."
-	ewarn "There can only be one session manager at runtime, otherwise random issues"
-	ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf"
-	ewarn "or package.use and remove sys-auth/consolekit before raising bugs."
-	ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE"
-}
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
index 9a3d27c702c5..28ee1d06a038 100644
--- a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://kde.org/plasma-desktop/"
 
 LICENSE="metapackage"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt
 +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook
 +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index c1e220ffff07..38dd7937203c 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-nm-5.24.4.tar.xz 926080 BLAKE2B 4ae2ae273572b60e6c4d88658f2247843921cb59060d1489c00388d4b224e66f6278f47009ba2a866ca7d725bba6c567839a4610c8a8123191511c048998ee42 SHA512 2a28f7879a3e90111ab43d6c30d7f191dfbd58dbcac1e2415387f054674cebc28e2aaeb5beffe448c1bc4f698bb1212b757746dc1e4f5d78a1c2e094895eae85
 DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8
-EBUILD plasma-nm-5.24.4.ebuild 2451 BLAKE2B 339674e0e06b01cc8a8358675de8182f43aec19f01f1752280e8a9ef2ec055aa21819820259c7b456c930889f75af7043be95513deb613b1678fefe44da6d88e SHA512 a613a33b4ab8ab782fcc2ecfef7e8b9d40f8637edcb4256f245fb270d2c54064997ddc10e490c2d97a9970588b69ac596cc344084716acbb8ca77db0bcc8f782
-EBUILD plasma-nm-5.24.5.ebuild 2454 BLAKE2B c0462e868751818539af1afe662d1edcac88c6126ff54389f96d5d4000956e707f1507c64f6523b355fec833577745474532383baf23a7937586ce95bb29889b SHA512 033b8e26f1d33f0bda8d02e8ba6a33fa6f40393d9d394ea5414b011840c8ae74b391be79200f8f2e8f8cafdc5c3fb17a4265e41506dbf1fc7863db3addde3bac
+EBUILD plasma-nm-5.24.5.ebuild 2451 BLAKE2B 339674e0e06b01cc8a8358675de8182f43aec19f01f1752280e8a9ef2ec055aa21819820259c7b456c930889f75af7043be95513deb613b1678fefe44da6d88e SHA512 a613a33b4ab8ab782fcc2ecfef7e8b9d40f8637edcb4256f245fb270d2c54064997ddc10e490c2d97a9970588b69ac596cc344084716acbb8ca77db0bcc8f782
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild
deleted file mode 100644
index 65f17f90aad8..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	ecm_src_prepare
-
-	# TODO: try to get a build switch upstreamed
-	if ! use openconnect; then
-		sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
index 2069ad424702..65f17f90aad8 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index a0d97ba1883f..e70e91e993ba 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-pa-5.24.4.tar.xz 132860 BLAKE2B 034716472ac2b2d0c35005b95457b75f6517d5a51cb94df57bec5b34a5f9785f1784f819b74f1ca330af4be58f3b665d3b26942976b9cd18ba4621873be86931 SHA512 37662d46928e5e086ea6e9d681903d70a2c673207c0c5b692dac01d583d38e14a79f185088a8f7db88e655ef16d62432771acc1cec9c923d22299f7b1da0749d
 DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1
-EBUILD plasma-pa-5.24.4.ebuild 952 BLAKE2B eef87ad07adfabadd99ff8cec30c6e7aa5201cc6e599b1e4f833c42523914ea40b21562cc996a55504fa94f69650e84985a222c4a19f309aad12d07fcf9a9ce5 SHA512 b11a42155850d9b4642fc861e8e8cfd3046b5d4fd926c6d93ca163a9eed7bb6083a50e173743176c99bdc0e8cdb07f01832c93a8a5013d241dd22d1d6ae33e04
-EBUILD plasma-pa-5.24.5.ebuild 955 BLAKE2B 70b5dc560a6f995ee731dfaafc500a1f54e74a813a79cab5410bd3a9f69f32684f954b9eb9213330a11ca0ee7ba0122a0beca9e6bc7389df2b7a85b5863886ff SHA512 7f8f79500b5838eb4238e13f660717e1a38fe2cd0e50b85c6f56c28e5eebfc9b0a608954cd2abc8993c9afd2331f5f32ebe87004f3f10006584790ab7e41ae88
+EBUILD plasma-pa-5.24.5.ebuild 952 BLAKE2B eef87ad07adfabadd99ff8cec30c6e7aa5201cc6e599b1e4f833c42523914ea40b21562cc996a55504fa94f69650e84985a222c4a19f309aad12d07fcf9a9ce5 SHA512 b11a42155850d9b4642fc861e8e8cfd3046b5d4fd926c6d93ca163a9eed7bb6083a50e173743176c99bdc0e8cdb07f01832c93a8a5013d241dd22d1d6ae33e04
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild
deleted file mode 100644
index f61ca444d701..000000000000
--- a/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	media-libs/libcanberra
-	media-sound/pulseaudio
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	|| (
-		media-video/pipewire
-		media-sound/pulseaudio-daemon
-		media-sound/pulseaudio[daemon(+)]
-	)
-	x11-themes/sound-theme-freedesktop
-"
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
index 3a401af81cad..f61ca444d701 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Plasma applet for audio volume management using PulseAudio"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 0977e095eef2..eb609950235c 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-sdk-5.24.4.tar.xz 261172 BLAKE2B c195814d62cfa8d22df67e726a11004e7a3530b0eec358a7b90270b09d525ef8817602a0dfac974e097c8b62f417af688a0b0173ca95868443585d267fefce2b SHA512 c531f4df314b25f7e34495a4c26189a5c83065523935a20ff482ddd22df7b922dd06784a218d41817bd49edef3bb1b41c09bfdd26aa806914a40781210d25690
 DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8
-EBUILD plasma-sdk-5.24.4.ebuild 1261 BLAKE2B 7474b8271aea4e5639335a0d09d8bef2c86d52f845a9bae5f19149c0ddb3d300b71c5f5311c684e6ff0759ca93cce939272f42eee4775da65c02e95a96222a3b SHA512 ab98f400066bfb76c8c315fbd346fecb27ec60995e47559c62f8ef03960df59aa9f3025d430b1d041d00a2401f337fcca5a5c18ea6b6efc260e1b4466bb4b5fb
-EBUILD plasma-sdk-5.24.5.ebuild 1264 BLAKE2B dc660adba19ef537efa455f269e6ed2ec776f11d63992fd3d2d24c49b4a7cc11b44ea8c0babc6b3abac97b740a0ded2667edef93a586912674a0285bcc28a18a SHA512 e6b4f8895578940997a22ea3eb8cbabef503497262cfad62321e4a0f6dafe27ab9cf308dad13aa86ce1bce052d0e1dd6cfcba1c963cc58f44854f10a0086ad08
+EBUILD plasma-sdk-5.24.5.ebuild 1261 BLAKE2B 7474b8271aea4e5639335a0d09d8bef2c86d52f845a9bae5f19149c0ddb3d300b71c5f5311c684e6ff0759ca93cce939272f42eee4775da65c02e95a96222a3b SHA512 ab98f400066bfb76c8c315fbd346fecb27ec60995e47559c62f8ef03960df59aa9f3025d430b1d041d00a2401f337fcca5a5c18ea6b6efc260e1b4466bb4b5fb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild
deleted file mode 100644
index 305df908068b..000000000000
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="optional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Useful applications for Plasma development"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-"
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
index 7aeb98067ec4..305df908068b 100644
--- a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
+++ b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Useful applications for Plasma development"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest
index 525314a01fb2..eb44406fd3a1 100644
--- a/kde-plasma/plasma-systemmonitor/Manifest
+++ b/kde-plasma/plasma-systemmonitor/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-systemmonitor-5.24.4.tar.xz 151840 BLAKE2B d0c8f3ab7881650b9bf38218cfeff78fbba0194a6fee80d79649f8ec12136082d86ec6153aa91815d2916416a9d641fa1ab7533d0f75c372336bbe3ef5b62df1 SHA512 13d489865df36bbe9a1465d7efd5603442144492781d0a5102e395f80f50b31d0519953962a0c3b2b9ff199c05daf20e9d7828ae42ce2335714c31bb6ff9f2c1
 DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d
-EBUILD plasma-systemmonitor-5.24.4.ebuild 1196 BLAKE2B fa7acad855f435430411030c3faf6998ac54e1e963c2af47f501a5126a5fa6730f6ce2de8017604f8a723c57fe9fcade6c9c703c3b2b7e0d997b3be1e9f3be0b SHA512 6976406a77aa2e2d21c4377ea4fb2fd0d41cee25f50ff8b13257eaa5ac4c05d792cb35a0dbd892ca7db0f651c72d299932241064b044fd6b53d887996ce2402c
-EBUILD plasma-systemmonitor-5.24.5.ebuild 1199 BLAKE2B 96783695175ef7c3c930f796515a413f16af19a02f19a2d433c7599a7e1f27069825287ce77ad8617f73dfb4ef61ab3d581c27bea2f9a0c8deb353fe3821e65f SHA512 1b90add832596d4779c740aa3622f3d08c4c5d2e9f637ec15cd5a5e4ba2873346d12418187a57266dc34f2ea7f76dc8b70cdc5535350800da9718caf22ce176d
+EBUILD plasma-systemmonitor-5.24.5.ebuild 1196 BLAKE2B fa7acad855f435430411030c3faf6998ac54e1e963c2af47f501a5126a5fa6730f6ce2de8017604f8a723c57fe9fcade6c9c703c3b2b7e0d997b3be1e9f3be0b SHA512 6976406a77aa2e2d21c4377ea4fb2fd0d41cee25f50ff8b13257eaa5ac4c05d792cb35a0dbd892ca7db0f651c72d299932241064b044fd6b53d887996ce2402c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild
deleted file mode 100644
index ed93a083cd93..000000000000
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.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
-
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.90.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Monitor system sensors, process information and other system resources"
-HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
-
-LICENSE="|| ( GPL-3 GPL-2 )"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/ksystemstats-${PVCUT}:5
-"
diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
index d39879f4df9c..ed93a083cd93 100644
--- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
+++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/"
 
 LICENSE="|| ( GPL-3 GPL-2 )"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest
index 4f03a27bbc01..654cbe62ed68 100644
--- a/kde-plasma/plasma-thunderbolt/Manifest
+++ b/kde-plasma/plasma-thunderbolt/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-thunderbolt-5.24.4.tar.xz 66724 BLAKE2B 339a4fd20ddd8032736d84e2247b0ed52f9a9231bd36c2f4c91defd09b8f3997d5c13642319fdfaa3e96921fbadbff94da6450d417f6e31f6fe675f72e63686d SHA512 eb5af8c87852fdd0089cc48675c572887ff1d0d63b2a68d7e2d28e22890f93a4697575f56b76fc3a135a81cd721ffef0fab6d274d862d431fd6daafc79d621be
 DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5
-EBUILD plasma-thunderbolt-5.24.4.ebuild 895 BLAKE2B 71a3848daf0e97d27451b609147470a73b4763c13f7fa42e78226da6b585879050acaa02b057df5ac2d0d14183c467c370d055431571e9f2adc1f8619927abe9 SHA512 6d7592a1a68819f75cbe87b1bafbc2b162eb4a4095b7107c43a5387573e036e48686b16279c983acfa082f9b4cd669c880d674634edf52612cca227f22120e10
-EBUILD plasma-thunderbolt-5.24.5.ebuild 897 BLAKE2B 88c6f4ef3de0fe510da8681e6cdb11466899e446b67664792466fe62ec8de4714de4438559dcd71fccdd65beda88d95d6e7f36dcccc519986b35f2ce3a4d0300 SHA512 738d5b60faab9c39d9204b5e1a7e886f93444c30db21871742ff35c5b14adcbb59aac8df06d6f1a09aef44f467910a1a11819ce883deef4b7009cd3aa91ddb4c
+EBUILD plasma-thunderbolt-5.24.5.ebuild 895 BLAKE2B 71a3848daf0e97d27451b609147470a73b4763c13f7fa42e78226da6b585879050acaa02b057df5ac2d0d14183c467c370d055431571e9f2adc1f8619927abe9 SHA512 6d7592a1a68819f75cbe87b1bafbc2b162eb4a4095b7107c43a5387573e036e48686b16279c983acfa082f9b4cd669c880d674634edf52612cca227f22120e10
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild
deleted file mode 100644
index 346585e6911a..000000000000
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma integration for controlling Thunderbolt devices"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
-
-LICENSE="|| ( GPL-2 GPL-3+ )"
-SLOT="5"
-KEYWORDS="amd64 ~riscv x86"
-IUSE=""
-
-# tests require DBus
-RESTRICT="test"
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	sys-apps/bolt
-"
diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
index f68c386c4db9..346585e6911a 100644
--- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
+++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt"
 
 LICENSE="|| ( GPL-2 GPL-3+ )"
 SLOT="5"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 # tests require DBus
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index b8dda04ec5d5..b4572d243ece 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-vault-5.24.4.tar.xz 178000 BLAKE2B 736fbad8567c21fcd259c2334674e88a1ce041c9e3136712444fcf4b69785f5bd86eff6edfcbf73cca54e6c6ff75f742c97064b6b63cb46ff13850bce5fd01fb SHA512 21bf4f215583bf055f15d3c05e0a8b8d637662619eced04008051e25c1bac7ca6fb9b83d0c8661daf91c4790405d422d272176042f3420f9d27497fc2fc84a4c
 DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2
-EBUILD plasma-vault-5.24.4.ebuild 1281 BLAKE2B 6956ed7e6c77aef87bc60b112b694d2b060b08ffe29baffebcd47767f0fe23ff5b356dbc769a6631e07bc327ab9f56006fa7077b38b7ad27a4153dc2359d4aa3 SHA512 362946fee322fa680cbbad96f5bc153f68d24461a6b7066d63c29b790b0f02378be9fed326ab45d4baf00c626b13afac6fdd1ea5b6aa226829aab7ad57bb5112
-EBUILD plasma-vault-5.24.5.ebuild 1284 BLAKE2B 893f8a8828a97ac6d93b6ddd59495a8fd1dbb2aae72c436ba408391ebc503add0aed67e470b768cb3d060cadc261e50a0ae3e13674ac735e69e714d31eb4ab3f SHA512 427e9c826232ce7d31c8f3b598f85b54327dfed75c70baa2b6a33b573ca208837e339f47886fac919addea27abfd160f44babe170528b5545998d04470e76d4c
+EBUILD plasma-vault-5.24.5.ebuild 1281 BLAKE2B 6956ed7e6c77aef87bc60b112b694d2b060b08ffe29baffebcd47767f0fe23ff5b356dbc769a6631e07bc327ab9f56006fa7077b38b7ad27a4153dc2359d4aa3 SHA512 362946fee322fa680cbbad96f5bc153f68d24461a6b7066d63c29b790b0f02378be9fed326ab45d4baf00c626b13afac6fdd1ea5b6aa226829aab7ad57bb5112
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild
deleted file mode 100644
index 9cce0daf50a1..000000000000
--- a/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Plasma applet and services for creating encrypted vaults"
-HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
-
-LICENSE="LGPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="networkmanager"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package networkmanager KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
index e1ff81661e57..9cce0daf50a1 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="networkmanager"
 
 DEPEND="
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index 68c9e2bce1d8..2b295a162225 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-workspace-wallpapers-5.24.4.tar.xz 72711976 BLAKE2B f8b06a88543e2ad6a225fc2d463045047df66b9582307cbc10a068aad0af6ee9ea2500c773edfa042498af8726d4ef3593893b70356189f21cf164a8ffc137f1 SHA512 8bfdd82e3e88d9723fcbd530660ef0fa8060a0b1504157057ea7a057aa1dd2a7309ca5b86830c4ed6c8e80fc8a31a01ce7b78e0675babafc95c41ba41607ae55
 DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873
-EBUILD plasma-workspace-wallpapers-5.24.4.ebuild 355 BLAKE2B 81afbc936fe285344c48e2bb0381dfd9ebe4982ef70e344f82dc16c29c2920281141137221bd55c410154ef23089b192be7b7d37ea3dfa7d1bfd0a6b7f1a4211 SHA512 5c86d1a046ceaf78f2201d54710325306e591095ce1058d0fa12ff04c159f92daf329763a38ee9b315d036d02a6c29713f88ff27fcadc14628fae8617a6627e4
-EBUILD plasma-workspace-wallpapers-5.24.5.ebuild 358 BLAKE2B dc52584491e99a1df8c1d6e9adba03dde84a63626cfd0522d49d88a0c3788486ea19521aa7de4e4037cd26143c540f5c2e800807466bfd0b9497ef61d91a2a4d SHA512 011b37788ce689db7db1857df23f484dab23f6b9c857ae8b92dec1c0fe353441ce69861dee3a3d0c2b64e420edc62ad9b3a35e078d69bb19949622317a9f755b
+EBUILD plasma-workspace-wallpapers-5.24.5.ebuild 355 BLAKE2B 81afbc936fe285344c48e2bb0381dfd9ebe4982ef70e344f82dc16c29c2920281141137221bd55c410154ef23089b192be7b7d37ea3dfa7d1bfd0a6b7f1a4211 SHA512 5c86d1a046ceaf78f2201d54710325306e591095ce1058d0fa12ff04c159f92daf329763a38ee9b315d036d02a6c29713f88ff27fcadc14628fae8617a6627e4
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild
deleted file mode 100644
index 862f306fb000..000000000000
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-3)
-inherit cmake kde.org
-
-DESCRIPTION="Wallpapers for the Plasma workspace"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/qtcore:5
-	kde-frameworks/extra-cmake-modules:5
-"
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
index bceff041c2fa..862f306fb000 100644
--- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
+++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Wallpapers for the Plasma workspace"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index bf57ab193ac7..fac8e0d7ec9b 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -10,8 +10,6 @@ AUX plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch 16
 AUX plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch 2366 BLAKE2B c14bfdd37480b6e501990daa77b0cafb8ed09ad63d96ce08be34c9c2f6dd08442195a566549eefbdbc69f8065c4221ed94b5cd0f12e25f479a8b82d2d08162e5 SHA512 83307de2dd31b3393e0d12f3204427c1f0c4a87bd2d69554e7fb7fd773a34ec71dc8d28055ceaae52d85bb9b04bf8f84b4c8c0f16ca1d775073c722cc0aeca6a
 AUX plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch 1544 BLAKE2B 8f27cb884f5780a8714f376ccdfee67623b1c71fb6f14f8ec0d58f050bd652cd7de54e459edd0f5072aa818bd5fa946f4251e464cdd48e3b2dc2fddc408511b6 SHA512 e85a3504250f79c439590303d542842da71cdbc8cb72fd4a9b010b11cc2bedd282c5debf40cbf0afdbec9545e4ce1c99842e17669386f97b0844dc77d57f4c15
 AUX plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch 1404 BLAKE2B 356c4f481c899c4f7e313f68496c65936eb693c9ec40e893fc02958c9446b06a914370d52b5c5f4c2e45901fb375ff7b1dc79a1505f43ee43c022728be005563 SHA512 3ad0e83b7f236da90694919cd9978d64ceb1c934f8e293a646907c58c6756bcb9d300c806647e907ea36a74a7ab77e223d9b420ba74db6664910fedf8c744232
-DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
-EBUILD plasma-workspace-5.24.4.ebuild 6490 BLAKE2B 5445697f4d3ecbc61f7714f4d7a03d7a410a1d36a2c34d0c4f9fbdfdcb861d039294557ecd7c8a91aeb6dce9ffdb931315beb4db52968af3f9868415c76e7632 SHA512 c22495611f87e8bae924b96f28df05c282352e8c303b46def1a7514b106da5b09f617ba6c8a3c4b985ad51083952d912f438bca1003a1b4f96e775e927cc4265
-EBUILD plasma-workspace-5.24.5-r1.ebuild 7103 BLAKE2B 5600f6aac17549f17e7658d98b2f849d8cd49d0a3f4f35a6bed409da74b21630c2d98f0a3f5768efa2502ddd1e783412310bf025c5ef0f824cac1833c22b614c SHA512 44a4f7073dd5910dc4f35f7ff72094c9783af2e9dd1524daa58b765b8dbecde8d044f985b5f66ce04bc60482d080f5787284365b7b550a92c288dfda5e262d1f
+EBUILD plasma-workspace-5.24.5-r1.ebuild 7100 BLAKE2B 9de41f9fa22bc2e66757a88e070be31d2e6b7b19c248ea5f4696e1bcc7b1bf78da4d9f7ed4de2397ef273aad77bb4e9925e8afa90a1cf1b2872d3c2ccf9c5daf SHA512 d43471c2412fea78398c24a916f6d23ed9ecd7e5ce80263e5f2e09678af97b3e63acb7b662051c60e6744e7abeb332d8e6a87581e1bc20b36941dce937d98bda
 MISC metadata.xml 822 BLAKE2B 653f8e3e3987d950746b0a5f423664302f1a59feefcf3704a6d89000748134ee26cb88262ef2fb1e6d79213b1d82c16ac4d8bcaa09a40bef987d7dc7d8a5c82c SHA512 638282cdb40c2386d56f8b20434ffd78a610e8bd4ce5212118d398ba482799de27b7eae3e7874099362e8b841da96c6c819d6e5e52f6ba97679f153425cbe55b
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
deleted file mode 100644
index 8c06edc3b7e3..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma workspace"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="appstream +calendar +fontconfig geolocation gps +policykit
-screencast +semantic-desktop telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-RESTRICT="test"
-
-# slot op: various private QtWaylandClient headers
-COMMON_DEPEND="
-	>=dev-libs/wayland-1.15
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwayland-${QTMIN}:5=
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kded-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/kpeople-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/prison-${KFMIN}:5[qml]
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/breeze-${PVCUT}:5
-	>=kde-plasma/kscreenlocker-${PVCUT}:5
-	>=kde-plasma/kwin-${PVCUT}:5
-	>=kde-plasma/layer-shell-qt-${PVCUT}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libksysguard-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	>=media-libs/phonon-4.11.0
-	sci-libs/libqalculate:=
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-	fontconfig? (
-		>=dev-qt/qtprintsupport-${QTMIN}:5
-		media-libs/fontconfig
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 )
-	gps? ( sci-geosciences/gpsd )
-	policykit? ( virtual/libcrypt:= )
-	screencast? (
-		>=dev-qt/qtgui-${QTMIN}:5=[egl]
-		media-libs/libglvnd
-		>=media-video/pipewire-0.3:=
-		x11-libs/libdrm
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	telemetry? ( dev-libs/kuserfeedback:5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/plasma-wayland-protocols-1.6.0
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-util/wayland-scanner-1.19.0
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	>=dev-qt/qdbus-${QTMIN}:*
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtpaths-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5[widgets]
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	kde-apps/kio-extras:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/milou-${PVCUT}:5
-	>=kde-plasma/plasma-integration-${PVCUT}:5
-	sys-apps/dbus
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	!<kde-plasma/breeze-5.22.90:5
-	!<kde-plasma/plasma-desktop-5.23.90:5
-	policykit? ( sys-apps/accountsservice )
-"
-BDEPEND="
-	>=dev-qt/qtwaylandscanner-${QTMIN}:5
-	virtual/pkgconfig
-"
-PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream
-	"${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478
-)
-
-src_prepare() {
-	ecm_src_prepare
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if ! use screencast; then
-		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
-	fi
-
-	# TODO: try to get a build switch upstreamed
-	if use geolocation; then
-		use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \
-			-i dataengines/geolocation/CMakeLists.txt || die
-	fi
-
-	if ! use policykit; then
-		cmake_run_in kcms cmake_comment_add_subdirectory users
-	fi
-
-	ecm_punt_kf_module Su
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
-		$(cmake_use_find_package appstream AppStreamQt)
-		$(cmake_use_find_package calendar KF5Holidays)
-		$(cmake_use_find_package fontconfig Fontconfig)
-		$(cmake_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package telemetry KUserFeedback)
-	)
-
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	# default startup and shutdown scripts
-	insinto /etc/xdg/plasma-workspace/env
-	doins "${FILESDIR}"/10-agent-startup.sh
-
-	insinto /etc/xdg/plasma-workspace/shutdown
-	doins "${FILESDIR}"/10-agent-shutdown.sh
-	fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
-	ecm_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh"
-	elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
index 9fa47cdd5c54..ff25b6a845ef 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="KDE Plasma workspace"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="appstream +calendar +fontconfig geolocation gps +policykit
 screencast +semantic-desktop telemetry"
 
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index 4cb3ae5415ee..7dead5900193 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST plymouth-kcm-5.24.4.tar.xz 39920 BLAKE2B e1edda971f8d055defe35da2710c1da7de336bde9dedc378b7217b1884da2bbdf066be58e17159b029487772f0ff3e2072986c6b7da1cf005e4dbab5ab3dd5ca SHA512 532f83b73fdbdfb1457a86d8d06d0f947eb64729d75b33646c7ca276845407c5ad924f2d3bfa34a926a26f0c580696ed076bb927b99d13edc1049f0109c8b4af
 DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8
-EBUILD plymouth-kcm-5.24.4.ebuild 927 BLAKE2B 9121a1195cad566bdace0e697db94fc1392bd978031a3b6953d8db234df4f95307023efcf1dca7631bd4c7587bddbcbc1bdc80c8677b564c276dbd5b4e611876 SHA512 e8f8860d428bacd642e75443e89ef727fd38fcdaf5a2fb494647dc246c3c70574cd3d7f34853f1c89451dcd782f2176cc8748a74fc0161f491b295b8e324ab51
-EBUILD plymouth-kcm-5.24.5.ebuild 930 BLAKE2B e695fae8b27526122913c55b3aa0288c196d47ac9eee3842bb9e521b6b85ffd81168b2ae90838b4c850a398df6cc2c80394434709aaaf9cabf8594643a597309 SHA512 782ff423160af85652c7c37bfb0217f2056e6fb13f774d698cd49ae60a3d1926cb5f0a2654ee68d91df2746bfe6f22cee32547a05e12e3e4effa54cafe3624db
+EBUILD plymouth-kcm-5.24.5.ebuild 927 BLAKE2B 9121a1195cad566bdace0e697db94fc1392bd978031a3b6953d8db234df4f95307023efcf1dca7631bd4c7587bddbcbc1bdc80c8677b564c276dbd5b4e611876 SHA512 e8f8860d428bacd642e75443e89ef727fd38fcdaf5a2fb494647dc246c3c70574cd3d7f34853f1c89451dcd782f2176cc8748a74fc0161f491b295b8e324ab51
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild
deleted file mode 100644
index d6268b4f5766..000000000000
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for Plymouth"
-HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	sys-boot/plymouth
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
index 8800e665bf19..d6268b4f5766 100644
--- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
+++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index 994f55d9d2c8..c29ba6b65163 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,5 +1,3 @@
-DIST polkit-kde-agent-1-5.24.4.tar.xz 48424 BLAKE2B f7981148478e674961aaac29359748e1703a5ae41d1cadde0b94da5c37c4bc9afd1a508e3ea6e6e083dae21174fa1e2377e3679ad6ae8709d50918579b9df069 SHA512 49e18d1c3e858eba2157064fef94b8023f7ac56cbc3bd43f1b454f19381a3d9567a68ec0f846097e992f4cec78f51ed011cc36afd9e3b335ffe6bf05001c6664
 DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93
-EBUILD polkit-kde-agent-5.24.4.ebuild 804 BLAKE2B 66a36e5a23884b96e7a550c8fd2186f81d3d4c0a1f3241f98ddc806e59d9d12cda40a5ab9fba14c8354302115d91553f00369a909dcc238fcf47fc3d75215fe6 SHA512 8aec98bdd1ff62a0956b4ebae37339507e8cdd6fb9a729087087cb65ff4be55a2b28664d3b3a1166d856db3d2f61daaca2c1dd7f421c68cee9a9b255bb48353e
-EBUILD polkit-kde-agent-5.24.5.ebuild 807 BLAKE2B 476505f9b4fceccdac7115d7fa7650eeb7c6f9bcaa309fe23ce05883b4f247d332b0656b7d0836b84f00ec9a500a447b9f9a17fd61f53b2747b44d8ff1c0d86f SHA512 e8d578a3157be61386736ac10860c9e065a168c28a9a528d05f0a84afe6048451cfdf9235d38b67de8c38ca3fec23e03f018be6fedf34b8e0e499ba2a49c0d63
+EBUILD polkit-kde-agent-5.24.5.ebuild 804 BLAKE2B 66a36e5a23884b96e7a550c8fd2186f81d3d4c0a1f3241f98ddc806e59d9d12cda40a5ab9fba14c8354302115d91553f00369a909dcc238fcf47fc3d75215fe6 SHA512 8aec98bdd1ff62a0956b4ebae37339507e8cdd6fb9a729087087cb65ff4be55a2b28664d3b3a1166d856db3d2f61daaca2c1dd7f421c68cee9a9b255bb48353e
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild
deleted file mode 100644
index 6d8dd7374950..000000000000
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="${PN}-1"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="PolKit agent module for KDE Plasma"
-HOMEPAGE="https://kde.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=sys-auth/polkit-qt-0.113.0
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
index 1a4ad3aed2e5..6d8dd7374950 100644
--- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
+++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://kde.org/"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index e2233dcc2468..17c38f9a63e2 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,5 +1,3 @@
-DIST powerdevil-5.24.4.tar.xz 632736 BLAKE2B ab348f7f193627bd7833890cc64ff07b614ff899f2fc2c148d38f6a42f627ae7f2ed7978aecd08795ab4ebdaa4a36b68c483f8fabe7714954e4527c6b743e1cf SHA512 195724a72593248bcf7001a59fbc3b1b1aa3672c3b040eff935993fff26e16c2d85ec37ccc3d2d25e9e3758dd5ed135f203d22855982141fca2e3600566589ee
 DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15
-EBUILD powerdevil-5.24.4.ebuild 1991 BLAKE2B 56f223cd0fc21b91890590a857ba4f43317afd11bb287708db6d1351d58cdf83e70739d4c53b5ae295444df0915c1399afba95d6f48a0ec913f8ee3c4a4a50f6 SHA512 25dbb8e291a1829f2f516f40ce386aaf864336c19fb981b6ecfbf8c95ce8f704e7a93f43a01c8f0f8657df5388fc246678794c125fbd36c5b88b48d5fa8f87a9
-EBUILD powerdevil-5.24.5.ebuild 1994 BLAKE2B 348e6b266b466d117992a6acf09e10f6e9e8ef6eb73aa25526f571248d8f426d7c1a64ba10499d7c784ba610b70b9d5d0a71bf02688bcf3b9ff206aa063856bc SHA512 9a5169c095243ff089559b4a509b4302e96b6c3a8c5a4d3f56c597a4f7a3e735eff199c1d42ae3ff4f8aab5e846e212f549af1f0be162fd6bd2fff4d93c0d8fa
+EBUILD powerdevil-5.24.5.ebuild 1991 BLAKE2B 56f223cd0fc21b91890590a857ba4f43317afd11bb287708db6d1351d58cdf83e70739d4c53b5ae295444df0915c1399afba95d6f48a0ec913f8ee3c4a4a50f6 SHA512 25dbb8e291a1829f2f516f40ce386aaf864336c19fb981b6ecfbf8c95ce8f704e7a93f43a01c8f0f8657df5388fc246678794c125fbd36c5b88b48d5fa8f87a9
 MISC metadata.xml 597 BLAKE2B 4e436cb067ff3c936a6e497de75b03947f4ccd1103f45237a8a7fe738f67c5a718bf17bbb7aa0a9eff068ce18ce4f0b73bb8f737badc63971e3edabcdd09bff8 SHA512 f4652971683109791e796a57de30efaf603566ad5f9e3e1d16ca54b1212b4cd3ebe1d9a934959fcb51d2722aafe3d57af708f45722534f225ea4b2889a492dc6
diff --git a/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild
deleted file mode 100644
index f06590672c3f..000000000000
--- a/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Power management for KDE Plasma Shell"
-HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="brightness-control caps +wireless"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5[policykit]
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=kde-plasma/libkscreen-${PVCUT}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-	virtual/libudev:=
-	x11-libs/libxcb
-	brightness-control? ( app-misc/ddcutil:= )
-	caps? ( sys-libs/libcap )
-	wireless? (
-		>=kde-frameworks/bluez-qt-${KFMIN}:5
-		>=kde-frameworks/networkmanager-qt-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	>=sys-power/upower-0.9.23
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_DDCUTIL=$(usex brightness-control)
-		$(cmake_use_find_package caps Libcap)
-		$(cmake_use_find_package wireless KF5BluezQt)
-		$(cmake_use_find_package wireless KF5NetworkManagerQt)
-	)
-
-	ecm_src_configure
-}
diff --git a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
index 94703d516236..f06590672c3f 100644
--- a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/powerdevil"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="brightness-control caps +wireless"
 
 DEPEND="
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 55f2e0ee52d4..7ee1c89f0531 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,5 +1,3 @@
-DIST sddm-kcm-5.24.4.tar.xz 81212 BLAKE2B 4e1b4a7762c330a89af10fe729373548bd2167c27dd5dbda53d08fa63c4ab0f399969b92a0fc67cd72bdb66bbccf360c057d09c81e4041ec6fed4f9ca1f7301f SHA512 ecff5e710148dc42daffdbebb5ea63c36afe01cf1c3219e615efc8c34d1191748e69ff79017beb3ccd1e48c0e967d258066b004c25b9aa2252972645e95a1192
 DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15
-EBUILD sddm-kcm-5.24.4.ebuild 1121 BLAKE2B 6f8903410d042d1a02522c707b5c7216f2ffa94ac8488ad388fc61d0022f6a699aae7d91de8d9c3d20937c4af12c3b16b5e0615485b6abcf9d1d73493b8f3f88 SHA512 847d677d60265519bd46ce8cd85245d8231129ed0067928f0adddb793febdf5a34ac7d3d98ffda9e6f384b157f862b68c60515997c4bfce991d83bc69076db94
-EBUILD sddm-kcm-5.24.5.ebuild 1124 BLAKE2B 94708d4108dba13447a2d95c8f813f96ba3feaa4d428b1b89c81d5ca819e7af3cb1c2af08bab9c9310fd83f474742623c8df24261a24103dda2ef440e07c77ed SHA512 43f4fb01cea31a70a478572fa099d2833f699529fb815f4beb5820550edd9454959b0ba928531847a1117635f47de28d6cfcabea9523c40dcce5c0608eb11f59
+EBUILD sddm-kcm-5.24.5.ebuild 1121 BLAKE2B 6f8903410d042d1a02522c707b5c7216f2ffa94ac8488ad388fc61d0022f6a699aae7d91de8d9c3d20937c4af12c3b16b5e0615485b6abcf9d1d73493b8f3f88 SHA512 847d677d60265519bd46ce8cd85245d8231129ed0067928f0adddb793febdf5a34ac7d3d98ffda9e6f384b157f862b68c60515997c4bfce991d83bc69076db94
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild
deleted file mode 100644
index 362db6a8c3c2..000000000000
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="KDE Plasma control module for SDDM"
-HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5[qml]
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-	x11-misc/sddm
-"
-
-DOCS=( CONTRIBUTORS )
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
index 7da8175afc35..362db6a8c3c2 100644
--- a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
+++ b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 1641ef54d0a8..cb682a6c8ba6 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,7 +1,5 @@
 AUX systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch 843 BLAKE2B 38a18ca89336b9a4abc3af3c466762095c4c28ca7e6711232546a7b7a16cb0163f77bc4872971483c429a836e40ed34cbbf42b052cd9ab840a5b2b4ad7da5d18 SHA512 944b2695a18c88fee6b77ffbd597cd1fbc9a2283d4f448bee927dfe2c660a58e511abd91928686725ffb6809bfcbf2bb9d8f7358c3f1d357dffe2c384c8e2d85
 AUX systemsettings-5.24.5-fix-kcm-highlighting.patch 1253 BLAKE2B b62c3c1927f09b267d7368faf3d2aae5a0101a628c6e1b11aaa4f1ece0a13ba306ba52cec228833b8ec4cb5929b4f936ffece8df9ba90960834fd7afa4452355 SHA512 44d21933fe20e280fb6f89b9515d7ed8701dbd078a11b3e93bf97a594ffbfc485699b3ff16d78c7ae5225f6f9f36aacfaf94b22ae1b9cf74c0eb9b5d590783e7
-DIST systemsettings-5.24.4.tar.xz 205488 BLAKE2B 0bef1c8f3c1c63820b273e8182db3a506b71f379bbe952b485c73485b9fecfea418dea19c1fdfa53fb0fc5436ece192f1b30e60ebb9e3e65151a21f62b9a50bb SHA512 4de5b7c8224f0fb376dfa5481c4185d44632485569e3dd1a7f36582751ca15de2382cd8293d684bdb1d771983ad09b53fa36fe7ae776f447ca09f609a6ec13c0
 DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1
-EBUILD systemsettings-5.24.4.ebuild 1754 BLAKE2B 5ecd7efeb773e3ab6fc762f074e805c1fff1d7c4d7339fde273dab3a8825f2a259aaa28f384a04791d03a96ebf9fa98748d890282ff480b9b788732d1bc21c09 SHA512 fce13b59dcbd64aba9527231caa74bd73101100fb574fdba17424899cfb3695cc179ea9ffe882f326b373e26e59570ee0bb47af65ba4ce160cf1eae7f2646f11
-EBUILD systemsettings-5.24.5-r1.ebuild 1903 BLAKE2B 6dfb418aa02e2899329d5d34d462e2f3874810f973d32ff8796e050beab00538f6b6aa3f2e344654165a0e65f5ce37c292999651e7fd490ad86c6e94a22787b9 SHA512 a9cdeb4027465ccfd3572d452600a6444de4e41bb957fc954d38e73eadf9a98f3450127f4030b5a82d877c78e9d7c76dd93fb3945113908c7a8768ff01de5058
+EBUILD systemsettings-5.24.5-r1.ebuild 1900 BLAKE2B 2602d0578a1c3a2ca774c6fc8c589df82b7c90de7154e40866cce60ff75d85f23442c5ac2fb4c38bde0b2c32d16249de1f3664a05a3cbbf939a054dccf1eb34a SHA512 14eb6addb666372fccf5b1e03a5983f79e26f6c687ff2525fc776575abcd2767eed5527ac2edd3f6c22897a5436a2a77d122b2607b7401e20c22fcbc7998527c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
deleted file mode 100644
index 3b2ece11ba78..000000000000
--- a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Control Center to configure KDE Plasma desktop"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE=""
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/kactivities-stats-${KFMIN}:5
-	>=kde-frameworks/kauth-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-plasma/libkworkspace-${PVCUT}:5
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
index ab73d76a6c65..3fd54a2ee7bc 100644
--- a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
+++ b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Control Center to configure KDE Plasma desktop"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest
index 721a313b2958..7dbe7b966ff5 100644
--- a/kde-plasma/xdg-desktop-portal-kde/Manifest
+++ b/kde-plasma/xdg-desktop-portal-kde/Manifest
@@ -1,6 +1,8 @@
+AUX xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch 3673 BLAKE2B c7a239293c2e3831c3490895fdff4e4ff03a5480130a1ed68412090aca457e18bb403394452d1edb24f9a92ca1156751d7ae5f4c2500b3337a0ae03924efb69a SHA512 a11aeaaea3ed54edc39000e9ec34f655fa9c3b1af3d8257a963a4ca7a64b8ad6025003cb2aa74fc4ee505f8d221d6fd537e61ef14cdcb23d6bf1eddaa6d44759
+AUX xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch 14356 BLAKE2B 7cf3a0c42f6630a8b6a5f415f04b0ab0f560163b4c7f5465c92ed11fd8c192c4bbdf49c9bacf8c99813f9312178639adb41b8fdb414adeb1f21b16ad739c988a SHA512 d6ae1a00c2aed8f033fcd7a9eef36f72ac3f31753ef39a946da34b6346db093a65dceaeb3664de92a70a8839be4d5f1fc385592e0cd188d70c93e12026302097
+AUX xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch 882 BLAKE2B 5f5efbf3ae00cf7555c9d8d7d167ab5e2ec7c5318c27ea533204e4e4590272258e62266d4ebd69aaaa30cdcbcfeaa7b995d92cd73e7a13bfcac35e0c16a1b577 SHA512 a3273bddccd3f0a6cb51d66661e88545292298427f42a797a9590abd24e7e99ca50971f8e27859d5e578cdca3257849a8fd72c57be3eda0d4fe938d787577d9d
 AUX xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch 1097 BLAKE2B bf2fab8ddc7d79f4759a5aec9de7c93ff13c0e249eee6eef689db59d034aa39a06b93db1260d3e3c96f567633dac07c762828815a9785e8bdf7de6a12eae324c SHA512 cc36b2e04ca0b88982a370a5b0b5b4ba77dbc503af970016be87b0a0c54417302f76f1febcd75b2736008523fd942d78431e706c200a73c1ebf64a8f61c2742a
-DIST xdg-desktop-portal-kde-5.24.4.tar.xz 88540 BLAKE2B 6a6522bbfe99919a98ee697fc6331fe6b833f376307dbfec303dddb2020c97d355dcd0b251d0feb1e270f2b9a7633f8e770f5e58d9a0ade618dd376fc3890eed SHA512 6efd6452aff8e139921d884e272d26421ed3b1b83c36ca1bdee8bb54633cf85866be87e5f169ececd5364d901d78d9f4b0dd520450b890540a5bd514b0e2e54c
 DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401
-EBUILD xdg-desktop-portal-kde-5.24.4-r1.ebuild 1201 BLAKE2B 34cf4675c8a870924f29a93bdafd9f5f66b95192941dfcc3c6667f366a57ad5ee1a80c579a33f6c98ed4f5ee08906f70989b4aceb0b10ee05f5666a7bf039823 SHA512 bf5537caff6ee0f201477a491cce01b0c636f965945b2393d0e3d14ec9d64a5cc18f706a7aa9c3afff4bb9ca6ea3d3b5c72bb80d0d557f16bb23fd23e8622d4d
-EBUILD xdg-desktop-portal-kde-5.24.5-r1.ebuild 1303 BLAKE2B dbf10ee78e67f90b7fe70dbd3ddfe867c481f3d2eae8bcc5ad439841eb14bf97b173c508a4a71719ab842d8a78ed75cbc6eda6591799fde6e1a9951bf07cd87b SHA512 66182b70a6401d607c0f5cb66d7e9cab01d35341e1aec38ed9297520f02a63224fb700a127aca340b0abd284cd8bca27f597f1e0c1e120e0796939494d060cc8
+EBUILD xdg-desktop-portal-kde-5.24.5-r1.ebuild 1300 BLAKE2B 4e167f9cd12ae68cfab313c4f8e83036041f61214ad04a85fd75b9fdaee679d2ae057135c5db8af2568f41b8221a655ff3701c2214697d70e47de440357384f8 SHA512 84c3baef8009b45fd09c2f76d606eb71274f52fd1e67e4b91c9c175d1f6362a55b56c374e6d1a055ddd223ce7e3ccafdde742fb14b6755fbb1544105a81d338c
+EBUILD xdg-desktop-portal-kde-5.24.5-r2.ebuild 1507 BLAKE2B 8164c463546d2f002e24872dc3f3e48c246e8cbc5755a97583a363f6041d81dc3f39ff8c949af43679e190ef14feaeb11cf541186f343b974789983028b49206 SHA512 88a558e65ec6f67b052fd35a7c4eb0b21003724169ac7cf503f83c49aeaaa28f0013f804b269177a9b7d35875b4e3c952c3a45102df9eaae60e4f8926c36cd65
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
new file mode 100644
index 000000000000..134f55c900b5
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
@@ -0,0 +1,107 @@
+From cd8275c722aa25dd22353121131c914d3ab3b438 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 28 May 2022 03:36:14 +0200
+Subject: [PATCH] screencast: When closing a session, only close the streams
+ from that session
+
+---
+ src/screencast.cpp         | 11 ++++++++---
+ src/session.h              | 12 ++++++++++++
+ src/waylandintegration.cpp |  5 +++++
+ src/waylandintegration.h   |  1 +
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/screencast.cpp b/src/screencast.cpp
+index 5be6210..84cc4bd 100644
+--- a/src/screencast.cpp
++++ b/src/screencast.cpp
+@@ -68,8 +68,12 @@ uint ScreenCastPortal::CreateSession(const QDBusObjectPath &handle,
+         return 2;
+     }
+ 
+-    connect(session, &Session::closed, []() {
+-        WaylandIntegration::stopAllStreaming();
++    connect(session, &Session::closed, [session] {
++        auto screencastSession = qobject_cast<ScreenCastSession *>(session);
++        const auto streams = screencastSession->streams();
++        for (const WaylandIntegration::Stream &stream : streams) {
++            WaylandIntegration::stopStreaming(stream.nodeId);
++        }
+     });
+ 
+     connect(WaylandIntegration::waylandIntegration(), &WaylandIntegration::WaylandIntegration::streamingStopped, session, &Session::close);
+@@ -169,7 +173,8 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle,
+             return 2;
+         }
+ 
+-        results.insert(QStringLiteral("streams"), QVariant::fromValue(streams));
++        session->setStreams(streams);
++        results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>(streams));
+ 
+         if (inhibitionsEnabled()) {
+             new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session);
+diff --git a/src/session.h b/src/session.h
+index a42222e..dd05680 100644
+--- a/src/session.h
++++ b/src/session.h
+@@ -14,6 +14,7 @@
+ 
+ #include "remotedesktop.h"
+ #include "screencast.h"
++#include "waylandintegration.h"
+ 
+ class Session : public QDBusVirtualObject
+ {
+@@ -62,10 +63,21 @@ public:
+         return SessionType::ScreenCast;
+     }
+ 
++    WaylandIntegration::Streams streams() const
++    {
++        return m_streams;
++    }
++    void setStreams(const WaylandIntegration::Streams &streams)
++    {
++        m_streams = streams;
++    }
++
+ private:
+     bool m_multipleSources;
+     ScreenCastPortal::CursorModes m_cursorMode;
+     ScreenCastPortal::SourceType m_types;
++
++    WaylandIntegration::Streams m_streams;
+ };
+ 
+ class RemoteDesktopSession : public ScreenCastSession
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index 9f5a177..e05f73a 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -89,6 +89,11 @@ void WaylandIntegration::stopAllStreaming()
+     globalWaylandIntegration->stopAllStreaming();
+ }
+ 
++void WaylandIntegration::stopStreaming(uint node)
++{
++    globalWaylandIntegration->stopStreaming(node);
++}
++
+ void WaylandIntegration::requestPointerButtonPress(quint32 linuxButton)
+ {
+     globalWaylandIntegration->requestPointerButtonPress(linuxButton);
+diff --git a/src/waylandintegration.h b/src/waylandintegration.h
+index b8e6a00..784ee12 100644
+--- a/src/waylandintegration.h
++++ b/src/waylandintegration.h
+@@ -131,6 +131,7 @@ void startStreamingInput();
+ Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+ Stream startStreamingWindow(const QMap<int, QVariant> &win);
+ void stopAllStreaming();
++void stopStreaming(uint node);
+ 
+ void requestPointerButtonPress(quint32 linuxButton);
+ void requestPointerButtonRelease(quint32 linuxButton);
+-- 
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch
new file mode 100644
index 000000000000..6aa94ccb7f69
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch
@@ -0,0 +1,358 @@
+From 3dbd366516c38d987025623feea18f79c15d72dd Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Mon, 30 May 2022 15:42:02 +0200
+Subject: [PATCH] Backport of 5f7fe7482ae3de6e5dabbd2712c283439b0eecac
+
+Since the codebases had diverged over time, I've backported it by hand
+using the same concepts as the forementioned fix, trying to minimise the
+delta with the latest released Plasma 5.24.
+---
+ src/remotedesktop.cpp      | 12 ++------
+ src/screencast.cpp         | 15 ++++++----
+ src/waylandintegration.cpp | 60 +++++++++++++++-----------------------
+ src/waylandintegration.h   | 26 +++++++++++++++--
+ src/waylandintegration_p.h | 15 ++--------
+ 5 files changed, 61 insertions(+), 67 deletions(-)
+
+diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp
+index f36def4..9282ff0 100644
+--- a/src/remotedesktop.cpp
++++ b/src/remotedesktop.cpp
+@@ -122,20 +122,14 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle,
+ 
+     if (remoteDesktopDialog->exec()) {
+         if (session->screenSharingEnabled()) {
+-            if (!WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden)) {
++            auto stream = WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden);
++            if (!stream.isValid()) {
+                 return 2;
+             }
+ 
+             WaylandIntegration::authenticate();
+ 
+-            QVariant streams = WaylandIntegration::streams();
+-
+-            if (!streams.isValid()) {
+-                qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Pipewire stream is not ready to be streamed";
+-                return 2;
+-            }
+-
+-            results.insert(QStringLiteral("streams"), streams);
++            results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>({stream}));
+         } else {
+             qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Only stream input";
+             WaylandIntegration::startStreamingInput();
+diff --git a/src/screencast.cpp b/src/screencast.cpp
+index 210bbbb..5be6210 100644
+--- a/src/screencast.cpp
++++ b/src/screencast.cpp
+@@ -147,26 +147,29 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle,
+ 
+     if (screenDialog->exec()) {
+         const auto selectedScreens = screenDialog->selectedScreens();
++        WaylandIntegration::Streams streams;
+         for (quint32 outputid : selectedScreens) {
+-            if (!WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode()))) {
++            auto stream = WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode()));
++            if (!stream.isValid()) {
+                 return 2;
+             }
++            streams << stream;
+         }
+         const auto selectedWindows = screenDialog->selectedWindows();
+         for (const auto &win : selectedWindows) {
+-            if (!WaylandIntegration::startStreamingWindow(win)) {
++            auto stream = WaylandIntegration::startStreamingWindow(win);
++            if (!stream.isValid()) {
+                 return 2;
+             }
++            streams << stream;
+         }
+ 
+-        QVariant streams = WaylandIntegration::streams();
+-
+-        if (!streams.isValid()) {
++        if (streams.isEmpty()) {
+             qCWarning(XdgDesktopPortalKdeScreenCast) << "Pipewire stream is not ready to be streamed";
+             return 2;
+         }
+ 
+-        results.insert(QStringLiteral("streams"), streams);
++        results.insert(QStringLiteral("streams"), QVariant::fromValue(streams));
+ 
+         if (inhibitionsEnabled()) {
+             new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session);
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index 44d862a..9f5a177 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -43,7 +43,7 @@ Q_LOGGING_CATEGORY(XdgDesktopPortalKdeWaylandIntegration, "xdp-kde-wayland-integ
+ 
+ Q_GLOBAL_STATIC(WaylandIntegration::WaylandIntegrationPrivate, globalWaylandIntegration)
+ 
+-static QDebug operator<<(QDebug dbg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &c)
++static QDebug operator<<(QDebug dbg, const WaylandIntegration::Stream &c)
+ {
+     dbg.nospace() << "Stream(" << c.map << ", " << c.nodeId << ")";
+     return dbg.space();
+@@ -74,12 +74,12 @@ void WaylandIntegration::startStreamingInput()
+     globalWaylandIntegration->startStreamingInput();
+ }
+ 
+-bool WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
++WaylandIntegration::Stream WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
+ {
+     return globalWaylandIntegration->startStreamingOutput(outputName, mode);
+ }
+ 
+-bool WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win)
+ {
+     return globalWaylandIntegration->startStreamingWindow(win);
+ }
+@@ -124,11 +124,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::screens()
+     return globalWaylandIntegration->screens();
+ }
+ 
+-QVariant WaylandIntegration::streams()
+-{
+-    return globalWaylandIntegration->streams();
+-}
+-
+ // Thank you kscreen
+ void WaylandIntegration::WaylandOutput::setOutputType(const QString &type)
+ {
+@@ -157,7 +152,9 @@ void WaylandIntegration::WaylandOutput::setOutputType(const QString &type)
+     }
+ }
+ 
+-const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::WaylandIntegrationPrivate::Stream &stream)
++namespace WaylandIntegration
++{
++const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream)
+ {
+     arg.beginStructure();
+     arg >> stream.nodeId;
+@@ -177,7 +174,7 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::Wa
+     return arg;
+ }
+ 
+-const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &stream)
++const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream)
+ {
+     arg.beginStructure();
+     arg << stream.nodeId;
+@@ -186,9 +183,7 @@ const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::Wa
+ 
+     return arg;
+ }
+-
+-Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Stream)
+-Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Streams)
++}
+ 
+ KWayland::Client::PlasmaWindowManagement *WaylandIntegration::plasmaWindowManagement()
+ {
+@@ -207,8 +202,8 @@ WaylandIntegration::WaylandIntegrationPrivate::WaylandIntegrationPrivate()
+     , m_fakeInput(nullptr)
+     , m_screencasting(nullptr)
+ {
+-    qDBusRegisterMetaType<WaylandIntegrationPrivate::Stream>();
+-    qDBusRegisterMetaType<WaylandIntegrationPrivate::Streams>();
++    qDBusRegisterMetaType<Stream>();
++    qDBusRegisterMetaType<Streams>();
+ }
+ 
+ WaylandIntegration::WaylandIntegrationPrivate::~WaylandIntegrationPrivate() = default;
+@@ -228,25 +223,25 @@ void WaylandIntegration::WaylandIntegrationPrivate::startStreamingInput()
+     m_streamInput = true;
+ }
+ 
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win)
+ {
+     auto uuid = win[KWayland::Client::PlasmaWindowModel::Uuid].toString();
+     return startStreaming(m_screencasting->createWindowStream(uuid, Screencasting::Hidden), {}, win);
+ }
+ 
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode)
+ {
+     auto output = m_outputMap.value(outputName).output();
+ 
+     return startStreaming(m_screencasting->createOutputStream(output.data(), mode), output, {});
+ }
+ 
+-bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream,
+-                                                                   QSharedPointer<KWayland::Client::Output> output,
+-                                                                   const QMap<int, QVariant> &win)
++WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream,
++                                                                                         QSharedPointer<KWayland::Client::Output> output,
++                                                                                         const QMap<int, QVariant> &win)
+ {
+     QEventLoop loop;
+-    bool streamReady = false;
++    Stream ret;
+     connect(stream, &ScreencastingStream::failed, this, [&](const QString &error) {
+         qCWarning(XdgDesktopPortalKdeWaylandIntegration) << "failed to start streaming" << stream << error;
+ 
+@@ -255,30 +250,26 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+         notification->setText(error);
+         notification->setIconName(QStringLiteral("dialog-error"));
+         notification->sendEvent();
+-
+-        streamReady = false;
+         loop.quit();
+     });
+     connect(stream, &ScreencastingStream::created, this, [&](uint32_t nodeid) {
+-        Stream s;
+-        s.stream = stream;
+-        s.nodeId = nodeid;
++        ret.stream = stream;
++        ret.nodeId = nodeid;
+         if (output) {
+             m_streamedScreenPosition = output->globalPosition();
+-            s.map = {
++            ret.map = {
+                 {QLatin1String("size"), output->pixelSize()},
+                 {QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Monitor)},
+             };
+         } else {
+-            s.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}};
++            ret.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}};
+         }
+-        m_streams.append(s);
++        m_streams.append(ret);
+         startStreamingInput();
+ 
+         connect(stream, &ScreencastingStream::closed, this, [this, nodeid] {
+             stopStreaming(nodeid);
+         });
+-        streamReady = true;
+ 
+         auto item = new KStatusNotifierItem(stream);
+         item->setStandardActionsEnabled(false);
+@@ -303,10 +294,10 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+     QTimer::singleShot(3000, &loop, &QEventLoop::quit);
+     loop.exec();
+ 
+-    return streamReady;
++    return ret;
+ }
+ 
+-void WaylandIntegration::WaylandIntegrationPrivate::Stream::close()
++void WaylandIntegration::Stream::close()
+ {
+     stream->deleteLater();
+ }
+@@ -390,11 +381,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::WaylandInte
+     return m_outputMap;
+ }
+ 
+-QVariant WaylandIntegration::WaylandIntegrationPrivate::streams()
+-{
+-    return QVariant::fromValue<WaylandIntegrationPrivate::Streams>(m_streams);
+-}
+-
+ void WaylandIntegration::WaylandIntegrationPrivate::authenticate()
+ {
+     if (!m_waylandAuthenticationRequested) {
+diff --git a/src/waylandintegration.h b/src/waylandintegration.h
+index 04319c9..b8e6a00 100644
+--- a/src/waylandintegration.h
++++ b/src/waylandintegration.h
+@@ -9,6 +9,7 @@
+ #ifndef XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+ #define XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+ 
++#include <QDBusArgument>
+ #include <QObject>
+ #include <QPoint>
+ #include <QSize>
+@@ -28,6 +29,23 @@ class ScreencastingSource;
+ 
+ namespace WaylandIntegration
+ {
++
++struct Stream {
++    ScreencastingStream *stream = nullptr;
++    uint nodeId;
++    QVariantMap map;
++
++    bool isValid() const
++    {
++        return stream != nullptr;
++    }
++
++    void close();
++};
++typedef QVector<Stream> Streams;
++const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream);
++const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream);
++
+ class WaylandOutput
+ {
+ public:
+@@ -110,8 +128,8 @@ bool isStreamingEnabled();
+ bool isStreamingAvailable();
+ 
+ void startStreamingInput();
+-bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+-bool startStreamingWindow(const QMap<int, QVariant> &win);
++Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
++Stream startStreamingWindow(const QMap<int, QVariant> &win);
+ void stopAllStreaming();
+ 
+ void requestPointerButtonPress(quint32 linuxButton);
+@@ -123,7 +141,6 @@ void requestPointerAxisDiscrete(Qt::Orientation axis, qreal delta);
+ void requestKeyboardKeycode(int keycode, bool state);
+ 
+ QMap<quint32, WaylandOutput> screens();
+-QVariant streams();
+ 
+ void init();
+ 
+@@ -132,4 +149,7 @@ KWayland::Client::PlasmaWindowManagement *plasmaWindowManagement();
+ WaylandIntegration *waylandIntegration();
+ }
+ 
++Q_DECLARE_METATYPE(WaylandIntegration::Stream)
++Q_DECLARE_METATYPE(WaylandIntegration::Streams)
++
+ #endif // XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H
+diff --git a/src/waylandintegration_p.h b/src/waylandintegration_p.h
+index 220ad3d..e95f6a0 100644
+--- a/src/waylandintegration_p.h
++++ b/src/waylandintegration_p.h
+@@ -53,15 +53,6 @@ private:
+     KWayland::Client::PlasmaWindowManagement *m_windowManagement = nullptr;
+ 
+ public:
+-    struct Stream {
+-        ScreencastingStream *stream = nullptr;
+-        uint nodeId;
+-        QVariantMap map;
+-
+-        void close();
+-    };
+-    typedef QVector<Stream> Streams;
+-
+     void authenticate();
+ 
+     bool isStreamingEnabled() const;
+@@ -69,9 +60,9 @@ public:
+ 
+     void startStreamingInput();
+ 
+-    bool startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win);
+-    bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
+-    bool startStreamingWindow(const QMap<int, QVariant> &win);
++    Stream startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win);
++    Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode);
++    Stream startStreamingWindow(const QMap<int, QVariant> &win);
+     void stopStreaming(uint32_t nodeid);
+     void stopAllStreaming();
+ 
+-- 
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch
new file mode 100644
index 000000000000..3c1284108b20
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch
@@ -0,0 +1,28 @@
+From d74e7dce1d333107760a8ae8d2bdd7521d31a09f Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol@kde.org>
+Date: Sat, 28 May 2022 03:37:14 +0200
+Subject: [PATCH] screencast: When we stop a stream, do it actively
+
+We were just forgetting about it.
+
+
+(cherry picked from commit aa531bde14a13521f99ae8e44d6e83bc8749d761)
+---
+ src/waylandintegration.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index b1b2d4d..44d862a 100644
+--- a/src/waylandintegration.cpp
++++ b/src/waylandintegration.cpp
+@@ -328,6 +328,7 @@ void WaylandIntegration::WaylandIntegrationPrivate::stopStreaming(uint32_t nodei
+ {
+     for (auto it = m_streams.begin(), itEnd = m_streams.end(); it != itEnd; ++it) {
+         if (it->nodeId == nodeid) {
++            it->close();
+             m_streams.erase(it);
+             break;
+         }
+-- 
+GitLab
+
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
index 302a1ac2c35e..4b47e51dd2d4 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
similarity index 76%
rename from kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild
rename to kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
index dce949206335..19da2f8c087b 100644
--- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE
 
 LICENSE="LGPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 COMMON_DEPEND="
@@ -42,3 +42,10 @@ RDEPEND="${COMMON_DEPEND}
 	sys-apps/xdg-desktop-portal
 "
 BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
+
+PATCHES=(
+	"${FILESDIR}/${P}-show-screenshare-notifier-more-prominently.patch" # KDE-bug 452980
+	"${FILESDIR}/${P}-screencast-stop-stream-actively.patch"
+	"${FILESDIR}/${P}-screencast-dont-provide-every-running-stream.patch"
+	"${FILESDIR}/${P}-screencast-close-only-streams-of-closing-session.patch"
+)
diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest
index 26374dd02c9c..2ff89f5be9b5 100644
--- a/kde-plasma/xembed-sni-proxy/Manifest
+++ b/kde-plasma/xembed-sni-proxy/Manifest
@@ -1,6 +1,4 @@
 AUX xembed-sni-proxy-5.20.80-standalone.patch 2090 BLAKE2B d56e29d6bdf62bd4fea74c963e6af642c956b2907a2995335845d730b11ab09b81bf535edceecca2bbc7fa44552bc1659e5e59e95415470fe77a7bece759ba4a SHA512 8eb77b1a97715d549164cff12dd4d1b63af2d0f8bbcb447d47b4ec82f539e37dad5395e0a7f8fd5c700fc82e06569313a36cf1f7e6eca09ad6d18bb890dbb9fe
-DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89
 DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996
-EBUILD xembed-sni-proxy-5.24.4.ebuild 1015 BLAKE2B db108b3c849fba5b6b1e2dfa0e66fdd730c9b983b7c53ae54d5123678e43d0dc9153cc016a30fe08316035a779c8c4e9b83e569b5097d26470a25e2c0dc58a3a SHA512 b09744ad6078ba7b097b14047d92f7e447647c99caf489bb74d9eb4ed89a7d69e46c851284e401bd937df43cc28324b69419ea4e7a8ffca6431b03f95d9505cb
-EBUILD xembed-sni-proxy-5.24.5.ebuild 1018 BLAKE2B a658a977463c9812864123305492f01c37231884a1968de9d144597305ead16583a0ac6176865cf5b06808c0b5f672aefc0814a089575d426e24644bbf6b9aab SHA512 e7bfdaf3795a863f9dc769c36b962b2e5d82d4234d6c0bd14599ea9bb74a1e3a1659c6d3864ea1d41a991b19dd7b3a3e1544606bc578d6305950d83b1f833957
+EBUILD xembed-sni-proxy-5.24.5.ebuild 1015 BLAKE2B db108b3c849fba5b6b1e2dfa0e66fdd730c9b983b7c53ae54d5123678e43d0dc9153cc016a30fe08316035a779c8c4e9b83e569b5097d26470a25e2c0dc58a3a SHA512 b09744ad6078ba7b097b14047d92f7e447647c99caf489bb74d9eb4ed89a7d69e46c851284e401bd937df43cc28324b69419ea4e7a8ffca6431b03f95d9505cb
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
deleted file mode 100644
index 4930f2576348..000000000000
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-KDE_ORG_NAME="plasma-workspace"
-KFMIN=5.90.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-inherit cmake kde.org
-
-DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
-HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-
-DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=kde-frameworks/extra-cmake-modules-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
-	x11-libs/libxcb
-	x11-libs/libXtst
-	x11-libs/xcb-util-image
-"
-RDEPEND="${DEPEND}
-	!kde-plasma/xembed-sni-proxy:0
-"
-
-S="${S}/${PN}"
-
-PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
-		-i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
-}
diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
index b73f5cac8f27..4930f2576348 100644
--- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
+++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sn
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-qt/qtcore-${QTMIN}:5
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 263bb12a9105..409de20d8104 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 5f5988117608..7fef7a990563 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,7 +1,9 @@
 DIST evolution-3.42.4.tar.xz 12285100 BLAKE2B dd02c84f4eb868b8a266b5d9a2383e16c095c073cd2849b96bee842b8ed67f0af803f14a867202321ad373148f80de142baf7c05b96bf4c84a62f881f5b26c8f SHA512 4319d19089269e53bb751408d5cec1609a245dd366a30ad6e2e117f074ff0b2f55228a5dbcc9af661846a253c0860a61a8648bd582b395851e21e152ffe0b1aa
 DIST evolution-3.44.0.tar.xz 13102720 BLAKE2B 7081cd8a90bb42ec9daba13664230df8a3b465137933b4a90537b51dca94befdf18675bd9f93e3050db95b60783f5dc06783362dba3d603e1708fd469bee167e SHA512 607c6b40717ffe6b0bb9c04897b6e4ea64f47ddb67337f7481bb358a10f489fcad3c5102e6235f7f4098687867762ff12ee86a930f62467604fe4d5fc1de5ef6
 DIST evolution-3.44.1.tar.xz 13106280 BLAKE2B afd4516f25caa8fd6d1510b2cc4c1051673f8a8c1c51dfa452f87f3312e844cb8fcd79064d3bf4a03554af04c70179af812be34681ba5ac5e1d6449f3bafa561 SHA512 c8deb23f4fb7848843cb9845d10d9509e7df0f4b21c439f85c530801b9ed04f05727f1ab2dd4af5b1419263fd87240dc5950fa1e15ef417f2e64134f13a3b6e0
+DIST evolution-3.44.2.tar.xz 13109776 BLAKE2B df01a14db82902da97e52dfea6b4b3a3839a9b801d5422da360e9379786be3e736a2b6c91a2f850c76f288c196b98fe98ea48cbec080e094bd6f2313c65f95c9 SHA512 e7dffc5cb4a9a84cccf881c75ba347f9bae3c87fd76613c9cc363bab9aeda864288ca93b48347c08c82734f20f237d489d3670789e2b38b7ed5efbaa9b8ca4a3
 EBUILD evolution-3.42.4.ebuild 3880 BLAKE2B 6f85910a08f61565efbc4a162c1876806d365db44eb9d26a6b4cae118274b7a2818362837bb8fb91b176342cd49c0ae3b21d1fd42948bb90fb6bcdc88dcf89c1 SHA512 5a6ace57dfbacae79f2f54d243871f7ac06f50e657c2107630d561d083a4c478935c15931fd562171e58445530301618fd9807f47f1436fdcb6c62dcdc380384
 EBUILD evolution-3.44.0.ebuild 3960 BLAKE2B b0e11777650bad27d79c338447859d4b799e28056f9c35bbbd78d78750e200aee7206c7be3f96b90ea23d7f52c983bfe2c92408f89e0ce881dc5cbf53be7fe53 SHA512 eaccb0d496202b5c05928441c11719671518beee760795f200bc32328a7b9ff46c524e9ca5615f5397848153a1486533486e156983897efe19873f763d094627
-EBUILD evolution-3.44.1.ebuild 3972 BLAKE2B 4be9bc4cc5905410604f9d3adc9afed3b1ad074e995cd78e25663ab746006da0258d491a00c18fe066f6f6a8ffc0a2a0274d94a5ee88e090715ef08cdca26e4c SHA512 2f089477668ba656d430efc30690389ba2f3adff0bb4e1185194551d9ad6f52982ab832dee1dd61d5cd2e99ca2e39a7a89435a8d254592d63e74a3379059b588
+EBUILD evolution-3.44.1.ebuild 3969 BLAKE2B 17bc0730f78a1701d411dc7b17a7af5761a3eaef2ece50075cc431a579ae94906edbea3057f07ccb36a8340a5c72a8104078ea53106794972b81054e4bb2ef43 SHA512 1f45155b9492f11ad526b8c8beb42f261f47d948affc6c762afe2df06ef8e6ae32ab821c5a89f6f61731555db91df58854f2b3f520f96a88b594cdba0d9efb96
+EBUILD evolution-3.44.2.ebuild 3972 BLAKE2B 4be9bc4cc5905410604f9d3adc9afed3b1ad074e995cd78e25663ab746006da0258d491a00c18fe066f6f6a8ffc0a2a0274d94a5ee88e090715ef08cdca26e4c SHA512 2f089477668ba656d430efc30690389ba2f3adff0bb4e1185194551d9ad6f52982ab832dee1dd61d5cd2e99ca2e39a7a89435a8d254592d63e74a3379059b588
 MISC metadata.xml 1078 BLAKE2B b3a32d1876342fba5db22aae478cf1194df56f01719c6322f13a069e9fe8d1f17123b9592e0a0c5c25ac856ddbb9d20266bc11ce7c9a4737aa7dd43e76c0aa8d SHA512 9c3da89a72cc8235f73fb98b2cbe21597a4889ebd4d989a98e105613e131a42236ed115c0ac88cb87a312a43123c5bdcc44aa76328bf3cd537367553691408f1
diff --git a/mail-client/evolution/evolution-3.44.1.ebuild b/mail-client/evolution/evolution-3.44.1.ebuild
index 13328af7ef15..2b66eef3b27e 100644
--- a/mail-client/evolution/evolution-3.44.1.ebuild
+++ b/mail-client/evolution/evolution-3.44.1.ebuild
@@ -14,7 +14,7 @@ SLOT="2.0"
 
 IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
diff --git a/mail-client/evolution/evolution-3.44.2.ebuild b/mail-client/evolution/evolution-3.44.2.ebuild
new file mode 100644
index 000000000000..13328af7ef15
--- /dev/null
+++ b/mail-client/evolution/evolution-3.44.2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake gnome2 readme.gentoo-r1
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
+
+# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
+LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
+SLOT="2.0"
+
+IUSE="archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# glade-3 support is for maintainers only per configure.ac
+# pst is not mature enough and changes API/ABI frequently
+# dconf explicitely needed for backup plugin
+# gnome-desktop support is optional with --enable-gnome-desktop
+# automagic libunity dep
+# >=gspell-1.8 to ensure it uses enchant:2 like webkit-gtk
+DEPEND="
+	>=app-crypt/gcr-3.4:=[gtk]
+	>=app-text/enchant-2.2.0:2
+	>=dev-db/sqlite-3.7.17
+	>=dev-libs/glib-2.56:2[dbus]
+	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-base/gnome-desktop-2.91.3:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
+	>=media-libs/libcanberra-0.25[gtk3]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.28.0:4[spell?]
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.22:3
+	>=x11-libs/libnotify-0.7:=
+	>=x11-misc/shared-mime-info-0.22
+
+	app-text/cmark:=
+	>=app-text/iso-codes-0.49
+	dev-libs/atk
+	gnome-base/dconf
+	x11-libs/libSM
+	x11-libs/libICE
+
+	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
+	bogofilter? ( mail-filter/bogofilter )
+	geolocation? (
+		>=media-libs/libchamplain-0.12:0.12[gtk]
+		>=media-libs/clutter-1.0.0:1.0
+		>=media-libs/clutter-gtk-0.90:1.0
+		>=sci-geosciences/geocode-glib-3.10.0 )
+	ldap? ( >=net-nds/openldap-2:= )
+	spamassassin? ( mail-filter/spamassassin )
+	spell? ( >=app-text/gspell-1.8:= )
+	ssl? (
+		>=dev-libs/nspr-4.6.1:=
+		>=dev-libs/nss-3.11:= )
+	weather? ( >=dev-libs/libgweather-3.91.0:4= )
+	ytnef? ( net-mail/ytnef )
+"
+RDEPEND="${DEPEND}
+	highlight? ( app-text/highlight )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
+# global scope PATCHES or DOCS array mustn't be used due to double default_src_prepare
+# call; if needed, set them after cmake_src_prepare call, if that works
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DENABLE_SCHEMAS_COMPILE=OFF
+		-DENABLE_GTK_DOC=$(usex gtk-doc)
+		-DWITH_OPENLDAP=$(usex ldap)
+		-DENABLE_SMIME=$(usex ssl)
+		-DENABLE_GNOME_DESKTOP=ON
+		-DWITH_ENCHANT_VERSION=2
+		-DENABLE_CANBERRA=ON
+		-DENABLE_AUTOAR=$(usex archive)
+		-DWITH_HELP=ON
+		-DENABLE_YTNEF=OFF
+		-DWITH_BOGOFILTER=$(usex bogofilter)
+		-DWITH_SPAMASSASSIN=$(usex spamassassin)
+		-DENABLE_GSPELL=$(usex spell)
+		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
+		-DENABLE_WEATHER=$(usex weather)
+		-DWITH_GWEATHER4=ON
+		-DENABLE_CONTACT_MAPS=$(usex geolocation)
+		-DENABLE_YTNEF=$(usex ytnef)
+		-DENABLE_PST_IMPORT=OFF
+		-DWITH_GLADE_CATALOG=OFF
+		-DENABLE_MARKDOWN=ON
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 2efa00851210..cc1dfa00e90d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -5,70 +5,6 @@ AUX gentoo-hwaccel-prefs.js 162 BLAKE2B c5f2dfb727081e2d538c262f12c0cfdda31cbda5
 AUX icon/thunderbird-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f55de86b716b28a3df6470594a612e07acda4c7dcdb48b6d55930972592f7f01afbbf14f09ccc4b20265d3c18554a01a2c SHA512 689c9fa5c37a1e6ee80a3dfaebec2a185d91508537c35ce2fb35d13d89b16ae0cf3c640c3115a52c0e4b7a7624aee6a8f8c52679a0073c94dea25cc779ce624b
 AUX thunderbird-r1.sh 2896 BLAKE2B 140047417b24e959fe6388c4913457f8e3e786158b7394abf7442b0d2e83de21238e58983845a23b855e1aab60c9289e1a12af430eac9a8b2d9929da97de2852 SHA512 f9b989152a8a3ac274033722c77ec19374085654ad6c85ea4db6f8af8f4b2066d6d9f82b610be2db341c8ac867547f54f806ca6571258ed98dd9e2527d21b357
 DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7
-DIST thunderbird-91.9.0-af.xpi 561893 BLAKE2B a960b28e1076edb28253d6ba37cbabd7ec5e28390b2a03d3534523bf38526fe53c39662962253e796a86e78765e1f2464aaa8834ab89d8347d4d52ce1b04f5b0 SHA512 88ff48ab1881908070abe982cf3de1b6d2e956a7a8b12f2504369e27e1a6f7b00af3cdfccc6f6e6eaba916f05811b88b8ef36218373c1fd709ab5814ad94e67c
-DIST thunderbird-91.9.0-ar.xpi 665729 BLAKE2B 89a32911b8efaef9865458440cad6c184df9c70b5aafa580ee49d520dc729f7885eeaeaf83fc28a25b8f5789e5b2e3364beaaf2aa7b87e0cdc5924d5046b8b6c SHA512 ea28bb9b5b13c0d93429239e27f4166a1c408b21973c850482ddf717addfb900e418930dbbfdc86ba6f41a4b561584ca6d3ae4d9118a461ebd856b9b9fe6b488
-DIST thunderbird-91.9.0-ast.xpi 580510 BLAKE2B d8af41d54f8b555f678b4f0ae1139153a7d82b7f330f8546b583a7e641b5553b0c1d257a4fd28857f20172416426c1158dae273dd357481f281c4e1a62335e72 SHA512 673575fc93a75631b443ed09df2c3c211f980059202494bd8320d9c4e7d2bdfe7611b83eda7d2c08695cfd7dc7adbbd7edf99e9419d36726434ec5bbd2f61a8e
-DIST thunderbird-91.9.0-be.xpi 695198 BLAKE2B f8886653e14038f8866da66f1bf5d1d68e76706b507e17a7085e4ec90651f16edb2ba1ce87fbba2ee90e3cfd408f7ecfebc331edf0e3474ff5f71662fd742a02 SHA512 578dacbda7a6d1fa9759b6bfc2c9118a2918777e19d9f07d32b35b30f8d2e285c69a8bd446d970f135797a41b233fa21a7e73e593bb5d264584e256ebe9e4ccf
-DIST thunderbird-91.9.0-bg.xpi 690995 BLAKE2B d7493477749b8fbf720b24857c4e1245bcfc2b130f092d7499c9aaf9e7266c8d25465ca15df6a94a5209b2d792378cac45c3c6eb571825099bbfa793cfbd1e0c SHA512 e6b73c1d372821c0789c195042461ba5339893ca877c63ee3a49f34f8a362e2d1af0eb259168eb0d81565f01f5550e00ee33ac8570d25c3edd4b5ffc10db8444
-DIST thunderbird-91.9.0-br.xpi 620587 BLAKE2B 3a6f7b3ff36005e9039a52b80dd7750da7686b883610f5fbb531ee3b078d3e135d3a1f65890eea6d88eed497fd2a2f2d7db1e2e6ba695b9ae19c328d4a6d5cd5 SHA512 54c160a072b51749c4362ea2dadfdf2a1a01183910e8986b33a93f2882218a8f74e250a7bc9fd1c4c9c8cb13c8a5569b0c4a44a91f89f52128ba63a5d86e50bf
-DIST thunderbird-91.9.0-ca.xpi 645974 BLAKE2B b149440506fda3cd1512bbe2ed5296e85b2d03d2de2b64a993c3a0797340deaaa0d161eba1f63584ce2065c056b9d9d769191725f3b75ed7affa3ab678b47654 SHA512 af31836f18d45886d8da2fadf9052f6df60f1d4727dde10e21a14e26590a579b4d712cf9a6349bf49a47378723b003f0abbe648e1ec6898924c2256709b4910f
-DIST thunderbird-91.9.0-cak.xpi 652066 BLAKE2B b9b8f3b6005d1b4e4b8d04d87e77ee2080b0db92b8d653fd85d29f506a58adea2a41063d9f092683cdfe0e727d833f3c6ede97e5192be59550b0a7025a932b31 SHA512 de05481fefc407713d6d62132099526aa065a4b29c320f4132f622f81d205149f18a7bc7bb60897b2739dabfb72017a2f68cd2427178490b6bd3220101282db8
-DIST thunderbird-91.9.0-cs.xpi 711939 BLAKE2B 9c5db0a812dc8ab627093e6ebd466db6375d9a1959d5ec404f24dc6f4a78012e31c446c8c3d82af0eba6043479f39ac83ebd09132727442c4887c16eacf2d19f SHA512 a2199359fd70a7fe19c21028c81e51267d66b908a39434cb9c4166ccab552a5f755e10677a7a2701e1c0514bf6c2d48495c15805403339f01eadbc1b98ee71b0
-DIST thunderbird-91.9.0-cy.xpi 688889 BLAKE2B cbf6edb5fab8202c2e5c5eb711fa659c71175d524c0716dcfbd31949b37b7f5cbc95b15a57aa6ce1952e5699942be1e0bab255480ce68d45158e280f9d94bb23 SHA512 354f373faed70932a19aa62a6159c56dd85b7e06576497e8ab954d1293c7393aab20bc8ae03527860d24e69c949963af06606098a87c904eba837af41401a937
-DIST thunderbird-91.9.0-da.xpi 674445 BLAKE2B bdc17f982af80ba85a5138ef3650d33d5129f12a4d4f28211a999f5012fffd9ed8031a83cfbbc1b516b26738c718c1c94deb3031cfbc06f9360a5edcc053bbad SHA512 085e2b7af5b01636721dd0162925677e983fd016eba2247a5b5ebf856014e7228cf70b9fc70390cd42575488cb7f3becc63b75777953adcfe6fe93cbaa7622e1
-DIST thunderbird-91.9.0-de.xpi 697527 BLAKE2B 452cff7e8ca3f7d10f58504dedbcc42a01e766429ff434bafce3b39e7758cc8fbb20b7652f98f5cdacb2f92f05193e9fa83afa5f1b45aeb34bd6ba15ed80c769 SHA512 b639499d8aded54909098515ded0b522d8d219b4d0ab8a665a4e273f9b103090775bdb15592f369a146e0f72b7d553f54f7f8855896750b6e7590ac22144f182
-DIST thunderbird-91.9.0-dsb.xpi 724000 BLAKE2B 9f5f34878c3297aa32050beb31807356ff1921773fc60a0f7922db3bd14e2facaffc42b9b09a2179554121b2cdb7be1d02911b112f156c7f5d4d65f071752b51 SHA512 53971dbd9aaf39a08b5b90b961a63e4ff82a994efede605df6aa88984ab16732e18885ec1abe8aa4e974ebe5a475079de0dea3275498c50080ff5e9ef5be86f5
-DIST thunderbird-91.9.0-el.xpi 821181 BLAKE2B 8f1eab436fe7885a72486ccad10266df3dc42dc2468807589708cd42baad1b5bfa96a797236bf541951fbf9ec9a532f36db9364e911da52d0c3c985c118eca27 SHA512 d58983a1473915922c913d42e2c6ce2346cf6221d27c0ac0ec303c99552586752bb381e473d8a669214828a3d446b8303b6a24c63704ceeb658cc4b1f2604ce6
-DIST thunderbird-91.9.0-en-CA.xpi 647813 BLAKE2B 5da9891b01efac97c970784178c5a9fdd8c542d9ea72c01a0f03b97e74d371bcf6e6cb19e40c0727c0b321c0bf09bf30ca3c163f6f10f3ec9ae1395242c1e492 SHA512 56608d95b5d79544b5649cf3e8d7d108098f072b9fb1136dd305369a106966acaabc8c0f4ea399c77c726eed5cedd38b9b965c4affcada704362387b7b89b932
-DIST thunderbird-91.9.0-en-GB.xpi 650553 BLAKE2B b215bf535dd86ae2ea53a5f1464e2a3d18517c4f9f6d7219d558c38c33fc92b8e747f7910ffd7e8a05773a3322cd1e08f936844a2b902bf4ec20c473b75591cf SHA512 71b4e64388c03c736910b5684375c7c97ac26247304d21d34952e7427613f72997ddf7b972b73c48fc5b60dcbfbbc71476fb71fc278275dc3b958ab105896911
-DIST thunderbird-91.9.0-es-AR.xpi 700497 BLAKE2B f809ef5107e619e085a4a4fd3ef56806d93769d582809ddcde1cdb0b75980b7d19d65e6e2e322e9445e79b2f335f88b3fe41e5ed344f201ac0ea5312c3e23095 SHA512 281362a6155144a20a4671127530a5abde1fb3a8d8f6fa7555cdb11f335787eca20c1a65513ac0124d7cc33b0b1afce5454fcebc4323270821da52e77862b199
-DIST thunderbird-91.9.0-es-ES.xpi 630920 BLAKE2B 1196ff9935b0b2e64ac033309944503f4c9778caddbfcf2eb76af913db83999fe59cd24cea65b68529515501037454a338e55b83cb80650c0d1e358062a15c95 SHA512 dfac9afd8fb756c072382cdb5ff47974a0b846b8fe5ffca81581fd07167d4f24416e4d3cf1ecea163f5c278c9130a00c061139ee79edf2e18cd58e30f9d4cb06
-DIST thunderbird-91.9.0-et.xpi 672170 BLAKE2B c5e555ea9a88a175a70a1ed6c0478cadd0e0e20029cf1efb52073f19368f8ca231fccb583f5aece1ad982f15d42265c75ae21aad7b6b2481e53c6a292a6c53c2 SHA512 fa6b590ace0ce60e36241479466fa67179d9514bea80d61ce1343fd418aa37b8f46e693d6ec6004bd91fd96b5725cd940d329a65de6773f44c16066179730a33
-DIST thunderbird-91.9.0-eu.xpi 678262 BLAKE2B be60dbb231b6264476f990120d4ec79549660e97c70e610c92a6568c3d4068bfff37410a1bd079b4a5d1c31620dda037c4334fff054657e0cf0e2d7502f71041 SHA512 b7bbc9321e122e32bd615390d326c12fab1090cbb5bdae04acacdc377d76126f1c5e90b588215ff6eb2c5e9c1c6b147f5777af2eac2f03d63962f1c2ab0ddf44
-DIST thunderbird-91.9.0-fi.xpi 676630 BLAKE2B 8a2a57814b2395b04f1db3bc96268452456e0699e4318dc4a2fd0c82df7bbbeec33fb248c7886cbcf0076f7f5dee111aa3780e900288c00de0889aecdd7eb6b5 SHA512 ee2e6d538ead1921ed7936a691bcef876283c559a78c19fc66c4e17d3c0d7f673152a0c929ba260877fca579978c2891edcbaad6c59c73236e63e642f8df8afb
-DIST thunderbird-91.9.0-fr.xpi 711454 BLAKE2B 6b35a7495d0d38fbc20d114e2882b9a265ffb0efe290a2b5edec3fdbf31f8d66b78e496a0077d42c6bcb967f4e4a683fbeaa8cd331e951a55f4b2bf9d648d1e5 SHA512 7cb80474ebc3ede31377ffa41816c131cf199917ef144a9c5c888953c64463e36477837d9e9636f72f732ae3299dd4feead55e866bef0beb85bc8f1cffb6de3f
-DIST thunderbird-91.9.0-fy-NL.xpi 691879 BLAKE2B 4a172455c0f6dbcbd542df9b4e327f34500ca2216fa625fa51a47acd2edcfba42c5392f235b3d163b2990d1b3ce37b78b9c3ed150955da46c668fe780ae88df3 SHA512 a84a8eeb69ab9b3f0394e05318455c4c7c13169a835719805a1643f6a13c10ffe4466440e134dcd3d88f62ece4e6941e279b78dd8674f6c86796ea160e79728e
-DIST thunderbird-91.9.0-ga-IE.xpi 613123 BLAKE2B a998ee6a2064f2bb1b3bb34aa82b8585a5d9d7669f4ded7d1010b83c5a1488efb4d4a66c03b2cee78c5056e766fa5a479db7cb8747817fed949279ce5e97666d SHA512 1ab01b0933073d1e21d89018f75918d12adea1dc8fc9fefa7a439570c675f8602f1bcfd785e661169c62f01b748965dcf7ea622b92b198bcd5f8b84a7b6de28b
-DIST thunderbird-91.9.0-gd.xpi 640647 BLAKE2B 53ce6b0a81e7232ec68c3b0bf32bef6e199fdc2dd01fa0c5958ca955e18f22aead55fc8512055d61150d4da063e694ccbd97f6ae43bb24774c0a708086d040a5 SHA512 f6a84137ba5250c328b37a3536713b9ec720da023e5f0d36c559f08af63b063529263a8f5ece62f7d14200334f579ca538bebeb0f426b09d9fb45a6be85a041b
-DIST thunderbird-91.9.0-gl.xpi 677788 BLAKE2B 144c036b99b94af984d01a75aba0a870fef392489fff3ee79921c0431a3d6d52af4bb69b95078c166f41dd594ef65c35c4f500a9a2f86a38bcfe9d45c9695055 SHA512 97ad8be20e96bc44b26836df8422cf52131c12632369404bbc19aeb2a286d7724da3d4eed0ad26380ab056743d3e699a7ff8bb3f6f7ad4cfd99de3ff706210a0
-DIST thunderbird-91.9.0-he.xpi 673190 BLAKE2B 2e22621ee9dbe0bb913b3fa75ad7bb7dc02ebd833ae168260afefb9feb39d7b6432369a7218664b864fa915c07955c150efb7dfb3eb841a34b58dee3f39229c6 SHA512 0ad821aa399d3d8e5c6c9c4f50b7f2965b3aa0acdac03f033ae82096e1f0d28eafbf127bd67aaf0dab02fe09102de78dafd3e0666ac818ca448ee304ad4df689
-DIST thunderbird-91.9.0-hr.xpi 653579 BLAKE2B 61299c76d6dfcd7ad45735258cbac3ed52a12ce5286b17f132e4dd4021a8803651d38a16c80f315aeca1c07fd98ce3ccbc8635f3407390b35539a52d2ea9e25d SHA512 88cb14042028e2d71719d58c64a8a5e7c2cb61a041d24af7632424ec11dd4db2ea63e74b96e46e389f76ecd0f30c3827af3eeb60130dad89b8a24e92269341ab
-DIST thunderbird-91.9.0-hsb.xpi 720812 BLAKE2B eaa0d2334a1dac1b1d46fc3846500714b9a1315209e18f79495b6936093b1c6fe1e9c51115e70fb3aec5bf33181adc6a7c20a4c0a7fca7a91e1bbe968d31886a SHA512 a9ecaa1f1cffeb7ccfa4535980162e382a7de352429692a55aee9b9bdcda16ed8e0170dde55f88a8cbe2ff2809d36f2458b8f7173cfe75b09d4270a86fc717d4
-DIST thunderbird-91.9.0-hu.xpi 723400 BLAKE2B 4fee3c754f5753cddf8e125e05da74932379a042c69bbb86526a3583519e7de8858fc2986d8f41bccfcee0043444242dba993df14e518cd1a6ecac37ced6facc SHA512 5a5b4ab9861d8e112011357e78d9b0ca9c381bd573fc1964c6f611f6c0a7f7b3959861ec18a7c18649170f42f3a46129e6eea8fc97310013100bdd267a8d3414
-DIST thunderbird-91.9.0-id.xpi 648249 BLAKE2B b95977ecc4a70d23e9f3569d9952141b2073e8043571eeba9d0ca53007409129bf0e9fa64816267fbba2c953dc5034909cb98b6912f8f08773411ef39fc36480 SHA512 9274dec833ee126465303506996e4910829c99b815c036ed489a1b483f4bae0cb24558055861d9318a95f3021a5226e2f2c732223754c1239f4907a5787e0368
-DIST thunderbird-91.9.0-is.xpi 682262 BLAKE2B 9f68535300adbeff02b138a7e598bd4d0cbc401eaec3ce5ba080f90813f05a3b632a0c4dafc130dd151cedc77931b59ae272d061c10186f9aafcefad270c0294 SHA512 138791eebd4362903a6288a9ca4cffd0d2d09ffd95413a21ca4df7c9c0f6977aa5c1f077154b5a0a735d97e40f83cb9b121debfa08a0b4ea9fcc9c3af25d058f
-DIST thunderbird-91.9.0-it.xpi 613333 BLAKE2B b333a3b3b59599e43cd7c6bca94a5f28be3cef7ae6fc87c7e33ed2b578ca1125e09b2986a2f5678eed784d9f62fa992f82cf735f012b97f9f69a38cc66f60097 SHA512 52a6f549f2771c57025074e39845ef0ffc8d002e21118766bbe7f8e304000c45dfab23e602bc7327807d3d8301d5619d35c5b460fee0288a0348903ed4f03f57
-DIST thunderbird-91.9.0-ja.xpi 756466 BLAKE2B b59314d0fcb4a2c6f32a72bcf69ffd317fb49ceebd1dafb235278f0ee686ab4a6402fd3e42c2d8b5feaaeec08315820165068b1cfe0705619766fe690a18ae6c SHA512 2f715c015a02efe66da4b19aaa27fb8c4f49c14687e7ab22c40615ea6b5051f13f9e5c4dd008177b66cd42a470a366613bf660b698d9fe3c0c801ba54625e419
-DIST thunderbird-91.9.0-ka.xpi 762629 BLAKE2B 03c749271b7a4d420277a42f1cdd6c207b6e728e63d7c3cb3209611bfd8f1802b7560443ce84f8daa85fabbf6a4b098507edeae924279d3b480b64f5b81cabbc SHA512 651a5eb8a641db3bc82357d24bf9a545e591b189c3973ee2aebc6a4403d579911f9d2caf27a1239822b478ec07724b6da2c613e3dc73b996ab457f6a714866c6
-DIST thunderbird-91.9.0-kab.xpi 677086 BLAKE2B c117239ae7513d54d830ef4865b93c18bdc51d2585a37c6bd53f2a2061062fa5753bf44ca05399e9bdc1152a15462fac4427be8e5fe02fe3367fd789a5d0f176 SHA512 1d5552138ddc896efd0855af3bc4587c57fdc8a323f35b1b6f574b4bf243745295002a62f6c1b2f2d448542e6f68bbbd7472e152d9e39283bf814eda08c0af7f
-DIST thunderbird-91.9.0-kk.xpi 745522 BLAKE2B 544b6cc5f219dda5091dc06c71ddcf9fa17b4844acfa47108e8093cb560c9c0a23383607670554c034e138afc924e416ede094eaf68b18ab32c1b012d92f1f86 SHA512 4751002ff331e59c4da910c068e2415394bd77663b7b87d5a82dd4533cab9f7504a4ed433824fc313554f5c49f6d0acc73979bf94a48e620c2f268e440c1f921
-DIST thunderbird-91.9.0-ko.xpi 704769 BLAKE2B 647ed171218ea862591378f5e1580fa55e1372140d5b239a0b3e8ecca9e3a763e3726e561521c1f265009e3f476b347965e812c98ae93ad53636e9240d3f90b1 SHA512 ab45b4eeadf6cd465b0bf90873f146b8094323af795e201f7b033863139559ca35afd546e4333b01cf1ebb9eef9864f5c49ab9ba023ce677e5762a1cc1892313
-DIST thunderbird-91.9.0-lt.xpi 696043 BLAKE2B f001d8ac1b63cebd0c1e2b3808e09c88f60eafbf300fad6ee0cc1e099a83a7fcb9a4ec1951c8dc3e5c418e51b46b6a55ab469eaa04e7dad2bb0976b785706f94 SHA512 8529ad40230fe51c1e2cc8eade56cd8a4d9458408e737996614bb7cf5bca4b3fcb83e995ef722d16a364d6e14ed04bf103592c5a97289a5d261e6d8f0783e669
-DIST thunderbird-91.9.0-lv.xpi 618523 BLAKE2B 17e1c9ac9745c4584f711ec31c1f481c55a9be02f8e2326d5696836de21504b6a8d6e24538e9b0af9942e5dbf20ec8875ef5d0136a74e58d3fe0a581d2cd25ea SHA512 ae0820426139aa1e88d509d9559141fc2048f9c3b931ac4fc609b5552b7458cf0fb404fcb35218f4dc168b98c334bab261bffe15c0670d99f755ee63295c0eba
-DIST thunderbird-91.9.0-ms.xpi 578079 BLAKE2B 595bcaad49cf1a840ceb3992161977283103a9879719e1788eb1037191d33f0995d4edf6de038a76b6a05339fe475d1be8cf6d939561af2c60ae730449477d37 SHA512 1f5451d97ddcc0cf88be6f788b564d1675217dd27b57c418884b421c76cee429499b0678a0caf7f4538b69f168cc562b84e18b8fd1663aabdaf034366ada81a6
-DIST thunderbird-91.9.0-nb-NO.xpi 653325 BLAKE2B 78c244ff057e58bd97e6e8741fcaf07d556cacfb690f143371b4cbd394a2cee02cec5dc334f009a79c28040ba5f689d325e7c9fb309c53e0ed13d98411fbcaef SHA512 755dea2d0608afd85782554d6d5fdd8a952f1b78e34d27e6eff3460bc21fa1acf4795f969803892bea39ab7f07a22847a1f2dfef1e11c056df3a1aa642368911
-DIST thunderbird-91.9.0-nl.xpi 685342 BLAKE2B e692fb2d0925f47ddd36317e47011ba55fa92e78cd675c084a8a362b70359008236cdb1145d9a57aa6da1b25c9e3b6957d00d5205dc8294e3f21f62f25805f4a SHA512 9c451d80f4c0494cea1786e26933c1563d767d32eeb957a24c138c353aee6c972f977130242ffd4648141238983cd9c945037f56a43297db4366efc5806adaae
-DIST thunderbird-91.9.0-nn-NO.xpi 658572 BLAKE2B 400c7c211b77d88de42b0e689c0d7cc80643010cefc219c09a2030cdfe90228b6c34b9a410751fd431afe9556a2ff54c422260735d5466ba36f82956f436f006 SHA512 0fa3bb155c9d30b7f5d47c2b7b26fc9130b3479144920a4214ad39c5f811806b085b756a62ced7840174835c621d5b0c5ebdb286d742fb320562233d91a92a8a
-DIST thunderbird-91.9.0-pa-IN.xpi 652334 BLAKE2B dc03b3385a6ca9a299dc6aef455a7f482049ac305fd7f592ed389184bf7f8ba6893f4c4ae96a1cb99415d04248d90eaf3725886d744d85eda35cb5c36b10c0d9 SHA512 a180f8388d958af5ce54b7ae55b73c0d36950f94c73499c784c6c3314297713b314c95774dd53375db4a8b47d40ba315ae2574027127469b48bcc8c2010df1c0
-DIST thunderbird-91.9.0-pl.xpi 694111 BLAKE2B 00d7b6aee28790b8abe758fde4e6473950e7dfceb56c7dbd465593283e0078a48726f1f69e68dd115e2b9d34590d30dbcb5c6cee074868c419619c797c78fe51 SHA512 3dd4254fc63f44bf9e8171a4f2a0c4774496857db4d5334ef587ab6b2d4bccca5748ee4228e11373945b81f6339e7095a65faa3976a7cb2034f59fd5b4fb54cd
-DIST thunderbird-91.9.0-pt-BR.xpi 694133 BLAKE2B 617276cdfe1ebe175d4b31dac5b60abed7ee0d9d47ef6ddce544a8bc597aa6a9e751736fd25cce76722fa09fa71e69b0840e90bd4e9cb8af853393822a714c4d SHA512 75e4f329e69a5362915ee15a3a9e83030f0013b1a8bae0bfe32976ae8d2915d7bad4e1a372df90fde78e7392d53aade50450350b9adee573931eb7af7a20e364
-DIST thunderbird-91.9.0-pt-PT.xpi 674674 BLAKE2B 7860059703f3c3f53c4947743c6c88b17f672a9cd1b3e55eccbe11169f9b44a4f699b0f2eb0011872d25a8f5b2260e532cea6dab93c04f8d4c7f56a22abe2403 SHA512 a41c5975f80e2a7b6199a4eb89fd14578b3eb003faf50f2cf8e8960c6283005f0170cddae897b446f31326e6efe811fda76fdf590985ed383089372dc0e90632
-DIST thunderbird-91.9.0-rm.xpi 687613 BLAKE2B 8876019fba14ac1cb3f6f325f2a2a1fa2323f4e566f83de058ec890862e27201a9a8e2a527c135c2862c3989da3b0df6be1734b818a65f4c576950f4b9fa8928 SHA512 249367a350a23c4f65c87b10598e08b708cdb645152f0405f98c14c407309f39862a4112865fbf22d2c3c388f4a9c1b0233322f88928e98f592d53c02ceb4533
-DIST thunderbird-91.9.0-ro.xpi 661345 BLAKE2B e58308083c72db3980cee4fbb1980a786f3599bf9c057312b2f7c6fca53b5f15d8d361868cccb622ef036c01382da65b63c2d89e16ecd4a07bac361bed2296c3 SHA512 b260a659a55d3722add2eba16ad3bb871e9b4ad206139d280fc304289cc38927e3f9052a5791cfdde82995844ec0e857fa7f0909fa02e88ca7eb3ce231b0dbbc
-DIST thunderbird-91.9.0-ru.xpi 793375 BLAKE2B e3dbf6f667490ad5784e14e2f7f16387f8ba0c8d5ed6db21359f1696c0ff6cb12578435468b25a3766873a24a0c5dbc62bbd29148217e31569e64a855f0a2c4c SHA512 68f636e51bfcadd3bcfaf474d646786573f103d21d2a74b0b10efb7ea7c224e9712a78a46411850909c9cb51a3b2cd9c9986001df8c4871875516ba86b1ec77c
-DIST thunderbird-91.9.0-sk.xpi 721092 BLAKE2B e12237d25e9de32ec9264a3a50a9a37e651d1f9cc01c61158a14e44446c4bc57dcabd98fb25f9b2b57b321fd9d8dd77442dfb8d25da473b33c769a3019dda5ef SHA512 a7b557163897aebec1c9f541320a08e0d6135ee4450e628697371cc07891870db3cb2e4c0c1ca3792a099042b757681a2ee2a984f20367f44fe3f51007527032
-DIST thunderbird-91.9.0-sl.xpi 682544 BLAKE2B 60203f9194ee028a941153ef8f1c15ac3e560723fa5ea342269f285523bbcdf2b88fc3479c1afa6aab26eee6d0c6caab25e110d3b89121820f9083e87bb398cf SHA512 87b9143619d9d6b87b30246e22c387279c25a0739897d3d695e89ac0eb30eb292979793df37cc804c98546b99bd8d4310b287445c3925c81f807a747dbe09c68
-DIST thunderbird-91.9.0-sq.xpi 703626 BLAKE2B 30664accc70eb50f04f9431104af849d30c516d8b331009f6fbfd333bae4b7878a7f3096b9dd633e26c0756025f50a79df5c27f0952e155fcc09fbd3c6fb2e73 SHA512 b0e94ac7eece597d8b3539ae16a5b64f0023e5a597ee94a9d595f597022ba3f707b796425bf484d0b8105ce8307f1cb9fe0bb46d642db12462272a666a6bff3f
-DIST thunderbird-91.9.0-sr.xpi 710564 BLAKE2B 27b9eeef78c5119febdc144026c1c96ef0f7bf5aac96e643c846e483ca999eb9fe2df653e15c755afcfee25a06b2f572b49b9f08c2ab76ed4909f257b98d5a04 SHA512 553c34a62ebd2f15c993bef76c649760a532e22be2236509dc6c529a37549dcadaba8dcf929fcc8704712ca3740ae647a5d1fa7edeb279210cd624d0b788cdbf
-DIST thunderbird-91.9.0-sv-SE.xpi 690968 BLAKE2B 875a193a3436d3df7903bea03d90d5b152de46b22f59408b48eb290c113410e1f587ed97f80b706a37ef59ca9b4def64a6492475f64d86a096c025f320562607 SHA512 83874b839edb45be55ea428a4c57a2e75a59ce389bcc9a56a36b7257177d61599cfc11875529062f5ba4cdf40f4ed9374af6e846a3d02b1de2322b32ea2110ca
-DIST thunderbird-91.9.0-th.xpi 748754 BLAKE2B ddd63fc2d2de718d5d76fadf46b76aaa57a459d9777a6609a22796f5943004c7baa5640448d947a27fd306b60d36d18ff8a55cb83dbf30d31b5c15f990f7da27 SHA512 e12bdb07eca97361f1f7b0edcce5d127996a13829d882324f88f358f615eacb40ce15f3597181a529d747e986a49aa09cf40190623be1916320d4c373f8cdeb8
-DIST thunderbird-91.9.0-tr.xpi 699653 BLAKE2B e7af633ab015d55f55f7a7697c37adfb8e5e8aceded90577c787f191649f6cb63f94a5b7e3a2a592ad74914661e176441b9a7fb6e89089d0838cf88bd53d6847 SHA512 bfa109ab0cc8309100a653d8d3b39f14aa4178ed6aa490a825274d9ced25141f896a63bc93b4556d104ee3d930057e989ac9452f262f1f7e99a5a9b5f1d0ed5f
-DIST thunderbird-91.9.0-uk.xpi 798482 BLAKE2B 03518c9a11aa24c3db8a13670b7384befd324fcb362cbc26c7be7909d35b88afd20d5b32e097b71dd1c0b2974d682338ea2e823aade72de5ef2994112401b031 SHA512 f78b1ae06c75c518de7a0229d64f26b2eec6a60aed637d8f3c91d2a74c6d3082caf11d84b41ac2d1688c38804e48ea5c8a1da15f7da7e7b88c528396669e7999
-DIST thunderbird-91.9.0-uz.xpi 595923 BLAKE2B 891c2b2e6f053c0360025bd59a4320e79cd3fd673a47922a091361b3bb45d15f92e6ac112af94abb407be2bff22ac4ed3d5c647e0ad6ac5f502a9d2756ff8346 SHA512 d94cfa93c26f1f654da9d26419ed63102a88b94732806c6c6c1363afe3adfb10535b68aa2d2f0117854f9a5b9478fc45e165bf5cc714795e3080e2fe9f53d259
-DIST thunderbird-91.9.0-vi.xpi 725525 BLAKE2B 461921f0281f635f4538f3f6303857526fff956b3911aae4473d9e191cbaf9b3ab639f25d54fd0490439f8e6d8e0ef0a83ef33f066c4c48fb3b37bb95b982023 SHA512 1e0bcef6b3d5885d95b792ce86545eb52d57805ef0bf7315224e624ee849c3219c4cd97cf74d9496844887108e6f583d58b2258dedd9d0d60284d7655beca8f6
-DIST thunderbird-91.9.0-zh-CN.xpi 730902 BLAKE2B 7b4afa2580ee07dc098940df67e457470cc03cc5f9680e4703ea9001af352113955c54fb318df0335977d41e426b873e41ea2364a7040b75edcd3fdb7a275411 SHA512 7e08d73b0a720800440ec7eb2d5ffd0e7ab393c6e6ecca515f5005bf1e4369a2b048fe5f4805536fc067712aab3b321c9bd546a342762114eac51f59871dff57
-DIST thunderbird-91.9.0-zh-TW.xpi 731944 BLAKE2B f1735f02aa8b45ee25ae684e0d63cc132bb6d1993f612bad9882a053749065d8bc0549fb5d74ca97cb4af306e8add6a466c1c001e7c148ebaf18130609a0602a SHA512 6030ad6d3c3b467ceabffbfff4d808ab5c63ffac4ece12b6c81116cf1a9b7cc5ce447f050115b60226ba0d3f9720636cb634bc7beda877eeab55765f1eb799f2
-DIST thunderbird-91.9.0.source.tar.xz 403847916 BLAKE2B 6905f18cace97cea12c02776d6b96259fe893cd416e14b4945e2a5982b025d11b4c74736cb6929211c6a9d13f0a5099b77bd40337a3b2c6a8cb9ee5f8fe35cb7 SHA512 474b5aca9c5e54fdc72eebff938f0d217bc039c3ac8d1caf965fb61bd1cf349f389a1df751a525de567a1eeabd7bb1bf2246014e84c7aab89edce059fe2e72d1
 DIST thunderbird-91.9.1-af.xpi 561894 BLAKE2B c21ea02150f66d06be8751bf0064d6c4410c21f0d8c86a32423037ffa1c1045598f0cf8026a8d640cd13911d2508b2e33a2ea72beaf81516d4e99e019984b525 SHA512 385d5fdd3cdd86b5ece192d912d662e0f0e4e7b9a90e623841f6dfc80c0f361f7e9256894150ce571db387e76f5e4661c1ac14bdac287c8856fba45c131f7f30
 DIST thunderbird-91.9.1-ar.xpi 665730 BLAKE2B 5a459f8c7f52cbc1299f4da6bcd5596bcbe7364a60c741523c4d7dc191d0830185cbeaac5d34fa9c577d0fccda52c96d1d20f800071a85aa184d55c4c467cc64 SHA512 7b9a8eb206062ec4393a72d8b3f5e0f36791f69a13ff0fab42ff190b4b2fda52d9f106fe23a3e40cee0c4f0796e5d3546bf8b6306316371998f57ec8c28644cb
 DIST thunderbird-91.9.1-ast.xpi 580511 BLAKE2B 5c3299a9037df6727de7640fde336b52ee23d291acfe6e35dd2c34aab3b29321643a5f2449d12b04628101c5a1528d41aecaa339ea8e54d94a96de4cff0e534b SHA512 9565939eba6df79c91f01d6c1f2243c9c5e8a70653eb035050e037d8e2eae79ab92a1dc272cab2d76f4617366c616b5f58b4e7a16ff3918cdb5ba7783f75a025
@@ -133,6 +69,5 @@ DIST thunderbird-91.9.1-vi.xpi 725526 BLAKE2B 8f839f3885ae8fe487155a1c85d47a52e4
 DIST thunderbird-91.9.1-zh-CN.xpi 730901 BLAKE2B 862935aa5a92152228b12859e78cfc8ebcdbc7353d8709dfb708232ad68bca5e65f3de3fa93697135902e5badb43e895e4075b8c6325fa0fbac21917e433c802 SHA512 64d5693bd3e16aa75b8ddf3ae6ab7a0467f49ab956c3e94e14a049f7bfaa250faeda0d141019a177605159aa24ecfa959ee2d37335cd4e32c098801db7cc6255
 DIST thunderbird-91.9.1-zh-TW.xpi 731944 BLAKE2B 3b6783f2f89ac75942f3e866e1f78955c4ae3e877dcf6b4caf60490039775a8eb8b06eb0a4f2f51534a3cc750891a71aac676ceeaea8f60bcd28fe2ccf8d7829 SHA512 5cdc661cf55268f77e462df6dd0465de87753e078ee67d8afbe8ed1ffffeb18aff3aa225fa8a053acba6957fc4f54eaf4f350ad008c5e2094d413391a223e675
 DIST thunderbird-91.9.1.source.tar.xz 402851656 BLAKE2B e938b8d6c28e1b3b43a7c7d08ebb96564adb1b790672c94070eba75910f5a3d18623f4ee08c7e6ca267d4f013d242bf6343cd06ff4fc20977b65b5b520c277a7 SHA512 997751056ad44367a128aef13ddd55f80798f262644253f814e6e607b3bfc3e33070ed072fa7062586378234cabc7ad106efa26befc3ecb843c5dd02c1498f0f
-EBUILD thunderbird-91.9.0.ebuild 32904 BLAKE2B ec90b9afa3a01f9af3debeec2382bf637970d092f051bbb0f9fd8daf27f8917333b25a5ad1fc54d73270cb5cd524c3c6473e7969e1eb6c6a69aedf228e02f47f SHA512 66c42838811f57c203c51eaeba855bf4e5d356848545814ea96c7be79d345825161390699142622aa75bee64b9f66c80fc0e9d4d93b676658c61205bcb2b0510
 EBUILD thunderbird-91.9.1.ebuild 32904 BLAKE2B ec90b9afa3a01f9af3debeec2382bf637970d092f051bbb0f9fd8daf27f8917333b25a5ad1fc54d73270cb5cd524c3c6473e7969e1eb6c6a69aedf228e02f47f SHA512 66c42838811f57c203c51eaeba855bf4e5d356848545814ea96c7be79d345825161390699142622aa75bee64b9f66c80fc0e9d4d93b676658c61205bcb2b0510
 MISC metadata.xml 1952 BLAKE2B e6fdbdd02f7471c54e61a02580f791bce574cb8eb0fe3416f621d8e55d89c310325724975d70ef5bcd1f89225ab3c6017836103ea904540ae423b2c3df57c98b SHA512 5acdff9aa964c713b8ef9abf32e8e79b2cdc1f80cb68131e58ce8734c0d55417f1e17c8f51956595aa66562c8f16d58b2a50de2b8079f86df9106b24da78ae05
diff --git a/mail-client/thunderbird/thunderbird-91.9.0.ebuild b/mail-client/thunderbird/thunderbird-91.9.0.ebuild
deleted file mode 100644
index 08dcd4fecb8e..000000000000
--- a/mail-client/thunderbird/thunderbird-91.9.0.ebuild
+++ /dev/null
@@ -1,1139 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-91esr-patches-06j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils \
-	llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp"
-IUSE+=" wayland wifi"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.51.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.13 )
-	x86? ( >=dev-lang/nasm-2.13 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.68
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libxcb:=
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.8.1:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-69.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	if use lto; then
-		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
-	fi
-
-	if use system-av1 && has_version "<media-libs/dav1d-1.0.0"; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "<media-libs/dav1d-1.0.0 detected, removing 1.0.0 compat patch."
-	elif ! use system-av1; then
-		rm -v "${WORKDIR}"/firefox-patches/0033-bgo-835788-dav1d-1.0.0-support.patch || die
-		elog "-system-av1 USE flag detected, removing 1.0.0 compat patch."
-	fi
-
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-js-shell \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${ESYSROOT}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable sndio
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# ld.gold is known to fail:
-			# /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld.gold: internal error in set_xindex, at /var/tmp/portage/sys-devel/binutils-2.37_p1-r1/work/binutils-2.37/gold/object.h:1050
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	optfeature_header "Optional runtime features:"
-	optfeature "encrypted chat support" net-libs/libotr
-}
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 4b9381756389..b14972442850 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b30fe967a911..9723a8c913d9 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,10 +6,10 @@ DIST postfix-3.6.5.tar.gz 4751485 BLAKE2B 7d53ccf76d978db269fe0ab8641abcb3ba91a7
 DIST postfix-3.6.6.tar.gz 4752461 BLAKE2B f2508233bfe72706450af0f61d58ef1b5781cebef28dbf42a3f9772f7033ead65542e6b906b35e9ec2adfe05db3f992a7f39287a6439cc60672d7313c52fe3e6 SHA512 ee2e1a59c99b9869c401f8a42afdc094c4b2ba804ed8f9f366c33b36b8d2c66d8362d5a32fbe72f4b2c9a431c232b60ada9fce29dec60ac4610220e0f5c6fb77
 DIST postfix-3.7.1.tar.gz 4824081 BLAKE2B d0bfdbc5105407e5143823e8e14b49e60d5c248eac435279a5fe803b370b46a56de9aff39fdf94398758863f753e43e889e2dffbb393ab63cf486d4fd3f5cf99 SHA512 2a8916eae4b0a4f4e055e1dbae1b9655b1eabcb22d911599a63fb9a1900174c9eab24280bee2ddab42db6674c6b4362964a2a41f67fcb18f0c8c41ad0100b044
 DIST postfix-3.7.2.tar.gz 4824424 BLAKE2B 3f7aaba222b64274f756ea37b8ac06c29469d9183879deb4942a709d75783f4a8ca81204971b6658aba4b5bea46ed9c21b14e1f8fc6b613f257acd3aad16c170 SHA512 23bb1af6bf3743c741f108da136f64613f9062d121dc459944ac192275335952cd309ffec6c380f5d36430605eec538c2549c3fdee9d4597f739d9d1b0a033fc
-DIST postfix-3.8-20220509.tar.gz 4825411 BLAKE2B 0fcbfa2389092607f460041f12660b73224ecfc1278fd4ff0c1f84745fd22a4ab86914b0ecbda00a17fa75a8e79f281ebec66ca2981a9a136b75596f01e8bd3b SHA512 6e0c49acf8a9584c4ef281246aecfa478a34cc9001ea7b31b973f399cef1928a8fce18c5fd4b5c6d27e7c892e7c71a121583f14cd776122eb6cc71e3154b6195
+DIST postfix-3.8-20220527.tar.gz 4825637 BLAKE2B ca4672848abfc254c7e7ac980b1cf0cfc6f6a19ddf7e9a82082eb89f9aae8a4387798c28f94a6399471e01e1317ba064668c7ee018a2c0c36dacfc88e6693557 SHA512 716ba64a055d89d80a7bd5da282e253bcfbf6c9409a937cdc4c632d2f999b47d7a28b8a930e0ce8096d687dd06656b1c559a72ae9a30bd2bda40dab85cf5a5b3
 EBUILD postfix-3.6.5-r2.ebuild 7919 BLAKE2B a88bc775ef810df0889974c9048cac9d44246bee07619eb4149324565c32214441792a3a840ae812210404b6e821851a3e3855469d14c9d53c3d7cf712464cc6 SHA512 3568560769a1781721182fb9ae5fd4518e3a70e23db1fd539ee032778cd6bf6c3361c10b3d65f17b0c88d6d05ef8e577a7041722d57c1f39ba78cda398d71720
 EBUILD postfix-3.6.6.ebuild 7925 BLAKE2B f6a2b8e247b2e75bb8a255a32fa32340a9aeeafcf63bfb655318be9a18e8a2af3f9f2e7ca527c7a06db3e19e145af702bb59933465732ba822149e3fde582074 SHA512 351c1b7b90a4c330f07f3ff8fc2a47b592b2068ce39909bd03ea927b5e9a1ef8198addcb0652a1b7f5a61754c778e9cbe649c005bf8a644a324ab6a306c069fe
 EBUILD postfix-3.7.1.ebuild 7931 BLAKE2B 8efa457dfdd582d00374a38fdbfabd9a6437be4a0e46597a87625e42dff74d73c267eb991f1957c8523918ab442100fb5e735ed049620454de9e9086f01a64f8 SHA512 7a151f8b803b1efedcd128c48f789b1777570eb4b37ba69f06b715ea3d14384ed86fd5a7f013f41f5b1968f12f8742fdecd38e3b389b45fc560200f306d8e2e8
 EBUILD postfix-3.7.2.ebuild 8022 BLAKE2B df96dc5ac7f942c4edc0e9a0ebccc3ec14d74156e60903ae55d213edadbbbbeaf84f9a38e0b7bd594789e451cb4c7a61b3ae8c5bd5b02551b7b065ddc9e120b8 SHA512 1a43136a74a6068c76cd0f542a4bd856e35edccf8d83494bb940e7c1d3d9032704b445160b76f949970d3173c596f6780d99f665536299cc4ac8faab2b64bd9f
-EBUILD postfix-3.8_pre20220509.ebuild 8060 BLAKE2B f47bbada9c7b165e8b3abee8eb88b5f36148cb7af19a216d4a3d80b7843e8fa39c59e99254fd30c9e9e002269b114ebb83df28ea6baebfe3b3217a4d2dcdf4c3 SHA512 0bd3c50a093847f7b687a0988f332167d33a9219aa9e315af48ffa20df6ad4a9c85c1c449cb781c2ed5f2342040b335ff23926be050bc769ff11b9a130e9f9de
+EBUILD postfix-3.8_pre20220527.ebuild 8060 BLAKE2B f47bbada9c7b165e8b3abee8eb88b5f36148cb7af19a216d4a3d80b7843e8fa39c59e99254fd30c9e9e002269b114ebb83df28ea6baebfe3b3217a4d2dcdf4c3 SHA512 0bd3c50a093847f7b687a0988f332167d33a9219aa9e315af48ffa20df6ad4a9c85c1c449cb781c2ed5f2342040b335ff23926be050bc769ff11b9a130e9f9de
 MISC metadata.xml 867 BLAKE2B 1839d35c91007bb07e1a722b6b4751e9f7754e00109859efe5850df16486bafbaeb019326d006438471678553aca9474462fa32eaba445362113ced6927bf4ab SHA512 ff898bdce2b60bc52a0d326f8f8221bd474cc4fa31def2ccc5526ba59ad396b0b26f22cc98ca4e1181e3c38e5476615e53bde2db1e643ae5b9209ac581ecc1fd
diff --git a/mail-mta/postfix/postfix-3.8_pre20220509.ebuild b/mail-mta/postfix/postfix-3.8_pre20220527.ebuild
similarity index 100%
rename from mail-mta/postfix/postfix-3.8_pre20220509.ebuild
rename to mail-mta/postfix/postfix-3.8_pre20220527.ebuild
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
index 6ea162beb620..d29f5af55040 100644
--- a/mail-mta/protonmail-bridge/Manifest
+++ b/mail-mta/protonmail-bridge/Manifest
@@ -1,5 +1,8 @@
 AUX protonmail-bridge.service 334 BLAKE2B a63e6f2e5c91cb90fe62a7a3864b3884e793392fb3c16f8df0e3f0d3a567cabe8aa6cb6170248f5556211fcf582b187ae56fd4c645522ce02054b42161f76924 SHA512 2ac55654ad2e0454bf936bc8ddfe842d9b4988f92493b48bc599d7641f6e45bdb7990f97fb4efbe997314d5ec1ef5f70beee9af4710755c3e29aba7bc849f111
 DIST protonmail-bridge-2.1.1-vendor.tar.xz 3778060 BLAKE2B 4350201ec1890eb398360df82d2b623800399e0d536545030254d4e17bac55729fe5d9d6238250b5599a5d4f59014804f442d9bf804a589ecf3be13b248e9bb3 SHA512 736a4c7e3536d8aff48a3987ef46ba0b1ca1aeb5f0346b78ecde93e989f921affa56dd63e70b66b026bdae8c843c7540a07623a744662958dca243e614421a5c
 DIST protonmail-bridge-2.1.1.tar.gz 2034768 BLAKE2B 8748650cd90610803bbba4ed503a01be308225367a82da403ed209f0ed593f2202dc3424ba3c2bc09b3fcfa19ff04cb67351e840aac9fc35f17bc6d512962774 SHA512 c280c61d7a8aaf6e7063183431184e2807e8cdb9ba68cb1a14e45529ccac2b2df7e6ee5b71d7e01341a4b625546ea8cf48ade7cbec64abd998cf8227d9b684de
+DIST protonmail-bridge-2.2.0-deps.tar.xz 237226036 BLAKE2B bb1eabb4a56c19ff6c79b4543ad39f94fe5821d02cf246110a1a41b64c55271c5cfc0be18e496f8f7a76d02d180567ac8dbaba520b27dd38c08708d885c66c1f SHA512 4a3da64b27732d55aaaff8850b9ce0e6c03deecbc8a051338a3bee4066250f10b99fb5f25d9d2cd5541b8de94ee2c11a2805b4344f28764b494e2b645c60b175
+DIST protonmail-bridge-2.2.0.tar.gz 3098013 BLAKE2B 310c84eab7973174a331247bde6f64dad03a3ed05ad241300e5c2c2f7361e5d7c4598201400c6f51a0df49e7ccb57a6230fc1b1c4b749e29d2f2796d3d4c8b81 SHA512 ca0941b37fccbdf8a581426e69ec0c8840ed384bc4fc64592fcf0f228303a3f9f46d41ad56310bc0f99e1bb633ff8c9fcd3c3ab11b5ba34ad6960342111e8fe2
 EBUILD protonmail-bridge-2.1.1-r1.ebuild 1416 BLAKE2B a9eb4eb06868ef61ff813ad07f05edbc976aa043f79b4c3f17f503f8dc8b653f401f8303d0624a6e78f7d10ff6c1912c0fe1f58f16a6af7fff73f517d63ef664 SHA512 756de69d2cbf51065b119416dd7852484e37e979b0375c6f928d173d46ee074638ab8121bcdbcff04f19fbfa8c24b7b38eb30f07b4e2c119c433308e3f311baf
+EBUILD protonmail-bridge-2.2.0.ebuild 1282 BLAKE2B acdc3ed50ad453ce5990d3489b93aa64e485cedd2bab69e25bd0b379ba1fd3050e15a02ac3883c15a05912d1339badae470dc6b520eb5774bae48fe5ea52ad2c SHA512 3195aae736579ace0a32897dc8c3bc17fc9f4326755d9d5e7fce53acfcc9f022655e6e187f6652b254def26ab2cd58f72f3a4c470ca828185b32a3ce10aa467a
 MISC metadata.xml 619 BLAKE2B 3350b5193ecc34b4511694c91a0990dbfed6204fc1e2db2acd869da46249bb73acc690cd186771eff77968f6d4009991a23f3e3055b6e4f3092d0da6aac026ac SHA512 7f21301b2375c7173750bf67e4df84aede219a5a7dc4b4b55776a6486eda1f7e3693677a10cf7b6971335b2df3b275bf7e4f27e0b22e3cf23420a8db858eaef0
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild
new file mode 100644
index 000000000000..3eb8df2b3026
--- /dev/null
+++ b/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd xdg-utils
+
+MY_PN="proton-bridge"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
+HOMEPAGE="https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/"
+SRC_URI="https://github.com/ProtonMail/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gui"
+
+# Quite a few tests require Internet access
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND="app-crypt/libsecret"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	xdg_environment_reset
+	default
+}
+
+src_compile() {
+	if use gui; then
+		emake \
+			QT_DOC_DIR="/usr/share/qt5-doc" \
+			QT_PKG_CONFIG=true \
+			build
+	else
+		emake build-nogui
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/bin
+	newexe ${MY_PN} ${PN}
+
+	systemd_douserunit "${FILESDIR}"/${PN}.service
+
+	# FIXME: USE=gui will probably need more files
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use gui && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gui && xdg_icon_cache_update
+}
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 2db4702f5218..b56310fbaeb4 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index 47c0e1788001..dab54eac0c23 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,5 +1,5 @@
 DIST cantarell-fonts-0.301.tar.xz 570328 BLAKE2B 2e1e235fe8986366fa2b75cfc0e5417a3e2ab4a3d237a4cc7639d56a2ae698bfe1e2e573a64d0557bcb9823428928d623cadf4f5d8c424a4516a0e44b0390659 SHA512 84bd37e9eeeb3001d336af49634184552d77df3ca780ef4cd9166925c87710575ab0208f50df2e4f0216f3b64dbe0ef5288a271866244e6cd1cd5518462f8b02
 DIST cantarell-fonts-0.303.1.tar.xz 338316 BLAKE2B 1208f57b70a82d93e2714483d36b2a0027f4e3a04eb494b9e74207d20e074377061d6af9bce4f9f48a56d87ff67fe9def1b24ec33a5f3b7decd883d3ab328505 SHA512 f61c2df6bb04167a9623bac141773211486059a5569106c0ed096d6d1a5d57e599cc5b75b06be954859aef13c649f7617ae067d9936932faec0b2ce896fd31b5
 EBUILD cantarell-0.301.ebuild 1053 BLAKE2B 1d112bfdc81b4bec330dc446227966ecb1193b2f133b2a5d49da6b070a04c6d88d65eb1202992366686a52051fe6c4999606d3d3e53f583ca67539c4da3ad26c SHA512 08d49850b8d2bc09ac227c6371dc6cfbc63cb37fc819b24c4b8ddfe4e8eb7c2efc804f366bdda03027fea4294071100b3e574cc4b6968b8f9c03febc5e96b97e
-EBUILD cantarell-0.303.1.ebuild 1107 BLAKE2B 9ae663ba95ef3905ecc2c330e6378beed77b88d595161a40787daf4995fc506bf4cfe7eaef836293261adcf17db5540ded91cfca630c9359856acd1ea1185749 SHA512 26f98ed272fe701b7bacbe41bb764abd0d78e95bc4c03424b5942f238f1dbba4a6044888392322b3bfe7379376ced07aa3f3fea7c50f6ebe5b63683043546cfc
+EBUILD cantarell-0.303.1.ebuild 1101 BLAKE2B 65147bdb2051603ff2ecf78204026a9b0b9ee471a1f7dd30d3b0b401605610eeba6c4764fc0ee9c049d2d38d601701f10d77888f75e60e1c50e3ede407371a54 SHA512 635c982ac73f6d0f7d001a0df6727964272e4c0717ac22484da990dc2f7440fc035100b6d8792c512466bfa898f707aa50aaf7cb3cb2da24e0ec1c9c158ef7b2
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-fonts/cantarell/cantarell-0.303.1.ebuild b/media-fonts/cantarell/cantarell-0.303.1.ebuild
index 84c00d2aa39f..a3dfb6feb79e 100644
--- a/media-fonts/cantarell/cantarell-0.303.1.ebuild
+++ b/media-fonts/cantarell/cantarell-0.303.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/media-fonts/lxgw-wenkai/Manifest b/media-fonts/lxgw-wenkai/Manifest
index ee30e9ec4f89..4a9f1927951a 100644
--- a/media-fonts/lxgw-wenkai/Manifest
+++ b/media-fonts/lxgw-wenkai/Manifest
@@ -1,3 +1,3 @@
-DIST lxgw-wenkai-v1.234.56.tar.gz 60970416 BLAKE2B 9d2d79c6bbdee7d4018873c6e4feaa0c43d499a0cdf7b98e9ffbff5d00b7613c94261c86dbc669e7c08f9fd6116ee212934cd6c171634b8a96128e0f0da661bb SHA512 63bdc92f840eaf7229af901d08c795fb40375453190e1e653c14cad429b348e3ed2fd345459c8a37bc129d7930ba4229512724f2164c7837787d1358eaac8866
-EBUILD lxgw-wenkai-1.234.56.ebuild 444 BLAKE2B 2ac9241a75c6173d0f6878d8d26731737d66e263d536d8435532f515ecd03c5f5e09d3caec1cf2b31f32ee08afd831ee129e0e61bf1599b6486b42a42dace0fa SHA512 f44b18e2ba4256a4a89dcd00e7b1478369fd2a7f175a721a4695e713eacde9bea8fc13e30d3bf964b4a02c11eb7bf9f7874078cdb34f931bfe1eb8f939ee40b5
+DIST lxgw-wenkai-v1.235.tar.gz 60332812 BLAKE2B 3fb6d68acbf33a135a37ed20dd438c525e0b2435c44948a495a7b35defab9f1495b61fa011b223b104fd1454e9d1ee5262ccf260f146d7c772d11536727967eb SHA512 c4254acba6114e7f610bcdde7b1bed93845da3c9d26cc3d5cb3f15affdfa13f96b34501a379f1fac83df6adc1f218b94411e89f07a4f80658a5aa6b2038bbba1
+EBUILD lxgw-wenkai-1.235.ebuild 444 BLAKE2B 2ac9241a75c6173d0f6878d8d26731737d66e263d536d8435532f515ecd03c5f5e09d3caec1cf2b31f32ee08afd831ee129e0e61bf1599b6486b42a42dace0fa SHA512 f44b18e2ba4256a4a89dcd00e7b1478369fd2a7f175a721a4695e713eacde9bea8fc13e30d3bf964b4a02c11eb7bf9f7874078cdb34f931bfe1eb8f939ee40b5
 MISC metadata.xml 600 BLAKE2B a619b03220f8d2f779fb751ed7cb92e293b52609ce813e990b0e2e801670422be57d97f509d7fd6f0fe2011974c90cec0a4bf2d2fdce9cc6adf4b927f2b998fe SHA512 9bbf3918a9f57cdd7a002a27d6b2d91ef9777b112a0dfe3eb6f6fdadae2ae296c981bdb80535fe576edc87f4ab02e0ee2eb6f0c4effb3880a7b59520330b439f
diff --git a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.234.56.ebuild b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.235.ebuild
similarity index 100%
rename from media-fonts/lxgw-wenkai/lxgw-wenkai-1.234.56.ebuild
rename to media-fonts/lxgw-wenkai/lxgw-wenkai-1.235.ebuild
diff --git a/media-fonts/unifont/Manifest b/media-fonts/unifont/Manifest
index dc26c3856c43..a0d7c9c1ed22 100644
--- a/media-fonts/unifont/Manifest
+++ b/media-fonts/unifont/Manifest
@@ -2,5 +2,5 @@ AUX 11.0.02-make.patch 366 BLAKE2B 1d857d76826b5906c6405aa41728121624b345ad1f9bf
 DIST unifont-13.0.01.tar.gz 21053298 BLAKE2B 981d3d79015df9fa401823034de532840652127bc881d13244243dc0fbaabc14212b006f1e72ff65233793c7064576b51855d6a8ab1f7d889e7837c9c22d4f5d SHA512 2987aa097f89b1287d126e44297b19e405e198bb8ede2e321e6452c60678ebf4cf0be5f059b9565f4584bad09801effabe64d01ab90f132f27b206174827b14b
 DIST unifont-14.0.03.tar.gz 27451330 BLAKE2B f0ae933fc493d7e724b0526968d63fb4209e28526346a835b918aa6a31cd1a31c15a0c00f89196f6fd42cf2a0b2db8c51d9b6f9d7648938609e8b7e4122078a3 SHA512 de80097a4e1751c6ca21775c8ffe19716a910a0d110749017eacaa50a9f8f02d80e0b402426f3c2309e64e129a0386e29015d1116ad5fd64f97e5dc7fb75bdce
 EBUILD unifont-13.0.01-r1.ebuild 1111 BLAKE2B 17d328acc0c6743b1acd0291ffcc50c2d5391ef398a25301b36a8f986c932225b2843457642a5e620de879db94295ef731ab41df5c8aa537214d1212b0a20c5c SHA512 cf8f9891dcb04300198161a40fc2a3ffe9c7adfd7d5567e52d8ea9e1e80f3c843ef2cbc4452e454ee2e5844f6dd8bc1c7b5a13c7174c2541cdc1bbfca2c1a1e4
-EBUILD unifont-14.0.03.ebuild 1070 BLAKE2B 7c935bfc0ca7318ff9a7351e470996c4dbe87b30dd76efd8a16bf0f403d05af0828c4d9e6cb1b1b28a8717c47e0b028850be47726c65d11f94338370700ba1c0 SHA512 0273a8d4f4ad13224785c710e5547b8d372864c042e83697ef74096bc2433dc42851e604fc03e58473b637503d78f626bdc68cda1bbd533496cd25a8ffaf2f26
+EBUILD unifont-14.0.03.ebuild 1099 BLAKE2B 804250a37644a6d811df692faa7afd1b057d98c9f7c5dd31baffa7433d597edbd152987b00f650ac3a8b09c6f102d2b2298e3cfbdaed7a7190102b835c6482a5 SHA512 38c1faca0611d7ee49b9c5205d1432f69f6ba341df17c87a957f243a54263dd27baf953891aa2ebaa44ea5510ae4a98424d2b057f336a15feedc6ea21b1e23b3
 MISC metadata.xml 485 BLAKE2B 5547944f4afc22e78b218df90194a20fd7d3a2bf012d231a98d51e570be16bf1644890541dea1e3ddeab2ca6e621f62c26e23ebc18aaa7cf7118f4aec639260d SHA512 fbc4063b1076aaec7f62bec624dcab2b76ff170fbe9cf3abcbbd0aa64610472b39555df1a5a706589781684590b8eb465c7467446bed63d20a8ea0e8ae21ba8e
diff --git a/media-fonts/unifont/unifont-14.0.03.ebuild b/media-fonts/unifont/unifont-14.0.03.ebuild
index 3986f0a2afe0..ff3636ed0802 100644
--- a/media-fonts/unifont/unifont-14.0.03.ebuild
+++ b/media-fonts/unifont/unifont-14.0.03.ebuild
@@ -37,8 +37,10 @@ src_compile() {
 		CFLAGS="${CFLAGS}"
 		INSTALL="${INSTALL-install}"
 	)
+
 	if use fontforge || use utils; then
-		emake "${buildargs[@]}"
+		# -j1 for bug #843584
+		emake -j1 "${buildargs[@]}"
 	fi
 }
 
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 110397289da8..eea76f3ddf71 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 3f6a07be10e7..2587d5182f93 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -3,5 +3,5 @@ DIST eog-plugins-42.0.tar.xz 132008 BLAKE2B 0dbe9ddcdf8f9a7f4da46caffe091a5d6e09
 DIST eog-plugins-42.1.tar.xz 131656 BLAKE2B e561e7b31daf950c1e1c1e1038bf40101b658583160439f7fd9050b52da2f6dd943105e1e1eeaefff7ed2aa759f8b96aad0a65130daba038733967db37158bfc SHA512 4688cb9cce044137717521a3ff2f769f960f12ec8b3f711971f276334f91915c8a3142aff2feb3d24d2eeb86223f040e9b699a1136e7fc7e96202a06b1cda1a8
 EBUILD eog-plugins-3.26.8.ebuild 1725 BLAKE2B f685d824292edc02b08cb0b2adc7d68fff1ef2868c742be61be0ff579795ebd3514f46a2594cc0d7d42eb8b95ee903a733ce88e9b2eca889944e08670c3480c2 SHA512 57604bd1094981357339c5a1382a21a517cd4538c09189a65e1927c61b63363ab36519c52cb99cf9a003e62ff887080b272a39bf4214050b7532749747da03c3
 EBUILD eog-plugins-42.0.ebuild 1681 BLAKE2B 95fdd675235a22c6800fff0d27f95ba3ec2e1c6802a7ded06e07c249a1c1e6c2d58c529c75c60bf1a8add7ec9d147de74226c6ec1df818c191dd0f949c3ef12c SHA512 a71006c09e8e82f7e6f2a8789f0ea0d893f6246f451b295f7093786eb84af307a9ec4098f2d35dbda371364ecc79801c2def9ea41bb9f239b820fc4f49c7dbdd
-EBUILD eog-plugins-42.1.ebuild 1724 BLAKE2B 51add057a8f5331f1fd0f00bfe1a9e223c185fc473c39e806fe4de30d6119cef7915c210a71ce92a4121d4ec41a5603d2bf7965710d9b86c603e232785c417e9 SHA512 2205791bf7d6c197a200c4f68074964a8c815d8173d4fb6d41452dbb54e9d8806f0d87b3decfd58697c60e685516f43cdeb2ba56cd882340b9da0aaf03713139
+EBUILD eog-plugins-42.1.ebuild 1722 BLAKE2B b3f1e17ee4b098b2ac63a70d3cdc3f7caaf2db9d647d289ddf4e2f81b91283d917a12a1f47569deecca1c8be054ce67bb660ba36f750ca07d82c5089e1122bf2 SHA512 4d3265072000f00915e49967c2f4297c6513697d1dbd3e686ab5a09f0e5aa821fd38a684bceb8d3ea3458a9f7004957c3f7c1a41a5158defe38c2f9c4cb7e6ca
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
index ddb7d165e7af..606145157af2 100644
--- a/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.or
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="+exif map picasa +python"
 REQUIRED_USE="
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 1cc76895ee66..489bb3abdcbb 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,9 @@
 DIST eog-41.1.tar.xz 3603320 BLAKE2B 8b0d7affe921bcb2c917f89dc3845360f784b5d5f394a7f94379c98cd905504cde7a8fb6f59aa09bc778e302113ad27ec5815e529b418d68a3012fbf9b018d65 SHA512 0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8
 DIST eog-42.0.tar.xz 4446392 BLAKE2B bb89eadaf2066f0ef3b6f99d47d75b438adfd3bca0451e8fa5d4513e98d1e8c6acc518eb7564f2768d43205a56843852edc1aa1ecce9fac8018ae4954376b852 SHA512 3901dbac9a371bac1e1bdc143e3d257a8e25fa2743a97bd9f9ecdb06e43cd5278edf33a46ab24c5e40babef6825181c986c99d9b4fafead71e04f51e65ae2acb
 DIST eog-42.1.tar.xz 4446444 BLAKE2B e500b3f96abfc72f56544c16254a99438137789be771310fd790c201451cf6a56fd9b6efc0ea8466dbb27be57cf0cd146d77c3e4917fda928ca02928ffaddea7 SHA512 12db6bb2218f9dcea0e0558b04c05f3f8eb298eb7170a9511a7996a37082667fe06994d1db3ee4fef759aeb763a9de87749c8defa8d749432b635d2b421d1c8a
+DIST eog-42.2.tar.xz 4445892 BLAKE2B 863ecf1efcf295ae0deb6a966b6e0009cf4966543548e258d73315810bb4c1ed8434fa022b8367d779243376d2ba6cbe10d5e44135cedd0e5ec520dcee4ceaaf SHA512 f2da81fe7040f7ffc63da03df4889add33d59ad8df637797d1094d95233f4ce891838dfe6f774f58de63c28a620807bc4097b3ab1f31afb7cc7c402f8501e69d
 EBUILD eog-41.1.ebuild 1638 BLAKE2B 1a794ce6f1dad0814421a93c46b50fe01db32105f6f02ff5c0be382331abd2c830a836f293f879902e0cbff5cad17a79c011e8cac357f3673edec997b0ac9140 SHA512 007349404c2bbd0d24a9b84843e9c4ca6db8bc9c9c09fe7638234fe8dc022b6297fe4e903bd286c0c58fad566a43dee8711f256b45d2fad9db3fff3f4da2b18b
 EBUILD eog-42.0.ebuild 1669 BLAKE2B eec46e687c48aea2c7e8dfa64ac63dd411e7d254792684305455b8ed4be21fcc63114b94760e284ce149e999f97bf08aac339a8cf59d23f8e94681af88b21293 SHA512 a9cff1c2f4429660a79a162cb912897caacbf469d15bbe1b61796d9c95c1f7b71b800ae496442e9a03666bef6e824ed5d38d73a8f3d32fab24db9525941b0f25
-EBUILD eog-42.1.ebuild 1716 BLAKE2B 715428a0a75026bc322ef6218da388a9d2e7c999dde86deb13357717a148810e9ac04af7a4d65b6990252fa9c757c7e3c82c89dbe5d684570f4548cdab3577bc SHA512 e198cb9d5073ccb91ce2780a810976f3ea73278c2259f5c2e9f04ebddad86ce0200362e467c8840029c66410235a3a56ac328e08841b262ed1682833f94594a0
+EBUILD eog-42.1.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
+EBUILD eog-42.2.ebuild 1716 BLAKE2B 715428a0a75026bc322ef6218da388a9d2e7c999dde86deb13357717a148810e9ac04af7a4d65b6990252fa9c757c7e3c82c89dbe5d684570f4548cdab3577bc SHA512 e198cb9d5073ccb91ce2780a810976f3ea73278c2259f5c2e9f04ebddad86ce0200362e467c8840029c66410235a3a56ac328e08841b262ed1682833f94594a0
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-42.1.ebuild b/media-gfx/eog/eog-42.1.ebuild
index fb9dfdc4d3cc..bb56eb7315ce 100644
--- a/media-gfx/eog/eog-42.1.ebuild
+++ b/media-gfx/eog/eog-42.1.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/eog/eog-42.2.ebuild b/media-gfx/eog/eog-42.2.ebuild
new file mode 100644
index 000000000000..fb9dfdc4d3cc
--- /dev/null
+++ b/media-gfx/eog/eog-42.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/gnome-font-viewer/Manifest b/media-gfx/gnome-font-viewer/Manifest
index 4dd0ae5402d0..b9357dd36860 100644
--- a/media-gfx/gnome-font-viewer/Manifest
+++ b/media-gfx/gnome-font-viewer/Manifest
@@ -2,5 +2,5 @@ AUX gnome-font-viewer-41.0-fix-meson-0.61-build.patch 1127 BLAKE2B 7cb4c294ea2a2
 DIST gnome-font-viewer-41.0.tar.xz 179672 BLAKE2B ce9e91b319ccf2e099cd30cf13e407270775950321e2bea69703050b5797ed879320939d260aba175f3ed6f5719e23f5628c6501f362c3e367ca5ddf70902037 SHA512 09d9ddcdd18fd0023dff46e7197988473119e0d753b7814fdca0116c6831a93146301dd56ee77546121c573c8d93801b5d8fed0c46da47052e31749058c21d50
 DIST gnome-font-viewer-42.0.tar.xz 287644 BLAKE2B 273328298187c1b77882638bb292ca9340a1dc57c917d9888abeadfe8ea01c27d0f59d382823b262323000da81457fb821aafa9b1ba50792ee75ce3dd8de4ee7 SHA512 231aaf594b22741f8a138c0a6c764244eb947f9cf30385353f4dea13cfc7929f21a291f9a56810eb24862310ecab6b4555147ef6be9e7a5d3057ae05ebba76ec
 EBUILD gnome-font-viewer-41.0.ebuild 765 BLAKE2B fd4fe11ea6248a29345ba3e233fcf3cf6c1af03931c20c19b03f85b88fba22dbae2329b54b55d2e438266d00d2a692ea1efa50b5037d8a4716c7efec9950a2e8 SHA512 c46a4053b7542e9a661cb437575ba7499dd5a9c4cf9b036f5ad37b7a93a69e389df482be1b6946d91686fbaa2fa6dc52c18b077f30e8cc2fba069fa98b069075
-EBUILD gnome-font-viewer-42.0.ebuild 701 BLAKE2B f00cff6398d538f2ed5138ba071ff00e64d4cac67fb95120692873acc6a9c0835156386670190c12dfbb38119d8b5b3f2a2246ac2614e28ac5490de2aa67ea2e SHA512 6d4892a90eec7fbfe2047f7c21dace02255e26c89e08f2c191e4c63da2c58acda47de72194a725ee1ecec3b437d30e46cdbcc04eec0c69928aa8340a6211cd0d
+EBUILD gnome-font-viewer-42.0.ebuild 698 BLAKE2B ef4171fb0f805b65d12ff9347847fa34ab65c8876cfdf00eb1346a1479f1ceb705c7a367b69a5727b28ed55c1dd6f12aed58a7da6673f0da73cc1e507f9f0d75 SHA512 c099a82f422936e21ece2c07386a3d4864c12fbff49d8236725c7d61a0670468ea29b9d897f95a307237f795fcf6dc97bf011fcf33df811cb29c13a77b7741d7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
index 00fc06c8d9d8..3b3d7ec9f33e 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-font-viewer"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index 9eb1e60809c8..ec695fa8030b 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -2,5 +2,5 @@ AUX 40.0-fix-build-with-meson-0.61.1.patch 779 BLAKE2B 12af9247983044bf674c38f40
 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
 DIST gnome-photos-42.0.tar.xz 2855624 BLAKE2B a980cc2f581f1f6834925426ba3e0e7e6c341d939b2fbe2aa40c737669fb09fcdd8bb64fd0dfbee640d8dd73061281b6b92f97cfb5737cbeca9788c9e01d7fbe SHA512 cddaa84596a180fb2a4d70db65c6e625e3d94bccbdc7bcc83ed577b9306210a2879e3d40f8823a9e097f78caa6fccc53404194e7dce0629db3ebda1aa428b714
 EBUILD gnome-photos-40.0.ebuild 2493 BLAKE2B 1d72bed250adf2098adeb9ec402751bd45817f3969cec39c459feaa3c93b066bbfc9c7f92a780f95e400cb4bac429db0c512464788e1fe6fdcccca27850e3c46 SHA512 e8dc79d269d3c1506dfaf16e03c87239a51f24c2d56f8b611c4d3f44a2cb7fffb0db9ee5af1b2a93b990c12363e7643bed58b1269c45662a7581f9beb763e973
-EBUILD gnome-photos-42.0.ebuild 2444 BLAKE2B d4dec905f1a30fe7439b9aee77bd1abf43baa3502a7f7b7b63b54334880652b4a5e19c577d17e867ca12bfd6815b0e98c2497dab4a193cb1b3acb5f225e7fd16 SHA512 b2998fa278183fb7643d1870050205e24c1f88269782fdb22982e22b8d63253c4a351eaf9bfbbc5ebc5f5fd43f59cc10680d4ce672e7c2c7944c634d0d30b17d
+EBUILD gnome-photos-42.0.ebuild 2441 BLAKE2B cbc42c5c0874e2af6880e01266f2e8a7dc4a4ae7f2cffcd60e35c22e1244dd9836e9f762e2faea89de9556e0ccf207a554c7e087256e645bff243266d4c5285c SHA512 e586a55bf2988b9767d7cf68d6364b4f730a36d90cbf02864796a5012bd8038fb5e5446a9951c752a208e3976b19b5aa31668b8df09e377ee639827313fec491
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
index 0ad5b2620be4..69c57dce0b5a 100644
--- a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
 
 LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE="flickr test upnp-av"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index 34294ec18acb..633df525d779 100644
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -2,5 +2,5 @@ AUX 3.12.2-link-with-x11.patch 419 BLAKE2B f13fc6aead441d83ba55fafd3528a96691c18
 DIST gthumb-3.10.4.tar.xz 7581416 BLAKE2B 7afc94c18d819a5eef7d075489533cf99e7f6d5eaf409b163524a2f62d9c22a40edbc114b16d6d7b7960df53d49cefda9196ebeaa2bc0c19e5760f584628209b SHA512 90f7d83d2fb6db12ef16e5ce29d9310ed5aaccb269004d72df985dda839c1ce738354942f537a23f63cbe724a351a0f13f2eb1e659ada50196af1bc60d5c5d27
 DIST gthumb-3.12.2.tar.xz 7585700 BLAKE2B 9fb4fd934975fb775b82cf17028abd6d4ac3c31ee30458c377d36d3af97e59218e621d09768eebec096c64e3d01697bd3080409fd2191c2af29d84c9b53508c1 SHA512 5304b5cfefa4ced6a244db5a6e2880dad4f5a598654c9ea6c7707ddc0a766bdfa108f827a74e400168dbc338e35db519fffb7ac7382e0ee564771d56af3ac97c
 EBUILD gthumb-3.10.4.ebuild 2348 BLAKE2B bdbd9aedb683d9a02e2731418c175405d50ce3388400970d944dbc119af902e57bcf735c2ee4bd7744be41b2fa77bc5ae22edf148061fcf29ccaa35825bed17c SHA512 aaac5963f3b6d12596c6b216fb29a2269d322013f8db95a45b38abf07053087d6132725985b5781bbf9e2b1804597700172da0179144c3511653614e44530ced
-EBUILD gthumb-3.12.2-r2.ebuild 2656 BLAKE2B f7bc20cc4706cb648c20237e9cb5930af61614725584817388f5488dd229f848c6609036d86a6193be6f74b6b6fdf5493f9f0314ca599c227794b74bf78f301e SHA512 bec38cf9aec2b4838e12a328b2a448383b01118232ea2159bee899e73aff640a2812e38cb94b8b58d8d199f6b31773b7aab74038cf92b7e0f7e71e05fb9996d8
+EBUILD gthumb-3.12.2-r2.ebuild 2654 BLAKE2B 95f882a359e0c8680e8dfea70fd24295926749ae678bc71f5369efa2aae69370b389ca79f03007f6b18abdc809d3e902272f48ca34a6d44ae4400a7e16422b9d SHA512 e56c9f6d0ed7bfb1c8722a95f275b2b82ce8d02cd13ae4e870cfcbf9c9406483ac02e99b19a4433a69444e17c3f9fb4bd604e7e91f6d7fc89ee8943c816e8e7f
 MISC metadata.xml 610 BLAKE2B 3f0da33439a8ea18b5a5b3939d892494370c163a41bbf1daf1e9663a6ca25f833447c555d04debc2f61795d4eea3eb2691e3181492dbc3be0a72df8ca960c501 SHA512 b12acc3949bac7cc6f45de0db32c7741eeadda19a975d4dd743053f6c3c63e3358c6900139793e3eeda782b91757f25cebbd5fbc5d550568d36fe2ff3581edaf
diff --git a/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild b/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild
index d7c6ca2c5978..8f3defb53ad5 100644
--- a/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.12.2-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer heif http jpegxl lcms raw slideshow svg tiff webp"
 
 # libX11 dep is a workaround. See files/3.12.2-link-with-x11.patch
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 5d6ae6702e71..d34f121d9a5e 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -7,10 +7,12 @@ DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
+DIST inkscape-1.2.tar.xz 39157952 BLAKE2B f2f8041cb57d8aa4cad1007f40ea7ce251a6d0c44d713a1542dd9cdf43b4a221705f5b59a244f6e9aca62ad7ec3686f44e7d79ec8cfdeb83a01f18a0d1be32bf SHA512 d4be4ef80638ed5a0fae655c3ea696a2171130110e220beb510e4b51dba95854ad065293bb07683c93a1c550764a1947621389da1199c43997f76b62b69e3812
 EBUILD inkscape-1.1-r1.ebuild 4548 BLAKE2B 1a9e56bac64ef4a83dfc2990601b9300c18892f2e7fe847cc0fca180efefd92835375303e78f542a88ce079ac28fc482ec07fa52d85ad22df8f65986cba030b9 SHA512 b2a14c00db740534497f2a6160160e5b3378d20452bf6162da379bc358279a4c81e189cfb8367392e73bb18e84b19a199e211c44b7d86a95156bad84ca654ca7
 EBUILD inkscape-1.1.1.ebuild 4338 BLAKE2B 51fdd65e55a73671e6a2936a55c2b89c6b8ad52db299b1731fed99f88e0de31ff70fb665dd483335b95b227a89657ab36a57bbcbf3dfcaa02dccc9616a60d0b6 SHA512 b98a58af9aabc792342e35ec5ac5a356b3caf71a2324aa6e6446474625cc2b66b7b48f7d13dfa5dda7ca053bf6e35fada56b5062f3e3288a0bcf99ed656c2496
-EBUILD inkscape-1.1.2-r1.ebuild 4774 BLAKE2B 3485b536927848210edb94692a0f2bb8c36d95533d85ce353df11da707a955bfb07e95345e60b905dcecbe87c60d1cb7b096693318862b1e5ac8b9fe50026b97 SHA512 57de05bb71ac6ba03014b44fe260bb40ab04709a40ef293baa9cdfd081517654eeefa783c685240377fff2b20a2cb2fe3701c249a38fc5b7f3d5088fa49190b3
+EBUILD inkscape-1.1.2-r1.ebuild 4773 BLAKE2B 9c64a13ccb22186fe7cbfe12be7cc0d3c230fa2b13216a41dc9893045556940f8430a13e263d7071779627e2da24d1eacf444dba1bfc057a6e12b1c6bc783618 SHA512 ff6f432ab35c2e222a7a4ad8b903f1a80bd53f1e2736f909c9ccfb76a79a84f1a026fc2090ec11a49d4f23ef92ee442f0db9aeb84063ff7b529473472cd5ff19
 EBUILD inkscape-1.1.2-r2.ebuild 4972 BLAKE2B 26ef9465a2b40fd9bfcd0c9af8bf11bad6b2e1af11826c68c9d0f61679df79520401fbf45199e3a5ab1b29330abe33558d00574aa264722388acaf79eb7ffb23 SHA512 dd05eba12d4aa8c97eda4d828db6d00930aa6b56bd908e11f15ee129c5cf8a4863902d2692c06cc8cefdb37b9173a4793033821bd9647ddac8808237d28fcfff
 EBUILD inkscape-1.1.2.ebuild 4645 BLAKE2B 0777360387987f1b86b82c25b2d8e72ebb589b57554aa0b610c1f567fb7a46508008b1de7b41a9fe7061a8a77490b3c98f4ab9800bbab61b4d29dba08e223d7a SHA512 d1f2601504f58e82f92ae7ce19c0d745ec3ffeb631d9b0f21f67b621eb0b403f7f22d427e5911c220fc7bb7f8ac937dc44e6b3acbdd594a855534002fb4c89f7
-EBUILD inkscape-9999.ebuild 4654 BLAKE2B 9311735766168299e53232a36d26839327e342ecb5fbb1469323e7199179c736718ef138c66dac0187ad42ecafc127883a40f546557375018377c8afd9fbc766 SHA512 3f5bccae039ab61d782b05d2686698f1c727db5c0f6983b332bd9087f0f3f29589fb5f9fe7c5b3b34487e7cbf383f26aebade9b4671c979be6d6a73a8d93578e
+EBUILD inkscape-1.2.ebuild 5065 BLAKE2B 8f25726e5bf300390e819e09c9d5c8abc91d1ec9549ba04f67ca06c85adfde6d529887ff24a86c5fe74906271658635d1eacddb721b67fe3e57b90e6cb052d7f SHA512 74ca41f416ce08c0512ef2a9e8cdf596a126a6d3d9efe5a877503a887312827b79bdaa29b50fb799ff186385c16a2c2b4e4061cfa7c6922a978a5f35009523cc
+EBUILD inkscape-9999.ebuild 5086 BLAKE2B cc67c3a42f972cc4085b66bf79db48e5a0555910ec034fbf242ae20b4f909cf4294098e6bb6dfde1407e8f3ff218d66403288892355f36ee12c3534cda6d5c5f SHA512 10571f3e81c26c3078f2a605c9372339d00365a7cb12e2bdbfd238ddc348bbee11a0615f7cefcefa3625ffa02625e541b6a04209205e72b63662e89a0b741f82
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
index e981f947726c..f18c02e8c2d9 100644
--- a/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
 else
 	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
diff --git a/media-gfx/inkscape/inkscape-1.2.ebuild b/media-gfx/inkscape/inkscape-1.2.ebuild
new file mode 100644
index 000000000000..05ed4ec9c216
--- /dev/null
+++ b/media-gfx/inkscape/inkscape-1.2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+MY_P="${P/_/}"
+inherit cmake flag-o-matic xdg toolchain-funcs python-single-r1
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git"
+else
+	SRC_URI="https://media.inkscape.org/dl/resources/file/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+DESCRIPTION="SVG based generic vector-drawing program"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+openmp postscript readline spell svg2 test visio wpg X"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	test? ( virtual/imagemagick-tools )
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/poppler-0.57.0:=[cairo]
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
+	dev-cpp/gtkmm:3.0
+	>=dev-cpp/pangomm-2.40:1.4
+	>=dev-libs/boehm-gc-7.1:=
+	>=dev-libs/boost-1.65:=
+	dev-libs/double-conversion:=
+	>=dev-libs/glib-2.41
+	>=dev-libs/libsigc++-2.8:2
+	>=dev-libs/libxml2-2.7.4
+	>=dev-libs/libxslt-1.1.25
+	dev-libs/gdl:3
+	dev-libs/popt
+	media-gfx/potrace
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	media-libs/libpng:0=
+	net-libs/libsoup:2.4
+	sci-libs/gsl:=
+	>=x11-libs/pango-1.44
+	x11-libs/gtk+:3[X?]
+	X? ( x11-libs/libX11 )
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		media-gfx/scour[${PYTHON_USEDEP}]
+	')
+	cdr? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libcdr
+	)
+	exif? ( media-libs/libexif )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
+	jemalloc? ( dev-libs/jemalloc )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	readline? ( sys-libs/readline:= )
+	spell? ( app-text/gspell )
+	visio? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+		media-libs/libvisio
+	)
+	wpg? (
+		app-text/libwpg:0.3
+		dev-libs/librevenge
+	)
+"
+# These only use executables provided by these packages
+# See share/extensions for more details. inkscape can tell you to
+# install these so we could of course just not depend on those and rely
+# on that.
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+	')
+	dia? ( app-office/dia )
+	postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+	[[ -d "${S}" ]] || mv -v "${WORKDIR}/${P}_202"?-??-* "${S}" || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i "/install.*COPYING/d" CMakeScripts/ConfigCPack.cmake || die
+}
+
+src_configure() {
+	# aliasing unsafe wrt #310393
+	append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		# -DWITH_LPETOOL   # Compile with LPE Tool and experimental LPEs enabled
+		-DWITH_NLS=ON
+		-DENABLE_POPPLER=ON
+		-DENABLE_POPPLER_CAIRO=ON
+		-DWITH_PROFILING=OFF
+		-DWITH_INTERNAL_2GEOM=ON
+		-DBUILD_TESTING=$(usex test)
+		-DWITH_LIBCDR=$(usex cdr)
+		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
+		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
+		-DWITH_GNU_READLINE=$(usex readline)
+		-DWITH_GSPELL=$(usex spell)
+		-DWITH_JEMALLOC=$(usex jemalloc)
+		-DENABLE_LCMS=ON
+		-DWITH_OPENMP=$(usex openmp)
+		-DBUILD_SHARED_LIBS=ON
+		-DWITH_SVG2=$(usex svg2)
+		-DWITH_LIBVISIO=$(usex visio)
+		-DWITH_LIBWPG=$(usex wpg)
+		-DWITH_X11=$(usex X)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
+}
+
+src_install() {
+	cmake_src_install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.bz2' -exec bzip2 -d {} \; || die
+
+	find "${ED}"/usr/share/man -type f -maxdepth 3 -name '*.gz' -exec gzip -d {} \; || die
+
+	local extdir="${ED}"/usr/share/${PN}/extensions
+
+	if [[ -e "${extdir}" ]] && [[ -n $(find "${extdir}" -mindepth 1) ]]; then
+		python_optimize "${ED}"/usr/share/${PN}/extensions
+	fi
+
+	# Empty directory causes sandbox issues, see bug #761915
+	rm -r "${ED}/usr/share/inkscape/fonts" || die "Failed to remove fonts directory."
+}
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index 76be9a5c187a..e9b78447bd43 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -17,11 +17,11 @@ else
 fi
 
 DESCRIPTION="SVG based generic vector-drawing program"
-HOMEPAGE="https://inkscape.org/"
+HOMEPAGE="https://inkscape.org/ https://gitlab.com/inkscape/inkscape/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
+IUSE="cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell svg2 test visio wpg X"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -49,13 +49,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/gdl:3
 	dev-libs/popt
 	media-gfx/potrace
+	media-libs/libepoxy
 	media-libs/fontconfig
 	media-libs/freetype:2
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	net-libs/libsoup:2.4
 	sci-libs/gsl:=
-	>=x11-libs/pango-1.37.2
+	>=x11-libs/pango-1.44
 	x11-libs/gtk+:3[X?]
 	X? ( x11-libs/libX11 )
 	$(python_gen_cond_dep '
@@ -67,7 +68,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-libs/librevenge
 		media-libs/libcdr
 	)
-	dbus? ( dev-libs/dbus-glib )
 	exif? ( media-libs/libexif )
 	imagemagick? (
 		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
@@ -142,7 +142,6 @@ src_configure() {
 		-DWITH_INTERNAL_2GEOM=ON
 		-DBUILD_TESTING=$(usex test)
 		-DWITH_LIBCDR=$(usex cdr)
-		-DWITH_DBUS=$(usex dbus)
 		-DWITH_IMAGE_MAGICK=$(usex imagemagick $(usex !graphicsmagick)) # requires ImageMagick 6, only IM must be enabled
 		-DWITH_GRAPHICS_MAGICK=$(usex graphicsmagick $(usex imagemagick)) # both must be enabled to use GraphicsMagick
 		-DWITH_GNU_READLINE=$(usex readline)
@@ -161,7 +160,15 @@ src_configure() {
 }
 
 src_test() {
-	cmake_build -j1 check
+	local myctestargs=(
+		# render_text*: needs patched Cairo / maybe upstream changes
+		# not yet in a release.
+		# test_lpe/test_lpe64: precision differences b/c of new GCC?
+		# cli_export-png-color-mode-gray-8_png_check_output: ditto?
+		-E "(render_test-use|render_test-glyph-y-pos|render_text-glyphs-combining|render_text-glyphs-vertical|render_test-rtl-vertical|test_lpe|test_lpe64|cli_export-png-color-mode-gray-8_png_check_output)"
+	)
+
+	cmake_src_test -j1
 }
 
 src_install() {
diff --git a/media-gfx/pstoedit/Manifest b/media-gfx/pstoedit/Manifest
index e006c3d41574..e0859d190200 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,4 +1,5 @@
+AUX pstoedit-3.75-gcc12.patch 282 BLAKE2B b25ffea80561cc5b3a35c2f48333996195bba681c8c14464f798344b6d09f72c86cbc4546fa185e699e8da729b394027b66162fc50e96dbb7e2ef8061ae300b2 SHA512 b4c1256a8b53746d611bd41d02184fd3d532aa16fda1661dd4bfa4badae94164c66bd47041e87072678bbbf7dfdc8eb0a928fbfb4f8cb6c947e28916871b17b0
 AUX pstoedit-3.75-libdl.patch 432 BLAKE2B 19d6b192c7fa1497f40baff8c039139248be34bbd7f1858e4731da4e631a46dfa8a7e5a9041a5e991a44fb049b0399fad763c65b9a27437d7bcd1d61631fd760 SHA512 010263020e07b57fdde3fa6478cf5865877d71d015a446d8111326d69ce7138467e384bb5f48baa149932a0c4a42d9a60552ff8616125cbc1dabf613cd78df79
 DIST pstoedit-3.75.tar.gz 1290057 BLAKE2B 607a265ea6f058e1ba432d55c4602452cd52a48302441ecee542a113d90b090ce888cc6fa5e3a8e3a2fdbf94dce9b1ab1f7f5ba58ab81f1f509eea9052a3cd82 SHA512 54b8cf7e78e52027d45e7550821476d9a9c4df4f63af83792b6a2909bc62236450ba6b619f95eede9f61a715f4937f1fbaf2ce4ae4b486daa0294c396a882a28
-EBUILD pstoedit-3.75.ebuild 1300 BLAKE2B 7614bc471896e99ac154c612bee2d111f10a1975b14268d81e2e6f894f062e718ec7d4e1f8d7fbaee5769b39c4a5fcd259c6f9c1337d27ea9bfffeec67c9c514 SHA512 47fa2e7eb1a7e6b893c9d5e6dedd93b451020dbd644e72c4d31cf091c092eade02005a8cd6341b37d391559bfe732b1773863d554bfa612922cf1563103b1e5d
+EBUILD pstoedit-3.75.ebuild 1333 BLAKE2B 5a03ac70300a30bd581ce4ce38a267a11e12a0cb236aee70eb184993c5c03d6182bc8b335bf4a60befdb5cdb830dcf23f072d94951241cc4ea66b126300a8b0f SHA512 e16079136f1e353a7d0c414993121028fa659b3033f97c307683830605b95be7c254fc918a21b3320dc57a871b553d9202f45a809b53194355e9a4dabafc6c1c
 MISC metadata.xml 634 BLAKE2B ea6bd21397a45a3591572e803513b32361761a9872800027ab779c2a9f0e214db9e70dc9fed0acbf6dafe3769cd8525e21d2875e62f4b8711bfc03f38bc47214 SHA512 d8d509f442aee8fbb9036dab15fba870e18b8d6b0b120d3c82bb50e7d86379425f5b91161e4f37137f43710fd50ac2c8481b47b0dd5ab39654729a7280258465
diff --git a/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch b/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch
new file mode 100644
index 000000000000..fa42a7a831b6
--- /dev/null
+++ b/media-gfx/pstoedit/files/pstoedit-3.75-gcc12.patch
@@ -0,0 +1,13 @@
+https://src.fedoraproject.org/rpms/pstoedit/raw/rawhide/f/pstoedit-fix-gcc12.patch
+https://bugs.gentoo.org/844040
+--- a/src/drvpptx.cpp
++++ b/src/drvpptx.cpp
+@@ -65,6 +65,7 @@
+ #define ZIP_EXTERN extern
+ 
+ #include <zip.h>
++#include <memory>
+ 
+ #ifdef _MSC_VER
+ // MS VC++ Windows
+
diff --git a/media-gfx/pstoedit/pstoedit-3.75.ebuild b/media-gfx/pstoedit/pstoedit-3.75.ebuild
index 6469d052b2b6..e866acb3c778 100644
--- a/media-gfx/pstoedit/pstoedit-3.75.ebuild
+++ b/media-gfx/pstoedit/pstoedit-3.75.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
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}"
 DOCS=( doc/readme.txt )
 HTML_DOCS=( doc/{changelog,pstoedit}.htm )
 
-PATCHES=( "${FILESDIR}"/${P}-libdl.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-libdl.patch
+	"${FILESDIR}"/${P}-gcc12.patch
+)
 
 src_prepare() {
 	default
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index babf638e0fa5..eb7a8a2199c8 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 856 BLAKE2B 7461babbe82c4cd2a9af878a704cd00d8ce5c13428d1a2a7ce159781520031a82404bff091f61bc4fb7fbc766bd22a7cc65c69173480d1ac2e5f0e41cb133047 SHA512 21df065e1ecad37801c275bb6344c712b081b908c46cf5ae84fd8688b3f962fd78f972738237d10358ccca1d8360514df0ee1fece3333cb360f2aed24a21ff9c
+EBUILD qrencode-4.1.1.ebuild 862 BLAKE2B 2c8a3246d70ebeb52affe91abb4b49ff90b40226a1ff278c829b2b2650a8cda8a432d3e0a1a3ca45663953444feb405d6265bc3c15c917e827f1a592d3154927 SHA512 9f66a132faf20590b4479b0f654a205cf308f8105332be124154aabb452772de8a2fa908b11b5c6b49a8a540a7d9b86f30d9a54c7e8cb50a876b95cda895bf51
 MISC metadata.xml 459 BLAKE2B 6098078226f047222b6eaeed16e7e66ab8cee01d25b042b325746532c4903fe5ebe7b2e8456d40e74ad232138ae5b95f0d51957895f794cf9b78739f84d9811c SHA512 b94b87b44d4af45350129dd2879f6463b1fc9e3803615c7bef28529f63cb3dad419dce43fd285fab357163f2b0193a4a453ba6f888d2a3b33c835a16ed841497
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 4abfd1947f00..58e1e9cec354 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="png test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index f9c75f07c5c3..52ea3078e1e6 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -4,6 +4,6 @@ DIST shotwell-0.30.14.tar.xz 6524680 BLAKE2B 321406d3731a4baa333c3820ee46e8dc12c
 DIST shotwell-0.30.15.tar.xz 6533632 BLAKE2B a973c22f06b2c05561db72974fa8f8a72006e4795ca282bd7c94e99f1b59c411917a30dd00b896cf606b80596c1510fe50e81c1a1c8fa6b98bcd75f8b25c5769 SHA512 aded4c8ec015546cb64189cc1a85b6bc233861367ec514cce041607a1deec9d69687f26e448865783c686813c1caec78df17c29d38c4296c4a255ff20c7cde0e
 DIST shotwell-0.30.16.tar.xz 6532812 BLAKE2B caa2ff2f4536d8f04900d7ba7c583b7ec0d0244d6253bc17971e2b4e04aa3790b17e932b3367e1be40d4a0bb566bab31396aa5dfdb6dbb5c9803272cd7f94e97 SHA512 4ed725a34b1663b9cb63dcd13c98795fb2ea9a5d79ee4541276bc9dc2f607ce6466cc9c983bab55e7418e69eef3d1598846aeb6750f00927663756bd11d9a084
 EBUILD shotwell-0.30.14.ebuild 1923 BLAKE2B b2ed36882aa19d902673d4f9b5565643e5a2c026e4973a439076fa047cc1bf7e6f5c9a2e573ee117cba45d7d6c520f4f1539290d76a3117c7c2df2ec30a13657 SHA512 27b1afaf0218ae38ab259ca619ec8a0a0e97ce5c2dde709402bf0e519beeacf663933ba7323976c3300e0b2da9058585a76ac8ef8d15b7d13b25a123c679dca9
-EBUILD shotwell-0.30.15.ebuild 1885 BLAKE2B 0ffd5e1db82c7abcce8a78f823625e5982dd56b8cfd77ab65d2a2c0aada103e9e1a47675f13023b7d02e974990f07ed905bd6f8b93b6bb6675573991ec8cb55e SHA512 199f1fc5966ef2496743e55289f25866f779bfd224cc7c1189d1a35b2241b0fc80de4bcd2dcd6127265262031e2ffbebaf8a60818a8421c17db8b6ec668bcd04
+EBUILD shotwell-0.30.15.ebuild 1882 BLAKE2B 7c80188ad903a5ce7950c7e9f99e258652bc592b64869fb1049a295e031bedf03f8296eeaaf5b5252c6fb62596d2bd63af8c689ceae42c40c6f95e2f2cbc2f58 SHA512 b22de2d539a7da105f13a684210cf9e8d9071d018aaffc433529444073cad4e4756035618e132a54e26bd65e4bcfb23b5922cbe353daeaa0e7025f70dab98642
 EBUILD shotwell-0.30.16.ebuild 1823 BLAKE2B a14405be5d105d113d552c602012de5f9fc65b704dcf9747bfaa9c0b150884ba8ddeb2590322a8a7fd6ea0d19dc042a2e2655bfdcdfc5e4ed4c65a4a1424fcf8 SHA512 00bbe3c3d8bcff50baac63e91d8c313c4c2d1ac744483f84daf1bef6931522bfee06a96ae14c611c4f92ef583594e86278acb625374521dc0636d7a8abf0ef34
 MISC metadata.xml 685 BLAKE2B 60a7448a9542a8663c25966bfa7dae2bbd50fb727795300e6483ea39147521b2d6ebd3c4dd894c553cbd94df18f4e39e1d88359d9da346a02cb7a02709d19f11 SHA512 da9730037e4d473898cfa537446b9ea3dae77bb915c54df139738a4e19b824ff273c36c2e3a43f421d91e2de09789843ccc84bd4cb4bcda258eee37fd9dec425
diff --git a/media-gfx/shotwell/shotwell-0.30.15.ebuild b/media-gfx/shotwell/shotwell-0.30.15.ebuild
index fae21f9f1568..378b625ed7dd 100644
--- a/media-gfx/shotwell/shotwell-0.30.15.ebuild
+++ b/media-gfx/shotwell/shotwell-0.30.15.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 IUSE="opencv udev"
 
 DEPEND="
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 2c4dfa4093af..3b5dd9545994 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -5,5 +5,5 @@ DIST simple-scan-42.0.tar.xz 1097464 BLAKE2B e2ca253d6fcff9a320312bbf32e50242b64
 DIST simple-scan-42.1.tar.xz 1100296 BLAKE2B 86d22abb8e3f72f19ab856d8e3578f57f71bc8e34ee5bb6e3809f160bc733b7f5753b947cbd12714829b29662087cdb601687cdd9ca1b1cbba41e543ce033ed2 SHA512 c4919ade08a30ee185eb4c62f59777fc360aa35c009f033ee9a9d10e23104fc0c44016509551e3d8de2948a3657c6c4d6c2fbbd955c4c09c6698d6733a55cfce
 EBUILD simple-scan-40.7.ebuild 1512 BLAKE2B 9c59589c74f9227579d0446c58ff3a24bfc7c06647223f63311d67e748df54ea7f59f9db59e7bcc2a4dd8644150961ceb32bc9547837201b9df259aea9c2b5c3 SHA512 f8051b6a45824ec2e0ba3cf9390d8f3937bf755f95d1f0b65c72233bdafd33fe2e08f45b18eeec5deea236bf198fa47dbd5784fc45f4572f49f438b22c567b6c
 EBUILD simple-scan-42.0.ebuild 1469 BLAKE2B 1c1c6d63706893b43d2a1d6c698908613dbb86f3838870d40a66fef5855e4056af6e6c5b3c2394039ca6b6485b1bf9d42a00b56e37b73f0d3bd52c391ab88b85 SHA512 f0c988eb6655f0c3cf4ed0aa6c4864b21c22daffe21b4515a0b70701b2668da6c850754f743d9dca05eeade03dde902e3758e68b569a31486b92051d1528d656
-EBUILD simple-scan-42.1.ebuild 1417 BLAKE2B ecad26a79c0d2f5b87644df1935db293af7e3e7287ca400a3df8f88445690f781dbb683a4d663470559b48810abe2be35e5c1b55802dabb198b814f8018b9c2f SHA512 192ba0903c6d4900b3aac228c7643445d95f51841173b203895e93ed1fde9ff1b6104bd50721876604302212f29910276f2f40d4b1d00d05b82bd1a77b9ec5e7
+EBUILD simple-scan-42.1.ebuild 1413 BLAKE2B cee1df9054a8d58afb0d4269a8dd4ff0c60a775aa1c881ac89ead27989d58df0c89ca0ae617d2023e137d75aa9d0eb304d7d602b00e413ac79745aa26e9cd085 SHA512 1253350677b27878f491c45bd776ec1349143b1d68cd34ffb264602568cc0fc95c21ebf98689a783ea44eee5572a45c44ee3c0a050680e323b04c044bb2e8be7
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-42.1.ebuild b/media-gfx/simple-scan/simple-scan-42.1.ebuild
index 00ffa5ac377e..d24be5225422 100644
--- a/media-gfx/simple-scan/simple-scan-42.1.ebuild
+++ b/media-gfx/simple-scan/simple-scan-42.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index b16cce54e7ed..393684aef0ad 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 4262da591c4e..4e2119592980 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -2,4 +2,4 @@ AUX aubio-0.4.9-docdir.patch 1192 BLAKE2B 617f5a63d51440eba157687b752822b3e14316
 AUX ffmpeg5.patch 745 BLAKE2B f353faf80b4fdfb26b2d8a135ab0415ac3f6780a2b5894e18b12e137fb109b1b89b4c8500f8dc1e809d763f851ce186f199f32c680a80c816f40ece997639d0f SHA512 8eeeac40bbf4e1faf7a99d2cbfe4a7b3bc85b5b5927c7bf69ef774ad06fcedcb0a84296dce7300f4907b2ca16525e6db854acad371d788c7f5fb7bd4a94efc86
 DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130
 EBUILD aubio-0.4.9-r1.ebuild 2890 BLAKE2B 8092db7b899d9e2a58a17369c76d4e7549d1bf6fd0ad28ab26489c100750f6aff24a4656ae6f1c7d55a2f5f63f74b3d705d30eac5fe18c9628f7b9c3549c05ca SHA512 c71ed6f34b4df6aa3da741bf12791a39a8b48649bf138d7fed98f428e7c3f0cea177f5c86767e128851b1743b7e3aee81a1faf9a3601043e3871ebb9ab4b6c85
-MISC metadata.xml 347 BLAKE2B f7d98421cac20a208edfa27aa0f7cf90749ae2ccf6db3b2504b7fef79f305e5b3d42adf63848ead968a47491f394ddd20c7c9eba78134e72f849d83636cf4fe6 SHA512 f4ca8b9029523bbcb1e4541033555eadf40fb61024f224545d41ce33b5647a213ffe6f15f7d1a088d192a9d240dd621fda3eb78a8b4c2a53d0f2b925673acd23
+MISC metadata.xml 424 BLAKE2B 427627520c0e31649dc3bfa4011cb80b48cac5bc2ba6bea55812b033b1a92e2a07477729f83057ae0c213c82ed20899e05978e6968db3d3ff166e153c4b1c1ea SHA512 a9cb14aef216e074f21616493f1a9276c43f05709b14492de8cbd90d4f19878bc9f905545327985639f05ee75234d11689eba519f88c6bafaa8b848bd887178d
diff --git a/media-libs/aubio/metadata.xml b/media-libs/aubio/metadata.xml
index 90fd530387b5..74ba2a643f99 100644
--- a/media-libs/aubio/metadata.xml
+++ b/media-libs/aubio/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>proaudio@gentoo.org</email>
 		<name>Gentoo ProAudio Project</name>
 	</maintainer>
 	<use>
 		<flag name="double-precision">Compile in double precision mode.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">aubio/aubio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/clutter-gst/Manifest b/media-libs/clutter-gst/Manifest
index 7529b84150bf..ab9be5c01362 100644
--- a/media-libs/clutter-gst/Manifest
+++ b/media-libs/clutter-gst/Manifest
@@ -1,3 +1,5 @@
+AUX 3.0.27-video-sink-Remove-RGBx-BGRx-support.patch 2406 BLAKE2B 936bdb2306030eb615b555f3d82ef14808a6f840f1b0eb9de4016b5cb7fa733c27efaadbcbb48ea2b40a65a989877dd3f12b3481491f60a82dd406a88cd7e857 SHA512 00ead4f4785c33b846caf74de79d7b44ec41499d44f16775cf1881b4c5d3a10e6b2a17eb60deafba19cd41f9d760d1df6b0b61299d6cb620e2b909871c369660
 DIST clutter-gst-3.0.27.tar.xz 404972 BLAKE2B 6861e6a0e8770b1d0c1a1d3ca593b2f8b5ea381614d063c040ee92e4099d8b4e43d25fa6058f7d1c146fdf94766b20e7aa69fa6fc6725b46af4a3ed976aa05cc SHA512 27271d9b2241a35cf7f61c4e9e25126d578494843c947cbeac6b5ad1dc8726c7a2a056239617ec39b04a7671a45dcbe2a65c364b10ed470f7c857647f8c36cac
 EBUILD clutter-gst-3.0.27-r1.ebuild 1439 BLAKE2B 5d32b0b52a270b73a7070bdadb84711ca75ffb78b802cac23f012645fb394c6ee44df804f0391c34e585fb4186856a6b82e6095e47577b6fe6f4344f2150424a SHA512 0d66197c99965ff613531baac0c551093ea5e4f448d226bf890689ce60c873d840d260e15fc5603e1fb0197dd49fb764a763e453a551df029c23a3e2d49cd2f4
+EBUILD clutter-gst-3.0.27-r2.ebuild 1291 BLAKE2B 223e4478cef41f70494b2082f6794aa4db83c7d7a8835cb373b10d5da46ebca60f172826e3f220967a945071ed3f03398b849a11110d33a46da9d090febef27a SHA512 c1ffa673c6d97c4556f5a4ba870c16b65ebd952a30ecb752cd2ee1d8c2d4fcb7943e5809a9de5d08ca9665d3bd98da5f909aa1e6b9a18a8cbea202051bf5f441
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
new file mode 100644
index 000000000000..3b28b0d10ce9
--- /dev/null
+++ b/media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2
+
+HOMEPAGE="https://blogs.gnome.org/clutter/"
+DESCRIPTION="GStreamer integration library for Clutter"
+
+LICENSE="LGPL-2.1+"
+SLOT="3.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="X debug +introspection udev"
+
+# >=cogl-1.18 provides cogl-2.0-experimental
+DEPEND="
+	>=dev-libs/glib-2.20:2
+	>=media-libs/clutter-1.20:1.0=[X=,introspection?]
+	>=media-libs/cogl-1.18:1.0=[introspection?]
+	>=media-libs/gstreamer-1.4:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-1.4:1.0
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.6.8:= )
+	udev? ( dev-libs/libgudev )
+"
+# uses goom from gst-plugins-good
+RDEPEND="${DEPEND}
+	>=media-libs/gst-plugins-good-1.4:1.0
+	!udev? ( media-plugins/gst-plugins-v4l2 )
+"
+BDEPEND="
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.11
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-video-sink-Remove-RGBx-BGRx-support.patch
+)
+
+src_configure() {
+	# --enable-gl-texture-upload is experimental
+	gnome2_src_configure \
+		--disable-maintainer-flags \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_enable introspection) \
+		$(use_enable udev)
+}
diff --git a/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch b/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch
new file mode 100644
index 000000000000..fba6addc08cf
--- /dev/null
+++ b/media-libs/clutter-gst/files/3.0.27-video-sink-Remove-RGBx-BGRx-support.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Tue, 26 Apr 2022 23:06:51 +0000
+Subject: [PATCH] video-sink: Remove RGBx/BGRx support
+
+The rgb24 renderer uses the wrong pixel stride and the rgb32 renderer
+assumes alpha is meaningful. We can use neither.
+
+Fixes: https://gitlab.gnome.org/GNOME/cheese/-/issues/51
+---
+ clutter-gst/clutter-gst-video-sink.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 2cbabe6043ca..2c1c10c7810b 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -98,8 +98,6 @@ GST_DEBUG_CATEGORY_STATIC (clutter_gst_video_sink_debug);
+   "I420,"                                       \
+   "RGBA,"                                       \
+   "BGRA,"                                       \
+-  "RGBx,"                                       \
+-  "BGRx,"                                       \
+   "RGB,"                                        \
+   "BGR,"                                        \
+   "NV12 }"
+@@ -1392,21 +1390,21 @@ static ClutterGstRenderer rgb32_glsl_renderer =
+                      ";"
+ #endif
+                      MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
+-                                "{ RGBA, BGRA, RGBx, BGRx }")),
++                                "{ RGBA, BGRA }")),
+     1, /* n_layers */
+     clutter_gst_rgb32_glsl_setup_pipeline,
+     clutter_gst_rgb32_upload,
+     clutter_gst_rgb32_upload_gl,
+     clutter_gst_dummy_shutdown,
+   };
+ 
+ static ClutterGstRenderer rgb32_renderer =
+   {
+     "RGB 32",
+     CLUTTER_GST_RGB32,
+     0,
+     GST_STATIC_CAPS (MAKE_CAPS (GST_CAPS_FEATURE_MEMORY_SYSTEM_MEMORY,
+-                                "{ RGBA, BGRA, RGBx, BGRx }")),
++                                "{ RGBA, BGRA }")),
+     2, /* n_layers */
+     clutter_gst_rgb32_setup_pipeline,
+     clutter_gst_rgb32_upload,
+@@ -1907,12 +1905,10 @@ clutter_gst_video_sink_parse_caps (GstCaps *caps,
+       format = CLUTTER_GST_NV12;
+       break;
+     case GST_VIDEO_FORMAT_RGB:
+-    case GST_VIDEO_FORMAT_RGBx:
+       format = CLUTTER_GST_RGB24;
+       bgr = FALSE;
+       break;
+     case GST_VIDEO_FORMAT_BGR:
+-    case GST_VIDEO_FORMAT_BGRx:
+       format = CLUTTER_GST_RGB24;
+       bgr = TRUE;
+       break;
diff --git a/media-libs/freeglut/Manifest b/media-libs/freeglut/Manifest
index f1c4251c3555..e1c9c4feda64 100644
--- a/media-libs/freeglut/Manifest
+++ b/media-libs/freeglut/Manifest
@@ -1,6 +1,3 @@
-AUX freeglut-3.2.1-gcc10-fno-common.patch 3500 BLAKE2B 7163acef56f8f1bfebeaed554ecbe7a27dc3321bd19f5da5c1f482f52a447acf7bff3b8358d8023d8552fa5fa999475b70e3ec7242e8a127000ee7b49f2f751b SHA512 0845bc4c91c6233cab8c56d15d1efa8fcdac7ae12270a089f8dd20520fc5c94078b7abceadef304f8f42cd575a61ad5b1f444f21e0bbdd3ff310bcc40192336b
-DIST freeglut-3.2.1.tar.gz 440228 BLAKE2B ed8a4b2361416cfee5540350ee50c32a56e5ea75d6834c677c5cec676967a04e13b2adf3da1cc9a3a2c73fbc6147b3b0bc91953a6edf1e35ce8c933eeff6f97a SHA512 aced4bbcd36269ce6f4ee1982e0f9e3fffbf18c94f785d3215ac9f4809b992e166c7ada496ed6174e13d77c0f7ef3ca4c57d8a282e96cbbe6ff086339ade3b08
 DIST freeglut-3.2.2.tar.gz 397203 BLAKE2B e4151d9bd984504edb02fadf2983c750c1c81557f3467c01d4202d34e9e082a62f07d373908d3517f9b3fd3253b7b409f882cfe2187d4ff1787f3cdc09eecfe4 SHA512 190231951d314f854c244bd27f7c20488403bd0eecffc342097a2e3d1621cec87f6c209a77b4c153aabcf44697b4070227930e295ab74fb88953cbbf94fc81d9
-EBUILD freeglut-3.2.1-r2.ebuild 1499 BLAKE2B 5fe6ab2def7d44b129fe22ed721303324e5deda66a0d572e990760371cf6c661cd0804a2db8b3c7e876b2834d027bb0bd01727655f86d468f7a638a8ed097bdb SHA512 321c424e287b5e4b0a1e1f7c02f34639b952a85ca4ca81f8f8479b732bd47ad93d8d141dd00ba61cfbed4bdadfeabf70e2608e02acdd6a5195b15d84da088957
-EBUILD freeglut-3.2.2.ebuild 1419 BLAKE2B 92093fe30cfc05f2b516f7429b483d74a1b074ba861e9295a1067beef251cc65eefb6656bfc651a94dec1800df51988382680b21be10da4d050b95fca3f9f940 SHA512 cab7ceb9a4377c01ede7a4dcf93a3ef6d8c611b617ad5303ca36527214637d524833b50d48ab5b0d75b5bb78b642398c17e38dd0af74c3e47f3f0a762bbd769a
+EBUILD freeglut-3.2.2.ebuild 1418 BLAKE2B ba39423769e8625cd765175e57cdae6988a4a7940f732cc3c61281af47a010d0c5fa72f6c716bf12683e7638610ed2ab29d10f4342ac9a5bed6a45dfff082b50 SHA512 df7ba88f571cb1f2a5563213f579b3dde1b969d62c5f36bd318f1baf04815c9071e8a4baf6aa658c18dafda90a3efea51a43264951b5dc881b8d4637ff43d55c
 MISC metadata.xml 529 BLAKE2B ef8eb49e76fa342486804eb88393b0b80710761c9255e8971f99cd40a41cdfa7ac4734d66a2d2b285d9493ae9b6c56706235749f4958985e15bb22796a81908b SHA512 fe290b4e32aaecbc3f604adf0ef295d8fb1e9a2dee4fd4c3b61a56a82e4d6c4395cb6b6e4e91a6c196d632cf65102539d8f91dd7556ab7d63e539866d83dc8e5
diff --git a/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch b/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch
deleted file mode 100644
index 655c01bf94b4..000000000000
--- a/media-libs/freeglut/files/freeglut-3.2.1-gcc10-fno-common.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5791564dd934d193df771a0a7c52013e9f456aa1 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Tue, 21 Jan 2020 22:33:49 +0000
-Subject: [PATCH] fg_gl2: fix build failure against gcc-10
-
-On gcc-10 (and gcc-9 -fno-common) build fails as:
-
-```
-[ 31%] Linking C executable bin/Lorenz_static
-/usr/bin/cmake -E cmake_link_script CMakeFiles/Lorenz_static.dir/link.txt --verbose=1
-/usr/lib/ccache/bin/cc  -Wall -pedantic  -rdynamic CMakeFiles/Lorenz_static.dir/progs/demos/Lorenz/lorenz.c.o \
-   -o bin/Lorenz_static  -lGLU -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi -lm lib/libglut.a -lGL -lm -lX11 -lXrandr -lXxf86vm -lXi
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x0):
-  multiple definition of `fghGenBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x0): first defined here
-ld: lib/libglut.a(fg_gl2.c.o):(.bss+0x8):
-  multiple definition of `fghDeleteBuffers'; lib/libglut.a(fg_window.c.o):(.bss+0x8): first defined here
-```
-
-Note: duplicate definition comes here from 'fg_gl2.h'.
-The fix is to move declaration to a 'fg_gl2.c' file.
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Bug: https://bugs.gentoo.org/705840
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/fg_gl2.c | 12 ++++++++++++
- src/fg_gl2.h | 14 +++++++-------
- 2 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/freeglut/freeglut/src/fg_gl2.c b/freeglut/freeglut/src/fg_gl2.c
-index 38b0acbb..f79c432a 100644
---- a/src/fg_gl2.c
-+++ b/src/fg_gl2.c
-@@ -27,6 +27,18 @@
- #include "fg_internal.h"
- #include "fg_gl2.h"
- 
-+#ifdef GL_ES_VERSION_2_0
-+/* Use existing functions on GLES 2.0 */
-+#else
-+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+#endif
-+
- void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
-   if (fgStructure.CurrentWindow != NULL)
-     fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
-diff --git a/freeglut/freeglut/src/fg_gl2.h b/freeglut/freeglut/src/fg_gl2.h
-index ab8ba5c7..fb3d4676 100644
---- a/src/fg_gl2.h
-+++ b/src/fg_gl2.h
-@@ -67,13 +67,13 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
- typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
- typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
- 
--FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
--FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
--FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
--FGH_PFNGLBUFFERDATAPROC fghBufferData;
--FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
--FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
--FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
-+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
-+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
-+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
-+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
-+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
-+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
-+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
- 
- #    endif
- 
diff --git a/media-libs/freeglut/freeglut-3.2.1-r2.ebuild b/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
deleted file mode 100644
index f99b7bafeb9e..000000000000
--- a/media-libs/freeglut/freeglut-3.2.1-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib
-
-DESCRIPTION="A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library"
-HOMEPAGE="http://freeglut.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug static-libs"
-
-# enabling GLES support seems to cause build failures
-RDEPEND=">=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-	>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]"
-# gles? ( media-libs/mesa[egl(+),gles1,gles2,${MULTILIB_USEDEP}] )
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.1-gcc10-fno-common.patch )
-HTML_DOCS=( doc/. )
-
-src_configure() {
-	local mycmakeargs=(
-#		"-DOpenGL_GL_PREFERENCE=GLVND" # bug 721006
-		"-DFREEGLUT_GLES=OFF"
-		"-DFREEGLUT_BUILD_DEMOS=OFF"
-		"-DFREEGLUT_BUILD_STATIC_LIBS=$(usex static-libs ON OFF)"
-	)
-#	$(cmake-utils_use gles FREEGLUT_GLES)
-	cmake-multilib_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-	cp "${ED}"/usr/$(get_libdir)/pkgconfig/{,free}glut.pc || die
-}
diff --git a/media-libs/freeglut/freeglut-3.2.2.ebuild b/media-libs/freeglut/freeglut-3.2.2.ebuild
index 2e5244f23243..d8fb60843cac 100644
--- a/media-libs/freeglut/freeglut-3.2.2.ebuild
+++ b/media-libs/freeglut/freeglut-3.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static-libs"
 
 # enabling GLES support seems to cause build failures
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 1262ae333363..ae009cf6868f 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -6,9 +6,11 @@ AUX freeimage-3.18.0-openexr-3-imath.patch 5333 BLAKE2B 9465fb9c9f50f5bfe08d1d33
 AUX freeimage-3.18.0-raw.patch 432 BLAKE2B 96c89d051a849f5909bdb9b3f720d4146651504f972a1661b55caa6344eeac3dc64dda1beb027e43e9b2eb7ce5ac8193db424422e74ce957744d9e6d14086a7a SHA512 01e150205a62ee9eb240890a5c9b92160a74073a1fe43811ed8941aeda824ba3c87bf4a2e631cbe367a7391374e93d309d95a6b5ec31009e4e8f1c2fc6b10da1
 AUX freeimage-3.18.0-remove-jpeg-transform.patch 3392 BLAKE2B d82f5723aaff66a995ec4d748a8bc988a18ef149e525d108b458971dc3ae7278e9f0d65527576b6ebcd54b403d296810e19cc2d808397a8aa3558a13bd296331 SHA512 071b5dc814020db19d41527f2f6fe89f2a3a1340d5825c204ea3fa496d4d1c3075bdd006fa041b0a819892d5b01f1b9b32ed8827e9a180ef9bbe92bf2554a67e
 AUX freeimage-3.18.0-rename-jpeg_read_icc_profile.patch 1278 BLAKE2B b387457b89614c4fe3e7e37891c8ce0cc296b8e05300cd88b789e1a6551cb78761a58446f1a16d0d59af6ea05fcf73defd898fe99e6b12e6cde9de6bd7606edc SHA512 4c18f02f750c47796a718f579ae3bfda91354eba4ba991f4df9d71a09ead04e13087bcd1423374c359a39b98c729a38466e464b46d7cd1af15e9e4aadd72a3b4
+AUX freeimage-3.18.0-tiff-4.4.0.patch 492 BLAKE2B 284ed6a083b982fbc758237ba96812872c6b16937c7530c8fde2ce793ffcaa1c48864be61b92f61e346d2587720e406f0a2daad1d9cd82fcd86fdaa2f99df45a SHA512 78e691747ceaa369c976e11cc44dcd0baa9c82cf3e064f17703711062fdb443c82db5b14ba79fabb432c63d70115455c83c16d03ee370569a71e8f33baa97366
 DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
 DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
 DIST freeimage-3.18.0-unbundling.patch 20960 BLAKE2B 61ee63e7be0d5db7bf4a3bc053bb67f5a6ce6949ed252b1729e7542addd432d1105b7e70d834f05210be3c5c81a5378a2cb00d5b9d8e21590672a1ac6e1135fa SHA512 c56062099e17e8a16447fccc4bdf3089e7992273f1a09a2ff7f591b3bd68a8d1e80842400aaffdc8394ed64273e26a4f01e12fc8c55bb40d346db96eb5dcbe30
 EBUILD freeimage-3.18.0-r3.ebuild 3182 BLAKE2B e4279ecd9c3e8e00a998da85402efb3edd6845a20e1a2b25a61480d666d65a8702df19762615290e74fbdb8960d0d95f83e31a12865bb14c335fc7377139c7e4 SHA512 2113ca778f0116fc5ac12b74e9264e2fb04169af05d0b84e09ba3c3b42c9f51b30fab059fbc432d4c151a2761652cc0fd3296f661b9727f6a78d7a68b03923da
-EBUILD freeimage-3.18.0-r6.ebuild 3272 BLAKE2B e838e809310f2485f47524126769c3225ba34ab4a65d287cc03a2fa8e75789771715f5536a9db2436d94f00ae41821d8fbed3cc3d6fafbfbe3a3228fa7d484d5 SHA512 f50a10ac25c41c43bfb61e1a1f09279d8e57439c028aff83a0446101acb520fa7efef4657b4c39361ef752cd619909f114490fbf0895fca3aa994fd8172c2197
+EBUILD freeimage-3.18.0-r7.ebuild 3289 BLAKE2B 5c91326a25624833c7435c4ddbe31765316334603aa1d4877cd259bb3bd3d2a15d9df755c14eca3ceff2f128ea9779bab1f8842bfe39ca09bbf5bca8c7d9b53f SHA512 1511ca9d8ee82a882ccbad93e1d390873381b092874d2e44063caa0e5f46630b94d69c8ec3da4569a383060b83bb889ef75a41ac412ed3b06ef6f8f391ddc389
+EBUILD freeimage-3.18.0-r8.ebuild 3337 BLAKE2B fcc3706dedf53fabcab9d0f0e420a6dc3212ecea4d862b1a35ef35fea4e6353360f30a308732d5e18e7e537d7c75da545574a345c4a14892a31461cd4eab11bf SHA512 06b5b5881b492209171845bf8bf5088a3eee944b2806c3d809cef9bea9a49d727a02d2c2a34b609131a603f6f0dae239e81812894f914de30e2bec355ac595e1
 MISC metadata.xml 404 BLAKE2B 09c1635a36f53e8e3a48bd43d03d6cafaf9d511caf5bc3174fea2434970e1372eb1dbb979eb093e88078960c968cd578fcc4b74b67a34f55bf078f074ee97ab3 SHA512 d271f95c2295b4370c5434a172e838467daeab733399c26a1a730771ffae5a46bef879fd7e424b182177a2dd14f9abcc903cfa1c35052f84a2517f8803856836
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-tiff-4.4.0.patch b/media-libs/freeimage/files/freeimage-3.18.0-tiff-4.4.0.patch
new file mode 100644
index 000000000000..a0c39064aa34
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-tiff-4.4.0.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/848531
+https://bugs.gentoo.org/848534
+https://www.asmail.be/msg0055228425.html
+--- a/Source/Metadata/XTIFF.cpp
++++ b/Source/Metadata/XTIFF.cpp
+@@ -750,5 +750,5 @@
+ 			}
+ 			// type of storage may differ (e.g. rationnal array vs float array type)
+-			if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
++			if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
+ 				// skip tag or _TIFFmemcpy will fail
+ 				continue;
diff --git a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
similarity index 98%
rename from media-libs/freeimage/freeimage-3.18.0-r6.ebuild
rename to media-libs/freeimage/freeimage-3.18.0-r7.ebuild
index fc7744569906..7f916489e378 100644
--- a/media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+++ b/media-libs/freeimage/freeimage-3.18.0-r7.ebuild
@@ -24,7 +24,7 @@ IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
 # uses code from it to handle 16bit<->float conversions.
 RDEPEND="
 	sys-libs/zlib
-	jpeg? ( virtual/jpeg:0 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	mng? ( media-libs/libmng:= )
 	openexr? ( media-libs/openexr:= )
@@ -33,7 +33,7 @@ RDEPEND="
 	tiff? (
 		>=dev-libs/imath-3.1.4-r2:=
 		>=media-libs/openexr-3:0=
-		media-libs/tiff:0
+		<media-libs/tiff-4.4.0
 	)
 	webp? ( media-libs/libwebp:= )"
 DEPEND="${RDEPEND}"
diff --git a/media-libs/freeimage/freeimage-3.18.0-r8.ebuild b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
new file mode 100644
index 000000000000..aef7915a1072
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0-r8.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edos2unix toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="https://freeimage.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+	mirror://sourceforge/${PN}/${MY_P}.pdf
+	https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/imath+openexr isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+	sys-libs/zlib
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( media-libs/openexr:= )
+	png? ( media-libs/libpng:0= )
+	raw? ( media-libs/libraw:= )
+	tiff? (
+		>=dev-libs/imath-3.1.4-r2:=
+		>=media-libs/openexr-3:0=
+		>=media-libs/tiff-4.4.0
+	)
+	webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
+	"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+	"${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+	"${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+	"${FILESDIR}"/${PN}-3.18.0-raw.patch
+	"${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+	"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
+	"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
+	"${FILESDIR}"/${PN}-3.18.0-libraw-0.20.0.patch
+	"${FILESDIR}"/${PN}-3.18.0-tiff-4.4.0.patch
+)
+
+src_prepare() {
+	pushd Source >/dev/null || die
+	cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+	cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+	rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+	popd >/dev/null || die
+
+	edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+	sed -i \
+		-e "s:/./:/:g" \
+		-e "s: ./: :g" \
+		-e 's: Source: \\\n\tSource:g' \
+		-e 's: Wrapper: \\\n\tWrapper:g' \
+		-e 's: Examples: \\\n\tExamples:g' \
+		-e 's: TestAPI: \\\n\tTestAPI:g' \
+		-e 's: -ISource: \\\n\t-ISource:g' \
+		-e 's: -IWrapper: \\\n\t-IWrapper:g' \
+		-e 's:INCLS:\nINCLS:g' \
+		Makefile.srcs fipMakefile.srcs || die
+	sed -i \
+		-e "/LibJPEG/d" \
+		-e "/LibJXR/d" \
+		-e "/LibPNG/d" \
+		-e "/LibTIFF/d" \
+		-e "/Source\/ZLib/d" \
+		-e "/LibOpenJPEG/d" \
+		-e "/OpenEXR/d" \
+		-e "/LibRawLite/d" \
+		-e "/LibMNG/d" \
+		-e "/LibWebP/d" \
+		-e "/LibJXR/d" \
+		Makefile.srcs fipMakefile.srcs || die
+
+	default
+}
+
+foreach_make() {
+	local m
+	for m in Makefile.{gnu,fip} ; do
+		emake -f ${m} \
+			USE_EXR=$(usex openexr) \
+			USE_JPEG=$(usex jpeg) \
+			USE_JPEG2K=$(usex jpeg2k) \
+			USE_MNG=$(usex mng) \
+			USE_PNG=$(usex png) \
+			USE_TIFF=$(usex tiff) \
+			USE_RAW=$(usex raw) \
+			USE_WEBP=$(usex webp) \
+			$(usex static-libs '' STATICLIB=) \
+			"$@"
+	done
+}
+
+src_compile() {
+	tc-export AR PKG_CONFIG
+	foreach_make \
+		CXX="$(tc-getCXX) -fPIC" \
+		CC="$(tc-getCC) -fPIC" \
+		${MY_PN}
+}
+
+src_install() {
+	foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
+	einstalldocs
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index efbb2ed3d2f7..ae0a35d1d665 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -2,5 +2,5 @@ AUX 0.14.0-clean-up-python-support.patch 7005 BLAKE2B 623b003ab5c03ed86585ac662c
 DIST gexiv2-0.12.2.tar.xz 378428 BLAKE2B bb3fd6310cdb76f3e88bb31e018d78013bb626559b9e95bf59688601388cff10739c20c431fa9539c1d24c9045d2b3590a0f783a994d3b8966c4df12e9127f4e SHA512 850bf41f6180b0fdd050ab08da6e3bbd8d25ffc25a1f48e17a1d7a65771893cc79fba9cbd6718bf1754251ac4a4754983f0ab8f006a05f8c4a15085846d001a5
 DIST gexiv2-0.14.0.tar.xz 387288 BLAKE2B bdbb4547486a248cd9c6559276ebac20d3af5211474b86eb6ebfb3a8c76670ff7c2d162435e0cbcb270f96c64f5bc1eedc2d63c021b65f57e1ad9ec8cf9a4bf8 SHA512 d745ae2d8ddcf0c8a2a7980eaa489f9b520af54242c5e4ddded9c3ae4a579c824c8cb659bd7e985ffa09f9fe37bdf73d6d9181d456711e0953b73023eb0f9f50
 EBUILD gexiv2-0.12.2.ebuild 1793 BLAKE2B 8251109fe8ea27a5fe4023479b1dfd0e0db1bf34635e2d79b6ec6bfe8830aca3faa5d6de1caa2b597de1f2fa3fc1b29903955fe4c72d2d06f2b8837664faec28 SHA512 7491b8132f9673955e896bf81d444a944dcaf306d253fb367966f142ab084f1b8dbd17f6dab7472ca920f51a481ac211b30eea07f3fd80c5b71028c72c273afc
-EBUILD gexiv2-0.14.0.ebuild 1876 BLAKE2B 9040e4426967ca972118ebd0dd32af8f8989af05c9f00d12c8065121e745acbe153f5cd677a749f500190151f5f9f0cffb5495e8b3f0c7dd0a57b55d5834a704 SHA512 6e8a1883f4a7b29e45815d6a8c0da4f35a2c619d4adaee915c65b20763226765090ea4bcf7ad3c29999b5cb3db39a38ca8b69b50c0da4f67c0500dde424e6803
+EBUILD gexiv2-0.14.0.ebuild 1870 BLAKE2B 3400902f162af6ce7a5fd2b976d694d671c3e13953c64b9e995108674b2c017fed87da47d9edb93178d56bbf61b332b71a6c0d60c8d5bb0221da50e83018c561 SHA512 4ed18d71f4f060fd0ff7e91b4376300d00389a52ea1c965f7d07be774b55a7c26ce7d559d06ad8bc35289592923e746399296c86454ecb37933a215e6743af61
 MISC metadata.xml 514 BLAKE2B 55bceb7ce8a3c1298a712d2340a166baeabac51ac09a248561c8f8c41b1696380f5d1307437dfab1b677e3e92950a028c20e115008cb359f31b354d01e0b13ee SHA512 63267566c28b52bcf4fe5359df76363767ae590f933e4936770ab0aa5fb43304c1d21c9e37acb81a4fcd0522135a364328379c6a27d3dead37a5f0d858e0672b
diff --git a/media-libs/gexiv2/gexiv2-0.14.0.ebuild b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
index 2de5eadc27cc..a3cc0119802e 100644
--- a/media-libs/gexiv2/gexiv2-0.14.0.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.14.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="LGPL-2.1+ GPL-2"
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 1c3b0c5c1479..2e18f149ccc5 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -2,5 +2,5 @@ AUX 1.10.6-fix-vector-check.patch 822 BLAKE2B 2a364853cd085fdfc1be38caf792667cc9
 DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
 DIST graphene-1.10.8.tar.gz 178557 BLAKE2B 57739a9cfc246a38968fa8352e0c05ce9e32e50753e7d18b8b25ecebd1ea294cfad26168437e290209011b51085fad7d8a47852b99510a7402f9a7dd00ac17f0 SHA512 526b0c17049459b687ceb7f6c26c9d982535e4048e74a0b6282704f9811d3c2e7e0e6cfef166aa953306b6cf77add6677bc600ae0c66cc052dc04c3d0345bd68
 EBUILD graphene-1.10.6-r1.ebuild 1588 BLAKE2B 32190e6be87361dc968579eb5c6ff548595b90dd4e8e93eba90ac5319062c629073435c7259cde7563ffb773a8714670217cbb61a6ab149a86d9cd5095fb9030 SHA512 1de7fdfc0af41108271e1aefa8407f7da31e064b10fc64563f560506ce2b8aef66dabaa99210044405c8d2a97827da532915bf30c8a61385437539c35bb9a27d
-EBUILD graphene-1.10.8.ebuild 1556 BLAKE2B 8e5c65427f4805e9719ebb8e34e05c9e57bca1eb0dca200a098289a7bbcabfa513bad574f77c9dcc8c7b2b1c27a14ac8ca3929f0c1b7b7796cc0be1131a39f31 SHA512 6c20ae61025e1e667df65e170c14898b3739404e845e1a02de6ca1b39987e0183cfdc7adf032ae63d67071e6158f81f4d7087707abee05e7d5a2c8b4de9a5c6c
+EBUILD graphene-1.10.8.ebuild 1551 BLAKE2B 66261c568676d3ff5581f7b7b9e8caaaeed2e5d88357a612e7cbc2896191c3be3709870b32707b4dd8cba787eddc0dd43c0319c3f59e4271b08d63f83a9f4d07 SHA512 27d9c28c72d5eb96bee1128498be76fa98e432cc68b9532fc59249fd5a33281353988566db6ea1091098a4ca50de135b27ac8ca4e350d4f9a44f200617504d2b
 MISC metadata.xml 334 BLAKE2B 72027568b7436430c57d6ca3e522368786b9219c7b139eeb3c1e04f398539c2f1e78d63c741546813e4118904777c202dc56be114cd27b7056ef289e14cfd074 SHA512 8300692156435706d82417194a9d8fcc6865560b67d723ea38d0a985f7b910f4f9c65cea31049e30fdf854ab2d4d4983197a006803b2b6fb6d28cc7e40746959
diff --git a/media-libs/graphene/graphene-1.10.8.ebuild b/media-libs/graphene/graphene-1.10.8.ebuild
index 21035513a318..4cf1cea2b7fa 100644
--- a/media-libs/graphene/graphene-1.10.8.ebuild
+++ b/media-libs/graphene/graphene-1.10.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ebassi/graphene/archive/refs/tags/${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index dc3eb0873345..b9609c27d81e 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -8,5 +8,5 @@ EBUILD gst-plugins-bad-1.16.3.ebuild 2204 BLAKE2B 4997f2c2c124f632229b3dbe185f55
 EBUILD gst-plugins-bad-1.18.4-r2.ebuild 2596 BLAKE2B 56a306ce7fdcdc1bf8c5f4fa770d954b39558c825f8884054302cddb2109e9281ea15abd0fd5416e6eaa401ba8bf84cbd982a85da8f2ada4ac5f7c924e75e13c SHA512 3e401390a1f43a65763222bc06fc0f5957e42ce3f528cef42d8ee074ac7d74a973d2b2d7c8a5d207ceff89196cf6f5a46d4aee26e6819fb2c3f408ecad46d129
 EBUILD gst-plugins-bad-1.18.6.ebuild 2458 BLAKE2B 396a174625dc67984afa3e95a3093cc055ffbaa835feb4aef8f40cd3052db506b7344a0602c3f0dc48698e023810ca30c58dc69bb6110f2dbef1eb4802404481 SHA512 e83ab13f31b602cf03f2dd2253702b263367a5af3c5a24a78fe1bb5fb0a64a62a2703155029970934ebb87615ecd2f307f9fb2779371acb485d05bafaead4fc6
 EBUILD gst-plugins-bad-1.20.1.ebuild 2444 BLAKE2B e24fb43caefb1f306df280aa5b883abf40e1ff76069f83c8b5febc3e46c8a06886f347f6b0cb777de39d541e5b46a5b69e33d9d653b32b3fb32207fc62ca949a SHA512 08545855e75450d86a97dd58c05d2555c1c5181e85e1610bb9d67fff5ac80f794358c4339a3445c355d93d103ebd12b338cfa5364838b0f14e6a3f2991454bb8
-EBUILD gst-plugins-bad-1.20.2.ebuild 2447 BLAKE2B 83ac1a1cc017bb1fac2f7b5b339a5f78b09666e8783a57982594571854f4e999effafba23d71e4e008592bd15e620f3c76c63bcbeb296947d7e14d1c3dbc44da SHA512 e50209c767b2639f3f961cea893fb463619ac8086f5f3d864f9fdfa48d7b9367f50a3667d4c3a0b74caddd01f72ef33d1f82956262b205e0050943da01556932
+EBUILD gst-plugins-bad-1.20.2.ebuild 2445 BLAKE2B 3c7437c545aeaef2e5533a91e5e067cda86c75f83be1ef1695914c10af6739423de6c0c09be1035f4d3a6c432bf63ab9c5c86b35b14a1c9ec00c10a3bdb3e9e8 SHA512 9f5ad19e161706b95ade80ccc9a712ca69949ab9f849e26a8600d6653f69bbb19318602fe237e307f55fbb648050653817cedd74fafd398d54a714e0d3c2ae67
 MISC metadata.xml 440 BLAKE2B 7effc0f6ca218dae5cae9375491cefd7304006ed2e0ffdb9afdedd8ea3098fd1fa4eb0c2cec9381a3bbbef1c4336094070484b11e447381a1465af66ccbcdb8f SHA512 443bc8793f8c94ea7005445fab8292a17ff2be19f82a769a303e5b84dcbb3282f61813995695bb935d16d2647aae2947acade8f456f14ff6df36fc45cd72f4fc
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
index 74d0ae56a9ea..870e4d51504c 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 0b1bb9161c48..a997a5b264a8 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -9,5 +9,5 @@ EBUILD gst-plugins-base-1.16.3-r1.ebuild 5996 BLAKE2B 7dd358811a9dd7611fdaa894d9
 EBUILD gst-plugins-base-1.18.4-r1.ebuild 5761 BLAKE2B 2b93d59d47e5e3ea484be1950a44be3eb03871dcbf67bf027a4dc98a44360431480eb877766cba61512a4b67c82ed777b331a8d52d257b4dc09174fd09bb0b38 SHA512 078ea3980db730d127a86a92b19d7eb80e811034ab55b1a715b135f7abd7b3ecea398d93821c9a21a4ad92431113f6355a0163f38cd2c7252ac0c5f487225d26
 EBUILD gst-plugins-base-1.18.6.ebuild 5634 BLAKE2B 63fc6ff951af5e2e4c3c094b203eccf15e6383faf833b7059282b340b8472accd436df11df55a35de69b4f107a0063b764eaf55bda9dc8ebb5f413ff48d362cc SHA512 ba4daa5a9a3fb7adea6b2a90882d4113cdc47d0da9ba0b884027962c8af68a5c264df516e7b8daedf3b41841142f0e12eac7a6088e67d79a8670d60317d031f4
 EBUILD gst-plugins-base-1.20.1.ebuild 5573 BLAKE2B db0104803ec4c96c76a7ecf067dce56dbd106ca418930bb83bd7256631cb219c8e30628195c2c473d6ec4a00895ca66f5b10fd100ad8e08f7c868350ff65d820 SHA512 4ca6a7fca9113889e811f269ddb46ea153b578eb25f9c468a6518c8b98024fb83425b1a462d4e0a596c2e1303c111f413c5833c1ac8cbea5121ac2580254a5f2
-EBUILD gst-plugins-base-1.20.2.ebuild 5589 BLAKE2B 7f15bc5c89620674e8354b18080ffbb56cf5c8e2a72e76d7cc76d4139f285342355a09c647bd114ab3db31f2671e7b86a678fc83b8f3cbf4884030ec8c62a915 SHA512 bdf3e2b24f1fd09a98d699c9d305ed58a5d47c0d69ea9c741558e337cf2454eed18654721113f350b909c741ea06a3ceabd6337e4a07d9267277acfbb2cc4b61
+EBUILD gst-plugins-base-1.20.2.ebuild 5587 BLAKE2B d50d5c65187fc993db26b31f218a5981b563709145e6e3e1b6172001623653f8abbe7e524919317ee786c0e21c76889910a7e60890fb192cf537716d05a06923 SHA512 de7c609c01e849f46daa1725454f25e05920320b2003302ecf80b17bd5a3312caa08c3174133aa7b9ebe3bf1c98c0fa35246be21d30aafa4bdbca2d158134ff3
 MISC metadata.xml 1066 BLAKE2B 1d67f7f75e3f44459adfce03a6ab85a8c7d6a0b24ae83ef48d6b80c1d64845edb1ec5e7cbbb002585eb91663210025707887f5eff66eee41b14e0afcbdc0b4fd SHA512 227960f7c740d5131c1006854273d4b1047a3ceba07d5eda3d60c0f5baba4e8ed9926fab1737e1f97c5745f87f80fcddbdc7e239f5f2942902c92f8053074931
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
index bfe3586db797..8ef956fedd21 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 # For OpenGL we have three separate concepts, with a list of possibilities in each:
 #  * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index ff38ab265940..91034b408a72 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-good-1.16.3.ebuild 1407 BLAKE2B 7709616de2741cecd718c6dd6ac66
 EBUILD gst-plugins-good-1.18.4.ebuild 1107 BLAKE2B 7a482bd520673f9f380be8ef253e56bd9fcafea31f408e2932cc2b05976b5757c46bb047c101ade5d35569413c16753e763f34477d7322c9a9d10055401fedf9 SHA512 929a9e4832409b481744d4048b99dda4a3fd1578d78cd306a7f8e94fa6614955145d801ecf6f9f994942f8b6588d3e57955b398ef956651699d4f8168bd5d047
 EBUILD gst-plugins-good-1.18.6.ebuild 1107 BLAKE2B e27c6fd7ebf7f2a96948fb945b2100e03a72117b7720c347f4346f6f71ba2e6946f095539894ace1018d576a1a8a70262a4c35c29d5a154301c0e175dc7a85af SHA512 5e46c46df637bb21b99ffd6c3a5d14e2295d95dc8f9ed9cf39871ea75ef9c9d220e4789a1fbac7052b9038bf53669a3a608808a8e1ddaff63de182c9106e2b88
 EBUILD gst-plugins-good-1.20.1.ebuild 1169 BLAKE2B 4708d87bbecb2d6bcf45e5db89c0f9ca36ee255a286fc79ba3ad5895e1d2c0a687ccb8689716d0dea3de70cac98621fc864fff5931ad31da2a0268dccb274df0 SHA512 62404ae8a5d86d442bf18afb8e457d888430bf6ff35eb116e0ed48b8737e702f1a7e882afa7582c81783c7249c8e5e1ac117265111bf39f5ba23f007d26ccb64
-EBUILD gst-plugins-good-1.20.2.ebuild 1165 BLAKE2B 0997d9e082c473ebcde55b9a693909a9305c591df1b931d75ad4189f9405a1c62df5168a9df7afadd1a6e255093a2c04703bd39badffdafb7abe04c4c02aceb4 SHA512 264bf65a1ace38ce48d991d42a9fd13c0fb67f16a3d976294cfcc0a10f9fd3d5602c08408b2a615ab823106df03238300acf95f34df0283e11564d8804f6da67
+EBUILD gst-plugins-good-1.20.2.ebuild 1163 BLAKE2B 562f043c8c7ccf2cb49d7899211260751f57518a71e158587f4e56da47f799ea7f986db934f09a60b713b9f75cebc8f17825cb4ab5b61ff8d0c925d5c2c25925 SHA512 8900d873b28babdef494c7b1fa5051eab99353a10fa4d879a8764055ca99d1b7edc3d4e486021d0ff7b931ba97b20097ec56981504faddbd43eb13449fa54a63
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
index 277b5cef4e69..e36044e8ac39 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 7b3909f4aef8..e103d68465b7 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-ugly-1.16.3.ebuild 941 BLAKE2B 2a5e299284a15b210674a41aaa998b
 EBUILD gst-plugins-ugly-1.18.4.ebuild 777 BLAKE2B ba68d1152cead7f1c2b373db2329426ad3e59ace5f7848f2371b97ad8ed49cf3d6ad43ac44b594c86ac581c6732e87070ab7e794e856cd188b933ead5f5c8f70 SHA512 80035915311971c204358b99090fcadd85b11b161ab76a49ac138623f2040c6723beba38f27110dc0e60a25ce651c5e43322b8eabf1e4021b66d5ad4c6857600
 EBUILD gst-plugins-ugly-1.18.6.ebuild 777 BLAKE2B 7e9d0f763b0d4db51857583ed6b9f7cd1cf8d3be410fe6a842a54cf2b8e414f98c5f3d6ddb925105fd7cdbf0360b22640292e10eb910257e3785ac6e7d133009 SHA512 0cd107c5dc7554447a9d0e2a7efab1d61e8cd25327206c94ec4917267603815d2dafc2a76fa8072a0516df319439cd95a279ffd8ee7d4bf92af967e5890e17c8
 EBUILD gst-plugins-ugly-1.20.1.ebuild 757 BLAKE2B 6b0aefde7c540fa4ce733fc7a998ffd814ba43ca4c08e058b3135a570fd43589dc5456cf4d01631c0e1299d5087421473843ab10d31fafeb3730a75e7e5afa68 SHA512 baa9b0afe57099445156440d5c386019f8eb4f6cb001be14e5f5a6c74f539ef3f72db0397c314f4e20e2203c50513d9123e11efd15a7851cc8ecbf3b37a3ed12
-EBUILD gst-plugins-ugly-1.20.2.ebuild 753 BLAKE2B ad3197a403404d1cb32c74e4a193a1f0ad9d2749dea7467165b4fa63f0d355e18cb188d442a74e46c54d2c626336d29e1511a97527f5581e95e15581b83acfc9 SHA512 c96d459fa10549a95cc36eb4d0081f6b3cb2e238a71979c6e14c014aa6f1c468286d2233c716a503b5d0b76357f41e27d082a8e070c833eda80b3a042cc20e68
+EBUILD gst-plugins-ugly-1.20.2.ebuild 751 BLAKE2B 41936eed0f2d93a96f0c068efbea0ee249eeb9d451d9dc987aca0d9fca4d808fc3b78ae2842b794cd7c3d844680afc21e5b55465f42111eb8300f9a128b499e8 SHA512 9f3ec10ca0a1053545176d0e4d6026fcbfa0e064d000b530fbeffc7e8732dc6c6e31bee8c263957a853ca975014d770b4bcea585e9964376e0f089a21ca37a5b
 MISC metadata.xml 346 BLAKE2B 940d96d0ed61860085f5f6ef81706c4bda670dd1b6bf4947e29e636d180a9bdf02c42e33fed50975f7da608f048dbe0d578f1b76c8e73b233bd7ac6d291dc653 SHA512 57dfe4552e5fa65043a0e5efba15df272f21d7c6838d705a83959991ff30a71ebf38526b5891cba93e4d1256f446258abd18cb368ec9782481f791e4815bd3b6
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
index 9c800de3cc36..5d44634e14dc 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="+orc"
 
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 4e6e842d7e39..23cddf85072a 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,7 @@
+DIST gst-editing-services-1.18.4.tar.xz 966984 BLAKE2B 825a2db30a83f1706ed90b185cbc16dea037635b3c13aa28d1f21d87c58885b11a814b3e2edbb444a237c858376a128889b5a4ac3371f04e91f58777fcdefc3f SHA512 53c4a089df3592d08cb06026e9674b5907809212fb619e985698d44679c37da5c83fa1d2b6988351335ef56602f4dd61ac8d590ad29e21f484e9d5eb630184ea
+DIST gst-editing-services-1.20.2.tar.xz 977092 BLAKE2B f64a922006ac4d8dde429a718a7e41360c83af1a6854baf68fbd2372ac3aa852f47cc986ae58fe6564044dee00484aaa36d66cd4d3f5ffe34153446b38c7d476 SHA512 a9f9dd196d838fab8727de6fd0c52fde6a1b56ba801b7b608e0f2d30abc38bf586f02c20bedcb1ba384089cf97e8d0db1719ed1c9e8c18c7e56ff732bb8e5de5
 DIST gstreamer-editing-services-1.16.3.tar.xz 1091208 BLAKE2B d88bed4e8958a6bad05aab8d6c19cd737c6812e0780c420fd144d58fe416cd5dbd01e019c3fc53417d65cb2d6e100de123dc8183c8c3dab329fd677ba55644c5 SHA512 c84cc2dab2b1644ab118794b7aeb98748f893a26070359850f48e87cf362fd53b54baf8754a07e1d412cacb85cf9cfcafb3cf10d79c67bbe077e4d763f9703ef
 EBUILD gstreamer-editing-services-1.16.3.ebuild 1857 BLAKE2B 9161678fd102cc9f249a289f7c6cccc97e9a3e4f4f4591cd598fbaaa736cf73a1b27c86cd1eaa2dfcbf5f0cad4c016796b533fd9567f1aa80c9deaa8d0be2105 SHA512 d5219ab71d71e520bfdf83c0ac58c5b442adc984893026675aeb2b5304c35c029b5debdbd1baf53655a1a097f1271f74e81701fcda3a6a2a02690ed8be2cc2c9
+EBUILD gstreamer-editing-services-1.18.4.ebuild 1337 BLAKE2B d9f33b423025d4afb7dd1f11e7b1e61122dfd43d14138adb1055703c09044cae9b79df389d5e4c4a4d1cb5b4b2db26a9c76f660a24ad2c09ec841b337fe2231f SHA512 21ffc2092e4125d710422002d9c3dd4459cbbe92dc32ea03f10c6fff891a6b4a851877ea4fc2087c4491715c848e87c77806472414da341d85009aa3d232973d
+EBUILD gstreamer-editing-services-1.20.2.ebuild 1337 BLAKE2B d9f33b423025d4afb7dd1f11e7b1e61122dfd43d14138adb1055703c09044cae9b79df389d5e4c4a4d1cb5b4b2db26a9c76f660a24ad2c09ec841b337fe2231f SHA512 21ffc2092e4125d710422002d9c3dd4459cbbe92dc32ea03f10c6fff891a6b4a851877ea4fc2087c4491715c848e87c77806472414da341d85009aa3d232973d
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.18.4.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.18.4.ebuild
new file mode 100644
index 000000000000..7caf66f5d784
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.18.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P/gstreamer/gst}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# Some tests are failing
+RESTRICT="test"
+
+S="${WORKDIR}"/${P/gstreamer/gst}
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # hotdoc not packaged
+		$(meson_feature introspection)
+		$(meson_feature test tests)
+		-Dbash-completion=disabled
+		-Dxptv=disabled
+		-Dpython=enabled
+		-Dvalidate=disabled
+		-Dexamples=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_moduleinto gi.overrides
+	python_foreach_impl python_domodule bindings/python/gi/overrides/GES.py
+}
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.2.ebuild
new file mode 100644
index 000000000000..7caf66f5d784
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit meson python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P/gstreamer/gst}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-libs/glib-2.40.0:2
+	dev-libs/libxml2:2
+	>=media-libs/gstreamer-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+	>=media-libs/gst-plugins-bad-${PV}:1.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+# Some tests are failing
+RESTRICT="test"
+
+S="${WORKDIR}"/${P/gstreamer/gst}
+
+src_configure() {
+	local emesonargs=(
+		-Ddoc=disabled # hotdoc not packaged
+		$(meson_feature introspection)
+		$(meson_feature test tests)
+		-Dbash-completion=disabled
+		-Dxptv=disabled
+		-Dpython=enabled
+		-Dvalidate=disabled
+		-Dexamples=disabled
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_moduleinto gi.overrides
+	python_foreach_impl python_domodule bindings/python/gi/overrides/GES.py
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 758220c722c5..cd610e0b2c45 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -8,5 +8,5 @@ EBUILD gstreamer-1.16.3.ebuild 2854 BLAKE2B a573111c26ab04f84025d4a83e7c8f4827fe
 EBUILD gstreamer-1.18.4.ebuild 1923 BLAKE2B 2665125b17e94481935f8a511929975a78f24f1e8300f2e544b742ef3076f7ceab1f985c34f85facc893671299635ea8303d5835992165eca5db4f62201a6924 SHA512 2f241f2e6713f9c68ddd1d116ac7ece29289dad2c288fb01829c6912108e09769ada4b3479e18531c11b061768c758e16647c0af96bedb0253561d88ac1b27f1
 EBUILD gstreamer-1.18.6.ebuild 1923 BLAKE2B 4091bd4ae149c4c155b93214183ba4b360d3ffca60fbeb79ac5d810e5b8461ccb62b8361db028db1a78b52f050eecc124168285ec125989ba2627dd2c58c4e0a SHA512 6eacae95697c7c8f0fafb633ee98f3cca63d0d0d98b3bc7ddbcc31761eb2193c3c6912d1ce9c601db5a509450c3ddaa7f2eecd2b984d8e4bcbfcda0e68c8b9b7
 EBUILD gstreamer-1.20.1.ebuild 1963 BLAKE2B 86fb850491c039def9a8aed674f09613f7e732b87f7236b0fde8b349b36475f7c8b8e0dc0ef5cb1acad2f28f4c179d82c000db392ccf96c8bb01c7778fe57816 SHA512 4a5148e0d60f34a01915b5925bc5d39c60b7560826fd87d71b841acd70df90f2e39e4972cf0bcdaa339b25c96ba9069126f3e8b268d2cff36ca99b1b00b155e6
-EBUILD gstreamer-1.20.2.ebuild 2017 BLAKE2B 64a193bde0d9ab58106438d0f6e573a99588bd881c22156e3524e8ff9eb016f1d2a5a48ee7a5bdf9a28989675b802c97f5728fc6a5e18ab602312fc69802a124 SHA512 8b48ada30203c14c8e64eb92cc5c33135a40598eccf34c8bf19e5a91f159800d4c1b5f75db32e3356eb8b091ea73e1cb2d41697a888cff2b0db969f89ae33b1c
+EBUILD gstreamer-1.20.2.ebuild 2015 BLAKE2B 9d667e7bb7b77205e6d10def6bb1b581087563a7041c31a3e10df0d1afb4ada70515e48618921f032cb36d13cba2072b02dd0c0e0da110c37a86d5dcd30282be SHA512 d5b0663a92617ba86d52d526070585976d40bd4d09a78ce536071cbd1b2830b90a1b23a08997108d0eae17412fe9fb2043eae9fd7efb0b33c2b32ee0b298f962
 MISC metadata.xml 587 BLAKE2B 6fbb8876aa30451f9ed4851b8da1698371f1d546fa13674ef87acae0a73f85770e17a5cec2232fabae28fc7cd28e76fdc177b9d016ea35f20094b40aef6a25c2 SHA512 d28f3793ddc86087854b04a2330e158f521761a45192ee32ac947f9affb400443205a3c0911864474738e2494626ba4fea66dac6549934fd5cdb32af6fe2ad4c
diff --git a/media-libs/gstreamer/gstreamer-1.20.2.ebuild b/media-libs/gstreamer/gstreamer-1.20.2.ebuild
index c68aabd7c9ad..8173ce97eb81 100644
--- a/media-libs/gstreamer/gstreamer-1.20.2.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.20.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+caps +introspection +orc unwind"
 
 RDEPEND="
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index de36a9162342..adef3769fab8 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,4 @@
 DIST libepoxy-1.5.10.tar.gz 332078 BLAKE2B d56b45a8fc38901fdb23c50b569a667fce8ca289103a8d7ca19f96a76c75d3c2ff9d6959ed2ed47bd64806add95dafe42dc85dfc5bc60af14b5500b70070e008 SHA512 6786f31c6e2865e68a90eb912900a86bf56fd3df4d78a477356886ac3b6ef52ac887b9c7a77aa027525f868ae9e88b12e5927ba56069c2e115acd631fca3abee
-DIST libepoxy-1.5.9.tar.gz 331982 BLAKE2B 2bac6dae7fa2fcc70c1a5cacb1e6b6d21aaf65a65792d3c60eb0745acc4967092136aad1fbba6009a8c8e9bb1091a5d0a38fca05e63be2b9141d9c7e3042b426 SHA512 2b7c269063dc1c156c1a2a525e27a0a323baaa7fa4ac091536e4cc5fc4c247efe9770d7979dbddb54deb14853008bb6f4d67fddd26d87cbd264eb1e6e65bc5a8
-EBUILD libepoxy-1.5.10.ebuild 1064 BLAKE2B 690b4e7a3cce9c1b7139e437074910db375d6b78878fbafa5d99b0082c77d5f633e07fff9801e7c1d95843d0dbffbd82a1a07358e291e9e13de520b32a27f536 SHA512 0f2fcdc92cdae263f13e35159c0c6edd2975d8cd98773698e6007558d1b4282da128784f0c1e32fb21d47bb9719188a48b7a80051123dc4104cba6216e5f3487
-EBUILD libepoxy-1.5.9-r1.ebuild 1063 BLAKE2B 1a71ee8959c3e61b63fa1b4ea10f24641559d9ab6a691ee0f238d7a917b5c62e996bd84a0b82bd81532c57a48a8342940512f9693cf404e3c05dd1278239b495 SHA512 31503d253f341f102425516acab418eff73b58975e312a20624659657b85727226e58c7946ce2ce9c74054bb2aa8bb4943b8a9cdf02b9c420755bf495ad138a1
+EBUILD libepoxy-1.5.10.ebuild 1063 BLAKE2B e2cac5cdf0595fd42a33dedf9a04863839187903a36cfb2ea4c414ff0b656b90e73f73db5efcf0029dab2f71cc5f1c000ed75a712bc456ffc42fec9dca0370b5 SHA512 0e4ef5e9214a06e07c3b623f8050a4c8d0617017a1196eb9734e4855a2352650f9496b1f91fcfaf25c317493952c2a5945ab52a27ab1f8ae0a0c01f112de9352
 EBUILD libepoxy-9999.ebuild 1071 BLAKE2B 880dc225465d58b7cd81322253bcc9b04541e2fb48570fd1f0b8d5228c026cc938e602df97b21413360a0f432628f9bc64c2a44959f2a0fd74c3139afe96cf1c SHA512 e9cef595b5fffe659e990b64b323b62cf1fc36f7755ce7774aa813122f3ad86512cbd1c75eb871424233fa84cef320c9791bd1a3574e556e9c9bafea265472f3
 MISC metadata.xml 376 BLAKE2B 980a035e0ac8a5a3126ee27c032e8f14353ca5e7f2920769b74a23aa827a1110ff8f55a49a1f3072889ea1fed9f76f39bb3c2fddc6f6e2e736773c961ea4be3b SHA512 d1b9e9349929118e39201157b34e7955b32301ceaea877025fdf929d1039af536618eec5a9b0c638622c390201cd4d3106d981f884cf0c1c6469534fa65797af
diff --git a/media-libs/libepoxy/libepoxy-1.5.10.ebuild b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
index 0c07152c2f90..c5d061d1589a 100644
--- a/media-libs/libepoxy/libepoxy-1.5.10.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Library for handling OpenGL function pointer management"
diff --git a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild b/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
deleted file mode 100644
index 486240d79bdb..000000000000
--- a/media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-PYTHON_REQ_USE='xml(+)'
-inherit meson-multilib python-any-r1 virtualx
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Library for handling OpenGL function pointer management"
-HOMEPAGE="https://github.com/anholt/libepoxy"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+egl test +X"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	egl? ( media-libs/mesa[egl(+),${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Degl=$(usex egl)
-		-Dglx=$(usex X)
-		$(meson_use X x11)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 6fa24523dfa2..f01d27e3f8c0 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -2,5 +2,5 @@ AUX 2.5.28-configure-Allow-with-jpeg-yes-argument-again.patch 6423 BLAKE2B ef91e
 DIST libgphoto2-2.5.28.tar.bz2 7399434 BLAKE2B 3feed613fd84cbea6109afa2ce643ad8be9b3df14cf332cbd93a8260d7082756f5278578b4052a289b954751a82a2f62583ea327ce96255bd653912130319bfc SHA512 5898d35a991361a6cc6824cb88aab79326b59e4080b5e885e1619667d11c4a92d24a1d3fbdbd6af49696508ace1eba1b17bf2f406c72dc9ad69bcf019bc86eec
 DIST libgphoto2-2.5.29.tar.xz 5875684 BLAKE2B a0bc48b95ecff3c7f157b7baee18bc3ad86d376c9adc6f7eedd2f8cea40434cc97598cad49ebc1e4683492f9eb3e5b3494de3112bb740d2ccd8e2c55cf4ff1ed SHA512 f8e3dbea58fa6f19a100ee319d5561387a54e8701a19d034bc7d6fe474dc6e4f21fccc4b6c11346df4fdc811666d49ea0b9a2b5b67aab00acd5a1e94d9259c94
 EBUILD libgphoto2-2.5.28.ebuild 6263 BLAKE2B 90b8acfb93c0237076ad1bd5a03ef12a472b1598f9dc4db35472209fb6186c7c7f786531063c6a250de68d8a2e3aae7b797b1d19e5303a2ad972a7d0186f7813 SHA512 99b679a74ff8883a17619b327332c5db56ffa23532d1e4807a2c39f5514059ce513eef299458fabd8eade9bd9903fe3bbda1046bf1cb00f0212c759ed5651f79
-EBUILD libgphoto2-2.5.29.ebuild 6198 BLAKE2B 6bcaf08306643d0e097df2471a1723b4af8180c9fe6b30bc002fe0fc9e12ec77ca41b994ce6988623c236c42d8b6540de3329e358c27ad0aac4f35f39e76fb82 SHA512 62dd159c987dcde61b975913975e9eac1342a70f064b44e2813fd18387279bd3c6131c2f45ec40969dd028619efb0ee268bfb31b808663f55f85d1430394745a
+EBUILD libgphoto2-2.5.29.ebuild 6192 BLAKE2B 2f382d1c72e7357e0778fd7ddc22fdb7c556e06183b66e1715500740fa143a710c7f269e88a721806f48581c5e4b1d456c9599641a020b89ce0f36456646d370 SHA512 6cea641d4312ce66c931a766236081ff607e7d5978af363caa3f476404a39b4751111a9b94f6b11c8841eb0ec4fedba2bf87de73f91bed78540095b8d2e6a976
 MISC metadata.xml 401 BLAKE2B 114b82879f1ab00f4b6b0784a675fc50ba303fee05355f5d6edf32e3f5d3e3015f43e8f300fb9ff45b9dc9100a30431d0458ea8fe1c868090ad739e83587053e SHA512 87a96a6120a0a29c1b05aa43c1548cea9d7fcf0ff3c5815c3369dac7545c8ca05f5a7795f870566bd264cb2873fdf6a79a7dea92d318fca8078d8ec6d8c6a2e3
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
index 3aab88a805ea..59deb9ac9117 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmediaart/Manifest b/media-libs/libmediaart/Manifest
index 5d3e4ea1fc5d..39427816d056 100644
--- a/media-libs/libmediaart/Manifest
+++ b/media-libs/libmediaart/Manifest
@@ -4,5 +4,5 @@ AUX libmediaart-1.9.4-drop-bashisms-configure.patch 1524 BLAKE2B 6ae4ba196772750
 DIST libmediaart-1.9.4.tar.xz 5827928 BLAKE2B defb53867341e3f0f794b3e167532f3ea232028b3ccc3968b13456eb74cacf8fab97e462914debaa0a7f08a2dcb98dcc0e77dec55319291388050a55b6a70a37 SHA512 e2526c22cb656c821da626c43c09d72afded1dfc369e77baea3de17dd6d3bd3b829cf3160e386459f55b9580cbeeb1d621c85876cb62739bc8d4f42429bdce1c
 DIST libmediaart-1.9.5.tar.xz 5549620 BLAKE2B 6656baeb52aa0f4c355354dab3eb5499af957a2d9c5530e46874127a71a55b744b0370ec25b5e187ea9b615acb195f5b817196d59e668c34f2e3c8c4f8060598 SHA512 b1d54f4b480cb5cf63a2231b082635268ac1ab708ba829a3e5ccfdfb530e9d463c5ac505cd1dc44643f23f787c4df2ef287a7e68d56e93a05b97be450c7799b6
 EBUILD libmediaart-1.9.4.ebuild 1800 BLAKE2B 0b6aff357fd291cc560b8195d0d7eaa141d70671d8216e0f477ee4c1a120c5b2294b7f391ad702a130152e38ced7c7cf7de2547d58f2c5b58121693239770f56 SHA512 667c3ff283ff2de3c97fa9496146c1930a752bf1748a4128638030336a91533ba71830b5f7f9946126580bb9845a2ea879dd4323a2d415aef899b554fc2844ba
-EBUILD libmediaart-1.9.5.ebuild 1194 BLAKE2B 88b32ddfca1334e88e482dc71f6f97a6c888ca1b478fccb2ad7f22d63b9ec9d4a81c1531ee3e5d1210c9f3822caca143d8ad3a3a04c60f42fb15cc9439e465de SHA512 eeea122d0f1ff4c0f6daf7ddbe862e313ebd21878eb23a06ed87a4a31464aef296ff4c38e4c4d058c00c882b8fa5c5c5a3d787425c807a8aebbbed3c170367a8
+EBUILD libmediaart-1.9.5.ebuild 1191 BLAKE2B c0beef107a6aa39c624624e093066a6fb496ab7db6bef6632c03e0b40c90813274f81532da6cf50c2827ae4ece20683311def74b8d1771f2832f1841945061ba SHA512 0aef5fe66ac859553fef2f660dc8f1b9c6b4cffe572a74416349e1fd359b3c268b3686219b8d35f7c8e5387de132fdb12e2538d195903f82fa796819d0bf93e3
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/media-libs/libmediaart/libmediaart-1.9.5.ebuild b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
index 426d14572a81..56bc6cbb41b6 100644
--- a/media-libs/libmediaart/libmediaart-1.9.5.ebuild
+++ b/media-libs/libmediaart/libmediaart-1.9.5.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libmediaart"
 
 LICENSE="LGPL-2.1+"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="gtk gtk-doc +introspection qt5 vala"
 REQUIRED_USE="
 	^^ ( gtk qt5 )
diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest
index a6f250824bb4..0152656c6668 100644
--- a/media-libs/libpulse/Manifest
+++ b/media-libs/libpulse/Manifest
@@ -1,3 +1,3 @@
-DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
-EBUILD libpulse-15.99.1-r1.ebuild 5670 BLAKE2B c5caf0dae85592b551d0a1e5c4a504bc343df726e093d9def30dc0bdffa27f4820b0dd922746ab2932d85ef36b2e65c75694570afb67a5ceaf5ed57877b45323 SHA512 11c1eafea71fe64429fe24b93cfcb3b91a2fd662e129092d8b8b9c07a47e725a3ebc13aa469cf692ccb05ffa785958a40f7a3e88e1d7cab106c746c87421edee
-MISC metadata.xml 622 BLAKE2B 4d143ef69b028fc7668d69fca9cae2b57a2c7e654d415807142098bd1a764e57b335280426d4dccaf2b1a8834bb7f2f18d07148539f0b00266c9851f45881a36 SHA512 efefb947045f47d0e5ddfd8c6a2a575ec2b51165a71b6cba9667e82c86265427d0832cb4f14f0f783e2d1d5261bf453f6730a452a9521b1c88e9989733e1402f
+DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
+EBUILD libpulse-16.0.ebuild 5733 BLAKE2B 8f1248073d32ae6f61cb663821729c96e40f30b0dc974e194997590fb40932a3408cec7b423e3461ead5e0869ee1a26cc81489072d3efdc97dabda523a7bd0eb SHA512 755dde7e142ee2af936bccdab5487d25137b2ad698e8005bc521f4fa783d260aa20acc755882ca3a245f43b13e5606b580846a3c752b285d44c75aa5061da51c
+MISC metadata.xml 688 BLAKE2B 18cb417831516dc964055b64495ffc914439ff261352dbb6f5eafb9bdea0b58335bdafa841bf4f616d71d92e48314bc057ef6f7117da4415e9247b1be437543c SHA512 7f9f092829d595bf4212cb42ada174b2142b439371d9c85c214dcac87cb03805b777d0c63954ab74b8f5259bcb4d89468c19f1d792b44c3eed5ca1b8e9b8f6c5
diff --git a/media-libs/libpulse/libpulse-15.99.1-r1.ebuild b/media-libs/libpulse/libpulse-16.0.ebuild
similarity index 97%
rename from media-libs/libpulse/libpulse-15.99.1-r1.ebuild
rename to media-libs/libpulse/libpulse-16.0.ebuild
index 8065b23b30d2..2de9bf92797f 100644
--- a/media-libs/libpulse/libpulse-15.99.1-r1.ebuild
+++ b/media-libs/libpulse/libpulse-16.0.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 
 SLOT="0"
-IUSE="+asyncns dbus doc +glib gtk selinux systemd tcpd test X"
+IUSE="+asyncns dbus doc +glib gtk selinux systemd tcpd test valgrind X"
 RESTRICT="!test? ( test )"
 
 # NOTE: libpcre needed in some cases, bug #472228
@@ -40,6 +40,7 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-pulseaudio )
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
+	valgrind? ( dev-util/valgrind )
 	X? (
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
@@ -131,7 +132,7 @@ multilib_src_configure() {
 		$(meson_native_use_feature systemd)
 		$(meson_native_use_feature tcpd tcpwrap)
 		-Dudev=disabled
-		-Dvalgrind=auto
+		$(meson_native_use_feature valgrind)
 		$(meson_feature X x11)
 
 		# Echo cancellation
diff --git a/media-libs/libpulse/metadata.xml b/media-libs/libpulse/metadata.xml
index afe3111f5cf9..7e1166ebdbfd 100644
--- a/media-libs/libpulse/metadata.xml
+++ b/media-libs/libpulse/metadata.xml
@@ -13,5 +13,6 @@
     </flag>
     <flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
     <flag name="doc">Build the doxygen-described API documentation.</flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
   </use>
 </pkgmetadata>
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index aee7d044ec00..f95ddac87c79 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,3 +1,5 @@
 DIST lilv-0.24.12.tar.bz2 427404 BLAKE2B 47efe553c6fc249ed0cde47a47a01e0b3496ea4dfac88849b75d9720cb3a158fa1c95959ffc1a09e606f8ba3831e79382ba08ad100ee17cf19c7f1ffa186d6e2 SHA512 ea22db4e995792b62d60d793169c792549b8fb0255c2cf7a85780dd149811921e2fae5eaea0fb83465f01b14dfa66361af3be40bf7cb3733e98655b943f4faee
+DIST lilv-0.24.14.tar.bz2 428004 BLAKE2B bc84fe5a4bf34f88ea7f9c09cb3168186f7f0fd2f3f23b08f55100502d959fd74fe7e1c6d9307772b1983fbeedde100f75d6751e9bf92a9663aaaa115ca0770c SHA512 f266e91f3cbc325c25dd7d08bde5033091cb3072c2dcb1490e9474f562b798dbc71c45ca7d971ed4dfd6bb16f5f6725ae242a58c4486684b71350e73f1469f47
 EBUILD lilv-0.24.12.ebuild 1776 BLAKE2B 8d2c5fc1be653e0dee02107d54d144b40e9f9808e13d134f99659a02897a7ca92eecda145d72ae72758f619f89ef9517a80b624666f41e11ef2da17d5bcd2dc5 SHA512 96b6d6ade16f2df560d8b2b15dcbcd54129a1e8d7c59223fec92c205726197576d9c9185f05f62c71d4f72c44ee8d08e2c6f9d08afdc983ddc44eeab8e86d033
+EBUILD lilv-0.24.14.ebuild 1782 BLAKE2B fc8297f81c97a01a101c86bdbde54e225d9578008d66347020b59e05a799f0b6b31bda9045bd72487ab06e663588d01e692d463e2ecf0e79818b6d26eaee0970 SHA512 be3d193cf2d7d80d85246b83d1d28161d1e89edb674abc09dee7b286c06a6c17b2c5f1d17f524865c77e304070a8ce37c65a5625725b5e53a434b3df8e86803d
 MISC metadata.xml 627 BLAKE2B daf8d11256943c40b936380dea55442e864896de881882c7a74a041fefb6774d4c632ea54979937a572f88f1e5301f6fc5ff1a9eb56f22c0a606f7c268f07b84 SHA512 b3de9e939e32df99104be4941b3f59a6d03bbb00b31960f6f186a02872db4151f2ac3d8aa5e9ecadf103008a6537026798758c5cbf191fdecd4ee20a68c1767a
diff --git a/media-libs/lilv/lilv-0.24.14.ebuild b/media-libs/lilv/lilv-0.24.14.ebuild
new file mode 100644
index 000000000000..644788e618ff
--- /dev/null
+++ b/media-libs/lilv/lilv-0.24.14.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/serd[${MULTILIB_USEDEP}]
+	dev-libs/sord[${MULTILIB_USEDEP}]
+	media-libs/libsndfile
+	media-libs/lv2[${MULTILIB_USEDEP}]
+	media-libs/sratom[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--no-bash-completion \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "") \
+		$(usex dyn-manifest --dyn-manifest "")
+}
+
+multilib_src_compile() {
+	./waf build || die
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	sed -i "/lv2jack/d" utils/lilv.bash_completion
+	newbashcomp utils/lilv.bash_completion lv2info
+
+	dodir /etc/env.d
+	echo "LV2_PATH=${EPREFIX}/usr/$(get_libdir)/lv2" > "${ED}/etc/env.d/60lv2"
+
+	python_optimize
+}
diff --git a/media-libs/lv2/Manifest b/media-libs/lv2/Manifest
index d168cdc5b253..1f99c8b6f78c 100644
--- a/media-libs/lv2/Manifest
+++ b/media-libs/lv2/Manifest
@@ -1,3 +1,5 @@
 DIST lv2-1.18.2.tar.bz2 538345 BLAKE2B 824c7bc2ce62de858308d856d0f89c6285c183764be3727eba5074f42543a1bb8a5e1cdd8a85bf0a4ba1103e1243c843013bd516d2d6e7ade09c46380bca3cee SHA512 d5bdcf94d3cf9a569e29964002a038ae73cd6ae7f09f7d973f8fd74858c8cf9d01bbed85ae8bf0a00efcb2b3611357a64571222a89972091941449c36d76b0ef
+DIST lv2-1.18.4.tar.bz2 540611 BLAKE2B 84bcb5578110ff933b37b398029ed062c9393e17f17ddaa6329638f3c71e2b17b424f84987c00bc2c5699ffc15649362b98d5b238521e593c578c67450ecfeec SHA512 8095a1f3dcf70cf8cefff18c40b52c1dffeab0fe1f6bfb083c9f0e48a9617d3c8647b3f4db567ac1f5f33564399ffe1023774ad9bacb1bb0133f182422f22d6a
 EBUILD lv2-1.18.2.ebuild 1353 BLAKE2B 2570bea49f79de9acefa1539f19788fb2129e59375491d0802e6070ed766e9d48d77e04c21e6f64e354d23e31487738d1448f696ba2ef15da0a7b2d6d89b5c4a SHA512 51bfeb0cc93da2ee4dfd9af0109983e7118641e340060d0a142b79615a78ab8053d581c4044c42ef25dd1a5188057504e2c3a0297171237aab5e45bb2ed3268c
+EBUILD lv2-1.18.4.ebuild 1353 BLAKE2B 2570bea49f79de9acefa1539f19788fb2129e59375491d0802e6070ed766e9d48d77e04c21e6f64e354d23e31487738d1448f696ba2ef15da0a7b2d6d89b5c4a SHA512 51bfeb0cc93da2ee4dfd9af0109983e7118641e340060d0a142b79615a78ab8053d581c4044c42ef25dd1a5188057504e2c3a0297171237aab5e45bb2ed3268c
 MISC metadata.xml 341 BLAKE2B 041aa9ea5ba80d8639da9242b14896da75fe648666ec6f4a59de8449a2daf7c741a05187e3265da96c8032ca0ae5a1430dc516fd667b9a0826d561462b5079ca SHA512 7a949f5da6524129d3edbde9917ae3a996b67a36d362a1bbba8a842d70eacb3d3cc5040a62a4daddfd776733635e49b5e70d02001d2a0bf09e9421fc22f3b894
diff --git a/media-libs/lv2/lv2-1.18.4.ebuild b/media-libs/lv2/lv2-1.18.4.ebuild
new file mode 100644
index 000000000000..515e321d0440
--- /dev/null
+++ b/media-libs/lv2/lv2-1.18.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-single-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="A simple but extensible successor of LADSPA"
+HOMEPAGE="https://lv2plug.in/"
+SRC_URI="https://lv2plug.in/spec/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+IUSE="doc plugins"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	plugins? ( virtual/pkgconfig )
+	doc? ( app-doc/doxygen dev-python/rdflib )
+"
+CDEPEND="
+	${PYTHON_DEPS}
+	plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )
+"
+DEPEND="
+	${CDEPEND}
+	doc? ( dev-python/markdown )
+"
+RDEPEND="
+	${CDEPEND}
+	$(python_gen_cond_dep '
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pygments[${PYTHON_USEDEP}]
+		dev-python/rdflib[${PYTHON_USEDEP}]
+	')
+"
+DOCS=( "README.md" "NEWS" )
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--lv2dir="${EPREFIX}"/usr/$(get_libdir)/lv2 \
+		$(use plugins || echo " --no-plugins") \
+		$(multilib_native_usex doc --docs "")
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${D}"
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index d657fae46c63..aae70ebe6f28 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,7 +3,7 @@ DIST mesa-22.0.3.tar.xz 15711916 BLAKE2B 2ecf9bc2293861e93abcc66cd5df6651a9eb7e5
 DIST mesa-22.0.4.tar.xz 15747320 BLAKE2B 22a3e5168a763e2095c2ec75556981c6da459b4ba14dc110beb15c714ea2d500d09db56b5c56f153c0b5fae1fd8d48c8dc84aa14bcb3ffc6d20a1a7cc76af446 SHA512 afecaf97fdf824e9004f3a50ea17f42edf810d682f383082ef87449a883263d4c5c8ae03558052960a63336451797101e198977553dedc09dbbc8fdb4815f526
 DIST mesa-22.1.0.tar.xz 15934484 BLAKE2B d4e3956f4a100bc54919ac7c8aeadb6d99fdd349b3a669b40967f14997f383c7ade6da957390f628e8dc521e8afde6ee67e7d9620099676c9889253630b9f8f0 SHA512 a2a6f6f37d1e63aa5537a2bbdfd8634fafebf7e223099deb0fd96749d6d1880ea692231fe12eb06ade78a5eb483d11d6f9ef746e94fe3fd58b4381d469afa934
 EBUILD mesa-21.3.8.ebuild 15208 BLAKE2B e383920612d00be64c1f03c445c0e02ebe59fdd03aad6dd6df2d7498f9168ae292e9356ff109bb1c9843b0ecd3c1dfef4b213d54a2b84104779a5759bb410169 SHA512 fe018844f36039c46d1d7a0f85c7756d7b90ea43aa60acb0ae6e728455998e4120ed410ce184161d89cd2e7467166d483d03cf0bd5b31033f4971d53f6cc168b
-EBUILD mesa-22.0.3.ebuild 12025 BLAKE2B 7137c10041e3c49754d78bd96f458e8f3995581e95bd88989b27b9404d168bb2091fe8e29500833986a8dca718e3de2ff9f29ae3f1a222708cf0fa7ce8d98557 SHA512 99eac9913f5b9822e13d811bad56e0c9adf834115ef37b10588646b10151fbab47a1157c4616c74cc8276a272cceb063fb0c71b53aaa36de3f3f6887a1e4cb95
+EBUILD mesa-22.0.3.ebuild 12024 BLAKE2B dbffe1250962d55123bef63c064dbe63f4536a5cdd01cc027138b42b74dd5e04fec81232030def77fadb7a2cc3f8ae590c83768e33169244732159f628648728 SHA512 29844cb6178bc140ae037323c43167689c92ddfa6b74b534171230537297e2f50cbb5d27d1c2b726ad8e6ef298d54873fd4be8cf4ee4c28a847dab569fb8fa97
 EBUILD mesa-22.0.4.ebuild 12032 BLAKE2B 8acd4c2e43d2ca6cf80e7488062e2c49139b4a1b780b92d3df16ef80a69e5af6983fa0adbf32687b7794caf7cfe8f6285dcd4fa76950f7abd9e8fdad6adf1071 SHA512 3506d673f24a5303b3a306e399b17c81ef84570b79754f60b7b8741352fdd6375b745d34ca0d86af12368fc664a4074d6cf92c8d29a585f124f2e3aaf3883a6a
 EBUILD mesa-22.1.0.ebuild 12079 BLAKE2B ef06ee48009df2890208ede0f404e69df0592fa889c7de6ba392d3ea5405ce2f56f80a7d74891f78c72a2902f7ba27d30a90d9cdd4595b31955a8b0b9678355f SHA512 66bd17f3913468b6e6b9dcc5e3010ab5b19a81eb97d6633e5aef220a6a4964a0c3c1cc29acd28c727f3a4bfd8d784a87df975a404ad81b5f67b5fcea9e8a2323
 EBUILD mesa-9999.ebuild 12181 BLAKE2B b11c4aaeb03b375af654d5fd43dce4f25f2c59824baf597ef1d39295e063b3ea5df9e87740aa840b2bf80b746fb89ae9a1db701afa0d0573dade2b63b050066f SHA512 5c1587ac5bf4c73d5eddd35ff6ed34c84a022dad319335f446708c341d0054005f4857d4a056e1dfdbe08483c54da6934e085595279dc541f2cdc87d113fd6ff
diff --git a/media-libs/mesa/mesa-22.0.3.ebuild b/media-libs/mesa/mesa-22.0.3.ebuild
index 39c721e70dc7..1352b26375e0 100644
--- a/media-libs/mesa/mesa-22.0.3.ebuild
+++ b/media-libs/mesa/mesa-22.0.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/nv-codec-headers/Manifest b/media-libs/nv-codec-headers/Manifest
index 01114fe9fa20..f1e8dd5e2e3a 100644
--- a/media-libs/nv-codec-headers/Manifest
+++ b/media-libs/nv-codec-headers/Manifest
@@ -1,5 +1,5 @@
 DIST nv-codec-headers-11.1.5.0.tar.gz 67850 BLAKE2B 27c1ae4a8710bbb1ca72d5009ec4b62c71f1899c128009bf7017603429dc9c47df9894bb0e1eb2fd21986ee713aa24a82e0753a4b196347ad51371d67b2f3dbf SHA512 b973ba763476b083870d7701b63cb98cc5e22d3698e431316c82b8ffd887d430df296938af52ed54478440105ac34f4282b0a8471eb541c1ff77cac9ad33ec3d
 DIST nv-codec-headers-11.1.5.1.tar.gz 68516 BLAKE2B 0c47b885f1dc14aa6a6118ee66ffc2846626986eee0a3c5fc6159f16aa72e5d12e6ccc44bb68b095cb36f68d8b437bde98c870e23b2794048de96b40fc85acae SHA512 b0738e51e3d542483a15bdbf615b1233a2ef110f1a12853b1af45c650fbd144f4aa94dd68289c66582eedb2309bf266c7e1c0ef48b9e2ee1789fd009ed45bd88
 EBUILD nv-codec-headers-11.1.5.0.ebuild 738 BLAKE2B 3d290c7431842d4f46036befbf3fee0bbce911f90f17760a127c009d4c65049504e4e42d5005623f18d4df22f1599cc3f0834d9dc9b5548eb5dc481124918304 SHA512 6607e5b46adafcda81eedf56b4e66094b51f915a70490e2a65249ded6e177cf551eade71af9761b46591bd12e88c388ea07e8ecf3bfdc428ebb57074766aa901
-EBUILD nv-codec-headers-11.1.5.1-r1.ebuild 677 BLAKE2B 96888014f8aba19dacad0e23017a2f490c5805e3473c1aaa5cd1410d8ff2ee3cfbcadc97a5d30ef6f6657c1f2614f8e366dcbf7710b9836da1afc631723d9657 SHA512 1b0359c7016606ce01d20b3ec2608c0040c16504d2dca896fd5bdce2c63818d76ffb91f85e35fa77b4810703943870d37e255a7a583e95590c1f0a3553c33164
+EBUILD nv-codec-headers-11.1.5.1-r1.ebuild 676 BLAKE2B 28354a01063d8f7b07ebcef87a9281a7392c65fef2ac7441a40e0fa4feaf4c84e3a6f7375b13ebd3e0737c0d1e311c2a0bcaa9f5b094647b72ce8a940a69c26f SHA512 b618d916c737f2be573614f58a6921b956df884d035662411c759c1873c4eb948eedfd1bd931e3ba55c366c02f66a69189bd2a43e9a272e26431bf6ac84d6691
 MISC metadata.xml 320 BLAKE2B 87b2f0f66194013fc14f77ab1d3cb940fba6d2194f8b17411cccd0fc3c5c86b850ceef3b05160d81929228392a4ceaaf8e7862ed0ed801f6f6af7dafb7624111 SHA512 589c3adde9ae93f2db628fe91710bc19e2d007ce0ab4810d17ab7dad6eede2a1e4e332e485c89fa542552f726a27a591a9894e0518663b9dd82063381b9126e5
diff --git a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
index bf44773fcf29..9d32e6417079 100644
--- a/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
+++ b/media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/FFmpeg/nv-codec-headers/releases/download/n${PV}/${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 src_compile() {
 	emake PREFIX="${EPREFIX}"/usr LIBDIR="$(get_libdir)"
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 1eb374686ad0..f0e81dad2503 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,7 +1,5 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
-DIST shaderc-2021.3.tar.gz 221509 BLAKE2B 5061073e4489bdf2245a7cd18968a5a874cd33c16b8944b5c781b78e648f20bc8cf49b52e61ee3fe5b2aa029fa8195687079865403bb662839917b142421c49c SHA512 759eca72564bea59c06d31f70a85571a391360d5d428db85a30f934d080bb25e254ecb5650f71a96742cf417f09d819f36d301e92294a5d0d294581ca554248a
 DIST shaderc-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
-EBUILD shaderc-2021.3.ebuild 2101 BLAKE2B 42f3908ff4b993f0d42ebee384c8dcc5ca37b1519fcb4e46be80aeea3ff4bc3d6ae6b7c03900c50a78fd7b25d5b24bf3a8b7dedeb1ab6bd6764feb1aab56e95f SHA512 a64488699535d988181ff860af17010990d4db9abf467f00d3c579b9a64c7b8dd60eb256908f63fe9c5bfcbaf3701330729cd854b125b3160c5ab2a1c20a1fa0
 EBUILD shaderc-2022.1-r1.ebuild 2107 BLAKE2B a2cb20b74828c14469bfb3506da763cfce58e2ee2749dd6b7ee91e8de637ff191e0179fb786c307c380f0185a1026b5ef437da2ba72e723fa0a550097e1530ec SHA512 585d833159ca9e71d60d64feeb68d697102e0a6fae2f85e875631d5cb35d75da9b39bdb3afe82a35dc2147d2c9fb68c9862af4b6b3687a8e9ac65c5afa593363
 EBUILD shaderc-2022.1.ebuild 2101 BLAKE2B 064ac4b89d4d563e7aec3744f4feb06c201e28e63e3bc5e8b2e8964975eb92ab6e098aa0d5a43d1eebc8cec14b2a70d0aae70ae32f993f7988f2facda38bae7f SHA512 6d3539448103e896a26850b74bcefa840b61bf83786b651eabb32ee39e9ff01d4aacc3d480ff68912a0a9278c7a94a297a3769e29cdc5e6b15af28cac210eaa7
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2021.3.ebuild b/media-libs/shaderc/shaderc-2021.3.ebuild
deleted file mode 100644
index 542b6fc9b649..000000000000
--- a/media-libs/shaderc/shaderc-2021.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
-HOMEPAGE="https://github.com/google/shaderc"
-EGIT_COMMIT="${PV}"
-SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc test"
-
-RDEPEND="
-	~dev-util/glslang-1.2.198[${MULTILIB_USEDEP}]
-	~dev-util/spirv-tools-1.2.198[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	~dev-util/spirv-headers-1.2.198
-	doc? ( dev-ruby/asciidoctor )
-	test? (
-		dev-cpp/gtest
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-2020.4-fix-build.patch
-)
-
-# https://github.com/google/shaderc/issues/470
-RESTRICT=test
-
-python_check_deps() {
-	if use test; then
-		has_version --host-root "dev-python/nose[${PYTHON_USEDEP}]"
-	fi
-}
-
-src_prepare() {
-	cmake_comment_add_subdirectory examples
-
-	# Unbundle glslang, spirv-headers, spirv-tools
-	cmake_comment_add_subdirectory third_party
-	sed -i \
-		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
-		glslc/test/CMakeLists.txt || die
-
-	# Disable git versioning
-	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
-
-	# Manually create build-version.inc as we disabled git versioning
-	cat <<- EOF > glslc/src/build-version.inc || die
-		"${P}\n"
-		"$(best_version dev-util/spirv-tools)\n"
-		"$(best_version dev-util/glslang)\n"
-	EOF
-
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DSHADERC_SKIP_TESTS="$(usex !test)"
-		-DSHADERC_ENABLE_WERROR_COMPILE="false"
-	)
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi && use doc; then
-		cmake_src_compile glslc_doc_README
-	fi
-	cmake_src_compile
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
-	fi
-	cmake_src_install
-}
diff --git a/media-libs/sratom/Manifest b/media-libs/sratom/Manifest
index c59cfe6b842b..9d61d2116933 100644
--- a/media-libs/sratom/Manifest
+++ b/media-libs/sratom/Manifest
@@ -1,3 +1,5 @@
+DIST sratom-0.6.10.tar.bz2 327047 BLAKE2B 6205a0269216099556556cd251649eba58fdf1a2c8a80611367f3b9564fe410ed7ff1c565ab7b628743fa99ca893eb7a86fed631872eff86e19de9ba534fae49 SHA512 cc5d2848d61de45a37d1f844b2c741016decf065bcac975214dd01108171ba332f0a51526f2f1078d5f501055af0a48716704515cbe7a9f73526fd878621ca4b
 DIST sratom-0.6.8.tar.bz2 327027 BLAKE2B 8e11e03e6a66e9c96f90a0f31f4a65c660ed44304600caa2daad09b955a4829b266f7495b8ed85c62c34adfbc3e7f97790096bd721b51e1038986ac2e3926e60 SHA512 49ec4b230a72005ab7a7a3de0bfa630a27a16f9f811ca8e7f6da7fcf6b34526577217075d428a993f95b813dd2a82a9b6892eeb2e36b66b122ada778fbb3fb95
+EBUILD sratom-0.6.10.ebuild 1284 BLAKE2B c3c8ea80a4be7bdca9a2a1776a5ea653a8be17ee0722f51c47f5734042bc0ec475e4c8670b91a07ac4d4d3ed266eef5d8cf212ceecfea1a4cd231fe513c77f17 SHA512 ae5379201063af9a98545953494edd025457675584cd44148838a000ecff46f3bb4bac625310bb595fe0e5fcfbec28d0742df42bedf9ed8d85cc5940e1d35aff
 EBUILD sratom-0.6.8.ebuild 1278 BLAKE2B 726d583fd9ba66da7f176208d40487d6b6cf0f5a7653ba5ac869ff4ddca46714de5f00b730fb4aa2897952b1d6312019405c697f6e0e9be1c61c9588a069a337 SHA512 683097cf2c70ec21edc30cba38c5535d5476510cc0d6c1f3b40783043e7427a885321681cf40f60aa91eeecf7f2e91767929c15ffc659ad42d0f22ee6aa19e9a
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-libs/sratom/sratom-0.6.10.ebuild b/media-libs/sratom/sratom-0.6.10.ebuild
new file mode 100644
index 000000000000..ab4d1ca6c301
--- /dev/null
+++ b/media-libs/sratom/sratom-0.6.10.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils multilib-build multilib-minimal
+
+DESCRIPTION="Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax"
+HOMEPAGE="http://drobilla.net/software/sratom/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+)
+"
+RDEPEND="
+	dev-libs/serd
+	dev-libs/sord
+	media-libs/lv2
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+"
+DOCS=( "NEWS" "README.md" )
+
+src_prepare() {
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--docdir=/usr/share/doc/${PF} \
+		$(multilib_native_usex doc --docs "") \
+		$(usex test --test "") \
+		$(usex static-libs --static "")
+}
+
+multilib_src_test() {
+	./waf test || die
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+	default
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+	default
+}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index a14749209714..891d5ef14688 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1,5 @@
 DIST suil-0.10.10.tar.bz2 339906 BLAKE2B 03d1ac744fa3fa487bbf44d6e006f6cfcc73dc4aa6eb79d1ac5d024dc9493e3e426ff6054705d1de514286b2d43f5a1448bfcf7e573fa95d61c41790ca06c405 SHA512 e442022096150b2f71d65bbd625e2e262cb3e3865c57f5a30f0472dac8ef90ad2fbbf67235823055019017e3751b46330f6e98b8e1745e5845eb02c4d2a4fc21
+DIST suil-0.10.12.tar.bz2 339666 BLAKE2B f70bbc18f5fa1a9263fe5c0a9241e966e124a855273bc6fe863375aef8505193e49b67d3b9d7ff6d4e4cf50cb6c2cb2b2d53dccab06005f82725e024cc8347d5 SHA512 f2b9ca36cc35d6b51c6e4ae144d61b1ba5e3b51113cca48d0535f6346ff918bdc7e299f0036ea1431c0ef59b1a02f1f4086a95db552d0a06bffb54567ab4a278
 EBUILD suil-0.10.10.ebuild 1080 BLAKE2B e31e13f77f38d9c2413f235fe4c68f87b441b3f804bfdef82f76fdc353aebaba2ca3fc4272607cbcf138ee757544f001a1ce24bae6e0c7e992ef65eaad975dc8 SHA512 ed46ba9df992f369a75512887743e862eabcb4f5f2edb44ba3a38420a26ee883c2f16b68f21d2274ccfda684fd3649e7032ada6b516f679da4575d9746fe45d3
+EBUILD suil-0.10.12.ebuild 1071 BLAKE2B 4580f32558e3c8b2eb142c8e869509f2344d920b27460257fb31dfe34bef695dea5d381654a1924d89ee019c34b46667b712da3735821031b2330d2a95630b3c SHA512 8c6bc663816f75b882521313d07b4a23336a64df10bf09c9044e2ef8385912b8f87bee4c9f81e24fa22fd32fe9184cd19e60c5cf8141e1472b161a656a169be4
 MISC metadata.xml 492 BLAKE2B 08b9c4faabd0b31d5397307c0a025e49b25124edf27fb2972e3d77f93b221985dc8a94eb7626e0b6f845877cdf4c714ead49c25dee3e7346efb92c7fa98ba0c1 SHA512 2505c885384508559d1ee43cd2c5f382d444299de05abb7395cad7510cb9dd40c55b3c33a0f4348b278ac4c7c52d3f083d7996a44d8f5bda4611f038822c5500
diff --git a/media-libs/suil/suil-0.10.12.ebuild b/media-libs/suil/suil-0.10.12.ebuild
new file mode 100644
index 000000000000..bf30b6068b4d
--- /dev/null
+++ b/media-libs/suil/suil-0.10.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
+HOMEPAGE="http://drobilla.net/software/suil/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="doc gtk qt5"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+		dev-python/sphinx_lv2_theme
+	)
+"
+CDEPEND="
+	media-libs/lv2
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)"
+RDEPEND="${CDEPEND}"
+DEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(usex gtk '' --no-gtk) \
+		$(usex qt5 '' --no-qt5) \
+		$(usex doc --docs '')
+}
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index e275ad46ff8a..6037e4bf923d 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,7 +1,7 @@
 AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1
 DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
-DIST tiff-4.4.0rc1.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
-DIST tiff-4.4.0rc1.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
+DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
+DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
 EBUILD tiff-4.3.0.ebuild 2056 BLAKE2B 424dba5d1ffb1699a268dabb5498fe6a46a21b70123bc1cba04b5e9bcb637151b4ff49262f9a53adf95766293a4a2c7d9bfaeb192c92e083ae5cefa21931a436 SHA512 09d81e358ed7af8dd65c73dfb8c857e5d48d7cdaf764a5a5fbcfe400133915d074a2c6c15bb0a617d0fdd271f10de20402a807a4e265dfc96dbe65af8b016bb3
-EBUILD tiff-4.4.0_rc1.ebuild 2756 BLAKE2B 87efbe24ba8bced755a0bd41d6c598277d787e757ef916ccb6b50cf5a14d27f16c1d03f20347656ccc130521959107d7afc772dcbd23af75524c11ac66bdb45e SHA512 4c50a69848add52996bc766681b3ba28841d7a0b19488aee917e236d58890ff24d4dd6bbd669766a1d241c0a27f8f3b86abc58c37ba8edded475c231b336525c
+EBUILD tiff-4.4.0.ebuild 2756 BLAKE2B 87efbe24ba8bced755a0bd41d6c598277d787e757ef916ccb6b50cf5a14d27f16c1d03f20347656ccc130521959107d7afc772dcbd23af75524c11ac66bdb45e SHA512 4c50a69848add52996bc766681b3ba28841d7a0b19488aee917e236d58890ff24d4dd6bbd669766a1d241c0a27f8f3b86abc58c37ba8edded475c231b336525c
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/tiff-4.4.0_rc1.ebuild b/media-libs/tiff/tiff-4.4.0.ebuild
similarity index 100%
rename from media-libs/tiff/tiff-4.4.0_rc1.ebuild
rename to media-libs/tiff/tiff-4.4.0.ebuild
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 20634e91f67c..705ee0f6efa1 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,9 +1,7 @@
 AUX vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch 1068 BLAKE2B 4a91aa7fbebf2707c34dc228d6ba81989c07fefb1386b8293f6d7707be7c76ad1abb96b0e9ac7cf6830ba60de97bf32fdeb94fa3432440fdeeee2e7d57bd24a0 SHA512 7ccd1380dc2796a6b671014be0af40d2591cefb4e04c8260e924ebbfafbc336b3a8f3fde4a238a6bf013b6528e5aadbcef208a8fa4ad8042803e9366b999aefc
 AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd07855e38d52b5af7fa557f722b83e6afa1c22bba027f2ffd6d6fee71dd27e4782b40d5e62734e7b913e332dfbf2d01b69eaad1a563337f9ac5df19 SHA512 4d4323acac168e5d9ea2b530c69400e980278bf5ec4450dcb2ff865c9714e02646ce90918dc4aa2f9dda932e46e3ff90c1639e4507ce5bf498a512b26f6b0417
-DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
 DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
 DIST vulkan-layers-1.3.211.tar.gz 3967709 BLAKE2B f86ff0fa053e0138a0bbdbec30e2fe0a59cfc24f43fe787b007ae352db81a700442d777637e1fc577332a47f36bc09383dd29416b5170fcf5d735562b6a58230 SHA512 e494ba793064f0d32fbdeaddaa01dcd730a36a5c793625bb4671a4e8067364171416ec8fb7361f946cc5d5e8dc16d58e2194c3eb5d3a57d58f4ace2e7ed34f5f
-EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
 EBUILD vulkan-layers-1.3.204.ebuild 1625 BLAKE2B 185afc830eea2ef233b17f445dac3f800b7b48bd30608589f693af0bbcf07b68ea43520566f12b116e48395f3539fe20f561f07b3585b05fa199e518d187d832 SHA512 993ab073216fb6086e61373244093a69857d67ec909df5c234f574fea73ea0474a75e2aa21d78f5c86f834b3175963485687877298d9f89f7441661ff94b1365
 EBUILD vulkan-layers-1.3.211.ebuild 1522 BLAKE2B fcd5d4961c8ad3f31c662d2fb88e550f060bae941181a6f1cd8b1842757cd1ecea13a0e30c7442ef00435fba5c5b6fd1c7b2c342e0e93c5c400c2f9ae3ec89d3 SHA512 ea42f13ab4a600b9b66e4f879cf4b6d646b52ce37981c9e249654d5d2ccf95676e539ffbbd2e8bccede4cea052263cae288c1b445494109807113e82a3a451b2
 EBUILD vulkan-layers-9999.ebuild 1587 BLAKE2B bd7bcafea4b564af36c93b7b823a8c93775d19af5c9311e9514d3c527567a3a477aa88d0926ee94de2904f84a0fef55eb48ffb8c87072bfff111812207f2599e SHA512 c6ade0a19be6619eedcbb470dabd32b83f1356f94e57ecd1dc525b5e093047dd994da441e4ba288ff01dc4d1c9b917c69964221c3c57955a1b41821778ab7518
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
deleted file mode 100644
index e7998585382d..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 4ebed18b798f..e2724e481c01 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,9 +1,5 @@
-DIST vulkan-loader-1.2.198.1.tar.gz 1441540 BLAKE2B c34fe5c0b97ee01038749754eb76b0fa7f1e4b9ad5ee78fa63ed9bf27e49362b215b39fd9fadcc5592097db80f3e655d109d6c92ae97829bdc75f5a28085d234 SHA512 dff0d8d9f6ffe4da6b94d491133c79d8fdbc724577387ae6f1522d7e557e39067ba66de60cc075bc469ad755dbe77d6e6728238a7ab4c07c36cf16964936e641
-DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
 DIST vulkan-loader-1.3.204.tar.gz 1465828 BLAKE2B 92716a01958a851374c037b325f7dcd1f3dcb45c1ee0086102c71424965255a3ce9423ed8c1312023f445050cf112c9312110c2d6f4d43ec9980270eca2bbb67 SHA512 f78778783a4981a2b0b38c651e87358afad5c15d220bd1cb95e907f9afe2a81073b6ee12992c7038d0c8227cadcd7a64c93d21b2155585db3d807982354989d1
 DIST vulkan-loader-1.3.211.tar.gz 1581450 BLAKE2B d7ea8cf54693733d78a0f4d96119c8b693f88f38c1a7664f2dc14b10bee3558fdf32279a51978c2d77a282a33b93ea6e0d6769e9d17345117bc2e048c4645707 SHA512 2c363909b975d3b286f2ac277e7ff8ea26347d7eb1b6bac9580ceba83822978d51e11fdb58e91e103b00b324f67b776f0e5917e781b3278d7edcba4669cbbd6c
-EBUILD vulkan-loader-1.2.198-r1.ebuild 1768 BLAKE2B 0b0369e7612be07e579dfdf9827d43c3c03251be8f0aef04ca6f79f260c89ec645fef83186aa573f830cbb898e58df3a778dc5a7da42c74d3195ce2dd2d24ce8 SHA512 362dcaedd4423ed385e6e03420f11570611abffbb413366ec9aca326783218693f8c9a378b722394f2f00a36196b87e173341f22b3ad6a70390a58c40ce42606
-EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
 EBUILD vulkan-loader-1.3.204.ebuild 1756 BLAKE2B 96d71d10ebb9a26f1594f10c1d6c0d667b49ae27ac06ff84cb34c729005229afac23f7665b4ba7d233412de7753edcf7238522cd316d40d9955d03808393d079 SHA512 e1ec1f2da7bcaffd0541139db2f526e63a2cbde079e40eabe12ccf41144f99a925f80f3151a5544137d11c4710b6c18aaabe72169f5b803d1175cbf55f80ab25
 EBUILD vulkan-loader-1.3.211.ebuild 1749 BLAKE2B 558264821cabe5d4bbd38cb8c1520b4b687a680c0630ee6653dddbdf5b863af65f3cc86a7b8c9fe33e9772b4831ba714d318dd3dd5754004e753d310387c9eb1 SHA512 617d4d112fe78a3f0fdc8e2cdc2965cc3bf1c2cda141716a3351dcecb9c6b9bd4755ef9a1e8ae66beeef0d873d3e8edc94d3a0ff3473623d1c0ee0e7fef24875
 EBUILD vulkan-loader-9999.ebuild 1773 BLAKE2B 700b68c6ba62da787c7749fdb7e7f959bb1bab344f8faf36f443a017a91d13fde0fa0e0a47ba19aaa4b892f93328ac655313c059de83c1886e6a97d6c1ccaa7e SHA512 c5d27b2dcafa1976cb6fc7ba6371b8d71480acb5cfe262a4b1009e978c0e6d189659902517a4d982259771061552ff2d8aacc444d597802857652d7da95a19d5
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild
deleted file mode 100644
index 27a02a896e09..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.1.tar.gz -> ${P}.1.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.1
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
deleted file mode 100644
index edcb493caa84..000000000000
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Loader
-CMAKE_ECLASS="cmake"
-inherit flag-o-matic cmake-multilib toolchain-funcs
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="layers wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-DEPEND="
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
-	# Integrated clang assembler doesn't work with x86 - Bug #698164
-	if tc-is-clang && [[ ${ABI} == x86 ]]; then
-		append-cflags -fno-integrated-as
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
-	)
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	keepdir /etc/vulkan/icd.d
-
-	cmake_src_install
-}
-
-pkg_postinst() {
-	einfo "USE=demos has been dropped as per upstream packaging"
-	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
-}
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index bc2981924340..c9e7f05d0895 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-a52dec/Manifest b/media-plugins/gst-plugins-a52dec/Manifest
index 869c3d6fab4e..aea607e0dce0 100644
--- a/media-plugins/gst-plugins-a52dec/Manifest
+++ b/media-plugins/gst-plugins-a52dec/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-a52dec-1.16.3.ebuild 443 BLAKE2B 93bc714183c1873abdc8f38b9454
 EBUILD gst-plugins-a52dec-1.18.4.ebuild 456 BLAKE2B da5c2529b9cc621953535af6b401f67e641410aa79766d310ab9e08eee09b2979b83c768c03dec48c1450b75923de85a8d27d08cf25cd0bdcef4eab1de5bd78b SHA512 f4a5d921e2ff26b958a199df1a7044622c814d00a10375b50c66519b4091ec40949b6423fb34b65c3f8b1f37aad6d218963552c11679b5434c493033bb339fe7
 EBUILD gst-plugins-a52dec-1.18.6.ebuild 456 BLAKE2B 0d9d57b47b52953cc842a2e9aa2da77df5611b039967f2b4db2817e5745c6cfab1f38014185080c513d6bd993000e7df7e2aba7beb1ecdb77fb22f367f3f0587 SHA512 1e3ed197909cdb057447348382792eb2f777e14a6aa000b6118223f16297bbc61042dfadf76b2179d3093e870b36fc759ccc39c486e375b650dc0c91ece6df86
 EBUILD gst-plugins-a52dec-1.20.1.ebuild 566 BLAKE2B bddb4c9d53a327b58390f8d61e7d795f94b0e1f3c47ca1e6a90a03e2536c7ef8bea914821774f4d1972ce4727f731395c5039097dbd158dcd80079c2d73c754c SHA512 efeb008002a8f0832f46570b1217d4a0a8d41f42e442f8ae4262068fd84f0e8a2b0ef3c78a8f0e5a40c522fa7b444f9da4da3c9cee560fd66307594da8ae794a
-EBUILD gst-plugins-a52dec-1.20.2.ebuild 562 BLAKE2B ac6bb0605c7a24b7194f245fa67a9173528af40bd37d8790cf8a658854d657a1a98305e0dca191c2a1a6cc0bf572f57a100d882c0ed0959766abe69ea1733751 SHA512 a6358af5648ac5a7e463ede5de24fdcdc10bb985a680efe235f9cde3ab1368bc3a46ed11c593277b1993757a7f919e75bf4238a3b96180368eed8ae1bfc61821
+EBUILD gst-plugins-a52dec-1.20.2.ebuild 560 BLAKE2B 8ecf418e6b6536e15f75af08dc51b6772a7d784a82516041f947cdb43671c1cdad3ed9287c882c361b6b07814048bf50e998492db7c40d8b440edce4ffb82ad8 SHA512 dcb33fee82d536b5135f836d4949f1b5bc94c90ce135901fe9aac5939e279264141eb21b4242d21438a35bdf024410d3bd6f0955274e650698dcad778d674c53
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild
index c47ca51ad0ae..db0ffdfad7bb 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="ATSC A/52 audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="+orc"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-assrender/Manifest b/media-plugins/gst-plugins-assrender/Manifest
index 0c34ead86cc4..afb6c749f3d4 100644
--- a/media-plugins/gst-plugins-assrender/Manifest
+++ b/media-plugins/gst-plugins-assrender/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-assrender-1.16.3.ebuild 398 BLAKE2B 46f97978b49d0a778af273652
 EBUILD gst-plugins-assrender-1.18.4.ebuild 411 BLAKE2B 53b3bcc5c0ca6cb128f6cf850299a76ef1e62979e1612eb5f639dc0bf422b7c9bf7652e5947e6fa6f782d1c7604888dac637025af3503e135a0d9d4bcdf65215 SHA512 8db2305e294c4f1ccdb5932ce5c3353113395646b5ff88a87f6a7ccf9324a51b43c55fe36d044b735ee0a00fd6ea710ad0641ffe91bfd6ec1789c83305dccac2
 EBUILD gst-plugins-assrender-1.18.6.ebuild 411 BLAKE2B 9a81342b2170cbbf763324c967859a21befcb8456667356b2cac3e7a5a5b1e76cb926ff31a567c211273d014b3225b7a6339ece64b46f63888af99a1f027c3b4 SHA512 7bc6efe12983f17abf078019298985afb6d6f8b66c90dd5ecebfa9248a21650ea2be88f0f8becd721eb6e3ee7d80d81c6d74c000828a0cbea274f1e88e2257ad
 EBUILD gst-plugins-assrender-1.20.1.ebuild 409 BLAKE2B eb4a0186c880d5ce0210d8522654721ffed9ba01927f6475835926ccb79e1786f336f36ba6e3c6cbd3c1b9e3a9df102270e1fd553e3581a7e23775eb62fb780a SHA512 12935761400265bfa69a817d5853985da2686b2fe8b043199fd4607a23a2ca4c4dd43f11dcdefb4132d92a0c47f63f2b1ca51bbdffa0e4848c5a01d0d666c3aa
-EBUILD gst-plugins-assrender-1.20.2.ebuild 405 BLAKE2B db834c047aad1edc93877e708eabdddc6d542ed35d60a09b6b1730fe78ca52fd12f49eaed2ce54bca1edb5667270da8fc69a1eb1d5588fd679025070dff40cd2 SHA512 d5d8243ac83273a71596a3420636c168e0e141a6597c0c617dd5dfc0613b0564ecce58a3f1f4e6241ac7cc5eafb02bce426770bbc5bab4f0f83c7a037b3a3a4d
+EBUILD gst-plugins-assrender-1.20.2.ebuild 403 BLAKE2B a6647557a1c8e57c70fbeedf9ea8152e71d6b885d1513520a75b27a24bb97af07507d4a5d3ebfcceb38f15ec263025c4a37dfb0ca2dee592afc84a951787e3a1 SHA512 b9949ee1b8537a6c3b928ba2aa7a3781ce3c2f8e9c23017886b9271e03a3bde0d8f2539ebbe0e248eac8e7b1fcdf13543b3e8c61237c6b43d8730849fc105af2
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild
index 2907730a62b4..290b6cc2241e 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="ASS/SSA rendering with effects support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdio/Manifest b/media-plugins/gst-plugins-cdio/Manifest
index 49b1717bb069..891e9e992710 100644
--- a/media-plugins/gst-plugins-cdio/Manifest
+++ b/media-plugins/gst-plugins-cdio/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-cdio-1.16.3.ebuild 372 BLAKE2B 280250587e3559487c8d02a632dd0b
 EBUILD gst-plugins-cdio-1.18.4.ebuild 385 BLAKE2B 4a25cc22c9a7e726686c9bab46a32c1fc247944784b4a126e6948a72308438cacf699c52772122e5e9c0b5a8e230e2dbf38210d93b2e5dc7eb58c3978ac77545 SHA512 404db1aed91a3f1bb3f8faa14b4bae8986620e74662d8e1cab49919ed03999b9f0d4196ab572b704235de41fbc94ade3c40fa9165ea777139ab40e997e92af0f
 EBUILD gst-plugins-cdio-1.18.6.ebuild 385 BLAKE2B b30aed28ae2115792970a7385ac88d11a4e8e68a624db65836e197ec1214247fae854a3a3b259ea0af3ef56e9e0cedab5c0beaa97cc423db7b2a4ec2904e302f SHA512 8e073293a80a2e874b2f52b795d7057fdfd75ca35f3f9ea050b83ed04efcddc0d991150d60e0030daddcc82609db2bcded47cb4c016d0c0cac40cd5bfe19833f
 EBUILD gst-plugins-cdio-1.20.1.ebuild 485 BLAKE2B 185a6de670973e687ca5a919f67b42911176b537cf281ef5e7cf0da78bdd1dcfd269c213e9e9aa0f8fee750888b76f5805e68778f6f09472da98d3a9433d26b7 SHA512 bb030ccc1872d54ee4672745ddc6679301ca0d9db803720f9beae3546d5704733094a4d75707019bcb714deac8e38e85476aa836140fa96c4b424cf1857e4a09
-EBUILD gst-plugins-cdio-1.20.2.ebuild 483 BLAKE2B 8f49c50d1cf895491406d13232644105f75b2a3ccb514617c7daf56474b5712be003ec940c3d368c57a96ffbceefa325db68478a82d75978a3fd2c87d3682563 SHA512 cdcc1c92e8d9f077942e2d8c82c7b62ebb2dbdbb9d8f1a71e04126ec441d8af09b5d0eb26e555f10e590858762cf4b07df3981637b602e59ce12af76a7122334
+EBUILD gst-plugins-cdio-1.20.2.ebuild 481 BLAKE2B 51368db2781b16342fbc1d444b592faea2a794166dddfe9247ac0181c46fcade5d42ca21fa7e526fb2b8fbaea3c13870cfbec95d5648ebbdd629ed2c77169cd3 SHA512 d0955daa3b298859ec4e9737f94009cf0f869472bcdf30a41affc0c99efeddc4cb8f30422fcd8257bafa19fe34d43d0b0b8ff0a4f989c995c38766078638e4eb
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild
index 769457678573..41892f115073 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-cdparanoia/Manifest b/media-plugins/gst-plugins-cdparanoia/Manifest
index 5639b7e2866f..b0da125a61d8 100644
--- a/media-plugins/gst-plugins-cdparanoia/Manifest
+++ b/media-plugins/gst-plugins-cdparanoia/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-cdparanoia-1.16.3.ebuild 475 BLAKE2B da0d62c41361adc6cc1a4bf3
 EBUILD gst-plugins-cdparanoia-1.18.4.ebuild 482 BLAKE2B 68b71044e43b6ce3252dbbecaf725dba1a248cf07a35680872ce831e42456aa26cedd685dacac2720406b4f68374874e9564e8cbba288fe4a2c6585c73f50b4a SHA512 631a613e3fef26f72c67cba824aaa6e798076b67ec46ccd937298b64512c88e9d16ccea8d1a8a69bb60f8c9e35e213ec38e0a4b442c717127b0567e47a81daa4
 EBUILD gst-plugins-cdparanoia-1.18.6.ebuild 482 BLAKE2B acce0f36ed3e27cd4d9fcf3f170e108493c431a19eac404ff5776074d69a65a47c148a227f5a52f96fc9dbae9f0d5d1f6c023d646f0339fc2e77e661d39ddb8b SHA512 e9f78bcd7d07ed9471238012ad7f1beecceae3cad9dcaa5ca39511712f24531184cbbc28772d3b8e0ca17a984bc6fb6404388a88d355da6f0e2564d1a7e4ff53
 EBUILD gst-plugins-cdparanoia-1.20.1.ebuild 480 BLAKE2B 6c2e1425d171d304293dc375f3a04184ab3e9043ce1a392c022e4d9aee90adebf6b1d52f76e5895943f71ff5322a7b04344c87c88acf6400dcfec2b1c434fa91 SHA512 67d6bc5000d4b4a34813fd8fa9a0ad2b4b048a1a9593a5d90ff9fcb9465095790e3f1cd01b3983b5b573fb6d2934d1009b84fad1340e9047295fe0153f0d3921
-EBUILD gst-plugins-cdparanoia-1.20.2.ebuild 476 BLAKE2B 6773a932d2704644268f464c99f6776c3728c0f96121524bdfa2e0155a4064018c47b569f97fd127b8b8a41315858d17da1a8396d9227b5a13a6ab9f781db157 SHA512 c3946d0ae755bb743349fb9c5881043282001bc334208725e0b6fb307dbf36bdf3d5eb6b0ed888be550bd8fd8438d2a5c1b1859c7985e1d259926467331c91be
+EBUILD gst-plugins-cdparanoia-1.20.2.ebuild 474 BLAKE2B 6a6d208958e37a8012040f6aaf84cee23a98f84f5052aec81ab9ac03c0684a16b04fa515f3bf2d88e3a73ed0312d27eb3e86286ab76dc4e38ce14cdfcf103a7a SHA512 984cd696640475ffd997fe8befbd45ff07ed5143f25677c8156197ef5d59245039d927984c3bb1172652b61c6566ad19e6f4fe344d63815d088802e80ff43276
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild
index c03cfa294518..cba85061667f 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="CD Audio Source (cdda) plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-chromaprint/Manifest b/media-plugins/gst-plugins-chromaprint/Manifest
index f416fcf2795e..e22cd8744445 100644
--- a/media-plugins/gst-plugins-chromaprint/Manifest
+++ b/media-plugins/gst-plugins-chromaprint/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-chromaprint-1.16.3.ebuild 380 BLAKE2B ded4b1e539d6696468c879d
 EBUILD gst-plugins-chromaprint-1.18.4.ebuild 396 BLAKE2B 8560b3127f5ca65cc720498ab0bd7ae025dcf47f4c70900213d2cb5c9114650281d85fa7a9e6cb777888a009b79edbacb0a41bd51baac2a38b3c7efd7ab89386 SHA512 d14df6b99ba98f0518e69ad8bc7f0c514fb955e73c74c6f4c7430126aeca4797c1d1fe5da9679a8888649d5d1f962fe68da319c40a25285d4f1c6628d7153bdb
 EBUILD gst-plugins-chromaprint-1.18.6.ebuild 396 BLAKE2B 934c5aeaf0506a35ce3053d6263a5f5d30a6f3bf95428a121acfb70899582a465bc57bbfa67bda0d1198be91bce714efef77ca56f9c3dcbc26597e9f21b0896d SHA512 e349215f98d6e0790e479b5e33802a50eaf90a36a404459dee5ba8b6039dfb418ecc110eeb1ea1a106ad07eec1f564188e02e9d7dc125f2a87aeb11c1fc6bd40
 EBUILD gst-plugins-chromaprint-1.20.1.ebuild 396 BLAKE2B 934c5aeaf0506a35ce3053d6263a5f5d30a6f3bf95428a121acfb70899582a465bc57bbfa67bda0d1198be91bce714efef77ca56f9c3dcbc26597e9f21b0896d SHA512 e349215f98d6e0790e479b5e33802a50eaf90a36a404459dee5ba8b6039dfb418ecc110eeb1ea1a106ad07eec1f564188e02e9d7dc125f2a87aeb11c1fc6bd40
-EBUILD gst-plugins-chromaprint-1.20.2.ebuild 396 BLAKE2B 934c5aeaf0506a35ce3053d6263a5f5d30a6f3bf95428a121acfb70899582a465bc57bbfa67bda0d1198be91bce714efef77ca56f9c3dcbc26597e9f21b0896d SHA512 e349215f98d6e0790e479b5e33802a50eaf90a36a404459dee5ba8b6039dfb418ecc110eeb1ea1a106ad07eec1f564188e02e9d7dc125f2a87aeb11c1fc6bd40
+EBUILD gst-plugins-chromaprint-1.20.2.ebuild 393 BLAKE2B a6816f80dbd97d8d960220aaa9f919f09b09d62076bf06bf0dca8f6e1560555a533173c07b084cc78290a32512f53ab1e92613264ad9f77573a7a7f95a9af6f4 SHA512 6d4524df1eb35c5bb1707542f4e18b887c1f542781059b04e1564e8890481d1bf9382d149192dad613f0a5e3e21e20308e34309e8f321aac0516f054b0d55c0c
 MISC metadata.xml 494 BLAKE2B ba6f7e6cdf8caeb886391f80b58c11e44096902aa4d0262c29a489bed7711b32705a6c45d5d5da0025c3678cbf0f925b2d90d508490990e68d7d92038db84d47 SHA512 959a3150fa16184c0ea690706c9c343b436e2bbc5185150bd50e49ef6081b5db4e71b4c7bd7bcc7c32359071c122f68d1f59ea47aab344a5058f7371db211883
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild
index 4da54c160d12..7a0fcdefede3 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dv/Manifest b/media-plugins/gst-plugins-dv/Manifest
index 9b52c4729608..2b095069b474 100644
--- a/media-plugins/gst-plugins-dv/Manifest
+++ b/media-plugins/gst-plugins-dv/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-dv-1.16.3.ebuild 406 BLAKE2B cf417bd6e948701ab8ecc82e1edf94b9
 EBUILD gst-plugins-dv-1.18.4.ebuild 392 BLAKE2B a087cf78bfb0acb25b7cae5e4b4d68ebfdeccd142ba02c2c40a988c8cbacb2ce646126c4a6a25e28bc586d37a5984bc6c3fe607217a988368099721a7967154c SHA512 83ce0a6caab5014eda40bb545c0a2771a4d1e2525c426f6572b73e4fe842c69e954d96a31331ea474faad7f7919d9028e0d2243e7a2dc955df880675d880d3ad
 EBUILD gst-plugins-dv-1.18.6.ebuild 392 BLAKE2B 4f0b142f22bd00b43b2930c314aca0ca407a1e37450dbc728979b6fa3748427e7597842a2360514f46b1374afcf6094d671875d9cef931ae12f33113a5be5686 SHA512 cbbd013db767023556f661d2cc6887c7a8f06d772cd1742aeb23a157a2ff13cd01afee7853c2307a19ea8411fb7f3ae1db7cbc00b25479ac83279d19bcc416f5
 EBUILD gst-plugins-dv-1.20.1.ebuild 388 BLAKE2B 3e0b27cf72cee00df0b2cfa54eccb3e1e992630c7fc875b34a86fae69d1fb91740ec6762d2d61f7169ddadff23e1d0a20f4670748a4dd9680f64b001d4f1c53f SHA512 ad1088d95f6c9d98a9828389f55a4605b78160c65426bb47ef1d742cf21f2e16485785a598d4fc05d174c58a643e07f8b8644a789fb216bfd837eb1f699baa12
-EBUILD gst-plugins-dv-1.20.2.ebuild 386 BLAKE2B cee1f7d846b7343f7485f465a7e7b3ee0f6e7d4be5259e1138521b386020df6786f4b0fbd3237af8dc165a9a069f6f2816c5638b5fe53cc27d73e23d9f83b338 SHA512 7e7ff1f9123d454114b78bc1c8746b68602545253a115bfeb23fd6cd7cb0870ecef36b7a748d17e96b85bd9cdb3bf055ecda60fe72ebdfb3ef60c601f072121c
+EBUILD gst-plugins-dv-1.20.2.ebuild 384 BLAKE2B 996d150f4b089f5c8cdf180f6b22b5f1bd0300b2cd3f326a2ca757a16b97702c195876277a958e190703b86ecc9b31925d9eae40efeed50f27f25450dceccee4 SHA512 dc06018446b2b081a8aeef7e75f73fd1aa76ee258ac5058c554e32a37dfca43d5943ff8560bdeff4f7bc653be64a6a5b3de80f88698a92bd201eadd4e5a19a72
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild
index b66c5d3b6163..198e43270841 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="DV demuxer and decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-dvb/Manifest b/media-plugins/gst-plugins-dvb/Manifest
index 896ce1b8e217..506c09dee229 100644
--- a/media-plugins/gst-plugins-dvb/Manifest
+++ b/media-plugins/gst-plugins-dvb/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-dvb-1.16.3.ebuild 411 BLAKE2B 2cab809327175e643982d0158505a63
 EBUILD gst-plugins-dvb-1.18.4.ebuild 417 BLAKE2B 8a4e869166b07f7a07a428fa050e8d23829aee65c153c0ec24971b7565421fa0a8ec7293b22af394f7259e36707d55d75c0a6d0eda4911d09b9cb0d8c10cd893 SHA512 fdbccc7295a637b684280f6a3cca39085e973713fe77d8c2b8de0b51214f50155fc895f85cd3170d9d3ee3bc7596896ef48d81752dc2e9a57d32b01a07ad3ab3
 EBUILD gst-plugins-dvb-1.18.6.ebuild 417 BLAKE2B 48cfbeb15429a4cd1bd81c7eeb54d8a65319248d70b560377f31c19ca2f67b862c1e47772ea7fde4731a37a6ffa3b1f54de5636dfce38d85cfa362170a8d68a0 SHA512 805a8b65a2fc0900b01062cd7a11ee92a492df1edb27aca9c702770d7003d1addb970ecc22cfc2722a57a99fa3f1b606f66de0a279b5442f74583822ea24d376
 EBUILD gst-plugins-dvb-1.20.1.ebuild 414 BLAKE2B e08d9669f7b83e7078f34da4debdabc602c982e85bec8942083eea383d9274a0c5afa9e72bbccdd899c2c78eeab5d544fa3b9521e1b76c26969c7b1620a7f057 SHA512 3f13ada88cf01fb9dd69e22310190380fe6361155f3bfa0daf81e0b5c961e4219bf41af911b5252cced173495753bc4c7090085ee7a51b52e977335adbc5a5f0
-EBUILD gst-plugins-dvb-1.20.2.ebuild 411 BLAKE2B b1ededacb2fc7a3b0c72aaade02578b1405a08437f800094890b8e399b85515a6939bae53f26a4057998f4b69b92600ead9f583f352fc0a7fb7f47844e24817e SHA512 c3e86298002334efc9d5843fc69ad5481c9803d769b09be158b68de83f4e9d636d50357228a41bde84d212b81909aa0cee042565b884095dabd571dbc7c7402d
+EBUILD gst-plugins-dvb-1.20.2.ebuild 409 BLAKE2B 52b3250310215bb4eb327db0bf54d3903bedb4a1928f6da0550fbe02e1e984a23e42ea1356f664cf600ad26813e62e4f5a67e2f60ef31311b1fa6ef1545ad37c SHA512 348357aaecaa279aae84367051f8164340b31502a1db94534b114003fbba478ae1b38a6e2caecf0d780a4085e6b7baa3ae5737b9a3bdeeea7df6d2c3404f828a
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild
index ced53fd7865c..0419b6197f1c 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPION="DVB device capture plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=""
 DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-dvdread/Manifest b/media-plugins/gst-plugins-dvdread/Manifest
index 6a2052cf5cea..3176b756030d 100644
--- a/media-plugins/gst-plugins-dvdread/Manifest
+++ b/media-plugins/gst-plugins-dvdread/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-dvdread-1.16.3.ebuild 376 BLAKE2B 3b662ee5bf8b97d596ae7b8800d
 EBUILD gst-plugins-dvdread-1.18.4.ebuild 389 BLAKE2B 555a809402bf34e326791d8676c8a614923ef9c1f265e186636131790f197749fa1cbd841f2d81eff2506f768d0e4d36f4b1e8cdd9d4387a0391d570cd7ec8e0 SHA512 502bfec03ed384ed9606bc21efa055272a7569c72f331ea651237593360b945bea6716de85f0e398d2fba193a317911ca0641c65c9cc4b76c947ecfb1c18d519
 EBUILD gst-plugins-dvdread-1.18.6.ebuild 389 BLAKE2B 31f65b77c017d2139dbce40a7a19e080a2a6b75f8808af5211664a8fe353d01f9ca26ce9b3c58c723632dff7afe803332b7a5710f0a2a593a7b720e567b6052b SHA512 b09485b04d48ce1640342ddc4498274ed8817f8f69101170d51e71f487b8e1fd11f3f78d1caf667b2c78f26f4acbe6a6da10324cb1f02eaf2e77d41cbcbaa3fe
 EBUILD gst-plugins-dvdread-1.20.1.ebuild 490 BLAKE2B 867149afe5fe27e0667b49e323940ff108f27933d0dbd8026324120ad159fab7534109ee6ead85909f9556e110f6949999635bc7f1ada01775243f13c0c2eadf SHA512 939abe4be232d35e55788544fa39496b915bd7af5301dc85df346577121610b05f8f402ccbcd4161450593b42ad960d019b0193a73752263c7ec12b21f93fcae
-EBUILD gst-plugins-dvdread-1.20.2.ebuild 487 BLAKE2B 8fabdb7b87bab44c8ecb6bd6afde0b22f8faffe8a101e4789d118c327ee8267d446d78c08c0ec1cd2cdb5a3eb9138f386648a77111f0b632d9cf88bf27f43a44 SHA512 aac0cefbec70909797857d37d8403b78aa995069bc7f1948e77239e6c34620d5e1fb93d52e8ad0f70c9468d786da0c0c2c3e0f6bab2b3a3590ff0a97faae46ce
+EBUILD gst-plugins-dvdread-1.20.2.ebuild 485 BLAKE2B 38832621bd591a5df12d92bbc39680165b6e1a536c4568012d2ddd532499c0521f39667d1fe87c9e9bb08c71ac6f60099699973d225e1dd1df791aac3f070b21 SHA512 0c3409600b1b3df5685c6a1b32b1111a2c53e05e547c0891e7bbe914cc829f792b20870c348719ff788924ea464b161befc05b4ba28caece42b90bbbb587ef7d
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild
index 9fafc1344277..9f3101b7bcda 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="DVD read plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libdvdread-4.2.0-r1:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faac/Manifest b/media-plugins/gst-plugins-faac/Manifest
index 67b6658aca5d..acc97bc4c39c 100644
--- a/media-plugins/gst-plugins-faac/Manifest
+++ b/media-plugins/gst-plugins-faac/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-faac-1.16.3.ebuild 357 BLAKE2B 5f96fffed2cd0fbc457e5a4a3d5b13
 EBUILD gst-plugins-faac-1.18.4.ebuild 363 BLAKE2B 69ef3020b6ce34ef8e9104dab4dc565893f99b5dd1f8206697748a3886d7c3d9d2cbd3662f14cae48c53dac1cede2c66a441dac3e40528a41ca3757e35b85801 SHA512 52214290411afc12cfc1bee248229e5efcc8211d630320e3d274c4fc056bd321f8be3928cd5122896f1188739902bf9ff8b358046c563111603a1a21f81bd4a6
 EBUILD gst-plugins-faac-1.18.6.ebuild 363 BLAKE2B 5d29882d3f21a113a166875a65cb2c5ec4849583d8a0c2345de0e9190d8f0d3e1ae9f3d27d6fa6edf378aefc234dc3f1af5cab38da08cbce6de018dc0df36cfe SHA512 8879ce16418525f0657d24d8420b563ce942a731a3b8a5b573efa247e1cf8980a82c143f687574db2290b2473caa26cc5bc73d4816904adabbc8bc5e1fe35aad
 EBUILD gst-plugins-faac-1.20.1.ebuild 359 BLAKE2B 02bac2a65cf57dc54a4c8bd422f15ab4ff158915e801100e7f62946d6a642d9ca37dbe6924a3af1ad27d8585a8ae1f962429723d6e580ce0208f2d11acc45e51 SHA512 9cf657add02f04e9fbb73c1f98fcf96d8255d40a934e629d3fdc19d8467bd2090939e05c048d37b6fcfa8c7b2ad589da3733e1c243cf4c07fcfd01979e4ea3b1
-EBUILD gst-plugins-faac-1.20.2.ebuild 357 BLAKE2B 372ce57d226dcfa198ed0ee866dd9b0050d1a5c258602e889c00bebab4582f5831fc3c5232190dac68dfff268aca078a27daa669181a0a3c19dee5bc4253fad0 SHA512 fbaa786b3e44b4ab004f1f91db800dc04dd8e64bef81395ae230036097d776cb3bf6f441cc545a3023b90f19c07704f826de96c7dc143c97e247ea906b3efa19
+EBUILD gst-plugins-faac-1.20.2.ebuild 355 BLAKE2B d91bdea239ae9c475ac2fc407259e66d2675dd8c45070c0e1be0772a723b7e829f55a146df3d3281562fa977c0db49df13ffbf5c0e1ac0e1de9f158322572aef SHA512 144066ec65dc97fe75007691025fb6f009ea1aba7b8a7bd8416541dfeefcd80b53ad4bd11f0508fbf552cb0e4cc43caafd4ec70799bb07b27e3196660b348ff7
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild
index 191af80ebf42..48e7e69dc711 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AAC audio encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-faad/Manifest b/media-plugins/gst-plugins-faad/Manifest
index 36932d571422..471603c56eec 100644
--- a/media-plugins/gst-plugins-faad/Manifest
+++ b/media-plugins/gst-plugins-faad/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-faad-1.16.3.ebuild 362 BLAKE2B e60f7548090c127380ff594abdc07c
 EBUILD gst-plugins-faad-1.18.4.ebuild 375 BLAKE2B f37dc1fabaa0f8b98870c38ae37670502aefd325523a93ba551ea3ca3da3f0666c112978aa96e575f81131c8d64eeda62d55860dc052e310d36709067c43c070 SHA512 d4c23034e12571f324e8d639a4ffdf6059625d2bf4370a3483e95577e84074ceb81c65a8551b5aa3b2e186ccae0ef041a9b4d85fc00465fc8a2080dbedd2c635
 EBUILD gst-plugins-faad-1.18.6.ebuild 375 BLAKE2B 5a5e430affa16de4b5368d69bbc432be2dc3c45ae378b9790602bf25372480af5fa7ddcca84b3064c43497567098ae652a6172d09aac84a675ca054d889d8646 SHA512 c2ebdb93e6ad4e82334f222b9a2fd9cf596cae21bc1e2466897c07ff5b41d2a63fe86e203d94ed66096e478b8bca7b9145be1fa8c3048aad5d4f785a19f08d14
 EBUILD gst-plugins-faad-1.20.1.ebuild 475 BLAKE2B e3963e3ff9d1bb6d9380d5845f9fce9cfdf65ad7a92059579a69aac141a26a0b9ef39828b0f42704b5c5dc9c304547775be9a837b448dfc60551f167d27d63a0 SHA512 859423a3f3e00afb8ef67ad46095a3955c1466a48029f74bd1bffadace809f3bc35b66d9bfa78ea3931518f710a3f7b33094ef5a4054c3003fcd83863fc88f59
-EBUILD gst-plugins-faad-1.20.2.ebuild 473 BLAKE2B bb2bbf3461d2257c5d9ab9634eaf6fd1849d1ed1dc836343151db747e8d7647156c1b96b81ce486e0a4b8dddb17996f6baaae5e152554b3a219d6e6f3f781318 SHA512 af9a2a2473705be06bd9132e8ab62e5912a4e8d03aff356ef6a31554f0a3e9ae93845c048effc9c51e0ebd62f5e5599b1abc84dc1e87da9f62c0123e2382fc76
+EBUILD gst-plugins-faad-1.20.2.ebuild 471 BLAKE2B 3fa48c0226be8b0c81be98541a1d1e3d4c1dd92be30a23d32c88213564f776334d62d5b5b17582892aa984fd706b518a77b3a98224a38d884167d9b1ee1787de SHA512 12f0b2e4dfe54fcf78304db34a1440e7b41703e2162917e6bf1d8b3ee0a57a9ad504fc92cfd269fd946a335a7fce0bd6cef7a31369c1ec19fb8da8dc8040c4d4
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild
index 2246488a3bb2..2646f25edc4c 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="AAC audio decoder plugin"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-flac/Manifest b/media-plugins/gst-plugins-flac/Manifest
index e62afcaa7b21..cd88c4b2b600 100644
--- a/media-plugins/gst-plugins-flac/Manifest
+++ b/media-plugins/gst-plugins-flac/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-flac-1.16.3.ebuild 386 BLAKE2B b566e3774fd5a43844bcaef49cfef4
 EBUILD gst-plugins-flac-1.18.4.ebuild 399 BLAKE2B bfcef38c5c12eb94ddbe10c5b02d6c35a14012464a0d06ee2bc74faa67a90bceab9c19fe65efd75a899e07fc91541cf36483fa26e0168a68ca3d7fd35e55e269 SHA512 2dbde4569a629b07210b0ab6304a916b6ff88480240b181e4cc45b17dc30aebf4982bca702272a77f541ec7dcc5b30591124da2623b12eff50a49691dd8ff30b
 EBUILD gst-plugins-flac-1.18.6.ebuild 399 BLAKE2B 2748fd05023965b77c901004e79b83b84cf59670f327c3b83cf8e31ca0878112e6e1eb0fd8deaf28f48e14b3dbf967524a809d1a578cfeb758451f4959651b06 SHA512 4d956e6f068e8696330ae711feb0d00551cc7aaf0702d9f091f8961720d3bf5198d0220ccc2c45ec6fa694e9122f511f906db688572a268f2fcf3f01ca694fa0
 EBUILD gst-plugins-flac-1.20.1.ebuild 397 BLAKE2B 3eff7478366bdd7b6a75852aeb9c20f0789f3f7d71d00aa363f34cf897c310ac0b7a97b3d0a32392997c8e73a05c00c2c3c8e95737037cf8afb6cd80bd8e44bf SHA512 aa1da048d5d400c7c0f43307419051c8edf9281a7737f489b7fd7e4997765a2cc6cd364fe5a2251f70eb8c244f406ce9eb3158ba0eebde96a0df45f6f9c38550
-EBUILD gst-plugins-flac-1.20.2.ebuild 393 BLAKE2B 1e45d087ef2e1578ea93fa2ddf7e0c9c6790e724c532a220d6982dae91001c9c304afbe7e1527ea3ed4af7cdd9b9f78541ae282c184e0642c6970310286397a5 SHA512 8e798695375cfc5bbcb8e68a9c771c8bb19b84ee144615c77abec68d67cf2893cda7f933f6bc9f03a34629ac102d1af9aa74d1179588787e37dc010bc20f4c16
+EBUILD gst-plugins-flac-1.20.2.ebuild 391 BLAKE2B ca0cd27d3430c6afa53d61d2f49a1bb50a9e7a06fe016cac0cf2926273c05cab8ab36e4a32556b6eaf86fd36d73087cd38ca3d089878eff3c9f25aded8fd9952 SHA512 04aa672dedc8c8a0a10e97aac6096464e9ee9d9c807c6295148161ea736d68b65c92fbc61ac24ce0db070b7a09f06ec4c6014e3ca63491169cf749339aededa8
 MISC metadata.xml 556 BLAKE2B cb52919884686ede76503190f6efcf3f8e9b4dfa667c0921391950610b40676b5e410e1870e8a87b3e80bda7dc5f4814ebb8528baf986d2832d011a31ec5469e SHA512 62157b789531cfb0c0bea4102674215cfd8d6258dac5468baf42273be4b9b675e5db0ee5543f091ec4fbf82830a8228f50eab40a120c4d3ff07a32afe6b0e9e2
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild
index c537583e71e5..298752b44d03 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="FLAC encoder/decoder/tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/Manifest b/media-plugins/gst-plugins-gdkpixbuf/Manifest
index 94587a3ee733..219d609d82c2 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/Manifest
+++ b/media-plugins/gst-plugins-gdkpixbuf/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-gdkpixbuf-1.16.3.ebuild 461 BLAKE2B d4aeb5ae1fccc72b2149839b1
 EBUILD gst-plugins-gdkpixbuf-1.18.4.ebuild 475 BLAKE2B d5f7bd8fdc5397243452ec090c38d626025c63a1576ef2882f23a08c13ce0583c66c7ed93cb383049ad86e55a24f870278727ea4a71e6a3e68713f8c1cbb06de SHA512 4f00580b1a0bf5e55e608299f6634c7d87da23b967d22abbfe3f8ce80a6eda867ee5c02d213231f966e64f03de400ce9c6e49df3b9f0066a9eab9484953b36bb
 EBUILD gst-plugins-gdkpixbuf-1.18.6.ebuild 475 BLAKE2B d5f7bd8fdc5397243452ec090c38d626025c63a1576ef2882f23a08c13ce0583c66c7ed93cb383049ad86e55a24f870278727ea4a71e6a3e68713f8c1cbb06de SHA512 4f00580b1a0bf5e55e608299f6634c7d87da23b967d22abbfe3f8ce80a6eda867ee5c02d213231f966e64f03de400ce9c6e49df3b9f0066a9eab9484953b36bb
 EBUILD gst-plugins-gdkpixbuf-1.20.1.ebuild 473 BLAKE2B 39a30beb8b8e63e07371896738d205fcf0a8b46f9c1a697cb1357377690279545a1ca3edfc86b02e15dd068c82a750efc5888addaac2fb56f28d4e78c6118459 SHA512 8b40473f890a2380a019e568d42235f1986e04526299e4c486e4b913253c9af60ba6fb02ea7db2fb6e38777e357bc378dd8c5c7c12afb40034c1440e00a85059
-EBUILD gst-plugins-gdkpixbuf-1.20.2.ebuild 469 BLAKE2B a43c6bc2630b3e3c17b36a34c0b5d12a403ea05bb9af9e8901a60573e4362a0a3fdb6f598b66b5b15a7bbf29abe2a4454095234911ceb172d756048d4b799402 SHA512 13197478e536f10d24e4edb3912bf97303b736cdd874ebc8c0e4810e40293b6f5d039ce4e048c699643c87bc1d9848c6154c3eea12fb42e1468b19a64b75b206
+EBUILD gst-plugins-gdkpixbuf-1.20.2.ebuild 467 BLAKE2B 34eaebf401726487acb0bff14e24b0c6490d0572d11e9e8a83d36b961601ce21d58bb2909fa2dcd39eb27ab28dcbfa8cedf789b1a9c5ca839e58a6d2d30570b8 SHA512 968c65f1e5a7645ff68b60759b11918b0def783549f56d504b1a0e779860036629408785438ded838d308f1d5f6e60d6f162642ddbaffbc7aa622d6a7d2a279a
 MISC metadata.xml 611 BLAKE2B ef8ecef60b33cc7ea30268d033d248507e0e18795a1d7856074a3a2bf07c1aef8865ca9d4590d91e3fb0bed076af4b8171e50dd4a88efd9931830f5e25299357 SHA512 a6adad0795f752d27e32b5460ed72bda5ef970d5a6a223974f1ee377dc0a7bafd0007d3294dfbe90ae3a8e4583e96c4fa9f2fec864ba325fb5c4d092c6bc2b8d
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild
index 1b90270538e8..deb769dde64f 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="Image decoder, overlay and sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-gtk/Manifest b/media-plugins/gst-plugins-gtk/Manifest
index 04664891b7de..024ac5f0904f 100644
--- a/media-plugins/gst-plugins-gtk/Manifest
+++ b/media-plugins/gst-plugins-gtk/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-gtk-1.16.3.ebuild 1179 BLAKE2B 7aaf5ff28b98509fec7816fc782741
 EBUILD gst-plugins-gtk-1.18.4.ebuild 1194 BLAKE2B f6d9ed545840fa1d7468c8c3fa4785c43251495e9c29ab17cf359c47e303efd60a378cca98bded929633e225ce66e8ec1c08f0cdf4943b1729d6489a5d6dab1f SHA512 450d4186dada48e10e5ea35c5b3fce3983b25062f66f6d49b5d00f92c4bd4da2d2593f240bb398375046242cb6489641e4f07671107f4b7957e451831b0f506f
 EBUILD gst-plugins-gtk-1.18.6.ebuild 1194 BLAKE2B 8a5ee3cd880b7981c90a9a008dbc69168ee98a82f2d503e42621d7930123de7a8bef837e2cbcdf86b62b3b9a1c85f339080fa0085ffe44d45b574fd8b86f1f69 SHA512 89645882f0c7108c4de271cc9da85aaef5d9bbd1fa59f0db8b4da0c5aa919db2a52d46ca855769dfe48d3dfff51d391d29133ca0c95052423701d7a391204acd
 EBUILD gst-plugins-gtk-1.20.1.ebuild 1200 BLAKE2B 07d7d3e0b3c1e8f44d1d01b44949fb629a09b6a18ed80c0630afb1bea68dc584cc5984915618354d51354938b8d0c105a76746602f701a3dc1294b554d15b1b5 SHA512 d0e4b8982729218df949e404477414fdb90f91ab751f4e77d7e82ac2f0baf147eeea195c7876df05462d1addf915e5d7cc0bbf312b05078f520fd7518521d88e
-EBUILD gst-plugins-gtk-1.20.2.ebuild 1196 BLAKE2B 2cb1f51354acaae651306e4cd3ca58349a5a8e93e401f7b611f4ba376e2d6343e1daffd01774806186ec345af896d64bee1098ac0a026d6d647406b102037369 SHA512 81f1e7c2006767989c6aaf6aa4fc83bf26de87a4d48d307bbb57f84fff19a4c2de1905f3670924d9acea9765b4e1920efeaf0ccf9778db997cee43a2765fb070
+EBUILD gst-plugins-gtk-1.20.2.ebuild 1194 BLAKE2B 8a5ee3cd880b7981c90a9a008dbc69168ee98a82f2d503e42621d7930123de7a8bef837e2cbcdf86b62b3b9a1c85f339080fa0085ffe44d45b574fd8b86f1f69 SHA512 89645882f0c7108c4de271cc9da85aaef5d9bbd1fa59f0db8b4da0c5aa919db2a52d46ca855769dfe48d3dfff51d391d29133ca0c95052423701d7a391204acd
 MISC metadata.xml 791 BLAKE2B 5926a04f19bd8076a5c37efa479a13d2399c230295ff231cf6b16c2ba26da2d5082045ace8e27022618c9f2cf31bef986d664b3d9a795e029492f95ff000eb54 SHA512 b4caabc1551bb36f4c4e8edf70a88716ceeff90309b0268d7db59aa0fe8f4aa02ec3eb26d4cefcd0fdaaf8951c77c2cea57396d7ba0d30955de4db70e2200589
diff --git a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild
index ebbca43af221..21c9d3859787 100644
--- a/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Video sink plugin for GStreamer that renders to a GtkWidget"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+egl gles2 +opengl wayland +X" # Keep default IUSE mirrored with gst-plugins-base
 # egl, wayland and X only matters if gst-plugins-base is built with USE=opengl and/or USE=gles2
 # We mirror egl/gles2/opengl/wayland/X due to automagic detection from gstreamer-gl.pc variables;
diff --git a/media-plugins/gst-plugins-jack/Manifest b/media-plugins/gst-plugins-jack/Manifest
index ba1125666825..feb4931ebb6f 100644
--- a/media-plugins/gst-plugins-jack/Manifest
+++ b/media-plugins/gst-plugins-jack/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-jack-1.16.3.ebuild 354 BLAKE2B 588eecfa2ce2e32c7cbae7c477cab2
 EBUILD gst-plugins-jack-1.18.4-r1.ebuild 485 BLAKE2B ff976fff898919c35ad91806c398ae9e64c70778180cc1bc400ece83ebf51a03e77380e6b745245c742164c05bf55c634997b0260177805df8ebb6de07a06414 SHA512 4b10743ac15b8acbf2816be8797fcbc08b7f1fd3274baf6e56492f7e6af878fec20223b37362e2cfecc55ceef7ffb0eb599af7293e1d72263508e0210d92e142
 EBUILD gst-plugins-jack-1.18.6.ebuild 485 BLAKE2B 1acb9a62f85205af67c9b2fd474f7ce1afc2c29cfb6189141c969e8762084bf3dcda9677747a2cdb492b7df6284b6632e50b6a8ab5dd8c4b3418f3c79009bd32 SHA512 3979e1c3e13f9be182cf91e9ef63472ffc9aa80b99960f2c01c4ed9fa79a3c097a2248b0e209bafe74d4a7b700f2943b06096a80cae094f2b64f93f096cd3de9
 EBUILD gst-plugins-jack-1.20.1.ebuild 483 BLAKE2B b6f3f9ef87a7a648503f7f6660423fccecbd503e5e26b936e2ef42e2103e081bb999c728008d8ccbac151dbf9c3cbfcd2a744d66f30cfe3cb2d317cdbed774c6 SHA512 ed7b2efcc0794ec7378ed31e6fa50da7d0076b4229066579ab40fa405317d3613142a8a11aad59babf97bb7620e96f16d344b5e18998aac805a9c58a6fbd0ace
-EBUILD gst-plugins-jack-1.20.2.ebuild 479 BLAKE2B 086f8b3961ae3dd200d79e6141a8b7d4e3b6bb78c8021070bebc3c839ba34f5ff5f2777dc9685349f4108afc88813c3e8076f2f71d6d967ffe3d3065d6e4f511 SHA512 7eac4a7141581c56315b89e218f28162e1044f75986fc1c80375d0537f6568b20eadd895aebf96c2cb82daee76c60a6626653fa3f6368440c317fb88a69a400c
+EBUILD gst-plugins-jack-1.20.2.ebuild 477 BLAKE2B ed3efa5c54d54db1939966209fd7b497e80df06dadd9322567f667cc9f93bf2a0661c5a9f809397d4587b57a6494775a11e1e7936ea3c3dadc08af39a076f113 SHA512 ae3c7cb34fd552e6203d01b282621aa8d6b03ce2c490c855909b2a27ea8781d6f81cd00090a03572b42ecb69c1a2293d9d323e6a5096d317dc34d2b3c18c3bd9
 MISC metadata.xml 488 BLAKE2B 342e74e1ed49bff874d7fb35c19f3c1492c31ea7ebf13006ae1d9f2ff0abe5e6c1292f8c5033f9c8609233e8ae9a8bb51bb600a95624643722bcb4d85fc030a4 SHA512 9d57b66877f623a7d50b38656f33082ee439ce5a04fa1b5dca67cef8dda03e71d5a7707981bce6e5e5a13a524be0b3b4b4ca806751c2618decdf12e7454265d8
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild
index 887dc1c810b3..6671eb6c117d 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="JACK audio server source/sink plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 # >=jack-1.9.7 is provided by pipewire[jack-sdk] as well
 RDEPEND="|| (
diff --git a/media-plugins/gst-plugins-jpeg/Manifest b/media-plugins/gst-plugins-jpeg/Manifest
index a3289e406802..82f99a450e09 100644
--- a/media-plugins/gst-plugins-jpeg/Manifest
+++ b/media-plugins/gst-plugins-jpeg/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-jpeg-1.16.3.ebuild 374 BLAKE2B 8952569f49957552269812901b8b74
 EBUILD gst-plugins-jpeg-1.18.4.ebuild 387 BLAKE2B 40435bc43e8c76e0be1c1e280c03517dd30e4ddb27cb8fc29d0a723f62a1a8cf2517b9e4231788e62f6954337571309e8dfaaffe3066785dfcdf5c0b5de04fc1 SHA512 a4ed56636f2c5ff41dea98826e092a3c1c5c2260e57f17c8c33f4388cf89ae5c32860694de4f7e1b9fe89e4021a21214aabe7c62b478a05d6ae5d2f72ff5ec82
 EBUILD gst-plugins-jpeg-1.18.6.ebuild 387 BLAKE2B 2e18f49a78ed40ce6c65490b6ccc1fc2d1b4e3b22794bfaccfa4c7cbca45fb0aa71163a0f4a6fc4b28d7409a28b1b7a7f2680e46efdc191301ff657319c36c45 SHA512 eb8375e3bb1cc10141773694c08c69a12b2e63391c46548f2aecf2e04d1cbb3d09f115aa80f060b767dbfc78c55b5d648d1a63c66613ea1b529c6324bcfeb2b4
 EBUILD gst-plugins-jpeg-1.20.1.ebuild 385 BLAKE2B d233cf88f1b7a843ea1ce6532828c5db6092fc6a8f5a50536f5998d726078b99c725b03394b28ba796b92c02ae4b8c64f34cd77457215c7a3b5fb61b12163450 SHA512 595505e48c61ed1a21141537e29b71022860276d555273e761cd1be2fbf1e0f46d64112f00eb7713ef238b8c31292c33df3aab229a2cac0d179e3d67c0544574
-EBUILD gst-plugins-jpeg-1.20.2.ebuild 387 BLAKE2B c318d75e1c4d012d01e6bfb0bd85aecea24b5a8b81c14e275fa86d127b18fa2336cbd563587276a7d913a27877634ebc4a7e46ef99917aa494a18ddf8c76a39f SHA512 de108a34391d8a278835d3ff84add16516436489bdb7be5e113917dfec1496c61f028050d036fa803a9f04ce00138c9b928a2555cf1e59453a6bf38290c94062
+EBUILD gst-plugins-jpeg-1.20.2.ebuild 385 BLAKE2B 48730a2629d065f820f43077c273657ccfb070a40088048734ba6a48ecacbf33cdedec6a908ba5e3db439e65768ea4c28eef1ca3d605061ebe7aab5840bae4f0 SHA512 2f49217654df102a4203992db2bd2864d7c433007f48f174eb56d41accbc44ca2f055b2bd4082fc237254ef0e6d2709b15d21c8b63badfe0c6ea055f69901c3f
 MISC metadata.xml 660 BLAKE2B 3c04b23dc1137c3e3f726bfea150737939ad5b22b8ccd4964823e41db8dba675e46d3ed14de09077e6431794e4be9bc38ee42d094b105f24cf3cea26c8c6a5b0 SHA512 491bf8ece75726026a51476a85cecbc5461960ced3f09f58ce82997267e8445680241aca4c360a2fe5014eea9c8e0670d2596244b2deee2deb27aa21e1524370
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild
index 90f81996701b..9a2f0ce6b964 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="JPEG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-lame/Manifest b/media-plugins/gst-plugins-lame/Manifest
index 02a4556dd998..72ae4a314bb2 100644
--- a/media-plugins/gst-plugins-lame/Manifest
+++ b/media-plugins/gst-plugins-lame/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-lame-1.16.3.ebuild 374 BLAKE2B 40329de5db81d7bc0bef99889b1b5a
 EBUILD gst-plugins-lame-1.18.4.ebuild 387 BLAKE2B 4e4716639593ad3777e7377fd7e7081871a5d18c19f807c197de92982b14af12c7d7f91b283f8c0ee9696cc76ae453e4a2a9a2c38481baa0a17aede322d55a95 SHA512 73939a3878b881b175ba7f47d1c8d889fda3e89f7dad233bd2934d740e76b800e6b7455cccb775c89436befd943bc7b2e28eff01a9fc957e12dd207649338173
 EBUILD gst-plugins-lame-1.18.6.ebuild 387 BLAKE2B 16152a3094ad3f3a5a5614a1e615da4214675fcfe6ed4220ca3f4c3189a2230481473c2a89d7558b2718ca61cf96557d8cdbfd34ffc4918c8daec178765927ea SHA512 e66db6750a8fffd0e126f9289e7b10ebad4e0304e6a3481ce87d7e52189ab5909b06af0c91dd803782adb30bf5ab58ae4f6510f75622b857c7640c275f9258b9
 EBUILD gst-plugins-lame-1.20.1.ebuild 383 BLAKE2B a726f992a95de75cb3be265a0f9218bb2ffd10515c577dccfa6b5b4ecbb793abe1e1b5f5a354013692c4782ebe78a0088d0470283e8efadd21df21079d91b691 SHA512 6e09150896be7b3abbf8a3ca10a2923362cb6ab29df5c1e7cee3ef2e446d495498f4dd2ee951f3cb69314b2bf85bd56ec02282576ecc336e1bd638ed37131b62
-EBUILD gst-plugins-lame-1.20.2.ebuild 381 BLAKE2B e0ad1f872cc85d288b9bb171dda80a511b6e66d7c9cfae6a0f270e481c98783cd9d38bd6fa6d303ac6063918fa0a05c93b22d10c692293772f22501d24c2679d SHA512 23172b884ca2e6453e6185deee011ca56c908e6c19a138dcb646a79ab6d62eb344d5127b1a09597b89ec82c2b6d253e1961e4eec041ae48af690d9737615faa3
+EBUILD gst-plugins-lame-1.20.2.ebuild 379 BLAKE2B a1778fc242e2e4f23bf3a9935d68b87d89c08bcab75edeb8018448774cecf2274d63fbce7ddc4f276625f20433637fbac789fc2a8bb47eb20b627c1a4addeeca SHA512 fd853ea3b8fa54693733535083dbb187ab3f64a8fed2f2c2015275fdcdf4cb14bade5264f428fe31637b3275015bf154c8b4a205537a0a7001d766e99ffb5165
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild
index 255f9374d374..20e665ebb351 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MP3 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-ldac/Manifest b/media-plugins/gst-plugins-ldac/Manifest
index d9ca12b67413..31f0808550b4 100644
--- a/media-plugins/gst-plugins-ldac/Manifest
+++ b/media-plugins/gst-plugins-ldac/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6
 DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c99f14f6d63fef455feb1ce90ae518bb9f80fd61bcfb223c20407b8d6240faaa93478495f8e9fda16fab36a311d167e88e25 SHA512 3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70
 EBUILD gst-plugins-ldac-1.20.1.ebuild 333 BLAKE2B 9919503c916e24b37ae05a99cdf3689aaef0e1790cdf15db8597739ea31cb82e4827fd9ea8a0d93e9efbe6156227ba98b76992431200d747581fc69b623bffd9 SHA512 0f70c73443c2d9516c7a8a13058e2b0e0c1749e7dbb1706acd0ad5990077f0ac68f357444f2d8f1560442f2c66ba76fd93aef3572b46f9556dce07d24d845968
-EBUILD gst-plugins-ldac-1.20.2.ebuild 329 BLAKE2B 4a18ccf2265251f437c9da5e4e4dbb8ff723d8985d08c86e7fca7b0a95add50d7ccb68c031a4ca500b332545ecb32e2d81ae29ee3387aae10ebaa8eb341a85ea SHA512 a69ff50fcc6238284f24b883bd94e6ca2229d4dbd911ee55abe11a3e287e1f9beb1c61ce8dac696303db130effa19cf1318a3e3d393551d869e19dd9b4ec2d31
+EBUILD gst-plugins-ldac-1.20.2.ebuild 327 BLAKE2B b0df9eccb33196f789b962fe536cdebd0f19222d2b5aad0a1afe09fe285ddddfee30deeac95eed143184366ff605fdf32686de4c93a62d778ad27659987f8831 SHA512 dbebbf074105e3cd868e13c889cb507e8e23465ca081a5f48dac7a011e567106fa170a0535494217695c93b8693962078bfafcecf2caf328d80c22059787ba1a
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
index f5fd362bdb4e..d54ea51281f0 100644
--- a/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="LDAC plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="media-libs/libldac[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libav/Manifest b/media-plugins/gst-plugins-libav/Manifest
index 788ee04404ed..11ac619085fd 100644
--- a/media-plugins/gst-plugins-libav/Manifest
+++ b/media-plugins/gst-plugins-libav/Manifest
@@ -12,5 +12,5 @@ EBUILD gst-plugins-libav-1.18.4.ebuild 869 BLAKE2B e47b8915fb34d56d98f75b5db1f03
 EBUILD gst-plugins-libav-1.18.6-r1.ebuild 928 BLAKE2B 452c347e51ab23520ca73fbf8dfe2397fe331d802436228b52d3ed0f6c4d1fa821dc399f810396c224f6e046d70d1f5c5a4a5a8b2afaa2f695adcc777f9ae491 SHA512 c0ffe6f320170c8693bf30b5bdc809b6d98426439a91b8af3a0357291b62b22acef400b37fc0fdbb8918b90a8bd5b1747914b8a2b83c55b980cb083c9f701ab9
 EBUILD gst-plugins-libav-1.18.6.ebuild 776 BLAKE2B d8f4d94008175d00f9b377e0b4d8143a32c69d1310e3d099ed8cf7676480598152b86d00717b0d730d37fd697c92cbe4d6dad2e10734d8facf7c3b9f3f1d443b SHA512 a063a1e036ba8aefe7b4c3a867f5d3e311707cfd85c27c87a593897683ba9ceb794610e60e6f3cb2aad63b6693126383e0d18a3e35a3c5b4db90c486052e5588
 EBUILD gst-plugins-libav-1.20.1.ebuild 779 BLAKE2B 19df9ead90ae3d9152046216255bd6473c83b510abd8b142bd4f173d2e1aee6d04cb68326b32fae717e4fea4bddece5478ac4eddbc7530f80fe3a7670e0a6b7e SHA512 c2e751e0683ba9166a7a928d6c38c433c711caab35005793b5548bb4988801cb92df50daef46055ac6472ca1f4ebb53b55b4a723fbf2d0ffcd2713001d6dac2f
-EBUILD gst-plugins-libav-1.20.2.ebuild 775 BLAKE2B a1d3973503f95494299acef0da164760b36cba93f17ad85cae71a620c9ab77e482aebd6283d65b04a975e547b4a75fbea7529a9360080c9fba3b63bc20d19a46 SHA512 cde09a3d3a23350c3a5fc03094e38389554af35162f9f29fbd1d68efa6c9826f522a68789cc68892771b24f18181ffa8e2089b8e256e37bfc3dcf1fd88b0b014
+EBUILD gst-plugins-libav-1.20.2.ebuild 773 BLAKE2B 96842ba4934caf66e14e509fff1fb8fee694c9823b55c4065a3db2581c273d93b333e46334bfcb682ef465ee514de7a24c2ce869d071be925506dd701560230b SHA512 825081a533ca131a5fe82b0130717e8dccd63318883d48d653d08fb7312edc0c3ce71f34657c5e8f42bf9bde504c53ee5ced1571d6a84920715bbdbe030c00c1
 MISC metadata.xml 267 BLAKE2B 331be70b2fa90cce1bf91ded1dac141de6a9bec40c1736bcb90d280ac7fabf22cfd0a701c7fd5864f007d1159954f7ee55701d5e68b47a1a9a217ca34b7ee619 SHA512 4dcdd6bc6d148a0e02a0f1b766bd0c5712d373d898c06078d8630e0067e858b815117392a11332b257156e95da6337494d99c2724d24cadb97432089908644b5
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
index f2fc4dc31d2d..facd70c3cb1c 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-libnice/Manifest b/media-plugins/gst-plugins-libnice/Manifest
index ff0cac1fe07f..05aca26b9b37 100644
--- a/media-plugins/gst-plugins-libnice/Manifest
+++ b/media-plugins/gst-plugins-libnice/Manifest
@@ -4,6 +4,6 @@ DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
 EBUILD gst-plugins-libnice-0.1.15-r100.ebuild 1663 BLAKE2B 1d76f0223d291e6be4bb2b94e8c34539f78a3fae8eef212c76884e59abfbd970ba3f8127ca13ed6ef1e5895ae7911403ae11f3be16683b50a045da73a86b3e2c SHA512 28f23f8bb2f117e9f52c3d2e90d15e6300150676edb2db33942c74ca94eb35940f30e4a99df91440930e091f1d9f89b8db93d9894fa508c083e3dd3c30ccdc03
-EBUILD gst-plugins-libnice-0.1.18.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
+EBUILD gst-plugins-libnice-0.1.18.ebuild 1231 BLAKE2B 8014b3bea118717dda0bf7b6022611e2bcfc6ee62326beefc7a04795683c1c4f37d7de735047763a81733e9576cf3b43b52e1d3d2fd75909cd3cb6e558270ca1 SHA512 c0a1ddf67dc1eb830beaab589d5a20d99bc0cc492bedbe40c42d8e4e6300dc69675725fa2d142545620ed0f6047747888142fee5886343dbf64deed4ae71bcde
 EBUILD gst-plugins-libnice-0.1.19.ebuild 1236 BLAKE2B 0b838016fa8f83e5c136f85266729af551b1bab083292c88c3b26875ce6f2b8457bd6aedbb13f9da990cf84db08db673ecfea2cfbfa7b834f3dee38a433f1fa7 SHA512 66da3b6c3844e5515a355e30ea5db1e01792d9b974b322245225661cb3864243ed40f4107c62ab78e22f7cab31fb35a89c0f5225f16d20a49fe07e4b4f6fdd8c
 MISC metadata.xml 373 BLAKE2B 440aa17e59153e87321e231c92b943329e7726c23255fe76ba8934b34e8a636adda880e90bc3ac285609cfccf6449dbff02dfe0ec6b2318ef039df4f1e780c8c SHA512 a92cce75c15b414f1821cfe274c78717f68c1b44254d9028934abc652ccacd8ff2261105aaf0b5c688e58c787d434b1358c0a5c239ad2ec7625d91de63dba0b1
diff --git a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
index 99b81c3f7797..88425f65b5b8 100644
--- a/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
+++ b/media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${MY_P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-libpng/Manifest b/media-plugins/gst-plugins-libpng/Manifest
index f8e1a360c7be..4e949702870d 100644
--- a/media-plugins/gst-plugins-libpng/Manifest
+++ b/media-plugins/gst-plugins-libpng/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-libpng-1.16.3.ebuild 370 BLAKE2B 7b54fd7718d84da3796a2e781ede
 EBUILD gst-plugins-libpng-1.18.4.ebuild 410 BLAKE2B b86aa7650260e9e4043a4008cec658ff1f0e0e211a1db9ed44da76e527cedaf4efae5c3c3ae880635a5e1f8f7f0743b3c85dbe07c170138cb57a95b7d7799ff3 SHA512 3a2fff3712792cd3741d765ddc63d6439155f571b9b27ab7fde064d7fd269ed567a86ac7f8ad8cfd925b7f326c74363b0a109307875f0c9cf9091cfa3a19afed
 EBUILD gst-plugins-libpng-1.18.6.ebuild 410 BLAKE2B b1323d3809fe18df63c811719113d6664148a53b69f5b299a8d4131b4f274155e0164e10db55c21e3be19bb810a0c0e1689730628096a1249f130829b8ef4299 SHA512 4603aff0abb4c9ca37c2c6c8e6c2d5dd4e9312d1a1bd9429979807210e10108fa55c21120659a15883d0e71adac4cf46f4b7f99b5b4c59bf895d0acd46e11287
 EBUILD gst-plugins-libpng-1.20.1.ebuild 407 BLAKE2B c9e29252c65df5ab60697fcb6493a8286bf901e703065518a740cb5e11bbff19ceefd353c788074deecae4cdd88a85d9ab59c9c1341cf39e1433fdf77f6c8b51 SHA512 688800399ed85e150f350f7f3ee3e61015f065e1e495093ce1911e174a69e35ed2cbd4a427a102c74294d887fad99ef84dfe5927639a48daa957eb2d52a1994e
-EBUILD gst-plugins-libpng-1.20.2.ebuild 404 BLAKE2B 57862f75182ff9220cf9cf1bf47bc8a850e275b9c83849f524140c051d53b1ae2ae1bd44a992be65f068a1e5146caa7c6b0a38895973fb2de736a206442639cd SHA512 ce763b063a7f00a6fb9365a1f5156a0206d63717ce98e267aa09a60efb2662990008f70a59d34a8916b6aeb0b30bf9bce51e63882586c36a9c5d5b88ce05aab2
+EBUILD gst-plugins-libpng-1.20.2.ebuild 402 BLAKE2B fc70ccc253c3a67b89be9b67ea427eafc35282b1a3c1e570ddfc353599d8d870ab8c3fa4b55e8025483e46d8ffdb0e1d05507e4dce9ee707822f63384f543cc4 SHA512 92e56d9943616a3ca030393ab32cbca34d9ec55a722aaa360cfbf7940990661dda6763f113162927128d34ff6488b3de5b5ef83d2aafac3a01fc73632ae9dab6
 MISC metadata.xml 484 BLAKE2B 39715acd23f06de3c5a0e7d46c75536018a122ff76fb537ef27ddfce3c9a8d8c97d435ef5393741b7d0964b75a7bd2617624f4f3173854ccc52beab06bc6fbd5 SHA512 916d09e2eaec4682390f0f530c8e3ce04dbe91c1f585ef45f3b33133774819667d7f3de33d5524000eb553ef87885ba9a026d669d3f2ba61ee93926044b992de
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild
index 279b5fc40431..e9b372ed683c 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="PNG image encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-libvisual/Manifest b/media-plugins/gst-plugins-libvisual/Manifest
index 92e3d0fb569b..2f44887b99f5 100644
--- a/media-plugins/gst-plugins-libvisual/Manifest
+++ b/media-plugins/gst-plugins-libvisual/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-libvisual-1.16.3.ebuild 615 BLAKE2B a216cc64f7e2937f6f3dc4db8
 EBUILD gst-plugins-libvisual-1.18.4.ebuild 644 BLAKE2B f56be2f60156c328510097652b419ec76f2c42225217396b86949cf625902003f48f560ba7825c51906ea63bc1f2e0cee29a63957e446353b1d0fbb4f3167dd9 SHA512 87e8d5aaa53bd7f20089f44597e58a55c156333b532453da9a2258e9dab395bcf70eafc83da934e7a50e6c70695f84983145954832d573e438d7d64541d56ed6
 EBUILD gst-plugins-libvisual-1.18.6.ebuild 644 BLAKE2B a2f313b3e6c38a8d5a17bfb253dcecc1f57f2e909252e440f79cfbd6a0624a05dab1e39a480481a08f755362c82815708cbf9d2ce3b72235edac9fd6a344b89b SHA512 934a702ce0f40a7d2f6538d1e40160d1e0a9a94cb7327c061ff1a70cf574fab8e7466d513ac959fbf68f4c770780569d224908ab9dc4c4e058bf25bd6abe3728
 EBUILD gst-plugins-libvisual-1.20.1.ebuild 640 BLAKE2B 146db247165471745078c13469e72ef50487c986682ebe8b61bb1853e9660b6cd37558d6dc7a45e1276a9d4e42ade32e376c5a9adc871d008676d309fadc59c7 SHA512 21918fcec10c62dd7c7e999d671bd8471a59f90228b359235a4c6969a48afd95faf2bd145c281e1a434ffc302a7e03eb7102443775581ea1ca6570ba2e27d201
-EBUILD gst-plugins-libvisual-1.20.2.ebuild 638 BLAKE2B e80e6d899f28ea67084d7a8235eebc44356192371771fbbd9657eade0c9a2a5b494ad89c87f71b75bcbfeeb2996983d73a2b852a8768b5b01f045c8d224fd3cf SHA512 4a5e25b1db1d7e2f9d3deaf3de40236c8cae66975cf689b4f7cc68f5bc4f58dea504bcefff139b09c217e02548d4778a279c040c130f1616ee9185ed14aae107
+EBUILD gst-plugins-libvisual-1.20.2.ebuild 636 BLAKE2B 0f011f1218b4f974a5c58ede4e7feb77d81862ddb9b9ca1bc53bb16fe5aa78c7d1f1262d1240f15b1aaadfeb828ebdd1afe8f5bda93363f7401e9e59dbc3641e SHA512 e7558e729fda10ab8741e3a52aa74149925df931c06031f8097e0ab62b0ce424959be40d8aea68fb5dd42fd0542f3ba6e7b7ac577d344022c96cbcaf747fb123
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild
index 6d43f003f86a..dfb985f7affb 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="Visualization elements for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-meta/Manifest b/media-plugins/gst-plugins-meta/Manifest
index 4e080bfd954e..0e052093dbeb 100644
--- a/media-plugins/gst-plugins-meta/Manifest
+++ b/media-plugins/gst-plugins-meta/Manifest
@@ -2,5 +2,5 @@ EBUILD gst-plugins-meta-1.16.3.ebuild 3756 BLAKE2B c1d47c34e6ec4bae156e5bdf3b70a
 EBUILD gst-plugins-meta-1.18.4.ebuild 3763 BLAKE2B 30e008039a7a3520e15713f28e721c18fd37f4c3e814dc71ac1b8aa1565cdf9ba8458a76d96c8b427771dfe66d7dcfa7548f21d624af598f8339572e64a26477 SHA512 145d3645bf653524986d6b50184e34478bddc0db99c9a3644c668488390adcc940580be36c38ef5c3cd4aa3e9d685264b57c69a9af2c5a784248b0463a5685fc
 EBUILD gst-plugins-meta-1.18.6.ebuild 3763 BLAKE2B eb4283bee3e188c18653853527d0785001dae6fa7cd4a8f6e2e47738741c09a8129218621ebb8c1858afc1821a18132447b7da92f4d8e0562a8d32ac3a077278 SHA512 a52a761e85d639835cb03594e3c5a3d205a79196eb7f7a76a0c234ffb062805e7ae466f76bf3f0f1b62eece24202263100b29f3e2cd6c6fac678cc9854468061
 EBUILD gst-plugins-meta-1.20.1.ebuild 3690 BLAKE2B 6b588eae5df5b2e8e3e4872520a00bf97422b8fc24c0ea400c7c08ec7a0b679cf6ffbf8f514430f7304f5c1f5af1c51689c57c418104248afef56d057103da40 SHA512 ef35c908ac8ef348640253a135f1debe6575b56e92f3c711f2dfc1363eece73d902261ebf9daf80480fe0128cede3f6dc50d3366fb631fd9f4377c4ff0125cbc
-EBUILD gst-plugins-meta-1.20.2.ebuild 3686 BLAKE2B d490d5b6dfd6215256088b8f0188ad979f38acfcfd43b992dbe3332744429981547dfbe42588deb2bf92f1b0ec6739ef63ab8a67ed3aa02a0d243e8ed58eef80 SHA512 aea86113a08a9f0054c1156f0548bd69a00872b56a0840ef7e16668ae5d89d7ae768d0d13015f37a652aeda966381d80f42b5eea2f7f5b265452d15fb26f1f43
+EBUILD gst-plugins-meta-1.20.2.ebuild 3684 BLAKE2B 06b658996343c983c3807945018df2830c91c20d69e1e1bb27bdc742c0417961929e63aab056dd9fbb43bc7f965b299db02fa579f627313ee579154a9dfb758b SHA512 72e4d4e1e4e6c32dc0c4fbc832521e757d18b12b74cd6db1869fedc3810c7c97ac0340e29279ea5ff734a9fe9a5096cfcb65c3fefec50ae29ced7500081d46ef
 MISC metadata.xml 887 BLAKE2B 4c4239a5f3011e3b0a2e24b4cd40af9147f6812842544b3289edb69405e5ade23fb53091169fd0929b4eff8d2fc5d69e2d48e544b03bce1e8b5fd617eab0bef9 SHA512 9841adc0180bf7f9514dfc1789fc374ecdb004063b6748cbb7f881f0d901a87afb1cf7dcefa4f1bef070e5a66412a15698345b573aba4f7a6b036e3f5c0e0420
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild
index 88be6ef228e4..89998ef2af0a 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="metapackage"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
 REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
 
diff --git a/media-plugins/gst-plugins-modplug/Manifest b/media-plugins/gst-plugins-modplug/Manifest
index 80794b2b6709..71cfc67dc9d0 100644
--- a/media-plugins/gst-plugins-modplug/Manifest
+++ b/media-plugins/gst-plugins-modplug/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-modplug-1.16.3.ebuild 366 BLAKE2B 8110d65b276382f98119fdfcb82
 EBUILD gst-plugins-modplug-1.18.4.ebuild 379 BLAKE2B 05c6b6609df81abe9e6744da17e62cf94ad8d3dd94bec109ed1d9b6ea3dd3b459491486b62b9313b5f7cdd17c3af13f300490e4584be8861bc9153d8380f5a96 SHA512 cfa0e7654344964669dab03eb9298ddd7162c6098669d6ec28cb190bc2737f122d284f9b76d26aff4dc84603181607eee3e3c6735e296dd002e89e46e851ba73
 EBUILD gst-plugins-modplug-1.18.6.ebuild 379 BLAKE2B ebd30889c001c9af4de61659477e4eeb97dd31627ca4a973431eafb20690ad99017e6339c904861afb8561bea2b9c2ce2f3262e9695d124a125ecc9a682a5488 SHA512 7a5866789f10682f17045184801498aa892aa9a8418b761d657a0693ae11d847e42dd76d35a5c98eaa0793473a8620eb5634a114d3e778b0a7a7a7e7b6f3b9bb
 EBUILD gst-plugins-modplug-1.20.1.ebuild 376 BLAKE2B e5257857287990f9d086352f7f48c324eca9b78d5caef5bcdbdf02a19429ab48ef34537641d247833a0db31de0f19029f7a1810ba7049e67df268bf5d66237e7 SHA512 96920d7a9e2721d177b4e87bfb856640d32c70142e96d68d280f7bb0937991e3fedee895aec86a6433f140e316e772c97704e4051d17c380a966c06649d08226
-EBUILD gst-plugins-modplug-1.20.2.ebuild 373 BLAKE2B 873aeebd1895abc77ebc22460db2396512300765e923ac0cb8f3424ccb9a2f94f240e54904c6a8e89f8b43acaccff55c111ac11a138f22ed1ce3efca2535a8fe SHA512 2371cdf19f6862bd8fca0f1f9ef58efc35c45d0eed3da4c9e4edfafe5937843e821df2abe6274cd0e02b3406d72b2dfbbccb4305892a0884b90d1b5d4330a117
+EBUILD gst-plugins-modplug-1.20.2.ebuild 371 BLAKE2B 06a3308ca3675a58038e534467ed16354e0bb0340d56f404a09450b4f21a30afb4fdc9da247809ba5af597efca43412ace52af232bc86301d2aee73b289dee17 SHA512 9e66b8a4052a0dd6b6311a6139aec3b3fa00907c0512a55a7e1199280717a0b50f72da7fc27e26b369befba46d3c8ad37145d0e33adefb5c6ad3773200922ae7
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild
index 10b3c48062dc..cc9887a17372 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="MOD audio decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpeg2dec/Manifest b/media-plugins/gst-plugins-mpeg2dec/Manifest
index 8abb3947a777..cbb281a2f7ba 100644
--- a/media-plugins/gst-plugins-mpeg2dec/Manifest
+++ b/media-plugins/gst-plugins-mpeg2dec/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-mpeg2dec-1.16.3.ebuild 400 BLAKE2B 406c82f6602cf1b03ecb741a45
 EBUILD gst-plugins-mpeg2dec-1.18.4.ebuild 413 BLAKE2B 09d5399355df763f462238719fc48c481f0e773462625698fa483f0449dab13c08bdb8475165dd9d7605b30b0fc196054d1813d7c9eccfba9d3d667e3c52a9d3 SHA512 da76e638da1b5501fd9cd671330c8d96fb1a97ac5dc44c64918ea2a448c71ec9c1c3e4674ca734e4651b82a32db73472043c97b3282f32e1c39bcf6a25e9c84d
 EBUILD gst-plugins-mpeg2dec-1.18.6.ebuild 413 BLAKE2B c7133403e0b07d9dadc9822a76430b98c362dbf28b851bddbd5b01e577fecfd225c004ee4a46ea5bec48a43d0e989435d9fa41954eb612808218e69bd7911ba8 SHA512 4981aab49cf46d9570bde58b8bc0783d50295de0300dbd35cba305839de5a22b99af6c2fb2c82cca231a60dfeefb3c2accfcb2fa918daa5feef6a63fbc177b39
 EBUILD gst-plugins-mpeg2dec-1.20.1.ebuild 515 BLAKE2B 8fea42df73b8a172c1aed0bf174113c1ea5b2443909f9cf85f5dc2c55d1bdcd6cfc5e53a765305ef68b3529dc4b854cee4333a97ba93ea4c68763a318a9b0624 SHA512 17c7e4bc48c2ef726f13d8f63db9881720369938d5ecb2b8555f0984d9e014848f5f6382b293f49b4b8d6a7bcca3c13d27942295d91af0fc7e293a8ba2ae0e93
-EBUILD gst-plugins-mpeg2dec-1.20.2.ebuild 511 BLAKE2B 8d265f5418769cf5ad777473c05743de4cda1dfede04e953df3123ababec03470076fef777d56775b39b7711cb95603e770d62f9ce07f9daf29a90828b6f5ba7 SHA512 7e9bac868b886044c2cebe77f7845d514beb1ad7b6a8fd17fdaf61915a4b16c7a0b7a02790908fd941529011ae29118987ecccd185ed77b661e40746fe3df305
+EBUILD gst-plugins-mpeg2dec-1.20.2.ebuild 509 BLAKE2B 0f23bc2f8076e6ec82c1ffe874958dfebc45926295973b93164963bc2dcd42360ecfcb1da7cb5f7615650f56f83dc3c2db98e261cee3e1a0de99d4279a8b72d6 SHA512 c4c4e6f9f3bec2765b426689075a1bff1876e74a8806eeafb8b33be0bb26c66b62dd0103005cdedb72772789c1ffba903c6aa51cfa19bced50b6d4c478ac7efe
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild
index e594ac2323e3..eb3928ab3584 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG2 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-mpg123/Manifest b/media-plugins/gst-plugins-mpg123/Manifest
index 0a45e426767c..3b7b74f147f8 100644
--- a/media-plugins/gst-plugins-mpg123/Manifest
+++ b/media-plugins/gst-plugins-mpg123/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-mpg123-1.16.3.ebuild 372 BLAKE2B afa83a3e476c97a7954bd4ca478a
 EBUILD gst-plugins-mpg123-1.18.4.ebuild 385 BLAKE2B ee3c8398d26753f3b9654840a5b1d508e88cb7ea92f001e7cad4e8ea3883e08926b589dbaed50ff884fc6bf7e9fa927a269f0a4a937617e174ed600beb85cb9b SHA512 3ffdfc134f06eb27afe0ba68511bb0991d71db9794580d2e0219f9f4ff8f7c9d0e1d5479e966ad29dc15297e2e28fe74ef19f254763b1b40bcb2585b68100238
 EBUILD gst-plugins-mpg123-1.18.6.ebuild 385 BLAKE2B 0dc9c0869f3e9558e3e5ad6ae5ef7ca91f2ab5fae097d0c2e16f7e0b7502b8d86f3c77b4ee41cee289404cbf3fe3d08abd94f3aaaa0879fd1d40f3ad10438268 SHA512 d97c0830780b5cbd6064c7fae3d2d55f2aa8bf0f0bbfce56c4a33c86e62e06ff5de86c14f56b7e6337295ca3ecf221921faffe76b7909ff344eab1816c3cae82
 EBUILD gst-plugins-mpg123-1.20.1.ebuild 383 BLAKE2B 089639e4b20d5880b390d26da8c52269ae5fc540920fa81101f04036b48ecbe0c55a5155946bfadad5f30afb2821a00909bdaa818b8f1426b8e6f944cba13120 SHA512 01c711af962f9510410e37e73cf7b7491ccef7ddaaf6687837724fa02114cefb34aa2dd4dff665595ef1040e7104b167467d2769e061e278ed326cb27acf1e66
-EBUILD gst-plugins-mpg123-1.20.2.ebuild 379 BLAKE2B f3ed7cd2a4b94b11ba788ef281375a5d957ea2e3287a4866b584067fc357e3dca17411edd2d12cf199572aec4c6ff48f716a16074c70319c473355e39766faad SHA512 3adbbd5d7c60c5ce517743af1e00a0627831b96da5ad29f521c4221d14a2337e606127985b4532be10112b5b4c91a43bc357275ed78131d29adc3d272ae5e80c
+EBUILD gst-plugins-mpg123-1.20.2.ebuild 377 BLAKE2B 9b90303ed67fcdff83de4a33fd09317a75559b05cc4d896b832b38835553cfd3f6664fe0b70fc57e4415a9dbd94337576cd8101251cbf63328d05cdffe39c8f2 SHA512 d259ffd9f7504b50c2abd5a837d90b492a24a33dd02cb55e7d48bf64dda907b85a39b2a1055376342f10e21ebacaa5603b374ddaa5d4ec604c64c54a3dc5ba61
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild
index 8a754bc239a6..e28aa778bb5c 100644
--- a/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MP3 decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-sound/mpg123-1.23[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-neon/Manifest b/media-plugins/gst-plugins-neon/Manifest
index 7528c6620a6f..c6355c311542 100644
--- a/media-plugins/gst-plugins-neon/Manifest
+++ b/media-plugins/gst-plugins-neon/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-neon-1.16.3.ebuild 515 BLAKE2B 0657d8758407d680402aaece5a97a1
 EBUILD gst-plugins-neon-1.18.4.ebuild 389 BLAKE2B 667d0d85b21aaad2f2c601e4e6e9b2404c364690d10ed15cf8dd170614dca915477867472a74633eedd1c85389fe41a6a8c5c19d2930298db951136e86fd2875 SHA512 7d65134148b8f260b4058914b3fe1862bdea1c8181d6b51a99149748939c3ea7ab1a6ac186c608a4846c2ec57c30d7fdfa78f9d8c91414f1795de17da22b1612
 EBUILD gst-plugins-neon-1.18.6.ebuild 389 BLAKE2B 8a628b1f40e8f714eb15929a0a7d21cb1aa6d3a661fa9ec10bb5c30aad155280b024610f2a461b62e35f70c0edb0d4a164e521d18da84b2bf4e6f83dfc89c7b4 SHA512 c735d6ad99abcf60eb5927be4fe38bbeb93b3272e6ff7fc6547a8314352306f344bc64318fea66b9a8554e78a5cdbafd3c290e354c7eeb6bce75969b53ae0b08
 EBUILD gst-plugins-neon-1.20.1.ebuild 387 BLAKE2B d2297864cf245e9a0973f01d93fbdd1043f48e8e19054b6eece32fbc2787066748642bc1516f83941bfd996e145075a9138470a325599c0bda962b72bb1e9107 SHA512 b338a171a6062d0c261f182ad10da3d6780d5859123084855ada07ee50ce3186a0eda781f41d80e823907211cb56cc88f79208d441bdab7be8620e7f2956fb30
-EBUILD gst-plugins-neon-1.20.2.ebuild 385 BLAKE2B 976b2432d50358a45dca3cf79936b2f4973db20bfe8726c5ca6e2c581c61de84ff0ddd7246e3db78f541fff814f3aed194560e6fd85c443806c9389062bfbcc1 SHA512 b12a1f5ca43b3e40136ee083a37b20aad5af3c2c3e620f9ff952b03d0d5e508b1e32dcbbcd30f9886d1c4b628b4b8522624ec0c3bd807a2f5e81e845ab462644
+EBUILD gst-plugins-neon-1.20.2.ebuild 383 BLAKE2B 3a0bf76c249bd23b1381fadb8cbc0a1de7ea1b4a437ab3631d7049645b82ac5bc1dcdbede813e3bfda53987a06605f879daffd526e44c44b6e10bf60646e3075 SHA512 b5170034122c81b5f82fa79b16f1e0b781e9f76332b1ca66258353b81b65d6e7ffbf03e6421190dd4157dcf5188193cb075c5716de241f4b7d4d3ccfb933e796
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild
index ed4bb576c6f3..953ff8529679 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="HTTP client source plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 
 RDEPEND="
 	>=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-openaptx/Manifest b/media-plugins/gst-plugins-openaptx/Manifest
index 665223daf3e7..ad5c99ea054c 100644
--- a/media-plugins/gst-plugins-openaptx/Manifest
+++ b/media-plugins/gst-plugins-openaptx/Manifest
@@ -1,5 +1,5 @@
 DIST gst-plugins-bad-1.20.1.tar.xz 6212148 BLAKE2B e88f6553668329abb7b787c5efb89d760e60009fb9bd23884aa54e5a8de94f50b9fc9cd74cb2d303d43511207574f447bf616d8f9836df5dcde767c4ee5bff4d SHA512 3113fc93bba59716e7a506cf00f88cb05ccfe3406515ecf7e377dcfd3a8f4e555ff45126c048dc736ae6a28acf430c96422be4a120889fbe04ed69c5acb1cad6
 DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c99f14f6d63fef455feb1ce90ae518bb9f80fd61bcfb223c20407b8d6240faaa93478495f8e9fda16fab36a311d167e88e25 SHA512 3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70
 EBUILD gst-plugins-openaptx-1.20.1.ebuild 415 BLAKE2B c5f35ef643a35cfea203fedb12ddf72e6e513e43f4c765ddc6abc30ee4ddf113f10cce959964112e352ab578f15aeb1a17eb8d73c826f57ef386933354b82f4e SHA512 908878652703178fc0f3227c82d249692fc4a22346e1647bd0f45837d6abd93584983ab158ca035684f2ff8e786b4191756facbb7269d7d02ad8b2f23b0a0227
-EBUILD gst-plugins-openaptx-1.20.2.ebuild 411 BLAKE2B 37f991c933e756b0294b2b054dba10b02254b092f6aa2d39580853e3ea90c3f51ed194a802423d49b35a20917188d33fef7bb536eb55c073953ef28a8da72c4e SHA512 3a5dff17eea3b59a42bdce2901e79b04800bf1d291a7a1a6dd023a0be794c3bb6b94e2ba0c241621c2dab0ba0f8423953445235635a65ec48aa2d255f7a38491
+EBUILD gst-plugins-openaptx-1.20.2.ebuild 409 BLAKE2B 9df3ac46f141ff49d05726259623d1f1b3939b6172d70267c1f74271a092a78973e360d309409041e0a3a11c1b606b5ce348d13752ce0e107599f048d7eaaa0c SHA512 0d968606ca5f4a4f6d65baa673657daf9ed77993d06d7d329fc666fa55e561df20705c0c517e322c8f6897c9790a2d7a5807cb88442bc446e897c9f1abde6023
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild
index 269e3f36508d..d68276964798 100644
--- a/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="openaptx plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	|| (
diff --git a/media-plugins/gst-plugins-opus/Manifest b/media-plugins/gst-plugins-opus/Manifest
index 24317517e2c7..68bca7af3f3c 100644
--- a/media-plugins/gst-plugins-opus/Manifest
+++ b/media-plugins/gst-plugins-opus/Manifest
@@ -12,5 +12,5 @@ EBUILD gst-plugins-opus-1.16.3.ebuild 1238 BLAKE2B 7875e4a2ed5aba7fc3b2297ff0224
 EBUILD gst-plugins-opus-1.18.4-r2.ebuild 1872 BLAKE2B 4db96e22966cc2ab04b374e1c3a25e22a06ba2efbd342ba910309bff02a099fc7f1e62725e5f494e55d41b5a23f4d3814103c434b22870c0946704c6e4d86f22 SHA512 a4c05db2078536511097f5f114875004deb0f824bab7d916468b09738e80a3f107e88a5d187e0641231afa16897b077b597c0c22cfa35dc7a44d50c5fe691ef0
 EBUILD gst-plugins-opus-1.18.6.ebuild 1872 BLAKE2B 0233fcb98cca75b0208f7a819ed1f4424d96777d39f18300718c147c405ef0014f452df530497e35be9f49cc4641d3f2ce55d3226064fc8c50dfa38bf6efa297 SHA512 0144870a70282598ae2d5f7f7a892142ff42b5be17e0fb61f6125c432c0712a51662cb9471b730536cf0fbbfdaec443f18b150928925e0f97a732b264bb62557
 EBUILD gst-plugins-opus-1.20.1.ebuild 1870 BLAKE2B 713454ea8004ca7653da139bced510ff268caa8d6cab7f51b4d3586f5455128f86a21ff1ba7425f02a982647b1f3315be1dbbd4d056d987083fff57be4551bfb SHA512 c98122ce66a2616a8240fb0549680b51d6bd325035f35c0f8e3cb3e3fc2d69061c4d6e33f09007a45b7d7f8d04805f1bf56f8f89d9ff829f73499e40e338578b
-EBUILD gst-plugins-opus-1.20.2.ebuild 1866 BLAKE2B ec98779a7b2a6ebd3428f138c35094f307fdb979768260163ae6abfd9e7981d057a9196dd6e2f7c9b886ba62da3034d9f650a227a7af57a40fc063bdf4780e7c SHA512 b0fd75e4bf4e853682cd62df44e0bd3b15799f991bb432a1bbd283b0cc4c10ba6be35ff5f9530208c9a10983e27520c8608d632c63b76c62af71a006cf6d5d6c
+EBUILD gst-plugins-opus-1.20.2.ebuild 1864 BLAKE2B eff8eda9bdcabd09002a41732025ec458e3317dea034c1551c03b8fd056de6042ffbc4e361af7128ae1acbe3a702fd1cd66c1f5c4ef5a5d688dd9ef0d8974fcc SHA512 8eb08f7c70389d0971ee375e113ce633c1fb86c414e7bf416b479718adb606f72d2913e07eaa6b9830cd1b2bba47dfb1d3fca784fdf50162f79bafd335a9caaf
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild
index 6069b8fe6862..91e34b2c31c2 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
 inherit gstreamer-meson
 
 DESCRIPTION="Opus audio parser plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND=">=media-libs/opus-1.1:=[${MULTILIB_USEDEP}]"
 
diff --git a/media-plugins/gst-plugins-oss/Manifest b/media-plugins/gst-plugins-oss/Manifest
index 66b94fc3ed6e..d4b32b50f29f 100644
--- a/media-plugins/gst-plugins-oss/Manifest
+++ b/media-plugins/gst-plugins-oss/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-oss-1.16.3.ebuild 352 BLAKE2B a06153c5b1e73a3bf23d852370a4191
 EBUILD gst-plugins-oss-1.18.4.ebuild 365 BLAKE2B f9b4b27fd2e8d7bc1d3402969b137537fcfabcd1a9be9a570d413a16aa140776bc849b994a29f3503e735b4d620eb61960f698ff38ef26c23eec60b8679d16be SHA512 2121df718baccf4bf13eea4f9f37dd22e044f5c37ba011b4907018461d3c73fcae94836ff2f560040f6779b9978580041a3515bb5aeb539a227b5faa37db4370
 EBUILD gst-plugins-oss-1.18.6.ebuild 365 BLAKE2B 4ce27e7ea672b76b00ea6fc57c056ba7a6ddbba66ccb7f5c1c2b8f7fc67f574c40c1f66a039e1f78282c759e879aaeadbf19dac58e1bcd5c1b5013c0e47fe240 SHA512 0b8be83d9010786db4ea12a2b3f3abd95f42a33e5487ffe8525007c3e8230b324a58f3443aa2309b7dc94ba8e69d8e9da21e283503f3962c10df034b5ce9489c
 EBUILD gst-plugins-oss-1.20.1.ebuild 363 BLAKE2B ecf8de2739963e5b187a33eb735a3130510c318421e342410841b3c833d2b9c04a90b010d69d57f7ea40fa842f220043c909238a82be35b3ceaf103534f8cd65 SHA512 4c163b74deaa0f7f83eeb13fc40a74fa57f401a5f2afd2773a2ee113994fb900cd9a56380937f0866dd464e15a40d575e4e1af4af3f7784f60163bff0ec60cc2
-EBUILD gst-plugins-oss-1.20.2.ebuild 359 BLAKE2B f96e043f51bedf5ccd81e035831ee11e40a954f693412866a71ce4836054d96d26b896f63f02a283a974d23648a9315a8204e4c5de3dc14ecedc9fc01ce14c0e SHA512 fdacb56fb795ad74b9d36ac2bea3567ea5ec55abc6eeaba444776d38d7cc66828ee10944824c4e72918ab4cc0bf2f9daaf91975824480bd96ef8ba4e2edb520a
+EBUILD gst-plugins-oss-1.20.2.ebuild 357 BLAKE2B 70d7857818b5991dccd56d6628b9421b28c6361b5d96df76696d5bf9d4c1682d6fdc32e6652909af7352a1906847da68415ceace1d00b00f6d8a9d18b2bb4c24 SHA512 514de6bf38688c05027bb167853a43ef643c000588665bb89b6dbce05948c3e5d191d1e6d9364713914d1d7683d428c514b6d935345b871a5e8116d5497f541e
 MISC metadata.xml 489 BLAKE2B da3aabebc7d62aee0a69ee7ecc40efe1c559048b4fefa3d2df3ea3c8899e3c64e371c6e6ebe083503beaf01d18b79a4f00b2e138632f36e8af6f7b2d7244191a SHA512 3607079dedbe1c0ccb14cf5fb8d74e6116b07213b7684357cce877d995f09f54c210580c8cb41cbcb8f61bd43e1706b2d5ab485cb87930ba2095c45c29f55e38
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild
index 1cb155aa9ebb..bc27eeabdbe6 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="OSS (Open Sound System) support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=""
 DEPEND="virtual/os-headers"
diff --git a/media-plugins/gst-plugins-pulse/Manifest b/media-plugins/gst-plugins-pulse/Manifest
index 5f785a9c1481..9b540ee29071 100644
--- a/media-plugins/gst-plugins-pulse/Manifest
+++ b/media-plugins/gst-plugins-pulse/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-pulse-1.16.3.ebuild 455 BLAKE2B 3ec1819ee293dc78c29214b3fec78
 EBUILD gst-plugins-pulse-1.18.4.ebuild 468 BLAKE2B add9c17dd21ff87c6de2e33d7159574e3b562642f7248d4279dfb7f33fe3037feb5a42e45acc2cfc4b44654ed81b4098bd370868bb7eb06e75dd657347f28973 SHA512 edd31f9e7875160bc5b19b9cc0c6e01a04394c1eebfb6f96bde87dc828155df10040d3259ea8a2a06a938d27027a0b2d90c54b8518c38d9d8e60bf30dc202766
 EBUILD gst-plugins-pulse-1.18.6.ebuild 468 BLAKE2B 63c62bd9b6b84f4991fa6ce0d6dd243eac1ab754e4a2241bb215a050835e9654b7ca7c9c5f89e04c97c847157984f71a74b243afb6e163cde093b7e75981557c SHA512 312e892cd24830c04178611611e20441946423e52ddd94ecf4df509858e5c04a72f0c48a29434a5d2c625ca02b66fd3a6b752cd50245abdfe3b379ab63ef5d2a
 EBUILD gst-plugins-pulse-1.20.1.ebuild 466 BLAKE2B 9782c25238290b87992ece5d28a9896b9406743ebf1f396cb7b58955cced3dbace0489232a598d7094cb2bf5993420db3984cc67c271bb081222c7ac69671888 SHA512 8f5174527d7f8741601becfb5f2131fc2b9f7d9e9313400feabc092e85cacbb9d0a0bfc80c303ff00ed9b55dada9ed643c9fd1fe74a6db6ff617976b5b8cb264
-EBUILD gst-plugins-pulse-1.20.2.ebuild 462 BLAKE2B 37b755b3e4cda56ea38307e42a9d940f3b7f70076011c05e587eb0d6de703bfec90077f75b193319aae49ee4bfd9b96b0f842892f67cb7ac2ebeadd1ded34ce9 SHA512 86ad3d16b07e48ef1aa4b0b65dcaf793ee4c1f12a3000c14e605541708fb4ca428e89581a213f06323397a45f04f8be1d0e64ffc5342e210519c1adf55948928
+EBUILD gst-plugins-pulse-1.20.2.ebuild 460 BLAKE2B 05e6b40320bb905d95e670bac517666ed87fe0e8cb4c0785983d552e92d73d0a9399205dae61e4cd55115104742f28ae0024f62c4652f7fffb8ea27ca6fdb228 SHA512 3e88dc0dbed736c5c85ec891a6ddd0aba0b1120c2a1daa1d0fb858def2c533c90fc1e3b5aad43ba4ddb343f9d77dba1f8d2305f32410769244529e812efdbb65
 MISC metadata.xml 611 BLAKE2B 380f7e85db2d10717c6871abb99dfcdf040a119d4e8f0c43b6e1ad44f41b1694af07797e70cbf724169e86110f4b4c06dd9b51f4d27f781bb71d3301efe38243 SHA512 f9605aee69329c581d8d92a14acc2cfebfe5d6adc93c7d66298fad2c3fb91328869c9142cb39fb8f70bd2a8f7a76e20c6a2a3be88c01ffa4270f372fe7248378
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild
index 320c16d585ad..15f373ffde37 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="PulseAudio sound server plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-raw1394/Manifest b/media-plugins/gst-plugins-raw1394/Manifest
index 8c061a61729a..e3a655d7e43c 100644
--- a/media-plugins/gst-plugins-raw1394/Manifest
+++ b/media-plugins/gst-plugins-raw1394/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-raw1394-1.16.3.ebuild 514 BLAKE2B 3e000cc8a099c729f58a6ac19d7
 EBUILD gst-plugins-raw1394-1.18.4.ebuild 522 BLAKE2B ae3e43e9a54ed2653432f9128fb3b5f0bb3a9dd4c65c03c12ca996a3f761d9aa42ab52c72bd3df3d771a16134332788b00224c0c8181604044fd4264fc6caff7 SHA512 538c2ebb413021191d5ae1625919929b6b5670ba03a410319e4ba9c979a42aa3ebb1b44f6ad091f6c1a83ab04c64fed17e352c7375a1dbf7839f387ce4f9191f
 EBUILD gst-plugins-raw1394-1.18.6.ebuild 522 BLAKE2B 24516d46d2d04c3bb619a27cf5599dd23259655c35306344b98470233fe3b7a7f8c050ccbe99756d83b7f5d922c2065d4871a487bf0ac55378e76773411e7af6 SHA512 5ff78d586de4059f453654b1d2f4cd8c899df78042b3d03b47559cd21a5926f1576313a0c7b350b6ba9c44f9ef1c21c84d84b18ca7dd877fd1474887a212823f
 EBUILD gst-plugins-raw1394-1.20.1.ebuild 518 BLAKE2B bb82156e4c99021a1406b6731ea1b447b64dc5bbcba4a38b6555ce7d43a9702f8fd1e5065e72a475345bcf973ee92fb91604812cd9cf6485a54894abc854a098 SHA512 79fc350d88e6cae3cb456831bfaa3b0f98539b918979c9b5a0093f219962d4c7cb8389372e9e513ee330630a039b75a9f17fd090c47637f334436234f45401c6
-EBUILD gst-plugins-raw1394-1.20.2.ebuild 516 BLAKE2B 819aacd5ba46259a277ecfb8034b89c710ef4d2e441e6f8b70ef1ff2bcdb9bae74b5f6192fd0575cef033261d265cf11e673eedb4da8b0f86c6e5711261813c9 SHA512 1ca9f67904d6c4b5ec3b9a49d71ac683af5b47c08642d352c5524cdd605691aec271ba37a12f2a69a045bf1775381184f933f395a2aac50cce93bdad6e5438e9
+EBUILD gst-plugins-raw1394-1.20.2.ebuild 514 BLAKE2B 07de69eb4fdae6ca7ea999f5b3ac21061084925b952301ad36b263d6fc7213cfd7d206e0275d51cb4ed5885a0836d79c0ec1fcdb064272a7ed69539e35d6bade SHA512 0f76f2b247614077e20af959ff67de0a401ac61cd77b347bb90c397cdc5028d11d39ec295f09b0b9f1b0522db178fe103704ea5f9b07710177ddff252235517c
 MISC metadata.xml 549 BLAKE2B be976af7c97b7132b7d823921d9d67f74469b4f1f323104fd219f33791874ce80428c44f0d7caeff7a4b860b66621932a4b5cbdd702eeaa974ca962608cc5af5 SHA512 f38c8c4367a505d692dfaa796f66461ad74570464e5da4083ca4c8a18db74817e97135a46764fa4a6e7bf179b31be5b81578cf44ace688596f2e45ca79f41d9b
diff --git a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild
index bf455badd987..3f663910164f 100644
--- a/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Fiwewire DV/HDV capture plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 
 RDEPEND="
 	>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-resindvd/Manifest b/media-plugins/gst-plugins-resindvd/Manifest
index cfaf1a3dd3b1..e164f2dd4a04 100644
--- a/media-plugins/gst-plugins-resindvd/Manifest
+++ b/media-plugins/gst-plugins-resindvd/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-resindvd-1.16.3.ebuild 445 BLAKE2B b8cb36795974579d2a2cd045e8
 EBUILD gst-plugins-resindvd-1.18.4.ebuild 458 BLAKE2B c8c1e81e51226649f96ddd364f9dd3dc820558955951165e333bfd0ad6f5b027726516c943b65ee16ee29d7968a1e55aec828400c752834e738528ab3fdbd677 SHA512 06a0478579ab5af4e957c23d45151ce0cdd9af32e9e92c937723ba9a7e8b3808167434214317b9bb24df82fa2ca75dc5b530c87d9b12111898bf7a663d6f81c6
 EBUILD gst-plugins-resindvd-1.18.6.ebuild 458 BLAKE2B 4d5c5be79068e6e2a66edc4f5951043b2e31b1f6d4f939c6eec3ffe5f50fcd7a83c9453dba6f8ec9b1bb6acec0beea7ca69b7c6ff4a495ad76b737dae0fca262 SHA512 385696d260daa7163a730824878bf7153c4d314f2f820fce916fb380d447c0230d831838edd6b380cb5a7e26a0bfe6d67c4acc687a98c7c839bd0ab888d12d5c
 EBUILD gst-plugins-resindvd-1.20.1.ebuild 559 BLAKE2B f2ab1e9d20ff6a9af05bd257f67782408fd9283f7b178d25af488a89f37d663268993ded1f6b74caa7d40ed5643b8571f33cf892e34f3ebc4ea7035e078a2839 SHA512 7a99327a99101c7a999a670c52f28509d1e516cec12a01a79bd41666b13b0b82fd9e6096cedfcc70035de7faa0c2fcf69c46d3cf4770342a1a51881ff1b57d86
-EBUILD gst-plugins-resindvd-1.20.2.ebuild 556 BLAKE2B 3921a40561bfdee0f72884eb004434210c06bf752d1ebeecbd707c7266e1ff51a9f7ae8f49bcbe43387a32a1f75538bf4b335cc32d3064377713fdecbd6c745a SHA512 987952e5e641faa9c99ecf11faa6b2cb63fb069c43cdb9168a314b769f6d03f05c58a7a308a7ea46b4cefa970c20aad0bbb53cadefecadc966d87db441cfd8ba
+EBUILD gst-plugins-resindvd-1.20.2.ebuild 554 BLAKE2B 26360ccb7e3d95f1b673a6e1dbb133f0333d327063290ddcd24eabb7d170ef59167359a429fc0dd46ddc6caff8c3e0b498859f9cb11d7e31ae918f7478bf2145 SHA512 2230e545f4677a18a7fc2df05dc18407b675b340e678e022216487e3ec7e3a344780dfb9d3a01d59edadab2cf7a897c18eb11ae6d0938c1b74e7e84e9f749f47
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild
index 0731f8db76bc..8d98172f1ce4 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="DVD playback support plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=media-libs/libdvdnav-4.2.0-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-sctp/Manifest b/media-plugins/gst-plugins-sctp/Manifest
index 29975a568fb0..02dcd97a8aaf 100644
--- a/media-plugins/gst-plugins-sctp/Manifest
+++ b/media-plugins/gst-plugins-sctp/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.20.2.tar.xz 6216208 BLAKE2B bbbe77a1255991a2f96696996fb0c
 EBUILD gst-plugins-sctp-1.18.4.ebuild 329 BLAKE2B a046d1af36e97b23c9d1bb0a89006cbd6d8e709ec4e484a168cf64395e3a44e991100aaeb536aed5704e9ea3a3efe96219a97d89bd8655bbc5290b30045c9f96 SHA512 5eccb0cafe7d5086bbbd244a35c9c45a04df5ec9d37b849600736caa6e1bcdb28230c25f4fdab584f483bd85ef8a34dbef7769403c0a658be8e19c8ae634408b
 EBUILD gst-plugins-sctp-1.18.6.ebuild 330 BLAKE2B 1012833cd875172b4fe0cc54b97a77452b4c6937a974d7dd593e33e5d0a3b42d4b87be22a580045d94f68cbd0c82c1912c20d220992402dd0e2ec2ecd357e048 SHA512 cda587c5ed19f3781a3428c0cfbb9299631914e366450c66737e51e23d048fb2471481a9bcd020000ccafd00e78edb00b43526a3b0b2fa735352316f550ba56d
 EBUILD gst-plugins-sctp-1.20.1.ebuild 322 BLAKE2B a519e4a0e2e69af8efc8d1e2df52640984ca8e31dcb982f01217098fd4927fd842a5c5f0da3f5de8101767fa9560dde826916fb6226807a84e51c65ecfd84bfb SHA512 5307584fa36d61af747b427f42911ef83d4d79af20d9ebbf3579e26bf9cd4aa121d4ef9be888b3baa77a094ce679d9508075a705cd33008f8db212d722c41fae
-EBUILD gst-plugins-sctp-1.20.2.ebuild 322 BLAKE2B a519e4a0e2e69af8efc8d1e2df52640984ca8e31dcb982f01217098fd4927fd842a5c5f0da3f5de8101767fa9560dde826916fb6226807a84e51c65ecfd84bfb SHA512 5307584fa36d61af747b427f42911ef83d4d79af20d9ebbf3579e26bf9cd4aa121d4ef9be888b3baa77a094ce679d9508075a705cd33008f8db212d722c41fae
+EBUILD gst-plugins-sctp-1.20.2.ebuild 321 BLAKE2B 622e9d4863cae3c896398f897a3ee0fd3f7740f479d17e2c0822225201a8905a57aea09bd6a1fb3657247069ec199edae02a98fc06392daa258ab1f6a827e456 SHA512 e4f86371598fbcc8280f625cae81b7bb7ae1820051ccdea490a0f4d42ae83cd4121e4b3269adca2231094dfd4ca335379e7371b5ef9eb41518671656e3cf2910
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild
index 1131b2c878af..82ba2fdda97d 100644
--- a/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="SCTP plugins for GStreamer"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-shout2/Manifest b/media-plugins/gst-plugins-shout2/Manifest
index 99e724e2a4a0..af0707c2d7ed 100644
--- a/media-plugins/gst-plugins-shout2/Manifest
+++ b/media-plugins/gst-plugins-shout2/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-shout2-1.16.3.ebuild 347 BLAKE2B dc909f13b5e4ad9557db0ce2aa03
 EBUILD gst-plugins-shout2-1.18.4.ebuild 353 BLAKE2B c5fded59986ed61a847b5e280ff66b1a13414dbf10c76560f8432936f5c055bd9e5950343249609fc9a24a4209dbbf7bb4dc002c27d94965b09da844e1ff929f SHA512 f380cc3eba1ae84fe3e6b245049c0108b088d959c9b77c6b7ded6008a776ff1856caee86da177609e12743ee1842db0c0bf3d87e5a4127e400ab6223152f9185
 EBUILD gst-plugins-shout2-1.18.6.ebuild 353 BLAKE2B d1608fd6d04b995533de043c530c3b3a208c0eebaa829d222be6f09f42c44789b70057f67f0c325ebda5e0c37c08e6b0c25b299ecd55c8908dd59d6eb3a12004 SHA512 30493edab2796b83cad564ee5776db341604156f4c02649ffe45bb51c045a9dd1a28ea12dbfa1e329ee9930144602456be656f85312229bf7db6c72ef3604975
 EBUILD gst-plugins-shout2-1.20.1.ebuild 349 BLAKE2B 1fe10e73aba05014412a7d7f46b721b3546890c282c835da119c55c30dea5471b145aca7bae6382c754607db24b17fbfb267846fe4665a9125e80b12ec442595 SHA512 ddecc9c2980fe0a3b93118beaf821dda5650b5e3d94a5eb8d045732d87b4f265b97c58023156639015551721d040b3407e0f11e4630e2cd1086f80f86837975a
-EBUILD gst-plugins-shout2-1.20.2.ebuild 347 BLAKE2B d77af7cca79a930cd6de94c5cd69d53e8ee8aac3c0484b19f2b4f6f25e377c729cf63f05fbe52ce113157acb597a52a803c656aba804d3733af486ca7847f02c SHA512 0cafb5ba6379993458973abe9ed6ebf8802d514e737133948c21ad984d16444885ab8ca45848bf29d98bf7d5e09925f5dba58e56f0585ee6527110d4d7879b2c
+EBUILD gst-plugins-shout2-1.20.2.ebuild 345 BLAKE2B 0693496d60522c216b06adc0b2333fb6a05733cc0d8bc235b02c61e64ef8d969d67ccbecd213726bd38c7fe9fcfce0243abc25353b11b7323b244a271c2ecf83 SHA512 066fce30b819869e3b09a91cb8463c6e1a7d0631d924c070fe3b5715abcc812099b7f0da3df52ad75428277e65ca364aa8ce22212dbe8711028e9bf6d2b61637
 MISC metadata.xml 479 BLAKE2B bbb55743b9e8dce2189fd76c94cc7fa254bfb9c2bccf0a46dcf37763491424625e08a6adcdede64ae8896606897acbbbeccef224cea1279e0e4944e4418081b1 SHA512 4bceaeaee1b4dc92e6b8472fd8e8b7d697ee737d3c905ca96760ce3917db90c7769bf1e94af31429193c910b95504b292adf1ef604dcfcec36db05e178a13339
diff --git a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild
index 67ed1e3216fd..c23332a157b3 100644
--- a/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Icecast server sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 
 RDEPEND=">=media-libs/libshout-2.3.1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-sidplay/Manifest b/media-plugins/gst-plugins-sidplay/Manifest
index 2dd8ad58285b..5232e23f9021 100644
--- a/media-plugins/gst-plugins-sidplay/Manifest
+++ b/media-plugins/gst-plugins-sidplay/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-sidplay-1.16.3.ebuild 352 BLAKE2B cc3cf50a2ee1f25348aaea6d919
 EBUILD gst-plugins-sidplay-1.18.4.ebuild 358 BLAKE2B 6098ace1d8e768ddf8dd96931c692322cc002ef1626ad63b42914b52ed5c4c28c7c1830dfc94d67ae808217a3d5ed32bdf66b0cb4da207369a5b60baeec77850 SHA512 a953c1ad5d7c6143615621059a1fe5acb68778b49c8be46c2a704953850d8557c7af284faff43a53148891669a0f04401b37e25326df2e11a7ae390d417d156c
 EBUILD gst-plugins-sidplay-1.18.6.ebuild 358 BLAKE2B f16d6aa5f0d4b9396e2d3d3fcb94b90dc14374fe58c30bdd823668954c01c24b90df18155e9cb31499f96a7ac946c4f242b4fe66a9ce9281458c574703bbf5fa SHA512 31eb6916cc13c17471eb5d30524e70cf99dc89b75cdc9b1d3a679b0bbd091143516697feaf04e08f12aa1a5cc4ae439bfcdb968b2eff13d8c87ec8ca7051d11f
 EBUILD gst-plugins-sidplay-1.20.1.ebuild 458 BLAKE2B c3700977b14a0f8dce1100d494d1b65c897e067c90ad1ef90688dc0043bfbab6800d806c163ea37617f6aa77d85272240ba35330794a51a635ece278f0ab4808 SHA512 72fa52c4f0f5890e1ba26b8ab06dc1e134489fb351c61b8a9d93b49390eb4b8f4797cc252287890dd91bda9e639e3df3ef36b2097f628f145ed76d9ede547924
-EBUILD gst-plugins-sidplay-1.20.2.ebuild 456 BLAKE2B ff249ef8510744ed56aee96844f0095a3e23ac6712bc62bb9b812acbb66eef519e1098112b539d2f75f5864a55aadc7adf50271aa5e99d666d573f32f13d54b8 SHA512 40f61c22d33bad8356359b269a124b8214b3407eff4a886faa4f4f382cc8bb1f417186a29756290b877fd6dc7d996893b301a41752359703bcc09afe429846fe
+EBUILD gst-plugins-sidplay-1.20.2.ebuild 454 BLAKE2B b3998a01d6e43795630b589119625b64e539845bbc453d645f33d835ed0592ca4d59b83c7a73804340f1edadcca99e76fe4cba385f2fcc99acce8709b44d2917 SHA512 224b55ae1aa896f3787b962bcee7a09dd06d7e86e31342573e6bc7c0e220cc98d4807b56912f33a31b62ef907c4f2bebf3977b70e657f205dbac9898b501507d
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild
index dfd7a20fba39..93e727c56c6c 100644
--- a/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="Sid decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/libsidplay-1.36.59-r1:1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-soup/Manifest b/media-plugins/gst-plugins-soup/Manifest
index e316993a8661..aca829ac2c1a 100644
--- a/media-plugins/gst-plugins-soup/Manifest
+++ b/media-plugins/gst-plugins-soup/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-soup-1.16.3.ebuild 394 BLAKE2B ff38a1cf5de02bb68c085b89577dfa
 EBUILD gst-plugins-soup-1.18.4.ebuild 407 BLAKE2B 2c137a80e855b902c1256c3792c1142401c0c70dd4b33f07059cf89e560a32161e1066e7a7df7166443153b5092bde9e52f4c9a7224e9e9f6d74ae75e2b75c00 SHA512 17e5aad0e1165b5f84ed17c2ce88f20ab359105d23de6b693221801467f704baac0b5874ba700a1c3feaff6a366ced1961f89caa7def8af2c3b8234f0a4e8eaf
 EBUILD gst-plugins-soup-1.18.6.ebuild 407 BLAKE2B 38d39d4335c122fc06b1bf5bb54df7b95ff5179f8767b6ba8f77f3474f8c9e1912e4a0f56719486ca3123f9f5973560a01df2b213abc74c45e090807453e56b6 SHA512 029f9563a237a11a2c556eee064165e9528d0ec1a2861323d344b29d58a345df1625b48cec81a529fac307f796dc82563411388180897156c69e278a468756f0
 EBUILD gst-plugins-soup-1.20.1.ebuild 405 BLAKE2B 82f4b8184719e53230111c705785097007352620a74f2c035df97df4f3183602c1c4caa053343c24061fe70700c6998fcf322773bb7974c0cae28f04f2aef083 SHA512 9592bc2ba7b4b6d576750de1b48c30ba5fd1024dec0fe07727a9feb58285ee24d56cd082d51826790fcd0f8d0773501277ffdc742d6abac20c99fa2bfe5749f1
-EBUILD gst-plugins-soup-1.20.2.ebuild 401 BLAKE2B 507e02eb30f4b6282a30400adb5720debfe51b1976fa7fcf6556056db67a3b60906308ec2c4e85e4a29b6fa94fd93c42a933b8015747edd1101162c96dce2962 SHA512 042a772ca8bb85edab888bdc8a6095ad96d651c80a7701b6fcea301f4fe82fd2e355af3b8c7fb6843f44c15fcc281cf428ec9b9832fe5ab6658687b17978d999
+EBUILD gst-plugins-soup-1.20.2.ebuild 399 BLAKE2B a8f4c2b7e7956bac3b99ca9fc8fd4db1ff2cdae3ea39a5c2381d661a36cea845103337989bedc01117d861d95692a8ad2774ef688d234f97e342d213ede21d04 SHA512 1b2ca59798be301b89959898b517b178feb8767cfc85430392a977c2bcf88d3b967fb4fb60e9edef8143f15c0cc7ea1521dccb96f96892852707ba3e78f58928
 MISC metadata.xml 553 BLAKE2B f9c596c85af9f2cac37f8ec62ab1b94b85c434484204c92a17c5401330111a0ea48dc97163a0d9bbb049592a944863da1c880bfd8dbc0af452ab6753d2889ec7 SHA512 2e72ef73c2cd4a87279a26930872a797d081b90053d2e6b1da7bf7e6a2ed1b22894f08e3c3ce6054462c9488524bb32469eac8e549ddf2c130569a6a15ca5c59
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild
index 5095703ad4f6..27e290b6a776 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="HTTP client source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 
 RDEPEND=">=net-libs/libsoup-2.48:2.4[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-speex/Manifest b/media-plugins/gst-plugins-speex/Manifest
index ce9b0013d0fc..2ad875bb67b9 100644
--- a/media-plugins/gst-plugins-speex/Manifest
+++ b/media-plugins/gst-plugins-speex/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-speex-1.16.3.ebuild 372 BLAKE2B 4b93ae199689cc5bff5d2a8b98670
 EBUILD gst-plugins-speex-1.18.4.ebuild 378 BLAKE2B 364a8d5cc79d2c4fe25d15db578f7911b764799835d7a4eb4b81fcaf25014f7d92c48c4029f7e4000bd5cebcd19a167c78549e6bf12ebf94a9ecbd6bef30e9d8 SHA512 b7adedd97c62bbddb5e8281e24263485d89c27d7e08b90df6d3a70ad77a4aded50f4e985710f6fd3d06e6782864b80d91a0b10a6a9c0a50ff96e34a4f8665945
 EBUILD gst-plugins-speex-1.18.6.ebuild 378 BLAKE2B 7832ca91c1d054eec9bfa70a2996ec2e1825efeada33ce2a05488e79e0c2e3566cbe0cf5b854eac8c19fdaa557c979284982f53cdcc2c3a9ec3006a214c01da3 SHA512 8ffd059e3f4cdcf6c7fceb08f8cddfc10612aa09ea4ee643399c5617706c5f0b87822f384fdec0407ca26a8c0974708dde6d561e6dd1bebf43ff7866900ddef5
 EBUILD gst-plugins-speex-1.20.1.ebuild 374 BLAKE2B fa77f2e6937dc1cd8dbfaa934484e17fcf45981fcb2091697d9f16f812074dc4c6ef7b721aa86e3a193a1894ee58142d3d0cf6d5abff511ab3e6c3e833e85b42 SHA512 0f71d9bcbc89d82b775aa47a82c530973a71c26bad63dbb2b63432230541882512a2a901ca0716a9b5eaac417ba4d901acafee5d7f2ef836b59f8b9eaf929d33
-EBUILD gst-plugins-speex-1.20.2.ebuild 372 BLAKE2B 9812fc1dc4c7bdd420c363dc6f781a97f3c439bf96781ebb195196ec0f9acc4d6fe0fa9b91919d71419f072dd9a7f5bc9d39a8af93989d252abca382d9cbafc6 SHA512 837bbacf2ca35e130e67aae5a25c8e2c9eff9abfd09adf0bea8ac32666cf7ae5ad78dbc56935d910861edb4a685b6915b9dc2d090ad69abbf0d466176d5ae65c
+EBUILD gst-plugins-speex-1.20.2.ebuild 370 BLAKE2B 0c2ec3f5122d114f474e5421e9f09dd3c1f33ff7bbf81a8cd09167b41a52fdfb26d3c6b0fa5e899a5a78db041ad315dcdc5aed28db024bb73c2a61a43aabff3c SHA512 ebb4646437712230e568f7fffa1ace26341ace5dd0697a7770f0f96f3f220bbd050bb1358cd101733867bb09955abf33f3fbbcd19152279e490ac0486c09cb6d
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild
index a5bbadbd8846..2d2541c3e20b 100644
--- a/media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Speex encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-srtp/Manifest b/media-plugins/gst-plugins-srtp/Manifest
index 13bd599e31c5..c825e7b1e816 100644
--- a/media-plugins/gst-plugins-srtp/Manifest
+++ b/media-plugins/gst-plugins-srtp/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-srtp-1.16.3.ebuild 384 BLAKE2B 5b855bec78ffbe904fe52fadbd65fb
 EBUILD gst-plugins-srtp-1.18.4.ebuild 397 BLAKE2B 64f13ecd04a3af70aa939f3bce4914a626231f191a3fdae223ce46bc6e7323a746bbbac37ec720d3957e664f6181e29e93d316c1971084d88921e6fb04a1d6b5 SHA512 78c7ad7dabb8fe2018d08c798d8d420e84447971651f22f61e7401c69048a27028a8abaee8b983b88f1750b107dbd5fade0b986d9f7834c2f0733daea4a42351
 EBUILD gst-plugins-srtp-1.18.6.ebuild 397 BLAKE2B 649df986a6cb3fee237f27f369b5fbc2621d21b907ebbc8c458f7a3e3663b48a7279ec6bb20a2dc364d0157a7c4f1d0710df8c3d36535fe6eea3f9bf1cba50d8 SHA512 239a961d6d1305726f67ac2636448b7b68de91e98eb790b027ed276ba33330347376768d7e788b4ce6e31e9ee21630247d7ecdc39270e379a02488535f071991
 EBUILD gst-plugins-srtp-1.20.1.ebuild 395 BLAKE2B 6f0291ae5efd80b83b048d5abba1cef42e0f3df80c1a0260d2c398f97e2e1aed368f4c5ec283f0f648ffc13539bfe7ad06870a97d9b9aa84ec4c0de369710eb2 SHA512 00c44af57d6596ffce3fd070c77e2dcc99670808975b8db497bb60536bdfb196cca6f4a4ea85548490a408d4bb6db156ae86b9e430d8b12a444b8a526d66a3dc
-EBUILD gst-plugins-srtp-1.20.2.ebuild 391 BLAKE2B 05dcb2307b1f627580d5bc46bb41cc572a76e32d0fd47db4c37e3dfc3e994ed263249fd00c172010abfb53dcb9ab5f1a01c4a5e616e4c379d203effd410faec5 SHA512 9e53c64503597318cb2e2b1c71b66cad77b21f3135dd2526016a658edf1d15df0df89d9339b7968ca6802da0f3f5252a61a93f1c3b291101b1d4499bb56796b7
+EBUILD gst-plugins-srtp-1.20.2.ebuild 389 BLAKE2B fc22f123363af8d375625513654eb7c056a565e5cadc65263d25f7840d9ec9593caa07150c7cbb435211602101490fbbed6f05ae6cb3122656f60bcfd5fe0e29 SHA512 b12ca7468e2780dae1b933b47ce9d17262a80187242e50383179e3c529722c3639e0dfa4b598adaacc541dbb4f23cf05a957f755ec23f4db0c266f27440413e1
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild
index d4c393d41e5a..6e0f155abfec 100644
--- a/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="SRTP encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86"
 
 RDEPEND="
 	>=net-libs/libsrtp-2.1.0:2=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-taglib/Manifest b/media-plugins/gst-plugins-taglib/Manifest
index b3854c074a91..3ca32dc9acb2 100644
--- a/media-plugins/gst-plugins-taglib/Manifest
+++ b/media-plugins/gst-plugins-taglib/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-taglib-1.16.3.ebuild 377 BLAKE2B d94cc86ce0dc82523432234813e3
 EBUILD gst-plugins-taglib-1.18.4.ebuild 389 BLAKE2B 7c69bf183d5a3541e39da88c8abc2ba227347982b6c42b71a22df7ed33f24a42745a9617b5125f497aba7acdaa8afff62457782350aa2c73b0b8454941fd2ddf SHA512 f20f7e8543c8f32d419c9355e5d0a3fb24e81a796ff68784ec8b673e08508a7e8387eabdeb8a244e2e9bdc2cad69cea8cb9f95d5c2e1161f5ad2b7b665943ecf
 EBUILD gst-plugins-taglib-1.18.6.ebuild 389 BLAKE2B 7c69bf183d5a3541e39da88c8abc2ba227347982b6c42b71a22df7ed33f24a42745a9617b5125f497aba7acdaa8afff62457782350aa2c73b0b8454941fd2ddf SHA512 f20f7e8543c8f32d419c9355e5d0a3fb24e81a796ff68784ec8b673e08508a7e8387eabdeb8a244e2e9bdc2cad69cea8cb9f95d5c2e1161f5ad2b7b665943ecf
 EBUILD gst-plugins-taglib-1.20.1.ebuild 387 BLAKE2B 930c0c7caf4b6e9dc855bec0edee087454213d71de54a1cb9045b74d695fbb1d83edca3a626583e0e1822d70b15e05be4ff29e5af9e456416df90d5135c82a89 SHA512 8f646ff3fa7a053e3bd92d0bce9c1a782fcbd8d0844e5c7c20fa78f46bf8b4f9f9043b22d3ecdecbaff03037c0daa2c73b6768ccf07dc1892c7d3bf8dd65d460
-EBUILD gst-plugins-taglib-1.20.2.ebuild 383 BLAKE2B 9d01aba05c88210cdeca1f899e1a891791d1dd87b62ebc9f2bdeb871fc2a376fb03681082efe6026c3f00f4d66ea45336e6acf53be4d463c101571496c011c07 SHA512 41f71aa0d285561706a4b9ddb55c73eab5694e2c5547ce346f6ffdf84823d1b12e5fe4aabb0c6cc7b083ac8e5d13254ca846999cf1b065a3eb64614695e79f95
+EBUILD gst-plugins-taglib-1.20.2.ebuild 381 BLAKE2B d30a0fbfca4cffd0806aea4ef55e0b686df4aa92681242020b5540b577002b1411c1b33fa2d48fcf9460c7b83f739e57d55b6b11780962c8cbdc595a6587a7d6 SHA512 7847f72c63e76c75e878c45bb8856293ecdff4cfec9bf8f2fbeeb1656c250580c305ba9b2bc7bf0d2d54a42c867ddc8e1ba4ba072199f60c83bf508c4e31c761
 MISC metadata.xml 473 BLAKE2B ea9703f6462bd4e4632ce2d8fbf164845f979f55016d2f855eb323ec9d048d1f83a12473195bb890f28d8d246ab85021bb20c88eb372db8e54f029ccdf7bfa43 SHA512 9bcf273ff843b7a554caba67748bf4ebb7cbdcf919ec639d29ed62816ab1492b8c71c7f9d62da54251248b899c58ea0fc37a3c05f523e01a5dbff790567e0fd2
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild
index 744b78052322..849bd57d9d0d 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="ID3v2/APEv2 tagger plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-twolame/Manifest b/media-plugins/gst-plugins-twolame/Manifest
index 71de832a542d..de60c4d06596 100644
--- a/media-plugins/gst-plugins-twolame/Manifest
+++ b/media-plugins/gst-plugins-twolame/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-twolame-1.16.3.ebuild 360 BLAKE2B beed27bc943a1160bfb34acd281
 EBUILD gst-plugins-twolame-1.18.4.ebuild 366 BLAKE2B 9ffbc7c88791750d1cea95621b1c2af502567ef892d1fce1399e7433422306853c20a090400f8e95141258f24262a773e16658cdf6ea5af6b0b9920375462f87 SHA512 617caac9f3b36f0d966847c3948902e6d4fc7cda0e714060552b02640e27e0ec6002e8c23f6f5215a1891804cbd9703afe2ecdfcca431956dabce3d21b44cd5a
 EBUILD gst-plugins-twolame-1.18.6.ebuild 366 BLAKE2B 29b8bacd4638fbbf2e3c84fc287a1277d022da7542f2a9a5ad6740fa70770dca570535ab99618b0f7e641ce5025e3be6185e7da200f404f285fdc3af0aaee8aa SHA512 ded32402ad51e64d0affad60010e65782dbfd8f26417bc79fc5cebe55c31e0ce758ff3f7c7bb0941f9ec508cb0bd0104971ef921a7f62a700bf06469f4d29643
 EBUILD gst-plugins-twolame-1.20.1.ebuild 362 BLAKE2B 3c081ea310b5a5701b7094b71383fb07c94ff09a70867419876804ce9126465a3a8418fb4152d0d94a6da73743552f4673bd149836d0d1ed57b4ded797749d64 SHA512 6e97603d7764c4ee38bd35f3e7412b7dea5a67f61dcec87e5bb139cabfd124010e798fb014e0d127e3d4309e8c34c23e004522372df3177237a8f22894d7f3fe
-EBUILD gst-plugins-twolame-1.20.2.ebuild 360 BLAKE2B b19572f4869d54fe6f8302f6fd34a14f1d8ea6817c47de12f81cb568969bd11c79aeadc77a50f977c548b3f5b2bbb65e0fdfaa1f6d47055904b2b0147a9dc82c SHA512 07152c22e8432909a74bf5e8e5293c1c1124c0fab3572e3022174ea3196151e4692ee24cbe649bff36fe6ffe06ef8ce9bd8cef837ea9cc4eb04f22fb21b27584
+EBUILD gst-plugins-twolame-1.20.2.ebuild 358 BLAKE2B 61b8263d744b2ed840ca24eff090ae92814c6e30c8ff47da71f8674e08afa8300ad4a18852553a533ec39383b051b82117b29affb6703fb24097f0b63aa3cbe1 SHA512 1ef1810e8dcda79806dc44c987b27780854e472904a1afa8a89060dc693f4000e9dccca70a2abe4e621e357222b01ceb32f2005ce0d777b0ffcd5f568d73b520
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild
index 659df815950f..918d937d32c0 100644
--- a/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="MPEG2 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND=">=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest
index 6331a29c2a99..fc5070a9e519 100644
--- a/media-plugins/gst-plugins-v4l2/Manifest
+++ b/media-plugins/gst-plugins-v4l2/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-v4l2-1.16.3.ebuild 663 BLAKE2B 838621f470d4e5c79bd6b85b63543b
 EBUILD gst-plugins-v4l2-1.18.4.ebuild 697 BLAKE2B a1ce9fd2333e848534b98de1fb7b8342f4d2919c030a2f640e1d0c46fda79d3f60b7ab8255ce3cd6177fb93e1ab739167c5519404b4018e9f8a80ede8f3f5c29 SHA512 f3ef1869bcb56cd74615e7f14c37d21bf2caa00278ccd11ac5dc0ee43d4aaf36a8f194805e045b9fbb080f292809a863254a4004c6dd6751faa2f22ba1cd8c20
 EBUILD gst-plugins-v4l2-1.18.6.ebuild 697 BLAKE2B ce490f0895edfdddd999989a1c37d715b8ddcab19d4668cdd947593e4f30e76a3e7a857a4bc2576e7ebd14b6c80926e3ca7d6b143e0eb2d7fe30ae271032b725 SHA512 f3a9140a1eca3212961fe32faed2b68e0cbc333bf8d70a79ace8f18446f528f6092974b25120cbe3245a1c1c3e0063882c3f3d8f908d0ef328ca206d8abc7245
 EBUILD gst-plugins-v4l2-1.20.1.ebuild 703 BLAKE2B e814a8dcdeacab946c8dc0eb23bd29db3fe61b7762b9ce607a32a804529df4a1afb44d3d2854e06803fbeef320a21612775ce2bbd634d6ee13ced9b44b8aee6f SHA512 9a183ab2cef64ce8484b49017412a400ab34234b71de174681cec27b7bd9bfb7edb4dc81bea2d5236c08633b930bacbbbcca522eb84df9f6f72813273964448a
-EBUILD gst-plugins-v4l2-1.20.2.ebuild 699 BLAKE2B 9f2e382e6aa9eb03dee47000487d63c016ac071e3ef69a5392f0f6f8060d56384eadd2e9aee5eb4e9b6d3dfd3611b8965e92cd8e59a39c2a89e5aec03be7a4b5 SHA512 207a1657de3f575426d752bfeb40e9c9b9ab51a2dec75f38b4fde86026321c2d318b1ec924ff1edcf23a972135ced21be965c9a0f07f82dc187f396bfa1bc17b
+EBUILD gst-plugins-v4l2-1.20.2.ebuild 697 BLAKE2B ce490f0895edfdddd999989a1c37d715b8ddcab19d4668cdd947593e4f30e76a3e7a857a4bc2576e7ebd14b6c80926e3ca7d6b143e0eb2d7fe30ae271032b725 SHA512 f3a9140a1eca3212961fe32faed2b68e0cbc333bf8d70a79ace8f18446f528f6092974b25120cbe3245a1c1c3e0063882c3f3d8f908d0ef328ca206d8abc7245
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild
index 3dd29f430bef..0b83f85fa000 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPION="V4L2 source/sink plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 IUSE="udev"
 
 RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/Manifest b/media-plugins/gst-plugins-vaapi/Manifest
index cd2ac6eeb84e..29d0b4618bbd 100644
--- a/media-plugins/gst-plugins-vaapi/Manifest
+++ b/media-plugins/gst-plugins-vaapi/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-vaapi-1.16.3-r2.ebuild 4343 BLAKE2B e9d969520c23d1a9bd1a86dc2
 EBUILD gst-plugins-vaapi-1.18.4-r3.ebuild 4225 BLAKE2B c5f52d1f827d2a8bab602f6432fcf640a4669cf8ec27e72bba182f4948653cf91ea95d40f0ff3e16ee2303499b3af2a31b83ed1360591da3017ae8b5fabd5a28 SHA512 fd0b6574234931d0d2ac0b1fb40774b13dfda23d18245e022bdb02d79b8d0b00e2fbee3f52f30ac58007eb941180981731241c703e586d3482cbad6bb9b0e587
 EBUILD gst-plugins-vaapi-1.18.6-r1.ebuild 4225 BLAKE2B c5f52d1f827d2a8bab602f6432fcf640a4669cf8ec27e72bba182f4948653cf91ea95d40f0ff3e16ee2303499b3af2a31b83ed1360591da3017ae8b5fabd5a28 SHA512 fd0b6574234931d0d2ac0b1fb40774b13dfda23d18245e022bdb02d79b8d0b00e2fbee3f52f30ac58007eb941180981731241c703e586d3482cbad6bb9b0e587
 EBUILD gst-plugins-vaapi-1.20.1-r1.ebuild 4156 BLAKE2B b0bfe46d74089168d2eefa349e048358c797a5b33c132a90b8bd53034f3bd49c0e7e0f3897c5b7cb00c1962ba526da978792ea171898330e70874a781a2fefbf SHA512 49381da69d6345d45f76ae7bf44842c72398f19c1a8d13962e4f14752ca16497be81f22f99eb29d888976c5595d7cbfe84663a750b28212d0066127d87fb5981
-EBUILD gst-plugins-vaapi-1.20.2.ebuild 4153 BLAKE2B 07ee5536f9005eb3967b272773c1c4bfda36cf86531a3d2ad67ba76623ea389a1b6c5cdfcdd3cc439ba976d57c80dd5dc6d66930474a7a378037d33d00514dbc SHA512 75ae85efbbb4f43bd0b3e6b412d3c6dc5c66e639c5c51a1ea9ca0f1ecd3cbd080dc6312f145f3a830b0b81f24dae6954bc27de56e4f7657bc7f7ea27573ea58e
+EBUILD gst-plugins-vaapi-1.20.2.ebuild 4152 BLAKE2B 529621b5fddbff7ab23451b60f45c196856dcb938011d04e630de7136e0ebc137f87d46aa09ccfaf87e269b1d33105ea993fd302cae76792a09e3a8a64cde5c3 SHA512 9df46842aa130a9a10070a348cce91c5edff5077bc9ae9f932a66f102159ebc043150425c3fbdcbd32cee8737c6c92520fab0b44f5e5ef1ea42d33f08ab10c54
 MISC metadata.xml 434 BLAKE2B bbc974951dbeb5b15d6c1aef4d79f0df6a9fb66ddcb370170deba060ea0c39be3d58dee5605de2c1cae8758621c548a4aff9fd26e59e6abe6aaedf7c33349cfb SHA512 64878569d6579302a606f6f9ef13cba96dcd950116653be2d1e7cdba51ae02d50b73ffb3f222ef9a009b720a425061cf3768eca8141b98dfb9513ee11cc9135b
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild
index 25c69bf2fa9d..721a006090c5 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="1.0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ppc64 ~riscv x86"
 IUSE="+drm +egl gles2 +opengl wayland +X" # Keep default enabled IUSE in sync with gst-plugins-base and libva
 
 # gst-vaapi configure is based around GL platform mainly, unlike gst-plugins-bad that goes by GL API mainly; for less surprises,
diff --git a/media-plugins/gst-plugins-vpx/Manifest b/media-plugins/gst-plugins-vpx/Manifest
index abacb56f9711..3a70cce4052c 100644
--- a/media-plugins/gst-plugins-vpx/Manifest
+++ b/media-plugins/gst-plugins-vpx/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-vpx-1.16.3.ebuild 386 BLAKE2B 4ef15e26829491b9862a4f165b25a23
 EBUILD gst-plugins-vpx-1.18.4.ebuild 389 BLAKE2B a2814ec632682aa4cf3e49b26b7b4d19842351a5a2fa96a11ddbf8ffd7bb2c734784075555b076628f8dd7b991a31d3e84f85e66f0ad3e5ad2fb528f213f4300 SHA512 fe1fd0f08f6b839f72fbc0b6a31e0bd0f4db7e475d9f790f739539dd84f02833d48a66a78d5102ff875a019d93ca2995507d87759648883eaf80657e949301c7
 EBUILD gst-plugins-vpx-1.18.6.ebuild 389 BLAKE2B 043ddcae03cc6b631a1ce79fb536112394971d7217efa5b35f8e138ae72c2e77ad532c7d7eb8996f1d06f416597299f11f4bcebddb57e44964806bec74710fd7 SHA512 3b74702d71b4580d458cde94b5710e68f9418ac10c9660ca9a575d0051da778b9f047ff7da7e053df3c75e53e8110a83f61d966f4334472a485c708e0b852d0e
 EBUILD gst-plugins-vpx-1.20.1.ebuild 387 BLAKE2B b156b5f5120eaecc3587df9146ba31c2edf885b8b71407f75d079e4de6404022b3e8219a9c75cb83d684f16417f1042bfa946ea09ba885251519fe195954f2cc SHA512 b82f0130bfa2daf2b0d77acc8f09af11cdea8798e34561cb04d15909c0755594ca5ef48955229fc06084a420c445b74c7504b1b39753ccd4cabde68c2c6a0eea
-EBUILD gst-plugins-vpx-1.20.2.ebuild 383 BLAKE2B c1d3e300898b6d30d9e02819a5bcbdff4a518552d16e69faec73c5c858989b36097c32c20deab35cfacf401c1b42d9c97c1ce06980da75e096835a09d4c5a267 SHA512 73101a9c325f55c6de7401df29dd9f5860a6a134f196d3f939a14cb9e179fb8820e3965f228cc4798e039fc1b6def8625bc48c1fc2c7e5020acfd6a489b4663e
+EBUILD gst-plugins-vpx-1.20.2.ebuild 381 BLAKE2B c8ab6bfda09420735e2fcc4aaba80c013758f9e44b2982f523081b6add6b1caab9c58438a97f8bb9ee98b715b1e475f668c44611bb2c59f3104d130138a4fd8b SHA512 d2ea3c668be045ed3c48138d79e035a53681deccf704383dd513c52e8d4250ec4fac6c9fc4eaa855b4ce0b9bababa21f695ce764520ce396a2768742d5b0eec4
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild
index 13d28b66fe97..c2806764615c 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="VP8/VP9 video encoder/decoder plugin for GStreamer"
-KEYWORDS="amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-libs/libvpx-1.7.0:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-wavpack/Manifest b/media-plugins/gst-plugins-wavpack/Manifest
index ac9c4e8fe574..3de1c1ef4ae7 100644
--- a/media-plugins/gst-plugins-wavpack/Manifest
+++ b/media-plugins/gst-plugins-wavpack/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-wavpack-1.16.3.ebuild 390 BLAKE2B 282ec2fa553168df3fbdf9f375a
 EBUILD gst-plugins-wavpack-1.18.4.ebuild 403 BLAKE2B ec9ad0b61a660586618e6afb2ad88ea1265d9a55eeed1cbe991765ede7f27def51aef233e8d77a9b5c232774408ee43db65a82a45b923c2dd915cffda6b7d193 SHA512 c833833d70a58ed9862e99ee746fa360aa137c17cb25528dc61630c2c5d146939fff333dd34dad41ebc21f4e216727f7544948f8d8c6a6d61183ec6732b32fea
 EBUILD gst-plugins-wavpack-1.18.6.ebuild 403 BLAKE2B bb008c9e97acc639497b0d506f18da5e8d57f23a24fc4fbc4cc4bb526761e9a0868d8647c977af43f64dcc173cb19322ded773b326ec11a62a386d2b5e9b0558 SHA512 76a54fad853e8c6b9f6e1d386466922f343709153ff4b7312f8acb046b24d9f7234583b5a9a0165b71129f069614df536ebdf46c0b7629390a0cef7dbd2a9fc6
 EBUILD gst-plugins-wavpack-1.20.1.ebuild 399 BLAKE2B 92169da100b657df086d1d5d90f23767b34f065b7d7dee59d0cb7fa94958878318c1c618dff0d5e34e7cece5abafddcfa0fd2a766fb4993c429d80df932e7515 SHA512 98dc1aa8170aa23f486192e86de80b88539b17423a6670d63652eaecc4321b355b6591ddd1b6a063061ed41cbbabaab2c9f36032cce435bdfeea98471b761a63
-EBUILD gst-plugins-wavpack-1.20.2.ebuild 397 BLAKE2B 29a7cd88375c157203d7d929f6a52efd537849c7d8281ab1e578a2648b56d6584586dc6a390252b35c346e87fe2049845abf2b72c7d71ed5376164d76db71a4b SHA512 e19637a0f7d4d39ec355f6e6c84aa4eff4fc2b26d8ce393342b2576bba010334136a81e66525183517f61ea07bf8fd3044b76afa076563f426300f67cd5f8fcb
+EBUILD gst-plugins-wavpack-1.20.2.ebuild 395 BLAKE2B f347591914555c217ebd4bd47e046eb8389d98db33909624dc3336f55fb5de9c7965fca68c70103186d30a023299e105016394cdf6fb4b1225e1e0296e8c45d2 SHA512 ff23351b3d7dc446c7d828c8084cd5057da26872448d50b6a0266a53c33493744448876a4cb8152da60850418e815cf1c9808a3390f871d4b6d53c42b38ff8c8
 MISC metadata.xml 530 BLAKE2B e03d00ad0be4cfe389447d4cb1cf58f708f80a247c79b8613c39d45e465aeac95943f34f447e240804b3bb05f2d69a23e70d32b67909e94b1c954f43c19cdbed SHA512 6f29436bc0fa41085fd6f2a350ef088f982416891784f52ef455742ea130970b23db9f69948ed4b107d7861ab0b252cffa42b9e5318a90f49f6ea8ec5e13db09
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild
index 1ad2433c3523..101393cc7b12 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="Wavpack audio encoder/decoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
index 3af0d95aa402..92bb580c7fd8 100644
--- a/media-plugins/gst-plugins-webrtc/Manifest
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-webrtc-1.16.3.ebuild 824 BLAKE2B 03cba6297709fc8b03f3a940870e
 EBUILD gst-plugins-webrtc-1.18.4-r1.ebuild 1408 BLAKE2B 1d2c494e0768d6d70db1ffad02ed37741aab9a3534ff71243f4d6f023416a3fdb308b51dc7b18e214b85a2ee13878dc0dbdbf755961d12a09cf7ab2e94721c7b SHA512 598cf20e5a2e8d15ceb6c5a14e28efd57ecccc3fa60d35127f7d50599942749d26aa20a242abb6c2b96d1ad36fce6fa3c6dc5ff67530dbb01d2fbf912cba5f87
 EBUILD gst-plugins-webrtc-1.18.6.ebuild 1409 BLAKE2B 6089935656836845738f8b7579d3238d8e4af7a9a020d478f095760039182295a37fdbf0a0e09cb154971c06d2bd13f4e9bc715185cd0249f4500f30cabfc21f SHA512 7367cdb13ac2a52e8276e8c233c867e30be505cce7a39fdc71794624a6ed152c8405d16f43148aae1bfdc5a444e90900283c42e5955dcb84369c4712f21860ca
 EBUILD gst-plugins-webrtc-1.20.1.ebuild 1401 BLAKE2B ad4d2deba552387d34420f61384d8fada1dbded64642c695c700aef9f134d0ee617f3ae91a3de9833e46298e55c890f3c9c37e54533289b01f3b85202147dcfd SHA512 17a6c6e2cf683b34f742dec634e596ff164dbd9248429d9d2d2cbb68f5f9b9c569fdff4bbfce1b8fac793ab51fa485702a76ac729a5afdb22186c7673eb59ac8
-EBUILD gst-plugins-webrtc-1.20.2.ebuild 1401 BLAKE2B ad4d2deba552387d34420f61384d8fada1dbded64642c695c700aef9f134d0ee617f3ae91a3de9833e46298e55c890f3c9c37e54533289b01f3b85202147dcfd SHA512 17a6c6e2cf683b34f742dec634e596ff164dbd9248429d9d2d2cbb68f5f9b9c569fdff4bbfce1b8fac793ab51fa485702a76ac729a5afdb22186c7673eb59ac8
+EBUILD gst-plugins-webrtc-1.20.2.ebuild 1400 BLAKE2B f419c597448d9c67496789eb60d5239100302b4d69db9af3c4f226e36a65d518fe26e5be5f90506d472b56e96bb0ac0cce773e461e43876b458372de37081f3a SHA512 92feadf20540da51579b4cc1257ef2360a1861676af3d15f10b9ac1cefa11340a8295df5d6cbeb46df00ce5800bf19b8ba6a18087a9bdbf95d518e268a9be1a8
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild
index c3f6d58eef3a..f37f6385d54d 100644
--- a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
 inherit gstreamer-meson
 
 DESCRIPTION="WebRTC plugins for GStreamer"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 # == ext/webrtc/meson.build
 # dev-libs/glib (eclass): gio_dep
diff --git a/media-plugins/gst-plugins-x264/Manifest b/media-plugins/gst-plugins-x264/Manifest
index eec5ce016d55..12a8acaa316c 100644
--- a/media-plugins/gst-plugins-x264/Manifest
+++ b/media-plugins/gst-plugins-x264/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-x264-1.16.3.ebuild 412 BLAKE2B 41a9f1939ce2b3de956c0cdb66bfe1
 EBUILD gst-plugins-x264-1.18.4.ebuild 425 BLAKE2B 6856872d833982eac07642703bfee3ce6c585e22c84059b02bc4658b8805fd654487f5cd6623da320b17a4dee60dedcdbd451c8de85ec3f4e638bf1acca89184 SHA512 3e634e08108ec48494f9cf4bc8a863529b26707b0f708bf100b490ade78fb93e4bfafeef1932b43b124614c253e686cd4868b6e26402c69f50013ec0a8919efd
 EBUILD gst-plugins-x264-1.18.6.ebuild 425 BLAKE2B b48d37246626209b482bc496a9aafbb2e937b6d9f50c669846502bfa39ef7525816851256b05e0590c6c0189cb62680e544062b5af186d34a2154e96353fc2a7 SHA512 dc2d140f19d5b68ae667a83aacb708bed254dcf84ccc5159c320bcdbe29537333584988a2fb824a1bc31637d6038d95197111c06fa8d3e79d3400fcb3da75be4
 EBUILD gst-plugins-x264-1.20.1.ebuild 527 BLAKE2B e105f87b17eb63ad184251c892c000df3559474418360381ff39e48047ce6bce31650a163b5ecf8fb30c5e2cac3298eb5c911fda2960ee62cdb5ec9ffddf87b3 SHA512 55bc5f137eed5dc78fa1daabfdad7086b19e8c390ca21130052b1f6d26daf0b66d64fd7756f11db30358f5cf629bd59bf4e9a229b9cdca4c310616ad7dd4b21a
-EBUILD gst-plugins-x264-1.20.2.ebuild 523 BLAKE2B 69c9e8c97fab7b267a86598fc607302dc0c09db7bd8387847ccaecf349620d67771b317a86260039b47f18b5be401950b651cbccf2cf9c18b3d18e9bc2519c67 SHA512 c0ea3ec34ca3072148dd0d63e8c4219134eff834fe3ea7dffe695047bf328a3d108d6991da1165748ff701fb9816822b00a761c858e10cb7b4eb3b424d13087e
+EBUILD gst-plugins-x264-1.20.2.ebuild 521 BLAKE2B 1744ebcfaf943de24a3fa0c18b7680cddd8e59f257c6a5d51d33769fbef9743f90a592dc57795a73a39aba2d9c4affe9a7c0b71bcc387f84cbbc73c43e6c21bf SHA512 d78c1bfe329a76890166dd3c6c5623078f77fc8fcdb9e1385adc225659457f09d33f6d5471bb7ea8e4d36c89026bc2f167b0964ec57455ed570cc9d18cb7d994
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild
index 932a8f7ecaaf..acef66ca6b33 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
 inherit gstreamer-meson
 
 DESCRIPTION="H.264 encoder plugin for GStreamer"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 # 20111220 ensures us X264_BUILD >= 120
 RDEPEND=">=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ximagesrc/Manifest b/media-plugins/gst-plugins-ximagesrc/Manifest
index 1bd7317beb47..4d94d4a836e1 100644
--- a/media-plugins/gst-plugins-ximagesrc/Manifest
+++ b/media-plugins/gst-plugins-ximagesrc/Manifest
@@ -7,5 +7,5 @@ EBUILD gst-plugins-ximagesrc-1.16.3.ebuild 682 BLAKE2B 7fda93011cc9c44d73aa7c8d5
 EBUILD gst-plugins-ximagesrc-1.18.4.ebuild 815 BLAKE2B 2946a0490ab23e7426a9cc42d1c48e4b9486b74348993d0ae8fc8b11782c2cca3b1c7d1ca9875e5a7d7d37997502ef049cee62ef08ec5afea493d4c7224e7ab5 SHA512 eaa84aef454e55974769bf504854f200ee8225326b52721beb496918f2a158c9d07ee7a5d3d002edff9f8ec6db103fde48853bfad77ec2cf637cc4f6557dd48c
 EBUILD gst-plugins-ximagesrc-1.18.6.ebuild 815 BLAKE2B 7b901ed81666d392d81119ca84f5a8edfaac7289e70fff868b754c55d9e744fddd53a7084cb3f680998223493af7d01f6ad4268ceda562f5a7aadff075f68ca3 SHA512 52b23d4512e2286bfa284a93889a3f925bf1aee2456af85a4efd66e4d0dfcce166f99859e8fc5d35d96a996759bad9b82ffe9ffdaede7b0f33a8fbc2852d57ac
 EBUILD gst-plugins-ximagesrc-1.20.1.ebuild 811 BLAKE2B 7aa8579bbd5c439c2830484b52e49e08e146bb63487d5f1c1ef9d0d7a855cc14b904117008db8cde5f4dd53cc75315d5c43ff0cb29fa0915a2107acf220b53ac SHA512 799ae6a6f7d3119bc6905617d3d046965d72583c51eebf2713a365f709e8e7eeb01edfe72b71b93edfb1faabedb2b0d1e628b1c30e698726c0700dd9a53ff8a7
-EBUILD gst-plugins-ximagesrc-1.20.2.ebuild 809 BLAKE2B fb1e24d61e6cc1ed51e21b0ffed3ee2d922d6a6c7e44ba7fb7e6c4b1eb08073d8584b3633d7eede6a9d40a89f746855315daa3b4c6374d4ba9e37cae709f4a35 SHA512 ce30aed5f8384eca03ae8b560c985389d95caadef145c46e1d79f75ec8482389d0b9e4ae860804a5246edaddb54bd6f5338f3fdb76458bb9e44133107df1af7d
+EBUILD gst-plugins-ximagesrc-1.20.2.ebuild 807 BLAKE2B e0b3c4ba9cb5cf4a4e862ad4a1d4d14890a2acd04b04f80b0fef1c058000f9123e50315ec90bb01d412e087dd0678cfd7e0d474dd5455722789b5989e0ff2311 SHA512 0ebea0b4bcb7c7be6ea4f5cf3546c919e12318ac8910cedde8d081bd7c24bbcca607a72affb9534d5498c5c70cc9cf04eea8c60aa4b20931fec993b6643b4aec
 MISC metadata.xml 458 BLAKE2B d284d58cc4bddde2a8942050d0db12bc040dddca27a415ffb90daa533a3b6f854478f2dee805fb39b2c20c494ced1d9855b77abdd4edc52cd28016307a5782a8 SHA512 1b264f32d905d9fbf4e676da23da4e52c68d5c2b6a4119b2ff31c1bdb793c0c0701b912a34849ec065cdc31bd2c89be96b6a1f9c434841458646ce500f12380d
diff --git a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild
index decb44a0555e..477776c1626b 100644
--- a/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild
+++ b/media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good
 inherit gstreamer-meson
 
 DESCRIPTION="X11 video capture stream plugin for GStreamer"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
diff --git a/media-plugins/ladspa-bs2b/Manifest b/media-plugins/ladspa-bs2b/Manifest
index b2a6d95e4d71..bcc9c307f849 100644
--- a/media-plugins/ladspa-bs2b/Manifest
+++ b/media-plugins/ladspa-bs2b/Manifest
@@ -1,3 +1,4 @@
 DIST ladspa-bs2b-0.9.1.tar.bz2 237542 BLAKE2B e37b5bd2e5cc1ee43f121c91137132a1330476a69fe40b159ca7dee8e38f486b17a9895012eb4a21f4a3c324693a7d3db689867f3edf2cfe2ea4bc2468d3ecac SHA512 1ef4b2b71cecb7f42b1b78fe20ffb7715aad1b360abbcbca629cad58d9377ff8779a0fe983b3c6f5a00376120c838deda1d160ff9f378a955cf4b308bc5bc46a
 EBUILD ladspa-bs2b-0.9.1-r1.ebuild 438 BLAKE2B cd0b303ac893648dd6eeb241b9272daf4f55532860eef8c05ef2ed8d2b0fa97a87ecd917d8e80fd632995f7139c3eaeafddadff48e669cf857fd16a0a3ce63ba SHA512 56db6957c4e123dcdebad33796934a388c6fbc4e70645cee43adcbe716a3a0e2d07df7a0d58203f102670a0ced4542af20065b3c5e4a434c684d5b751618a145
+EBUILD ladspa-bs2b-0.9.1-r2.ebuild 509 BLAKE2B 8d0e38bde76a6ada473aba07fbd4bbbdda6cfe1a529f5570a85ac66acc02c1e06c0f1943a6c99c2be7bd132f80552f4be1277dc1794261d7c07a54d451a9373b SHA512 0f77bfcc6a844dd4725351c4dcbf7c4580b1991fbb24e8daba7119a70166ccfb50932a0e4665a2f8c3d6f342e8ebee1b9610c7367f921e1c645e54b96db7a41e
 MISC metadata.xml 324 BLAKE2B 1ac07610cd5e3a3a2874a9eba847b8aa874c700b53e6f9513cab2e806446d7a1dd4a25a750271475dda8a6d62a6afc31625988fb64051e6ad78476324d06266a SHA512 d98e4b491ba58c9d08b924e7c432d496599af2558796637039d7771759072522b06f75d4fc2eade53953fcd76bac9937d13b774c2c2e02ba23e0650d62dbe7b0
diff --git a/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r2.ebuild b/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..335c9aee6c76
--- /dev/null
+++ b/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+DESCRIPTION="LADSPA plugin for bs2b headphone filter"
+HOMEPAGE="http://bs2b.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bs2b/plugins/LADSPA%20plugin/${PV}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/ladspa-sdk
+		>=media-libs/libbs2b-3.1.0"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index f7444a1c4270..cf64eea2a2e3 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index c82e4dde6c5c..9ec7a22ba94d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -6,5 +6,5 @@ DIST flrig-1.4.5.tar.gz 995774 BLAKE2B 7853c38521c880cd0b1622dae339f6e5120ca9679
 EBUILD flrig-1.4.2.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 EBUILD flrig-1.4.3.ebuild 476 BLAKE2B 8665ccf1ef91f3f25912d4af906aeb74a579a5c865ce52f392f34f9ecaf14309a2d936ab6f3916b02e50fa8ea5d92d1171c9de3ef0cb7fb80491d02eec96cd99 SHA512 aec358712976dcaceada364545bcd9306cc5b3441db9100a71dae0d8d5f3a09e1e69b855a79524722840b3090c40c6fc000aa03fc0ba399a8cbc84dfebb0bc32
 EBUILD flrig-1.4.4.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
-EBUILD flrig-1.4.5.ebuild 582 BLAKE2B b09dfce22f77aa2d6d5a6438c17ef42e0bddb9789c32abf5adf457af92008637f3ccc2d567aa4b4ebb4961cfcad3362619c69f0408f347f97259a32a6c1fec77 SHA512 f3a0722ae497b9d4c28d35ff26b77294de34cd131b01ee2a5118023638996b4f93e5de661fe4b2bd5b11c1a0938ea47918a0b26cb57ca8888e932ec85ec94816
+EBUILD flrig-1.4.5.ebuild 580 BLAKE2B 736959be898c2c019f981b73efeb1959855e77dc69b7be94d78010395e7b863140744df973509a677f3753c484e652246ff603ff5eaeade68f71f3d639334d5b SHA512 ae7ad3a79af61d473426a6f28a6677ed42c7563584cc8c95a575d7a799beabdf83f64363be6b7bcd133b8d80a9835bc27c96b0b377dd0fafdc9b734666013fd3
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
diff --git a/media-radio/flrig/flrig-1.4.5.ebuild b/media-radio/flrig/flrig-1.4.5.ebuild
index fa8591685185..91b26b7fb75c 100644
--- a/media-radio/flrig/flrig-1.4.5.ebuild
+++ b/media-radio/flrig/flrig-1.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 DOCS=(AUTHORS ChangeLog README)
diff --git a/media-radio/gpredict/Manifest b/media-radio/gpredict/Manifest
index e76f5c0dcb48..b0a67dcb23cf 100644
--- a/media-radio/gpredict/Manifest
+++ b/media-radio/gpredict/Manifest
@@ -1,6 +1,6 @@
 AUX gpredict-2.2.1-fno-common.patch 334 BLAKE2B f822b1685c3e5c96a1810c62fb501879cad0c6aeae04ee57845fb0df2cd7c0e4605b668bbb3807723213e896e8feaf19e162ac821c0995a7bf801bcfc8385dee SHA512 7b060f18508202c1b37f6799c83321c0e8a90312e0afa0a24e1ad978458a4a91246892366b39eb505965db1dba13a8cf75d8c2f45e36011d27b99dbdace12f0e
 AUX gpredict-2.3-doc.patch 473 BLAKE2B ed1a1a742ca972a53cd2ac35723f5b02eb212f8d6bf4049eef4ae78afbaa50067f8777c0c5614456251e68050e38d4f64f840a3b886024a0d9869f1a163e74de SHA512 af5d9cff76ba3cadea43c664bfa5d3292d1e02765b36776c26346c6a89b146162ca67c1a90c0fb6388a3ccca2cdbd0dedeb2d71e109e8435980aaabbce80fac1
 DIST gpredict-2.3.tar.gz 7742902 BLAKE2B 1ff567871838b062c59ab0076330a354afee082506044f5ce2ae1c7553e7f3462770f7134d13e3b603f7966476d13b365dd3575cc6c7e32d23865ba29b602cc9 SHA512 d7434aff482c943951a79cb607c91f118cfbde8209b4b370d0d2147766244fab2839b5c712864c2c521635f31c484ef2bfd3c771371e946f5a3561801ab474b5
-EBUILD gpredict-2.3-r1.ebuild 778 BLAKE2B dcff8f6cffb98138e98620ada31803c8fb7ac425369251dbdffb80010142bd6cb454407b00e5f30ff81358fb634cb310e2be0c5d3b441bd4879b40ab66880bc4 SHA512 0589f9c4480ea2140a93868edfa17566d7214c44b4bffd5dd2ffdfd8e57ed7164c536e5cd48a33a6536737ac4d945df9c67387a2ac502656f87922903b2d226a
+EBUILD gpredict-2.3-r1.ebuild 776 BLAKE2B 9338b1f0b9ab9e1085465f0a9470a6097acade0aefb3227dbf7077200af51f3e94ed2b61787d93289e61285046e6622c5895f12765c3fa60050de66e14fd6eb4 SHA512 de2ea06989ce638fd27c6724be1501f3cb1c0e3d52147c2f27a7761a561a1c12f249f837e626dcfecad28c79d5b0f7dc9e4b2cf2d4f88207ac42a1cc7351ed1f
 EBUILD gpredict-2.3.ebuild 812 BLAKE2B 3c4265ab4f1c824ea19941c554e2d5eca1ab7a55842e92f38ee0a15a8253cbc22f60ee8f33c60645d1837b8a897720ce4a2334eb1ff6a9f45f8fc354c7055b83 SHA512 ca0d609e84a3055847fdae6b9c35bf64beb9a4732d300f9cf16d1ddae5581366a7fc4a8597e496cd7e3f44b2b351a10b84e871fdbea95e95f3510401e82f70de
 MISC metadata.xml 328 BLAKE2B b4b0687c3d8f2e47cca383f78a620fa997398ceb9cbb01bc10c872d971bb277fee6831b95768f9ef8ccbf86beb120e97f344cfc2ebe2077b9a33fa90db9471e7 SHA512 ca3a9ce7b68a7dcfedd0dd0a64c8c1e34cc07133c4822864b3f55f51356ea615edfca7954414fcdd8607be0e1b9a105797450b0f661d2c16fc773b1e45fa7a71
diff --git a/media-radio/gpredict/gpredict-2.3-r1.ebuild b/media-radio/gpredict/gpredict-2.3-r1.ebuild
index a24b2f3a6e4b..6955f0b16cc7 100644
--- a/media-radio/gpredict/gpredict-2.3-r1.ebuild
+++ b/media-radio/gpredict/gpredict-2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/csete/gpredict/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-radio/tqsl/Manifest b/media-radio/tqsl/Manifest
index c18f59c18b17..411244cc9dd0 100644
--- a/media-radio/tqsl/Manifest
+++ b/media-radio/tqsl/Manifest
@@ -1,5 +1,7 @@
 DIST tqsl-2.6.1.tar.gz 3516512 BLAKE2B 4dc52dcb0b35d0eccdc531a0d5d09e7bf827791c21f63401bc880d912b5fe2214fa2ec85888bbe680fe34226452c911f2e10c89b03ab45d8c17720e1e668920f SHA512 0e18461d60016f633024f103c7e3584f6ac9254ff45133505bdcb2c0a32e6e24415cefe8120f791b0f8df993e88cdae7e724fd8cd86c0bb4a1eed382a6a94de0
 DIST tqsl-2.6.2.tar.gz 3516428 BLAKE2B daa9b474b5a803192857e3586b989399fea04de9a8c67b4ebdb3b4f2f02d08a68ab317589824b15fa7c974ee82bf4a75bb4d51a8b44e4e6468fd582e2339190a SHA512 c32a0d2eb1bd0f840d918085cd3e343e2fd169958e51bf6bad3c187a98df8996612b868585d38bbdc4794bc99525df89a52d0aaa9fe919c1baaa3884d9baf78e
+DIST tqsl-2.6.3.tar.gz 3516151 BLAKE2B 34df7d322404aba9ccf64b55c97799b4a02f9a3b1032e59a72dff7f9a6c118ebafab0316b5bd763fb981d813e9360df130179532af98f695a48e15530cb6fe6a SHA512 e6308cda39177b74ebb30eee481ed52f9231916a1c6dfaef2d42eaa758bc247ff46319b29d9d61fa7b1503164392b365f5e8bdbfac622281646c630034ff88e2
 EBUILD tqsl-2.6.1-r1.ebuild 611 BLAKE2B 2d6ebf6c4ab6aa758d5f478773ac0d1f5ee33ee3236ee38d1d5c96a07b3552084bd6a783c9d917cf744209f4626592a965e68633990239a379e7e930116cbefb SHA512 4f3cf63ffd36318dc72018aac110b8f547aa29de6effeeebd261ab83cc134d5d641f5a8656235b60f0262e534abbffc7fb7142df12157305a40a409ccdcacc55
 EBUILD tqsl-2.6.2.ebuild 611 BLAKE2B 2d6ebf6c4ab6aa758d5f478773ac0d1f5ee33ee3236ee38d1d5c96a07b3552084bd6a783c9d917cf744209f4626592a965e68633990239a379e7e930116cbefb SHA512 4f3cf63ffd36318dc72018aac110b8f547aa29de6effeeebd261ab83cc134d5d641f5a8656235b60f0262e534abbffc7fb7142df12157305a40a409ccdcacc55
+EBUILD tqsl-2.6.3.ebuild 611 BLAKE2B 2d6ebf6c4ab6aa758d5f478773ac0d1f5ee33ee3236ee38d1d5c96a07b3552084bd6a783c9d917cf744209f4626592a965e68633990239a379e7e930116cbefb SHA512 4f3cf63ffd36318dc72018aac110b8f547aa29de6effeeebd261ab83cc134d5d641f5a8656235b60f0262e534abbffc7fb7142df12157305a40a409ccdcacc55
 MISC metadata.xml 291 BLAKE2B c8f0e0ebc3b625eac2168e41e2d9772e0b03fa293a5c057209b3b1a0485f3d882810ff4a8eb060efb4d6739f265f268a3f8a35777071c2e4102d8c7578e66b26 SHA512 1e2ab60b78d6a013be338bea0565d133fcc8f9433e2e4191e56722691a2b5ed78c9566f3c85987685eb84c5d6425d0fd6fc0fff2945e7de38c7f7eca5013ae8a
diff --git a/media-radio/tqsl/tqsl-2.6.3.ebuild b/media-radio/tqsl/tqsl-2.6.3.ebuild
new file mode 100644
index 000000000000..ee19a35410f7
--- /dev/null
+++ b/media-radio/tqsl/tqsl-2.6.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake wxwidgets
+
+DESCRIPTION="ARRL Logbook of the World"
+HOMEPAGE="https://www.arrl.org/tqsl-download"
+SRC_URI="https://www.arrl.org/${PN}/${P}.tar.gz"
+
+LICENSE="LOTW"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/expat:=
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	dev-db/lmdb:=
+	sys-libs/zlib:=
+	x11-libs/wxGTK:${WX_GTK_VER}="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS.txt INSTALL README )
+HTML_DOCS=( html/. )
+
+src_configure() {
+	setup-wxwidgets
+	cmake_src_configure
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1138994e907e..3e6e3cea7e05 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index feb6ae874ec7..c7d452f6acfe 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,9 +1,7 @@
-DIST abcMIDI-2022.04.06.zip 609956 BLAKE2B c140bcacc94d8e6193ba6220c1747861a11d79e5b394ff5826edfdb3029e57b3a6d9443a557baf6279d4a7c9e6488dcb2c8d0e6a05858046be53fc52be2640bd SHA512 06d4ddfc4f7bbc1906604629e3b2ca7ebf8d2f89edb478d2068b2ba4efab6ff1d96aeebd6344ea2ebc7a92c23cf49d08b40bc97c47458e526d505313fb52a527
 DIST abcMIDI-2022.04.28.zip 610114 BLAKE2B 73ef4569bf58cf45c5b8972150d7e81d84c88b4ca05d616a06df9585c5fca1ca73d635699db323583402113c1b783979d1d34719ae107700843cfc42ee209268 SHA512 1e17d493597bb2d22b491587c0bbb86e04aed8ea2af2f426e48c68871ec0fcd1180e78f0ccc44d9bd63c5d98cbb22db5a9aa8b66a15bfcc35aa7e9770c813350
 DIST abcMIDI-2022.05.05.zip 610217 BLAKE2B 241d9ae42defef6345b143c59140f1cee844c19608b6a897b020f0a54c915d45edaf09ef75e1e01b1a932a6e82934aaa82d1e82c74c61d23e1c372418726bff8 SHA512 7f8141792e67e5ed22e84d35f0f9894c5ecba74817ac9c23323d5e7777bad0a3fc477daf43bf515e243aad46476c3a9597d8e9b4e0e865210b5baad0a1ebc6d3
 DIST abcMIDI-2022.05.20.zip 611325 BLAKE2B 1fd9c786ec0a7b3558f71502ceda261419b6883dffe524de6f5203188f5ee618d52ad1cba0662d28a3ba4c252702abf4d5a2e4271b951916e9164c9d573b28ff SHA512 f6e8212c4bc96fc62f95c868f65bfd40208f2aeb5d4913fe1b4d85331dae69a763cfc3db9f446018dd0b43afaec496b6572ea0c46ebeac563902899b71f24645
-EBUILD abcmidi-2022.04.06.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
-EBUILD abcmidi-2022.04.28.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
+EBUILD abcmidi-2022.04.28.ebuild 676 BLAKE2B ce33e38e9ac6f8e8467ce54426cc8438bfc8aa6b21292a98097160afc74c3da4e7d649adbb65beb148bad10703ba3bd7fac998cf519705658fbd172ffb28c333 SHA512 5f0e1b9a3484b499ab963df3d9680fd078c2072145dae9bf6ebb55f6bc3ba43abae758434ef5e162cdb786f67375e4b4f085b133a7b6ae764af9f421d59b9021
 EBUILD abcmidi-2022.05.05.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 EBUILD abcmidi-2022.05.20.ebuild 678 BLAKE2B 4b57316933b325ccfe2e5a34df1dff4f782e09af521e5d21f54ee435552c631fa73869008bb5beb21bfade619c03130083c4c52a266fb7c32b0741be66c3f4ef SHA512 3fcefcdced72e7d8ac0d82b638c893bf2472ba5fb20910b9d3651d890ad5886bdb263b8b8cb43d7f3a400f98df4c7b8a084cfbe666ce0c5b3fc18d0af7a430cc
 MISC metadata.xml 327 BLAKE2B d92d9b40b1c1af1a4ba5cea8b956a098066ae7cc9eab2cb31a0dfbcc37400558f5f35a6ce04a7541ecbea7578906f688d2931c1f62751e5a2d7bb7b80e97cd2f SHA512 170ca99684768ef2d5b0e8a26e6ca64468b3134847ffe53f6a1efb623bfe77a6c09dfd67df553a306af045a47bc69f0d41ceadf508cce7f75f3c2a7614d2d725
diff --git a/media-sound/abcmidi/abcmidi-2022.04.06.ebuild b/media-sound/abcmidi/abcmidi-2022.04.06.ebuild
deleted file mode 100644
index 3b11050a4f44..000000000000
--- a/media-sound/abcmidi/abcmidi-2022.04.06.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-BDEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i "s:-O2::" configure.ac || die
-	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2022.04.28.ebuild b/media-sound/abcmidi/abcmidi-2022.04.28.ebuild
index 11f547f4cb8e..3b11050a4f44 100644
--- a/media-sound/abcmidi/abcmidi-2022.04.28.ebuild
+++ b/media-sound/abcmidi/abcmidi-2022.04.28.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="examples"
 
 BDEPEND="app-arch/unzip"
diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index 3cdc1801218d..eaf80960b64b 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,5 +1,7 @@
 DIST easyeffects-6.2.3.tar.gz 2621460 BLAKE2B fb73c635b10dec5808d046a4df63cdaaada1c3534f1e9275fdd4f28db52a9111a850367b564b5d008a1bdb7c7e55864e38cc1d50fc363b5614fb138bd0fe0cc1 SHA512 79babe59ef0c86d138b29a4c2dfaa1a937da9de8d7ae7cc40bee6ae5e011b6c43d6ff9554885ce116114943976d50c24c44c4e30775933b5ee8a2bf350d55525
 DIST easyeffects-6.2.4.tar.gz 2648725 BLAKE2B 8d4f10f286ed4b3468ffa2e3b5331b9dfd9c266b0a6a35b373856be14c8465032c79ebad2826ff7ebb1a8db3d81a57fef398880fa7601282da672d5348dae817 SHA512 1c7a9fb95bab3fe039d96420d465d8dfa0d42bf3c04081c5b258f3f227923229f658d6e8152587bf38b26e0a3f3c73b5b89a1a8c9b42807b7e02b776f419e361
+DIST easyeffects-6.2.5.tar.gz 2673461 BLAKE2B b254dbee930d4ed3c87f27e41321f5b2151bcda258cece4a6fbb7f1465b839851bf82b3fb5517bee44c23bef34f53fe7dce8f54295d93473e7e19622131c3274 SHA512 260b864e5928191dd5574e23a5f51f4df0dcc552c44ecf2d0c1166d589fc1b4320b9da786de88c8837dcb28527163051dc80b5a5a33a9cdde2466405c73248f2
 EBUILD easyeffects-6.2.3.ebuild 2008 BLAKE2B 9b434e4192e1948618cc9f596461d462e30df5c4cced38fc7ba0d9bc18e3c8d6bf743ec3086eb4c781539a20caf42125145830f686936ee5f9db211478b68cf0 SHA512 f81af4dba50434c0bedc5311e6a4d0445235088463bf430300c3cb869384a085ec3f747e3fda2b551acce8165ef7d365d3fcccd0e0985ead8e631fde72f57e08
 EBUILD easyeffects-6.2.4.ebuild 2009 BLAKE2B c8f52c14419c2dc8ce34bdc69c7adfc259bd63042ab8677925800fe25d68f7fb5ecb6fea41c4576716eb3e367044a251412bac3435b35d1bf6fac1494e36ebbd SHA512 6d4d9b07d2e08cc971a9ea543fa38830a9901444453ec80a0e65f8c0bfd28281477cab48944a559effb650744361c0229402c10cc0569372390b3d9d3f3e02e4
+EBUILD easyeffects-6.2.5.ebuild 2009 BLAKE2B c8f52c14419c2dc8ce34bdc69c7adfc259bd63042ab8677925800fe25d68f7fb5ecb6fea41c4576716eb3e367044a251412bac3435b35d1bf6fac1494e36ebbd SHA512 6d4d9b07d2e08cc971a9ea543fa38830a9901444453ec80a0e65f8c0bfd28281477cab48944a559effb650744361c0229402c10cc0569372390b3d9d3f3e02e4
 MISC metadata.xml 839 BLAKE2B d3fde7fe66f301f320a4fc3adb4a5fb5e5f84405b015209b696045eaffe251f7d1531efdb2d9fab6512647dac991290b622bf411dff36ecf304c9b063567c03c SHA512 fc68f37398082f885a2c7c5d117191fc37d1c1a51381439cefe1ae798b7b019598e81f5c5f1832950669cef340d418220024993b95aeb911dfd9fa1df0eb82fc
diff --git a/media-sound/easyeffects/easyeffects-6.2.5.ebuild b/media-sound/easyeffects/easyeffects-6.2.5.ebuild
new file mode 100644
index 000000000000..fe870ff42fa7
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-6.2.5.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils flag-o-matic meson
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="calf +doc mda-lv2 zamaudio"
+
+# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
+# TODO: check this every release.
+RESTRICT="test"
+
+DEPEND="dev-cpp/nlohmann_json
+	dev-cpp/tbb
+	>=dev-libs/glib-2.56:2
+	dev-libs/libfmt
+	>=dev-libs/libsigc++-3.0.6:3
+	>=gui-libs/gtk-4.2.1:4
+	gui-libs/libadwaita:1
+	media-libs/libbs2b
+	>=media-libs/libebur128-1.2.0
+	media-libs/libsndfile
+	>=media-libs/lilv-0.22
+	>=media-libs/lv2-1.18.2
+	media-libs/rnnoise
+	media-libs/rubberband[ladspa]
+	media-libs/speexdsp
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.41
+	sci-libs/fftw:3.0"
+RDEPEND="${DEPEND}
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	doc? ( gnome-extra/yelp )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	zamaudio? ( media-plugins/zam-plugins )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if ! test-flag-CXX -std=c++20 ; then
+			die "${PN} requires degree of C++20 support only available since GCC 10 or Clang 10"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 8b451fa59c5c..cc4534a35a45 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.6.tar.gz 1749202 BLAKE2B 5296d48809a457770a968fb9ae20ae4091bbae11d6fbf8a11f75e44de1ca9fa1c121e925e61f25ab1016907ced73364ff632ffa3e7edfa9d15019bf3f3e0bb3c SHA512 e4958c409e057fe6e09a0aa86cc0d7c939aa883de479aa90c43f19faa4d0c3a0f6aca7242fad11ec7a7776cb7e2e602c953c6249fc94b9f04425101584ae3e6c
 DIST fluidsynth-2.2.7.tar.gz 1748897 BLAKE2B fd53603947ddf5a76676cfc3d77b1d904146ec7c30ab6e54a2c32cae0e76ec4b66397506072cac277febdd1b799801d5b13c7b37cc0ea4a545fae26077a1d881 SHA512 62709f96fa07bbafb9b907438da7376abdf1a4e679cd2b105c5bca257f1ff62c18bd4c646ef2ccba64ca5273604da996fb2caaf61eeee44686bf45fef1ed83a7
-EBUILD fluidsynth-2.2.6.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
-EBUILD fluidsynth-2.2.7.ebuild 3412 BLAKE2B bce2c2f30f2a8fbda235537ead2aafc502007422214fe7fe2f712098e552b1e85b2c7a837ad9875f12dbd64f68fda15db249755e7df536aba3a4007143880886 SHA512 e6e29a359c4646e22cb2d47170140b4e808a31c5e8cf0ddd4b9f900cfe7035f0adfe92788a0e6cae5fc0c23a8b83edefdccd78167fea7a20de746c9181433fa4
+EBUILD fluidsynth-2.2.7.ebuild 3411 BLAKE2B cf562d000e5f356f19726938c25725b46fafb5e89cf38284f06b22698c8b862223d36a50aca668442646883ec9f276233388c6ead9bd1e4552960e7f1297c8c3 SHA512 005178c5da24a8d97d75743235db5ea4dd6c7f08896b06af3dca8ee14f0b8acd05009ba28f0a5fa7c40a0507d7b9bb164117b92ceb00d3574eb8345ccab33dfc
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
deleted file mode 100644
index 387ff481a6d0..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd toolchain-funcs
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
index 24c1c2215988..387ff481a6d0 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 64c70d4e579c..7489dad43c8a 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -4,5 +4,5 @@ DIST gnome-music-42.0.tar.xz 1651960 BLAKE2B 43ecee648441dab0b562e5a307554e62b3a
 DIST gnome-music-42.1.tar.xz 1652976 BLAKE2B 6a6f6249a0ae61895feeaf658e6d4b0b217ed198e2137edf2f8acdf03f8b9f0b35adf19c74d34d360f3a5d8f1e4b0c3a4004f4b14444c7ebe7b7327d94d86284 SHA512 4feb02459a010c83c66bde12d73be648e9e482117bda88ae2e44e93b59ac7c0b80522e8e4d7ccb38954465d7c012975521b0764f0a42dbecef737fe64d3c3bf1
 EBUILD gnome-music-41.0.ebuild 2038 BLAKE2B 320ae70e53fbf0fd10d422c9474e8ad51e9fec306d44286fbf00cb204b4b7bdfdbf1b3353e34d233e7dde1f99dda502874c3fcb4afa6c7ed59c43797b5d68275 SHA512 c39ca3701a2d60bb50c410159307ef08eda5af203e13fc1d023bc003578d15d3cfd04081d3aba6b429bc03305dd7db3a20c079c04db1623d3b69837d995a1e82
 EBUILD gnome-music-42.0.ebuild 1849 BLAKE2B 3d05926c2893b92f9364e5e1117edb7bc344119488e89c6c43fcb0c84c07eb114f5f279f19083841dfc8ae091592543590402f49aee1679bd5416c9abeffa450 SHA512 c8b1f5e332642b3c3ad34893f80da7620b458707303509bc00b6df1ef1f03ea054307cfe1dd9f082d95f931a5ce97fc20e588c446c00e670578026b25a0f4cfe
-EBUILD gnome-music-42.1.ebuild 1849 BLAKE2B 3d05926c2893b92f9364e5e1117edb7bc344119488e89c6c43fcb0c84c07eb114f5f279f19083841dfc8ae091592543590402f49aee1679bd5416c9abeffa450 SHA512 c8b1f5e332642b3c3ad34893f80da7620b458707303509bc00b6df1ef1f03ea054307cfe1dd9f082d95f931a5ce97fc20e588c446c00e670578026b25a0f4cfe
+EBUILD gnome-music-42.1.ebuild 1846 BLAKE2B c258788808729d4c9ba66191a916bedbd77640df404e4a48ba0660ca32f08539f2240e1dd8cf031206689fbad6ddd11282a2ec871d166172b65d0fde8570f2ae SHA512 0f2fe38e786f5898e458b529b7d650c72c4f568bd048358b897bebb512058c45df7f66b400a916e9ce61e0cf79653a9b8d71b8694cb1c0f4ac5a434f5815b0e1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-music/gnome-music-42.1.ebuild b/media-sound/gnome-music/gnome-music-42.1.ebuild
index 1ca03facd942..61bf800171da 100644
--- a/media-sound/gnome-music/gnome-music-42.1.ebuild
+++ b/media-sound/gnome-music/gnome-music-42.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 
 DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.67.1:2
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 48ad2baebfc3..4326c21d7e88 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -2,5 +2,5 @@ AUX 40.0-fix-build-with-meson-0.61.1.patch 1456 BLAKE2B 3326dd305dbb9ba2fb24de56
 DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
 DIST gnome-sound-recorder-42.0.tar.xz 162208 BLAKE2B 6f4f17ad5cb2cd893626defb3b91e62c0dfbfdae4c815df934a2d35a7b0e315f689f3ea222d9adef960935828095c337e00076aba60b4c1b3d243c274063aed3 SHA512 53fe2fe0646c5055cedc1c62cf87176dca52bf3d9452d83bcc849d9946179afbef826f08ff65a97ede7a0d14ade4da0755b2ef3780460d5a80f8f9e6c85fcfbd
 EBUILD gnome-sound-recorder-40.0.ebuild 1116 BLAKE2B 8598f16aa62a75219e15dc6c9249b14d80463c1814d89de996c6a58f2a4553ffd8a3e8544f7e1b21915455701c4c09a319e10e44bfa1039de55ad0ef03285ab9 SHA512 8499a041cf2d6cc1efc2a99d2eafac12f080f7176169579df21521b0eefb94909d074e09d1340f162de3d5673b97aeeae544700569b3cc14b89b7fa3a19784f4
-EBUILD gnome-sound-recorder-42.0.ebuild 1104 BLAKE2B face159f8593dc5fc1eb734f38486abae2eecda3c66a2bac545f832ff2a8ef38307224179baf6ca7d05f0fd8241cc8cafe555c6d9673cbe0b6dce30d2e3ffb36 SHA512 4b368c148c36ca8158c88a7bc78056ccd8fbacdee90db6f4e2c5de881ab5f47083c0e5ae006208117d779e48c6a7e2578d082c560f04058c204ef14688418269
+EBUILD gnome-sound-recorder-42.0.ebuild 1102 BLAKE2B 78f8bb877f3030f0e6efd8394457279c14671cd20b9dba6cbb748480487e477628e8f2a30ead85b43ab97f57099dfa1146708a41342fd46a6166ae9171cd34b5 SHA512 6cb7e3b92cb0e8cd9c4aa96544e6d217305e0ef3aeb239287efa680f1ddacd4f262ec0419c3e7cc0d9e57ca64c4dec3230ee044016324381d0e98990d86614b7
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
index e125245f0098..417b22aa2866 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/gjs-1.54.0
diff --git a/media-sound/kmidimon/Manifest b/media-sound/kmidimon/Manifest
index 926b4e738669..2e9bdc9d8263 100644
--- a/media-sound/kmidimon/Manifest
+++ b/media-sound/kmidimon/Manifest
@@ -1,6 +1,4 @@
 AUX kmidimon-1.2.0-fix-cmake-pathvar.patch 579 BLAKE2B c3a169a4d947aed747fcf63a01ae550759d78b26315fccaf5e7a4666f3b7807ce655add3028800144fa075b78bbddb86afd443a357a00e0b5f6db8840219529c SHA512 dda87e16ae63a6bacf40faa3dd02ef26eb2a90040a4e27bfc7f6dd9c26b8415493dcf63df4b15488d80deb23655e5c6a7045822ee765961800d95afb81ed975b
-DIST kmidimon-1.2.0.tar.bz2 696057 BLAKE2B a0a3cc8ccd7d9f065c5b1b5594a6baeafd36e4a124207bd8b8f55a3d3c22f7bc7eb84771b51f71f07f3251da3d796a79980a8e22a545576220dce17b354a1403 SHA512 ea62240438111428b1b10e4df2179497495038a376b848cd3fc910ca5eb6126a63f1ebafe9eb1408a0037a9626ffab5bf43e7e3cc31608d878b329450ec17463
 DIST kmidimon-1.3.0.tar.bz2 698412 BLAKE2B 185125fda809042a064b225f14ef5c04c69f07bda77d2291d2719256ccbee122bc181d9ea602cb43335f764ae9576daf79966a681637d080f5e3533bd856715d SHA512 02085e6d6768fe5d35649446ec5db2eadcf34b4c727fb250bdbc33d79c86a16d6dc3993ddd9fe08e93e08e1400fb3f56bb71913020ffa410f56ad7168bf08b97
-EBUILD kmidimon-1.2.0.ebuild 740 BLAKE2B 6a273d79f052ad37fd8cc32693d275b09f82fb34e51eefdb0288ddc4ea2d710809465b52cf9682c5336b0974d05f068d9397fd0c4ee2d77bd52e41fe119b57b5 SHA512 164d7c8d782b96ddd382e2e12de098b1ad6faecb3816d8c835dbe89c9e693cf44efda6fe9eef97d4ba97144a1845584b07035e657334c806f6a0bc5a9a0629fd
-EBUILD kmidimon-1.3.0.ebuild 749 BLAKE2B 2b328bcc8f515975f2b6668e4fd8e2d597e697aadbc05f79512e32276e191d39f94ed072d3c308e48f49d3ed9955b41cf660d44c50ffdb9b629c6a9c7fabf07b SHA512 38d53438018478ffbfca437fd17f16c95f5a07f17df86f5cb33892802eb536140d423f65fbd22d56321a700e6bfb847014b62af4a4079ca4ff850ba09ff1858b
+EBUILD kmidimon-1.3.0.ebuild 747 BLAKE2B 3fd99444aa6485220a108f0f5bd62089823e84fbd41dab48a12d04cc81fca453f03306bcb417d32b319cea28d7500ec9b9b4998480bad33ee5e4a0260c2d12f7 SHA512 eab108f943148e3cb198772f7cfb6824e2c355811e324b37890f4e179ec7f07a1ffc324b06a1f5fcde17a3e8ce48baf0784aabba44dcc5497413b11f1105f25e
 MISC metadata.xml 442 BLAKE2B 20c1a6190737f4d447ab159fa0568f27b731d3472b3a4ec26fc4d3225ec9e82fca014d82ad41fe1c8c6b80e785973d066bf7101078ccccd7efac67d3d992749b SHA512 bf4cb478d26b5e1f49057954f77284b6126c72541925299b71f901559bba3020c25a8ca6e6b9b4ccee966f612c71a6b8554f08e64e97e00c3c09232ded483c09
diff --git a/media-sound/kmidimon/kmidimon-1.2.0.ebuild b/media-sound/kmidimon/kmidimon-1.2.0.ebuild
deleted file mode 100644
index 203ceb048fe8..000000000000
--- a/media-sound/kmidimon/kmidimon-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="MIDI monitor for ALSA sequencer"
-HOMEPAGE="https://kmidimon.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	>=media-sound/drumstick-2.4.0
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cmake-pathvar.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_DOCS=OFF
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
-		-DUSE_QT=5
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/kmidimon/kmidimon-1.3.0.ebuild b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
index 846c67c3cf42..a8a7c43aa1ff 100644
--- a/media-sound/kmidimon/kmidimon-1.3.0.ebuild
+++ b/media-sound/kmidimon/kmidimon-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/media-sound/patchage/Manifest b/media-sound/patchage/Manifest
index eff771b8e9dc..3092a672d94b 100644
--- a/media-sound/patchage/Manifest
+++ b/media-sound/patchage/Manifest
@@ -1,4 +1,6 @@
 AUX patchage-1.0.4-fix-compilation.patch 1561 BLAKE2B 53f1fe7f55170de0d9e4261dbac98c1bd0d964fdd5644bf4d431b76758829f2bb183a84644f714813a03d666a4630e3b38bf1a171c7534d3bc5487ca8566ebe7 SHA512 00d4bf65a9ba73fdce5690f23ef80c84c02b532dd607025ddf28f19b5cb8e81c2d661e61b6b1ea31e2783c72ee1650f1befe01df1b52c0413d9f02438bce253b
 DIST patchage-1.0.4.tar.bz2 661824 BLAKE2B 3e56b7513e19e0acb1ef524ba7d7754699abdb6a968547f7a545c8651f23a33c209b9728dae01d839022ec380185a1673ff58733c1553007a6a3b7c889aa7f03 SHA512 665d81ca16c1052f71c3037d2ad8f9a6120b09a323999468484dda1b4c4b567c36728ebe38c54152406b63a4107f04764d0dede52302bc7a7b124e82132749fb
+DIST patchage-1.0.6.tar.bz2 664841 BLAKE2B 72d0de6d12e07ec160f4c59c51f138e1220a1b8994bdab90f56dd715bf16b6f561836d184ec5d5077de3bc7bb5c6778ea2b7bcbf0b33230be662f2b729eac568 SHA512 b7aedcb07da0c81842929833ab93a0b20c08e465bf05ebb4e47670d295c0d4d0d50f0f74001d9264c2c23ef08d3881232e7622ecf101d1d53ffcae2f8c0f31d3
 EBUILD patchage-1.0.4.ebuild 951 BLAKE2B a224d38a2bad4119fb798bb823537d82410a8ecbe76a047d26d4d24ee6f10555db9be4359426a58cea963e9a54791aafd3d78c7ff7a3f033932d5f490159c746 SHA512 1770a22ccb29e87f00c9b2f6ffc1b08d76ea5067a27793bf56bc8bf0ad8dc30526295754a426e184a2d53ef5f53a45f2c6d1cb1a1cd4365dc4134f763ab22363
-MISC metadata.xml 355 BLAKE2B 07b7a3c571166e24a93417478bb27d1d94e9e201b2e9137af50cfe04b477e9b99c38edc72fd36abcc4dbc77f65f593f25299deb733df0d9c87625285eb8ef419 SHA512 234ae6322d86d20ce4116991068ef65458f686adfb7b956d5a7c24af672d62a7552ce5023978e65d061e7f9f19b0e9a76e7730f345312a6555fccfc73826df32
+EBUILD patchage-1.0.6.ebuild 920 BLAKE2B 16c58bb17b90792513457d5335cbad58205b168bbe16f7b4ffa7fb6c6eb56454b4c4eba6bfc6c917d0fdd94b56dea03ef297400332ae6e601c8821bb35c6ad5a SHA512 e2a82337ac41646d7aa1d407cd68856f4d9b230d021e820e268274126c6a393325032bcb1096258441cef131b1d3130e1049bd166f66d0b24003b1c21b90b8aa
+MISC metadata.xml 427 BLAKE2B a77d10e847d1ceb32b0ba9ba22a723df471d751c6ecd7ddc849f13fea71c451b9a0c7959687ba09efd23ca7dd6ffd7a77e00abd69021f5ecfeacde0680fa0814 SHA512 3ed9c62eb59dad36bd4477bcdbb95eeff21fcf8ac8c989814d24e288e58b7032452acbce472a191c8151551071b86274fdb935ae6ef5cb916a4b22510ec96789
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 31c35cf5131f..4bae645001ae 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proaudio@gentoo.org</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
-  <use>
-    <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
-  </use>
+	<maintainer type="project">
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
+	<use>
+		<flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+	</use>
+	<upstream>
+		<remote-id type="gitlab">drobilla/patchage</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/patchage/patchage-1.0.6.ebuild b/media-sound/patchage/patchage-1.0.6.ebuild
new file mode 100644
index 000000000000..6e6e47d0591f
--- /dev/null
+++ b/media-sound/patchage/patchage-1.0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='threads(+)'
+inherit waf-utils python-any-r1 xdg
+
+DESCRIPTION="Modular patch bay for JACK-based audio and MIDI systems"
+HOMEPAGE="https://drobilla.net/software/patchage"
+SRC_URI="https://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack-dbus"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+RDEPEND="dev-cpp/glibmm:2
+	dev-cpp/gtkmm:2.4
+	media-libs/ganv
+	virtual/jack
+	alsa? ( media-libs/alsa-lib )
+	jack-dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/libfmt:="
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_configure() {
+	waf-utils_src_configure \
+		$(use debug && echo "--debug") \
+		$(use alsa || echo "--no-alsa") \
+		$(use jack-dbus && echo "--jack-dbus")
+}
diff --git a/media-sound/pulseaudio-daemon/Manifest b/media-sound/pulseaudio-daemon/Manifest
index 9089ff4510af..688b69554ef2 100644
--- a/media-sound/pulseaudio-daemon/Manifest
+++ b/media-sound/pulseaudio-daemon/Manifest
@@ -3,6 +3,6 @@ AUX pulseaudio.conf.d 151 BLAKE2B 99b185b9353259f37f3396c6f2bb56b80cac0159c9c5d0
 AUX pulseaudio.init.d-5 2224 BLAKE2B d7710b77b209391016e9f84b574cdf70636904d7f54caf9297357ebee97e8ae10c54119521ecad99fbef5f1ad341128b06816f8c733faa29d9c44fa8c435008b SHA512 a11d02fd1c6672a7f022e6ef3e3ad8e3a7f2bf50257c38573db0823415c990021a7bf29b1e194d3d9c8a59464673958604086ef519313a4e3a6bd79071397f29
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
-DIST pulseaudio-15.99.1.tar.xz 1546536 BLAKE2B d77b7f9d05c1ffe1490b72dbf58b479962798d6e961d4efc935cbab0a6ad7fcd6ecb99de5efa5b85658b58e59024087cfd446ac4e7eeef1cd38fa7e579b5fb3c SHA512 3eb7cdc9795204513d43336836d12709e78ebb001a97e9bab81969a4981a10df2d68a5fad34aef2660f37b72d269cb01e4c6e76c42a5c5742ac56c0f575778d5
-EBUILD pulseaudio-daemon-15.99.1-r2.ebuild 10750 BLAKE2B 8fc7f6d0d6ca2ee681381b38d3eb64d66cc4fe5b75f3639e21475179e13bc31019aa5c154c361aa1cf3b83147b4e3d8aef332ddcecf8efad59e27fb62678a86f SHA512 c564acd1bd2151d5de10e2b559f8b215b3a9009ff762ac8a138f3d2b3527a1575e6d7f2946eb94bdd3b6d274cc0bc841aea74abdaa2ba54de2380790cb1379cb
-MISC metadata.xml 3219 BLAKE2B fd8c28b21c9fc9d2185d2f92481b5cdf1b344dbd95a7d668f5fa14320f90698654ae68cca14789fd9f83fe9fe9b46f906988acdbce36c5e0102846baaf10e7e0 SHA512 9b1c4d4a5077d6e7dae69c4f54d82586d77d32dca078ae39f63995b2b2320ec9804be24688657ed47823ee034ce8b54a8f9e0229e9b35849778b0204ef97352c
+DIST pulseaudio-16.0.tar.xz 1551276 BLAKE2B 54ba5d446bc02246bf842280f577851eb66ff9fed1e1b0d2d03e238796d9d04bc1fc27215b02fdded37441da1747be23d1e03d5a00b79ee3b91eb35c0f76a470 SHA512 42d4968c2dc88f5e39a5358d124e399e40a5abdf815eff387087141bc9dddd217012acb35649a8e0e24a44e8a402d90eb193ce2eef186f7d59550f757a6cc26d
+EBUILD pulseaudio-daemon-16.0.ebuild 10812 BLAKE2B b5ba77e07000afb6409f014fbdc1d5e4f3aedd9cdc239185d8ae3b2023addebd5caa6d13b13f4ce9893a8d92a43cade609bcc6ad502bcd7cb29c92a9a51820ba SHA512 ce2afb4e0f0c4963f7b93283f20c3ec22b7faa3d2ad45640bd8b8d45c8d263b0bc9f196ecaf06833e06932d71d4c63a9bf177e6dcf739cc48e3a6c127e30ed72
+MISC metadata.xml 3285 BLAKE2B e8e8ad3ff3c4535fa3cf689fb0417b1dd40f920280837984129b33608e7d1418e40115e636de20405ddc4acb810fe9a73293e6858ee4dae21eaed4f37d57e017 SHA512 ddb79bfe43bc877b05e86482d547f4ea5e07a7036c1e1386653de770717ef6d367dc4f986f68c19831afeecd6a0fc41cba44842861bd00f9d4765fd3241c0845
diff --git a/media-sound/pulseaudio-daemon/metadata.xml b/media-sound/pulseaudio-daemon/metadata.xml
index 0a4437e23510..01b2fcbf1b72 100644
--- a/media-sound/pulseaudio-daemon/metadata.xml
+++ b/media-sound/pulseaudio-daemon/metadata.xml
@@ -56,6 +56,7 @@
       Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
       ConsoleKit.
     </flag>
+    <flag name="valgrind">Compile in valgrind memory hints</flag>
     <flag name="native-headset">
       Build with native HSP backend for bluez 5.
     </flag>
diff --git a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild
similarity index 98%
rename from media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild
rename to media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild
index e1c72c7c113e..17d8424a2b3e 100644
--- a/media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild
+++ b/media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild
@@ -33,7 +33,7 @@ SLOT="0"
 # TODO: Find out why webrtc-aec is + prefixed - there's already the always available speexdsp-aec
 # NOTE: The current ebuild sets +X almost certainly just for the pulseaudio.desktop file
 IUSE="+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc
-native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf"
+native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -56,7 +56,7 @@ REQUIRED_USE="
 # - media-libs/speexdsp is providing echo canceller implementation and used in resampler
 # TODO: libatomic_ops is only needed on some architectures and conditions, and then at runtime too
 COMMON_DEPEND="
-	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd?,X?]
+	>=media-libs/libpulse-${PV}[dbus?,glib?,systemd?,tcpd?,valgrind?,X?]
 	dev-libs/libatomic_ops
 	>=media-libs/libsndfile-1.0.20
 	>=media-libs/speexdsp-1.2
@@ -95,6 +95,7 @@ COMMON_DEPEND="
 	systemd? ( sys-apps/systemd:= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	udev? ( >=virtual/udev-143[hwdb(+)] )
+	valgrind? ( dev-util/valgrind )
 	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 )
 	X? (
 		>=x11-libs/libxcb-1.6
@@ -211,7 +212,7 @@ src_configure() {
 		$(meson_feature systemd)
 		$(meson_feature tcpd tcpwrap) # TODO: This should technically be enabled for 32bit too, but at runtime it probably is never used without daemon?
 		$(meson_feature udev)
-		-Dvalgrind=auto
+		$(meson_feature valgrind)
 		$(meson_feature X x11)
 
 		# Echo cancellation
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index bfed4e0ca828..d93b00cb4eb5 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -11,6 +11,6 @@ DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 EBUILD pulseaudio-13.0-r1.ebuild 11420 BLAKE2B 9dbe3d7ca0e295c016925e23369ec3b499dfa2d48c67289936c4211c07a72512251efc2e61688571ed5a0b6406a85f78efecaa8f5385283ea40d1659ceb54a86 SHA512 d5a27a4a1382dbaf0df03f72c020ed35ca221f98e3231cbd8a210656fd45a355091c7fdf1754e20ab63a97eeafedffa49b6a307a7bf0ce410a5cfaff998989c8
 EBUILD pulseaudio-15.0-r2.ebuild 11169 BLAKE2B 87e797d697ecdf882c30da4bb573322dab4c2a24c92f18738c93cfad16cf9405d1a3745db130e2774758b459e131b06f66b5d794eb0fc40d760ef8b2bee16710 SHA512 d751359d6305ceb29957a325aa77b4a1b4206f5d86ed98346df1e9f272f06fb43867e5154ab65b8911d36816d74d7238970ceb06b792ea3e08ef5ef63fa5b663
-EBUILD pulseaudio-15.0-r3.ebuild 11218 BLAKE2B e4ea86454bdd6d58cb0dde82a6826068ca441141a0b0642ea5c54f1d13f8c9f18ec318134a3ab8a597afad240b77ca8670ae1c8b1bcdf6c0b1850dec50eff44a SHA512 774ed8b83d1ccd19e9556e3b2caa8d824799cf309e172215ea64ff331ccee1260a47e944440bd35e4a25544a95be6c7afd89da5f820c1df63ae219ba4f09fbda
-EBUILD pulseaudio-15.99.1-r1.ebuild 934 BLAKE2B 96f03b2a9085b1b45488b4fc9eb035a52e85c61a888b588613e5bd9a785bfdd9684c3e7db765669d8485257bf271a42e61b3c8ed3c9cbd4f87887f0a0c8f1079 SHA512 fc5bdb8a1d6afb9ad8e7be6fd97ad925d3135e2937bcdadf5758dfa3998ac611c6b3c03662cff03a838e63acaa078a4fdd7cbe3899435c8a6d89e30dfe4cc46f
+EBUILD pulseaudio-15.0-r3.ebuild 11216 BLAKE2B b6b81a19e36106b2faff1607539af5c11a612c1a9f686f2d76b1d3a22873fddec171821ffedb3224dab2e1737fe87019460869f9059f800627a0b842ac1792ed SHA512 eadd4841cda27faa7c86b31e3cb2d658e01096ce2c4bfe1e818387294d11de3f1199c54512166df0f3dda5470f2cf7b9e37e4fcdcfe69bc29c9fe5cceaab3817
+EBUILD pulseaudio-16.0.ebuild 934 BLAKE2B 96f03b2a9085b1b45488b4fc9eb035a52e85c61a888b588613e5bd9a785bfdd9684c3e7db765669d8485257bf271a42e61b3c8ed3c9cbd4f87887f0a0c8f1079 SHA512 fc5bdb8a1d6afb9ad8e7be6fd97ad925d3135e2937bcdadf5758dfa3998ac611c6b3c03662cff03a838e63acaa078a4fdd7cbe3899435c8a6d89e30dfe4cc46f
 MISC metadata.xml 3874 BLAKE2B 0aa44014b4b731a193e4bbf4f0eca2e3df5946d8e210f90679d7625b61f18ff29c5b3dd18999b489997471885fd1f3f8fcf722eae2cf1e4210e236f8b025540a SHA512 01c4d22c01cc92570dbfeaa749c82b434ae25520ace0258bc61f74fc51beba1235affb39b4eb1609c9e39d6215b46b721524f606bc391dbc6955084186cb1efd
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
index 962f0f34e649..85f1d2a7a9a7 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
 else
 	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # libpulse-simple and libpulse link to libpulse-core; this is daemon's
diff --git a/media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-16.0.ebuild
similarity index 100%
rename from media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
rename to media-sound/pulseaudio/pulseaudio-16.0.ebuild
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 1366141b42c2..702ce0051f4d 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,7 @@
 AUX pulseeffects-4.8.5-meson_no_automagic.patch 1529 BLAKE2B d3ac44aed8a08ab62b932032b3c25e7e0019fbdc2c70e33114d4cca787e3f441ffe2bdc0c3c8c65a5f5a79b396c965b3f2c2fc4f1a9c392c1dc347c53f6460fa SHA512 508856da931ffeeab631ac684ba918e113144b345d95670bf0ac7c3cb1a4033745f2dfbfbf2cbb02a26a61c21146d74b0cbf22951386b3fc574f314d6318ae69
-AUX pulseeffects-4.8.6-boost_1.79.patch 872 BLAKE2B c3f5f6a763b3c373a92ae5c009ce43b6c308b3a298c282a6b137246536fa4662dc0eeec509b15d3943dad05ef0b7da9aa8935d259c1284dc83106e8efe086946 SHA512 c63cfe67fcf1c6c6da8104ee81aac76115030557df456f165c37b5c3479d8b256967410cf8a144186af43fc1c6ea4c68658eca5ad37ed812e9599db67b8f6da1
-AUX pulseeffects-4.8.6-meson_no_automagic.patch 1529 BLAKE2B 63ff162b0d0dbf7d091d6d1ce4b57bd4e0f43c72d795457ede6709d26ceea661fb7208ea762b8061458a456c1ebdeff24c2e4e1c5b1796b0fa7f11d268e85e7e SHA512 d086cbe38a6aa0149bea52e4b6fde74edfc0d769fe56225754ce13ee0316f3c149333527ca0512dc0f3f703ff84f3f5da19b4504cd2d6100c79d14fa54967bbd
+AUX pulseeffects-4.8.7-meson_no_automagic.patch 1529 BLAKE2B 1a40bf0382e378129b784a1d65138e89934757b2e3580616e163a9f2be1675b6a181b3909b3d7dd25b5e1bc5243d316534e2eaae4d7f82e4764645be33ac6c15 SHA512 249fb9a3c4254c21a49c46b1eab4d0c9dd6081a1367d192be7f9446b97235aa2c5ef909465fe130c0d01024f6152a7208c5a2205781d8f84bf5b6bf1e10204cf
 DIST pulseeffects-4.8.5.tar.gz 2028531 BLAKE2B 0ba68c90d4eb25e3b22c4f39f989bef428c970f0dcfa0b301c500928f835d76c31cd1d7692d1a853b3121d4e8fbee8102c1f538b06cb15933509719a6da5d8a0 SHA512 b72f4d5356af1308d997f01ac2efc5eefb569e9a1253f0a19918aec5f9c2d386ab5c293a5aa6a28e8d15200289f32d34c8f3d524bc50874c750afdee61bc0820
-DIST pulseeffects-4.8.6.tar.gz 2028485 BLAKE2B bf50c72773670ec9b8fd1f21b927b23f6656a2de6c86fc0b68a8fb199a2c949146d1c550f6ce291ca713edb5d0f2a034cf5cae6f3d266c4ef0f541c5f247e422 SHA512 37ad97e7234e9dae0f3be910b35b2dfed94f593c39e59b9977e31c95108e7edede4104cc5fe32292e617f119898c4bad4e9fd5afdfb9aaaa134f5cb78fc5fa0f
+DIST pulseeffects-4.8.7.tar.gz 2028489 BLAKE2B 705783104c7ce3f4ff1246cf05c1a31c09ef0507a720365b9a8914e6e076a209dcc56e240ae2de1981f3ab377f10947d08260fe8ae8b3cae5724db1235a0c01c SHA512 0fa679723ba76ab0a0cf3136dfa66fec09b16643f3f4f7bd1bb2826794d907c5c29a2fc7633e30d3542ddf755c842fdaa167528942fe459e3e697ac3524c0cb9
 EBUILD pulseeffects-4.8.5-r1.ebuild 2236 BLAKE2B 1dc26ed814192ccc3af475a41b5bce38b5659b895983071cd6a4a3be9f3ba5d864c7f9b7e9721e6f42b8776a4697af024ddc3d394fd0995fff284a457f0ab2be SHA512 484d0995b1f56ea5df785612a2ddbce2e6d6473995228838ff1fa54126dd14453cfcff3621e8dde3cba59cd9d5cf8bbb3a3596c4b2e7b4859e6af7a2e72bc219
-EBUILD pulseeffects-4.8.6.ebuild 2309 BLAKE2B ecd5f4b4149d9c00e4a2ed5867a2557f7635ff63533b9681bdf39bd0859678302718a8fc791454b444b538ffe309ac2dbd7e0c2e05eb9dfedc0d760cc732326e SHA512 3df6e5825be388d2abdbc9b19d62da277f733ec5664cf19255769443c02b5807eeb8c71c5b85ffd64ecbaa9a081ffb2128147c4b89cea2bec14e8d58b3f141f3
+EBUILD pulseeffects-4.8.7.ebuild 2272 BLAKE2B 85d17be336f47d40d88040c14fdb9b94c0cabd7ebfd736d6eb9a1931d7bfe9338b6f8f756649ae95f948a27d3750e12e11ff9b2f29f51609b704eef48e9f4e0e SHA512 0fee68bf5a3efcab10542a4f59cb45e75312638f9de2f06f2d8bd45948c3be57a5015e4671bd3de33c86e87ab7b3957e04124048c94efd1de7fcdc7feb1f2587
 MISC metadata.xml 1353 BLAKE2B 8a3ab829edb36bf0f711057096176b15fad113820ec9910d5791c20cf9bc2802396264c43550a8a46b1f8318357b4d4e6a99c264d7b0b89aadc201b8f5098dee SHA512 bab593219b241f0903415945c110bdbe08197618d648785bbe0a7ed5c8a53618e16d60f82e5456ccd4236762384ae571bfc484bbb2f6aac8c99bd9d339f30e65
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.6-boost_1.79.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.6-boost_1.79.patch
deleted file mode 100644
index 825aaca32822..000000000000
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.6-boost_1.79.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/844898
-https://github.com/wwmm/easyeffects/commit/1000de1c27f422fb2fd6106c554844e9d81925cf
-
-From: Sven Hesse <drmccoy@drmccoy.de>
-Date: Sun, 15 May 2022 19:04:32 +0200
-Subject: [PATCH] fix compilation with Boost 1.79.0
-
-Boost.Filesystem in Boost 1.79.0 changed the already-deprecated header
-of string_file.hpp to be not included by default anymore in its commit
-266e1ac892a6f54d807fb35bf639a9aa1c8b2db1.
-
-Boost.Filesystem's fstream.hpp was never included directly by default,
-but string_file.hpp did include it, so this code here in PulseEffects
-worked. With Boost 1.79.0, though, it explodes in lin 179.
---- a/src/general_settings_ui.cpp
-+++ b/src/general_settings_ui.cpp
-@@ -21,6 +21,7 @@
- #include <giomm/file.h>
- #include <glibmm.h>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include "util.hpp"
- 
- namespace {
-
diff --git a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
similarity index 98%
rename from media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
rename to media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
index 0288fab2987d..7d29270ce54e 100644
--- a/media-sound/pulseeffects/files/pulseeffects-4.8.6-meson_no_automagic.patch
+++ b/media-sound/pulseeffects/files/pulseeffects-4.8.7-meson_no_automagic.patch
@@ -3,7 +3,7 @@
 @@ -4,7 +4,7 @@
  	'cpp',
  	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '4.8.6',
+ 	version: '4.8.7',
 -	meson_version: '>= 0.40.0'
 +	meson_version: '>= 0.47.0'
  )
diff --git a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
similarity index 96%
rename from media-sound/pulseeffects/pulseeffects-4.8.6.ebuild
rename to media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
index cb43e0354667..9d5f05ab09b9 100644
--- a/media-sound/pulseeffects/pulseeffects-4.8.6.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
@@ -60,8 +60,7 @@ BDEPEND="dev-libs/appstream-glib
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.6-meson_no_automagic.patch
-	"${FILESDIR}"/${P}-boost_1.79.patch
+	"${FILESDIR}"/${PN}-4.8.7-meson_no_automagic.patch
 )
 
 S="${WORKDIR}"/easyeffects-${PV}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index b20dce8f32c2..90b9ead2d9a0 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,6 +1,7 @@
+AUX 3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch 5817 BLAKE2B 2530b6064799c647955d5f1b08174933137de7e4a4d76afc61091693386a84d70e5a453c3d68d648bed12017574d05f794779418e0ce995a1f5f17dd447156ce SHA512 2219b5f40717970953ce20cd92703c67a8c54461fd544275a3efaca141c2e070706ada82ea966de8a641ce67eca354193368215ea45f2c5a64e381b2347e2d4f
 AUX 3.4.5-relax-meson-version-check.patch 1058 BLAKE2B cd8e34536be5bd95ccf040fcac294da2a28d433a0b4f7ceade4723e1993613c1b165b3bd2490adb8cfa59514cefff88ca415ca1dc531eb7afca47db0a2b39471 SHA512 c60a488df140bc587efd57aaa14768ab804d096f154f27c3838b86aabf6c92817cb7e485ad0fec07ec1f8b2b7c2465ff458e77ee16ca7dcb126d9de87de8f8d5
 DIST rhythmbox-3.4.4.tar.xz 3890320 BLAKE2B 69c89c0478d6c43e1c4a10d39f25c25c3dc81f9b93f870e0de8947395e0f49d3902cb8dcf74c945da744536090b7058616545ad706626047e0c8fb61b0b792d7 SHA512 1fcd41dd66ffe34852f8cedb80ade57d101118295d6fd6f0a8687000ab6500991d2e11482daedb30a7abaf63e54e33ee3c4eaab73b075ec5e5907182f9a8c865
 DIST rhythmbox-3.4.5.tar.xz 3537764 BLAKE2B fe710816d0c48f5eac6925d5d160f0db060a3369a98afb8b57bd746998e40d413e51e3f5d2631d28eccb5af9a5b71b511f2c42812fbfa88e2cfd46f16338cc78 SHA512 aa9451a5046a99ed4318a45de6e3df069e7646d83e27895608a1e66f664312d0c2b72c8bb9da902eeb1255ab3d2f15956f4891ff51c1ad28f572c9c020dcefb7
 EBUILD rhythmbox-3.4.4.ebuild 3337 BLAKE2B 75495811cd8c559c630d14d33340c7d67b8d7c9acf0d50ad699fc6b4657fa389c9b39ae131a461f74e7eddce69c2b15117e7aa1bbcc077e653386a33bc312ae6 SHA512 2a489d4f822bed89869886dd41cc0852d5e7aefc017e03a7a31c67ca55663a4eb518d83b3ff4785fdf768cffd4c083b849b923defd9f9a5a37f18881c70cd318
-EBUILD rhythmbox-3.4.5.ebuild 3334 BLAKE2B 3cd2333b5f5f7e80db86ecd37337e9d3c3d7fdd6e01e93aceffcbe7c05966851a47d381f9ba717fde9cc8d7f24433a41b7a63f12e0783af878259a0dacb4f2da SHA512 b1a73477c5206fd6b30f61b72ef763f8a514c7b3de925821366f3b4243c4512c62d5541d32ca7d7023c60447c09db58606a1e85dd1daa109ca333b39e6b09694
+EBUILD rhythmbox-3.4.5.ebuild 3415 BLAKE2B 319a62ee706e0777afa2848d250514345212da2a2305dd6db68455766f4db92e091c227a009870ec55ea7919691aa12a57bfb620af7b2e73f4f56c5a8010509e SHA512 37cd266bbd929b95e4dc5539c0bddef75934214df0f1af51db273156cbb12d565332357349f365167dc294b6ce7f59fac3d128473111746a1347ee08e968f975
 MISC metadata.xml 546 BLAKE2B 3f273ab651f53329ae8c493be78977713b4bcf31b35a65d66b523f5b27e11b456b26cddf78ce4ec7b08478fff2fceb875b7e976e9491cb63007744ea93f518ed SHA512 bb4c662bc4728e72ff31d32101da0b67e77e254e3511de9b7cf5bf98bc224f21d6b31e07f3c687c41d66f7abe15109d353402d6db5405086edea1f5518f2436d
diff --git a/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
new file mode 100644
index 000000000000..294d2d2ef66f
--- /dev/null
+++ b/media-sound/rhythmbox/files/3.4.5-build-don-t-use-feature.allowed-around-dependency-ch.patch
@@ -0,0 +1,169 @@
+From c9dfc5a5899d2628ba1dd6f93f46cf589669bd45 Mon Sep 17 00:00:00 2001
+From: Jonathan Matthew <jonathan@d14n.org>
+Date: Tue, 17 May 2022 08:18:21 +1000
+Subject: [PATCH] build: don't use feature.allowed() around dependency checks
+
+When the feature specified as the 'required' parameter to dependency()
+is disabled, it returns an empty dependency object, which is much easier
+to deal with than a dependency variable that's only conditionally
+defined.
+
+Fixes: #1972
+---
+ meson.build | 94 +++++++++++++++++++++--------------------------------
+ 1 file changed, 37 insertions(+), 57 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5792b0e49..de265901b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -70,71 +70,52 @@ tdb = dependency('tdb', version: '>= 1.2.6', required: true)
+ totem_plparser = dependency('totem-plparser', version: '>= 3.2.0', required: true)
+ 
+ use_gudev = false
+-if get_option('gudev').allowed()
+-  gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
+-  if gudev.found()
+-    use_gudev = true
+-    cdata.set('HAVE_GUDEV', 1)
+-  endif
++gudev = dependency('gudev-1.0', version: '>= 143', required: get_option('gudev'))
++if gudev.found()
++  use_gudev = true
++  cdata.set('HAVE_GUDEV', 1)
+ endif
+ 
+ use_ipod = false
+-if get_option('ipod').allowed()
+-  libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
+-  if libgpod.found()
+-    use_ipod = true
+-  endif
++libgpod = dependency('libgpod-1.0', version: '>= 0.7.92', required: get_option('ipod'))
++if libgpod.found()
++  use_ipod = true
+ endif
+ 
+ use_mtp = false
+-if get_option('mtp').allowed()
+-  libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
+-
+-  if libmtp.found()
+-    if use_gudev
+-      use_mtp = true
+-    elif get_option('mtp').enabled()
+-      error('MTP explicitly requested but GUdev is not available')
+-    endif
++libmtp = dependency('libmtp', version: '>= 0.3.0', required: get_option('mtp'))
++if libmtp.found()
++  if use_gudev
++    use_mtp = true
++  elif get_option('mtp').enabled()
++    error('MTP explicitly requested but GUdev is not available')
+   endif
+ endif
+ 
+ use_notify = false
+-if get_option('libnotify').allowed()
+-  libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
+-
+-  if libnotify.found()
+-    use_notify = true
+-  endif
++libnotify = dependency('libnotify', version: '>= 0.7.0', required: get_option('libnotify'))
++if libnotify.found()
++  use_notify = true
+ endif
+ 
+ use_libsecret = false
+-if get_option('libsecret').allowed()
+-  libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
+-
+-  if libsecret.found()
+-    use_libsecret = true
+-  endif
++libsecret = dependency('libsecret-1', version: '>= 0.18', required: get_option('libsecret'))
++if libsecret.found()
++  use_libsecret = true
+ endif
+ cdata.set('PY_LIBSECRET_ENABLED', use_libsecret)
+ cdata.set('WITH_LIBSECRET', use_libsecret)
+ 
+ use_lirc = false
+-if get_option('lirc').allowed()
+-  lirc = dependency('lirc', required: get_option('lirc'))
+-
+-  if lirc.found()
+-    use_lirc = true
+-  endif
++lirc = dependency('lirc', required: get_option('lirc'))
++if lirc.found()
++  use_lirc = true
+ endif
+ 
+ have_libbrasero_media = false
+-if get_option('brasero').allowed()
+-  brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
+-
+-  if brasero_media.found()
+-    have_libbrasero_media = true
+-  endif
++brasero_media = dependency('libbrasero-media3', version: '>= 2.31.5', required: get_option('brasero'))
++if brasero_media.found()
++  have_libbrasero_media = true
+ endif
+ 
+ have_gnu_fwrite_unlocked = false
+@@ -189,16 +170,16 @@ cdata.set('PLUGINDATADIR',  plugindatadir)
+ cdata.set('SAMPLEPLUGINDIR', libdir / 'rhythmbox' / 'sample-plugins')
+ 
+ enable_python = false
+-if get_option('plugins_python').allowed()
+-  python = find_program('python3', required: get_option('plugins_python'))
+-  pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
+-  pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++python = find_program('python3', required: get_option('plugins_python'))
++pygobject = dependency('pygobject-3.0', version: '>= 3.0.0', required: get_option('plugins_python'))
++pyoverridesdir = run_command([python, '-c', '''import gi; print(gi._overridesdir)'''], check: true).stdout().strip()
++if python.found() and pygobject.found()
+   enable_python = true
+ endif
+ 
+ enable_vala = false
+-if get_option('plugins_vala').allowed()
+-  vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++vala_found = add_languages('vala', required: get_option('plugins_vala'), native: false)
++if vala_found
+   enable_vala = true
+   vapi_dir = meson.current_source_dir() / 'bindings' / 'vala'
+   add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
+@@ -231,12 +212,9 @@ if get_option('daap').allowed()
+ endif
+ 
+ enable_grilo = false
+-if get_option('grilo').allowed()
+-  grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
+-
+-  if grilo.found()
+-    enable_grilo = true
+-  endif
++grilo = dependency('grilo-0.3', version: '>= 0.3.1', required: get_option('grilo'))
++if grilo.found()
++  enable_grilo = true
+ endif
+ 
+ enable_check = false
+@@ -279,7 +257,9 @@ summary({'iPod integration': use_ipod,
+          'Python plugin support': enable_python,
+          'Vala plugin support': enable_vala,
+          'Libsecret keyring support': use_libsecret,
+-         'FM radio support': enable_fm_radio,},
++         'FM radio support': enable_fm_radio,
++         'Grilo support': enable_grilo,
++        },
+         section: 'Plugins')
+ 
+ configinc = include_directories('.')
+-- 
+2.35.1
+
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
index c4b440ad855b..d9e9ffb13091 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
@@ -93,7 +93,10 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
-PATCHES=( "${FILESDIR}/${PV}"-relax-meson-version-check.patch )
+PATCHES=(
+	"${FILESDIR}/${PV}"-relax-meson-version-check.patch
+	"${FILESDIR}/${PV}"-build-don-t-use-feature.allowed-around-dependency-ch.patch
+)
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index 6cef3bcd35b9..f5abd1089ee3 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,3 +1,4 @@
 DIST sonata-1.7.0.tar.gz 2258617 BLAKE2B 704f673737095351f88f64bc858db465b26d8e0fdb34cbb4d3917abe65ec276ec3e6419edd41d9e8b193a886c8dfd178b5fc94daa4a178aae817c2d3024c266b SHA512 c60c16b6cca439c2063069ceea62afdb9f09c9735d36ba42e2b5b1caf07506f15d722d75c68e355db4615b937a728679aeae1619527ac8267feec111635c27f5
+EBUILD sonata-1.7.0-r1.ebuild 932 BLAKE2B e2d470092dc57f8c000975293b2a1e2a59bc31b65dbf62038e6519ca5a75a958500bea3e9bfde8506abfe63106e228998f3c4ab604bc3d6b3fc9b03b6d99836a SHA512 e96d741d34da389b2f23375dff13e88192424b18aac4a157144ab8d46c1b45e8e8bbff057306c5d1ffc4c692b54478462072b6562a7f7eb02c2df0439178e2a7
 EBUILD sonata-1.7.0.ebuild 939 BLAKE2B 897bba35fe7242a4ae7566d310233394b3f4503bbaea3fe82f55851d9ae91257d2b562731659d33e7f9f12767d3d33d1fe8a6728708bc244b2f92254c410bc7d SHA512 7667dbb253e1f3db4e7a7f6ccaeed3b4f41ea06f521745aa632df0d4955ed598915b2060cd5af80a759209345e38f4bec0ce3d7acbd5ae30780637a1922cc777
 MISC metadata.xml 479 BLAKE2B a6af1d8ece4f12a3acf9c8f05bace4fb6cca33024f7c7c7fb522d03984cbef587bd62f46478df77ac14dac26b4956fe16b7e52d2b1f534daa36bc3152e2bec3b SHA512 ffd3a9e6f601890b84a6ebb27e24c500dd4bf8c49e872dfe599dc692a2b4c703235aa1b21e75710b601e1524951ec8121546970a75e5a7e970aaeaddc957fe92
diff --git a/media-sound/sonata/sonata-1.7.0-r1.ebuild b/media-sound/sonata/sonata-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..9f2634cd65b6
--- /dev/null
+++ b/media-sound/sonata/sonata-1.7.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+inherit desktop distutils-r1 xdg
+
+DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.nongnu.org/sonata/"
+SRC_URI="https://github.com/multani/sonata/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus taglib"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/python-mpd[${PYTHON_USEDEP}]
+		dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+		taglib? ( dev-python/tagpy[${PYTHON_USEDEP}] )
+	')
+"
+BDEPEND="virtual/pkgconfig"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doicon -s 128 sonata/pixmaps/sonata.png
+	rm -r "${ED}"/usr/share/sonata || die
+}
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 4083571975b7..f87e522acc7d 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,5 @@
 DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
+DIST soundconverter-4.0.3.tar.gz 655814 BLAKE2B ffb8c1e8dafe631c5320fbb4af12eceb6fec7ed8267aba2f6da9ef3b76ab12b85eee92ff58c9743b36ab5c92e4148f0a7a66d5fda66fc126fc266e9ec24d9fc4 SHA512 018c2409101c21b85ff25581dac70a64d072cbc4aee29842aa25745f20e2cc03cf2c8ed1f34bc9ac5e679f7a6631a7998fb9183dc5adf69cab907f757727b959
 EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
-MISC metadata.xml 349 BLAKE2B 48933367cf9c097cd0f081328bb264294c3ff3c81cf8c782dca6a1528dd9e8aef406b3ee7ac561c7e6b8a69335266fc63654103b505ea9730e1262b14cc3bef8 SHA512 d9224edbd42d76ac53151c8deeb7cf5f428c020970554fb4757a4380d5e173c5a2938dd87703afd1bc9b634ffdd8b227d8eda1c6b933e341cb7cd894e82fe151
+EBUILD soundconverter-4.0.3.ebuild 2726 BLAKE2B c876a2857f006ef8437b598ed0f11d231b8c221e5573c855ffed0fa75d03b32be406d03f492556db9f2629f92502e8db63e82e15d2cf6d5a6b2f9265604cacbb SHA512 a01bddd4ed6685123f8753f74df501b0a115acc67d58a4b37a5922df7a30970b921702008cf4200335db79a0eb88f16b4f4da89a0ba58704539e1af594001410
+MISC metadata.xml 413 BLAKE2B b72915536e7a83e087d9fbe87756b3a8ffa38265360d17bfacaadf75694a032bf55b024574813692ff91e0664ab0849584ab3027e277443260ff9a3afc31ffa4 SHA512 772a3ec6f12308dea14140a65e35c66066e7f9869e1518f92313f23f46f2a6f7b3f18f3b2650c7197c934d07219bca656c446aae7ef7532b57323f924222939e
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 1fd31681d373..e16be19bd1bc 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">soundconverter</remote-id>
+		<remote-id type="github">kassoulet/soundconverter</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/soundconverter/soundconverter-4.0.3.ebuild b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
new file mode 100644
index 000000000000..334ca9cba906
--- /dev/null
+++ b/media-sound/soundconverter/soundconverter-4.0.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit gnome2-utils distutils-r1 virtualx xdg
+
+MY_PV="${PV/_/-}"
+DESCRIPTION="A simple audiofile converter application for the GNOME environment"
+HOMEPAGE="https://soundconverter.org/"
+SRC_URI="https://github.com/kassoulet/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aac flac mp3 ogg opus vorbis"
+
+# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
+# List in soundconverter/gstreamer.py
+# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
+RDEPEND="
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]
+	x11-libs/pango[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python[${PYTHON_USEDEP}]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	')
+	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
+	media-plugins/gst-plugins-meta:1.0
+	flac? ( media-plugins/gst-plugins-flac:1.0 )
+	media-libs/gst-plugins-good:1.0
+	mp3? (
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+	)
+	aac? ( media-plugins/gst-plugins-faac:1.0 )
+	opus? (	media-plugins/gst-plugins-opus:1.0 )
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	')
+	test? (
+		media-plugins/gst-plugins-flac:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-lame:1.0
+		media-plugins/gst-plugins-faac:1.0
+		media-plugins/gst-plugins-opus:1.0
+	)
+"
+
+# Before PEP517: tests seem to hang and also fail to find fdkaacenc from gst?
+# After: need to trick it into finding the data (inc. glade files)
+RESTRICT="test"
+
+python_prepare_all() {
+	gnome2_environment_reset
+	distutils-r1_python_prepare_all
+
+	rm -v "${S}/CHANGELOG.old" || die
+
+	# workaround incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	! [[ -v LINGUAS && -z ${LINGUAS} ]] || rm po/*.po || die
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	export GSETTINGS_SCHEMA_DIR="${S}/data"
+	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}"/data || die
+
+	"${EPYTHON}" tests/test.py || die
+}
+
+python_install_all() {
+	rm -v "${ED}"/usr/share/glib-2.0/schemas/gschemas.compiled || die
+	mv -v "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die
+	distutils-r1_python_install_all
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0c6689b107bc..5c1949d9d189 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -11,5 +11,5 @@ DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4
 DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
 EBUILD xmms2-0.8_p20201016-r2.ebuild 5910 BLAKE2B 857f8877eed08b63640483f312fa99d9a626f2f32988f525c156d5416d1b3812740c63086a59cb0aadef6aaf51f4685706ff4ad1fadb30aadb063f8c0b3bd09e SHA512 4837be50ebf0560e263aa54bd98d462140e63a86456942f42efeb4869897274b5f5b5a643a80df67482ee755ed8230406d102db15cfa7d16b18526b52bd3b24d
-EBUILD xmms2-0.9.1.ebuild 5505 BLAKE2B bb5d03e6b8dc67a3d5329d28d64553ef4aa60b2e11d9cd334054b8ca887af77e38cae215751ee136a57b058a0b0a3af7d5bf5cc322c4629918ac204e9da19395 SHA512 8eee7a7d1831a0b75eafec174b42cc197b76735eac11f7af1213db695d9d07e4bf36fafeaa6ffc6f4c63b244130f9b8b00ce07808203a53e57ebb4b7242cc837
+EBUILD xmms2-0.9.1.ebuild 5502 BLAKE2B 6741f82610f973e266357934f2d765733620dcc06c5f7eaad2c0c1240c1417bcec729cb9eb1de71b10502293ab5f619b0ceb156f4b546a73b7e7d58e1092c619 SHA512 f29542750cf03987c3bc7cf939b1972cf0af2aa45a0f265f69d3016bb008a01c92ac0e2f4d92edf3caa7477ecc8d8d62f264528be112b847a3df6d22bd3d94d1
 MISC metadata.xml 1437 BLAKE2B 7f3c3cd1d134ee5c24a9dc1990108012640b366a587832eda270bcef2bca91777f9358a067d351f9ac83c118680b60af2955a3f195a6adc20eb84dc334553fb8 SHA512 0533f6c30210a6c2f06cefd833df6fbd8ebfcc510e6bf05133210a57d7d05e45875d829555011b6827b8fc440cb0779f85d4ca17dd3e862cf0519e874e0d8c9f
diff --git a/media-sound/xmms2/xmms2-0.9.1.ebuild b/media-sound/xmms2/xmms2-0.9.1.ebuild
index 3352a282436e..1e2c76e125e2 100644
--- a/media-sound/xmms2/xmms2-0.9.1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.b
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index d5c040d36951..ab8ef80fa0fb 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 8e6189b32b70..37c6138596c7 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,3 +1,3 @@
 DIST v4l-utils-1.22.1.tar.bz2 2086238 BLAKE2B a3f01a17ea7c8925c74dd883d30b42f54b7926d253dac79e4cadaba43abc33672804257b3b92e5aa640ead6b5aaaa2458f05e21642044d7dea77e5580a8dbe9a SHA512 8a634d8995d13f453dfaf90ca5d0dfb26f2f4b10a0d200d76a949c46f77040d12fc0a5b35e05d7b1ba68bcfc85a445be5a5ab1d4a7d4eabfe3a254038ccc6170
-EBUILD v4l-utils-1.22.1.ebuild 2702 BLAKE2B 981890ae66984abe90d454fe5fc8dd87a6e8278503c0e35f865e3e9178c0674408ab2ae467aee4fe67cff2e15e069626e45d11e1f22f92964188be63972119e5 SHA512 72017e6e5672b2d0b3cdd4671d29da9e4037866ea455d7b22038a1ce5d4f50d47fea68c97062673348a4978173aec57301a577cf3473c3f5b45d6f7a6ba69d94
+EBUILD v4l-utils-1.22.1.ebuild 2786 BLAKE2B 9d7ae7685cbfc80cd349650c94ddb140479892754cade1268eab962364f076ceb9e652ebcc214f3ecdf07073f508dd2f67534532b968ff199d19966d5e3eb320 SHA512 c89e1b232d88ae331e5ab434da29697422934c52909e2d9323c6a7b55c412b803ff6759d8cb70e0f5f4ef2029722e79b3f8de7cd7fc536ef7405da1dd3900627
 MISC metadata.xml 323 BLAKE2B 79c864de29f9e92372f16bc835f1d260bc7de2c2c809c625806cc18611c50d992abc69de9b8754afa683fabd6a9422e4eb619d87490d4cf5ae1142f05af3557f SHA512 89ec71cc2961d7a6787e4d0e95c959823d1068602ea6cbeac7065ffe926e6c218ad7984c32271131e2624f49f314507cccf1a639e68e3669481d979dcc50bdc7
diff --git a/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
index b8517c0d787b..6566baa52d21 100644
--- a/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
@@ -101,6 +101,7 @@ src_install() {
 
 pkg_postinst() {
 	xdg_pkg_postinst
+	use udev && udev_reload
 
 	if [[ -n ${REPLACING_VERSIONS} ]] && ver_test 1.20.0 -ge ${REPLACING_VERSIONS%% *}; then
 		ewarn "WARNING! ir-keytable has changed significantly from version 1.20.0 so"
@@ -108,3 +109,8 @@ pkg_postinst() {
 		ewarn "https://bugs.gentoo.org/767175 for more details."
 	fi
 }
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	use udev && udev_reload
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e85b37c3ed67..4527aca7f656 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest
index 0889111a1e6c..119e2a7f1eb2 100644
--- a/media-video/ffmpeg-chromium/Manifest
+++ b/media-video/ffmpeg-chromium/Manifest
@@ -2,7 +2,9 @@ AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eadd
 AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05
 AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2
 DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8 SHA512 35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7
+DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9 SHA512 f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a
 DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2
 EBUILD ffmpeg-chromium-100.ebuild 6223 BLAKE2B b61ad726d698c6ae4a4e46b2d84eb30fc01f86d7eb76d3492cabf6fc2a890ae2a7c8b29cd9453153db73a87eb59a58e09c966d5978841e77af5ab3fd09f1d3ed SHA512 42055512d93f34a333342787f3df5a92029f562cc46542c77ef752e6ae6f291031e5910c166ce2608277ebc490c919921e9aa554843ef9bc9c19064e939dc110
+EBUILD ffmpeg-chromium-102.ebuild 6556 BLAKE2B 578b23d3771a279d8a0fe63cda8ce018875c2093602322c627ad746a915ecf52f01ae83e36d7ebf81d71102fe088b34b9abb3114c9a2762d90823fd95a1edcea SHA512 bf97d01da03c0d2a9e4816acd5b5198e5faf198ca56faaf3f788a9449905c2749b295bb8c684d837014bf60c9ea208f4b29a2a9022e5d141d7773c42eaa34b00
 EBUILD ffmpeg-chromium-96.ebuild 6152 BLAKE2B 1afb8f595b0f1bd5259de827ca614343165b97cd60f4443d23139d5162edd065d13e3c37f59a43b8a3837058cebcb360616f7b33c65df1fa408c3afc789a9166 SHA512 00a82ddb95b0457f5347b680ae6c7bf058052de6aacdd9e15435f84a3f2d70c776149f2e9c0ff7935f19e2fe35dcbf05ab2cea43cf6d97c1882353be35d019f6
 MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674
diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
new file mode 100644
index 000000000000..ced0a90f7959
--- /dev/null
+++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+COMMIT="5cd95cdf972ad92c38a4ea2d059ac9d6167302ca"
+DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers"
+HOMEPAGE="https://ffmpeg.org/"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz"
+
+SLOT="${PV}"
+LICENSE="
+	!gpl? ( LGPL-2.1 )
+	gpl? ( GPL-2 )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64"
+
+# Options to use as use_enable in the foo[:bar] form.
+# This will feed configure with $(use_enable foo bar)
+# or $(use_enable foo foo) if no :bar is set.
+# foo is added to IUSE.
+FFMPEG_FLAG_MAP=(
+		cpudetection:runtime-cpudetect debug
+		+gpl
+		vaapi vdpau vulkan
+		# decoders
+		mmal +opus:libopus
+		video_cards_nvidia:ffnvcodec
+		# Threads; we only support pthread for now but ffmpeg supports more
+		+threads:pthreads
+)
+
+IUSE="
+	${FFMPEG_FLAG_MAP[@]%:*}
+"
+
+# Strings for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+ARM_CPU_FEATURES=(
+	cpu_flags_arm_thumb:armv5te
+	cpu_flags_arm_v6:armv6
+	cpu_flags_arm_thumb2:armv6t2
+	cpu_flags_arm_neon:neon
+	cpu_flags_arm_vfp:vfp
+	cpu_flags_arm_vfpv3:vfpv3
+	cpu_flags_arm_v8:armv8
+)
+ARM_CPU_REQUIRED_USE="
+	arm64? ( cpu_flags_arm_v8 )
+	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
+	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
+	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
+	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
+	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
+"
+X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
+X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
+X86_CPU_REQUIRED_USE="
+	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
+	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
+	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
+	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
+	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
+	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
+	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
+	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
+	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
+	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
+	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
+	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
+	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
+"
+
+CPU_FEATURES_MAP=(
+	${ARM_CPU_FEATURES[@]}
+	${X86_CPU_FEATURES[@]}
+)
+IUSE="${IUSE}
+	${CPU_FEATURES_MAP[@]%:*}"
+
+CPU_REQUIRED_USE="
+	${ARM_CPU_REQUIRED_USE}
+	${X86_CPU_REQUIRED_USE}
+"
+
+RDEPEND="
+	mmal? ( media-libs/raspberrypi-userland )
+	opus? ( >=media-libs/opus-1.0.2-r2 )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1:0= )
+	video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 )
+	vdpau? ( >=x11-libs/libvdpau-0.7 )
+	vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
+"
+
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+	>=sys-devel/make-3.81
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+"
+
+REQUIRED_USE="
+	${CPU_REQUIRED_USE}"
+RESTRICT="
+	test
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-100.patch
+	"${FILESDIR}"/chromium.patch
+)
+
+src_prepare() {
+	export revision=git-N-g${COMMIT:0:10}
+	default
+
+	# -fdiagnostics-color=auto gets appended after user flags which
+	# will ignore user's preference.
+	sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die
+
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
+}
+
+src_configure() {
+	local myconf=( )
+
+	# bug 842201
+	use ia64 && tc-is-gcc && append-flags \
+		-fno-tree-ccp \
+		-fno-tree-dominator-opts \
+		-fno-tree-fre \
+		-fno-code-hoisting \
+		-fno-tree-pre \
+		-fno-tree-vrp
+
+	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
+
+	for i in "${ffuse[@]#+}" ; do
+		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
+	done
+
+	# CPU features
+	for i in "${CPU_FEATURES_MAP[@]}" ; do
+		use ${i%:*} || myconf+=( --disable-${i#*:} )
+	done
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		[[ ${i} = native ]] && i="host" # bug #273421
+		myconf+=( --cpu=${i} )
+		break
+	done
+
+	# LTO support, bug #566282, bug #754654
+	is-flagq "-flto*" && myconf+=( "--enable-lto" )
+	filter-flags "-flto*"
+
+	# Mandatory configuration
+	myconf=(
+		--disable-stripping
+		# This is only for hardcoded cflags; those are used in configure checks that may
+		# interfere with proper detections, bug #671746 and bug #645778
+		# We use optflags, so that overrides them anyway.
+		--disable-optimizations
+		--disable-libcelt # bug #664158
+		"${myconf[@]}"
+	)
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=( --target-os=freebsd )
+				;;
+			*mingw32*)
+				myconf+=( --target-os=mingw32 )
+				;;
+			*linux*)
+				myconf+=( --target-os=linux )
+				;;
+		esac
+	fi
+
+	local extra_libs
+	if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then
+		# bug #782811
+		# bug #790590
+		extra_libs+="$(test-flags-CCLD -latomic) "
+	fi
+
+	set -- "${S}/configure" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--nm="$(tc-getNM)" \
+		--strip="$(tc-getSTRIP)" \
+		--ranlib="$(tc-getRANLIB)" \
+		--pkg-config="$(tc-getPKG_CONFIG)" \
+		--optflags="${CFLAGS}" \
+		--extra-libs="${extra_libs}" \
+		--disable-all \
+		--disable-autodetect \
+		--disable-error-resilience \
+		--disable-everything \
+		--disable-faan \
+		--disable-iconv \
+		--disable-network \
+		--enable-avcodec \
+		--enable-avformat \
+		--enable-avutil \
+		--enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \
+		--enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \
+		--enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \
+		--enable-pic \
+		--enable-static \
+		"${myconf[@]}" \
+		${EXTRA_FFMPEG_CONF}
+
+	echo "${@}"
+	"${@}" || die
+}
+
+src_compile() {
+	emake V=1 libffmpeg
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install-libffmpeg
+}
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 63fc9af9da85..b42fcbfd552d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -16,7 +16,7 @@ DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd
 EBUILD ffmpeg-4.2.4-r1.ebuild 17888 BLAKE2B 1caa0e1cd92a80e88155728d6f27b3096013489d214ea9a149f3075d2b3c86b85c715461a5b8e37d51dbba64c6774b660370b66683bb1ab24083f54ec2ab035d SHA512 1fc959b91614b8c24b84ad26f7c0a5aa1e6f0d9676c5782bb436ba98ad699facc5dd2b7733680f77994290fd5ede9ce4ae86663bf7addfec45b42bd03fa98e10
 EBUILD ffmpeg-4.3.2-r1.ebuild 17976 BLAKE2B 316f31b8f30fa052c7ea64736b8286cb4868b4d118e1bd8165cfd6d32ff44d0178d7ac5fa32998ba6241025f3df7179c5a8ba2955fad875ea8fa0d2d9b0260d0 SHA512 fa2e327f64e1f279cf22ba5b148d23cfd22763f32d053444b292ce34b06ab231beaff5b42aa07b39089bc798301060fdedfd224716276c510549b28749af9ab8
 EBUILD ffmpeg-4.4.1-r5.ebuild 18614 BLAKE2B f339b1cacbfc6255c8b15cf722a9c901c8b3c9e20a1f3a5e7282f5aa3ab8c288bb51617234c2be296527d9c99e0c820a0d7bb0f82076b3b07d5fdcdf41f3b3e5 SHA512 6ee56aae37236be11dc3155c4fa76984c5ce8a95032c733a23e6e344db51c3b9e74de684cdb3e02b5df0eb6e46ba0b5f501de73ecd8060664715a57fe14fb3a8
-EBUILD ffmpeg-4.4.2.ebuild 18876 BLAKE2B a5207f2d74a5be9112d19f590c1ca347e3aa5f003b7cdfa370f1d5ae5b91b062a5991274283bd3a6defaaf8a3880faaeb9c9753907dcbf153a89b300acf32129 SHA512 3f6bcd2707b8101d58515572e55f9016b6d52cc8b516ccaa7f0a3fe02a3e90d4a8788f0c6ff6f9bfcc8e91a4c2eaab7fc8d1afa8266302266308360374914f35
-EBUILD ffmpeg-5.0.1.ebuild 18972 BLAKE2B 8d515f2215fdfac3e91c04b124bb0416e42fc342218170b018c3c2ae31cc45b97bea3cc81c7619fc92565630bc84ddf6263d9b9bfd75bb45aac912868a24e809 SHA512 e9cad84a777242a01227f3d9c6d5e793b5575c67c7ea4edbebc51738dc13aa60df256a241fdbe501bc04eb1b4694dce133bcbfce34f08b10413d93ef9928192b
+EBUILD ffmpeg-4.4.2.ebuild 18887 BLAKE2B 847dad244529588f29239a68329c14fd9d8634f08234251fc069abfeb1dfea6bfaf91489196b1ecf6edaa0cddd6cd5c7ef85d63edc07e096023d69fcbbf1b735 SHA512 98f8adfac3129537eaf4cd2c780dcd121a72cf34f8e27b39243ef68c9ad272e401f1726d3b7c7d16832942a7ad12b8a972fce2074e39a14089f9856184f4c793
+EBUILD ffmpeg-5.0.1.ebuild 18983 BLAKE2B d9756266540b3d33c52c1d2e8b57ecf0f4e2e07cb7c7356a290634443d232addd2f5ac440a693d00a6f9b2ea3b12361732018c42455257ecfa3d69e91840377b SHA512 806a7f815a07bb1ef3d8ba33128b1a366770e6c96b7a4062b965b34b4e74b99c68793137c9466443a4d3d7e62ddf5b0d58f0aa7fae2c3d112b8fd9a4ace01899
 EBUILD ffmpeg-9999.ebuild 18860 BLAKE2B 93849bb34591d76ec42624de561c6bc0ccc076e6d887325971c17d71fa6ffa4f95c13d86c8a3012ee296a55a4c670d74c22a3a4b5ccabc12b11ec457bf7576db SHA512 40758ac1f01bea9dcb31d38594a5507f189cb7e33527cdbd8c1bd402059775a2096c07376d6d114eb18d0bfeb6ec762650582962fc5e54ee7b34bf09eaf120a3
 MISC metadata.xml 6269 BLAKE2B 5d7f3a5376927ddf9d9c95c7465bc2b8df451be3c2ba62be38cce88449222fb6b9d6c30d88e89c403a2d60eb3b3d3f95f762ac85f85f07d54712a24d2712e40f SHA512 fbd108f665076751db688ddd0bf05b9d1fd004eff547a6a3707be369e6919efe989d82f43c09775456fa0035699ec249c8a9941dbdbf7952b1c6be11cd26acda
diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
index 5d9c4833feb2..425b251814ba 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
index 22a2b8e62697..7beebe3c0dac 100644
--- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 15bbd7690542..93ec55ee70fd 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -11,6 +11,6 @@ EBUILD mkvtoolnix-57.0.0.ebuild 2969 BLAKE2B 402ed70eb494854ce19cebf3e78809b8f96
 EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f
 EBUILD mkvtoolnix-61.0.0.ebuild 2707 BLAKE2B f2a49d0826ba6790ae810dde53e798490312b8ce89257ebcf69f0f1a5e0cebf76a77098920fa2d07d4f6a84ee2eeeeb0546f006423e941332b664707d4177acf SHA512 c78a908c2be0e394ae42100b4196347e79903df925e2c436cc6140bf0d54e4f18ee798bd2f4e6643f202a0106d57f2fadbc2d9724f938126f98c2f960d6f4acc
 EBUILD mkvtoolnix-64.0.0.ebuild 2717 BLAKE2B b5711556f9c73bda4a13cdb51e01db8a7c98966cb5579ff6c8cb01169e979a11e516c8e0d3884ffb1b5f2e941b885182c2b7b031deb1742798a06f0339ca1e72 SHA512 b6c8a32ef2c59cdf1a9587ec3d48e1d89f319c8b1c41caa6729f6baf7e5d215bf28c86ce35cfd00ca34908e06245fb400a0f69c3915a8bee5095922fb2a1b2db
-EBUILD mkvtoolnix-67.0.0.ebuild 2931 BLAKE2B baf0ebefaf8adbb46010c76d55f71d1950453d4f4ef32821be0d646cb8428d5bd9884e0ff50fc8ce9baf4362e5cd2f9dc5e3e38bdab72958dcddba19399dedf8 SHA512 8f93889fd7e55f80d55ab4cfbf7b89b7cc683c09b0eb7646d740ecf164d417434ffde452dbfd069a90eccfb1cc8b0ebf79ab6b7ec12cfca6e4146027a319fee3
+EBUILD mkvtoolnix-67.0.0.ebuild 2930 BLAKE2B e56034197d6386c1008e980453cde9265044c3f421aa4371eb3c5b593c6c1ea10fe1c043b8ae3b2d623ebbca1ceeb4716afe7e228c3a3364ecb7554537ea4d66 SHA512 b54da741df25d0c5ba7e81a5d13cb9243818865f85279ad298350aed2b0adca9725212f55bcd2bd74de9ad7ed9e7be8aefdcc53c45a555e30c17a591ca097ad0
 EBUILD mkvtoolnix-9999.ebuild 2931 BLAKE2B baf0ebefaf8adbb46010c76d55f71d1950453d4f4ef32821be0d646cb8428d5bd9884e0ff50fc8ce9baf4362e5cd2f9dc5e3e38bdab72958dcddba19399dedf8 SHA512 8f93889fd7e55f80d55ab4cfbf7b89b7cc683c09b0eb7646d740ecf164d417434ffde452dbfd069a90eccfb1cc8b0ebf79ab6b7ec12cfca6e4146027a319fee3
 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567
diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
index 0939d7201a9b..d6c978a14197 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~ppc ~ppc64 x86"
 fi
 
 DESCRIPTION="Tools to create, alter, and inspect Matroska files"
diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest
index 1dc02e01c60d..cbf8f4ad2106 100644
--- a/media-video/pitivi/Manifest
+++ b/media-video/pitivi/Manifest
@@ -2,6 +2,10 @@ AUX pitivi-0.999-gst-0.18.patch 1753 BLAKE2B fa8c3f8226987667285817853f8a9f86fe4
 AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be1f3e90037ea7f4638aba60fe47cf77e4a9dd4b77d716fd7b3793da0c501b29462b9e98918fc1de089615de2d4f0c SHA512 dfd9c1e9c84de7883b386dcc9b555d904b5633cdfaa0670de7e95ac3561ff45e4f692fcea77cd6b6d4082d834a41026a73b80d0916c81cb15c95d1508534a599
 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f
 AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026
+AUX pitivi-2021.05-meson-compatibility.patch 1452 BLAKE2B 453356f66c217b0ae527219819a5ca3ff4a7da60664e21f2fda211c846c3efd9139d8564d93eb907e72e56f2b4f497135c7f7f5d0728a2380844d5b5de040db5 SHA512 394ad3c1317598d7bb020176e1572598f310eb5fa2e37e274fd572a9c8a3338c52accd1a66be8e9322032a1c677481a219bb25da223f348d2469320bde80a2fd
+AUX pitivi-2021.05-python-collections.patch 406 BLAKE2B e3c70bb271d95ac5b6bd6f0fb8738b24e8db544140e565173aa71c652ee1c25f8e50f77ef822c3843e4609d531e5f9b25ce299cf82f59db975121a44c1ad0e58 SHA512 20c6c6df1d86a3e5e126b5f3d851fa56651a18a86313c358eef63a423d70e501b28abfc767e7fca8d01e0cd2106d346e2dcdbf8075f60596ac6ada8059e2f5e8
 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8
+DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb
 EBUILD pitivi-0.999-r5.ebuild 2908 BLAKE2B d87fc4e7fbf9147bf2bf280ce9128a973ebdac9daeba82f41045641fb311f22b885fa684667d816b420021cd16edd1862b610100754da6adefb4f49fb0736c83 SHA512 4f59f61f9e039d42cd962c4917b3906ec55739dca4994ede2420b7a23cbb5a70c519edc52085f237ca22973b49f9bd2a8e0103f8bd09dc15343b513c05fb5da8
+EBUILD pitivi-2021.05-r1.ebuild 2211 BLAKE2B f5da0c3c871f15c20fd014d814e42f29b49d9d108d6b8894100697019a0b3f2bd347c9d6215ddb9a26c9cb50f579c1e9f696525627fb8ee99739d6b093fd8b2d SHA512 c57017c3b1593bc633491e22f0df7784b100b13363b6d16f108a9c01dd58a63eb86c8367f74bfa385a26fa486d2483c3993c259ff54e2bc3118c8c52c8d571bd
 MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459
diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
new file mode 100644
index 000000000000..990f84b06795
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch
@@ -0,0 +1,45 @@
+From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Tue, 25 Jan 2022 15:37:34 +0200
+Subject: [PATCH] Fix compatibility with meson 0.61
+
+Previously positional arguments to i18n.merge_files() were just ignored
+but this became an error.
+---
+ data/meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 2ea82cf12..60d23169b 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir)
+ install_subdir('videopresets', install_dir: pkgdatadir)
+ install_subdir('gstpresets', install_dir: pkgdatadir)
+ 
+-desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop',
++desktop_file = i18n.merge_file(
+     type: 'desktop',
+     output : 'org.pitivi.Pitivi.desktop',
+     input : 'org.pitivi.Pitivi.desktop.in',
+@@ -25,7 +25,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml',
++appdata_file = i18n.merge_file(
+     type: 'xml',
+     output : 'org.pitivi.Pitivi.appdata.xml',
+     input : 'org.pitivi.Pitivi.appdata.xml.in',
+@@ -43,7 +43,7 @@ if appstream_util.found()
+   )
+ endif
+ 
+-i18n.merge_file('org.pitivi.Pitivi-mime.xml',
++i18n.merge_file(
+     output : 'org.pitivi.Pitivi-mime.xml',
+     input : 'org.pitivi.Pitivi-mime.xml.in',
+     po_dir: podir,
+-- 
+GitLab
+
diff --git a/media-video/pitivi/files/pitivi-2021.05-python-collections.patch b/media-video/pitivi/files/pitivi-2021.05-python-collections.patch
new file mode 100644
index 000000000000..fc04cd8d8726
--- /dev/null
+++ b/media-video/pitivi/files/pitivi-2021.05-python-collections.patch
@@ -0,0 +1,13 @@
+https://src.fedoraproject.org/rpms/pitivi/raw/rawhide/f/collections.patch
+--- a/pitivi/utils/loggable.py
++++ b/pitivi/utils/loggable.py
+@@ -14,7 +14,7 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+-import collections
++import collections.abc as collections
+ import errno
+ import fnmatch
+ import os
+
diff --git a/media-video/pitivi/pitivi-2021.05-r1.ebuild b/media-video/pitivi/pitivi-2021.05-r1.ebuild
new file mode 100644
index 000000000000..a52f0b5b2206
--- /dev/null
+++ b/media-video/pitivi/pitivi-2021.05-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="sqlite"
+
+inherit gnome.org meson python-single-r1 xdg
+
+DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework"
+HOMEPAGE="https://www.pitivi.org"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Do not forget to check pitivi/check.py for dependencies!!!
+# gsound, libav, libnotify and v4l are optional
+GST_VER="1.18.4"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pycairo-1.10[${PYTHON_USEDEP}]
+	')
+	>=x11-libs/cairo-1.10
+
+	>=media-libs/gstreamer-${GST_VER}:1.0[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-libs/glib-2.30.0:2
+
+	>=dev-libs/gobject-introspection-1.34:=
+
+	dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}]
+
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		>=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+	')
+
+	gnome-base/librsvg:=
+
+	>=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora]
+	>=media-libs/gst-plugins-bad-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gtk-${GST_VER}:1.0
+	>=media-libs/gst-plugins-good-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-libav-${GST_VER}:1.0
+	>=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0
+
+	>=x11-libs/libnotify-0.7[introspection]
+	x11-libs/libwnck:3[introspection]
+	>=x11-libs/gtk+-3.20.0:3[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/yelp-tools
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=dev-util/intltool-0.35.5
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c
+	"${FILESDIR}"/${P}-meson-compatibility.patch
+	"${FILESDIR}"/${P}-python-collections.patch
+)
+
+src_configure() {
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"
+}
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 03068d726164..1964d742d16b 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -3,5 +3,5 @@ AUX 3.38.2-fix-build-with-meson-0.61.1.patch 1170 BLAKE2B 63303d911e4ace3025a9de
 DIST totem-3.38.2.tar.xz 2190700 BLAKE2B 3b3b8166cf674b882a3a66a5729d794489fe779944bb277fad35fe027b56270e6ef578590924309b9fe28aca0544754696acd98d31a7243a33a533abe73ed6fd SHA512 1dac3a0afe31b47147a129c70dddf7480446fc1bb5432f9cd537384e3be25da6a9b87918fa7bcf7e7cd68c8dac45e75f6b1f7c1885edefac846c52f96b40567f
 DIST totem-42.0.tar.xz 2476952 BLAKE2B 45eac2e586c3c17eab9f570812ae2c79812859635d1ef6df1d0d2c526436558dbab9581699ce86d3e2cd3048f5d65bbd1927c3faa5f7575a5468d0813ce68bcc SHA512 67872d06a7d691a23b97255c5ee5f8d90a1fdf2b36f064f26c10fb4958733772eea456aab4f0fe2c89d23ec987cf5b9c2383c97ba5bec45247953296f1cd6c4b
 EBUILD totem-3.38.2.ebuild 2890 BLAKE2B b14e07b5ebcfeabfe4c69fd8e662d377dd193524421ecf671d1fd8ecbf22ef2d805bfca147420403ce8ef4bc817dab1621127e1966f154c425596e4e0dc9de37 SHA512 a8f131f6967ade9636e03781502b4dd4c78797afaf733e2474c392b8af325ec6471585e1ad8857fe76e5e11db37ed18fba9ee12d7ce19c08b9e8f7ec61cee09d
-EBUILD totem-42.0-r1.ebuild 2867 BLAKE2B 5458a5616a78c361ca8620cb4fde4ad0048e12f458a339089628e78d8786f69b86d9f6ba514bb1e08cac376b096f0edab2e99972bd77f6fb2866560283589a79 SHA512 1ad5ad3ad62907a07806bb493db41d1fcc1092a31d4633ada57d27fb110ff498597e2cbf9de0ea02bedb010f24315d5b01d0e74873228347f919a573763337d2
+EBUILD totem-42.0-r1.ebuild 2864 BLAKE2B 6e37f4c483fb85fd876f2303400b4dd645c923c060829cfe70b349dab33ae0c41034625a1257d79cf1ba86f1e52472ab50fb90007dba951251c70be8408f458a SHA512 e7bc37256d9dd2ceead0be928d2c578a7e5eb65a31f2af50944d479f327e5e7cc9a9c62a435dba730d796e12cb51fef691ecc70c0f19b732da8e178682ddd325
 MISC metadata.xml 1018 BLAKE2B 1cb6fbaa86e0aa6bc60901e7e0b30765de1bea563666af206bfd75c8ed779332e1536dfebbe8d83d0a940bb4266157d0673b19f64021c76e3fa549a208945335 SHA512 3cb85a567ae7573ec0cf7cc12440ff3d879a3566b4773930752142b9e83ab366b983a470d3ae1f212acd78b217136c1ee681ff7d98d1e980e769867b1791d1d6
diff --git a/media-video/totem/totem-42.0-r1.ebuild b/media-video/totem/totem-42.0-r1.ebuild
index cbc4522cdc97..a91d7e1bcf24 100644
--- a/media-video/totem/totem-42.0-r1.ebuild
+++ b/media-video/totem/totem-42.0-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
 "
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.56.0:2
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 3f07e1e9e975..89e67d541c01 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,5 +1,6 @@
 AUX wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch 3969 BLAKE2B 9d9fcdf2327834329e120e2322f03acb0a541b3095bba194be132b153769120e59d617bf4b64ebeb4cbc73caaf2fcbe2c6345da3aeef43ab88891edb93750f87 SHA512 406159756795c208ff809489dcd88fd0095681d9867a8c193f73e40709a27ce33a22a635bada6b5594f097113a5af47375d8814016554cbd6ad809ae18ad1502
 AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch 4475 BLAKE2B baa62d342e3a5f753044f4f4f757064792424e05535b540c09ecef4ac70edf32edbae6a4a36ee87d9c041cccdd24d229ba828e50cdc303c50b1f6d4afef7b075 SHA512 4cce604cd7aa754b53d7473f0a12e764449f76932f7ee0fea6e2b5f6b1f11bc2a38a28eedea5f003a112836ecc6a209c3d5e4b29a582749be742d075e51e6518
+AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1
 AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb
 AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d
 AUX wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch 3610 BLAKE2B d473e299a6c22de630786ea4e8ff739aae2975614c79b6fc195a908b4431cc0eba57cfd688865f5c9fe91adf105b75fd6bbe8c00872b8640a8a7a36caabcb620 SHA512 f9770ec2afd83908d473d28cb8972212f57e7e12a64490417f5c301872e3c4cec644090480e60ad9085bbea8f0fc86c521e90b8853534acfe6959dfd5ed9a832
@@ -7,9 +8,8 @@ AUX wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch
 DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f
 DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929
 EBUILD wireplumber-0.4.10-r1.ebuild 3652 BLAKE2B 6cdae58a794ac8710565acbd0af6a5f8d40e13831eef22c066bb2b45569d3f9f6ad3f94f0925ff54a0b032f50d2eb7c2394878bb3eb2924c91ab7ce2f63ee550 SHA512 2daf7d6661b18789a0aa60737923b69b89d180d80164ead599f7ae1ef1ad460df1ec9ebb1d4534efd6b38cec627fb17c555c161a20b4fa6852a3d60236587680
-EBUILD wireplumber-0.4.10-r2.ebuild 3795 BLAKE2B 84f7a4c68c76ba8a25d3157e43012049a2bfda5ba978a143bfcd71f5024c4df7083caf9b61108517dcfda1b1669c555a4d54ddc8027f1997fb0adce14b7b2073 SHA512 1fe77d958a208db0e23c7bb9ded6d006af259bf70dc76a5e63c2cdd5f2c4320529c593da2f792fe15970cc22cf3d2ac0fa5951fcad35e5f3235ba4a490b66641
-EBUILD wireplumber-0.4.10.ebuild 3554 BLAKE2B 5fffbb92a92c479a326e111215ebecfcc675494cb804913eede2252193629fdf09cd11bcaf63bcb0cd7767926b931e3041b6a9eee1a775e9e144525da673c8d1 SHA512 d3e0cb716523df0ff5be7491992b71d7d576d9929dd75434abcf00e81a46e17e2a11a228b897c25b669a0e2df4151b3595f14c2330fabf53935cb4c9e78e387f
+EBUILD wireplumber-0.4.10-r3.ebuild 3953 BLAKE2B 2dd1cdba585add8ef1e6cf3e0b7b6f51911215de9ae70e49ae1123557830eaf78a111c18bc8de03fdd79a31d43ba2f73299e341a004310b19738a3713609881c SHA512 d1baf6109ebed5c081189392f4fde8cdb4ae6175059deefebea554dffc4c1d5813ed8ec9a811f1f9e397bfc703f455205d89320a1a9322072bdbdab16367cb78
 EBUILD wireplumber-0.4.9-r1.ebuild 3689 BLAKE2B fbc08a9345afaabe31c270b60ce69daf78834a165c64aadf0eb6e6ad7ad5a300676107c377ee11f720df9cd11a8ca300cfea902679679ba1a0e67b0fdd043b5c SHA512 738d760ede5bd05047f399987e7266ee0c732e62f5449468c90dab39385e11e37d67d7559d96229467550e380ba30afbbbb72c08e0c733872ef6f961c4169e27
 EBUILD wireplumber-0.4.9.ebuild 3512 BLAKE2B edd21937127291c47bf9d87566172a22cde8a1aeb24eda1be76355abf5c734192c1b18cb62eade6fab59df8cb1cbf590201a77f9e4eee1e806384f7d9b2b10d6 SHA512 9751335866a253c0598653638600dc3b713adc7377d5f453a2286b7ef0d0a75751f32819c3bdb76a91e7d874109c5e9d511c12c882971c7ff716928c42119081
-EBUILD wireplumber-9999.ebuild 3561 BLAKE2B 8e1f3a64f43d3831e3a5e29a9d77ac031a127d1b55704a914fac954e92790a514aa71671dc36eb623ba0e1716bcdd86045767d7c0d69a2c4d31820302f574e68 SHA512 8a85bcbbb7edef7c80d36a6a8beb7db3892ee0a48e0b76b4c685df08069d524c29d07076b4cdeab5fb17e16a538d10b625d2fbd02a98316289e556dab7209c57
+EBUILD wireplumber-9999.ebuild 3563 BLAKE2B bbd86c4a9cfaaec2dc039b486b6737fc9770783860c755ae6d0bd9b1d9c803f608627273e95d8df68a6acfe81e5080258549ae08f0890f605eaf9c1a66a03bc7 SHA512 1bb23ba5ceff7f46934d0312040d594ab8a33007a15be3a71f5e16f07b8e70f15a3dee3bafa6553fca0cf53522b035df3ecb0468832ba0655223f8b81ce9f81a
 MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee
diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
new file mode 100644
index 000000000000..d9c51489a893
--- /dev/null
+++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
@@ -0,0 +1,187 @@
+https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/392cce2136e81ac3146078eacbbae85b694c917a
+
+From 392cce2136e81ac3146078eacbbae85b694c917a Mon Sep 17 00:00:00 2001
+From: Julian Bouzas <julian.bouzas@collabora.com>
+Date: Fri, 20 May 2022 07:38:24 -0400
+Subject: [PATCH] m-default-nodes: don't check if all device nodes are ready
+ when finding default node
+
+This check was originally added to avoid a small audio glitch when changing
+default nodes while also changing the device profile (eg Gnome Sound Settings).
+The check is removed because it causes issues when disabling alsa nodes. There
+are plans to fix the audio glitch issue in the future with the planned
+event-dispatcher architecture.
+
+Fixes #279
+---
+ modules/module-default-nodes.c | 136 ---------------------------------
+ 1 file changed, 136 deletions(-)
+
+diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c
+index 0fdaed5..577f9bb 100644
+--- a/modules/module-default-nodes.c
++++ b/modules/module-default-nodes.c
+@@ -345,135 +345,6 @@ reevaluate_default_node (WpDefaultNodes * self, WpMetadata *m, gint node_t)
+   }
+ }
+ 
+-static guint
+-get_device_total_nodes (WpPipewireObject * proxy)
+-{
+-  g_autoptr (WpIterator) profiles = NULL;
+-  g_auto (GValue) item = G_VALUE_INIT;
+-
+-  profiles = wp_pipewire_object_enum_params_sync (proxy, "Profile", NULL);
+-  if (!profiles)
+-    return 0;
+-
+-  for (; wp_iterator_next (profiles, &item); g_value_unset (&item)) {
+-    WpSpaPod *pod = g_value_get_boxed (&item);
+-    gint idx = -1;
+-    const gchar *name = NULL;
+-    g_autoptr (WpSpaPod) classes = NULL;
+-
+-    /* Parse */
+-    if (!wp_spa_pod_get_object (pod, NULL,
+-        "index", "i", &idx,
+-        "name", "s", &name,
+-        "classes", "?P", &classes,
+-        NULL))
+-      continue;
+-    if (!classes)
+-      continue;
+-
+-    /* Parse profile classes */
+-    {
+-      g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (classes);
+-      g_auto (GValue) v = G_VALUE_INIT;
+-      gint total_nodes = 0;
+-      for (; wp_iterator_next (it, &v); g_value_unset (&v)) {
+-        WpSpaPod *entry = g_value_get_boxed (&v);
+-        g_autoptr (WpSpaPodParser) pp = NULL;
+-        const gchar *media_class = NULL;
+-        gint n_nodes = 0;
+-        g_return_val_if_fail (entry, 0);
+-        if (!wp_spa_pod_is_struct (entry))
+-          continue;
+-        pp = wp_spa_pod_parser_new_struct (entry);
+-        g_return_val_if_fail (pp, 0);
+-        g_return_val_if_fail (wp_spa_pod_parser_get_string (pp, &media_class), 0);
+-        g_return_val_if_fail (wp_spa_pod_parser_get_int (pp, &n_nodes), 0);
+-        wp_spa_pod_parser_end (pp);
+-
+-        total_nodes += n_nodes;
+-      }
+-
+-      if (total_nodes > 0)
+-        return total_nodes;
+-    }
+-  }
+-
+-  return 0;
+-}
+-
+-static gboolean
+-nodes_ready (WpDefaultNodes * self)
+-{
+-  g_autoptr (WpIterator) it = NULL;
+-  g_auto (GValue) val = G_VALUE_INIT;
+-
+-  /* Get the total number of nodes for each device and make sure they exist
+-   * and have at least 1 port */
+-  it = wp_object_manager_new_filtered_iterator (self->rescan_om,
+-      WP_TYPE_DEVICE, NULL);
+-  for (; wp_iterator_next (it, &val); g_value_unset (&val)) {
+-    WpPipewireObject *device = g_value_get_object (&val);
+-    guint total_nodes = get_device_total_nodes (device);
+-    if (total_nodes > 0) {
+-      guint32 device_id = wp_proxy_get_bound_id (WP_PROXY (device));
+-      g_autoptr (WpIterator) node_it = NULL;
+-      g_auto (GValue) node_val = G_VALUE_INIT;
+-      guint ready_nodes = 0;
+-
+-      node_it = wp_object_manager_new_filtered_iterator (self->rescan_om,
+-          WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY,
+-          PW_KEY_DEVICE_ID, "=i", device_id, NULL);
+-      for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) {
+-        WpPipewireObject *node = g_value_get_object (&node_val);
+-        g_autoptr (WpPort) port =
+-              wp_object_manager_lookup (self->rescan_om,
+-              WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY,
+-              PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)),
+-              NULL);
+-        if (port)
+-          ready_nodes++;
+-      }
+-
+-      if (ready_nodes < total_nodes) {
+-        const gchar *device_name = wp_pipewire_object_get_property (
+-            WP_PIPEWIRE_OBJECT (device), PW_KEY_DEVICE_NAME);
+-        wp_debug_object (self, "device '%s' is not ready (%d/%d)", device_name,
+-            ready_nodes, total_nodes);
+-        return FALSE;
+-      }
+-    }
+-  }
+-
+-  /* Make sure Audio and Video virtual sources have ports */
+-  {
+-    g_autoptr (WpIterator) node_it = NULL;
+-    g_auto (GValue) node_val = G_VALUE_INIT;
+-    node_it = wp_object_manager_new_filtered_iterator (self->rescan_om,
+-        WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_DEVICE_ID, "-",
+-        NULL);
+-    for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) {
+-      WpPipewireObject *node = g_value_get_object (&node_val);
+-      const gchar *media_class = wp_pipewire_object_get_property (
+-          WP_PIPEWIRE_OBJECT (node), PW_KEY_MEDIA_CLASS);
+-      g_autoptr (WpPort) port =
+-          wp_object_manager_lookup (self->rescan_om,
+-          WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY,
+-          PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)),
+-          NULL);
+-      if (!port &&
+-          (g_strcmp0 ("Audio/Source/Virtual", media_class) == 0 ||
+-           g_strcmp0 ("Video/Source/Virtual", media_class) == 0)) {
+-        const gchar *node_name = wp_pipewire_object_get_property (
+-            WP_PIPEWIRE_OBJECT (node), PW_KEY_NODE_NAME);
+-        wp_debug_object (self, "virtual node '%s' is not ready", node_name);
+-        return FALSE;
+-      }
+-    }
+-  }
+-
+-  return TRUE;
+-}
+-
+ static void
+ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self)
+ {
+@@ -491,10 +362,6 @@ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self)
+   if (!metadata)
+     return;
+ 
+-  /* Make sure nodes are ready for current profile */
+-  if (!nodes_ready (self))
+-    return;
+-
+   wp_trace_object (self, "re-evaluating defaults");
+   reevaluate_default_node (self, metadata, AUDIO_SINK);
+   reevaluate_default_node (self, metadata, AUDIO_SOURCE);
+@@ -584,13 +451,10 @@ on_metadata_added (WpObjectManager *om, WpMetadata *metadata, gpointer d)
+   self->rescan_om = wp_object_manager_new ();
+   wp_object_manager_add_interest (self->rescan_om, WP_TYPE_DEVICE, NULL);
+   wp_object_manager_add_interest (self->rescan_om, WP_TYPE_NODE, NULL);
+-  wp_object_manager_add_interest (self->rescan_om, WP_TYPE_PORT, NULL);
+   wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_DEVICE,
+       WP_OBJECT_FEATURES_ALL);
+   wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_NODE,
+       WP_OBJECT_FEATURES_ALL);
+-  wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_PORT,
+-      WP_OBJECT_FEATURES_ALL);
+   g_signal_connect_object (self->rescan_om, "objects-changed",
+       G_CALLBACK (schedule_rescan), self, G_CONNECT_SWAPPED);
+   g_signal_connect_object (self->rescan_om, "object-added",
+-- 
+2.35.1
+
diff --git a/media-video/wireplumber/wireplumber-0.4.10-r2.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
similarity index 95%
rename from media-video/wireplumber/wireplumber-0.4.10-r2.ebuild
rename to media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
index a3581508193e..bcd942a98219 100644
--- a/media-video/wireplumber/wireplumber-0.4.10-r2.ebuild
+++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
@@ -63,8 +63,10 @@ RDEPEND="${DEPEND}
 DOCS=( {NEWS,README}.rst )
 
 PATCHES=(
+	"${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch
 	"${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch
 	"${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch
+	"${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch
 	"${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch
 )
 
@@ -94,7 +96,7 @@ src_install() {
 	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
 	# will not actually get stored twice until modified.
 	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
+	doins -r "${ED}"/usr/share/wireplumber
 }
 
 pkg_postinst() {
diff --git a/media-video/wireplumber/wireplumber-0.4.10.ebuild b/media-video/wireplumber/wireplumber-0.4.10.ebuild
deleted file mode 100644
index 9bae3695faf2..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.10.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.48:=
-	virtual/libc
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	fi
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild
index d231bfe704c3..ca50e19600e4 100644
--- a/media-video/wireplumber/wireplumber-9999.ebuild
+++ b/media-video/wireplumber/wireplumber-9999.ebuild
@@ -88,7 +88,7 @@ src_install() {
 	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
 	# will not actually get stored twice until modified.
 	insinto /etc
-	doins -r ${ED}/usr/share/wireplumber
+	doins -r "${ED}"/usr/share/wireplumber
 }
 
 pkg_postinst() {
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9334ca786971..6bdc6c75a61e 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 851d9aa7aaf8..2da4527f3341 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 27 May 2022 09:39:50 +0000
+Tue, 31 May 2022 06:09:30 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b861f31a320d..da11c7766e15 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 518604 BLAKE2B 771190ff87bcfe6702a19150591bf573a429c51546ab7bd3ae25f101a4ec657d93d6fb83f7cb3aa4055e581eab5fde9d88a73a604dc34f426cb30ebb4385af9b SHA512 0b5d0f14e5d6ec3ff896d9d472edea00620a08f552ffc5516b0264e609527cf65471ee37a5002559add52d5c1898b2b60d48c9e97e6d2451bd84bf24fd112ab4
-TIMESTAMP 2022-05-27T09:39:54Z
+TIMESTAMP 2022-05-31T06:09:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKQnGpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKVsR5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAZtQ//ZWR5nGl87qFIOVwwdhzMwMjcC8XmiXsThu93QF9GAzXCLK3OzpbluOM0
-T9N+QhK0ByxpP1iHPzMz/1PYW91vZwuouBD9H7hf480w/9rlZi436iuNguRJudcd
-A1FovYbL/qAr1WmOEJnewN+ZKqNN7l/ISyWG8PPaenFZ6xBT68lpZMFCOocVBG3R
-LwYmFMdoPw4xNddkW3urLnLvj9bucg3/K2DctiaQAN80JM4Yu8sc4zxqyYBYkaYn
-4TWwaL+5ajy42JiVwXDITf7p7eDiX2cjbUJLxkhbTTF17pVqOv4MYDwNtu/STd5Q
-jNkJkpBp/ZB1oX/wkAX3LP0GrjZ0NtAJExQMUD192X3IiCTdGhA0FSNjROO2aCYA
-cM7bJZOnN+A4wwr7u5fyKaUaW6/chZGGvKRw+1J4GuSzGS88W/8zKg5cSTZGFiiS
-cRjoCPE8nW1/CdPxfciTNgoEKN85KYiYyV1dkp9bzUo87u3BNk9NkdAn++lWq024
-EGkLUSPHoQdrFZKAY6CeGlM870RG7SGjT59QFhWjZ1qzgx/IsZuCPOFL0VUtXPa5
-lKrzQjFTK9odKT4zXqD5YgMQeBwpnH+19nWn8KtsWJR1wrO9VhdLSAN3E1L+DDHO
-+7VO1OXWdeyAp0j5Xz9lpfMqz/v0YE1W0HqHBoeCh9tNO/UwPZM=
-=yzG5
+klCTdBAAj4pV8ybdce1nFSZ/8OEvsWfgUG6r1pWFIUg+wYCq/Tdg58FHOrkU3CKn
+sEyv3Xing3Y11is5hxK5ecLOBrD2HN+yLEoQsT+5irmj2B5LF1wv2oxO8bPZHy63
+eoulF+QxQ7D1PCkBvrUpALq/fPXQJDJlDXZTIEz7a8waUXOPgOpoQLtw+yDrwzQQ
+fkdpVxzZhMJCrN3xsGlHdmql/vi6ZpqeqUmSuiLmQtPVvuF8ZyhMj79ygP7qv5pd
+OTJlVBbneDS4TV1pF5VfxSnYnPGn0uj5vMFIQDIXJBjEr7pJmxXaY2thMLL288mk
+04rS9VkLqhWUfUHKZtDIrxGlSpohiTao5RKA5nWySGuuowKd5HOHpCw5cE8K9P37
+Y2bdlR+QfDQsnRSO3ExMKN+5wceAsTD7B4jnMdamMS1xIoWJHCfrqKgNVIy+zfPs
+wg6Sql7PsSzkPBVptY8HWR/eAXjJHlhNBiDig4Lhhwz1eeNbA99dfKbZAlFx+k1y
+hGTGbzzckdb8zA3/vJx7fid9vtPLJ1PvBRekICBHhRDt0TulO0KeK0sJ4AtPoaL/
+qAGLnGSwGKvb2A+YcvGhEIbdonbkcVi2af/1czw9oKeWjjY3SR+AQMTAoooEP3lx
+OncKdOE4cntA3gOwTYFML37I39fCvVVMLoj2xNrfp6XkgNq4884=
+=uTOp
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 851d9aa7aaf8..10a943f35b78 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 27 May 2022 09:39:50 +0000
+Tue, 31 May 2022 06:09:31 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 774f1175eca6..d54c81356709 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 22f03281ea75..9a0966bb62cf 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
index c3acc1f0f765..69856d165697 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Accessibility https://gitlab.gnome.org/GNOME/at-spi2-core
 INHERIT=gnome.org meson-multilib systemd virtualx xdg
 IUSE=X gtk-doc +introspection 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2.1+
 RDEPEND=>=sys-apps/dbus-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.62:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[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=gtk-doc? ( X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.44/at-spi2-core-2.44.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=11c8040940aee45d551d058d467403e7
+_md5_=723745a2de702fde1ff87446adad5309
diff --git a/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1 b/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1
deleted file mode 100644
index b2f86afe34c1..000000000000
--- a/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-lang/perl sys-apps/ed virtual/pkgconfig
-DEFINED_PHASES=compile install
-DEPEND=>=app-text/htmltidy-5.0.0:= dev-libs/libpcre2:= net-misc/curl sys-libs/readline:= odbc? ( dev-db/unixODBC )
-DESCRIPTION=Combination editor, browser, and mail client that is 100% text based
-EAPI=8
-HOMEPAGE=https://edbrowse.org
-IUSE=odbc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/htmltidy-5.0.0:= dev-libs/libpcre2:= net-misc/curl sys-libs/readline:= odbc? ( dev-db/unixODBC )
-SLOT=0
-SRC_URI=https://github.com/CMB/edbrowse/archive/v3.8.2.1.tar.gz -> edbrowse-3.8.2.1.tar.gz https://github.com/bellard/quickjs/archive/2788d71e823b522b178db3b3660ce93689534e6d.tar.gz -> quickjs-2788d71.tar.gz
-_md5_=64d65e1234b8b2f4a871d90ac80d15b0
diff --git a/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r2 b/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r2
new file mode 100644
index 000000000000..507b24e51e38
--- /dev/null
+++ b/metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r2
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl sys-apps/ed virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=>=app-text/htmltidy-5.0.0:= dev-db/unixODBC dev-libs/libpcre2:= net-misc/curl sys-libs/readline:=
+DESCRIPTION=Combination editor, browser, and mail client that is 100% text based
+EAPI=8
+HOMEPAGE=https://edbrowse.org
+INHERIT=edo toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-text/htmltidy-5.0.0:= dev-db/unixODBC dev-libs/libpcre2:= net-misc/curl sys-libs/readline:=
+SLOT=0
+SRC_URI=https://github.com/CMB/edbrowse/archive/v3.8.2.1.tar.gz -> edbrowse-3.8.2.1.tar.gz https://github.com/bellard/quickjs/archive/2788d71e823b522b178db3b3660ce93689534e6d.tar.gz -> quickjs-2788d71.tar.gz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d4cbcbeb494ed26f5fbf3054dafef01b
diff --git a/metadata/md5-cache/app-accessibility/orca-42.1 b/metadata/md5-cache/app-accessibility/orca-42.1
index aa916e1b3d8d..0ddc007ed46f 100644
--- a/metadata/md5-cache/app-accessibility/orca-42.1
+++ b/metadata/md5-cache/app-accessibility/orca-42.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Orca
 INHERIT=gnome2 python-single-r1
 IUSE=+braille python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+ CC-BY-SA-3.0
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=app-accessibility/at-spi2-atk-2.34:2 >=app-accessibility/at-spi2-core-2.36:2[introspection] >=dev-libs/atk-2.36 >=dev-libs/glib-2.28:2 media-libs/gstreamer:1.0[introspection] >=x11-libs/gtk+-3.6.2:3[introspection] python_single_target_python3_8? ( dev-python/gst-python:1.0[python_targets_python3_8(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/gst-python:1.0[python_targets_python3_9(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/gst-python:1.0[python_targets_python3_10(-)] >=dev-python/pygobject-3.18:3[python_targets_python3_10(-)] ) braille? ( python_single_target_python3_8? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_8(-)] dev-libs/liblouis[python,python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_9(-)] dev-libs/liblouis[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-accessibility/brltty-5.0-r3[python,python_targets_python3_10(-)] dev-libs/liblouis[python,python_targets_python3_10(-)] ) ) dev-libs/atk[introspection] python_single_target_python3_8? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_8(-)] >=dev-python/pyatspi-2.36[python_targets_python3_8(-)] dev-python/setproctitle[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_9(-)] >=dev-python/pyatspi-2.36[python_targets_python3_9(-)] dev-python/setproctitle[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=app-accessibility/speech-dispatcher-0.8[python,python_targets_python3_10(-)] >=dev-python/pyatspi-2.36[python_targets_python3_10(-)] dev-python/setproctitle[python_targets_python3_10(-)] ) x11-libs/libwnck:3[introspection] x11-libs/pango[introspection]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/orca/42/orca-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5508c39c195b1e4f17db25b706ae2a66
+_md5_=40a8f760e1653f4ce6b35a979adc36ba
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0dce543b4389..581bebde4220 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-5.7.0 b/metadata/md5-cache/app-admin/ansible-5.7.0
index 3d200506a458..b73c88260b85 100644
--- a/metadata/md5-cache/app-admin/ansible-5.7.0
+++ b/metadata/md5-cache/app-admin/ansible-5.7.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=>=app-admin/ansible-base-2.12.0 <app-admin/ansible-base-2.13 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible/ansible-5.7.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4a31f3facd54c106e6e63398c6599262
+_md5_=c0c1ba64e17cce197412861a73967665
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.12.5 b/metadata/md5-cache/app-admin/ansible-base-2.12.5
index d6b82bd036bd..c4fbcfc8ea68 100644
--- a/metadata/md5-cache/app-admin/ansible-base-2.12.5
+++ b/metadata/md5-cache/app-admin/ansible-base-2.12.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.ansible.com/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos
 LICENSE=GPL-3
 RDEPEND=dev-python/paramiko[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/httplib2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/netaddr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/resolvelib-0.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/resolvelib-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-misc/sshpass virtual/ssh python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/a/ansible-core/ansible-core-2.12.5.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e49804cbb5634dcc138682b2c9ada5bf
+_md5_=29daa9f8c9bf42a04b2d2a27cf6eb389
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.1.0 b/metadata/md5-cache/app-admin/ansible-lint-6.2.2
similarity index 95%
rename from metadata/md5-cache/app-admin/ansible-lint-6.1.0
rename to metadata/md5-cache/app-admin/ansible-lint-6.2.2
index 16b778be9cba..c5c7a65e941d 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.1.0
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.2.2
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
 EAPI=8
@@ -8,10 +8,10 @@ IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_pytho
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
 PROPERTIES=test_network
-RDEPEND=>=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=>=app-admin/ansible-base-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.1.0.tar.gz -> ansible-lint-6.1.0.tar.gz
+SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.2.2.tar.gz -> ansible-lint-6.2.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=038a56f85b203b6ddd7b1144a5993398
+_md5_=7a373a329b5146a5c1b2ca39192f4b59
diff --git a/metadata/md5-cache/app-admin/awscli-1.24.10 b/metadata/md5-cache/app-admin/awscli-1.24.10
new file mode 100644
index 000000000000..1a0db69a52fb
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.24.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/botocore-1.26.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.26.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/s3transfer-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aws/aws-cli/archive/1.24.10.tar.gz -> aws-cli-1.24.10.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0be05582602362c12f1e36fbc7b98f7a
diff --git a/metadata/md5-cache/app-admin/checksec-2.6.0 b/metadata/md5-cache/app-admin/checksec-2.6.0
new file mode 100644
index 000000000000..e72cc2f4a270
--- /dev/null
+++ b/metadata/md5-cache/app-admin/checksec-2.6.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
+EAPI=8
+HOMEPAGE=https://github.com/slimm609/checksec.sh
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.6.0.tar.gz -> checksec-2.6.0.tar.gz
+_md5_=f93078de64fa7d9046c722c13b7ddedf
diff --git a/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1 b/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
index 051b051b0910..c68cebd53c9b 100644
--- a/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
+++ b/metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://keepassxc.org
 INHERIT=cmake flag-o-matic xdg
 IUSE=autotype browser doc keeshare +network test yubikey
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1 GPL-2 GPL-3
 RDEPEND=app-crypt/argon2:= dev-libs/botan:2= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-gfx/qrencode:= sys-libs/readline:0= sys-libs/zlib:= autotype? ( x11-libs/libX11 x11-libs/libXtst ) keeshare? ( sys-libs/zlib:=[minizip] ) yubikey? ( dev-libs/libusb:1 sys-apps/pcsc-lite )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/keepassxreboot/keepassxc/archive/2.7.1.tar.gz -> keepassxc-2.7.1.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=67f905f12dad06bc02d66fb0b549cc1f
+_md5_=80cc25674904fc7c937357d121331fcd
diff --git a/metadata/md5-cache/app-admin/pydf-12-r2 b/metadata/md5-cache/app-admin/pydf-12-r2
index 355e6f147176..c615d8371c9a 100644
--- a/metadata/md5-cache/app-admin/pydf-12-r2
+++ b/metadata/md5-cache/app-admin/pydf-12-r2
@@ -1,15 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 DEFINED_PHASES=install prepare
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
 DESCRIPTION=Enhanced df with colors
-EAPI=7
+EAPI=8
 HOMEPAGE=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/
 INHERIT=python-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=public-domain
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=http://kassiopeia.juls.savba.sk/~garabik/software/pydf/pydf_12.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6b156eb4924370d9ef1ea78ebda41a4d
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=848143fa0fe8b2e45d43eed899a3e1c8
diff --git a/metadata/md5-cache/app-admin/sysklogd-2.4.0 b/metadata/md5-cache/app-admin/sysklogd-2.4.0
new file mode 100644
index 000000000000..7180f90d5432
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysklogd-2.4.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] )
+DESCRIPTION=Standard log daemons
+EAPI=7
+HOMEPAGE=https://troglobit.com/sysklogd.html https://github.com/troglobit/sysklogd
+INHERIT=flag-o-matic systemd toolchain-funcs
+IUSE=logger logrotate systemd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[logger] ) logrotate? ( app-admin/logrotate )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/troglobit/sysklogd/releases/download/v2.4.0/sysklogd-2.4.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0dc219e5af61c67c54600fe4178fbc2c
diff --git a/metadata/md5-cache/app-admin/sysklogd-9999 b/metadata/md5-cache/app-admin/sysklogd-9999
index 43f47c69d115..ecd6cdd92486 100644
--- a/metadata/md5-cache/app-admin/sysklogd-9999
+++ b/metadata/md5-cache/app-admin/sysklogd-9999
@@ -12,4 +12,4 @@ RDEPEND=logger? ( !<sys-apps/util-linux-2.34-r3 !>=sys-apps/util-linux-2.34-r3[l
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fe96ce7929f24b4d593a24e59d5ccac7
+_md5_=0dc219e5af61c67c54600fe4178fbc2c
diff --git a/metadata/md5-cache/app-admin/syslog-summary-1.14-r5 b/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
index 82858c6acde3..eca00ee7771d 100644
--- a/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
+++ b/metadata/md5-cache/app-admin/syslog-summary-1.14-r5
@@ -3,12 +3,12 @@ DESCRIPTION=Summarizes the contents of a syslog log file
 EAPI=7
 HOMEPAGE=https://github.com/dpaleino/syslog-summary
 INHERIT=python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9
+IUSE=python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~sparc x86
 LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/downloads/dpaleino/syslog-summary/syslog-summary-1.14.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=46f2fb21e96870f81ec83d718d2803ef
+_md5_=08061e4091c8846584cfc8c9b3f15b1c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 8a119ad5ddb9..5b1101ae2ce4 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/brotli-1.0.9-r4 b/metadata/md5-cache/app-arch/brotli-1.0.9-r4
index e880452286af..c2b88623c989 100644
--- a/metadata/md5-cache/app-arch/brotli-1.0.9-r4
+++ b/metadata/md5-cache/app-arch/brotli-1.0.9-r4
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=python? ( >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/google/brotli/archive/v1.0.9.tar.gz -> brotli-1.0.9.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/brotli-1.0.9.testdata.tar.xz )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=610de04e0b460b5e598dad7716832f83
+_md5_=de13010aa36fe9c1b78012437880df65
diff --git a/metadata/md5-cache/app-arch/brotli-9999 b/metadata/md5-cache/app-arch/brotli-9999
index 2a522abce984..46aae1c99f48 100644
--- a/metadata/md5-cache/app-arch/brotli-9999
+++ b/metadata/md5-cache/app-arch/brotli-9999
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python? ( >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
 DESCRIPTION=Generic-purpose lossless compression algorithm
@@ -13,4 +13,4 @@ REQUIRED_USE=python? ( || ( python_targets_pypy3 python_targets_python3_8 python
 RESTRICT=!test? ( test )
 SLOT=0/9999
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=610de04e0b460b5e598dad7716832f83
+_md5_=de13010aa36fe9c1b78012437880df65
diff --git a/metadata/md5-cache/app-arch/file-roller-3.42.0 b/metadata/md5-cache/app-arch/file-roller-3.42.0
index ac54ec927295..421f151c75e9 100644
--- a/metadata/md5-cache/app-arch/file-roller-3.42.0
+++ b/metadata/md5-cache/app-arch/file-roller-3.42.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/FileRoller
 INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 IUSE=libnotify nautilus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=app-arch/libarchive-3.2:= >=dev-libs/glib-2.38:2 >=dev-libs/json-glib-0.14 >=x11-libs/gtk+-3.22.0:3 >=gui-libs/libhandy-1.5.0:1 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.4.3:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/file-roller/3.42/file-roller-3.42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=379e4d313fcbdc49cc9d05b6bf585276
+_md5_=1b336e3b080f55a0e0c331f3398d1d9a
diff --git a/metadata/md5-cache/app-arch/unrar-6.1.7 b/metadata/md5-cache/app-arch/unrar-6.1.7
new file mode 100644
index 000000000000..1fb5f997759f
--- /dev/null
+++ b/metadata/md5-cache/app-arch/unrar-6.1.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Uncompress rar files
+EAPI=7
+HOMEPAGE=https://www.rarlab.com/rar_add.htm
+INHERIT=multilib toolchain-funcs
+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 ~x86-solaris
+LICENSE=unRAR
+SLOT=0/6
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-6.1.7.tar.gz -> unrar-6.1.7.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1fffe9ed9a30262d627bcd37d1775207
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 065c5a3f68b6..3b8b358f3114 100644
Binary files a/metadata/md5-cache/app-containers/Manifest.gz and b/metadata/md5-cache/app-containers/Manifest.gz differ
diff --git a/metadata/md5-cache/app-containers/apptainer-1.0.2 b/metadata/md5-cache/app-containers/apptainer-1.0.2
index eb1812b34f02..104a5ebb6d70 100644
--- a/metadata/md5-cache/app-containers/apptainer-1.0.2
+++ b/metadata/md5-cache/app-containers/apptainer-1.0.2
@@ -12,4 +12,4 @@ RDEPEND=app-crypt/gpgme >=dev-lang/go-1.17.6 dev-libs/openssl sys-apps/util-linu
 SLOT=0
 SRC_URI=https://github.com/apptainer/apptainer/releases/download/v1.0.2/apptainer-1.0.2.tar.gz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0b6216ab050410a66e40fde71ea7df21
+_md5_=d44bdb6f7ee2ea9a8f52efc62b4fb380
diff --git a/metadata/md5-cache/app-containers/cri-tools-1.24.2 b/metadata/md5-cache/app-containers/cri-tools-1.24.2
new file mode 100644
index 000000000000..54e83f16ff74
--- /dev/null
+++ b/metadata/md5-cache/app-containers/cri-tools-1.24.2
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-lang/go
+DESCRIPTION=CLI and validation tools for Kubelet Container Runtime (CRI)
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes-sigs/cri-tools
+INHERIT=bash-completion-r1 go-module
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes-sigs/cri-tools/archive/v1.24.2.tar.gz -> cri-tools-1.24.2.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4c840d1da58ffe26d5db9fb0c0cd68d5
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 16569dfb8d40..2b31fdf864ad 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/eid-mw-5.1.4 b/metadata/md5-cache/app-crypt/eid-mw-5.1.4
new file mode 100644
index 000000000000..5f82cb44a9f5
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/eid-mw-5.1.4
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy >=app-crypt/pinentry-1.1.0-r4[gtk] ) p11-kit? ( app-crypt/p11-kit ) virtual/pkgconfig
+DESCRIPTION=Electronic Identity Card middleware supplied by the Belgian Federal Government
+EAPI=8
+HOMEPAGE=https://eid.belgium.be
+INHERIT=autotools desktop gnome2-utils xdg-utils
+IUSE=+dialogs +gtk p11-kit
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=>=sys-apps/pcsc-lite-1.2.9 gtk? ( x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 dev-libs/libxml2 net-misc/curl[ssl] net-libs/libproxy >=app-crypt/pinentry-1.1.0-r4[gtk] ) p11-kit? ( app-crypt/p11-kit )
+REQUIRED_USE=dialogs? ( gtk )
+SLOT=0
+SRC_URI=https://codeload.github.com/fedict/eid-mw/tar.gz/v5.1.4 -> eid-mw-5.1.4.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3ffc5837aa4aa0df3ab5cab5e0c8d2b3
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1 b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
new file mode 100644
index 000000000000..b91040547522
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=python? ( dev-lang/swig ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) qt5? ( dev-qt/qtcore:5 ) test? ( qt5? ( dev-qt/qttest:5 ) )
+DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
+EAPI=8
+HOMEPAGE=http://www.gnupg.org/related_software/gpgme
+INHERIT=distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
+IUSE=common-lisp static-libs +cxx python qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+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=GPL-2 LGPL-2.1
+RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) qt5? ( dev-qt/qtcore:5 )
+REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=!test? ( test )
+SLOT=1/11.6.15
+SRC_URI=mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2.sig )
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=2332617a13d64753332c2b31c4211398
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3 b/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
index f9bd55f4d14b..7a4d7b1769fb 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
+++ b/metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Libsecret
 INHERIT=bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
 IUSE=+crypt gtk-doc +introspection test tpm +vala 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+ Apache-2.0
 PDEPEND=virtual/secret-service
 RDEPEND=>=dev-libs/glib-2.44:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] crypt? ( >=dev-libs/libgcrypt-1.2.2: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(-)?] ) tpm? ( >=app-crypt/tpm2-tss-3.0.3:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.20/libsecret-0.20.5.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9b21dc07132b226c4545b5d40204f3fa
+_md5_=6c9fbfab6ce30d2439457e85ed9ce784
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.20 b/metadata/md5-cache/app-crypt/mit-krb5-1.20
new file mode 100644
index 000000000000..e77d85ad06de
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.20
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/yacc cpu_flags_x86_aes? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) ) doc? ( virtual/latex-base ) test? ( dev-util/cmocka ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=!!app-crypt/heimdal >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb:= ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) xinetd? ( sys-apps/xinetd )
+DESCRIPTION=MIT Kerberos V
+EAPI=8
+HOMEPAGE=https://web.mit.edu/kerberos/www/
+INHERIT=autotools python-any-r1 systemd toolchain-funcs multilib-minimal
+IUSE=cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
+RDEPEND=!!app-crypt/heimdal >=sys-fs/e2fsprogs-1.46.4-r51[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-libs/libverto-0.2.5[libev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libverto-0.2.5[libevent,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lmdb? ( dev-db/lmdb:= ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkinit? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) xinetd? ( sys-apps/xinetd ) selinux? ( sec-policy/selinux-kerberos )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://web.mit.edu/kerberos/dist/krb5/1.20/krb5-1.20.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c5adc0180992f859a9824e5ce22ef7af
diff --git a/metadata/md5-cache/app-crypt/pius-3.0.0-r1 b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
index c61d35541a54..5d150bc592fc 100644
--- a/metadata/md5-cache/app-crypt/pius-3.0.0-r1
+++ b/metadata/md5-cache/app-crypt/pius-3.0.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=app-crypt/gnupg-2.0.0
 DESCRIPTION=A tool for signing and email all UIDs on a set of PGP keys
 EAPI=7
 HOMEPAGE=https://www.phildev.net/pius/ https://github.com/jaymzh/pius
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=>=app-crypt/gnupg-2.0.0 dev-lang/perl python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/jaymzh/pius/releases/download/v3.0.0/pius-3.0.0.tar.bz2
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dc955c97025afe8570aca3d63a6fe445
+_md5_=4e614569516bc8e5cac002893c8ad5e9
diff --git a/metadata/md5-cache/app-crypt/veracrypt-1.25.9 b/metadata/md5-cache/app-crypt/veracrypt-1.25.9
new file mode 100644
index 000000000000..8de0b4948b30
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/veracrypt-1.25.9
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig asm? ( dev-lang/yasm )
+DEFINED_PHASES=compile configure install postinst setup test
+DEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
+DESCRIPTION=Disk encryption with strong security based on TrueCrypt
+EAPI=8
+HOMEPAGE=https://www.veracrypt.fr/en/Home.html
+INHERIT=desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+IUSE=+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD truecrypt-3.0
+RDEPEND=sys-fs/lvm2 sys-fs/fuse:0 x11-libs/wxGTK:3.0-gtk3[X?] app-admin/sudo dev-libs/pkcs11-helper
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://github.com/veracrypt/VeraCrypt/archive/VeraCrypt_1.25.9.tar.gz -> veracrypt-1.25.9.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6
+_md5_=4e41104ac98da062657a3a1b9d44b0ac
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 4a13cdd9a147..fe96314d4883 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/halibut-1.3 b/metadata/md5-cache/app-doc/halibut-1.3
new file mode 100644
index 000000000000..1a1ad3b795da
--- /dev/null
+++ b/metadata/md5-cache/app-doc/halibut-1.3
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=yet another free document preparation system
+EAPI=8
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/halibut/
+INHERIT=cmake
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/halibut/halibut-1.3/halibut-1.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0fb965e65d0cf8158f5cd40dd0b88f1e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index b824dd84d052..267cc2bf823b 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/bluefish-2.2.12-r1 b/metadata/md5-cache/app-editors/bluefish-2.2.12-r1
new file mode 100644
index 000000000000..4179a6c01f68
--- /dev/null
+++ b/metadata/md5-cache/app-editors/bluefish-2.2.12-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-libs/glib-2.24:2 dev-libs/libxml2:2 virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=sys-libs/zlib x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) spell? ( app-text/enchant:2 ) x11-libs/pango
+DESCRIPTION=GTK HTML editor for the experienced web designer or programmer
+EAPI=8
+HOMEPAGE=https://bluefish.openoffice.nl/
+INHERIT=autotools python-single-r1 xdg
+IUSE=gucharmap nls python spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=sys-libs/zlib x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) spell? ( app-text/enchant:2 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.12.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6a787134e18bf2e673e9b4499e862ff2
diff --git a/metadata/md5-cache/app-editors/gedit-42.0 b/metadata/md5-cache/app-editors/gedit-42.0
index 34e5963e94a3..5096f6cf72be 100644
--- a/metadata/md5-cache/app-editors/gedit-42.0
+++ b/metadata/md5-cache/app-editors/gedit-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit
 INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
 IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit/42/gedit-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7a6c976d5efd24cc2d79ac6221dacebb
+_md5_=e19faecf56b026dc2235f053c5d74abd
diff --git a/metadata/md5-cache/app-editors/gedit-42.1 b/metadata/md5-cache/app-editors/gedit-42.1
new file mode 100644
index 000000000000..e2686e5be75c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-42.1
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.56[vapigen(+)] dev-lang/vala:0.54[vapigen(+)] dev-lang/vala:0.52[vapigen(+)] dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] ) app-text/docbook-xml-dtd:4.1.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1 ) dev-util/itstool >=sys-devel/gettext-0.18 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) )
+DESCRIPTION=A text editor for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit https://gitlab.gnome.org/GNOME/gedit
+INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
+IUSE=+python gtk-doc spell python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.64:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection,vala] >=dev-libs/libpeas-1.14.1[gtk] >=dev-libs/libxml2-2.5.0:2 >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] >=dev-python/pygobject-3:3[cairo,python_targets_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] ) ) x11-themes/adwaita-icon-theme gnome-base/gsettings-desktop-schemas gnome-base/gvfs
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit/42/gedit-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=23d93d2762aef589e7b99b041a9b3d8e
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-42.0 b/metadata/md5-cache/app-editors/gedit-plugins-42.0
index bbf3d778779f..2672bccbb48e 100644
--- a/metadata/md5-cache/app-editors/gedit-plugins-42.0
+++ b/metadata/md5-cache/app-editors/gedit-plugins-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
 INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
 IUSE=charmap git +python terminal vala python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
 REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) terminal? ( python )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gedit-plugins/42/gedit-plugins-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c07a7bd3bd74cd22118c2abaccfc36f2
+_md5_=097da3d3966d8bef3b49f3082d0a048f
diff --git a/metadata/md5-cache/app-editors/gedit-plugins-42.1 b/metadata/md5-cache/app-editors/gedit-plugins-42.1
new file mode 100644
index 000000000000..e180a0c05b0d
--- /dev/null
+++ b/metadata/md5-cache/app-editors/gedit-plugins-42.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+DESCRIPTION=Collection of extra plugins for the gedit Text Editor
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Gedit/ShippedPlugins
+INHERIT=gnome.org gnome2-utils meson python-single-r1 vala xdg
+IUSE=charmap git +python terminal vala python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/libpeas-1.14.1[gtk] >=app-editors/gedit-40.0 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 >=x11-libs/gtksourceview-4.0.2:4 python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( app-editors/gedit[python,python_single_target_python3_8(-)] dev-libs/libpeas[python,python_single_target_python3_8(-)] >=dev-python/dbus-python-0.82[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-editors/gedit[python,python_single_target_python3_9(-)] dev-libs/libpeas[python,python_single_target_python3_9(-)] >=dev-python/dbus-python-0.82[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-editors/gedit[python,python_single_target_python3_10(-)] dev-libs/libpeas[python,python_single_target_python3_10(-)] >=dev-python/dbus-python-0.82[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=x11-libs/gtk+-3.9:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) terminal? ( >=x11-libs/vte-0.52:2.91[introspection] )
+REQUIRED_USE=charmap? ( python ) git? ( python ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) terminal? ( python )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gedit-plugins/42/gedit-plugins-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c07a7bd3bd74cd22118c2abaccfc36f2
diff --git a/metadata/md5-cache/app-editors/ghex-42.2 b/metadata/md5-cache/app-editors/ghex-42.2
index fb309757f023..85dd13c7be03 100644
--- a/metadata/md5-cache/app-editors/ghex-42.2
+++ b/metadata/md5-cache/app-editors/ghex-42.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=gtk-doc test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.66.0:2 >=gui-libs/gtk-4.0.0:4 dev-libs/gobject-introspection !app-editors/ghex:2
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/ghex/42/ghex-42.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfb602a58147f57a07ff979ccba5325b
+_md5_=bfccd2c2b90f979984da53413c955eb9
diff --git a/metadata/md5-cache/app-editors/gnome-text-editor-42.1 b/metadata/md5-cache/app-editors/gnome-text-editor-42.1
index a6b7bd1e2e5d..e89069da81aa 100644
--- a/metadata/md5-cache/app-editors/gnome-text-editor-42.1
+++ b/metadata/md5-cache/app-editors/gnome-text-editor-42.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-text-editor
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=spell
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.69:2 >=gui-libs/gtk-4.6:4 >=gui-libs/gtksourceview-5.4.1:5 gui-libs/libadwaita:1 dev-libs/libpcre spell? ( >=app-text/enchant-2.2.0:2 dev-libs/icu:= ) gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3897aaf510178de247da4bee87e813f9
+_md5_=3cda58cca586af94dcd9c9723ea81437
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100 b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
index 18054097558d..97b30892b415 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/gvim-8.2.0814-r100
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=5b51f18b7978cf74c13bedd915e1e367
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3428-r1 b/metadata/md5-cache/app-editors/gvim-8.2.3428-r1
index 9ff46d1e19e5..2947fa063496 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3428-r1
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3428-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7608f8ed7ea046d2ae224d126d800c80
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3567 b/metadata/md5-cache/app-editors/gvim-8.2.3567
index 17839a1ae5a5..c7b3ba58e3c5 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3567
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3567
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3567.tar.gz -> vim-8.2.3567.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e9a1216aa0252cb3f13c6578bfbac053
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3582 b/metadata/md5-cache/app-editors/gvim-8.2.3582
index a772976a16ea..22f1742cb8c4 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3582
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3582
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3582.tar.gz -> vim-8.2.3582.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a46facedf0369443b215f8a27b3838db
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3669 b/metadata/md5-cache/app-editors/gvim-8.2.3669
index 23fb2a09edab..4d60d42888e8 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3669
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3669
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3669.tar.gz -> vim-8.2.3669.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e9a1216aa0252cb3f13c6578bfbac053
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3741 b/metadata/md5-cache/app-editors/gvim-8.2.3741
index 09d2d791540d..a852545008ff 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3741
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3741
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a46facedf0369443b215f8a27b3838db
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.3950 b/metadata/md5-cache/app-editors/gvim-8.2.3950
index ee226d1ccfd0..90737adc8ad3 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.3950
+++ b/metadata/md5-cache/app-editors/gvim-8.2.3950
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3950.tar.gz -> vim-8.2.3950.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=65eefe915703ade1e60093d8a33dcbe6
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.4285 b/metadata/md5-cache/app-editors/gvim-8.2.4285
index f1fce41e7845..8aa544a8574f 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.4285
+++ b/metadata/md5-cache/app-editors/gvim-8.2.4285
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4285.tar.gz -> vim-8.2.4285.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=65eefe915703ade1e60093d8a33dcbe6
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.4328 b/metadata/md5-cache/app-editors/gvim-8.2.4328
index c1c891f3b589..d1bdf428905c 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.4328
+++ b/metadata/md5-cache/app-editors/gvim-8.2.4328
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4328.tar.gz -> vim-8.2.4328.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ac0159f332e88a2f09498dcb6fbb783d
diff --git a/metadata/md5-cache/app-editors/gvim-8.2.4586 b/metadata/md5-cache/app-editors/gvim-8.2.4586
index 1cd283198e50..deb917327b1e 100644
--- a/metadata/md5-cache/app-editors/gvim-8.2.4586
+++ b/metadata/md5-cache/app-editors/gvim-8.2.4586
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) p
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=65eefe915703ade1e60093d8a33dcbe6
diff --git a/metadata/md5-cache/app-editors/gvim-9999 b/metadata/md5-cache/app-editors/gvim-9999
index b5400930609a..7e5adf5b7063 100644
--- a/metadata/md5-cache/app-editors/gvim-9999
+++ b/metadata/md5-cache/app-editors/gvim-9999
@@ -12,5 +12,5 @@ RDEPEND=~app-editors/vim-core-9999 >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurs
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e9a1216aa0252cb3f13c6578bfbac053
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r1 b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
similarity index 69%
rename from metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r1
rename to metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
index e195adf28ffa..282e7c8e0270 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r1
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
@@ -1,6 +1,6 @@
 BDEPEND=python? ( python_targets_python3_8? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
 DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
 EAPI=8
 HOMEPAGE=https://github.com/lancos/qhexedit2/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 qmake-utils
 IUSE=doc +gui python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/lancos/qhexedit2/archive/ba5af8616b3a6c916e718914225a483267c01356.tar.gz -> qhexedit2-0.8.6_p20190316.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a0a259277ff46ee082ba4048281495b4
+_md5_=b7bb9251d20bd779e91ec11ec9812750
diff --git a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r1 b/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
similarity index 69%
rename from metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r1
rename to metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
index fb8f95c2db99..4ca62782daa8 100644
--- a/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r1
+++ b/metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
@@ -1,6 +1,6 @@
 BDEPEND=python? ( python_targets_python3_8? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt-builder-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sip-5:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
 DESCRIPTION=Hex editor library, Qt application written in C++ with Python bindings
 EAPI=8
 HOMEPAGE=https://github.com/Simsys/qhexedit2/
@@ -8,9 +8,9 @@ INHERIT=distutils-r1 qmake-utils
 IUSE=doc +gui python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/PyQt5-5.15.6[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Simsys/qhexedit2/archive/541139125be034b90b6811a84faa1413e357fd94.tar.gz -> qhexedit2-0.8.9_p20210525.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=aec88f2f5dc3144932b119de63a6c831
+_md5_=2ff1ed3a41dcfebb20374e35e53872c0
diff --git a/metadata/md5-cache/app-editors/vim-8.2.0814-r100 b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
index 2c4d3d9f8c65..386b3a1d821c 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.0814-r100
+++ b/metadata/md5-cache/app-editors/vim-8.2.0814-r100
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0d6199ff98a9d9ac1a99225814a99f90
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3428-r1 b/metadata/md5-cache/app-editors/vim-8.2.3428-r1
index 726b42ba2f3b..e84c10acb923 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3428-r1
+++ b/metadata/md5-cache/app-editors/vim-8.2.3428-r1
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=908d7aa8361b04542b99e75c72b56e2a
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3567 b/metadata/md5-cache/app-editors/vim-8.2.3567
index 64e0ee477238..6baafcb2988e 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3567
+++ b/metadata/md5-cache/app-editors/vim-8.2.3567
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3567.tar.gz -> vim-8.2.3567.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c251caf60f1fb97ed8fe643dce205bf1
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3582 b/metadata/md5-cache/app-editors/vim-8.2.3582
index c83b5cc0d0d2..6fcb8e44c431 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3582
+++ b/metadata/md5-cache/app-editors/vim-8.2.3582
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3582.tar.gz -> vim-8.2.3582.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a833f59ba68fa5af0ac3059acd7dbcfb
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3669 b/metadata/md5-cache/app-editors/vim-8.2.3669
index 71f9e6e2b8ce..29b190f2dd92 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3669
+++ b/metadata/md5-cache/app-editors/vim-8.2.3669
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3669.tar.gz -> vim-8.2.3669.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c251caf60f1fb97ed8fe643dce205bf1
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3741 b/metadata/md5-cache/app-editors/vim-8.2.3741
index 15a579bab3d4..83d405d54ca9 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3741
+++ b/metadata/md5-cache/app-editors/vim-8.2.3741
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a833f59ba68fa5af0ac3059acd7dbcfb
diff --git a/metadata/md5-cache/app-editors/vim-8.2.3950 b/metadata/md5-cache/app-editors/vim-8.2.3950
index f610c850d4d4..90ee571599a4 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.3950
+++ b/metadata/md5-cache/app-editors/vim-8.2.3950
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3950.tar.gz -> vim-8.2.3950.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c251caf60f1fb97ed8fe643dce205bf1
diff --git a/metadata/md5-cache/app-editors/vim-8.2.4285 b/metadata/md5-cache/app-editors/vim-8.2.4285
index a39412afe676..f36d35735dc9 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.4285
+++ b/metadata/md5-cache/app-editors/vim-8.2.4285
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4285.tar.gz -> vim-8.2.4285.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=c251caf60f1fb97ed8fe643dce205bf1
diff --git a/metadata/md5-cache/app-editors/vim-8.2.4328-r1 b/metadata/md5-cache/app-editors/vim-8.2.4328-r1
index 7fb8a4a62a68..db2ce01880f5 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.4328-r1
+++ b/metadata/md5-cache/app-editors/vim-8.2.4328-r1
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4328.tar.gz -> vim-8.2.4328.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=0521b0d05d72a3e0a9f74004d09a2070
diff --git a/metadata/md5-cache/app-editors/vim-8.2.4586 b/metadata/md5-cache/app-editors/vim-8.2.4586
index 64108c69b568..63c1bbcbeb30 100644
--- a/metadata/md5-cache/app-editors/vim-8.2.4586
+++ b/metadata/md5-cache/app-editors/vim-8.2.4586
@@ -12,5 +12,5 @@ RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a385190dd2d9e85b5ff997941b494441
diff --git a/metadata/md5-cache/app-editors/vim-9999 b/metadata/md5-cache/app-editors/vim-9999
index e4afa0b87b83..a07e92c9fa2a 100644
--- a/metadata/md5-cache/app-editors/vim-9999
+++ b/metadata/md5-cache/app-editors/vim-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) gpm? ( >=sys-libs/gpm-1.19.3 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) ) ~app-editors/vim-core-9999 !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) ) racket? ( dev-scheme/racket ) ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.7 ) virtual/rubygems ) selinux? ( sys-libs/libselinux ) sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) vim-pager? ( !minimal )
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a385190dd2d9e85b5ff997941b494441
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.0814 b/metadata/md5-cache/app-editors/vim-core-8.2.0814
index d923bb0ac8d3..027a700ba9fb 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.0814
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.0814
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.0814.tar.gz -> vim-8.2.0814.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=54327f557cb1d11918aee348986273a0
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3428 b/metadata/md5-cache/app-editors/vim-core-8.2.3428
index afcc7b964484..0764f996ad34 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3428
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3428
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3428.tar.gz -> vim-8.2.3428.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ee6919a042a66680f567b63267d79a09
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3567 b/metadata/md5-cache/app-editors/vim-core-8.2.3567
index d9ea69563e28..52002ff8d3f9 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3567
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3567
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3567.tar.gz -> vim-8.2.3567.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=977ca20c10101cff971780e28122ebe9
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3582 b/metadata/md5-cache/app-editors/vim-core-8.2.3582
index a3bfb4772191..e68d0e6a37b8 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3582
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3582
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3582.tar.gz -> vim-8.2.3582.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ec8ba9f09a231753c63b36af42c4dc33
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3669 b/metadata/md5-cache/app-editors/vim-core-8.2.3669
index 4e8048312f5d..5918a4381b33 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3669
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3669
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3669.tar.gz -> vim-8.2.3669.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=977ca20c10101cff971780e28122ebe9
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3741 b/metadata/md5-cache/app-editors/vim-core-8.2.3741
index 49d0157dcb7a..000865e26887 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3741
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3741
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3741.tar.gz -> vim-8.2.3741.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=ec8ba9f09a231753c63b36af42c4dc33
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.3950 b/metadata/md5-cache/app-editors/vim-core-8.2.3950
index 3c6fed69981b..fe42c98ef4a2 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.3950
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.3950
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.3950.tar.gz -> vim-8.2.3950.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=977ca20c10101cff971780e28122ebe9
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.4285 b/metadata/md5-cache/app-editors/vim-core-8.2.4285
index 86207a7ff6af..b963952151e4 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.4285
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.4285
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4285.tar.gz -> vim-8.2.4285.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=977ca20c10101cff971780e28122ebe9
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.4328-r1 b/metadata/md5-cache/app-editors/vim-core-8.2.4328-r1
index ee74d16840d9..7db482275d5d 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.4328-r1
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.4328-r1
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648 !<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4328.tar.gz -> vim-8.2.4328.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=4398f3c3268a4a8402c42c66a29dd15e
diff --git a/metadata/md5-cache/app-editors/vim-core-8.2.4586 b/metadata/md5-cache/app-editors/vim-core-8.2.4586
index 4acb2ef710cd..6946fed0246e 100644
--- a/metadata/md5-cache/app-editors/vim-core-8.2.4586
+++ b/metadata/md5-cache/app-editors/vim-core-8.2.4586
@@ -11,5 +11,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 RDEPEND=!!<app-editors/gvim-8.1.0648 !<app-editors/vim-8.2.4328-r1
 SLOT=0
 SRC_URI=https://github.com/vim/vim/archive/v8.2.4586.tar.gz -> vim-8.2.4586.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=72eb49e6c4ffeebc267d5c9d61320c8b
diff --git a/metadata/md5-cache/app-editors/vim-core-9999 b/metadata/md5-cache/app-editors/vim-core-9999
index 814a9dc5fc8d..c508b39a2a10 100644
--- a/metadata/md5-cache/app-editors/vim-core-9999
+++ b/metadata/md5-cache/app-editors/vim-core-9999
@@ -10,5 +10,5 @@ PDEPEND=!minimal? ( app-vim/gentoo-syntax )
 PROPERTIES=live
 RDEPEND=!!<app-editors/gvim-8.1.0648 !<app-editors/vim-8.2.4328-r1
 SLOT=0
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=72eb49e6c4ffeebc267d5c9d61320c8b
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 7622ca23cf79..2654c78a50eb 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/assess-0.6 b/metadata/md5-cache/app-emacs/assess-0.6
new file mode 100644
index 000000000000..e9ac07ac80ec
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/assess-0.6
@@ -0,0 +1,15 @@
+BDEPEND=app-emacs/m-buffer test? ( app-emacs/load-relative ) >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Test support functions for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/phillord/assess/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=app-emacs/m-buffer >=app-editors/emacs-23.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/phillord/assess/archive/v0.6.tar.gz -> assess-0.6.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=74b63b5eea118918c3fb0c1b35adea85
diff --git a/metadata/md5-cache/app-emacs/cask-mode-0.1 b/metadata/md5-cache/app-emacs/cask-mode-0.1
new file mode 100644
index 000000000000..963c1e0286d0
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/cask-mode-0.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-emacs/assess app-emacs/ert-runner ) >=app-editors/emacs-24.3:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=Major mode for editing Cask files for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/Wilfred/cask-mode/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.3:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Wilfred/cask-mode/archive/0.1.tar.gz -> cask-mode-0.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=0e315c74c37daa03dcad50cac8698dbb
diff --git a/metadata/md5-cache/app-emacs/compat-28.1.1.1-r1 b/metadata/md5-cache/app-emacs/compat-28.1.1.1-r1
new file mode 100644
index 000000000000..56f5fccab0a6
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/compat-28.1.1.1-r1
@@ -0,0 +1,13 @@
+BDEPEND=sys-apps/texinfo >=app-editors/emacs-24:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Compatibility libraries for Emacs
+EAPI=8
+HOMEPAGE=https://git.sr.ht/~pkal/compat
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-24:*
+SLOT=0
+SRC_URI=https://git.sr.ht/~pkal/compat/archive/28.1.1.1.tar.gz -> compat-28.1.1.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=be9ba576a12ed4fb078069736dccf2c2
diff --git a/metadata/md5-cache/app-emacs/consult-0.18 b/metadata/md5-cache/app-emacs/consult-0.18
new file mode 100644
index 000000000000..3c60c5cef5af
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/consult-0.18
@@ -0,0 +1,13 @@
+BDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Consulting complete-read
+EAPI=8
+HOMEPAGE=https://github.com/minad/consult
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-emacs/compat-28.1 >=app-editors/emacs-27:*
+SLOT=0
+SRC_URI=https://github.com/minad/consult/archive/refs/tags/0.18.tar.gz -> consult-0.18.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=5eafdaaa2b81a75da888a151968486c6
diff --git a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2 b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
index c6fea493f9fc..f200c4a633a1 100644
--- a/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
+++ b/metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
@@ -3,11 +3,12 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=EditorConfig plugin for emacs
 EAPI=8
 HOMEPAGE=https://github.com/editorconfig/editorconfig-emacs
-KEYWORDS=~amd64 ~x86
+INHERIT=elisp readme.gentoo-r1
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-emacs/archive/v0.8.2.tar.gz -> editorconfig-emacs-0.8.2.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=8ec9300315020f43189cd24a74dd571e
+_md5_=9d6c06891a317064d83c9b98025cebc0
diff --git a/metadata/md5-cache/app-emacs/f-0.19.0 b/metadata/md5-cache/app-emacs/f-0.19.0-r1
similarity index 61%
rename from metadata/md5-cache/app-emacs/f-0.19.0
rename to metadata/md5-cache/app-emacs/f-0.19.0-r1
index 1072067aa5fa..33df4a7b6244 100644
--- a/metadata/md5-cache/app-emacs/f-0.19.0
+++ b/metadata/md5-cache/app-emacs/f-0.19.0-r1
@@ -1,13 +1,15 @@
+BDEPEND=>=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
+DEPEND=app-emacs/dash app-emacs/s
 DESCRIPTION=Modern API for working with files and directories in Emacs
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/rejeep/f.el
+INHERIT=elisp
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.19.0.tar.gz -> f-0.19.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=a82585d652930b74b5bbb53c08fdb962
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=99fe4fe0e4e9d428ce1f07a888d2cf35
diff --git a/metadata/md5-cache/app-emacs/f-0.20.0 b/metadata/md5-cache/app-emacs/f-0.20.0-r1
similarity index 62%
rename from metadata/md5-cache/app-emacs/f-0.20.0
rename to metadata/md5-cache/app-emacs/f-0.20.0-r1
index 1eabcf8cdbcd..b21e075ae565 100644
--- a/metadata/md5-cache/app-emacs/f-0.20.0
+++ b/metadata/md5-cache/app-emacs/f-0.20.0-r1
@@ -1,13 +1,15 @@
+BDEPEND=>=app-editors/emacs-23.1:*
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
+DEPEND=app-emacs/dash app-emacs/s
 DESCRIPTION=Modern API for working with files and directories in Emacs
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/rejeep/f.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=app-emacs/dash app-emacs/s >=app-editors/emacs-23.1:*
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/rejeep/f.el/archive/v0.20.0.tar.gz -> f-0.20.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=56e56b62f441b483e0b36a32721dc52e
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=1602ebf932bfcbfc036fa501b4535f24
diff --git a/metadata/md5-cache/app-emacs/jde-2.4.1-r2 b/metadata/md5-cache/app-emacs/jde-2.4.1-r2
deleted file mode 100644
index 605582ca4580..000000000000
--- a/metadata/md5-cache/app-emacs/jde-2.4.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8:* dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 dev-java/ant-contrib:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java Development Environment for Emacs
-EAPI=7
-HOMEPAGE=http://jdee.sourceforge.net/
-INHERIT=java-pkg-2 java-ant-2 elisp
-IUSE=doc source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jdk-1.8:* dev-java/bsh:0 dev-java/junit:0 dev-util/checkstyle:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=mirror://gentoo/jdee-2.4.1.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=37bbccf39475cf2aff62729c5892e08a
diff --git a/metadata/md5-cache/app-emacs/load-relative-1.3.1 b/metadata/md5-cache/app-emacs/load-relative-1.3.1
new file mode 100644
index 000000000000..1f3c82b0451e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/load-relative-1.3.1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Relative loads for Emacs Lisp files
+EAPI=8
+HOMEPAGE=https://github.com/rocky/emacs-load-relative/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/rocky/emacs-load-relative/archive/1.3.1.tar.gz -> load-relative-1.3.1.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=00890b43f0f0fb9f26847e5f46c274f1
diff --git a/metadata/md5-cache/app-emacs/m-buffer-0.15 b/metadata/md5-cache/app-emacs/m-buffer-0.15
new file mode 100644
index 000000000000..c9869be0856d
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/m-buffer-0.15
@@ -0,0 +1,15 @@
+BDEPEND=test? ( app-emacs/load-relative ) >=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DESCRIPTION=List Oriented Buffer Operations for Emacs
+EAPI=8
+HOMEPAGE=https://github.com/phillord/m-buffer-el/
+INHERIT=elisp
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/phillord/m-buffer-el/archive/v0.15.tar.gz -> m-buffer-0.15.tar.gz
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=599f11687569ff04ca16037f5e8e1511
diff --git a/metadata/md5-cache/app-emacs/racket-mode-20220411 b/metadata/md5-cache/app-emacs/racket-mode-20220411
index 97217f9173e9..7c6dcc6e9639 100644
--- a/metadata/md5-cache/app-emacs/racket-mode-20220411
+++ b/metadata/md5-cache/app-emacs/racket-mode-20220411
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DESCRIPTION=Emacs modes for Racket: edit, REPL, check-syntax, debug, profile, and more
 EAPI=8
 HOMEPAGE=https://github.com/greghendershott/racket-mode/
-KEYWORDS=~amd64 ~x86
+INHERIT=elisp
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=dev-scheme/racket:=[-minimal] >=app-editors/emacs-25.1:*
 SLOT=0
 SRC_URI=https://github.com/greghendershott/racket-mode/archive/e7efbb52fdf2219532230a199153d8a33889c26f.tar.gz -> racket-mode-20220411.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=10bae43282fbb3b2473f01e6cb88cfef
+_md5_=1899f9085ba5f0f03fae2544f5d382ac
diff --git a/metadata/md5-cache/app-emacs/s-1.12.0 b/metadata/md5-cache/app-emacs/s-1.12.0-r1
similarity index 59%
rename from metadata/md5-cache/app-emacs/s-1.12.0
rename to metadata/md5-cache/app-emacs/s-1.12.0-r1
index 249f4b7b82af..b1db45e34187 100644
--- a/metadata/md5-cache/app-emacs/s-1.12.0
+++ b/metadata/md5-cache/app-emacs/s-1.12.0-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-editors/emacs-23.1:*
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
 DESCRIPTION=The long lost Emacs string manipulation library
-EAPI=6
+EAPI=8
 HOMEPAGE=https://github.com/magnars/s.el
+INHERIT=elisp
 KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-23.1:*
 SLOT=0
 SRC_URI=https://github.com/magnars/s.el/archive/1.12.0.tar.gz -> s-1.12.0.tar.gz
-_eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
-_md5_=37339a47bb953cf840c682c582b7e001
+_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
+_md5_=68b8bd7b317ad7b486b0b4c9c2056453
diff --git a/metadata/md5-cache/app-emacs/vertico-0.22 b/metadata/md5-cache/app-emacs/vertico-0.24
similarity index 79%
rename from metadata/md5-cache/app-emacs/vertico-0.22
rename to metadata/md5-cache/app-emacs/vertico-0.24
index 37ec50ef5dfe..4da755c0f80d 100644
--- a/metadata/md5-cache/app-emacs/vertico-0.22
+++ b/metadata/md5-cache/app-emacs/vertico-0.24
@@ -3,10 +3,11 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DESCRIPTION=Vertical interactive completion
 EAPI=8
 HOMEPAGE=https://github.com/minad/vertico
+INHERIT=elisp
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=>=app-editors/emacs-27:*
 SLOT=0
-SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.22.tar.gz -> vertico-0.22.tar.gz
+SRC_URI=https://github.com/minad/vertico/archive/refs/tags/0.24.tar.gz -> vertico-0.24.tar.gz
 _eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	e7aaa047873789f549ea3df2f04b2145
 _md5_=a21f11f2d111ef98b890cc7961a8bb1a
diff --git a/metadata/md5-cache/app-emulation/86Box-3.4.1-r1 b/metadata/md5-cache/app-emulation/86Box-3.5
similarity index 93%
rename from metadata/md5-cache/app-emulation/86Box-3.4.1-r1
rename to metadata/md5-cache/app-emulation/86Box-3.5
index 01aff2ba07ee..dc70c05a6eab 100644
--- a/metadata/md5-cache/app-emulation/86Box-3.4.1-r1
+++ b/metadata/md5-cache/app-emulation/86Box-3.5
@@ -10,6 +10,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-2+
 RDEPEND=app-emulation/faudio dev-libs/libevdev media-libs/freetype:2= media-libs/libpng:= media-libs/libsdl2 media-libs/openal media-libs/rtmidi net-libs/libslirp sys-libs/zlib qt5? ( x11-libs/libXi ) fluidsynth? ( media-sound/fluidsynth ) munt? ( media-libs/munt-mt32emu ) openal? ( media-libs/openal ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qttranslations:5 dev-qt/qtwidgets:5 )
 SLOT=0
-SRC_URI=https://github.com/86Box/86Box/archive/refs/tags/v3.4.1.tar.gz -> 86Box-3.4.1.tar.gz
+SRC_URI=https://github.com/86Box/86Box/archive/refs/tags/v3.5.tar.gz -> 86Box-3.5.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=e20ca492820b98b61965a90c69cb18f0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 8ea633c83289..2869eb3295c4 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.8.2 b/metadata/md5-cache/app-emulation/protontricks-1.8.2
new file mode 100644
index 000000000000..1efcaf9ca184
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/protontricks-1.8.2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_pypy3? ( dev-python/setuptools_scm[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools_scm[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools_scm[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools_scm[python_targets_python3_11(-)] ) test? ( app-emulation/winetricks python_single_target_pypy3? ( dev-python/setuptools[python_targets_pypy3(-)] dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] dev-python/vdf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] dev-python/vdf[python_targets_python3_11(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.0.1[python_targets_python3_11(-)] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) python_single_target_pypy3? ( >=dev-python/gpep517-3[python_targets_pypy3(-)] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)] dev-python/wheel[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-3[python_targets_python3_11(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
+EAPI=8
+HOMEPAGE=https://github.com/Matoking/protontricks
+INHERIT=distutils-r1 xdg-utils
+IUSE=+gui test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-emulation/winetricks python_single_target_pypy3? ( dev-python/setuptools[python_targets_pypy3(-)] dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] dev-python/vdf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] dev-python/vdf[python_targets_python3_11(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/protontricks/protontricks-1.8.2.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c19b260ac756f9281a500ffd1dc9f439
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20220516 b/metadata/md5-cache/app-emulation/ruffle-0_p20220516
index fbb7d31a2a5e..c86aadab0843 100644
--- a/metadata/md5-cache/app-emulation/ruffle-0_p20220516
+++ b/metadata/md5-cache/app-emulation/ruffle-0_p20220516
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=virtual/rust-1.60 >=virtual/rust-1.53
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
 DEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
 DESCRIPTION=Flash Player emulator written in Rust
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x
 SLOT=0
 SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2022-05-16.tar.gz -> ruffle-nightly-2022-05-16.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/alsa/0.6.0/download -> alsa-0.6.0.crate https://crates.io/api/v1/crates/alsa-sys/0.3.1/download -> alsa-sys-0.3.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.34.0+1.2.203/download -> ash-0.34.0+1.2.203.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/atk-sys/0.15.1/download -> atk-sys-0.15.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.56.0/download -> bindgen-0.56.0.crate https://crates.io/api/v1/crates/bit-set/0.5.2/download -> bit-set-0.5.2.crate https://crates.io/api/v1/crates/bit-vec/0.6.3/download -> bit-vec-0.6.3.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.3.0/download -> bitstream-io-1.3.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/bytemuck/1.9.1/download -> bytemuck-1.9.1.crate https://crates.io/api/v1/crates/bytemuck_derive/1.1.0/download -> bytemuck_derive-1.1.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/castaway/0.1.2/download -> castaway-0.1.2.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cesu8/1.1.0/download -> cesu8-1.1.0.crate https://crates.io/api/v1/crates/cexpr/0.4.0/download -> cexpr-0.4.0.crate https://crates.io/api/v1/crates/cfg-expr/0.10.2/download -> cfg-expr-0.10.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clang-sys/1.3.1/download -> clang-sys-1.3.1.crate https://crates.io/api/v1/crates/clap/3.1.17/download -> clap-3.1.17.crate https://crates.io/api/v1/crates/clap_derive/3.1.7/download -> clap_derive-3.1.7.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/clipboard/0.5.0/download -> clipboard-0.5.0.crate https://crates.io/api/v1/crates/clipboard-win/2.2.0/download -> clipboard-win-2.2.0.crate https://crates.io/api/v1/crates/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/codespan-reporting/0.11.1/download -> codespan-reporting-0.11.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/combine/4.6.3/download -> combine-4.6.3.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/console_error_panic_hook/0.1.7/download -> console_error_panic_hook-0.1.7.crate https://crates.io/api/v1/crates/console_log/0.2.0/download -> console_log-0.2.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/copyless/0.1.5/download -> copyless-0.1.5.crate https://crates.io/api/v1/crates/core-foundation/0.7.0/download -> core-foundation-0.7.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download -> core-foundation-sys-0.7.0.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.crate https://crates.io/api/v1/crates/coreaudio-rs/0.10.0/download -> coreaudio-rs-0.10.0.crate https://crates.io/api/v1/crates/coreaudio-sys/0.2.9/download -> coreaudio-sys-0.2.9.crate https://crates.io/api/v1/crates/cpal/0.13.5/download -> cpal-0.13.5.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/curl/0.4.43/download -> curl-0.4.43.crate https://crates.io/api/v1/crates/curl-sys/0.4.54+curl-7.83.0/download -> curl-sys-0.4.54+curl-7.83.0.crate https://crates.io/api/v1/crates/d3d12/0.4.1/download -> d3d12-0.4.1.crate https://crates.io/api/v1/crates/darling/0.13.1/download -> darling-0.13.1.crate https://crates.io/api/v1/crates/darling_core/0.13.1/download -> darling_core-0.13.1.crate https://crates.io/api/v1/crates/darling_macro/0.13.1/download -> darling_macro-0.13.1.crate https://crates.io/api/v1/crates/deflate/1.0.0/download -> deflate-1.0.0.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/embed-resource/1.7.2/download -> embed-resource-1.7.2.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.1.0/download -> enum-map-2.1.0.crate https://crates.io/api/v1/crates/enum-map-derive/0.8.0/download -> enum-map-derive-0.8.0.crate https://crates.io/api/v1/crates/enumset/1.0.8/download -> enumset-1.0.8.crate https://crates.io/api/v1/crates/enumset_derive/0.5.5/download -> enumset_derive-0.5.5.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/euclid/0.22.6/download -> euclid-0.22.6.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/exr/1.4.2/download -> exr-1.4.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.crate https://crates.io/api/v1/crates/float_next_after/0.1.5/download -> float_next_after-0.1.5.crate https://crates.io/api/v1/crates/flume/0.10.12/download -> flume-0.10.12.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.1/download -> gdk-pixbuf-sys-0.15.1.crate https://crates.io/api/v1/crates/gdk-sys/0.15.1/download -> gdk-sys-0.15.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gif/0.11.3/download -> gif-0.11.3.crate https://crates.io/api/v1/crates/gio-sys/0.15.7/download -> gio-sys-0.15.7.crate https://crates.io/api/v1/crates/glib-sys/0.15.7/download -> glib-sys-0.15.7.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.2/download -> glow-0.11.2.crate https://crates.io/api/v1/crates/gobject-sys/0.15.9/download -> gobject-sys-0.15.9.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.3/download -> gpu-alloc-0.5.3.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.2/download -> gpu-descriptor-0.2.2.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/gtk-sys/0.15.3/download -> gtk-sys-0.15.3.crate https://crates.io/api/v1/crates/half/1.8.2/download -> half-1.8.2.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hexf-parse/0.2.1/download -> hexf-parse-0.2.1.crate https://crates.io/api/v1/crates/http/0.2.6/download -> http-0.2.6.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.24.2/download -> image-0.24.2.crate https://crates.io/api/v1/crates/indexmap/1.6.2/download -> indexmap-1.6.2.crate https://crates.io/api/v1/crates/indicatif/0.16.2/download -> indicatif-0.16.2.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inplace_it/0.3.3/download -> inplace_it-0.3.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.7.1/download -> isahc-1.7.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jni/0.19.0/download -> jni-0.19.0.crate https://crates.io/api/v1/crates/jni-sys/0.3.0/download -> jni-sys-0.3.0.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/khronos-egl/4.1.0/download -> khronos-egl-4.1.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lebe/0.5.1/download -> lebe-0.5.1.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.120/download -> libc-0.2.120.crate https://crates.io/api/v1/crates/libflate/1.2.0/download -> libflate-1.2.0.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lyon/0.17.10/download -> lyon-0.17.10.crate https://crates.io/api/v1/crates/lyon_algorithms/0.17.7/download -> lyon_algorithms-0.17.7.crate https://crates.io/api/v1/crates/lyon_geom/0.17.6/download -> lyon_geom-0.17.6.crate https://crates.io/api/v1/crates/lyon_path/0.17.7/download -> lyon_path-0.17.7.crate https://crates.io/api/v1/crates/lyon_tessellation/0.17.10/download -> lyon_tessellation-0.17.10.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.crate https://crates.io/api/v1/crates/mach/0.3.2/download -> mach-0.3.2.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.23.1/download -> metal-0.23.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/mio/0.8.1/download -> mio-0.8.1.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/naga/0.8.5/download -> naga-0.8.5.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.0.crate https://crates.io/api/v1/crates/ndk/0.6.0/download -> ndk-0.6.0.crate https://crates.io/api/v1/crates/ndk-context/0.1.0/download -> ndk-context-0.1.0.crate https://crates.io/api/v1/crates/ndk-glue/0.5.1/download -> ndk-glue-0.5.1.crate https://crates.io/api/v1/crates/ndk-glue/0.6.1/download -> ndk-glue-0.6.1.crate https://crates.io/api/v1/crates/ndk-macro/0.3.0/download -> ndk-macro-0.3.0.crate https://crates.io/api/v1/crates/ndk-sys/0.2.2/download -> ndk-sys-0.2.2.crate https://crates.io/api/v1/crates/ndk-sys/0.3.0/download -> ndk-sys-0.3.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/5.1.2/download -> nom-5.1.2.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.2.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num-complex/0.4.0/download -> num-complex-0.4.0.crate https://crates.io/api/v1/crates/num-derive/0.3.3/download -> num-derive-0.3.3.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.4.0/download -> num-rational-0.4.0.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_enum/0.5.7/download -> num_enum-0.5.7.crate https://crates.io/api/v1/crates/num_enum_derive/0.5.7/download -> num_enum_derive-0.5.7.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_exception/0.1.2/download -> objc_exception-0.1.2.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/oboe/0.4.5/download -> oboe-0.4.5.crate https://crates.io/api/v1/crates/oboe-sys/0.4.5/download -> oboe-sys-0.4.5.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.0/download -> os_str_bytes-6.0.0.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/pango-sys/0.15.1/download -> pango-sys-0.15.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project/1.0.10/download -> pin-project-1.0.10.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download -> pin-project-internal-1.0.10.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/png/0.17.5/download -> png-0.17.5.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/primal-check/0.3.1/download -> primal-check-0.3.1.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/profiling/1.0.5/download -> profiling-1.0.5.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.2/download -> raw-window-handle-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.2/download -> rayon-1.5.2.crate https://crates.io/api/v1/crates/rayon-core/1.9.2/download -> rayon-core-1.9.2.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rfd/0.8.2/download -> rfd-0.8.2.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.3/download -> rle-decode-fast-1.0.3.crate https://crates.io/api/v1/crates/ron/0.7.0/download -> ron-0.7.0.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustdct/0.7.0/download -> rustdct-0.7.0.crate https://crates.io/api/v1/crates/rustfft/6.0.1/download -> rustfft-6.0.1.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/shlex/0.1.1/download -> shlex-0.1.1.crate https://crates.io/api/v1/crates/sid/0.6.1/download -> sid-0.6.1.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.3/download -> smithay-client-toolkit-0.15.3.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.2/download -> spin-0.9.2.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/svg/0.10.0/download -> svg-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.5.0/download -> symphonia-0.5.0.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.5.0/download -> symphonia-bundle-mp3-0.5.0.crate https://crates.io/api/v1/crates/symphonia-core/0.5.0/download -> symphonia-core-0.5.0.crate https://crates.io/api/v1/crates/symphonia-metadata/0.5.0/download -> symphonia-metadata-0.5.0.crate https://crates.io/api/v1/crates/syn/1.0.92/download -> syn-1.0.92.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.7.1/download -> tiff-0.7.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tracing/0.1.32/download -> tracing-0.1.32.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.20/download -> tracing-attributes-0.1.20.crate https://crates.io/api/v1/crates/tracing-core/0.1.23/download -> tracing-core-0.1.23.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version-compare/0.1.0/download -> version-compare-0.1.0.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.1/download -> vswhom-sys-0.1.1.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.30/download -> wasm-bindgen-futures-0.4.30.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/webbrowser/0.7.1/download -> webbrowser-0.7.1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/wgpu/0.12.0/download -> wgpu-0.12.0.crate https://crates.io/api/v1/crates/wgpu-core/0.12.2/download -> wgpu-core-0.12.2.crate https://crates.io/api/v1/crates/wgpu-hal/0.12.4/download -> wgpu-hal-0.12.4.crate https://crates.io/api/v1/crates/wgpu-types/0.12.0/download -> wgpu-types-0.12.0.crate https://crates.io/api/v1/crates/wide/0.7.4/download -> wide-0.7.4.crate https://crates.io/api/v1/crates/widestring/0.5.1/download -> widestring-0.5.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.35.0/download -> windows-0.35.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.35.0/download -> windows_aarch64_msvc-0.35.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.35.0/download -> windows_i686_gnu-0.35.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.35.0/download -> windows_i686_msvc-0.35.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.35.0/download -> windows_x86_64_gnu-0.35.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.35.0/download -> windows_x86_64_msvc-0.35.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.3.3/download -> x11-clipboard-0.3.3.crate https://crates.io/api/v1/crates/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz -> gc-arena-4931b3bc25b2b74174ff5eb9c34ae0dda732778b.tar.gz https://github.com/ruffle-rs/h263-rs/archive/023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz -> h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz https://github.com/ruffle-rs/nellymoser/archive/4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz -> nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2ccee25027796e163c80287bdb672fa9
+_md5_=a894f88fb7b7a75bf871e5805bde77c5
diff --git a/metadata/md5-cache/app-emulation/ruffle-9999 b/metadata/md5-cache/app-emulation/ruffle-9999
index 9d0d22b47565..5223eacdfa94 100644
--- a/metadata/md5-cache/app-emulation/ruffle-9999
+++ b/metadata/md5-cache/app-emulation/ruffle-9999
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=virtual/rust-1.56 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=virtual/rust-1.60 >=virtual/rust-1.53 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
 DEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
 DESCRIPTION=Flash Player emulator written in Rust
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x11-libs/gtk+:3 x11-libs/libxcb:=
 SLOT=0
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4999794c1654ce4c5b778f140d99cb63
+_md5_=9da77d03b78076bf89226148c7e6a8ba
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32-r1
similarity index 97%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32-r1
index 6b0670b05d99..fe29f1e61db4 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32-r1
@@ -13,4 +13,4 @@ RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.32/VirtualBox-6.1.32.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=90ea8df0ac7ed2475199cb5aa464b580
+_md5_=00fea7d9c6fe28472f0d94d78cbc505b
diff --git a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34 b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r1
similarity index 97%
rename from metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34
rename to metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r1
index 3a0ff1a7633f..6e02719846c2 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34
+++ b/metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r1
@@ -13,4 +13,4 @@ RDEPEND=acct-group/vboxguest acct-group/vboxsf acct-user/vboxguest X? ( x11-apps
 SLOT=0/6.1
 SRC_URI=https://download.virtualbox.org/virtualbox/6.1.34/VirtualBox-6.1.34.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.12-patches-01.tar.xz
 _eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=13ce0bcaf669f16460916a1d72edc48f
+_md5_=776886584467903c02ec719f6b58ce7d
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index d2268be41a94..ce5aa03fe992 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.26-r1 b/metadata/md5-cache/app-i18n/ibus-1.5.26-r1
index 763992e67241..b8bb34e21c86 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.26-r1
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.26-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/ibus/ibus/wiki
 INHERIT=autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils
 IUSE=X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection nls +python systemd test +unicode vala wayland python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/iso-codes >=dev-libs/glib-2.65.0:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) gtk4? ( gui-libs/gtk:4 ) gui? ( x11-libs/libX11 x11-libs/libXi ) introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gui? ( x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=appindicator? ( gtk3 ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) introspection ) test? ( gtk3 ) vala? ( introspection ) X? ( gtk3 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.26/ibus-1.5.26.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8bfe5e1089cb73ed0dfdfa3be8130b6c
+_md5_=39c3325484b166b76c7134445dc5fca2
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 16dae04e06a3..e2a37b6ab0f8 100644
Binary files a/metadata/md5-cache/app-laptop/Manifest.gz and b/metadata/md5-cache/app-laptop/Manifest.gz differ
diff --git a/metadata/md5-cache/app-laptop/rogauracore-1.5 b/metadata/md5-cache/app-laptop/rogauracore-1.5
index 1b11c5d577a5..5aab39627366 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-1.5
+++ b/metadata/md5-cache/app-laptop/rogauracore-1.5
@@ -5,10 +5,10 @@ DESCRIPTION=RGB keyboard control for Asus ROG laptops
 EAPI=7
 HOMEPAGE=https://github.com/wroberts/rogauracore
 INHERIT=autotools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=virtual/libusb:=
 SLOT=0
 SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.5.tar.gz -> rogauracore-1.5.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efbaef08b699340861d5dd3b40da1814
+_md5_=202a4a1dfee2728fe8493ff78f5d9d28
diff --git a/metadata/md5-cache/app-laptop/rogauracore-1.4 b/metadata/md5-cache/app-laptop/rogauracore-1.6
similarity index 67%
rename from metadata/md5-cache/app-laptop/rogauracore-1.4
rename to metadata/md5-cache/app-laptop/rogauracore-1.6
index 2ec4ad0c4549..382278115884 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-1.4
+++ b/metadata/md5-cache/app-laptop/rogauracore-1.6
@@ -1,14 +1,14 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure prepare
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure postinst prepare
 DEPEND=virtual/libusb:=
 DESCRIPTION=RGB keyboard control for Asus ROG laptops
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wroberts/rogauracore
-INHERIT=autotools
+INHERIT=autotools udev
 KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=virtual/libusb:=
 SLOT=0
-SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.4.tar.gz -> rogauracore-1.4.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efbaef08b699340861d5dd3b40da1814
+SRC_URI=https://github.com/wroberts/rogauracore/archive/refs/tags/1.6.tar.gz -> rogauracore-1.6.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=b276d883bd84a34d5577684fea702e24
diff --git a/metadata/md5-cache/app-laptop/rogauracore-9999 b/metadata/md5-cache/app-laptop/rogauracore-9999
index 9be0826ec346..9b604d7b54b7 100644
--- a/metadata/md5-cache/app-laptop/rogauracore-9999
+++ b/metadata/md5-cache/app-laptop/rogauracore-9999
@@ -1,13 +1,13 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure prepare unpack
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure postinst prepare unpack
 DEPEND=virtual/libusb:=
 DESCRIPTION=RGB keyboard control for Asus ROG laptops
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/wroberts/rogauracore
-INHERIT=autotools git-r3
+INHERIT=autotools udev git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=virtual/libusb:=
 SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=efbaef08b699340861d5dd3b40da1814
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=b276d883bd84a34d5577684fea702e24
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index bb088aecc329..dcb37aa6a6d7 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/broot-1.13.0 b/metadata/md5-cache/app-misc/broot-1.13.0
new file mode 100644
index 000000000000..b4ca1df22075
--- /dev/null
+++ b/metadata/md5-cache/app-misc/broot-1.13.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.58 >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
+DESCRIPTION=A new way to see and navigate directory trees
+EAPI=8
+HOMEPAGE=https://dystroy.org/broot/ https://github.com/Canop/broot
+INHERIT=bash-completion-r1 cargo
+IUSE=X debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD-2 BSD LGPL-3+ MIT ZLIB
+RDEPEND=dev-libs/libgit2:= X? ( x11-libs/libxcb:= )
+SLOT=0
+SRC_URI=https://github.com/Canop/broot/archive/v1.13.0.tar.gz -> broot-1.13.0.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/adler32/1.2.0/download -> adler32-1.2.0.crate https://crates.io/api/v1/crates/ahash/0.4.7/download -> ahash-0.4.7.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_colours/1.1.1/download -> ansi_colours-1.1.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.56/download -> anyhow-1.0.56.crate https://crates.io/api/v1/crates/argh/0.1.7/download -> argh-0.1.7.crate https://crates.io/api/v1/crates/argh_derive/0.1.7/download -> argh_derive-0.1.7.crate https://crates.io/api/v1/crates/argh_shared/0.1.7/download -> argh_shared-0.1.7.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bet/1.0.1/download -> bet-1.0.1.crate https://crates.io/api/v1/crates/bincode/1.3.3/download -> bincode-1.3.3.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bytemuck/1.8.0/download -> bytemuck-1.8.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/char_reader/0.1.1/download -> char_reader-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/cli-log/0.1.0/download -> cli-log-0.1.0.crate https://crates.io/api/v1/crates/cli-log/2.0.0/download -> cli-log-2.0.0.crate https://crates.io/api/v1/crates/clipboard-win/4.4.1/download -> clipboard-win-4.4.1.crate https://crates.io/api/v1/crates/color_quant/1.1.0/download -> color_quant-1.1.0.crate https://crates.io/api/v1/crates/coolor/0.3.1/download -> coolor-0.3.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crokey/0.4.0/download -> crokey-0.4.0.crate https://crates.io/api/v1/crates/crokey-proc_macros/0.4.0/download -> crokey-proc_macros-0.4.0.crate https://crates.io/api/v1/crates/crossbeam/0.8.1/download -> crossbeam-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.7/download -> crossbeam-epoch-0.9.7.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.4/download -> crossbeam-queue-0.3.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.7/download -> crossbeam-utils-0.8.7.crate https://crates.io/api/v1/crates/crossterm/0.19.0/download -> crossterm-0.19.0.crate https://crates.io/api/v1/crates/crossterm/0.22.1/download -> crossterm-0.22.1.crate https://crates.io/api/v1/crates/crossterm_winapi/0.7.0/download -> crossterm_winapi-0.7.0.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/csv2svg/0.1.6/download -> csv2svg-0.1.6.crate https://crates.io/api/v1/crates/custom_error/1.9.2/download -> custom_error-1.9.2.crate https://crates.io/api/v1/crates/deflate/0.8.6/download -> deflate-0.8.6.crate https://crates.io/api/v1/crates/deser-hjson/1.0.2/download -> deser-hjson-1.0.2.crate https://crates.io/api/v1/crates/directories/3.0.2/download -> directories-3.0.2.crate https://crates.io/api/v1/crates/directories-next/2.0.0/download -> directories-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/error-code/2.3.1/download -> error-code-2.3.1.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/file-size/1.0.3/download -> file-size-1.0.3.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/getrandom/0.2.5/download -> getrandom-0.2.5.crate https://crates.io/api/v1/crates/gif/0.11.3/download -> gif-0.11.3.crate https://crates.io/api/v1/crates/git2/0.13.25/download -> git2-0.13.25.crate https://crates.io/api/v1/crates/glassbench/0.3.1/download -> glassbench-0.3.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/hashbrown/0.9.1/download -> hashbrown-0.9.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.6.0/download -> hashlink-0.6.0.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/id-arena/2.2.1/download -> id-arena-2.2.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.23.14/download -> image-0.23.14.crate https://crates.io/api/v1/crates/indexmap/1.8.0/download -> indexmap-1.8.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.1.22/download -> jpeg-decoder-0.1.22.crate https://crates.io/api/v1/crates/lazy-regex/2.3.0/download -> lazy-regex-2.3.0.crate https://crates.io/api/v1/crates/lazy-regex-proc_macros/2.3.0/download -> lazy-regex-proc_macros-2.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lfs-core/0.11.0/download -> lfs-core-0.11.0.crate https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libgit2-sys/0.12.26+1.3.0/download -> libgit2-sys-0.12.26+1.3.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.20.1/download -> libsqlite3-sys-0.20.1.crate https://crates.io/api/v1/crates/libz-sys/1.1.5/download -> libz-sys-1.1.5.crate https://crates.io/api/v1/crates/line-wrap/0.1.1/download -> line-wrap-0.1.1.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap/0.7.0/download -> memmap-0.7.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/minimad/0.7.1/download -> minimad-0.7.1.crate https://crates.io/api/v1/crates/minimad/0.9.0/download -> minimad-0.9.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.3.7/download -> miniz_oxide-0.3.7.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/mio/0.7.14/download -> mio-0.7.14.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.4/download -> num_threads-0.1.4.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/onig/6.3.1/download -> onig-6.3.1.crate https://crates.io/api/v1/crates/onig_sys/69.7.1/download -> onig_sys-69.7.1.crate https://crates.io/api/v1/crates/open/1.7.1/download -> open-1.7.1.crate https://crates.io/api/v1/crates/opener/0.5.0/download -> opener-0.5.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.9.0/download -> phf-0.9.0.crate https://crates.io/api/v1/crates/phf_generator/0.9.1/download -> phf_generator-0.9.1.crate https://crates.io/api/v1/crates/phf_macros/0.9.0/download -> phf_macros-0.9.0.crate https://crates.io/api/v1/crates/phf_shared/0.9.0/download -> phf_shared-0.9.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/plist/1.3.1/download -> plist-1.3.1.crate https://crates.io/api/v1/crates/png/0.16.8/download -> png-0.16.8.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-status/0.1.1/download -> proc-status-0.1.1.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quote/1.0.15/download -> quote-1.0.15.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.1/download -> rayon-1.5.1.crate https://crates.io/api/v1/crates/rayon-core/1.9.1/download -> rayon-core-1.9.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rgb/0.8.32/download -> rgb-0.8.32.crate https://crates.io/api/v1/crates/rusqlite/0.24.2/download -> rusqlite-0.24.2.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/safemem/0.3.3/download -> safemem-0.3.3.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scoped_threadpool/0.1.9/download -> scoped_threadpool-0.1.9.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/secular/1.0.1/download -> secular-1.0.1.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/signal-hook/0.1.17/download -> signal-hook-0.1.17.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.1/download -> signal-hook-mio-0.2.1.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/snafu/0.7.0/download -> snafu-0.7.0.crate https://crates.io/api/v1/crates/snafu-derive/0.7.0/download -> snafu-derive-0.7.0.crate https://crates.io/api/v1/crates/splitty/0.1.0/download -> splitty-0.1.0.crate https://crates.io/api/v1/crates/str-buf/1.0.5/download -> str-buf-1.0.5.crate https://crates.io/api/v1/crates/strict/0.1.4/download -> strict-0.1.4.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/svg/0.8.2/download -> svg-0.8.2.crate https://crates.io/api/v1/crates/syn/1.0.86/download -> syn-1.0.86.crate https://crates.io/api/v1/crates/syntect-no-panic/4.6.1/download -> syntect-no-panic-4.6.1.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termimad/0.10.3/download -> termimad-0.10.3.crate https://crates.io/api/v1/crates/termimad/0.20.0/download -> termimad-0.20.0.crate https://crates.io/api/v1/crates/terminal-clipboard/0.3.1/download -> terminal-clipboard-0.3.1.crate https://crates.io/api/v1/crates/termux-clipboard/0.1.0/download -> termux-clipboard-0.1.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/tiff/0.6.1/download -> tiff-0.6.1.crate https://crates.io/api/v1/crates/time/0.1.43/download -> time-0.1.43.crate https://crates.io/api/v1/crates/time/0.3.7/download -> time-0.3.7.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/umask/2.0.0/download -> umask-2.0.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/weezl/0.1.5/download -> weezl-0.1.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/x11-clipboard/0.5.3/download -> x11-clipboard-0.5.3.crate https://crates.io/api/v1/crates/xcb/0.10.1/download -> xcb-0.10.1.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/xterm-query/0.1.0/download -> xterm-query-0.1.0.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=38eb54b70607822cf92bda2bd9ac0e13
diff --git a/metadata/md5-cache/app-misc/gnote-42.0 b/metadata/md5-cache/app-misc/gnote-42.0
index f7a6e794ae3e..27c50e8f29cd 100644
--- a/metadata/md5-cache/app-misc/gnote-42.0
+++ b/metadata/md5-cache/app-misc/gnote-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Gnote
 INHERIT=gnome2 meson readme.gentoo-r1
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-3+ FDL-1.1
 RDEPEND=>=dev-libs/glib-2.62:2[dbus] >=dev-cpp/glibmm-2.62.0:2 >=dev-cpp/gtkmm-3.22.20:3.0 >=app-crypt/libsecret-0.8 >=dev-libs/libxml2-2:2 dev-libs/libxslt >=sys-apps/util-linux-2.16:= >=app-text/gspell-1.6.0:= test? ( dev-libs/unittest++ ) gnome-base/gsettings-desktop-schemas
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnote/42/gnote-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2b1117ab35c67249ae96094cb8ef2a7d
+_md5_=f8a0b25ac246744ff6d70f28c9490f93
diff --git a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3 b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3
index f3474c08b7d2..24228c931ba1 100644
--- a/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3
+++ b/metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://gentooexperimental.org/~genstef/dist/inputlircd-0.0.1_pre15.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=79a0c49ce293af4a38972a52ddecd5a2
+_md5_=2a9c64de1517c3e1586709488982fb7c
diff --git a/metadata/md5-cache/app-misc/tracker-3.3.0 b/metadata/md5-cache/app-misc/tracker-3.3.0
index c40a517916a1..31b88c30aaff 100644
--- a/metadata/md5-cache/app-misc/tracker-3.3.0
+++ b/metadata/md5-cache/app-misc/tracker-3.3.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 INHERIT=bash-completion-r1 flag-o-matic gnome.org gnome2-utils linux-info meson python-any-r1 systemd vala xdg
 IUSE=gtk-doc +miners stemmer test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 PDEPEND=miners? ( >=app-misc/tracker-miners-3.3 )
 RDEPEND=>=dev-libs/glib-2.52:2 >=sys-apps/dbus-1.3.2 >=dev-libs/gobject-introspection-1.54:= >=dev-libs/icu-4.8.1.2:= >=dev-libs/json-glib-1.4 >=net-libs/libsoup-2.40.1:2.4 >=dev-libs/libxml2-2.7 >=dev-db/sqlite-3.29.0 stemmer? ( dev-libs/snowball-stemmer:= )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3/0
 SRC_URI=mirror://gnome/sources/tracker/3.3/tracker-3.3.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2bffe0638205fc77352aa715a7f4739c
+_md5_=84237079f32bcaf3109d8a64250ff435
diff --git a/metadata/md5-cache/app-misc/tracker-miners-3.3.0 b/metadata/md5-cache/app-misc/tracker-miners-3.3.0
index 71c5e16b878e..ce3abf402bef 100644
--- a/metadata/md5-cache/app-misc/tracker-miners-3.3.0
+++ b/metadata/md5-cache/app-misc/tracker-miners-3.3.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
 INHERIT=flag-o-matic gnome.org gnome2-utils meson python-any-r1 systemd xdg
 IUSE=cue exif ffmpeg gif gsf +gstreamer iptc +iso +jpeg networkmanager +pdf +playlist raw +rss seccomp test +tiff upower +xml xmp xps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.70:2 >=app-misc/tracker-3.2.0:3= gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0 >=media-plugins/gst-plugins-meta-1.20:1.0 ) !gstreamer? ( ffmpeg? ( media-video/ffmpeg:0= ) ) >=sys-apps/dbus-1.3.1 xmp? ( >=media-libs/exempi-2.1.0:= ) raw? ( media-libs/gexiv2 ) >=dev-libs/icu-4.8.1.2:= cue? ( media-libs/libcue:= ) exif? ( >=media-libs/libexif-0.6 ) gsf? ( >=gnome-extra/libgsf-1.14.24:= ) xps? ( app-text/libgxps ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) iso? ( >=sys-libs/libosinfo-0.2.10 ) >=media-libs/libpng-1.2:0= seccomp? ( >=sys-libs/libseccomp-2.0 ) tiff? ( media-libs/tiff:0 ) xml? ( >=dev-libs/libxml2-2.6 ) pdf? ( >=app-text/poppler-0.16.0[cairo] ) playlist? ( >=dev-libs/totem-pl-parser-3:= ) upower? ( >=sys-power/upower-0.9.0 ) sys-libs/zlib:0 gif? ( media-libs/giflib:= ) networkmanager? ( net-misc/networkmanager:= ) rss? ( >=net-libs/libgrss-0.7:0 ) app-arch/gzip
 REQUIRED_USE=cue? ( gstreamer )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/tracker-miners/3.3/tracker-miners-3.3.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=04b50819cdd3980c5840e085794f5579
+_md5_=5b06cfb960ffabf769ce71afd517a0e8
diff --git a/metadata/md5-cache/app-misc/vifm-0.11 b/metadata/md5-cache/app-misc/vifm-0.11
index 3a94d64e398e..dfae8b6a0ea7 100644
--- a/metadata/md5-cache/app-misc/vifm-0.11
+++ b/metadata/md5-cache/app-misc/vifm-0.11
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/vifm/vifm/archive/v0.11.tar.gz -> vifm-0.11.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=01c43791b488f179cd72dad96570cbeb
diff --git a/metadata/md5-cache/app-misc/vifm-0.12 b/metadata/md5-cache/app-misc/vifm-0.12
index a6695a726839..ba6599bfd064 100644
--- a/metadata/md5-cache/app-misc/vifm-0.12
+++ b/metadata/md5-cache/app-misc/vifm-0.12
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 SRC_URI=https://github.com/vifm/vifm/archive/v0.12.tar.gz -> vifm-0.12.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b61d050888d2abef41d6c0f418d9f1a8
diff --git a/metadata/md5-cache/app-misc/vifm-9999 b/metadata/md5-cache/app-misc/vifm-9999
index 88d8cb87582c..2182bef9d2e5 100644
--- a/metadata/md5-cache/app-misc/vifm-9999
+++ b/metadata/md5-cache/app-misc/vifm-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.9-r3:0 magic? ( sys-apps/file ) gtk? ( x11-libs/gtk+:2 ) X? ( x11-libs/libX11 ) vim? ( || ( app-editors/vim app-editors/gvim ) ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=a48fb846738941a9c50f0272436a6cef
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 80695c27f04c..74aff9d02553 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/gnumeric-1.12.52 b/metadata/md5-cache/app-office/gnumeric-1.12.52
index 340dab536adb..614f7fff44e6 100644
--- a/metadata/md5-cache/app-office/gnumeric-1.12.52
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.52
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.gnumeric.org/
 INHERIT=autotools gnome.org python-r1 xdg
 IUSE=+introspection libgda perl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
 REQUIRED_USE=introspection? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.52.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3d3c72a4dadf93dc1b19c804335f735d
+_md5_=3967ddaa86facfd2d65df533edd228cf
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 80b667a55c3f..6de59b6f0b28 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.1 b/metadata/md5-cache/app-portage/gpyutils-0.8.1
new file mode 100644
index 000000000000..e748e69e9280
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/mgorny/gpyutils/archive/v0.8.1.tar.gz -> gpyutils-0.8.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4cc7f25554763b7be337dc44881cb6f4
diff --git a/metadata/md5-cache/app-portage/gpyutils-0.8.2 b/metadata/md5-cache/app-portage/gpyutils-0.8.2
new file mode 100644
index 000000000000..69adc428ade1
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gpyutils-0.8.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utitilies for maintaining Python packages
+EAPI=8
+HOMEPAGE=https://github.com/mgorny/gpyutils/ https://pypi.org/project/gpyutils/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-portage/gentoopm-0.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/mgorny/gpyutils/archive/v0.8.2.tar.gz -> gpyutils-0.8.2.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4cc7f25554763b7be337dc44881cb6f4
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index a025662858d7..c91aade056cf 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/nushell-0.63.1 b/metadata/md5-cache/app-shells/nushell-0.63.1
new file mode 100644
index 000000000000..9488b668847c
--- /dev/null
+++ b/metadata/md5-cache/app-shells/nushell-0.63.1
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.60 virtual/pkgconfig >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= dev-libs/openssl:0= net-libs/libssh2:= net-libs/nghttp2:= net-misc/curl extra? ( dev-db/sqlite:3= x11-libs/libX11 x11-libs/libxcb )
+DESCRIPTION=A new type of shell, written in Rust
+EAPI=8
+HOMEPAGE=https://www.nushell.sh
+INHERIT=cargo
+IUSE=+extra debug
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 BSD Boost-1.0 CC0-1.0 ISC MIT MPL-2.0 Unlicense ZLIB
+RDEPEND=>=dev-libs/libgit2-0.99:= dev-libs/oniguruma:= dev-libs/openssl:0= net-libs/libssh2:= net-libs/nghttp2:= net-misc/curl extra? ( dev-db/sqlite:3= x11-libs/libX11 x11-libs/libxcb )
+SLOT=0
+SRC_URI=https://github.com/nushell/nushell/archive/0.63.1.tar.gz -> nushell-0.63.1.tar.gz https://crates.io/api/v1/crates/Inflector/0.11.4/download -> Inflector-0.11.4.crate https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/alloc-no-stdlib/2.0.3/download -> alloc-no-stdlib-2.0.3.crate https://crates.io/api/v1/crates/alloc-stdlib/0.2.1/download -> alloc-stdlib-0.2.1.crate https://crates.io/api/v1/crates/alphanumeric-sort/1.4.4/download -> alphanumeric-sort-1.4.4.crate https://crates.io/api/v1/crates/ansi-parser/0.8.0/download -> ansi-parser-0.8.0.crate https://crates.io/api/v1/crates/ansi-str/0.1.1/download -> ansi-str-0.1.1.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/array-init-cursor/0.2.0/download -> array-init-cursor-0.2.0.crate https://crates.io/api/v1/crates/arrayvec/0.4.12/download -> arrayvec-0.4.12.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/arrow-format/0.4.0/download -> arrow-format-0.4.0.crate https://crates.io/api/v1/crates/arrow2/0.11.2/download -> arrow2-0.11.2.crate https://crates.io/api/v1/crates/as-slice/0.1.5/download -> as-slice-0.1.5.crate https://crates.io/api/v1/crates/assert_cmd/2.0.4/download -> assert_cmd-2.0.4.crate https://crates.io/api/v1/crates/async-stream/0.3.3/download -> async-stream-0.3.3.crate https://crates.io/api/v1/crates/async-stream-impl/0.3.3/download -> async-stream-impl-0.3.3.crate https://crates.io/api/v1/crates/async-trait/0.1.53/download -> async-trait-0.1.53.crate https://crates.io/api/v1/crates/atomic-polyfill/0.1.8/download -> atomic-polyfill-0.1.8.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/bare-metal/0.2.5/download -> bare-metal-0.2.5.crate https://crates.io/api/v1/crates/bare-metal/1.0.0/download -> bare-metal-1.0.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bit_field/0.10.1/download -> bit_field-0.10.1.crate https://crates.io/api/v1/crates/bitfield/0.13.2/download -> bitfield-0.13.2.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitpacking/0.8.4/download -> bitpacking-0.8.4.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/brotli/3.3.4/download -> brotli-3.3.4.crate https://crates.io/api/v1/crates/brotli-decompressor/2.3.2/download -> brotli-decompressor-2.3.2.crate https://crates.io/api/v1/crates/brownstone/1.1.0/download -> brownstone-1.1.0.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byte-unit/4.0.14/download -> byte-unit-4.0.14.crate https://crates.io/api/v1/crates/bytemuck/1.9.1/download -> bytemuck-1.9.1.crate https://crates.io/api/v1/crates/bytemuck_derive/1.1.0/download -> bytemuck_derive-1.1.0.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/calamine/0.18.0/download -> calamine-0.18.0.crate https://crates.io/api/v1/crates/capnp/0.14.6/download -> capnp-0.14.6.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/chrono/0.4.19/download -> chrono-0.4.19.crate https://crates.io/api/v1/crates/chrono-humanize/0.2.1/download -> chrono-humanize-0.2.1.crate https://crates.io/api/v1/crates/chrono-tz/0.5.3/download -> chrono-tz-0.5.3.crate https://crates.io/api/v1/crates/chrono-tz/0.6.1/download -> chrono-tz-0.6.1.crate https://crates.io/api/v1/crates/chrono-tz-build/0.0.2/download -> chrono-tz-build-0.0.2.crate https://crates.io/api/v1/crates/codepage/0.1.1/download -> codepage-0.1.1.crate https://crates.io/api/v1/crates/comfy-table/5.0.1/download -> comfy-table-5.0.1.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/const_format/0.2.23/download -> const_format-0.2.23.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cortex-m/0.7.4/download -> cortex-m-0.7.4.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/critical-section/0.2.7/download -> critical-section-0.2.7.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crossterm/0.23.2/download -> crossterm-0.23.2.crate https://crates.io/api/v1/crates/crossterm_winapi/0.9.0/download -> crossterm_winapi-0.9.0.crate https://crates.io/api/v1/crates/crunchy/0.2.2/download -> crunchy-0.2.2.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/cstr_core/0.2.5/download -> cstr_core-0.2.5.crate https://crates.io/api/v1/crates/csv/1.1.6/download -> csv-1.1.6.crate https://crates.io/api/v1/crates/csv-core/0.1.10/download -> csv-core-0.1.10.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/ctrlc/3.2.2/download -> ctrlc-3.2.2.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.2.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dialoguer/0.9.0/download -> dialoguer-0.9.0.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/difflib/0.4.0/download -> difflib-0.4.0.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/doc-comment/0.3.3/download -> doc-comment-0.3.3.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/dtparse/1.2.0/download -> dtparse-1.2.0.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/ego-tree/0.6.2/download -> ego-tree-0.6.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/embedded-hal/0.2.7/download -> embedded-hal-0.2.7.crate https://crates.io/api/v1/crates/eml-parser/0.1.3/download -> eml-parser-0.1.3.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/erased-serde/0.3.20/download -> erased-serde-0.3.20.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/failure/0.1.8/download -> failure-0.1.8.crate https://crates.io/api/v1/crates/failure_derive/0.1.8/download -> failure_derive-0.1.8.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fd-lock/3.0.5/download -> fd-lock-3.0.5.crate https://crates.io/api/v1/crates/filesize/0.2.0/download -> filesize-0.2.0.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs_extra/1.2.0/download -> fs_extra-1.2.0.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/fuzzy-matcher/0.3.7/download -> fuzzy-matcher-0.3.7.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/generic-array/0.12.4/download -> generic-array-0.12.4.crate https://crates.io/api/v1/crates/generic-array/0.13.3/download -> generic-array-0.13.3.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getopts/0.2.21/download -> getopts-0.2.21.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/getset/0.1.2/download -> getset-0.1.2.crate https://crates.io/api/v1/crates/ghost/0.1.4/download -> ghost-0.1.4.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/git2/0.14.4/download -> git2-0.14.4.crate https://crates.io/api/v1/crates/gjson/0.8.1/download -> gjson-0.8.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/h2/0.3.13/download -> h2-0.3.13.crate https://crates.io/api/v1/crates/hamcrest2/0.3.0/download -> hamcrest2-0.3.0.crate https://crates.io/api/v1/crates/hash32/0.1.1/download -> hash32-0.1.1.crate https://crates.io/api/v1/crates/hash32/0.2.1/download -> hash32-0.2.1.crate https://crates.io/api/v1/crates/hash_hasher/2.0.3/download -> hash_hasher-2.0.3.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashbrown/0.12.1/download -> hashbrown-0.12.1.crate https://crates.io/api/v1/crates/hashlink/0.7.0/download -> hashlink-0.7.0.crate https://crates.io/api/v1/crates/heapless/0.5.6/download -> heapless-0.5.6.crate https://crates.io/api/v1/crates/heapless/0.7.13/download -> heapless-0.7.13.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/html5ever/0.25.2/download -> html5ever-0.25.2.crate https://crates.io/api/v1/crates/htmlescape/0.3.1/download -> htmlescape-0.3.1.crate https://crates.io/api/v1/crates/http/0.2.7/download -> http-0.2.7.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/httparse/1.7.1/download -> httparse-1.7.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/hyper/0.14.18/download -> hyper-0.14.18.crate https://crates.io/api/v1/crates/hyper-tls/0.5.0/download -> hyper-tls-0.5.0.crate https://crates.io/api/v1/crates/ical/0.7.0/download -> ical-0.7.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/indent_write/2.2.0/download -> indent_write-2.2.0.crate https://crates.io/api/v1/crates/indexmap/1.8.1/download -> indexmap-1.8.1.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/integer-encoding/3.0.3/download -> integer-encoding-3.0.3.crate https://crates.io/api/v1/crates/inventory/0.2.3/download -> inventory-0.2.3.crate https://crates.io/api/v1/crates/io-lifetimes/0.6.1/download -> io-lifetimes-0.6.1.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.5.0/download -> ipnet-2.5.0.crate https://crates.io/api/v1/crates/is_ci/1.1.1/download -> is_ci-1.1.1.crate https://crates.io/api/v1/crates/is_debug/1.0.1/download -> is_debug-1.0.1.crate https://crates.io/api/v1/crates/is_executable/1.0.1/download -> is_executable-1.0.1.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/joinery/2.1.0/download -> joinery-2.1.0.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lexical/6.1.1/download -> lexical-6.1.1.crate https://crates.io/api/v1/crates/lexical-core/0.8.5/download -> lexical-core-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-float/0.8.5/download -> lexical-parse-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-parse-integer/0.8.5/download -> lexical-parse-integer-0.8.5.crate https://crates.io/api/v1/crates/lexical-util/0.8.5/download -> lexical-util-0.8.5.crate https://crates.io/api/v1/crates/lexical-write-float/0.8.5/download -> lexical-write-float-0.8.5.crate https://crates.io/api/v1/crates/lexical-write-integer/0.8.5/download -> lexical-write-integer-0.8.5.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libgit2-sys/0.13.4+1.4.2/download -> libgit2-sys-0.13.4+1.4.2.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/libproc/0.10.0/download -> libproc-0.10.0.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.24.2/download -> libsqlite3-sys-0.24.2.crate https://crates.io/api/v1/crates/libssh2-sys/0.2.23/download -> libssh2-sys-0.2.23.crate https://crates.io/api/v1/crates/libz-sys/1.1.6/download -> libz-sys-1.1.6.crate https://crates.io/api/v1/crates/linked-hash-map/0.5.4/download -> linked-hash-map-0.5.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lscolors/0.9.0/download -> lscolors-0.9.0.crate https://crates.io/api/v1/crates/lz4/1.23.3/download -> lz4-1.23.3.crate https://crates.io/api/v1/crates/lz4-sys/1.9.3/download -> lz4-sys-1.9.3.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md-5/0.10.1/download -> md-5-0.10.1.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.3/download -> memmap2-0.5.3.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/meval/0.2.0/download -> meval-0.2.0.crate https://crates.io/api/v1/crates/miette/3.3.0/download -> miette-3.3.0.crate https://crates.io/api/v1/crates/miette/4.7.1/download -> miette-4.7.1.crate https://crates.io/api/v1/crates/miette-derive/3.3.0/download -> miette-derive-3.3.0.crate https://crates.io/api/v1/crates/miette-derive/4.7.1/download -> miette-derive-4.7.1.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.3/download -> mio-0.8.3.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/multiversion/0.6.1/download -> multiversion-0.6.1.crate https://crates.io/api/v1/crates/multiversion-macros/0.6.1/download -> multiversion-macros-0.6.1.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb/0.1.3/download -> nb-0.1.3.crate https://crates.io/api/v1/crates/nb/1.0.0/download -> nb-1.0.0.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nix/0.24.1/download -> nix-0.24.1.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/nom/1.2.4/download -> nom-1.2.4.crate https://crates.io/api/v1/crates/nom/4.2.3/download -> nom-4.2.3.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/nom-supreme/0.6.0/download -> nom-supreme-0.6.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/nu-ansi-term/0.45.1/download -> nu-ansi-term-0.45.1.crate https://crates.io/api/v1/crates/num/0.2.1/download -> num-0.2.1.crate https://crates.io/api/v1/crates/num/0.4.0/download -> num-0.4.0.crate https://crates.io/api/v1/crates/num-bigint/0.2.6/download -> num-bigint-0.2.6.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-complex/0.2.4/download -> num-complex-0.2.4.crate https://crates.io/api/v1/crates/num-complex/0.4.1/download -> num-complex-0.4.1.crate https://crates.io/api/v1/crates/num-format/0.4.0/download -> num-format-0.4.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.2.4/download -> num-rational-0.2.4.crate https://crates.io/api/v1/crates/num-rational/0.4.0/download -> num-rational-0.4.0.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.20.0+1.1.1o/download -> openssl-src-111.20.0+1.1.1o.crate https://crates.io/api/v1/crates/openssl-sys/0.9.73/download -> openssl-sys-0.9.73.crate https://crates.io/api/v1/crates/output_vt100/0.1.3/download -> output_vt100-0.1.3.crate https://crates.io/api/v1/crates/overload/0.1.1/download -> overload-0.1.1.crate https://crates.io/api/v1/crates/owo-colors/3.4.0/download -> owo-colors-3.4.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/parquet-format-async-temp/0.3.0/download -> parquet-format-async-temp-0.3.0.crate https://crates.io/api/v1/crates/parquet2/0.12.1/download -> parquet2-0.12.1.crate https://crates.io/api/v1/crates/parse-zoneinfo/0.3.0/download -> parse-zoneinfo-0.3.0.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/peresil/0.3.0/download -> peresil-0.3.0.crate https://crates.io/api/v1/crates/pest/2.1.3/download -> pest-2.1.3.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.10.0/download -> phf_codegen-0.10.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/planus/0.2.0/download -> planus-0.2.0.crate https://crates.io/api/v1/crates/polars/0.21.1/download -> polars-0.21.1.crate https://crates.io/api/v1/crates/polars-arrow/0.21.1/download -> polars-arrow-0.21.1.crate https://crates.io/api/v1/crates/polars-core/0.21.1/download -> polars-core-0.21.1.crate https://crates.io/api/v1/crates/polars-io/0.21.1/download -> polars-io-0.21.1.crate https://crates.io/api/v1/crates/polars-lazy/0.21.1/download -> polars-lazy-0.21.1.crate https://crates.io/api/v1/crates/polars-ops/0.21.1/download -> polars-ops-0.21.1.crate https://crates.io/api/v1/crates/polars-time/0.21.1/download -> polars-time-0.21.1.crate https://crates.io/api/v1/crates/polars-utils/0.21.1/download -> polars-utils-0.21.1.crate https://crates.io/api/v1/crates/pori/0.0.0/download -> pori-0.0.0.crate https://crates.io/api/v1/crates/powierza-coefficient/1.0.0/download -> powierza-coefficient-1.0.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/predicates/2.1.1/download -> predicates-2.1.1.crate https://crates.io/api/v1/crates/predicates-core/1.0.3/download -> predicates-core-1.0.3.crate https://crates.io/api/v1/crates/predicates-tree/1.0.5/download -> predicates-tree-1.0.5.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/procfs/0.12.0/download -> procfs-0.12.0.crate https://crates.io/api/v1/crates/pwd/1.3.1/download -> pwd-1.3.1.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quick-xml/0.19.0/download -> quick-xml-0.19.0.crate https://crates.io/api/v1/crates/quick-xml/0.22.0/download -> quick-xml-0.22.0.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quickcheck_macros/1.0.0/download -> quickcheck_macros-1.0.0.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_distr/0.4.3/download -> rand_distr-0.4.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/reedline/0.6.0/download -> reedline-0.6.0.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/reqwest/0.11.10/download -> reqwest-0.11.10.crate https://crates.io/api/v1/crates/result/1.0.0/download -> result-1.0.0.crate https://crates.io/api/v1/crates/riscv/0.7.0/download -> riscv-0.7.0.crate https://crates.io/api/v1/crates/riscv-target/0.1.2/download -> riscv-target-0.1.2.crate https://crates.io/api/v1/crates/roxmltree/0.14.1/download -> roxmltree-0.14.1.crate https://crates.io/api/v1/crates/rstest/0.12.0/download -> rstest-0.12.0.crate https://crates.io/api/v1/crates/rusqlite/0.27.0/download -> rusqlite-0.27.0.crate https://crates.io/api/v1/crates/rust-embed/6.4.0/download -> rust-embed-6.4.0.crate https://crates.io/api/v1/crates/rust-embed-impl/6.2.0/download -> rust-embed-impl-6.2.0.crate https://crates.io/api/v1/crates/rust-embed-utils/7.2.0/download -> rust-embed-utils-7.2.0.crate https://crates.io/api/v1/crates/rust_decimal/0.10.2/download -> rust_decimal-0.10.2.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.2.3/download -> rustc_version-0.2.3.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustix/0.34.7/download -> rustix-0.34.7.crate https://crates.io/api/v1/crates/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scraper/0.12.0/download -> scraper-0.12.0.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/0.9.0/download -> semver-0.9.0.crate https://crates.io/api/v1/crates/semver/0.11.0/download -> semver-0.11.0.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/semver-parser/0.7.0/download -> semver-parser-0.7.0.crate https://crates.io/api/v1/crates/semver-parser/0.10.2/download -> semver-parser-0.10.2.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_ini/0.2.0/download -> serde_ini-0.2.0.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_test/1.0.137/download -> serde_test-1.0.137.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/serde_yaml/0.8.24/download -> serde_yaml-0.8.24.crate https://crates.io/api/v1/crates/serial_test/0.5.1/download -> serial_test-0.5.1.crate https://crates.io/api/v1/crates/serial_test_derive/0.5.1/download -> serial_test_derive-0.5.1.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/shadow-rs/0.11.0/download -> shadow-rs-0.11.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-mio/0.2.3/download -> signal-hook-mio-0.2.3.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/simdutf8/0.1.4/download -> simdutf8-0.1.4.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/snap/1.0.5/download -> snap-1.0.5.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.3/download -> spin-0.9.3.crate https://crates.io/api/v1/crates/sqlparser/0.16.0/download -> sqlparser-0.16.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/streaming-decompression/0.1.0/download -> streaming-decompression-0.1.0.crate https://crates.io/api/v1/crates/streaming-iterator/0.1.5/download -> streaming-iterator-0.1.5.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/string_cache/0.8.4/download -> string_cache-0.8.4.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.2/download -> string_cache_codegen-0.5.2.crate https://crates.io/api/v1/crates/strip-ansi-escapes/0.1.1/download -> strip-ansi-escapes-0.1.1.crate https://crates.io/api/v1/crates/strum/0.23.0/download -> strum-0.23.0.crate https://crates.io/api/v1/crates/strum/0.24.0/download -> strum-0.24.0.crate https://crates.io/api/v1/crates/strum_macros/0.23.1/download -> strum_macros-0.23.1.crate https://crates.io/api/v1/crates/strum_macros/0.24.0/download -> strum_macros-0.24.0.crate https://crates.io/api/v1/crates/supports-color/1.3.0/download -> supports-color-1.3.0.crate https://crates.io/api/v1/crates/supports-hyperlinks/1.2.0/download -> supports-hyperlinks-1.2.0.crate https://crates.io/api/v1/crates/supports-unicode/1.0.2/download -> supports-unicode-1.0.2.crate https://crates.io/api/v1/crates/sxd-document/0.3.2/download -> sxd-document-0.3.2.crate https://crates.io/api/v1/crates/sxd-xpath/0.4.2/download -> sxd-xpath-0.4.2.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/sys-locale/0.2.0/download -> sys-locale-0.2.0.crate https://crates.io/api/v1/crates/sysinfo/0.23.13/download -> sysinfo-0.23.13.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/termtree/0.2.4/download -> termtree-0.2.4.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.1.44/download -> time-0.1.44.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/titlecase/1.1.0/download -> titlecase-1.1.0.crate https://crates.io/api/v1/crates/tokio/1.18.2/download -> tokio-1.18.2.crate https://crates.io/api/v1/crates/tokio-native-tls/0.3.0/download -> tokio-native-tls-0.3.0.crate https://crates.io/api/v1/crates/tokio-util/0.7.2/download -> tokio-util-0.7.2.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/trash/2.1.4/download -> trash-2.1.4.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typed-arena/1.7.0/download -> typed-arena-1.7.0.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/typetag/0.1.8/download -> typetag-0.1.8.crate https://crates.io/api/v1/crates/typetag-impl/0.1.8/download -> typetag-impl-0.1.8.crate https://crates.io/api/v1/crates/ucd-trie/0.1.3/download -> ucd-trie-0.1.3.crate https://crates.io/api/v1/crates/umask/2.0.0/download -> umask-2.0.0.crate https://crates.io/api/v1/crates/uncased/0.9.7/download -> uncased-0.9.7.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/utf8-width/0.1.6/download -> utf8-width-0.1.6.crate https://crates.io/api/v1/crates/utf8parse/0.2.0/download -> utf8parse-0.2.0.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/vcell/0.1.3/download -> vcell-0.1.3.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec1/1.8.0/download -> vec1-1.8.0.crate https://crates.io/api/v1/crates/version_check/0.1.5/download -> version_check-0.1.5.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/volatile-register/0.2.1/download -> volatile-register-0.2.1.crate https://crates.io/api/v1/crates/vte/0.10.1/download -> vte-0.10.1.crate https://crates.io/api/v1/crates/vte_generate_state_changes/0.1.1/download -> vte_generate_state_changes-0.1.1.crate https://crates.io/api/v1/crates/wait-timeout/0.2.0/download -> wait-timeout-0.2.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download -> wasi-0.10.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.30/download -> wasm-bindgen-futures-0.4.30.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/wax/0.4.0/download -> wax-0.4.0.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.37.0/download -> windows-0.37.0.crate https://crates.io/api/v1/crates/windows-sys/0.30.0/download -> windows-sys-0.30.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.30.0/download -> windows_aarch64_msvc-0.30.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.30.0/download -> windows_i686_gnu-0.30.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.37.0/download -> windows_i686_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.30.0/download -> windows_i686_msvc-0.30.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.37.0/download -> windows_i686_msvc-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.30.0/download -> windows_x86_64_gnu-0.30.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.37.0/download -> windows_x86_64_gnu-0.37.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.30.0/download -> windows_x86_64_msvc-0.30.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/winres/0.1.12/download -> winres-0.1.12.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/xmlparser/0.13.3/download -> xmlparser-0.13.3.crate https://crates.io/api/v1/crates/yaml-rust/0.4.5/download -> yaml-rust-0.4.5.crate https://crates.io/api/v1/crates/zeroize/1.5.5/download -> zeroize-1.5.5.crate https://crates.io/api/v1/crates/zip/0.5.13/download -> zip-0.5.13.crate https://crates.io/api/v1/crates/zstd/0.11.2+zstd.1.5.2/download -> zstd-0.11.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-safe/5.0.2+zstd.1.5.2/download -> zstd-safe-5.0.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-sys/2.0.1+zstd.1.5.2/download -> zstd-sys-2.0.1+zstd.1.5.2.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=79bc028e21996387b75fef0858a40b5d
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index d7b9d557953e..eadc532eb143 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/calibre-5.43.0 b/metadata/md5-cache/app-text/calibre-5.43.0
new file mode 100644
index 000000000000..cc4de7eedbe5
--- /dev/null
+++ b/metadata/md5-cache/app-text/calibre-5.43.0
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-python/setuptools-23.1.0[python_targets_python3_8(-)] >=dev-python/sip-5[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-23.1.0[python_targets_python3_9(-)] >=dev-python/sip-5[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-23.1.0[python_targets_python3_10(-)] >=dev-python/sip-5[python_targets_python3_10(-)] ) >=virtual/podofo-build-0.9.6_pre20171027 virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev )
+DESCRIPTION=Ebook management application
+EAPI=8
+HOMEPAGE=https://calibre-ebook.com/
+INHERIT=toolchain-funcs python-single-r1 qmake-utils xdg-utils
+IUSE=ios +udisks python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3+ GPL-3 GPL-2+ GPL-2 GPL-1+ LGPL-3+ LGPL-2.1+ LGPL-2.1 BSD MIT Old-MIT Apache-2.0 public-domain || ( Artistic GPL-1+ ) CC-BY-3.0 OFL-1.1 PSF-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ipv6(+),sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ipv6(+),sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ipv6(+),sqlite,ssl] ) >=app-text/hunspell-1.7:= >=app-text/podofo-0.9.6_pre20171027:= >=app-text/poppler-0.26.5[qt5] dev-libs/glib:2= dev-libs/hyphen:= >=dev-libs/icu-57.1:= dev-libs/libinput:= >=dev-libs/dbus-glib-0.106 dev-libs/openssl:= dev-libs/snowball-stemmer:= >=sys-apps/dbus-1.10.8 python_single_target_python3_8? ( app-accessibility/speech-dispatcher[python,python_targets_python3_8(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_8(-)] dev-python/beautifulsoup4[python_targets_python3_8(-)] dev-python/cchardet[python_targets_python3_8(-)] >=dev-python/chardet-3.0.3[python_targets_python3_8(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_8(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_8(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_8(-)] dev-python/dnspython[python_targets_python3_8(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_8(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_8(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_8(-)] dev-python/jeepney[python_targets_python3_8(-)] >=dev-python/lxml-3.8.0[python_targets_python3_8(-)] >=dev-python/markdown-3.0.1[python_targets_python3_8(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_8(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_8(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_8(-)] >=dev-python/pillow-3.2.0[python_targets_python3_8(-)] >=dev-python/psutil-4.3.0[python_targets_python3_8(-)] >=dev-python/pychm-0.8.6[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] >=dev-python/pygments-2.3.1[python_targets_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_8(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_8(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_8(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_8(-)] dev-python/regex[python_targets_python3_8(-)] dev-python/zeroconf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( app-accessibility/speech-dispatcher[python,python_targets_python3_9(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_9(-)] dev-python/beautifulsoup4[python_targets_python3_9(-)] dev-python/cchardet[python_targets_python3_9(-)] >=dev-python/chardet-3.0.3[python_targets_python3_9(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_9(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_9(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_9(-)] dev-python/dnspython[python_targets_python3_9(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_9(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_9(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_9(-)] dev-python/jeepney[python_targets_python3_9(-)] >=dev-python/lxml-3.8.0[python_targets_python3_9(-)] >=dev-python/markdown-3.0.1[python_targets_python3_9(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_9(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_9(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_9(-)] >=dev-python/pillow-3.2.0[python_targets_python3_9(-)] >=dev-python/psutil-4.3.0[python_targets_python3_9(-)] >=dev-python/pychm-0.8.6[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/pygments-2.3.1[python_targets_python3_9(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_9(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_9(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_9(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_9(-)] dev-python/regex[python_targets_python3_9(-)] dev-python/zeroconf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( app-accessibility/speech-dispatcher[python,python_targets_python3_10(-)] >=dev-python/apsw-3.25.2_p1[python_targets_python3_10(-)] dev-python/beautifulsoup4[python_targets_python3_10(-)] dev-python/cchardet[python_targets_python3_10(-)] >=dev-python/chardet-3.0.3[python_targets_python3_10(-)] >=dev-python/cssselect-0.7.1[python_targets_python3_10(-)] >=dev-python/css-parser-1.0.4[python_targets_python3_10(-)] >=dev-python/dbus-python-1.2.4[python_targets_python3_10(-)] dev-python/dnspython[python_targets_python3_10(-)] >=dev-python/feedparser-5.2.1[python_targets_python3_10(-)] >=dev-python/html2text-2019.8.11[python_targets_python3_10(-)] >=dev-python/html5-parser-0.4.9[python_targets_python3_10(-)] dev-python/jeepney[python_targets_python3_10(-)] >=dev-python/lxml-3.8.0[python_targets_python3_10(-)] >=dev-python/markdown-3.0.1[python_targets_python3_10(-)] >=dev-python/mechanize-0.3.5[python_targets_python3_10(-)] >=dev-python/msgpack-0.6.2[python_targets_python3_10(-)] >=dev-python/netifaces-0.10.5[python_targets_python3_10(-)] >=dev-python/pillow-3.2.0[python_targets_python3_10(-)] >=dev-python/psutil-4.3.0[python_targets_python3_10(-)] >=dev-python/pychm-0.8.6[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/pygments-2.3.1[python_targets_python3_10(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_10(-)] >=dev-python/PyQt5-5.15.5_pre2107091435[gui,svg,widgets,network,printsupport,python_targets_python3_10(-)] >=dev-python/PyQt-builder-1.10.3[python_targets_python3_10(-)] >=dev-python/PyQtWebEngine-5.15.5_pre2108100905[python_targets_python3_10(-)] dev-python/regex[python_targets_python3_10(-)] dev-python/zeroconf[python_targets_python3_10(-)] ) dev-qt/qtcore:5= dev-qt/qtdbus:5= dev-qt/qtgui:5=[jpeg] dev-qt/qtwidgets:5= dev-util/desktop-file-utils dev-util/gtk-update-icon-cache media-fonts/liberation-fonts media-libs/fontconfig:= >=media-libs/freetype-2:= >=media-libs/libmtp-1.1.11:= >=media-libs/libwmf-0.2.8 >=media-gfx/optipng-0.7.6 >=sys-libs/zlib-1.2.11:= virtual/libusb:1= x11-libs/libxkbcommon:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXrender:= x11-misc/shared-mime-info >=x11-misc/xdg-utils-1.0.2-r2 ios? ( >=app-pda/usbmuxd-1.0.8 >=app-pda/libimobiledevice-1.2.0 ) udisks? ( virtual/libudev ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://download.calibre-ebook.com/5.43.0/calibre-5.43.0.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ecf3ec1c6e7544c8fee315347886b1e1
diff --git a/metadata/md5-cache/app-text/discount-2.2.7-r2 b/metadata/md5-cache/app-text/discount-2.2.7b
similarity index 89%
rename from metadata/md5-cache/app-text/discount-2.2.7-r2
rename to metadata/md5-cache/app-text/discount-2.2.7b
index 2f53488e733e..feaaaa6fb6f5 100644
--- a/metadata/md5-cache/app-text/discount-2.2.7-r2
+++ b/metadata/md5-cache/app-text/discount-2.2.7b
@@ -8,6 +8,6 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.7.tar.bz2
+SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.7b.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=96a6b1c8da116623ff9b47728de7c5fe
+_md5_=4d45636b15d024ab71b13765031dc0b8
diff --git a/metadata/md5-cache/app-text/enchant-1.6.1-r2 b/metadata/md5-cache/app-text/enchant-1.6.1-r2
index afb59b966a97..e5daec61fae8 100644
--- a/metadata/md5-cache/app-text/enchant-1.6.1-r2
+++ b/metadata/md5-cache/app-text/enchant-1.6.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=8
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) !<app-text/enchant-2.3.3:2
 REQUIRED_USE=|| ( aspell hunspell )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_md5_=76c2dfe3dc768a389cd767c4e7e65362
+_md5_=65abb793071f67ebde4a3dbc0a43eb86
diff --git a/metadata/md5-cache/app-text/enchant-2.3.3-r1 b/metadata/md5-cache/app-text/enchant-2.3.3-r1
index 800d26d7a46e..07c789e9153e 100644
--- a/metadata/md5-cache/app-text/enchant-2.3.3-r1
+++ b/metadata/md5-cache/app-text/enchant-2.3.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Spellchecker wrapping library
 EAPI=8
 HOMEPAGE=https://abiword.github.io/enchant/
 IUSE=aspell +hunspell nuspell test voikko
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) nuspell? ( >=app-text/nuspell-5.1.0:0= ) voikko? ( dev-libs/libvoikko ) !<app-text/enchant-1.6.1-r2:0
 REQUIRED_USE=|| ( aspell hunspell nuspell )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.3.3/enchant-2.3.3.tar.gz
-_md5_=6144729e71faf6e08766e7f9b7f42731
+_md5_=82cc8762b56c754e8d52f842f7c8b9a2
diff --git a/metadata/md5-cache/app-text/evince-42.2 b/metadata/md5-cache/app-text/evince-42.2
index cc55e45e1b2c..e18c508ded0f 100644
--- a/metadata/md5-cache/app-text/evince-42.2
+++ b/metadata/md5-cache/app-text/evince-42.2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evince
 INHERIT=gnome.org gnome2-utils meson systemd xdg
 IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
 SLOT=0/evd3.4-evv3.3
 SRC_URI=mirror://gnome/sources/evince/42/evince-42.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba456b5a0beb9f935c45d906792685f1
+_md5_=403dc741fb58b035db0807e70833a511
diff --git a/metadata/md5-cache/app-text/gspell-1.10.0 b/metadata/md5-cache/app-text/gspell-1.10.0
index 360e8cc3c75a..9fffe9db80c3 100644
--- a/metadata/md5-cache/app-text/gspell-1.10.0
+++ b/metadata/md5-cache/app-text/gspell-1.10.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/gspell
 INHERIT=gnome2 vala virtualx
 IUSE=+introspection +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=app-text/enchant-2.1.3:2 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=mirror://gnome/sources/gspell/1.10/gspell-1.10.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c04b80d513af16f7fb85c949438cfb85
+_md5_=418b472fdc72483de16a985fbad35afc
diff --git a/metadata/md5-cache/app-text/jabref-2.10-r7 b/metadata/md5-cache/app-text/jabref-2.10-r7
deleted file mode 100644
index 6babfdabf068..000000000000
--- a/metadata/md5-cache/app-text/jabref-2.10-r7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* doc? ( dev-java/junit:0 ) test? ( dev-java/junit:0 ) dev-java/antlr:0 dev-java/antlr:3 dev-java/commons-logging:0 dev-java/fontbox:1.7 dev-java/jaxb-api:2 dev-java/jempbox:1.7 dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=8
-HOMEPAGE=https://www.jabref.org/
-IDEPEND=dev-util/desktop-file-utils
-INHERIT=desktop java-pkg-2 java-ant-2 virtualx xdg-utils
-IUSE=doc test test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=virtual/jre:1.8 dev-java/antlr:0 dev-java/antlr:3 dev-java/commons-logging:0 dev-java/fontbox:1.7 dev-java/jaxb-api:2 dev-java/jempbox:1.7 dev-java/log4j-12-api:2 dev-java/log4j-api:2 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3b426005b0c8bc1ee8682f73efa6a844
diff --git a/metadata/md5-cache/app-text/pelican-4.7.2-r1 b/metadata/md5-cache/app-text/pelican-4.7.2-r1
index 3e9f60bc67c2..4819cd98a6aa 100644
--- a/metadata/md5-cache/app-text/pelican-4.7.2-r1
+++ b/metadata/md5-cache/app-text/pelican-4.7.2-r1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
 INHERIT=distutils-r1
 IUSE=doc examples markdown test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv ~x86
 LICENSE=AGPL-3
 RDEPEND=>=dev-python/docutils-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/blinker-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/feedgenerator-1.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/unidecode-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) markdown? ( >=dev-python/markdown-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/getpelican/pelican/archive/4.7.2.tar.gz -> pelican-4.7.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cc667b49659bed5f9faa25a8722d3c42
+_md5_=90fcc42219cac45c0dbc28ef7d6a7780
diff --git a/metadata/md5-cache/app-text/xiphos-4.2.1-r1 b/metadata/md5-cache/app-text/xiphos-4.2.1-r1
new file mode 100644
index 000000000000..f0793f4372a6
--- /dev/null
+++ b/metadata/md5-cache/app-text/xiphos-4.2.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) app-arch/zip app-text/yelp-tools dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/glib-utils dev-util/itstool virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
+DESCRIPTION=A Gtk+-based Bible-study frontend for SWORD
+EAPI=8
+HOMEPAGE=https://xiphos.org/
+INHERIT=cmake xdg-utils
+IUSE=dbus debug
+KEYWORDS=~amd64
+LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
+RDEPEND=sys-apps/util-linux dev-libs/libxml2 dev-libs/libxslt dbus? ( dev-libs/dbus-glib ) >=app-text/sword-1.8.1 dev-libs/glib:2 dev-libs/icu >=net-libs/biblesync-1.2.0 net-libs/webkit-gtk:4 sys-libs/zlib[minizip] x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.2.1/xiphos-4.2.1.tar.xz https://dev.gentoo.org/~marecki/dists/app-text/xiphos/xiphos-4.2.1-disable_webkit_editor.patch.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=32009804e391e4c0839f80c51b62f715
diff --git a/metadata/md5-cache/app-text/yelp-tools-42.0 b/metadata/md5-cache/app-text/yelp-tools-42.0
index af6f73f91c42..a5e5bd439b4d 100644
--- a/metadata/md5-cache/app-text/yelp-tools-42.0
+++ b/metadata/md5-cache/app-text/yelp-tools-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
 INHERIT=gnome2 meson python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( GPL-2+ freedist ) GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.38
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-tools/42/yelp-tools-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=30d433c33b3c8c276891c2c352586b9a
+_md5_=57db50812689408b607ed3a725ed4ae3
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 4b891f7f3887..e440d3ad9cea 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604 b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
index bea4cb7ad67a..b7728dc44892 100644
--- a/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
+++ b/metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Jinja2 syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/Glench/Vim-Jinja2-Syntax/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Glench/Vim-Jinja2-Syntax/archive/5d2496eb5fd4415c7ce062ccbcd53a3f0de93aa3.tar.gz -> Vim-Jinja2-Syntax-0.0_pre20210604.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e41f3fb4712d79d42f430361c4474812
diff --git a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1 b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
index 9f5ffe088cc1..4943414bf899 100644
--- a/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
+++ b/metadata/md5-cache/app-vim/ackvim-1.0.9-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: run ack from vim
 EAPI=6
 HOMEPAGE=https://github.com/mileszs/ack.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=sys-apps/ack || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mileszs/ack.vim/archive/1.0.9.tar.gz -> ack.vim-1.0.9.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=2eee2a0b4c475257c75ff912bb592719
diff --git a/metadata/md5-cache/app-vim/airline-0.11 b/metadata/md5-cache/app-vim/airline-0.11
index 0c84a9cfd68e..ab628c503cf7 100644
--- a/metadata/md5-cache/app-vim/airline-0.11
+++ b/metadata/md5-cache/app-vim/airline-0.11
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
 EAPI=7
 HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-airline/vim-airline/archive/v0.11.tar.gz -> airline-0.11.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8d8599a1cc3db2f8360c08dfd50f1d1c
diff --git a/metadata/md5-cache/app-vim/airline-9999 b/metadata/md5-cache/app-vim/airline-9999
index a9ed33d3540b..33d1c5d1a4f2 100644
--- a/metadata/md5-cache/app-vim/airline-9999
+++ b/metadata/md5-cache/app-vim/airline-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: lean & mean statusline for vim that's light as air
 EAPI=7
 HOMEPAGE=https://github.com/vim-airline/vim-airline/ https://www.vim.org/scripts/script.php?script_id=4661
+INHERIT=vim-plugin git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=308506a5798f6c10999fa648fe52e228
diff --git a/metadata/md5-cache/app-vim/airline-themes-0_pre20181021 b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
index fe8ec417d889..71155db0c3c8 100644
--- a/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
+++ b/metadata/md5-cache/app-vim/airline-themes-0_pre20181021
@@ -3,10 +3,11 @@ DEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a collection of themes for vim-airline
 EAPI=7
 HOMEPAGE=https://github.com/vim-airline/vim-airline-themes
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~zlogene/distfiles/app-vim/airline-themes/airline-themes-0_pre20181021.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=08b7674d2ca4e57ef813a77c287677ba
diff --git a/metadata/md5-cache/app-vim/airline-themes-9999 b/metadata/md5-cache/app-vim/airline-themes-9999
index 0a64aaf9cf89..e7d320176a3a 100644
--- a/metadata/md5-cache/app-vim/airline-themes-9999
+++ b/metadata/md5-cache/app-vim/airline-themes-9999
@@ -3,9 +3,10 @@ DEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev
 DESCRIPTION=vim plugin: a collection of themes for vim-airline
 EAPI=6
 HOMEPAGE=https://github.com/vim-airline/vim-airline-themes
+INHERIT=vim-plugin git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=app-vim/airline || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7c611ae385f5ea9198aa07ba5e035fdf
diff --git a/metadata/md5-cache/app-vim/align-43 b/metadata/md5-cache/app-vim/align-43
index 065d02d63810..d13eb2476889 100644
--- a/metadata/md5-cache/app-vim/align-43
+++ b/metadata/md5-cache/app-vim/align-43
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: commands and maps to help produce aligned text
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=294
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/align-43.tar.bz2 https://dev.gentoo.org/~radhermit/vim/align-43.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e451778f60ac3b1cc845b34f735e0411
diff --git a/metadata/md5-cache/app-vim/alternate-2.18-r2 b/metadata/md5-cache/app-vim/alternate-2.18-r2
index 095191f577df..d0187e41fc30 100644
--- a/metadata/md5-cache/app-vim/alternate-2.18-r2
+++ b/metadata/md5-cache/app-vim/alternate-2.18-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly switch between .c and .h files
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/a.vim https://www.vim.org/scripts/script.php?script_id=31
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=alternate
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/a.vim/archive/2.18.tar.gz -> alternate-2.18.tar.gz https://www.vim.org/scripts/download_script.php?src_id=6347 -> alternate.txt
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=84209f1aab31db4a2a932b8c8140bdc8
diff --git a/metadata/md5-cache/app-vim/ansiesc-12 b/metadata/md5-cache/app-vim/ansiesc-12
index 1a390e409222..4a1e0a28637b 100644
--- a/metadata/md5-cache/app-vim/ansiesc-12
+++ b/metadata/md5-cache/app-vim/ansiesc-12
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ansi escape sequences concealed, but highlighted as specified
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=302
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=app-vim/cecutil || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ansiesc-12.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ansiesc-12.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=4d0011fa674ddb87a0a7f1d99edfe720
diff --git a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1 b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
index c8f5b45f457a..22118cd539a2 100644
--- a/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+++ b/metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Java ant build system integration
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=155
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2
 RDEPEND=dev-java/ant || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ant_menu-0.5.7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ant_menu-0.5.7.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f4bdcd73a74b27106a873e4e8b10a262
diff --git a/metadata/md5-cache/app-vim/autoalign-14 b/metadata/md5-cache/app-vim/autoalign-14
index c5ca815f22ac..70d2c76faaf4 100644
--- a/metadata/md5-cache/app-vim/autoalign-14
+++ b/metadata/md5-cache/app-vim/autoalign-14
@@ -3,10 +3,11 @@ DEPEND=app-arch/xz-utils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: automatically align bib, c, c++, tex and vim code
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=884
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=>=app-vim/align-30 >=app-vim/cecutil-4 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/autoalign-14.tar.xz https://dev.gentoo.org/~chutzpah/vim/autoalign-14.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=2528178041187337be05b29c3d37dc96
diff --git a/metadata/md5-cache/app-vim/bash-support-4.2.1 b/metadata/md5-cache/app-vim/bash-support-4.2.1
index ae4b362a77ff..da34cc3cd031 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.2.1
+++ b/metadata/md5-cache/app-vim/bash-support-4.2.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bash-support-4.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bash-support-4.2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c974833191f877d2a586479a5ec02a41
diff --git a/metadata/md5-cache/app-vim/bash-support-4.3 b/metadata/md5-cache/app-vim/bash-support-4.3
index c3e9ea1ace90..0fe67c1db1ec 100644
--- a/metadata/md5-cache/app-vim/bash-support-4.3
+++ b/metadata/md5-cache/app-vim/bash-support-4.3
@@ -4,10 +4,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: write and run bash scripts using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=365
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24452 -> bash-support-4.3.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e9f097f2d4a9dc8f081a8629adbd1609
diff --git a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2 b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
index 6ab5e0836c57..4076dca174e6 100644
--- a/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+++ b/metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: BNF file syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=250
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/bnf-syntax-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/bnf-syntax-1.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e3c8297df8d4d0c855dfc32068dacbfd
diff --git a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1 b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
index d93f5646eb2f..b1d33b6b1706 100644
--- a/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
+++ b/metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Support for the brainfuck programming language
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=716
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/brainfuck-syntax-1.0.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/brainfuck-syntax-1.0.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5d015045b608d2e805438cb4427d8dcd
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r1 b/metadata/md5-cache/app-vim/breakpts-4.0-r1
index 8e7e67560f14..c99416450ad7 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r1
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: sets vim breakpoints visually
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/breakpts-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/breakpts-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=459d8fbd967d3dd31b57747cae2c47d8
diff --git a/metadata/md5-cache/app-vim/breakpts-4.0-r2 b/metadata/md5-cache/app-vim/breakpts-4.0-r2
index 50c95ffd5a93..c63667571bfd 100644
--- a/metadata/md5-cache/app-vim/breakpts-4.0-r2
+++ b/metadata/md5-cache/app-vim/breakpts-4.0-r2
@@ -4,10 +4,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: sets vim breakpoints visually
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=618
+INHERIT=vim-plugin
 KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) >=app-vim/multvals-3.6.1 >=app-vim/genutils-1.13 >=app-vim/foldutil-1.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=8142 -> breakpts-4.0.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=22eedc9ddb91eace8abede60c7b8cd2a
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.18 b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
index 9c1c0def56f2..af7a19487e4a 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.18
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.18
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.18.tar.gz -> bufexplorer-7.4.18.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f331a1983899a0e4aba9b501e7c6ffc4
diff --git a/metadata/md5-cache/app-vim/bufexplorer-7.4.19 b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
index 9ce6c6afd823..144a1dbff16b 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-7.4.19
+++ b/metadata/md5-cache/app-vim/bufexplorer-7.4.19
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jlanzarotta/bufexplorer/archive/v7.4.19.tar.gz -> bufexplorer-7.4.19.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e52cf25f9ad650546d0d626a49412acd
diff --git a/metadata/md5-cache/app-vim/bufexplorer-9999 b/metadata/md5-cache/app-vim/bufexplorer-9999
index f9bf3d98e5ea..9eebdc294971 100644
--- a/metadata/md5-cache/app-vim/bufexplorer-9999
+++ b/metadata/md5-cache/app-vim/bufexplorer-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: easily browse vim buffers
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=42 https://github.com/jlanzarotta/bufexplorer
+INHERIT=vim-plugin git-r3
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3b1a339b61d9f025f7d045e08a350d0e
diff --git a/metadata/md5-cache/app-vim/c-support-6.1.1 b/metadata/md5-cache/app-vim/c-support-6.1.1
index 33bfc1fd2821..1b3cf8de13f7 100644
--- a/metadata/md5-cache/app-vim/c-support-6.1.1
+++ b/metadata/md5-cache/app-vim/c-support-6.1.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: C/C++-IDE -- Write and run programs using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=213
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/c-support-6.1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/c-support-6.1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=23af1601f091d19cceb35431d7d809f0
diff --git a/metadata/md5-cache/app-vim/calendar-2.9-r1 b/metadata/md5-cache/app-vim/calendar-2.9-r1
index 4f0cde9b661a..1a6f12409ac0 100644
--- a/metadata/md5-cache/app-vim/calendar-2.9-r1
+++ b/metadata/md5-cache/app-vim/calendar-2.9-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: calendar window
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=52
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/calendar-2.9.tar.bz2 https://dev.gentoo.org/~radhermit/vim/calendar-2.9.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fe64d3177d8f4f9b3795b75eec003ecd
diff --git a/metadata/md5-cache/app-vim/cctree-1.61-r1 b/metadata/md5-cache/app-vim/cctree-1.61-r1
index ffb7c54e6353..47389a043284 100644
--- a/metadata/md5-cache/app-vim/cctree-1.61-r1
+++ b/metadata/md5-cache/app-vim/cctree-1.61-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Cscope based source-code browser and code flow analysis tool
 EAPI=6
 HOMEPAGE=https://sites.google.com/site/vimcctree/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=bufexplorer.vim
 RDEPEND=dev-util/cscope || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cctree-1.61.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cctree-1.61.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=608d78a654f35de7b8b36ad920ae90d1
diff --git a/metadata/md5-cache/app-vim/cecutil-17 b/metadata/md5-cache/app-vim/cecutil-17
index dd9b2862801b..d827c8f1bea6 100644
--- a/metadata/md5-cache/app-vim/cecutil-17
+++ b/metadata/md5-cache/app-vim/cecutil-17
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library used by many of Charles Campbell's plugins
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1066
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cecutil-17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cecutil-17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d1c20030f183d5277a170a19245bc162
diff --git a/metadata/md5-cache/app-vim/cfengine-syntax-20141019 b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
index c20a12be9a19..2c9fbfae5af3 100644
--- a/metadata/md5-cache/app-vim/cfengine-syntax-20141019
+++ b/metadata/md5-cache/app-vim/cfengine-syntax-20141019
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Cfengine 3 configuration files syntax
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2904 https://github.com/neilhwatson/vim_cf3
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-3+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cfengine-syntax-20141019.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cfengine-syntax-20141019.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=458b46ae5e885090aab9734b8a46b10b
diff --git a/metadata/md5-cache/app-vim/checkattach-0.17 b/metadata/md5-cache/app-vim/checkattach-0.17
index 3f34a4cf41df..ae421bb5c6ef 100644
--- a/metadata/md5-cache/app-vim/checkattach-0.17
+++ b/metadata/md5-cache/app-vim/checkattach-0.17
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: check for attachments when writing mails with mutt
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2796 https://github.com/chrisbra/CheckAttach
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/checkattach-0.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/checkattach-0.17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=34fc2ee6c173b3797df52e1050b43497
diff --git a/metadata/md5-cache/app-vim/closetag-0.9.1-r1 b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
index 3e8a9a04016c..7d84daa9c6f5 100644
--- a/metadata/md5-cache/app-vim/closetag-0.9.1-r1
+++ b/metadata/md5-cache/app-vim/closetag-0.9.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: close HTML/XML tags quickly
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=13
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/closetag-0.9.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/closetag-0.9.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=222fa03e5ef198542c6b432f8fb7437e
diff --git a/metadata/md5-cache/app-vim/cmdalias-3.0-r1 b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
index 7f1e16c7cd27..cc225be5c38f 100644
--- a/metadata/md5-cache/app-vim/cmdalias-3.0-r1
+++ b/metadata/md5-cache/app-vim/cmdalias-3.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for alias creation
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=746
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cmdalias-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cmdalias-3.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8a4db0295dc596c5dfeb5bd9af7fce3f
diff --git a/metadata/md5-cache/app-vim/colorschemes-20140623-r1 b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
index 4bad90f7736f..87ac2e3ebf2c 100644
--- a/metadata/md5-cache/app-vim/colorschemes-20140623-r1
+++ b/metadata/md5-cache/app-vim/colorschemes-20140623-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a collection of color schemes from vim.org
 EAPI=7
 HOMEPAGE=https://www.vim.org/
+INHERIT=edos2unix vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=vim GPL-2 GPL-2+ GPL-3 GPL-3+ MIT BSD WTFPL-2 public-domain vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/colorschemes-20140623.tar.bz2 https://dev.gentoo.org/~radhermit/vim/colorschemes-20140623.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6ecb0049dc9eb549fbc458c44abe14ad
diff --git a/metadata/md5-cache/app-vim/colorsel-20100406 b/metadata/md5-cache/app-vim/colorsel-20100406
index a47eca1d28bc..ddc9fd1a9f4f 100644
--- a/metadata/md5-cache/app-vim/colorsel-20100406
+++ b/metadata/md5-cache/app-vim/colorsel-20100406
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: RGB / HSV color selector
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=927
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=>=app-editors/gvim-7.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=12789 -> colorsel-20100406.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=58f0aa1517cd6b27feb700d7271710ee
diff --git a/metadata/md5-cache/app-vim/command-t-5.0.3-r1 b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
index 215d32c8cfdb..169a2db102a7 100644
--- a/metadata/md5-cache/app-vim/command-t-5.0.3-r1
+++ b/metadata/md5-cache/app-vim/command-t-5.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/v
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 SLOT=0
 SRC_URI=https://github.com/wincent/command-t/archive/5.0.3.tar.gz -> command-t-5.0.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=31081c81d39e742467c4372c3739ca6d
diff --git a/metadata/md5-cache/app-vim/csound-syntax-0.8.1 b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
index 1e73943ae1eb..fc5b46376cf5 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-0.8.1
+++ b/metadata/md5-cache/app-vim/csound-syntax-0.8.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
 EAPI=7
 HOMEPAGE=https://github.com/luisjure/csound
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/luisjure/csound-vim/archive/v0.8.1.tar.gz -> csound-syntax-0.8.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=afed93cb5d7b4ff5fc6fe3786e16cb2b
diff --git a/metadata/md5-cache/app-vim/csound-syntax-20160804 b/metadata/md5-cache/app-vim/csound-syntax-20160804
index 672cfd454c4b..08007fce2b64 100644
--- a/metadata/md5-cache/app-vim/csound-syntax-20160804
+++ b/metadata/md5-cache/app-vim/csound-syntax-20160804
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: set of tools for editing Csound files with vim
 EAPI=6
 HOMEPAGE=https://github.com/luisjure/csound
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csound-syntax-20160804.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csound-syntax-20160804.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f21217d805d5f392f3c51cb25924012c
diff --git a/metadata/md5-cache/app-vim/csscomplete-1.0 b/metadata/md5-cache/app-vim/csscomplete-1.0
index a1b44ebd40c9..3154b54f0725 100644
--- a/metadata/md5-cache/app-vim/csscomplete-1.0
+++ b/metadata/md5-cache/app-vim/csscomplete-1.0
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: CSS 3 omni complete function
 EAPI=6
 HOMEPAGE=https://github.com/othree/csscomplete.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/othree/csscomplete.vim/archive/1.0.tar.gz -> csscomplete-1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f21f75e7c53cb7efb3a1e5a8e2778f6b
diff --git a/metadata/md5-cache/app-vim/csv-0.31-r1 b/metadata/md5-cache/app-vim/csv-0.31-r1
index 934647dd7040..e142c1a4cf27 100644
--- a/metadata/md5-cache/app-vim/csv-0.31-r1
+++ b/metadata/md5-cache/app-vim/csv-0.31-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display and alter csv files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2830
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/csv-0.31.tar.bz2 https://dev.gentoo.org/~radhermit/vim/csv-0.31.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8ac9f8c51bf6b9f7a5ffd2fe60e18ef6
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80 b/metadata/md5-cache/app-vim/ctrlp-1.80
index dc7081f6ceb4..ab46cae42663 100644
--- a/metadata/md5-cache/app-vim/ctrlp-1.80
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
 EAPI=6
 HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/1.80.tar.gz -> ctrlp-1.80.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=944019784167acad3e18b68aab6bec1a
diff --git a/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418 b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
index 2092c5f82379..c5d14b9859b5 100644
--- a/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
+++ b/metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: fuzzy file, buffer, mru, tag, ... finder with regex support
 EAPI=6
 HOMEPAGE=https://github.com/ctrlpvim/ctrlp.vim
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ctrlpvim/ctrlp.vim/archive/4b9e7cac612902a25498cca49f13475fe1a821a4.tar.gz -> ctrlp-1.80_p20180418.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=173e6809d113b0e1f56756cd3107c6ac
diff --git a/metadata/md5-cache/app-vim/ctx-1.17-r1 b/metadata/md5-cache/app-vim/ctx-1.17-r1
index c58bcd19cc19..957a9be89aea 100644
--- a/metadata/md5-cache/app-vim/ctx-1.17-r1
+++ b/metadata/md5-cache/app-vim/ctx-1.17-r1
@@ -3,10 +3,11 @@ DEPEND=app-editors/vim[perl] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display current scope context in a C file
 EAPI=6
 HOMEPAGE=http://www.bluweb.com/us/chouser/proj/ctx/
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc x86
 LICENSE=GPL-2
 RDEPEND=!app-vim/enhancedcommentify || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ctx-1.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ctx-1.17.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f34576dcadbb01f4b87ca77bba6c36c1
diff --git a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1 b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
index e7b839181842..7252f7d9d74d 100644
--- a/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+++ b/metadata/md5-cache/app-vim/curcmdmode-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for extending vim's mode() function
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=745
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=app-vim/genutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/curcmdmode-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/curcmdmode-1.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5360bebb8b8e6f58cc24e5670986653d
diff --git a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1 b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
index 061563ed161d..e0388fcad6c4 100644
--- a/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+++ b/metadata/md5-cache/app-vim/cvsmenu-1.147-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: CVS(NT) integration script
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1245
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc x86
 LICENSE=LGPL-2
 RDEPEND=dev-vcs/cvs || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/cvsmenu-1.147.tar.bz2 https://dev.gentoo.org/~radhermit/vim/cvsmenu-1.147.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=740fdb8d6b5c2499f844e499f5fdd257
diff --git a/metadata/md5-cache/app-vim/dbext-26.00 b/metadata/md5-cache/app-vim/dbext-26.00
index a4c46fd00aa8..da0d81635b48 100644
--- a/metadata/md5-cache/app-vim/dbext-26.00
+++ b/metadata/md5-cache/app-vim/dbext-26.00
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy access to databases
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=356
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dbext-26.00.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dbext-26.00.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5622978270657b426327143b95317a91
diff --git a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908 b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
index 7c570979fd27..1c981f473824 100644
--- a/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
+++ b/metadata/md5-cache/app-vim/detectindent-1.0_p20150908
@@ -3,10 +3,11 @@ DEPEND=app-arch/xz-utils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: automatically detect file indent settings
 EAPI=7
 HOMEPAGE=https://github.com/ciaranm/detectindent
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~hppa ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/detectindent-1.0_p20150908.tar.xz https://dev.gentoo.org/~chutzpah/vim/detectindent-1.0_p20150908.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3dc48ec1212a69b591ff3be266f8fd67
diff --git a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1 b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
index b44897ad1c75..306e52e059ff 100644
--- a/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+++ b/metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for dhcpd.conf
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=744
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dhcpd-syntax-20030825.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dhcpd-syntax-20030825.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0d5306e1053857cd8edfb3852616f5db
diff --git a/metadata/md5-cache/app-vim/diffchar-8.2 b/metadata/md5-cache/app-vim/diffchar-8.2
index 17786fe32e62..7d3d89a11469 100644
--- a/metadata/md5-cache/app-vim/diffchar-8.2
+++ b/metadata/md5-cache/app-vim/diffchar-8.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
 EAPI=6
 HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/837334b268302cf6c597d88485aa8aad6a500b98.tar.gz -> diffchar-8.2.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=efa0af6f5367c544ae3f7acd4cc6f8d0
diff --git a/metadata/md5-cache/app-vim/diffchar-8.6 b/metadata/md5-cache/app-vim/diffchar-8.6
index a713518b9e24..e9e3f3273075 100644
--- a/metadata/md5-cache/app-vim/diffchar-8.6
+++ b/metadata/md5-cache/app-vim/diffchar-8.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: highlight the exact differences, based on characters and words
 EAPI=7
 HOMEPAGE=https://github.com/rickhowe/diffchar.vim https://www.vim.org/scripts/script.php?script_id=4932
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rickhowe/diffchar.vim/archive/c889cc133e8c6a1ba9ff089a6b9a6b94bd345cb4.tar.gz -> diffchar-8.6.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8f7d2644fb402ae7e535ec453017aa6b
diff --git a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1 b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
index 7729bcc3b61b..22f4e20e23ed 100644
--- a/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
+++ b/metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: diff and merge two directories recursively
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=102
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=sys-apps/diffutils || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/dirdiff-1.1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/dirdiff-1.1.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d8067b81f1be2badc17438d80e534a3c
diff --git a/metadata/md5-cache/app-vim/easy-align-2.10.0-r1 b/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
index 03a3d4b2d919..293e2007be8e 100644
--- a/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
+++ b/metadata/md5-cache/app-vim/easy-align-2.10.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a simple alignment plugin
 EAPI=6
 HOMEPAGE=https://github.com/junegunn/vim-easy-align https://www.vim.org/scripts/script.php?script_id=4520
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/junegunn/vim-easy-align/archive/2.10.0.tar.gz -> easy-align-2.10.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=9aaede01a31ad85c6c4fb3eec27d77c1
diff --git a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2 b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
index 7cf5698b22bb..8ea1add5919c 100644
--- a/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+++ b/metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: EBNF (ISO/IEC 14997) file syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=545
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ebnf-syntax-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ebnf-syntax-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=40979936c7e730f551b964e94af394e2
diff --git a/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1 b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
index 87467bc8fae8..843a62f3cafb 100644
--- a/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
+++ b/metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Support EditorConfig files
 EAPI=7
 HOMEPAGE=https://editorconfig.org/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD-2 PSF-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/editorconfig/editorconfig-vim/archive/v1.1.1.tar.gz -> editorconfig-vim-1.1.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3cc33f04ddf9bb35530cdfd0c65dbf63
diff --git a/metadata/md5-cache/app-vim/emmet-0.85-r1 b/metadata/md5-cache/app-vim/emmet-0.85-r1
index 4f48271074f2..ad6f22f92cfb 100644
--- a/metadata/md5-cache/app-vim/emmet-0.85-r1
+++ b/metadata/md5-cache/app-vim/emmet-0.85-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2981 https://mattn.github.io/emmet-vim/ https://emmet.io/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/emmet-0.85.tar.bz2 https://dev.gentoo.org/~radhermit/vim/emmet-0.85.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d044d845d65724041f93a2f88ce31267
diff --git a/metadata/md5-cache/app-vim/emmet-9999 b/metadata/md5-cache/app-vim/emmet-9999
index be4af927827d..41a523684d4c 100644
--- a/metadata/md5-cache/app-vim/emmet-9999
+++ b/metadata/md5-cache/app-vim/emmet-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: HTML and CSS hi-speed coding
 EAPI=6
 HOMEPAGE=https://mattn.github.io/emmet-vim https://emmet.io
+INHERIT=vim-plugin git-r3
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a7e0fb8e9922aa58df99b1fad811f2dd
diff --git a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1 b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
index 2777aa140a8d..fbca73c9ef7a 100644
--- a/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+++ b/metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
@@ -3,10 +3,11 @@ DEPEND=sys-apps/sed || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced comment creation
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=23
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=BSD
 RDEPEND=sys-apps/sed !app-vim/ctx || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/enhancedcommentify-2.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/enhancedcommentify-2.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0ed72b08384536d15c2e72bf928336ad
diff --git a/metadata/md5-cache/app-vim/errsign-0.1-r1 b/metadata/md5-cache/app-vim/errsign-0.1-r1
index 0f1cd7be76d2..2a5258f4a586 100644
--- a/metadata/md5-cache/app-vim/errsign-0.1-r1
+++ b/metadata/md5-cache/app-vim/errsign-0.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display marks on lines with errors
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1027
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/errsign-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/errsign-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=798a826071ed4ccb39c3641c0604057a
diff --git a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2 b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
index b4db0cfe4ae6..f796406ea23b 100644
--- a/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+++ b/metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for eruby
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=403
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eruby-syntax-2.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/eruby-syntax-2.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=64aebfea8066d41595b85721a8aee09d
diff --git a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r2 b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r2
index fecc8d4aa3e6..9f220e379d3a 100644
--- a/metadata/md5-cache/app-vim/eselect-syntax-20070506-r2
+++ b/metadata/md5-cache/app-vim/eselect-syntax-20070506-r2
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/eselect-syntax-20070506.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bb9cf7bbc3d37a353fafdd693a02fea3
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-20090310 b/metadata/md5-cache/app-vim/exheres-syntax-20090310
index c3b986995a6d..ffb801b99fdb 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-20090310
+++ b/metadata/md5-cache/app-vim/exheres-syntax-20090310
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: exheres format highlighting
 EAPI=6
 HOMEPAGE=https://www.exherbo.org/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.exherbo.org/~ahf/pub/software/releases/exheres-syntax/exheres-syntax-20090310.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f77857d5b56964ead1fd59063f6eb9ab
diff --git a/metadata/md5-cache/app-vim/exheres-syntax-99999999 b/metadata/md5-cache/app-vim/exheres-syntax-99999999
index 796ec9decca5..b63949e366fd 100644
--- a/metadata/md5-cache/app-vim/exheres-syntax-99999999
+++ b/metadata/md5-cache/app-vim/exheres-syntax-99999999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: exheres format highlighting
 EAPI=6
 HOMEPAGE=https://www.exherbo.org/
+INHERIT=vim-plugin git-r3
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=df0558ee58c9818e05a5ab52fb62b57a
diff --git a/metadata/md5-cache/app-vim/extra-syntax-4-r2 b/metadata/md5-cache/app-vim/extra-syntax-4-r2
index 1e22097f40c4..cfca2e27cdeb 100644
--- a/metadata/md5-cache/app-vim/extra-syntax-4-r2
+++ b/metadata/md5-cache/app-vim/extra-syntax-4-r2
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: metapackage for all extra syntax packages
 EAPI=6
 HOMEPAGE=https://www.vim.org/
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ~ppc ppc64 x86
 LICENSE=metapackage
 RDEPEND=app-vim/bnf-syntax app-vim/brainfuck-syntax app-vim/cfengine-syntax app-vim/dhcpd-syntax app-vim/ebnf-syntax app-vim/eruby-syntax app-vim/fluxbox-syntax app-vim/gentoo-syntax app-vim/gtk-syntax app-vim/help-extra-syntax app-vim/nagios-syntax app-vim/ntp-syntax app-vim/pgn-syntax app-vim/selinux-syntax app-vim/wikipedia-syntax app-vim/xquery-syntax app-vim/xsl-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0589a64d7502ed196f93c183e5d3a915
diff --git a/metadata/md5-cache/app-vim/ferret-4.0 b/metadata/md5-cache/app-vim/ferret-4.0
index 4f2d9c583a9c..b7add8fed188 100644
--- a/metadata/md5-cache/app-vim/ferret-4.0
+++ b/metadata/md5-cache/app-vim/ferret-4.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced multi-file search
 EAPI=6
 HOMEPAGE=https://github.com/wincent/ferret
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/4.0.tar.gz -> ferret-4.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=41e62ff7c9f7b9e49f06744c2cbcf439
diff --git a/metadata/md5-cache/app-vim/ferret-5.0 b/metadata/md5-cache/app-vim/ferret-5.0
index c364138a6307..61c8835cce59 100644
--- a/metadata/md5-cache/app-vim/ferret-5.0
+++ b/metadata/md5-cache/app-vim/ferret-5.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced multi-file search
 EAPI=7
 HOMEPAGE=https://github.com/wincent/ferret
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/wincent/ferret/archive/5.0.tar.gz -> ferret-5.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c8b6862e4713b3dd0beca4b54e687abd
diff --git a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1 b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
index 4ec46c9d4816..5e11fbf7f777 100644
--- a/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
+++ b/metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: fluxbox files syntax and indent
 EAPI=6
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=679
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=vim
 RDEPEND=app-vim/genindent || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/fluxbox-syntax-1.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/fluxbox-syntax-1.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fcc68af51d8c0ee2002f82636a1a54fc
diff --git a/metadata/md5-cache/app-vim/foldutil-3.0-r1 b/metadata/md5-cache/app-vim/foldutil-3.0-r1
index 1016fdecc42b..17363065227d 100644
--- a/metadata/md5-cache/app-vim/foldutil-3.0-r1
+++ b/metadata/md5-cache/app-vim/foldutil-3.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: fold creation utility
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=158
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-2.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/foldutil-3.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/foldutil-3.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=719478f821598ba4c5572921f61db4a2
diff --git a/metadata/md5-cache/app-vim/frawor-0.2.3 b/metadata/md5-cache/app-vim/frawor-0.2.3
index 4f1037a78269..ebdf41a1e47c 100644
--- a/metadata/md5-cache/app-vim/frawor-0.2.3
+++ b/metadata/md5-cache/app-vim/frawor-0.2.3
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: modular vim framework
 EAPI=6
 HOMEPAGE=https://bitbucket.org/ZyX_I/frawor
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://bitbucket.org/ZyX_I/frawor/downloads/frawor-0.2.3.tar.xz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=1d2114f744e2834704b4d45e137bbfcd
diff --git a/metadata/md5-cache/app-vim/frawor-0.2.3-r1 b/metadata/md5-cache/app-vim/frawor-0.2.3-r1
index 52bc02192606..2eed49c6fb4b 100644
--- a/metadata/md5-cache/app-vim/frawor-0.2.3-r1
+++ b/metadata/md5-cache/app-vim/frawor-0.2.3-r1
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: modular vim framework
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3631 https://github.com/vim-scripts/frawor
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/frawor/archive/0.2.3.tar.gz -> frawor-0.2.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=97e1e3dc7bf8753f464aeb41d36a5af3
diff --git a/metadata/md5-cache/app-vim/fugitive-2.4 b/metadata/md5-cache/app-vim/fugitive-2.4
index f7a3f49e2598..c5f820f01f1f 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.4
+++ b/metadata/md5-cache/app-vim/fugitive-2.4
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.4.tar.gz -> fugitive-2.4.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=aea2817ab56aa2f5478b512532f282a7
diff --git a/metadata/md5-cache/app-vim/fugitive-2.5 b/metadata/md5-cache/app-vim/fugitive-2.5
index 00d7951588fc..48dbb9ee4e69 100644
--- a/metadata/md5-cache/app-vim/fugitive-2.5
+++ b/metadata/md5-cache/app-vim/fugitive-2.5
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v2.5.tar.gz -> fugitive-2.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=42a25b5dd48e6b7d272d3b8c87693796
diff --git a/metadata/md5-cache/app-vim/fugitive-3.1 b/metadata/md5-cache/app-vim/fugitive-3.1
index 08f682359b6a..342b3636b6f6 100644
--- a/metadata/md5-cache/app-vim/fugitive-3.1
+++ b/metadata/md5-cache/app-vim/fugitive-3.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.1.tar.gz -> fugitive-3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fugitive-3.2 b/metadata/md5-cache/app-vim/fugitive-3.2
index 020665098f78..f177e9170302 100644
--- a/metadata/md5-cache/app-vim/fugitive-3.2
+++ b/metadata/md5-cache/app-vim/fugitive-3.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.2.tar.gz -> fugitive-3.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fugitive-3.4 b/metadata/md5-cache/app-vim/fugitive-3.4
index dfc7c30d3724..61100aac54e9 100644
--- a/metadata/md5-cache/app-vim/fugitive-3.4
+++ b/metadata/md5-cache/app-vim/fugitive-3.4
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~ppc-macos ~x64-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-fugitive/archive/v3.4.tar.gz -> fugitive-3.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a62293749e14261c2f4685c12e6dc431
diff --git a/metadata/md5-cache/app-vim/fugitive-9999 b/metadata/md5-cache/app-vim/fugitive-9999
index a31d060db4fa..daaf9aab6a54 100644
--- a/metadata/md5-cache/app-vim/fugitive-9999
+++ b/metadata/md5-cache/app-vim/fugitive-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a git wrapper for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2975 https://github.com/tpope/vim-fugitive/
+INHERIT=vim-plugin git-r3
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0ae2ff45231ee7de6c97530b2224df66
diff --git a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2 b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
index de5e565bf81d..9303182cfddd 100644
--- a/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+++ b/metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: buffer/file/command/tag/etc explorer with fuzzy matching
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1984
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=app-vim/l9 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13961 -> fuzzyfinder-4.2.2.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=aa59555b9fdec197f20950fa94f18668
diff --git a/metadata/md5-cache/app-vim/genindent-1.1-r1 b/metadata/md5-cache/app-vim/genindent-1.1-r1
index a7015ffb0575..1ec08472fc55 100644
--- a/metadata/md5-cache/app-vim/genindent-1.1-r1
+++ b/metadata/md5-cache/app-vim/genindent-1.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for simplifying indent files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=678
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/genindent-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/genindent-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c705f98ccb446ad315d86dedd7d3a6ea
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-1 b/metadata/md5-cache/app-vim/gentoo-syntax-1
index 20c101312081..629d17f40af7 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-1
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-1
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
+INHERIT=vim-plugin
 IUSE=ignore-glep31
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=45e028946d9f0d298044883a34313034
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-2 b/metadata/md5-cache/app-vim/gentoo-syntax-2
index 699f5f5c5eb6..00f3a4540275 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-2
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-2
@@ -10,5 +10,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/gentoo-syntax.git/snapshot/gentoo-syntax-2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=317f65939a95b9addd899a0dc6a71c46
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-9999 b/metadata/md5-cache/app-vim/gentoo-syntax-9999
index 56482cb2829d..9c84a6c51ca7 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-9999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-9999
@@ -4,10 +4,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
+INHERIT=git-r3 vim-plugin
 IUSE=ignore-glep31
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=1dde2fcd50787ad12d867944ad8856e8
diff --git a/metadata/md5-cache/app-vim/genutils-2.5-r1 b/metadata/md5-cache/app-vim/genutils-2.5-r1
index 94d79cdf00de..05004e12f1e0 100644
--- a/metadata/md5-cache/app-vim/genutils-2.5-r1
+++ b/metadata/md5-cache/app-vim/genutils-2.5-r1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library with various useful functions
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=197
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=11399 -> genutils-2.5.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e9ae61156fac980c19c7b34a0c756490
diff --git a/metadata/md5-cache/app-vim/gist-7.3 b/metadata/md5-cache/app-vim/gist-7.3
index b47e890c682c..13f3ac9d8cff 100644
--- a/metadata/md5-cache/app-vim/gist-7.3
+++ b/metadata/md5-cache/app-vim/gist-7.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interact with gists (gist.github.com)
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2423 https://github.com/mattn/gist-vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=app-vim/webapi net-misc/curl dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/gist-vim/archive/7.3.tar.gz -> gist-7.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=4ad74697a065dd6df3bde149c5bef28e
diff --git a/metadata/md5-cache/app-vim/git-patch-tags-0.2 b/metadata/md5-cache/app-vim/git-patch-tags-0.2
index 7e045c1ed8e9..7b1005002f60 100644
--- a/metadata/md5-cache/app-vim/git-patch-tags-0.2
+++ b/metadata/md5-cache/app-vim/git-patch-tags-0.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: add git patch tags as used in linux kernel development
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3632
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/git-patch-tags-0.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/git-patch-tags-0.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d327aeb09778eb60ce4e6fdc928140bd
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180316 b/metadata/md5-cache/app-vim/gitgutter-20180316
index bb99b15bd146..b624989f6b6e 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20180316
+++ b/metadata/md5-cache/app-vim/gitgutter-20180316
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
 EAPI=6
 HOMEPAGE=https://github.com/airblade/vim-gitgutter/
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/37bdd03d176c5e182c7e8dbdc79c3f71d2a04898.tar.gz -> gitgutter-20180316.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=31986e7af553048cab18529866d849e3
diff --git a/metadata/md5-cache/app-vim/gitgutter-20180815 b/metadata/md5-cache/app-vim/gitgutter-20180815
index c005c9918d38..ee40c6f475a4 100644
--- a/metadata/md5-cache/app-vim/gitgutter-20180815
+++ b/metadata/md5-cache/app-vim/gitgutter-20180815
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
 EAPI=6
 HOMEPAGE=https://github.com/airblade/vim-gitgutter/
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/airblade/vim-gitgutter/archive/50a7062909d91a290fae04219887b1b45f3138db.tar.gz -> gitgutter-20180815.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fbf5d90f8b74664705b8e5354d8c8565
diff --git a/metadata/md5-cache/app-vim/gitgutter-99999999 b/metadata/md5-cache/app-vim/gitgutter-99999999
index 52af0194d186..3e4da22bcf1b 100644
--- a/metadata/md5-cache/app-vim/gitgutter-99999999
+++ b/metadata/md5-cache/app-vim/gitgutter-99999999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: shows a git diff in the sign column and stages/reverts hunks
 EAPI=6
 HOMEPAGE=https://github.com/airblade/vim-gitgutter/
+INHERIT=vim-plugin git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=47e61422683e4ab568f8314454f44b0e
diff --git a/metadata/md5-cache/app-vim/gitlog-5.1.0 b/metadata/md5-cache/app-vim/gitlog-5.1.0
index b3134e39d6d7..c5011afda80f 100644
--- a/metadata/md5-cache/app-vim/gitlog-5.1.0
+++ b/metadata/md5-cache/app-vim/gitlog-5.1.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_5.1.0.tar.gz -> gitlog-5.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=cc3771a210a332a3a19f4fad35e9c445
diff --git a/metadata/md5-cache/app-vim/gitlog-6.0.0 b/metadata/md5-cache/app-vim/gitlog-6.0.0
index 3c66212ed98f..14a40b1144c1 100644
--- a/metadata/md5-cache/app-vim/gitlog-6.0.0
+++ b/metadata/md5-cache/app-vim/gitlog-6.0.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/PAntoine/vimgitlog/archive/version_6.0.0.tar.gz -> gitlog-6.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitlog-9999 b/metadata/md5-cache/app-vim/gitlog-9999
index 42b5a8096ab9..6fb8978d6cd7 100644
--- a/metadata/md5-cache/app-vim/gitlog-9999
+++ b/metadata/md5-cache/app-vim/gitlog-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: git log and diff plugin for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4294 https://github.com/PAntoine/vimgitlog/
+INHERIT=vim-plugin git-r3
 LICENSE=Artistic
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ffaf3e979e660774215ed926ffcb7a4f
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20111225 b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
index eac75095d122..ca8eebc39f4d 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20111225
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20111225
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: gitolite syntax highlighting
 EAPI=7
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=2900
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~arm x86
 LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gitolite-syntax-20111225.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=4770a61cd80cc1f941127243924ef64a
diff --git a/metadata/md5-cache/app-vim/gitolite-syntax-20130306 b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
index b9cd54b02684..b78c2e3bec03 100644
--- a/metadata/md5-cache/app-vim/gitolite-syntax-20130306
+++ b/metadata/md5-cache/app-vim/gitolite-syntax-20130306
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: gitolite syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/tmatilai/gitolite.vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=Apache-2.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmatilai/gitolite.vim/archive/990634e95f209ffca96970da1c117c0f67697d89.tar.gz -> gitolite-syntax-20130306.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6da0a06b02aa2cc50d66d3750344e947
diff --git a/metadata/md5-cache/app-vim/gitv-1.3.1 b/metadata/md5-cache/app-vim/gitv-1.3.1
index ca634492bafc..2a82222f17b0 100644
--- a/metadata/md5-cache/app-vim/gitv-1.3.1
+++ b/metadata/md5-cache/app-vim/gitv-1.3.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: gitk for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~ppc-macos
 LICENSE=vim
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gregsexton/gitv/archive/v1.3.1.tar.gz -> gitv-1.3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6b03f0c64a92b5da626a68e7747bc26c
diff --git a/metadata/md5-cache/app-vim/gitv-9999 b/metadata/md5-cache/app-vim/gitv-9999
index d66fe1597a37..d9fb2fe77f1a 100644
--- a/metadata/md5-cache/app-vim/gitv-9999
+++ b/metadata/md5-cache/app-vim/gitv-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: gitk for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3574 https://github.com/gregsexton/gitv/
+INHERIT=vim-plugin git-r3
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=b52cd7c6207c5e1990dfea4b48677507
diff --git a/metadata/md5-cache/app-vim/gnupg-2.6 b/metadata/md5-cache/app-vim/gnupg-2.6
index ecdc6060fecb..098785ba68b8 100644
--- a/metadata/md5-cache/app-vim/gnupg-2.6
+++ b/metadata/md5-cache/app-vim/gnupg-2.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=transparent editing of gpg encrypted files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gnupg-2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gnupg-2.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fc9929901bdc803cfdb788e382dfa053
diff --git a/metadata/md5-cache/app-vim/gnupg-2.7.1 b/metadata/md5-cache/app-vim/gnupg-2.7.1
index 410760455446..a363a663255a 100644
--- a/metadata/md5-cache/app-vim/gnupg-2.7.1
+++ b/metadata/md5-cache/app-vim/gnupg-2.7.1
@@ -4,10 +4,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=transparent editing of gpg encrypted files
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3645
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
 RDEPEND=app-crypt/gnupg || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=27359 -> gnupg-2.7.1.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0cf7342fc9c13782e3d651d15e87641c
diff --git a/metadata/md5-cache/app-vim/greputils-2.8-r1 b/metadata/md5-cache/app-vim/greputils-2.8-r1
index 21265bace241..da20d15134a5 100644
--- a/metadata/md5-cache/app-vim/greputils-2.8-r1
+++ b/metadata/md5-cache/app-vim/greputils-2.8-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface with grep, find and id-utils
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1062
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.18 >=app-vim/multvals-3.6.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/greputils-2.8.tar.bz2 https://dev.gentoo.org/~radhermit/vim/greputils-2.8.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c04b1fe875f948a7564a84c84a3b0603
diff --git a/metadata/md5-cache/app-vim/gtk-syntax-20130716 b/metadata/md5-cache/app-vim/gtk-syntax-20130716
index b1222e71442d..957ff1993f22 100644
--- a/metadata/md5-cache/app-vim/gtk-syntax-20130716
+++ b/metadata/md5-cache/app-vim/gtk-syntax-20130716
@@ -9,5 +9,5 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/gtk-syntax-20130716.tar.bz2 https://dev.gentoo.org/~radhermit/vim/gtk-syntax-20130716.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6bd34daa24150d61af95fb97b578d3c0
diff --git a/metadata/md5-cache/app-vim/gundo-2.6.2-r3 b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
index dfac2df8272f..b6c938b028b7 100644
--- a/metadata/md5-cache/app-vim/gundo-2.6.2-r3
+++ b/metadata/md5-cache/app-vim/gundo-2.6.2-r3
@@ -11,5 +11,5 @@ RDEPEND=|| ( app-editors/vim[python,python_single_target_python3_8(-)?,python_si
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sjl/gundo.vim/archive/v2.6.2.tar.bz2 -> gundo-2.6.2.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0815e6fa3b341cdcf9320063ab1777bc
diff --git a/metadata/md5-cache/app-vim/haskellmode-20101118-r1 b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
index e6d935753c37..6e81da2e83e7 100644
--- a/metadata/md5-cache/app-vim/haskellmode-20101118-r1
+++ b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
 DESCRIPTION=vim plugin: Provides IDE-like features for Haskell development
 EAPI=6
 HOMEPAGE=http://projects.haskell.org/haskellmode-vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=dev-lang/ghc[doc] net-misc/wget || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
 SLOT=0
 SRC_URI=http://code.haskell.org/~wwolff/haskellmode/haskellmode-20101118.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f63d0cec323bc2d2a4afaeb5e2065a25
diff --git a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2 b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
index 278c52a213c6..4247a14a9b81 100644
--- a/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
+++ b/metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: extra syntax highlighting for help files
 EAPI=7
 HOMEPAGE=http://www.drchip.org/astronaut/vim/
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/help-extra-syntax-20050106.tar.bz2 https://dev.gentoo.org/~radhermit/vim/help-extra-syntax-20050106.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7ba0e197d29c3af08b62e12746bbd082
diff --git a/metadata/md5-cache/app-vim/increment-1.1-r1 b/metadata/md5-cache/app-vim/increment-1.1-r1
index f0cfb3375fe1..d473937a301a 100644
--- a/metadata/md5-cache/app-vim/increment-1.1-r1
+++ b/metadata/md5-cache/app-vim/increment-1.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily create sequences of incremented values
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=842
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/increment-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/increment-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0c5b4fedc8148ff16713be5fd7e2c4d5
diff --git a/metadata/md5-cache/app-vim/indentpython-0.3 b/metadata/md5-cache/app-vim/indentpython-0.3
index 56039188f521..0ce4d95a7dbb 100644
--- a/metadata/md5-cache/app-vim/indentpython-0.3
+++ b/metadata/md5-cache/app-vim/indentpython-0.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Indent Python code according to PEP8
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=974
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/indentpython.vim/archive/0.3.tar.gz -> indentpython-0.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8d4b57d31ef50b13aecdabd2a3541a5e
diff --git a/metadata/md5-cache/app-vim/info-1.7-r2 b/metadata/md5-cache/app-vim/info-1.7-r2
index 126c917315d4..471f729b56ab 100644
--- a/metadata/md5-cache/app-vim/info-1.7-r2
+++ b/metadata/md5-cache/app-vim/info-1.7-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: GNU info documentation browser
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=21
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/info-1.7.tar.bz2 https://dev.gentoo.org/~radhermit/vim/info-1.7.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=78a8d1e9734df55c95480d176e991b77
diff --git a/metadata/md5-cache/app-vim/iris-1.0.0 b/metadata/md5-cache/app-vim/iris-1.0.0
index 526e64602b3e..1a8f77fa5879 100644
--- a/metadata/md5-cache/app-vim/iris-1.0.0
+++ b/metadata/md5-cache/app-vim/iris-1.0.0
@@ -11,5 +11,5 @@ RDEPEND=dev-python/imapclient python_targets_python3_8? ( >=dev-lang/python-3.8.
 REQUIRED_USE=|| ( python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/soywod/iris.vim/archive/v1.0.0.tar.gz -> iris-1.0.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=dbd7ffc40e25fce1a71b7c97002e45fd
diff --git a/metadata/md5-cache/app-vim/jedi-0.10.0 b/metadata/md5-cache/app-vim/jedi-0.10.0
index 06954f3394eb..fb7f48b856fe 100644
--- a/metadata/md5-cache/app-vim/jedi-0.10.0
+++ b/metadata/md5-cache/app-vim/jedi-0.10.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi-vim/archive/0.10.0.tar.gz -> jedi-0.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=dcdd0eada1dfe3062b313fb13c24cdfb
diff --git a/metadata/md5-cache/app-vim/json-20150511 b/metadata/md5-cache/app-vim/json-20150511
index df6ce8be4f99..b701143c4733 100644
--- a/metadata/md5-cache/app-vim/json-20150511
+++ b/metadata/md5-cache/app-vim/json-20150511
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a better JSON for Vim
 EAPI=7
 HOMEPAGE=https://github.com/elzr/vim-json/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/json-20150511.tar.bz2 https://dev.gentoo.org/~radhermit/vim/json-20150511.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=9279712c42c56cf8e93950b3e9cd10a7
diff --git a/metadata/md5-cache/app-vim/l9-1.1 b/metadata/md5-cache/app-vim/l9-1.1
index 509178799965..47483bdc0c5a 100644
--- a/metadata/md5-cache/app-vim/l9-1.1
+++ b/metadata/md5-cache/app-vim/l9-1.1
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for vim scripts
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3252
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13948 -> l9-1.1.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f670b18e574694f779b60f2bd58a8232
diff --git a/metadata/md5-cache/app-vim/languagetool-1.30 b/metadata/md5-cache/app-vim/languagetool-1.30
index bafd05aa6068..534a3e262f9d 100644
--- a/metadata/md5-cache/app-vim/languagetool-1.30
+++ b/metadata/md5-cache/app-vim/languagetool-1.30
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=grammar checker for various languages
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3223
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=app-text/languagetool || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/languagetool-1.30.tar.bz2 https://dev.gentoo.org/~radhermit/vim/languagetool-1.30.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=82360cb097280db05c9c4918babba7f5
diff --git a/metadata/md5-cache/app-vim/lightline-9999 b/metadata/md5-cache/app-vim/lightline-9999
index 9d82ce8b18ee..fa67f351fcc5 100644
--- a/metadata/md5-cache/app-vim/lightline-9999
+++ b/metadata/md5-cache/app-vim/lightline-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: A light and configurable statusline/tabline
 EAPI=6
 HOMEPAGE=https://github.com/itchyny/lightline.vim/
+INHERIT=vim-plugin git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=48459901ef0cf6d075c1aa31ef2d3a5f
diff --git a/metadata/md5-cache/app-vim/locateopen-1.3-r1 b/metadata/md5-cache/app-vim/locateopen-1.3-r1
index 4474dbc35b44..8a040e34c1c6 100644
--- a/metadata/md5-cache/app-vim/locateopen-1.3-r1
+++ b/metadata/md5-cache/app-vim/locateopen-1.3-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: open a file without supplying a path
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=858
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=sys-apps/mlocate || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/locateopen-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/locateopen-1.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3873545121ea00d3dc1676580df1ddab
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1 b/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
index bb4307a70076..8026db2e5966 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
+++ b/metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
 EAPI=6
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/lustyexplorer-4.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/lustyexplorer-4.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=07f9a6f76dfb828f91bcff1ff23fb21a
diff --git a/metadata/md5-cache/app-vim/lustyexplorer-5.0 b/metadata/md5-cache/app-vim/lustyexplorer-5.0
index d59b8b2c3cc8..7553c483d8ca 100644
--- a/metadata/md5-cache/app-vim/lustyexplorer-5.0
+++ b/metadata/md5-cache/app-vim/lustyexplorer-5.0
@@ -4,10 +4,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: dynamic filesystem and buffer explorer
 EAPI=7
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=1890
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=bufexplorer.vim
 RDEPEND=|| ( app-editors/vim[ruby] app-editors/gvim[ruby] ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=26146 -> lusty-explorer-5.0.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d900bc96010ca78e951d6812dd425977
diff --git a/metadata/md5-cache/app-vim/matrix-1.10-r1 b/metadata/md5-cache/app-vim/matrix-1.10-r1
index f2a6f72ea290..7d4412c6f130 100644
--- a/metadata/md5-cache/app-vim/matrix-1.10-r1
+++ b/metadata/md5-cache/app-vim/matrix-1.10-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Screensaver inspired by the Matrix
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1189
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/matrix-1.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/matrix-1.10.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c09142ba42ab567619e86601beaceeea
diff --git a/metadata/md5-cache/app-vim/mediawiki-20151115 b/metadata/md5-cache/app-vim/mediawiki-20151115
index 72ebddf608bb..cc16c32db84f 100644
--- a/metadata/md5-cache/app-vim/mediawiki-20151115
+++ b/metadata/md5-cache/app-vim/mediawiki-20151115
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: MediaWiki syntax highlighting
 EAPI=7
 HOMEPAGE=https://github.com/chikamichi/mediawiki.vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~hppa ~mips ~ppc ~ppc64 ~x86
 LICENSE=public-domain
 RDEPEND=!app-vim/wikipedia-syntax || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/chikamichi/mediawiki.vim/archive/26e5737264354be41cb11d16d48132779795e168.tar.gz -> mediawiki-20151115.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c247067827f60fc6513e8454f76ca4f2
diff --git a/metadata/md5-cache/app-vim/merginal-2.1.0 b/metadata/md5-cache/app-vim/merginal-2.1.0
index b3288b83c4bd..2bfadb54ebe4 100644
--- a/metadata/md5-cache/app-vim/merginal-2.1.0
+++ b/metadata/md5-cache/app-vim/merginal-2.1.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim script: fugitive extension to manage and merge git branches
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.0.tar.gz -> merginal-2.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c7c8e93377f9d5242523f5846b13c43f
diff --git a/metadata/md5-cache/app-vim/merginal-2.1.2 b/metadata/md5-cache/app-vim/merginal-2.1.2
index b9e8883aff91..a44660efe4eb 100644
--- a/metadata/md5-cache/app-vim/merginal-2.1.2
+++ b/metadata/md5-cache/app-vim/merginal-2.1.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim script: fugitive extension to manage and merge git branches
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/idanarye/vim-merginal/archive/2.1.2.tar.gz -> merginal-2.1.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5f5b2478e6533fb5c9f177a6fab8595c
diff --git a/metadata/md5-cache/app-vim/merginal-9999 b/metadata/md5-cache/app-vim/merginal-9999
index de7c5d314859..f6eaa9496e24 100644
--- a/metadata/md5-cache/app-vim/merginal-9999
+++ b/metadata/md5-cache/app-vim/merginal-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim script: fugitive extension to manage and merge git branches
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4955 https://github.com/idanarye/vim-merginal/
+INHERIT=vim-plugin git-r3
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=app-vim/fugitive || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5f5b2478e6533fb5c9f177a6fab8595c
diff --git a/metadata/md5-cache/app-vim/minibufexpl-6.5.2 b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
index 8fd337deb276..88e6d20d2975 100644
--- a/metadata/md5-cache/app-vim/minibufexpl-6.5.2
+++ b/metadata/md5-cache/app-vim/minibufexpl-6.5.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easily switch between buffers
 EAPI=6
 HOMEPAGE=https://github.com/fholgado/minibufexpl.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc x86
 LICENSE=bufexplorer.vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/fholgado/minibufexpl.vim/archive/v6.5.2.tar.gz -> minibufexpl-6.5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f104917f34ae4a4066530a66cb0b8a45
diff --git a/metadata/md5-cache/app-vim/molokai-0.1_p20151115 b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
index 1e31b48ef89d..afec63249f91 100644
--- a/metadata/md5-cache/app-vim/molokai-0.1_p20151115
+++ b/metadata/md5-cache/app-vim/molokai-0.1_p20151115
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: molokai color scheme
 EAPI=6
 HOMEPAGE=https://github.com/tomasr/molokai
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomasr/molokai/archive/c67bdfcdb31415aa0ade7f8c003261700a885476.tar.gz -> molokai-0.1_p20151115.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=38b721b74bea69a106ca909a4071ed8a
diff --git a/metadata/md5-cache/app-vim/multiplesearch-1.3 b/metadata/md5-cache/app-vim/multiplesearch-1.3
index 21115dd7f29e..96a6f59d9556 100644
--- a/metadata/md5-cache/app-vim/multiplesearch-1.3
+++ b/metadata/md5-cache/app-vim/multiplesearch-1.3
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: allows multiple highlighted searches
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=479
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=9276 -> multiplesearch-1.3.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=443a99a1b028769eb8a228dd62b18bb0
diff --git a/metadata/md5-cache/app-vim/multvals-3.10-r1 b/metadata/md5-cache/app-vim/multvals-3.10-r1
index 9f360a4e6cfc..650419c6873b 100644
--- a/metadata/md5-cache/app-vim/multvals-3.10-r1
+++ b/metadata/md5-cache/app-vim/multvals-3.10-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: library for helping with arrays
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=171
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/multvals-3.10.tar.bz2 https://dev.gentoo.org/~radhermit/vim/multvals-3.10.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=b52535649c6859875b8b05d13a59b8ff
diff --git a/metadata/md5-cache/app-vim/nagios-syntax-1.8 b/metadata/md5-cache/app-vim/nagios-syntax-1.8
index 5b6303de439a..e4139cc9b6ad 100644
--- a/metadata/md5-cache/app-vim/nagios-syntax-1.8
+++ b/metadata/md5-cache/app-vim/nagios-syntax-1.8
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Nagios configuration files syntax
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2261
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/nagios-syntax-1.8.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a9886a79467448f352f82e44e5e90d84
diff --git a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1 b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
index c5a08cb7dcf8..8a7c0183f596 100644
--- a/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
+++ b/metadata/md5-cache/app-vim/neocomplcache-7.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ultimate auto completion system
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2620
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/neocomplcache-7.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/neocomplcache-7.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=08e43b17170724c736b18f29697dbf99
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-2.5.2 b/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
index 99fe0abe7e86..ba8d1d20f44c 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
+++ b/metadata/md5-cache/app-vim/nerdcommenter-2.5.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy commenting of code for many filetypes
 EAPI=7
 HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x86-linux ~sparc64-solaris
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdcommenter/archive/2.5.2.tar.gz -> nerdcommenter-2.5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6065a3ef26714b85df56d343c05aab61
diff --git a/metadata/md5-cache/app-vim/nerdcommenter-9999 b/metadata/md5-cache/app-vim/nerdcommenter-9999
index 39fb6a1796b3..378f52a8f9be 100644
--- a/metadata/md5-cache/app-vim/nerdcommenter-9999
+++ b/metadata/md5-cache/app-vim/nerdcommenter-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy commenting of code for many filetypes
 EAPI=7
 HOMEPAGE=https://github.com/scrooloose/nerdcommenter https://www.vim.org/scripts/script.php?script_id=1218
+INHERIT=vim-plugin git-r3
 LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fff6c5f34bf428c01725bb7cc5b24653
diff --git a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1 b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
index 8f579506d119..0f05e22d93c1 100644
--- a/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
+++ b/metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/5.0.0.tar.gz -> nerdtree-5.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a9f316d53ff944b35e66d1b4070bf50e
diff --git a/metadata/md5-cache/app-vim/nerdtree-6.4.1 b/metadata/md5-cache/app-vim/nerdtree-6.4.1
index 905875133df2..09f9b8d40a50 100644
--- a/metadata/md5-cache/app-vim/nerdtree-6.4.1
+++ b/metadata/md5-cache/app-vim/nerdtree-6.4.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/6.4.1.tar.gz -> nerdtree-6.4.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a9acd7afd7efbead48b45a47104dc54c
diff --git a/metadata/md5-cache/app-vim/nerdtree-6.4.3 b/metadata/md5-cache/app-vim/nerdtree-6.4.3
index 72be33972569..781442659664 100644
--- a/metadata/md5-cache/app-vim/nerdtree-6.4.3
+++ b/metadata/md5-cache/app-vim/nerdtree-6.4.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86 ~x64-macos
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/scrooloose/nerdtree/archive/6.4.3.tar.gz -> nerdtree-6.4.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=90c2233bf788c851b5279585067e7ed1
diff --git a/metadata/md5-cache/app-vim/nerdtree-9999 b/metadata/md5-cache/app-vim/nerdtree-9999
index cd39cdffa4b0..0d8fd07a4091 100644
--- a/metadata/md5-cache/app-vim/nerdtree-9999
+++ b/metadata/md5-cache/app-vim/nerdtree-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: A tree explorer plugin for navigating the filesystem
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1658 https://github.com/scrooloose/nerdtree
+INHERIT=vim-plugin git-r3
 LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=90c2233bf788c851b5279585067e7ed1
diff --git a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7 b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
index d477d8104e42..ec780334face 100644
--- a/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
+++ b/metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: NERDTree and tabs in vim
 EAPI=6
 HOMEPAGE=https://github.com/jistr/vim-nerdtree-tabs
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=app-vim/nerdtree || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jistr/vim-nerdtree-tabs/archive/v1.4.7.tar.gz -> nerdtree-tabs-1.4.7.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=60df7f1cf3ae77a12a4478fae2b1ed3e
diff --git a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3 b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
index 641dcd40ec40..0dcd2aaaaab8 100644
--- a/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+++ b/metadata/md5-cache/app-vim/nginx-syntax-0.3.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Nginx configuration files syntax
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1886
+INHERIT=vim-plugin
 KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/nginx-syntax-0.3.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/nginx-syntax-0.3.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e3b4dd0d7570c50b989ed6d411af5bd7
diff --git a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1 b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
index 51d53c021a39..186d227676d9 100644
--- a/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
+++ b/metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ntp.conf syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=778
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ntp-syntax-20031001.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ntp-syntax-20031001.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bf86945965c35bc6d3537b66cb546612
diff --git a/metadata/md5-cache/app-vim/omnicppcomplete-0.41 b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
index b25cb9d89a45..6a4f4cb10139 100644
--- a/metadata/md5-cache/app-vim/omnicppcomplete-0.41
+++ b/metadata/md5-cache/app-vim/omnicppcomplete-0.41
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 DESCRIPTION=vim plugin: C/C++ omni-completion with ctags database
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1520
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=>=dev-util/ctags-5.7 || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=7722 -> omnicppcomplete-0.41.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=eb5325b68a5ae8037270e79ee4959cbe
diff --git a/metadata/md5-cache/app-vim/pathogen-2.4-r1 b/metadata/md5-cache/app-vim/pathogen-2.4-r1
index f784f076174f..41c901df2206 100644
--- a/metadata/md5-cache/app-vim/pathogen-2.4-r1
+++ b/metadata/md5-cache/app-vim/pathogen-2.4-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: manage your runtimepath
 EAPI=6
 HOMEPAGE=https://github.com/tpope/vim-pathogen/ https://www.vim.org/scripts/script.php?script_id=2332
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-pathogen/archive/v2.4.tar.gz -> pathogen-2.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=02b724c9e1726172fb082e0191d88731
diff --git a/metadata/md5-cache/app-vim/pdv-1.0.1-r1 b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
index 31b04c0f2d6c..4eaf80f28c79 100644
--- a/metadata/md5-cache/app-vim/pdv-1.0.1-r1
+++ b/metadata/md5-cache/app-vim/pdv-1.0.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: PDV (phpDocumentor for Vim)
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1355
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pdv-1.0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pdv-1.0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5d086a19c606a2d289b8537965f3344f
diff --git a/metadata/md5-cache/app-vim/perl-support-5.3.2 b/metadata/md5-cache/app-vim/perl-support-5.3.2
index 4a5de56a27a5..e3467d72ddbf 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.3.2
+++ b/metadata/md5-cache/app-vim/perl-support-5.3.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
 RDEPEND=dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/perl-support-5.3.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/perl-support-5.3.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c8566da4b7bfe69c15e96f3105dffce8
diff --git a/metadata/md5-cache/app-vim/perl-support-5.4 b/metadata/md5-cache/app-vim/perl-support-5.4
index 25acf28ac422..c32e3adca170 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.4
+++ b/metadata/md5-cache/app-vim/perl-support-5.4
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 GPL-2+
 RDEPEND=!ppc? ( dev-perl/Devel-NYTProf ) dev-perl/Perl-Tidy dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/WolfgangMehner/perl-support/archive/version-5.4.tar.gz -> perl-support-5.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3f8d1f9d99d3d35842c8ed20171fbbf4
diff --git a/metadata/md5-cache/app-vim/perlomni-2.5 b/metadata/md5-cache/app-vim/perlomni-2.5
index f58775c0c696..16ca1068f149 100644
--- a/metadata/md5-cache/app-vim/perlomni-2.5
+++ b/metadata/md5-cache/app-vim/perlomni-2.5
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvi
 DESCRIPTION=vim plugin: a vim plugin with Perl omni completion functions
 EAPI=6
 HOMEPAGE=https://github.com/c9s/perlomni.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=vim.org
 RDEPEND=app-arch/unzip dev-lang/perl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/c9s/perlomni.vim/archive/v2.5.tar.gz -> perlomni-2.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f4f7e9c9958e5fbd2f1aa468e2ce6d33
diff --git a/metadata/md5-cache/app-vim/pfsyntax-1.3 b/metadata/md5-cache/app-vim/pfsyntax-1.3
index c608379b57d8..04667d5e634d 100644
--- a/metadata/md5-cache/app-vim/pfsyntax-1.3
+++ b/metadata/md5-cache/app-vim/pfsyntax-1.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: pf syntax highlighting for vim
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/pf.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/pf.vim/archive/1.3.tar.gz -> pfsyntax-1.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=659d0b2d67bc004a2dd1cf0ad75980d1
diff --git a/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1 b/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
index 4eee242dcb11..ce0597f1a66c 100644
--- a/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
+++ b/metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: PGN (chess Portable Game Notation) syntax highlighting
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=677
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pgn-syntax-1.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pgn-syntax-1.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=5e06fbf2f07f41e66122edfca69b74c2
diff --git a/metadata/md5-cache/app-vim/phpdocs-0.26-r1 b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
index 808a71de6e6b..9ce6d6d8ed05 100644
--- a/metadata/md5-cache/app-vim/phpdocs-0.26-r1
+++ b/metadata/md5-cache/app-vim/phpdocs-0.26-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: PHPDoc Support in VIM
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=520
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/phpdocs-0.26.tar.bz2 https://dev.gentoo.org/~radhermit/vim/phpdocs-0.26.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=66c59936f96f504127ab770c69f214ff
diff --git a/metadata/md5-cache/app-vim/project-1.4.1 b/metadata/md5-cache/app-vim/project-1.4.1
index 7cf91872df7e..3d869659befb 100644
--- a/metadata/md5-cache/app-vim/project-1.4.1
+++ b/metadata/md5-cache/app-vim/project-1.4.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Managing multiple projects with multiple sources like an IDE
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=69
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=6273 -> project-1.4.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d5d2539082db30998603e56a4ac9e890
diff --git a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1 b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
index 41a415c3497f..2310466e40c1 100644
--- a/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
+++ b/metadata/md5-cache/app-vim/puppet-syntax-3.0.1
@@ -3,10 +3,11 @@ DEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.
 DESCRIPTION=vim plugin: Puppet configuration files syntax
 EAPI=7
 HOMEPAGE=http://puppetlabs.com/
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ~ppc64 sparc x86 ~amd64-linux ~x64-macos ~x64-solaris
 LICENSE=Apache-2.0 GPL-2
 RDEPEND=!<app-admin/puppet-3.0.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~tampakrap/tarballs/puppet-syntax-3.0.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=dd1d474268bbcfb24163a49e84465924
diff --git a/metadata/md5-cache/app-vim/pushpop-4.0-r1 b/metadata/md5-cache/app-vim/pushpop-4.0-r1
index b27d65a36548..bf982f4dda55 100644
--- a/metadata/md5-cache/app-vim/pushpop-4.0-r1
+++ b/metadata/md5-cache/app-vim/pushpop-4.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: pushd / popd from the vim commandline
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=129
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-vim/genutils-1.1 >=app-vim/cmdalias-1.0 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/pushpop-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/pushpop-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ad81a5d2b0f10616dc6a1add65530167
diff --git a/metadata/md5-cache/app-vim/pyclewn-2.1-r2 b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
index 641c0063bbd6..07ebaf2db7e3 100644
--- a/metadata/md5-cache/app-vim/pyclewn-2.1-r2
+++ b/metadata/md5-cache/app-vim/pyclewn-2.1-r2
@@ -12,5 +12,5 @@ RDEPEND=|| ( app-editors/vim app-editors/gvim[netbeans] ) app-arch/vimball || (
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyclewn/pyclewn-2.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=cdbd4ab10c2b8efaebe34e3f1809d459
diff --git a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2 b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
index 90cdbd8c1f97..4f287fd7083f 100644
--- a/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+++ b/metadata/md5-cache/app-vim/pydiction-1.2.3-r2
@@ -11,5 +11,5 @@ RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/pydiction-1.2.3.zip
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e0c0cac61d783747f4e46670a7c5a74d
diff --git a/metadata/md5-cache/app-vim/pydoc-2.0-r1 b/metadata/md5-cache/app-vim/pydoc-2.0-r1
index 7973760a88bf..d8c23c880dc6 100644
--- a/metadata/md5-cache/app-vim/pydoc-2.0-r1
+++ b/metadata/md5-cache/app-vim/pydoc-2.0-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/fs111/pydoc.vim/tarball/2.0 -> pydoc-2.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=12c656089e068200f50d2fcb89eb51fd
diff --git a/metadata/md5-cache/app-vim/pytest-1.1.4 b/metadata/md5-cache/app-vim/pytest-1.1.4
index 7484000e0630..eae8be043ede 100644
--- a/metadata/md5-cache/app-vim/pytest-1.1.4
+++ b/metadata/md5-cache/app-vim/pytest-1.1.4
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: run tests with py.test from within vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3424
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytest || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=18178 -> pytest-1.1.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d03a3b652c5d1e2354aa2ed9a31837b0
diff --git a/metadata/md5-cache/app-vim/rails-5.2 b/metadata/md5-cache/app-vim/rails-5.2
index 2d778b6d9448..330cecb5b75f 100644
--- a/metadata/md5-cache/app-vim/rails-5.2
+++ b/metadata/md5-cache/app-vim/rails-5.2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: aids developing Ruby on Rails applications
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1567 https://github.com/tpope/vim-rails/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-rails/archive/v5.2.tar.gz -> rails-5.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3ac7b63ea0177b7965417e0d896b6063
diff --git a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0 b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
index c7d2b0b18ff7..234e05dcc03a 100644
--- a/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
+++ b/metadata/md5-cache/app-vim/rainbow_parentheses-1.0
@@ -3,10 +3,11 @@ DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Colour parentheses to differentiate nest levels
 EAPI=6
 HOMEPAGE=https://github.com/kien/rainbow_parentheses.vim
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=vim
 RDEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/rainbow_parentheses-1.0.zip
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7900297d4d84fe24a81a8e2beb35530f
diff --git a/metadata/md5-cache/app-vim/recover-0.18 b/metadata/md5-cache/app-vim/recover-0.18
index 7320e2d2ca06..1f0a9b968469 100644
--- a/metadata/md5-cache/app-vim/recover-0.18
+++ b/metadata/md5-cache/app-vim/recover-0.18
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: show differences for recovered files
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3068 https://github.com/chrisbra/Recover.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/recover-0.18.tar.bz2 https://dev.gentoo.org/~radhermit/vim/recover-0.18.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bae55b532176a0a413a66603099aa4bc
diff --git a/metadata/md5-cache/app-vim/reload-0.6.17-r1 b/metadata/md5-cache/app-vim/reload-0.6.17-r1
index 1c25f4f3ed2c..e1fdb5793edb 100644
--- a/metadata/md5-cache/app-vim/reload-0.6.17-r1
+++ b/metadata/md5-cache/app-vim/reload-0.6.17-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: automatic reloading of vim scripts
 EAPI=6
 HOMEPAGE=http://peterodding.com/code/vim/reload/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.8.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-reload/archive/0.6.17.tar.gz -> reload-0.6.17.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=543e2def2809676a2ebe1f0212faa4c7
diff --git a/metadata/md5-cache/app-vim/repeat-1.1 b/metadata/md5-cache/app-vim/repeat-1.1
index 71527da7c805..213a9cf51938 100644
--- a/metadata/md5-cache/app-vim/repeat-1.1
+++ b/metadata/md5-cache/app-vim/repeat-1.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: use the repeat command "." with plugin maps
 EAPI=7
 HOMEPAGE=https://github.com/tpope/vim-repeat/ https://www.vim.org/scripts/script.php?script_id=2136
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-repeat/archive/v1.1.tar.gz -> repeat-1.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=912d256ad60a12a72f72d0678191bb38
diff --git a/metadata/md5-cache/app-vim/ri-browser-1.2-r1 b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
index 8ac8002092e8..59684852f34e 100644
--- a/metadata/md5-cache/app-vim/ri-browser-1.2-r1
+++ b/metadata/md5-cache/app-vim/ri-browser-1.2-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface for browsing ri/ruby documentation
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=494
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~ppc ~sparc ~x86
 LICENSE=public-domain
 RDEPEND=dev-lang/ruby || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/ri-browser-1.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ri-browser-1.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ec77108fa505ec00e6811dd0ba23d9cb
diff --git a/metadata/md5-cache/app-vim/rust-vim-1_pre20210215 b/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
index f05b3d845600..41088ad1b6b4 100644
--- a/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
+++ b/metadata/md5-cache/app-vim/rust-vim-1_pre20210215
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Vim configuration for Rust
 EAPI=7
 HOMEPAGE=https://www.rust-lang.org https://github.com/rust-lang/rust.vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( MIT Apache-2.0 )
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust.vim/archive/87c745d8d506fc1eecc1d81df15d5bde1658a2fc.tar.gz -> rust-vim-1_pre20210215.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a0d95160f77156632197ef60296a3dc6
diff --git a/metadata/md5-cache/app-vim/salt-vim-20151119 b/metadata/md5-cache/app-vim/salt-vim-20151119
index 78498b4be3f3..439ae9f39313 100644
--- a/metadata/md5-cache/app-vim/salt-vim-20151119
+++ b/metadata/md5-cache/app-vim/salt-vim-20151119
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Vim files for working on Salt files
 EAPI=7
 HOMEPAGE=https://github.com/saltstack/salt-vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=!<=app-admin/salt-2015.5.6 !~app-admin/salt-2015.8.0 !~app-admin/salt-2015.8.1 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/saltstack/salt-vim/archive/5b15d379fbcbb84f82c6a345abc08cea9d374be9.tar.gz -> salt-vim-20151119.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7d0b291533c4db017d22ec952288966b
diff --git a/metadata/md5-cache/app-vim/scala-syntax-1.0-r1 b/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
index a8d2bacef888..67b1a86bf69b 100644
--- a/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
+++ b/metadata/md5-cache/app-vim/scala-syntax-1.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Scala syntax highlighting, filetype and indent settings
 EAPI=6
 HOMEPAGE=https://www.scala-lang.org/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/scala-syntax-1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6940232e46fec0a04e6500997ca6a179
diff --git a/metadata/md5-cache/app-vim/screen-1.5 b/metadata/md5-cache/app-vim/screen-1.5
index ddbb0edf27d8..af5320c98fdc 100644
--- a/metadata/md5-cache/app-vim/screen-1.5
+++ b/metadata/md5-cache/app-vim/screen-1.5
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: simulate a split shell with screen or tmux
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2711
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=public-domain
 RDEPEND=|| ( app-misc/screen app-misc/tmux ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/Screen-vim---gnu-screentmux/tarball/1.5 -> screen-1.5.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=b764e87b00ef1f0fbd72aebcae0b2997
diff --git a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1 b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
index 5ab2bef93975..59bf3f07309f 100644
--- a/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+++ b/metadata/md5-cache/app-vim/searchcomplete-1.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: tab completion in searches
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=474
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/searchcomplete-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/searchcomplete-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6aebc1d9c851460ca8e59d421febc458
diff --git a/metadata/md5-cache/app-vim/securemodelines-20140926 b/metadata/md5-cache/app-vim/securemodelines-20140926
index b9f7a55fc5d8..240ecb1018c1 100644
--- a/metadata/md5-cache/app-vim/securemodelines-20140926
+++ b/metadata/md5-cache/app-vim/securemodelines-20140926
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: secure, user-configurable modeline support
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1876 https://github.com/ciaranm/securemodelines
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/securemodelines-20140926.tar.bz2 https://dev.gentoo.org/~radhermit/vim/securemodelines-20140926.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e4a685bce75121b58e5f124dce9eeef5
diff --git a/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1 b/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
index 9311748a771f..ea094b499af3 100644
--- a/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
+++ b/metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: SELinux type enforcement policy syntax
 EAPI=7
 HOMEPAGE=http://www.cip.ifi.lmu.de/~bleher/selinux/
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/selinux-syntax-20041225.tar.bz2 https://dev.gentoo.org/~radhermit/vim/selinux-syntax-20041225.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3f548828d91fa47f6ba6a225de262c93
diff --git a/metadata/md5-cache/app-vim/session-2.13.1 b/metadata/md5-cache/app-vim/session-2.13.1
index 8dfd3c5773f5..97bc38bf3f38 100644
--- a/metadata/md5-cache/app-vim/session-2.13.1
+++ b/metadata/md5-cache/app-vim/session-2.13.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: extended session management for vim
 EAPI=6
 HOMEPAGE=http://peterodding.com/code/vim/session/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=app-vim/vim-misc-1.17.6 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-session/archive/2.13.1.tar.gz -> session-2.13.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=20204ba956894c7cd7387882c43ba628
diff --git a/metadata/md5-cache/app-vim/showmarks-2.2-r1 b/metadata/md5-cache/app-vim/showmarks-2.2-r1
index 18ae50205b50..f2d21c0d1d16 100644
--- a/metadata/md5-cache/app-vim/showmarks-2.2-r1
+++ b/metadata/md5-cache/app-vim/showmarks-2.2-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: show location marks visually
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=152
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/showmarks-2.2.tar.bz2 https://dev.gentoo.org/~radhermit/vim/showmarks-2.2.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fc62440b7a45f525c9914d78f455e4ec
diff --git a/metadata/md5-cache/app-vim/sleuth-1.1 b/metadata/md5-cache/app-vim/sleuth-1.1
index 66baa1ed9e8f..57dcd17f42f5 100644
--- a/metadata/md5-cache/app-vim/sleuth-1.1
+++ b/metadata/md5-cache/app-vim/sleuth-1.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: heuristically set buffer options
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4375 https://github.com/tpope/vim-sleuth
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sleuth-1.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sleuth-1.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=94e68688fa1d5a34fb95dc42821635e2
diff --git a/metadata/md5-cache/app-vim/snipmate-0.87-r1 b/metadata/md5-cache/app-vim/snipmate-0.87-r1
index 1a1e2dc6522d..0727470e80a6 100644
--- a/metadata/md5-cache/app-vim/snipmate-0.87-r1
+++ b/metadata/md5-cache/app-vim/snipmate-0.87-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: TextMate-style snippets
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2540 https://github.com/garbas/vim-snipmate
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=app-vim/vim-addon-mw-utils app-vim/tlib || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/garbas/vim-snipmate/archive/v0.87.tar.gz -> snipmate-0.87.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=74933c96aa1a0d47e4f2e9e0f623ab43
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r3 b/metadata/md5-cache/app-vim/splice-1.1.0-r3
index 2f3371d352f2..e1c78d4819dd 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r3
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) |
 REQUIRED_USE=^^ ( python_single_target_python3_8 )
 SLOT=0
 SRC_URI=https://bitbucket.org/sjl/splice.vim/get/v1.1.0.tar.gz -> splice-1.1.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f4e0fb96a321e45d9f4421a06cd17835
diff --git a/metadata/md5-cache/app-vim/splice-1.1.0-r4 b/metadata/md5-cache/app-vim/splice-1.1.0-r4
index ca1d66cad8a2..c8a731c99e0e 100644
--- a/metadata/md5-cache/app-vim/splice-1.1.0-r4
+++ b/metadata/md5-cache/app-vim/splice-1.1.0-r4
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/sjl/splice.vim/archive/v1.1.0.tar.gz -> splice-1.1.0-github.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=9409f6cb31309cbbd886f5c103ce9857
diff --git a/metadata/md5-cache/app-vim/sudoedit-0.21 b/metadata/md5-cache/app-vim/sudoedit-0.21
index fc4e308c851f..31bfcb5457e5 100644
--- a/metadata/md5-cache/app-vim/sudoedit-0.21
+++ b/metadata/md5-cache/app-vim/sudoedit-0.21
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: edit files using sudo or su
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2709 https://github.com/chrisbra/SudoEdit.vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( app-admin/sudo sys-apps/shadow ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/sudoedit-0.21.tar.bz2 https://dev.gentoo.org/~radhermit/vim/sudoedit-0.21.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3ffd6819d9880cf432233e945375ce39
diff --git a/metadata/md5-cache/app-vim/supertab-2.1 b/metadata/md5-cache/app-vim/supertab-2.1
index 0d062fbc04aa..a4c0bf3358d4 100644
--- a/metadata/md5-cache/app-vim/supertab-2.1
+++ b/metadata/md5-cache/app-vim/supertab-2.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: enhanced Tab key functionality
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1643 https://github.com/ervandew/supertab/
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~mips ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/ervandew/supertab/archive/2.1.tar.gz -> supertab-2.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c01da565336afdb92310a19d1c6c2ced
diff --git a/metadata/md5-cache/app-vim/surround-2.1-r1 b/metadata/md5-cache/app-vim/surround-2.1-r1
index 62b09bf812c2..66a54ce51cfa 100644
--- a/metadata/md5-cache/app-vim/surround-2.1-r1
+++ b/metadata/md5-cache/app-vim/surround-2.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Delete/change/add parentheses/quotes/XML-tags & much more
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1697
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/surround-2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/surround-2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=07d590b2853b178af4e87afc9fb72f9d
diff --git a/metadata/md5-cache/app-vim/syntastic-3.9.0 b/metadata/md5-cache/app-vim/syntastic-3.9.0
index c158d8183238..67c340d21f22 100644
--- a/metadata/md5-cache/app-vim/syntastic-3.9.0
+++ b/metadata/md5-cache/app-vim/syntastic-3.9.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax checking using external tools
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/vim-syntastic/syntastic/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=WTFPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-syntastic/syntastic/archive/3.9.0.tar.gz -> syntastic-3.9.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7b45fb38cc0b4436883dbef9096e3ab5
diff --git a/metadata/md5-cache/app-vim/syntastic-9999 b/metadata/md5-cache/app-vim/syntastic-9999
index 472a2222e062..23a365e5204d 100644
--- a/metadata/md5-cache/app-vim/syntastic-9999
+++ b/metadata/md5-cache/app-vim/syntastic-9999
@@ -4,9 +4,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax checking using external tools
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2736 https://github.com/vim-syntastic/syntastic/
+INHERIT=vim-plugin git-r3
 LICENSE=WTFPL-2
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=02d39f62eb0b4be46eb96de15419a21a
diff --git a/metadata/md5-cache/app-vim/tagbar-2.7 b/metadata/md5-cache/app-vim/tagbar-2.7
index 6d3345bfb388..347e13b57ab3 100644
--- a/metadata/md5-cache/app-vim/tagbar-2.7
+++ b/metadata/md5-cache/app-vim/tagbar-2.7
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display tags of the current file ordered by scope
 EAPI=6
 HOMEPAGE=https://majutsushi.github.com/tagbar/ https://www.vim.org/scripts/script.php?script_id=3465
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=>=dev-util/ctags-5.5 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/majutsushi/tagbar/archive/v2.7.tar.gz -> tagbar-2.7.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ad1f3c7b4f23601770d87b163fdd851a
diff --git a/metadata/md5-cache/app-vim/taglist-4.6 b/metadata/md5-cache/app-vim/taglist-4.6
index 20a068e71fb9..1decd17281fb 100644
--- a/metadata/md5-cache/app-vim/taglist-4.6
+++ b/metadata/md5-cache/app-vim/taglist-4.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ctags-based source code browser
 EAPI=7
 HOMEPAGE=http://vim-taglist.sourceforge.net/
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=vim
 RDEPEND=dev-util/ctags || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/taglist-4.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/taglist-4.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=47a939a1eae3787d45b1d1d28423a854
diff --git a/metadata/md5-cache/app-vim/tasklist-1.0.1 b/metadata/md5-cache/app-vim/tasklist-1.0.1
index d2043c7c0215..e9b522260e44 100644
--- a/metadata/md5-cache/app-vim/tasklist-1.0.1
+++ b/metadata/md5-cache/app-vim/tasklist-1.0.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Highlight FIXME/TODO/CUSTOM keywords in a separate list
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2607
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/tasklist.vim/tarball/1.0.1 -> tasklist-1.0.1.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0857fb2ffcf1cd49f312a79140b6a490
diff --git a/metadata/md5-cache/app-vim/tcomment-3.08.1 b/metadata/md5-cache/app-vim/tcomment-3.08.1
index 56ab00680cfb..810d4fbf617f 100644
--- a/metadata/md5-cache/app-vim/tcomment-3.08.1
+++ b/metadata/md5-cache/app-vim/tcomment-3.08.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: an extensible and universal comment toggler
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tcomment_vim/archive/3.08.1.tar.gz -> tcomment-3.08.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ce167b7ff7a6e8d81217647f9ac4e0f1
diff --git a/metadata/md5-cache/app-vim/tcomment-9999 b/metadata/md5-cache/app-vim/tcomment-9999
index 2249d2f21a02..346b7fae35b2 100644
--- a/metadata/md5-cache/app-vim/tcomment-9999
+++ b/metadata/md5-cache/app-vim/tcomment-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: an extensible and universal comment toggler
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1173 https://github.com/tomtom/tcomment_vim
+INHERIT=vim-plugin git-r3
 LICENSE=GPL-3
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=67a9d0e025cefdd6fd8646ed1b9f6847
diff --git a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1 b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
index cc85619807f2..2e8247e942cf 100644
--- a/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
+++ b/metadata/md5-cache/app-vim/thlnk-1.2.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: linking in plaintext
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=293
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/thlnk-1.2.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/thlnk-1.2.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bab54303ed2e8c2ed8014f70416fd91f
diff --git a/metadata/md5-cache/app-vim/tlib-1.22 b/metadata/md5-cache/app-vim/tlib-1.22
index a52c4482c5fe..5207221d0941 100644
--- a/metadata/md5-cache/app-vim/tlib-1.22
+++ b/metadata/md5-cache/app-vim/tlib-1.22
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a library of utility functions
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.22.tar.gz -> tlib-1.22.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=df8d9cb0b1beff63c2ffd90ee9e9af35
diff --git a/metadata/md5-cache/app-vim/tlib-1.23 b/metadata/md5-cache/app-vim/tlib-1.23
index 1e24f51911d4..162188dc72d9 100644
--- a/metadata/md5-cache/app-vim/tlib-1.23
+++ b/metadata/md5-cache/app-vim/tlib-1.23
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a library of utility functions
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.23.tar.gz -> tlib-1.23.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ccd42aea14a8f90bf3d6af65da272389
diff --git a/metadata/md5-cache/app-vim/tlib-1.27 b/metadata/md5-cache/app-vim/tlib-1.27
index 84ec914d5246..b6e5e5bef0ae 100644
--- a/metadata/md5-cache/app-vim/tlib-1.27
+++ b/metadata/md5-cache/app-vim/tlib-1.27
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a library of utility functions
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1863 https://github.com/tomtom/tlib_vim
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tomtom/tlib_vim/archive/1.27.tar.gz -> tlib-1.27.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f902e9345e1e5bf618720dffd3b4018c
diff --git a/metadata/md5-cache/app-vim/tmpl-0.1-r1 b/metadata/md5-cache/app-vim/tmpl-0.1-r1
index 0b7e4e13ef5d..add00bbb77ea 100644
--- a/metadata/md5-cache/app-vim/tmpl-0.1-r1
+++ b/metadata/md5-cache/app-vim/tmpl-0.1-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Syntax for Sam Tregar's HTML::Template
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=254
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tmpl-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tmpl-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ebbdbaa2f2db3f568db8b9b5fffaba52
diff --git a/metadata/md5-cache/app-vim/toggle-0.5-r1 b/metadata/md5-cache/app-vim/toggle-0.5-r1
index f5698cc4ea8b..6b900bd793ee 100644
--- a/metadata/md5-cache/app-vim/toggle-0.5-r1
+++ b/metadata/md5-cache/app-vim/toggle-0.5-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: quickly toggle boolean-type keywords
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=895
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/toggle-0.5.tar.bz2 https://dev.gentoo.org/~radhermit/vim/toggle-0.5.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=582252076d66381a224c28525ea72059
diff --git a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1 b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
index 286d5b15caa0..c394adcf6e5e 100644
--- a/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+++ b/metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for perl module Template-Toolkit
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=830
+INHERIT=vim-plugin
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/tt2-syntax-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/tt2-syntax-1.13.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=26003c7167b5bfe83e4cc8fb578cf72c
diff --git a/metadata/md5-cache/app-vim/txtfmt-2.4-r1 b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
index 0a7e218948a6..96c9047dcdb4 100644
--- a/metadata/md5-cache/app-vim/txtfmt-2.4-r1
+++ b/metadata/md5-cache/app-vim/txtfmt-2.4-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: rich text highlighting in vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=13856 -> txtfmt-2.4.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=cf6c5f72b305054937cc106660ccedd8
diff --git a/metadata/md5-cache/app-vim/txtfmt-3.1 b/metadata/md5-cache/app-vim/txtfmt-3.1
index 1f8d740357e5..7503c0d849f7 100644
--- a/metadata/md5-cache/app-vim/txtfmt-3.1
+++ b/metadata/md5-cache/app-vim/txtfmt-3.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: rich text highlighting in vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2208
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://www.vim.org/scripts/download_script.php?src_id=24489 -> txtfmt-3.1.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=58b0140f5a38d187fda7f862a2260e41
diff --git a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2 b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
index f5b3678c4bbe..ea40069329b8 100644
--- a/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
+++ b/metadata/md5-cache/app-vim/udev-syntax-20051016-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: syntax highlighting for udev rules files
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1381
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~hppa ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/udev-syntax-20051016.tar.bz2 https://dev.gentoo.org/~radhermit/vim/udev-syntax-20051016.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ea54e516ed09fd342e083b16d667e00e
diff --git a/metadata/md5-cache/app-vim/undotree-6.0 b/metadata/md5-cache/app-vim/undotree-6.0
index e4faa31d862d..b6cc8b5fb600 100644
--- a/metadata/md5-cache/app-vim/undotree-6.0
+++ b/metadata/md5-cache/app-vim/undotree-6.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display your undo history in a graph
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mbbill/undotree/archive/rel_6.0.tar.gz -> undotree-6.0.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=6b24107152224a9d2b999523a865bd11
diff --git a/metadata/md5-cache/app-vim/undotree-9999 b/metadata/md5-cache/app-vim/undotree-9999
index a4424b978c3f..694814a7e9bb 100644
--- a/metadata/md5-cache/app-vim/undotree-9999
+++ b/metadata/md5-cache/app-vim/undotree-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: display your undo history in a graph
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
+INHERIT=vim-plugin git-r3
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bc6b5d2995b36f175e7d2eb1667a5b27
diff --git a/metadata/md5-cache/app-vim/unite-4.0-r1 b/metadata/md5-cache/app-vim/unite-4.0-r1
index 0df7663f8b6d..3fe878daf16a 100644
--- a/metadata/md5-cache/app-vim/unite-4.0-r1
+++ b/metadata/md5-cache/app-vim/unite-4.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: unite all sources
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3396
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/unite-4.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=a46e7cbb546406b4d6a2beeb982174f2
diff --git a/metadata/md5-cache/app-vim/unite-4.1 b/metadata/md5-cache/app-vim/unite-4.1
index 8410160df785..dd8e32df34f8 100644
--- a/metadata/md5-cache/app-vim/unite-4.1
+++ b/metadata/md5-cache/app-vim/unite-4.1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: unite all sources
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=3396
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=!app-vim/neocomplcache || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/unite-4.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/unite-4.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c6c6d8eb1404aa65dbc0c3f43e7e7fe3
diff --git a/metadata/md5-cache/app-vim/uptime-1.3-r1 b/metadata/md5-cache/app-vim/uptime-1.3-r1
index b3305a57d10a..2547b265936a 100644
--- a/metadata/md5-cache/app-vim/uptime-1.3-r1
+++ b/metadata/md5-cache/app-vim/uptime-1.3-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display vim uptimes
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=965
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/uptime-1.3.tar.bz2 https://dev.gentoo.org/~radhermit/vim/uptime-1.3.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=8075adcbd32a4b9b352574d0d48ec290
diff --git a/metadata/md5-cache/app-vim/vcscommand-1.99.47 b/metadata/md5-cache/app-vim/vcscommand-1.99.47
index 6ef12edde980..bdff6e63dbb8 100644
--- a/metadata/md5-cache/app-vim/vcscommand-1.99.47
+++ b/metadata/md5-cache/app-vim/vcscommand-1.99.47
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: CVS/SVN/SVK/git/bzr/hg integration plugin
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=90
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=!app-vim/cvscommand || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vcscommand-1.99.47.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vcscommand-1.99.47.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=77d4dcd28f5fb459dcd8ac623dfa168f
diff --git a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105 b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
index a5ed6cfcec51..8dcb7f328a38 100644
--- a/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
+++ b/metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interpret a file by function and cache file automatically
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2940 https://github.com/MarcWeber/vim-addon-mw-utils
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-addon-mw-utils-20121105.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-addon-mw-utils-20121105.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c0459fafaac49855452e842c4a4c5365
diff --git a/metadata/md5-cache/app-vim/vim-autoclose-2.0 b/metadata/md5-cache/app-vim/vim-autoclose-2.0
index 64d2a54c8175..953497ff4c6c 100644
--- a/metadata/md5-cache/app-vim/vim-autoclose-2.0
+++ b/metadata/md5-cache/app-vim/vim-autoclose-2.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: open-close pair of characters
 EAPI=6
 HOMEPAGE=https://github.com/Townk/vim-autoclose
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~monsieurp/packages/vim-autoclose-2.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f34db03388c12fcade26361f220b6c45
diff --git a/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506 b/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
index c1b68e06ddaf..004319a98e9e 100644
--- a/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
+++ b/metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Vim plugin for clang-format
 EAPI=7
 HOMEPAGE=https://github.com/rhysd/vim-clang-format
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=sys-devel/clang || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/rhysd/vim-clang-format/archive/95593b67723f23979cd7344ecfd049f2f917830f.tar.gz -> vim-clang-format-0_pre20200506.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=b951c5c6421154a83ae1ed2668fcd72f
diff --git a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530 b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
index 16f9bb6553ba..59e5d6c08d2a 100644
--- a/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
+++ b/metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: comment stuff out
 EAPI=6
 HOMEPAGE=https://github.com/tpope/vim-commentary
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tpope/vim-commentary/archive/7f2127b1dfc57811112785985b46ff2289d72334.tar.gz -> vim-commentary-1.3_p20180530.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bbbf5e12023dd203cd58d2587a656a66
diff --git a/metadata/md5-cache/app-vim/vim-flake8-1.6 b/metadata/md5-cache/app-vim/vim-flake8-1.6
index 359832ee6541..c018282e61cb 100644
--- a/metadata/md5-cache/app-vim/vim-flake8-1.6
+++ b/metadata/md5-cache/app-vim/vim-flake8-1.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: runs the currently open file through flake8
 EAPI=6
 HOMEPAGE=https://github.com/nvie/vim-flake8
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.tar.gz -> vim-flake8-1.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f9ac2fbf18d73d0c7a5bd51bb810e3f5
diff --git a/metadata/md5-cache/app-vim/vim-go-1.13 b/metadata/md5-cache/app-vim/vim-go-1.13
index e5f351f75e89..79871908328a 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.13
+++ b/metadata/md5-cache/app-vim/vim-go-1.13
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Go development plugin for Vim
 EAPI=6
 HOMEPAGE=https://github.com/fatih/vim-go
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.13.tar.gz -> vim-go-1.13.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=c0a15036e78a3b6e6e88e353af351fff
diff --git a/metadata/md5-cache/app-vim/vim-go-1.19 b/metadata/md5-cache/app-vim/vim-go-1.19
index cb4be26fdc67..a2b333ba2fe0 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.19
+++ b/metadata/md5-cache/app-vim/vim-go-1.19
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Go development plugin for Vim
 EAPI=6
 HOMEPAGE=https://github.com/fatih/vim-go
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.19.tar.gz -> vim-go-1.19.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3650bfe3902e2bbf050f9c5a37d1e2b2
diff --git a/metadata/md5-cache/app-vim/vim-go-1.20 b/metadata/md5-cache/app-vim/vim-go-1.20
index 43beabc0eb29..b2a0f017e332 100644
--- a/metadata/md5-cache/app-vim/vim-go-1.20
+++ b/metadata/md5-cache/app-vim/vim-go-1.20
@@ -3,11 +3,12 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Go development plugin for Vim
 EAPI=6
 HOMEPAGE=https://github.com/fatih/vim-go
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/fatih/vim-go/archive/v1.20.tar.gz -> vim-go-1.20.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=687a5934b83845d13219c0261afaa980
diff --git a/metadata/md5-cache/app-vim/vim-hoogle-1.3 b/metadata/md5-cache/app-vim/vim-hoogle-1.3
index 01cfe99a03af..31527f853e8c 100644
--- a/metadata/md5-cache/app-vim/vim-hoogle-1.3
+++ b/metadata/md5-cache/app-vim/vim-hoogle-1.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: use hoogle within vim
 EAPI=6
 HOMEPAGE=https://github.com/Twinside/vim-hoogle
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/Twinside/vim-hoogle/archive/31823f830843385f53a3da7a5bfaf678494383c4.tar.gz -> vim-hoogle-1.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fc27d8bf42c1250e323cdb11fae79600
diff --git a/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226 b/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
index 100d4a99c67f..9e9d7fae871b 100644
--- a/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
+++ b/metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Runtime files for app-misc/jq
 EAPI=7
 HOMEPAGE=https://github.com/bfrg/vim-jq
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/bfrg/vim-jq/archive/0076ef5424894e17f0ab17f4d025a3b519008134.tar.gz -> vim-jq-0.0_pre20210226.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=27647fcd02b681964e64247def7c7940
diff --git a/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502 b/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
index 8181bc1bd4af..234d7214a601 100644
--- a/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
+++ b/metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Filetype plugin for dev-lang/jsonnet
 EAPI=7
 HOMEPAGE=https://github.com/google/vim-jsonnet
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/jsonnet || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/google/vim-jsonnet/archive/824dcfe76568dba38135332fc4729e2b2c4d9b3a.tar.gz -> vim-jsonnet-0_pre20190502.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=714c60d577f0e1e11000b6eb981261e2
diff --git a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2 b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
index 6c9094b4f415..1ca4d1b1883d 100644
--- a/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
+++ b/metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vim-latex/vim-latex-1.10.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=bf4bae2ba75149d25b0db48248c666b8
diff --git a/metadata/md5-cache/app-vim/vim-misc-1.17.6 b/metadata/md5-cache/app-vim/vim-misc-1.17.6
index 3e9b8ea78cf9..b3af5eaf2bbc 100644
--- a/metadata/md5-cache/app-vim/vim-misc-1.17.6
+++ b/metadata/md5-cache/app-vim/vim-misc-1.17.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: miscellaneous auto-load scripts
 EAPI=7
 HOMEPAGE=http://peterodding.com/code/vim/misc/
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/xolox/vim-misc/archive/1.17.6.tar.gz -> vim-misc-1.17.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f75af9a154093ee493d9592c33f72b65
diff --git a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1 b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
index dde444009dbc..1432f65bada0 100644
--- a/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
+++ b/metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Sublime Text's awesome multiple selection feature for Vim
 EAPI=6
 HOMEPAGE=https://github.com/terryma/vim-multiple-cursors
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/terryma/vim-multiple-cursors/archive/v2.2.tar.gz -> vim-multiple-cursors-2.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=1462dffe61240751816665abb916ac13
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
index b55e47d19887..0cc29cbf1c96 100644
--- a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
+++ b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: nftables syntax and indent
 EAPI=7
 HOMEPAGE=https://github.com/nfnty/vim-nftables
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nfnty/vim-nftables/archive/01c7b97eff12fd4b624e6efa2c0468163db61ebc.tar.gz -> vim-nftables-0_pre20200224.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=1418fafebe897c138955eaebf9388d29
diff --git a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1 b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
index 06e1fbbf955c..73ec928e797e 100644
--- a/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
+++ b/metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: nftables syntax and indent
 EAPI=7
 HOMEPAGE=https://github.com/nfnty/vim-nftables
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/nfnty/vim-nftables/archive/26f8a506c6f3e41f1e4a8d6aa94c9a79a666bbff.tar.gz -> vim-nftables-0_pre20200629.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7b0f7a6bcffad5e58a5d35bca5aed768
diff --git a/metadata/md5-cache/app-vim/vim-r-1.2.6 b/metadata/md5-cache/app-vim/vim-r-1.2.6
index bc4d382b3100..838ef1acbfb5 100644
--- a/metadata/md5-cache/app-vim/vim-r-1.2.6
+++ b/metadata/md5-cache/app-vim/vim-r-1.2.6
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: integrate vim with R
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=2628
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 RDEPEND=dev-lang/R || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vim-r-1.2.6.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vim-r-1.2.6.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=aaa91dd1dbacd457e7ff2384af88f82a
diff --git a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0 b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
index af96a783793f..8816e22d2635 100644
--- a/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
+++ b/metadata/md5-cache/app-vim/vim-rest-console-2.6.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=a REST console for vim
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=5182 https://github.com/diepm/vim-rest-console
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/diepm/vim-rest-console/archive/v2.6.0.tar.gz -> vim-rest-console-2.6.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fff42e8716c08800e0f7d3b0ed3bb92c
diff --git a/metadata/md5-cache/app-vim/vim-tmux-3.0.0 b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
index a23e3fb909d9..ce0a454d24a9 100644
--- a/metadata/md5-cache/app-vim/vim-tmux-3.0.0
+++ b/metadata/md5-cache/app-vim/vim-tmux-3.0.0
@@ -9,5 +9,5 @@ LICENSE=public-domain MIT
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/tmux-plugins/vim-tmux/archive/v3.0.0.tar.gz -> vim-tmux-3.0.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=4b999e6ec385553588643a63fbee9129
diff --git a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106 b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
index 087eb5531aca..db45daef0ff6 100644
--- a/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
+++ b/metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: collection of vimscripts for Haskell development
 EAPI=6
 HOMEPAGE=https://github.com/dag/vim2hs
+INHERIT=vim-plugin vcs-snapshot
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-lang/ghc || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/dag/vim2hs/archive/f2afd55704bfe0a2d66e6b270d247e9b8a7b1664.tar.gz -> vim2hs-0.1_p20171106.tar.gz
-_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=136d66c3be6e260b9d18e8a72ef71dbc
diff --git a/metadata/md5-cache/app-vim/vimagit-1.7.3 b/metadata/md5-cache/app-vim/vimagit-1.7.3
index ae65093c3d6a..e368e72be2cf 100644
--- a/metadata/md5-cache/app-vim/vimagit-1.7.3
+++ b/metadata/md5-cache/app-vim/vimagit-1.7.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: ease your git workflow within vim
 EAPI=6
 HOMEPAGE=https://github.com/jreybert/vimagit
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jreybert/vimagit/archive/1.7.3.tar.gz -> vimagit-1.7.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0b438af6f1c1b734f8cf6c2af9e96774
diff --git a/metadata/md5-cache/app-vim/vimagit-9999 b/metadata/md5-cache/app-vim/vimagit-9999
index f7ad07b74c7b..bbb97f128fc2 100644
--- a/metadata/md5-cache/app-vim/vimagit-9999
+++ b/metadata/md5-cache/app-vim/vimagit-9999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: ease your git workflow within vim
 EAPI=6
 HOMEPAGE=https://github.com/jreybert/vimagit
+INHERIT=vim-plugin git-r3
 LICENSE=vim
 PROPERTIES=live
 RDEPEND=dev-vcs/git || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=0b438af6f1c1b734f8cf6c2af9e96774
diff --git a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1 b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
index f8afeba0dbfc..9a1213edfff8 100644
--- a/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
+++ b/metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: vimbuddy for the status line
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/vimbuddy.vim
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
 LICENSE=public-domain
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/vimbuddy.vim/archive/0.9.2.tar.gz -> vimbuddy-0.9.2.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d850451b30d5a4038caca10fa6319e68
diff --git a/metadata/md5-cache/app-vim/vimcdoc-1.9.0 b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
index 5793e2a5c699..acdb1fcb0c1d 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-1.9.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-1.9.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=online vim documentation translated into Chinese
 EAPI=6
 HOMEPAGE=http://vimcdoc.sourceforge.net/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-1.9.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/metadata/md5-cache/app-vim/vimcdoc-2.1.0 b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
index 956fd8e01c8a..a49e6d9b5038 100644
--- a/metadata/md5-cache/app-vim/vimcdoc-2.1.0
+++ b/metadata/md5-cache/app-vim/vimcdoc-2.1.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=online vim documentation translated into Chinese
 EAPI=6
 HOMEPAGE=http://vimcdoc.sourceforge.net/
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vimcdoc/vimcdoc-2.1.0.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=cb77845350d433bf01c2fa789c0569bb
diff --git a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3 b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
index e792f2db1244..9aff83f95945 100644
--- a/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
+++ b/metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Clojure syntax highlighting, filetype and indent settings
 EAPI=6
 HOMEPAGE=https://github.com/vim-scripts/VimClojure
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=dev-lang/clojure || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vim-scripts/VimClojure/archive/2.3.6.tar.gz -> vimclojure-2.3.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=52ddf6ef97abe630e51850c96ad5c4ed
diff --git a/metadata/md5-cache/app-vim/vimcommander-0.81 b/metadata/md5-cache/app-vim/vimcommander-0.81
index b21dac9b6217..1528b87010c3 100644
--- a/metadata/md5-cache/app-vim/vimcommander-0.81
+++ b/metadata/md5-cache/app-vim/vimcommander-0.81
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Total Commander style file explorer
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=808
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimcommander-0.81.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimcommander-0.81.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=584428898c3cd81533ef55afb58e5299
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1 b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
index 7dc761856934..31c02d155cc7 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: easy and fast outlining
 EAPI=6
 HOMEPAGE=https://github.com/vimoutliner/vimoutliner
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~ia64 ppc sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/v0.3.6.tar.gz -> vimoutliner-0.3.6.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=e545d2de961d48ea32d144903b385057
diff --git a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2 b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
index f46158255aa5..06670d75b7be 100644
--- a/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
+++ b/metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/vimoutliner/vimoutliner/archive/4f12628247940d98eedd594961695dc504261058.tar.gz -> vimoutliner-0.4.0_p20180301.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-snapshot	19dc666868420457132a7514d4621476	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=069d8f366e21b60cfc3e4666f18a9bab
diff --git a/metadata/md5-cache/app-vim/vimpython-1.13-r3 b/metadata/md5-cache/app-vim/vimpython-1.13-r3
index 2f17965c0b5a..bae3220040fe 100644
--- a/metadata/md5-cache/app-vim/vimpython-1.13-r3
+++ b/metadata/md5-cache/app-vim/vimpython-1.13-r3
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gentoo/vimpython-1.13.tar.bz2 https://dev.gentoo.org/~radhermit/vim/vimpython-1.13.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=3bafd44bbae40a5a65304dbc2aa8c937
diff --git a/metadata/md5-cache/app-vim/vimtex-1.5 b/metadata/md5-cache/app-vim/vimtex-1.5
index cbbe0a868fea..62407f945aa7 100644
--- a/metadata/md5-cache/app-vim/vimtex-1.5
+++ b/metadata/md5-cache/app-vim/vimtex-1.5
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
 EAPI=7
 HOMEPAGE=https://github.com/lervag/vimtex
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/lervag/vimtex/archive/v1.5.tar.gz -> vimtex-1.5.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=fcc5271d306b5baf044bf4eecfe5fcb0
diff --git a/metadata/md5-cache/app-vim/vimtex-99999999 b/metadata/md5-cache/app-vim/vimtex-99999999
index 191ef0a67e82..1ccafd48e89c 100644
--- a/metadata/md5-cache/app-vim/vimtex-99999999
+++ b/metadata/md5-cache/app-vim/vimtex-99999999
@@ -3,9 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=vim plugin: a modern vim plugin for editing LaTeX files
 EAPI=6
 HOMEPAGE=https://github.com/lervag/vimtex
+INHERIT=vim-plugin git-r3
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!app-vim/vim-latex !app-vim/automatictexplugin || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7a4c74ae2a3bb616e1e25594d731c11c
diff --git a/metadata/md5-cache/app-vim/voom-5.3-r1 b/metadata/md5-cache/app-vim/voom-5.3-r1
index 2ab0ba34bb83..ab42291ff8e2 100644
--- a/metadata/md5-cache/app-vim/voom-5.3-r1
+++ b/metadata/md5-cache/app-vim/voom-5.3-r1
@@ -11,5 +11,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) p
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/vim-voom/VOoM/archive/v5.3.tar.gz -> voom-5.3.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=f9b159b8fa6d6ed2c8dd5961cf767931
diff --git a/metadata/md5-cache/app-vim/webapi-0.3 b/metadata/md5-cache/app-vim/webapi-0.3
index fd3a12ec7d9b..b02853aaf49e 100644
--- a/metadata/md5-cache/app-vim/webapi-0.3
+++ b/metadata/md5-cache/app-vim/webapi-0.3
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: interface to Web APIs
 EAPI=6
 HOMEPAGE=https://github.com/mattn/webapi-vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86 ~x64-macos
 LICENSE=BSD
 RDEPEND=net-misc/curl || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/mattn/webapi-vim/archive/0.3.tar.gz -> webapi-0.3.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=038718e97cc22d60f8717ab5b5c48784
diff --git a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1 b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
index 44b4c6bd72f6..42d5b7862a02 100644
--- a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
+++ b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Wikipedia syntax highlighting
 EAPI=6
 HOMEPAGE=https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
+INHERIT=vim-plugin
 KEYWORDS=amd64 ~hppa ~mips ppc ppc64 x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=98d232f59d43653be7cb67c060441103
diff --git a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2 b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
index 7381fa2818bb..0533444894be 100644
--- a/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
+++ b/metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: XQuery syntax highlighting
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=803
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim.org
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xquery-syntax-0.1.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xquery-syntax-0.1.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ac61a9472b6cb86b675cc4d254e845f1
diff --git a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2 b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
index a798bf18aba8..4c995491169c 100644
--- a/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
+++ b/metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Syntax for XSLT (with HTML and others)
 EAPI=6
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=257
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/xsl-syntax-0.3.11.tar.bz2 https://dev.gentoo.org/~radhermit/vim/xsl-syntax-0.3.11.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=76b1b8f823159e2ac604102cb837d2a4
diff --git a/metadata/md5-cache/app-vim/yankring-19.0 b/metadata/md5-cache/app-vim/yankring-19.0
index 5c8f4f198ff0..792a35aa3a4a 100644
--- a/metadata/md5-cache/app-vim/yankring-19.0
+++ b/metadata/md5-cache/app-vim/yankring-19.0
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: maintains a history of previous yanks and deletes
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1234
+INHERIT=vim-plugin
 KEYWORDS=amd64 x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=92b8037da5b70b838c848bfbb6e90fe3
diff --git a/metadata/md5-cache/app-vim/yankring-19.0-r1 b/metadata/md5-cache/app-vim/yankring-19.0-r1
index 120db5cab4c4..43f1f6c0a64b 100644
--- a/metadata/md5-cache/app-vim/yankring-19.0-r1
+++ b/metadata/md5-cache/app-vim/yankring-19.0-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: maintains a history of previous yanks and deletes
 EAPI=7
 HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=1234
+INHERIT=vim-plugin
 KEYWORDS=~amd64 ~x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/yankring-19.0.tar.bz2 https://dev.gentoo.org/~radhermit/vim/yankring-19.0.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=ee305b0a601e9ab72e71e074a9e75c12
diff --git a/metadata/md5-cache/app-vim/zenburn-2.25 b/metadata/md5-cache/app-vim/zenburn-2.25
index 024db2e8dbd0..6b6971843c2a 100644
--- a/metadata/md5-cache/app-vim/zenburn-2.25
+++ b/metadata/md5-cache/app-vim/zenburn-2.25
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=Low-contrast color scheme for Vim
 EAPI=6
 HOMEPAGE=https://github.com/jnurmine/Zenburn
+INHERIT=vim-plugin
 KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-1
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.tar.gz -> zenburn-2.25.tar.gz
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=7d545dea0f2efee36138a7f60e737960
diff --git a/metadata/md5-cache/app-vim/zoomwin-24-r1 b/metadata/md5-cache/app-vim/zoomwin-24-r1
index f42990994da6..e0ea3a5cbbf1 100644
--- a/metadata/md5-cache/app-vim/zoomwin-24-r1
+++ b/metadata/md5-cache/app-vim/zoomwin-24-r1
@@ -3,10 +3,11 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: brief-style window zooming
 EAPI=6
 HOMEPAGE=http://www.vim.org/scripts/script.php?script_id=508
+INHERIT=vim-plugin
 KEYWORDS=~alpha amd64 ~ia64 ~mips ppc sparc x86
 LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/zoomwin-24.tar.bz2 https://dev.gentoo.org/~radhermit/vim/zoomwin-24.tar.bz2
-_eclasses_=vim-doc	e063cddf18e5d2f2cfb21388252579ec	vim-plugin	a7b5f19bc94a311ca1cf7127c8b84c41
+_eclasses_=vim-doc	f088862726f2bc672c57b1063b81ec52	vim-plugin	89bf54501de4a75f241062d5a56e787f
 _md5_=d24cde21087aa219ce0c5fe66b690c6c
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index cca332494a9f..1cb02a834144 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.66.4 b/metadata/md5-cache/dev-cpp/glibmm-2.66.4
index 87789293f55b..c6012b7ece96 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.66.4
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.66.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtkmm.org https://gitlab.gnome.org/GNOME/glibmm
 INHERIT=gnome.org meson-multilib python-any-r1
 IUSE=doc debug test 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.61.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.66/glibmm-2.66.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ba3c627823ce53672c5665e965f99517
+_md5_=fb045f1b301c9fdf20ba538acf169c4a
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.72.1 b/metadata/md5-cache/dev-cpp/glibmm-2.72.1
index 7622f22d75a0..b2653a5c02b4 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.72.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.72.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtkmm.org
 INHERIT=gnome.org meson-multilib python-any-r1
 IUSE=doc debug test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.71.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libsigc++:3[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=2.68
 SRC_URI=mirror://gnome/sources/glibmm/2.72/glibmm-2.72.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6dad25a9b9dfd6492599dbbccdab98e4
+_md5_=80487eda74eca7b1a10d3b75aea72357
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.24.6 b/metadata/md5-cache/dev-cpp/gtkmm-3.24.6
index 6825ccbf39ec..ecbb4cf4a701 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.24.6
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.24.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.gtkmm.org https://gitlab.gnome.org/GNOME/gtkmm
 INHERIT=gnome.org meson-multilib python-any-r1 virtualx
 IUSE=aqua doc test wayland X 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/atkmm-2.24.2:0[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/cairomm-1.12.0:0[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/glibmm-2.54.0:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/pangomm-2.38.2:1.4[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libsigc++-2.3.2:2[doc?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libepoxy-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.35.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.24.0:3[aqua?,wayland?,X?,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=|| ( aqua wayland X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.24/gtkmm-3.24.6.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=90b580f830a4225c45d33e4bbf711d8c
+_md5_=cb381a0a1bba32cd89f6512256882825
diff --git a/metadata/md5-cache/dev-cpp/prometheus-cpp-1.0.1 b/metadata/md5-cache/dev-cpp/prometheus-cpp-1.0.1
new file mode 100644
index 000000000000..95cf4eb3a7ac
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/prometheus-cpp-1.0.1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx] test? ( dev-cpp/benchmark dev-cpp/gtest )
+DESCRIPTION=Prometheus Client Library for Modern C++
+EAPI=8
+HOMEPAGE=https://github.com/jupp0r/prometheus-cpp
+INHERIT=cmake
+IUSE=test zlib
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=net-misc/curl sys-libs/zlib www-servers/civetweb[cxx]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jupp0r/prometheus-cpp/archive/v1.0.1.tar.gz -> prometheus-cpp-1.0.1.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1d39c627b360f11c7b1d0b2262c04c48
diff --git a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2 b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
deleted file mode 100644
index 729161947938..000000000000
--- a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20
-EAPI=7
-HOMEPAGE=https://github.com/martinus/robin-hood-hashing
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/martinus/robin-hood-hashing/archive/3.11.2.tar.gz -> robin-hood-hashing-3.11.2.tar.gz
-_md5_=b1ab64e801712200adc9b5837c911efa
diff --git a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5 b/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5
deleted file mode 100644
index c568f17a4909..000000000000
--- a/metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Fast & memory efficient hashtable based on robin hood hashing for C++11/14/17/20
-EAPI=7
-HOMEPAGE=https://github.com/martinus/robin-hood-hashing
-INHERIT=cmake
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/martinus/robin-hood-hashing/archive/3.11.5.tar.gz -> robin-hood-hashing-3.11.5.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7d6544c6b45b1a65d3308fcbfc1e8562
diff --git a/metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r2 b/metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
similarity index 82%
rename from metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r2
rename to metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
index e44e2bbaaad9..21a8138c6cdb 100644
--- a/metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r2
+++ b/metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
@@ -11,6 +11,6 @@ LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=!systemd? ( sys-libs/libcap ) systemd? ( >=sys-apps/systemd-236:= ) tools? ( dev-libs/expat )
 RESTRICT=!test? ( test )
 SLOT=0/0
-SRC_URI=https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v0.9.0.tar.gz -> sdbus-c++-0.9.0.tar.gz !systemd? ( https://github.com/systemd/systemd-stable/archive/v249.11/systemd-stable-249.11.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz ) )
+SRC_URI=https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v0.9.0.tar.gz -> sdbus-c++-0.9.0.tar.gz !systemd? ( https://github.com/systemd/systemd-stable/archive/v250.6/systemd-stable-250.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-250.4.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-250.4.tar.gz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-250.4.tar.gz ) )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6ea4ac3375530b82cbff3325ac42da53
+_md5_=5f1dfa8f676fec2d9ba07cb4ef18af76
diff --git a/metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r2 b/metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
similarity index 82%
rename from metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r2
rename to metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
index cf23d38586f6..2f3a3a9e2eae 100644
--- a/metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r2
+++ b/metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
@@ -11,6 +11,6 @@ LICENSE=LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1
 RDEPEND=!systemd? ( sys-libs/libcap ) systemd? ( >=sys-apps/systemd-236:= ) tools? ( dev-libs/expat )
 RESTRICT=!test? ( test )
 SLOT=0/1
-SRC_URI=https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v1.1.0.tar.gz -> sdbus-c++-1.1.0.tar.gz !systemd? ( https://github.com/systemd/systemd-stable/archive/v249.11/systemd-stable-249.11.tar.gz elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-249.5-r1.tar.xz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-249.5-r1.tar.xz ) )
+SRC_URI=https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v1.1.0.tar.gz -> sdbus-c++-1.1.0.tar.gz !systemd? ( https://github.com/systemd/systemd-stable/archive/v250.6/systemd-stable-250.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/distfiles/systemd-musl-patches-250.4.tar.gz https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-250.4.tar.gz https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-250.4.tar.gz ) )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=087cc9e4352da27f76dcbecdc407822d
+_md5_=d56b56be6a81745cc80f0a6b857b134b
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 13ccd1d129a6..92e614aa97ba 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/mavlink_c-20220518 b/metadata/md5-cache/dev-embedded/mavlink_c-20220518
new file mode 100644
index 000000000000..6707ab413149
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/mavlink_c-20220518
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Official reference C library for the v2 protocol
+EAPI=7
+HOMEPAGE=https://github.com/mavlink/c_library_v2
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mavlink/c_library_v2/archive/241907e288b43513b28f83595d0de3b2088bce0f.tar.gz -> mavlink_c-20220518.tar.gz
+_md5_=ade77e8ab5ecddabb383bc68a2c6c160
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01
deleted file mode 100644
index 207e44c7ec72..000000000000
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.01
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/openssl:=
-DESCRIPTION=utilities for working with Das U-Boot
-EAPI=8
-HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
-INHERIT=toolchain-funcs
-IUSE=envtools
-KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.01.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d0f4a9b2b845a9dc3082db107fc56f03
diff --git a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04 b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
index 1a9f2a9f6a2a..64d3c93e1594 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.denx.de/wiki/U-Boot/WebHome
 INHERIT=toolchain-funcs
 IUSE=envtools
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/openssl:=
 SLOT=0
 SRC_URI=https://ftp.denx.de/pub/u-boot/u-boot-2022.04.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=17f435bf63f4d90f7e7e5e5402231aa0
+_md5_=d0f4a9b2b845a9dc3082db107fc56f03
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 7969f8c73cb7..2d3bc03c738f 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
new file mode 100644
index 000000000000..afd71b0f978b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jdk-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/
+INHERIT=java-pkg-2 java-pkg-simple prefix
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=EPL-1.0
+RDEPEND=~dev-java/eclipse-ecj-4.22:4.22 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.22
+SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	prefix	eab3c99d77fe00506c109c8a736186f7
+_md5_=16906fe0be1c0936565664ca79aca066
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.1 b/metadata/md5-cache/dev-java/commons-daemon-1.3.1
new file mode 100644
index 000000000000..15e6d62c819e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tools to allow Java programs to run as UNIX daemons
+EAPI=8
+HOMEPAGE=https://commons.apache.org/proper/commons-daemon/
+INHERIT=java-pkg-2 java-pkg-simple toolchain-funcs
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.1-src.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d412f8b094404834a3f081ac98fc825c
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1 b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
new file mode 100644
index 000000000000..1aeff7abae0a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-17:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Eclipse Compiler for Java
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=+ant doc source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=EPL-1.0
+PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.22 )
+RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.22
+SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.22-202111241800/ecjsrc-4.22.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
+_md5_=4d367efb81de0e6b3334cb40ce75314e
diff --git a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1 b/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
deleted file mode 100644
index 91fedac3e3e0..000000000000
--- a/metadata/md5-cache/dev-java/jempbox-1.7.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An open source Java library for parsing font files
-EAPI=7
-HOMEPAGE=https://pdfbox.apache.org/
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.7
-SRC_URI=mirror://apache/pdfbox/1.7.1/pdfbox-1.7.1-src.zip
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=21159a2c08ba683736340c4837d890b4
diff --git a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1 b/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
deleted file mode 100644
index 838c5a42f7bf..000000000000
--- a/metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Open-source graph component for Java
-EAPI=6
-HOMEPAGE=https://www.jgraph.com
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc examples source doc source
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gentoo/jgraph-5.12.0.4.jar
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=73d1f454e456a915170fbb915caf2a52
diff --git a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2 b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
similarity index 57%
rename from metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
rename to metadata/md5-cache/dev-java/jopt-simple-5.0.4
index fb4b88ee1531..99942e11910d 100644
--- a/metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
+++ b/metadata/md5-cache/dev-java/jopt-simple-5.0.4
@@ -1,15 +1,14 @@
-BDEPEND=app-arch/unzip
 DEFINED_PHASES=compile install preinst prepare setup test
 DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=A toolkit for list transformations
+DESCRIPTION=A Java library for parsing command line options
 EAPI=8
-HOMEPAGE=http://www.glazedlists.com/
+HOMEPAGE=https://jopt-simple.github.io/jopt-simple/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=|| ( LGPL-2.1 MPL-1.1 )
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
-SRC_URI=http://java.net/downloads/glazedlists/glazedlists-1.8.0/glazedlists-1.8.0-source_java15.zip -> glazedlists-1.8.0.zip
+SRC_URI=https://github.com/jopt-simple/jopt-simple/archive/jopt-simple-5.0.4.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=343c91daad959937d1630fb1d26312fb
+_md5_=869f0071e55b362b14d280eec1a83c7c
diff --git a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2 b/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
deleted file mode 100644
index 1799a3202fd0..000000000000
--- a/metadata/md5-cache/dev-java/microba-0.4.4.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=dev-java/jgraph:0 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Swing components for date operations and palettes
-EAPI=8
-HOMEPAGE=https://github.com/tdbear/microba
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-java/jgraph:0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/tdbear/microba/archive/refs/tags/0.4.4.3.tar.gz -> microba-0.4.4.3.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=c811b7362e71e4127d891198e7b0a894
diff --git a/metadata/md5-cache/dev-java/spin-1.5-r2 b/metadata/md5-cache/dev-java/spin-1.5-r2
deleted file mode 100644
index de48c32a4169..000000000000
--- a/metadata/md5-cache/dev-java/spin-1.5-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:0 )
-DESCRIPTION=Transparent threading solution for non-freezing Swing applications.
-EAPI=8
-HOMEPAGE=http://spin.sourceforge.net
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3
-RDEPEND=>=virtual/jre-1.8:* dev-java/cglib:3 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/spin/spin/v1.5/spin-1.5-all.zip
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=85477047cb583e6a212b1783d52db5f0
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 245a46526fee..22aa2718b19e 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2020 b/metadata/md5-cache/dev-lang/gnat-gpl-2020
index e35fdb24916f..28e1c939d982 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2020
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2020
@@ -13,5 +13,5 @@ RDEPEND=!sys-devel/gcc:9.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/libin
 RESTRICT=test
 SLOT=9.3.1
 SRC_URI=https://community.download.adacore.com/v1/649a561ec6de9e476c54b02715b79f7503600ce5?filename=gnat-2020-20200429-19B04-src.tar.gz -> gnat-2020-20200429-19B04-src.tar.gz https://community.download.adacore.com/v1/e6b6a3e318e13248456bd37b758435e602b367da?filename=gcc-9-2020-20200429-19AA7-src.tar.gz -> gcc-9-2020-20200429-19AA7-src.tar.gz https://community.download.adacore.com/v1/c7a97636b31f3575df85f1eb0965462a353630dd?filename=gcc-interface-9-2020-20200429-19B10-src.tar.gz -> gcc-interface-9-2020-20200429-19B10-src.tar.gz bootstrap? ( amd64? ( http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-5.tar.bz2 mirror://gentoo/gcc-9.3.0-patches-5.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9204bdac5e41aa901db39c4a1f328db2
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
index 374252aa81d0..dfab889b3da8 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
@@ -13,5 +13,5 @@ RDEPEND=!~sys-devel/gcc-10.3.1 sys-libs/zlib virtual/libiconv nls? ( virtual/lib
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=fa8fd8a43d3d6b6035abb3fd96dd4496
diff --git a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3 b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
index c3ccdb59f113..d28a233c628e 100644
--- a/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
+++ b/metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
@@ -13,5 +13,5 @@ RDEPEND=!=sys-devel/gcc-10.3.1* sys-libs/zlib virtual/libiconv nls? ( virtual/li
 RESTRICT=test
 SLOT=10
 SRC_URI=https://community.download.adacore.com/v1/005d2b2eff627177986d2517eb31e1959bec6f3a?filename=gnat-2021-20210519-19A70-src.tar.gz -> gnat-2021-20210519-19A70-src.tar.gz https://community.download.adacore.com/v1/44cd393be0b468cc253bf2cf9cf7804c993e7b5b?filename=gcc-10-2021-20210519-19A74-src.tar.gz -> gcc-10-2021-20210519-19A74-src.tar.gz https://community.download.adacore.com/v1/8ace7d06e469d36d726cc8badb0ed78411e727f3?filename=gcc-interface-10-2021-20210519-19A75-src.tar.gz -> gcc-interface-10-2021-20210519-19A75-src.tar.gz bootstrap? ( amd64? ( https://community.download.adacore.com/v1/6eb6eef6bb897e4c743a519bfebe0b1d6fc409c6?filename=gnat-gpl-2014-x86_64-linux-bin.tar.gz&rand=1193 -> gnat-gpl-2014-x86_64-linux-bin.tar.gz ) x86? ( https://community.download.adacore.com/v1/c5e9e6fdff5cb77ed90cf8c62536653e27c0bed6?filename=gnat-gpl-2014-x86-linux-bin.tar.gz&rand=436 -> gnat-gpl-2014-x86-linux-bin.tar.gz ) ) https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=c354ac5fa7f6f003792af2ba1a9b5549
diff --git a/metadata/md5-cache/dev-lang/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index e0cfd7fd0b15..84c5ab59f8f3 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jdk-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=455ba9562aeb531c7e59061002ec9aa8
+_md5_=a9569f73fbe910c8e341ff5af8dcfb0e
diff --git a/metadata/md5-cache/dev-lang/perl-5.36.0_rc3 b/metadata/md5-cache/dev-lang/perl-5.36.0
similarity index 70%
rename from metadata/md5-cache/dev-lang/perl-5.36.0_rc3
rename to metadata/md5-cache/dev-lang/perl-5.36.0
index fe992be106f0..eb71505b248d 100644
--- a/metadata/md5-cache/dev-lang/perl-5.36.0_rc3
+++ b/metadata/md5-cache/dev-lang/perl-5.36.0
@@ -6,10 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.perl.org/
 INHERIT=alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 IUSE=berkdb debug doc gdbm ithreads minimal quadmath
+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=|| ( Artistic GPL-1+ )
 PDEPEND=!minimal? ( >=app-admin/perl-cleaner-2.5 >=virtual/perl-CPAN-2.290.0 >=virtual/perl-Encode-3.120.0 >=virtual/perl-File-Temp-0.230.400-r2 >=virtual/perl-Data-Dumper-2.154.0 virtual/perl-Test-Harness )
 RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3:= ) app-arch/bzip2 >=sys-libs/zlib-1.2.12 virtual/libcrypt:=
 SLOT=0/5.36
-SRC_URI=mirror://cpan/src/5.0/perl-5.36.0-RC3.tar.xz mirror://cpan/authors/id/R/RJ/RJBS/perl-5.36.0-RC3.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.36.0-patches-1/perl-5.36.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.36.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.tar.gz
+SRC_URI=mirror://cpan/src/5.0/perl-5.36.0.tar.xz mirror://cpan/authors/id/R/RJ/RJBS/perl-5.36.0.tar.xz https://github.com/gentoo-perl/perl-patchset/releases/download/perl-5.36.0-patches-1/perl-5.36.0-patches-1.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/perl-5.36.0-patches-1.tar.xz https://github.com/arsv/perl-cross/releases/download/1.3.7/perl-cross-1.3.7.tar.gz
 _eclasses_=alternatives	a0c93671b4b99c1326c746e95dc53396	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=0597f2a74e36b8c86104f3ca3e8fb9a1
diff --git a/metadata/md5-cache/dev-lang/vala-0.54.7 b/metadata/md5-cache/dev-lang/vala-0.54.7
index e3932597739c..20bbd520b7a6 100644
--- a/metadata/md5-cache/dev-lang/vala-0.54.7
+++ b/metadata/md5-cache/dev-lang/vala-0.54.7
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome2
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.54.7 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.54
 SRC_URI=mirror://gnome/sources/vala/0.54/vala-0.54.7.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4741f99255a4ed12302379ff9e93da9b
+_md5_=b77fe8f758a2d020aa022016ccf954e6
diff --git a/metadata/md5-cache/dev-lang/vala-0.56.1 b/metadata/md5-cache/dev-lang/vala-0.56.1
index 919f6e7be279..ef2ae4914163 100644
--- a/metadata/md5-cache/dev-lang/vala-0.56.1
+++ b/metadata/md5-cache/dev-lang/vala-0.56.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome2
 IUSE=test valadoc
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48.0:2 >=dev-libs/vala-common-0.56.1 valadoc? ( >=media-gfx/graphviz-2.16 ) !<net-libs/libsoup-2.66.2[vala]
 RESTRICT=!test? ( test )
 SLOT=0.56
 SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=29fc525db9185dfe9793fe1caa7fb496
+_md5_=e956fecb10257b34c8e094d33911f9bf
diff --git a/metadata/md5-cache/dev-lang/yap-7.1.0 b/metadata/md5-cache/dev-lang/yap-7.1.0
index 9112e08397bc..d178982c675c 100644
--- a/metadata/md5-cache/dev-lang/yap-7.1.0
+++ b/metadata/md5-cache/dev-lang/yap-7.1.0
@@ -1,6 +1,6 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libutf8proc sys-libs/zlib dev-libs/gmp:0 java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/wheel dev-python/numpy ) raptor? ( media-libs/raptor ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite ) xml? ( dev-libs/libxml2 ) doc? ( app-doc/doxygen[dot] ) java? ( dev-lang/swig ) python? ( >=dev-lang/swig-4.0.0 )
+DEPEND=dev-libs/libutf8proc sys-libs/zlib dev-libs/gmp:0[cxx] java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/wheel dev-python/numpy ) raptor? ( media-libs/raptor ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite ) xml? ( dev-libs/libxml2 ) doc? ( app-doc/doxygen[dot] ) java? ( dev-lang/swig ) python? ( >=dev-lang/swig-4.0.0 )
 DESCRIPTION=YAP is a high-performance Prolog compiler
 EAPI=7
 HOMEPAGE=http://www.dcc.fc.up.pt/~vsc/Yap/
@@ -8,9 +8,9 @@ INHERIT=cmake flag-o-matic python-single-r1
 IUSE=R debug doc examples java mpi mysql odbc postgres python raptor readline sqlite static threads xml python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~amd64 ~x86
 LICENSE=Artistic LGPL-2
-RDEPEND=dev-libs/libutf8proc sys-libs/zlib dev-libs/gmp:0 java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/wheel dev-python/numpy ) raptor? ( media-libs/raptor ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite ) xml? ( dev-libs/libxml2 )
+RDEPEND=dev-libs/libutf8proc sys-libs/zlib dev-libs/gmp:0[cxx] java? ( >=virtual/jdk-1.8:* ) mpi? ( virtual/mpi ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql:= ) R? ( dev-lang/R ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) dev-python/wheel dev-python/numpy ) raptor? ( media-libs/raptor ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) sqlite? ( dev-db/sqlite ) xml? ( dev-libs/libxml2 )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/vscosta/yap/archive/77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz -> yap-77bb2ba5eadfb95b67abccd22b298cfb75dd3328.tar.gz https://dev.gentoo.org/~keri/distfiles/yap/yap-7.1.0-gentoo-patchset-3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=457fcb58b627c834e3bb87ae5e3d2e7a
+_md5_=66b52c5db0054706c03e7660b89b6f1d
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 7c6a7fdc1fdb..04f2a560e28d 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/atk-2.38.0 b/metadata/md5-cache/dev-libs/atk-2.38.0
index 571ed18327f3..d4829175e6d7 100644
--- a/metadata/md5-cache/dev-libs/atk-2.38.0
+++ b/metadata/md5-cache/dev-libs/atk-2.38.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 INHERIT=gnome.org meson-multilib xdg
 IUSE=gtk-doc +introspection 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.38.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.38/atk-2.38.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cd625cdba14fe0a6d24336e738e9f3bb
+_md5_=52714bb3602024a67fd7021ea01348fb
diff --git a/metadata/md5-cache/dev-libs/efl-1.26.2 b/metadata/md5-cache/dev-libs/efl-1.26.2
index a6762de1b6fb..d53d905db26b 100644
--- a/metadata/md5-cache/dev-libs/efl-1.26.2
+++ b/metadata/md5-cache/dev-libs/efl-1.26.2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner ) doc? ( app-doc/doxygen dev-texlive/texlive-fontutils ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) !x11-themes/e-flat-theme dev-libs/libinput:= net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg X? ( !opengl? ( media-libs/mesa[egl(+),gles2] ) media-libs/freetype x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxkbcommon wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif:= ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput:= dev-libs/wayland media-libs/mesa[gbm(+)] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev:= ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz:= ) heif? ( media-libs/libheif:= ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) svg? ( gnome-base/librsvg:2 ) system-lz4? ( app-arch/lz4:= ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind:= ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:=[deprecated(+)] ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated(+)] ) !x11-themes/e-flat-theme dev-libs/libinput:= net-misc/curl media-libs/giflib:= media-libs/libpng:0= sys-apps/dbus sys-libs/zlib virtual/jpeg X? ( !opengl? ( media-libs/mesa[egl(+),gles2] ) media-libs/freetype x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxkbcommon wayland? ( x11-libs/libxkbcommon[X] ) ) avif? ( media-libs/libavif:= ) connman? ( net-misc/connman ) drm? ( dev-libs/libinput:= dev-libs/wayland media-libs/mesa[gbm(+)] x11-libs/libdrm x11-libs/libxkbcommon ) elogind? ( sys-auth/elogind virtual/libudev:= ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz:= ) heif? ( media-libs/libheif:= ) hyphen? ( dev-libs/hyphen ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:= ) json? ( >=media-libs/rlottie-0.0.1_pre20200424:= ) mono? ( dev-lang/mono ) opengl? ( virtual/opengl ) pdf? ( app-text/poppler:=[cxx] ) physics? ( sci-physics/bullet:= ) postscript? ( app-text/libspectre ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw:= ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 ) sound? ( media-libs/libsndfile ) svg? ( gnome-base/librsvg:2 ) system-lz4? ( app-arch/lz4:= ) systemd? ( sys-apps/systemd:= ) tiff? ( media-libs/tiff ) tslib? ( x11-libs/tslib:= ) unwind? ( sys-libs/libunwind:= ) v4l? ( media-libs/libv4l ) vnc? ( net-libs/libvncserver ) wayland? ( dev-libs/wayland media-libs/mesa[gles2,wayland] x11-libs/libxkbcommon ) webp? ( media-libs/libwebp:= ) xpm? ( x11-libs/libXpm ) xpresent? ( x11-libs/libXpresent ) zeroconf? ( net-dns/avahi ) wayland? ( dev-libs/wayland-protocols ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
 EAPI=7
 HOMEPAGE=https://www.enlightenment.org
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.26.2.tar.xz
 _eclasses_=docs	8ed2a8a28ff109e7a3582c9abb7fe327	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b930c37ae00d26d4f13f614127e269a3
+_md5_=9d24c4ae363f87ee35bc2861bfa86a94
diff --git a/metadata/md5-cache/dev-libs/expat-2.4.8 b/metadata/md5-cache/dev-libs/expat-2.4.8
index 0c665b85b6d2..5a486df872f6 100644
--- a/metadata/md5-cache/dev-libs/expat-2.4.8
+++ b/metadata/md5-cache/dev-libs/expat-2.4.8
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://libexpat.github.io/
 INHERIT=autotools multilib-minimal
 IUSE=examples static-libs unicode 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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_8/expat-2.4.8.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2b24d479f9273ce65e2ebb7dd17e74b2
+_md5_=158fd7859d9c39e551c452b187a5927f
diff --git a/metadata/md5-cache/dev-libs/folks-0.15.5 b/metadata/md5-cache/dev-libs/folks-0.15.5
index 30e70e337324..14e1940f0a6b 100644
--- a/metadata/md5-cache/dev-libs/folks-0.15.5
+++ b/metadata/md5-cache/dev-libs/folks-0.15.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks https://gitlab.gnome.org/GNOME/folks
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=bluetooth eds +telepathy test utils
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8[introspection] >=dev-libs/gobject-introspection-1.54:= telepathy? ( >=net-libs/telepathy-glib-0.19.9 dev-libs/dbus-glib ) eds? ( >=gnome-extra/evolution-data-server-3.38:= ) dev-libs/libxml2:2 utils? ( sys-libs/readline:0= ) bluetooth? ( >=net-wireless/bluez-5[obex] ) telepathy? ( net-im/telepathy-mission-control )
 REQUIRED_USE=bluetooth? ( eds )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/26
 SRC_URI=mirror://gnome/sources/folks/0.15/folks-0.15.5.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5c00224a7cc1037f574ad7fa9621b9b5
+_md5_=6f0f69320f5cbec1f120000edf91a997
diff --git a/metadata/md5-cache/dev-libs/fribidi-1.0.12 b/metadata/md5-cache/dev-libs/fribidi-1.0.12
index 3de452bbe226..60c8c509ebc1 100644
--- a/metadata/md5-cache/dev-libs/fribidi-1.0.12
+++ b/metadata/md5-cache/dev-libs/fribidi-1.0.12
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://fribidi.org/
 INHERIT=meson-multilib
 IUSE=doc test 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fribidi/fribidi/releases/download/v1.0.12/fribidi-1.0.12.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=010b45abe62414fb0c958a49325e20f5
+_md5_=df93c369238c2df1f75a79e85d66ce45
diff --git a/metadata/md5-cache/dev-libs/gjs-1.64.5 b/metadata/md5-cache/dev-libs/gjs-1.64.5
index 348861bacca2..11d6c9485057 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.64.5
+++ b/metadata/md5-cache/dev-libs/gjs-1.64.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 INHERIT=gnome.org meson virtualx
 IUSE=+cairo examples gtk readline +sysprof test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.58.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.61.2:= dev-lang/spidermonkey:68 cairo? ( x11-libs/cairo[X] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.64/gjs-1.64.5.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=54dfd012ac24b99697e3870caf63993e
+_md5_=973a8a1eb02129a8640833805fe1b600
diff --git a/metadata/md5-cache/dev-libs/gjs-1.72.0 b/metadata/md5-cache/dev-libs/gjs-1.72.0
index cde981ffe09a..4da44d94efec 100644
--- a/metadata/md5-cache/dev-libs/gjs-1.72.0
+++ b/metadata/md5-cache/dev-libs/gjs-1.72.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Gjs
 INHERIT=flag-o-matic gnome.org meson virtualx
 IUSE=+cairo examples gtk readline sysprof test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
 LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
 RDEPEND=>=dev-libs/glib-2.66.0 dev-libs/libffi:= >=dev-libs/gobject-introspection-1.66.1:= >=dev-lang/spidermonkey-91.3.0:91 cairo? ( x11-libs/cairo[X,glib,svg] ) readline? ( sys-libs/readline:0= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gjs/1.72/gjs-1.72.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=63505b6dc2c3c858b96a669d45c10d67
+_md5_=b1dd049b8d4db08697131cb6f500c42c
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.1 b/metadata/md5-cache/dev-libs/glib-2.72.1
index 56111c11e1f4..d7f55b7b6d29 100644
--- a/metadata/md5-cache/dev-libs/glib-2.72.1
+++ b/metadata/md5-cache/dev-libs/glib-2.72.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gtk.org/
 INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
 IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.72.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[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-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[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-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=76c9b338e0b68a29081089fcacb5dfde
+_md5_=6b7cadd478839eee44a520d857acae4f
diff --git a/metadata/md5-cache/dev-libs/glib-2.72.2 b/metadata/md5-cache/dev-libs/glib-2.72.2
new file mode 100644
index 000000000000..5f09f7a0d5d0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/glib-2.72.2
@@ -0,0 +1,18 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.8 gtk-doc? ( >=dev-util/gtk-doc-1.33 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 ) systemtap? ( >=dev-util/systemtap-1.3 ) || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) test? ( >=sys-apps/dbus-1.2.14 ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=!<dev-util/gdbus-codegen-2.72.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[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-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[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-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=The GLib library of C routines
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=flag-o-matic gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+IUSE=dbus debug +elf fam gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr 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 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+PDEPEND=dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
+RDEPEND=!<dev-util/gdbus-codegen-2.72.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.31:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/libffi-3.0.13-r1:=[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-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[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-apps/util-linux-2.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) elf? ( virtual/libelf:0= ) fam? ( >=virtual/fam-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[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=gtk-doc? ( test )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eb8aca44fcde41ce2485515e94b98b94
diff --git a/metadata/md5-cache/dev-libs/gmime-3.2.11 b/metadata/md5-cache/dev-libs/gmime-3.2.11
index 70ff8648bd34..d7364255f594 100644
--- a/metadata/md5-cache/dev-libs/gmime-3.2.11
+++ b/metadata/md5-cache/dev-libs/gmime-3.2.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jstedfast/gmime http://spruce.sourceforge.net/gmime/
 INHERIT=flag-o-matic gnome2 vala
 IUSE=crypt doc idn test +vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.58.0:2 sys-libs/zlib crypt? ( >=app-crypt/gpgme-1.8.0:= ) idn? ( net-dns/libidn2:= ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-libs/gobject-introspection-1.30.0:= )
 RESTRICT=!test? ( test )
 SLOT=3.0
 SRC_URI=https://github.com/jstedfast/gmime/releases/download/3.2.11/gmime-3.2.11.tar.xz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f79b6bff581529b40fcd7e64ad3b4481
+_md5_=776702c757b27777926ccfb614dc50bb
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
index 74e67044cb75..db8e9824a5bf 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 INHERIT=gnome.org meson python-single-r1 xdg
 IUSE=doctool gtk-doc test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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
+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=LGPL-2+ GPL-2+
 RDEPEND=>=dev-libs/gobject-introspection-common-1.72.0 >=dev-libs/glib-2.58.0:2 dev-libs/libffi:= doctool? ( python_single_target_python3_8? ( dev-python/mako[python_targets_python3_8(-)] dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/mako[python_targets_python3_9(-)] dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/mako[python_targets_python3_10(-)] dev-python/markdown[python_targets_python3_10(-)] ) ) virtual/pkgconfig python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=86c7cfd1bf41dc1ab3e06f4a4df335e6
+_md5_=21d053d3c189a40ad73f47cf7c5eb05e
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
index dff3f3b0f9d1..5204b3f53329 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
@@ -4,10 +4,10 @@ DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 INHERIT=gnome.org
-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
+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=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.72.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.72/gobject-introspection-1.72.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=95d79a6528843668a2ebb05e91193817
+_md5_=3699c23e887ba33aad1c95e612281add
diff --git a/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269 b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
new file mode 100644
index 000000000000..c8f9172ce6da
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/intel-metrics-library:= dev-libs/libnl:3 dev-libs/libxml2:2 >=dev-util/intel-graphics-compiler-1.0.11061-r1 >=dev-util/intel-graphics-system-controller-0.2.4:= media-libs/mesa >=virtual/opencl-3 l0? ( >=dev-libs/level-zero-1.7.15 ) vaapi? ( x11-libs/libdrm[video_cards_intel] x11-libs/libva )
+DESCRIPTION=Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver
+EAPI=8
+HOMEPAGE=https://github.com/intel/compute-runtime
+INHERIT=cmake flag-o-matic
+IUSE=+l0 +vaapi
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=media-libs/gmmlib-22.0.2:=
+SLOT=0
+SRC_URI=https://github.com/intel/compute-runtime/archive/22.21.23269.tar.gz -> intel-compute-runtime-22.21.23269.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3d1ab25267c27ac0bc040ff2cb178e71
diff --git a/metadata/md5-cache/dev-libs/jemalloc-5.3.0 b/metadata/md5-cache/dev-libs/jemalloc-5.3.0
index e48279c07f8b..847cf8de954b 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-5.3.0
+++ b/metadata/md5-cache/dev-libs/jemalloc-5.3.0
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=http://jemalloc.net/ https://github.com/jemalloc/jemalloc
 INHERIT=autotools multilib-minimal
 IUSE=debug lazy-lock prof stats xmalloc 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=~loong
+KEYWORDS=~loong ~sparc
 LICENSE=BSD
 SLOT=0/2
 SRC_URI=https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=138c84d1eff5383459a246ad60a68ff0
+_md5_=c2eaa6a78b0f3a2fd22d2bd8a78f2afe
diff --git a/metadata/md5-cache/dev-libs/json-c-0.15 b/metadata/md5-cache/dev-libs/json-c-0.15
deleted file mode 100644
index 4ad98ae5c4c5..000000000000
--- a/metadata/md5-cache/dev-libs/json-c-0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=doc? ( >=app-doc/doxygen-1.8.13 ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A JSON implementation in C
-EAPI=7
-HOMEPAGE=https://github.com/json-c/json-c/wiki
-INHERIT=cmake-multilib
-IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-SLOT=0/5
-SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.15.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0cc0f733e2f82842a04dc36a22e2f45f
diff --git a/metadata/md5-cache/dev-libs/json-c-0.16-r1 b/metadata/md5-cache/dev-libs/json-c-0.16-r1
index 98a5bc1abaf0..10e41775f575 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.16-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.16-r1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/json-c/json-c/wiki
 INHERIT=cmake-multilib
 IUSE=cpu_flags_x86_rdrand doc static-libs threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0/5
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e4e727e44744793584e3698d9a9a1ba4
+_md5_=ab5f616b577983ee2bda66f7ec102d06
diff --git a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5 b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
index 624803af9e89..4bc2fd4aa5bb 100644
--- a/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
+++ b/metadata/md5-cache/dev-libs/jsoncpp-1.9.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
 INHERIT=meson python-any-r1
 IUSE=doc test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( public-domain MIT )
 RESTRICT=!test? ( test )
 SLOT=0/25
 SRC_URI=https://github.com/open-source-parsers/jsoncpp/archive/1.9.5.tar.gz -> jsoncpp-1.9.5.tar.gz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4695b4f3e9acde6cae78eeb2e2ca0f1e
+_md5_=9ded3434c67017b2e0a9ac2940cb1601
diff --git a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0 b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
index 9f53552aba8f..a2642a5ef441 100644
--- a/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
+++ b/metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/jsonrpc-glib
 INHERIT=gnome.org meson vala
 IUSE=gtk-doc +introspection test vala
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/json-glib[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/jsonrpc-glib/3.42/jsonrpc-glib-3.42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8
-_md5_=9abb50bfe5c94bcab39015a8ccd1a581
+_md5_=78f392a5417f84b90bbac163f6798cd0
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.4 b/metadata/md5-cache/dev-libs/libclc-14.0.4
new file mode 100644
index 000000000000..b13a86f366a5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.4
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( sys-devel/clang:14 sys-devel/clang:13 sys-devel/clang:12 sys-devel/clang:11 sys-devel/clang:10 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!!sys-devel/llvm:0
+DESCRIPTION=OpenCL C library
+EAPI=8
+HOMEPAGE=https://libclc.llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=video_cards_nvidia video_cards_r600 video_cards_radeonsi
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
+REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3d0d9669ff1ac2ee9699d7e441b97db2
diff --git a/metadata/md5-cache/dev-libs/libdazzle-3.44.0 b/metadata/md5-cache/dev-libs/libdazzle-3.44.0
index 21d2c9c5267f..75d7eb08037b 100644
--- a/metadata/md5-cache/dev-libs/libdazzle-3.44.0
+++ b/metadata/md5-cache/dev-libs/libdazzle-3.44.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libdazzle
 INHERIT=gnome.org meson vala virtualx
 IUSE=gtk-doc +introspection test +vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.24.0:3[introspection?] introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libdazzle/3.44/libdazzle-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=fe348eba9b75979577f5dfa872206c71
+_md5_=aed3d7ac613063f1258b54088b221ffe
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.0 b/metadata/md5-cache/dev-libs/libevdev-1.12.0
deleted file mode 100644
index 8f315bd77926..000000000000
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) doc? ( app-doc/doxygen ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=test? ( dev-libs/check[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=Handler library for evdev events
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
-INHERIT=meson-multilib python-any-r1
-IUSE=doc test 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=55b0bb4128728b76fc505a95f41906a6
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.12.1 b/metadata/md5-cache/dev-libs/libevdev-1.12.1
index 6f10edf72010..a8c27c52159e 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.12.1
+++ b/metadata/md5-cache/dev-libs/libevdev-1.12.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libevdev/ https://gitlab.freedesktop.org/libevdev/libevdev
 INHERIT=meson-multilib python-any-r1
 IUSE=doc test 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f23338e3988d6ce293eeb1a20983b1b2
+_md5_=e63e4a7a6b9beea285e4b1d586ad7579
diff --git a/metadata/md5-cache/dev-libs/libgit2-1.4.3 b/metadata/md5-cache/dev-libs/libgit2-1.4.3
index 58560cc9b27e..ac94566db63b 100644
--- a/metadata/md5-cache/dev-libs/libgit2-1.4.3
+++ b/metadata/md5-cache/dev-libs/libgit2-1.4.3
@@ -1,4 +1,4 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 DESCRIPTION=A linkable library for Git
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://libgit2.org/
 INHERIT=cmake python-any-r1
 IUSE=examples gssapi +ssh test +threads trace
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86 ~ppc-macos
 LICENSE=GPL-2-with-linking-exception
 RDEPEND=dev-libs/libpcre2:= net-libs/http-parser:= sys-libs/zlib dev-libs/openssl:0= gssapi? ( virtual/krb5 ) ssh? ( net-libs/libssh2 )
 RESTRICT=!test? ( test )
 SLOT=0/1.4
 SRC_URI=https://github.com/libgit2/libgit2/archive/v1.4.3.tar.gz -> libgit2-1.4.3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=87041986027ad6688c2a1bb6212a0b71
+_md5_=50aff98c81158b9cd462aeae2624df30
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0 b/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
index f12513e820c1..816f7427e299 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Library for code common to GNOME games
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgnome-games-support
 INHERIT=gnome.org meson vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/libgee-0.14.0:0.8= >=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.2:4
 SLOT=2/4
 SRC_URI=mirror://gnome/sources/libgnome-games-support/2.0/libgnome-games-support-2.0.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f65b9f4c31ba850fb5d729ce45ea34b5
+_md5_=601557d217f20fef694b9868b91c29dc
diff --git a/metadata/md5-cache/dev-libs/libgweather-4.0.0 b/metadata/md5-cache/dev-libs/libgweather-4.0.0
index be3521a7a9c7..d8aaf07ef691 100644
--- a/metadata/md5-cache/dev-libs/libgweather-4.0.0
+++ b/metadata/md5-cache/dev-libs/libgweather-4.0.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/LibGWeather
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=gtk-doc +introspection test +vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.68.0:2 >=net-libs/libsoup-2.44:2.4 >=dev-libs/libxml2-2.6.0:2 sci-geosciences/geocode-glib introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=4/4-0
 SRC_URI=mirror://gnome/sources/libgweather/4.0/libgweather-4.0.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5e42afded88c737ca7a4034833ebf090
+_md5_=c653a3e9d0e802c56b3fbcb01889c57c
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21 b/metadata/md5-cache/dev-libs/libintl-0.21
index 55c102f16850..caf6c20d9749 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21
+++ b/metadata/md5-cache/dev-libs/libintl-0.21
@@ -12,4 +12,4 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.tar.xz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b6e77fc2cab6565259d6d5d39b202e57
+_md5_=3f18a288e39a65ff476bc954b368f4a7
diff --git a/metadata/md5-cache/dev-libs/libnop-2021.11.03 b/metadata/md5-cache/dev-libs/libnop-2021.11.03
new file mode 100644
index 000000000000..4d32cac62568
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libnop-2021.11.03
@@ -0,0 +1,12 @@
+BDEPEND=test? ( dev-cpp/gtest )
+DEFINED_PHASES=compile install test
+DESCRIPTION=C++ Native Object Protocols
+EAPI=8
+HOMEPAGE=https://github.com/google/libnop
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/libnop/archive/35e800d81f28c632956c5a592e3cbe8085ecd430.tar.gz -> libnop-2021.11.03.tar.gz
+_md5_=5e0b5145d5e01ae7e01535432aa325b6
diff --git a/metadata/md5-cache/dev-libs/libpeas-1.32.0 b/metadata/md5-cache/dev-libs/libpeas-1.32.0
index 99f38acc4b4e..f7a5dca935a6 100644
--- a/metadata/md5-cache/dev-libs/libpeas-1.32.0
+++ b/metadata/md5-cache/dev-libs/libpeas-1.32.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.11 >=dev-util/gi-docgen-2021.7 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) )
 DESCRIPTION=A GObject plugins library
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://developer.gnome.org/libpeas/stable/
 INHERIT=gnome.org lua-single meson python-single-r1 vala virtualx xdg
 IUSE=glade +gtk gtk-doc lua +python vala lua_single_target_luajit lua_single_target_lua5-1 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= gtk? ( >=x11-libs/gtk+-3.0.0:3[introspection] ) glade? ( >=dev-util/glade-3.9.1:3.10 ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_luajit? ( >=dev-lua/lgi-0.9.0[lua_targets_luajit(-)] ) lua_single_target_lua5-1? ( >=dev-lua/lgi-0.9.0[lua_targets_lua5-1(-)] ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.2:3[python_targets_python3_10(-)] ) )
 REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libpeas/1.32/libpeas-1.32.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1c51de282783096bfbedc81d3263b696
+_md5_=4b929947c38b18360cf48acdf0eb3b26
diff --git a/metadata/md5-cache/dev-libs/libportal-0.6 b/metadata/md5-cache/dev-libs/libportal-0.6
index 840716a601ad..9580407c0517 100644
--- a/metadata/md5-cache/dev-libs/libportal-0.6
+++ b/metadata/md5-cache/dev-libs/libportal-0.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/flatpak/libportal
 INHERIT=meson vala virtualx
 IUSE=gtk gtk-doc +introspection qt5 test +vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-libs/glib-2.58:2 introspection? ( dev-libs/gobject-introspection:= ) gtk? ( x11-libs/gtk+:3 gui-libs/gtk:4 ) qt5? ( dev-qt/qtcore:= dev-qt/qtgui:= dev-qt/qtx11extras:= dev-qt/qtwidgets:= )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0/1-1-1-1
 SRC_URI=https://github.com/flatpak/libportal/releases/download/0.6/libportal-0.6.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=d45ee13a47a1d933130529a7c1bb6e7d
+_md5_=7b08d2eda380063b9996baf02fd592fd
diff --git a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1 b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
index 89add3f91576..f3e4fcffc237 100644
--- a/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
+++ b/metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/libpwquality/libpwquality
 INHERIT=pam python-r1 usr-ldscript
 IUSE=pam python static-libs python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=|| ( BSD GPL-2 )
 RDEPEND=>=sys-libs/cracklib-2.8:=[static-libs(+)?] pam? ( sys-libs/pam ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.4/libpwquality-1.4.4.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=a00d52b72d1bca7bfaee693f8d9e0897
+_md5_=998ac0abfe4c92c4e73d3682beef1701
diff --git a/metadata/md5-cache/dev-libs/libuv-1.44.1 b/metadata/md5-cache/dev-libs/libuv-1.44.1
index 8079ddd65954..4173eb660182 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.44.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.44.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/libuv/libuv
 INHERIT=autotools multilib-minimal
 IUSE=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 ~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=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.44.1.tar.gz -> libuv-1.44.1.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7c8e28e680475fd0ad12cdff5da218fe
+_md5_=45aec6d47eac26cd118ed10f13a23905
diff --git a/metadata/md5-cache/dev-libs/libuv-9999 b/metadata/md5-cache/dev-libs/libuv-9999
index 75d35584ef47..247f029160e6 100644
--- a/metadata/md5-cache/dev-libs/libuv-9999
+++ b/metadata/md5-cache/dev-libs/libuv-9999
@@ -9,4 +9,4 @@ LICENSE=BSD BSD-2 ISC MIT
 PROPERTIES=live
 SLOT=0/1
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0e3ec362aa42c8165571b1b6d9d318d0
+_md5_=2871bba45a64946a4492be62e24403ba
diff --git a/metadata/md5-cache/dev-libs/libwacom-2.2.0 b/metadata/md5-cache/dev-libs/libwacom-2.2.0
new file mode 100644
index 000000000000..91b4b713c7fa
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-2.2.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/python-libevdev[python_targets_python3_11(-)] dev-python/pyudev[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] dev-python/pyudev[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] dev-python/pyudev[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] dev-python/pyudev[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] ) ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+DESCRIPTION=Library for identifying Wacom tablets and their model-specific features
+EAPI=8
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+INHERIT=meson python-any-r1 udev
+IUSE=doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 dev-libs/libgudev:=
+RESTRICT=!test? ( test )
+SLOT=0/9
+SRC_URI=https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.2.0/libwacom-2.2.0.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=d47e0e7139747256f297cec16629f8dc
diff --git a/metadata/md5-cache/dev-libs/metee-3.1.3 b/metadata/md5-cache/dev-libs/metee-3.1.3
index dc38c5f83fd8..b6baaee37ae0 100644
--- a/metadata/md5-cache/dev-libs/metee-3.1.3
+++ b/metadata/md5-cache/dev-libs/metee-3.1.3
@@ -10,4 +10,4 @@ LICENSE=Apache-2.0
 SLOT=0/3.1.3
 SRC_URI=https://github.com/intel/metee/archive/refs/tags/3.1.3.tar.gz -> metee-3.1.3.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fbe601a41ea229a43ebca115431cc08c
+_md5_=5f6e1b696defb1fcf2f44c9604cc2048
diff --git a/metadata/md5-cache/dev-libs/mimalloc-2.0.6 b/metadata/md5-cache/dev-libs/mimalloc-2.0.6
index b5551c350b8f..e48d6dae0016 100644
--- a/metadata/md5-cache/dev-libs/mimalloc-2.0.6
+++ b/metadata/md5-cache/dev-libs/mimalloc-2.0.6
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/mimalloc
 INHERIT=cmake-multilib
 IUSE=test 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=~amd64 ~loong ~x86
+KEYWORDS=amd64 ~loong ~x86
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/microsoft/mimalloc/archive/refs/tags/v2.0.6.tar.gz -> mimalloc-2.0.6.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ff5fdda24e38ec550b27aaf6dc1b09ec
+_md5_=0484ce695141c706f9c1c5c0e6b7a099
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1o b/metadata/md5-cache/dev-libs/openssl-1.1.1o
index c65b4d330cd4..3dffcce3374c 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1o
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1o
@@ -4,7 +4,7 @@ DEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[st
 DESCRIPTION=full-strength general purpose cryptography library (including SSL and TLS)
 EAPI=7
 HOMEPAGE=https://www.openssl.org/
-INHERIT=flag-o-matic toolchain-funcs multilib-minimal verify-sig
+INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 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 ~x86-winnt
 LICENSE=openssl
@@ -13,5 +13,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1o.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1o.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9356e09366ff9f743574a7729f335ba9
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=8e3bed2a63334fe55f1c90d29dde2a76
diff --git a/metadata/md5-cache/dev-libs/serd-0.30.12 b/metadata/md5-cache/dev-libs/serd-0.30.12
new file mode 100644
index 000000000000..0c8f24c32d2d
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/serd-0.30.12
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
+DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and NTriples
+EAPI=7
+HOMEPAGE=http://drobilla.net/software/serd/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal
+IUSE=doc static-libs test 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/serd-0.30.12.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=d7728df8fee15882626755914f373ec6
diff --git a/metadata/md5-cache/dev-libs/sord-0.16.10 b/metadata/md5-cache/dev-libs/sord-0.16.10
new file mode 100644
index 000000000000..464b502c7c8c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sord-0.16.10
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libpcre dev-libs/serd || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
+DESCRIPTION=Library for storing RDF data in memory
+EAPI=7
+HOMEPAGE=http://drobilla.net/software/sord/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal
+IUSE=doc static-libs test 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/libpcre dev-libs/serd
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/sord-0.16.10.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=426ec7df5f3b593f27234cdfb9ec6507
diff --git a/metadata/md5-cache/dev-libs/sord-9999 b/metadata/md5-cache/dev-libs/sord-9999
index 76e5ddaa5140..699e9c77ee4f 100644
--- a/metadata/md5-cache/dev-libs/sord-9999
+++ b/metadata/md5-cache/dev-libs/sord-9999
@@ -1,6 +1,6 @@
 BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/libpcre dev-libs/serd || ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
+DEPEND=dev-libs/libpcre dev-libs/serd || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
 DESCRIPTION=Library for storing RDF data in memory
 EAPI=7
 HOMEPAGE=http://drobilla.net/software/sord/
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/libpcre dev-libs/serd
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=c10dc4c4396b3d0273243ff41e8727fc
+_md5_=cbbc607343aa0277e49f5d0beb024896
diff --git a/metadata/md5-cache/dev-libs/template-glib-3.34.1 b/metadata/md5-cache/dev-libs/template-glib-3.34.1
index 376d1647b69c..baa8c7fb1d19 100644
--- a/metadata/md5-cache/dev-libs/template-glib-3.34.1
+++ b/metadata/md5-cache/dev-libs/template-glib-3.34.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/template-glib
 INHERIT=gnome.org meson vala
 IUSE=gtk-doc +introspection vala
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2 dev-libs/gobject-introspection:=
 REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/template-glib/3.34/template-glib-3.34.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8
-_md5_=d9bd6eaec52a36a1a4237aa8885ff0c9
+_md5_=7d9dc0c3910368aed432b55df9ce2bd3
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.56.1 b/metadata/md5-cache/dev-libs/vala-common-0.56.1
index 8cc6b7bc0d85..293ef4166314 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.56.1
+++ b/metadata/md5-cache/dev-libs/vala-common-0.56.1
@@ -4,9 +4,9 @@ DESCRIPTION=Build infrastructure for packages that use Vala
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/Vala
 INHERIT=gnome.org
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/vala/0.56/vala-0.56.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=357b8a61c9766b629b43c7ae9bc89d5e
+_md5_=76240e9fed9fd0a3b43eefe721fd05a4
diff --git a/metadata/md5-cache/dev-libs/wayland-protocols-1.24 b/metadata/md5-cache/dev-libs/wayland-protocols-1.24
deleted file mode 100644
index 9535222d4a96..000000000000
--- a/metadata/md5-cache/dev-libs/wayland-protocols-1.24
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/wayland-scanner virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=test? ( dev-libs/wayland )
-DESCRIPTION=Wayland protocol files
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/
-INHERIT=meson
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/wayland-protocols-1.24.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a13d4253eb9dcfbbf16cbd6a967dc099
diff --git a/metadata/md5-cache/dev-libs/weston-10.0.0 b/metadata/md5-cache/dev-libs/weston-10.0.0
index 49757f3e8324..ea6104743984 100644
--- a/metadata/md5-cache/dev-libs/weston-10.0.0
+++ b/metadata/md5-cache/dev-libs/weston-10.0.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
 INHERIT=meson python-any-r1 readme.gentoo-r1 xdg-utils
 IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +seatd +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT CC-BY-SA-3.0
 RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.24 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.95 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm(+)] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) examples? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) pipewire? ( >=media-video/pipewire-0.3:= ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) seatd? ( sys-auth/seatd:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xwayland x11-libs/cairo[X,xcb(+)] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
 REQUIRED_USE=colord? ( lcms ) drm? ( gles2 ) pipewire? ( drm ) remoting? ( drm gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://wayland.freedesktop.org/releases/weston-10.0.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9ff5d0ad94fc6a78767129b537d103ca
+_md5_=02b9b78bcc78136d74b89e0ee799a2e6
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index a9c09650391c..d37f17cf122e 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.4 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.4
new file mode 100644
index 000000000000..99667dfcf6fb
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.4
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-14.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.4[llvm_targets_M68k] ) !!sys-devel/llvm:0
+DESCRIPTION=OCaml bindings for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-any-r1
+IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-14.0.4:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.4[llvm_targets_M68k] )
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k )
+RESTRICT=!test? ( test )
+SLOT=0/14.0.4
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fbae63c9b8e8f4c773111b71ce3e17ae
diff --git a/metadata/md5-cache/dev-perl/Alien-Build-2.380.0 b/metadata/md5-cache/dev-perl/Alien-Build-2.480.0
similarity index 61%
rename from metadata/md5-cache/dev-perl/Alien-Build-2.380.0
rename to metadata/md5-cache/dev-perl/Alien-Build-2.480.0
index ece3c5e78336..720400bbb35f 100644
--- a/metadata/md5-cache/dev-perl/Alien-Build-2.380.0
+++ b/metadata/md5-cache/dev-perl/Alien-Build-2.480.0
@@ -1,16 +1,16 @@
-BDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig test? ( dev-perl/Devel-Hide >=dev-perl/Test2-Suite-0.0.60 !minimal? ( dev-perl/Alien-Base-ModuleBuild dev-perl/Sort-Versions ) ) dev-lang/perl
+BDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig test? ( dev-perl/Devel-Hide >=dev-perl/Test2-Suite-0.0.121 !minimal? ( dev-perl/Alien-Base-ModuleBuild dev-perl/Sort-Versions ) ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Build external dependencies for use in CPAN
-EAPI=7
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/Alien-Build
 INHERIT=perl-module
-IUSE=minimal test zip examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+IUSE=minimal zip test examples
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Scalar-List-Utils-1.330.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
+RDEPEND=zip? ( dev-perl/Archive-Zip ) virtual/perl-Archive-Tar >=dev-perl/Capture-Tiny-0.170.0 virtual/perl-Digest-SHA virtual/perl-ExtUtils-CBuilder >=virtual/perl-ExtUtils-MakeMaker-6.640.0 >=virtual/perl-ExtUtils-ParseXS-3.300.0 >=dev-perl/FFI-CheckLib-0.110.0 >=dev-perl/File-Which-1.100.0 dev-perl/File-chdir virtual/perl-JSON-PP >=virtual/perl-Scalar-List-Utils-1.330.0 >=dev-perl/Path-Tiny-0.77.0 >=virtual/perl-Test-Simple-1.302.96 >=virtual/perl-Text-ParseWords-3.260.0 virtual/pkgconfig dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.38.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
-_md5_=68717b36fa417b3a56ac2060b5adb993
+SRC_URI=mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-2.48.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=825705299badad4dd1ee5ad8da9a494e
diff --git a/metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0-r1 b/metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0-r1
deleted file mode 100644
index 38c320b2c760..000000000000
--- a/metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Time-HiRes sci-visualization/gnuplot virtual/perl-ExtUtils-MakeMaker dev-lang/perl
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=Find and verify functionality of the gnuplot executable
-EAPI=7
-HOMEPAGE=https://metacpan.org/release/Alien-Gnuplot
-INHERIT=perl-module
-KEYWORDS=amd64 ~x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-HTTP-Tiny virtual/perl-Time-HiRes sci-visualization/gnuplot dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/Z/ZO/ZOWIE/Alien-Gnuplot-1.033.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
-_md5_=dcfc54846181a96d4d2cb854b34b1a75
diff --git a/metadata/md5-cache/dev-perl/B-Keywords-1.240.0 b/metadata/md5-cache/dev-perl/B-Keywords-1.240.0
new file mode 100644
index 000000000000..b95e74c2495c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/B-Keywords-1.240.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Lists of reserved barewords and symbol names
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/B-Keywords
+INHERIT=perl-module
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=|| ( Artistic GPL-2 )
+RDEPEND=dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.24.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=cbaac0f95b1e6523455e81356696dfd2
diff --git a/metadata/md5-cache/dev-perl/DBI-1.643.0 b/metadata/md5-cache/dev-perl/DBI-1.643.0
index 30baa959a69f..16d4d48b0511 100644
--- a/metadata/md5-cache/dev-perl/DBI-1.643.0
+++ b/metadata/md5-cache/dev-perl/DBI-1.643.0
@@ -1,16 +1,16 @@
-BDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl
+BDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils !<=dev-perl/SQL-Statement-1.330.0 >=virtual/perl-ExtUtils-MakeMaker-6.480.0 test? ( >=virtual/perl-Test-Simple-0.900.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Database independent interface for Perl
-EAPI=7
+EAPI=8
 HOMEPAGE=https://metacpan.org/release/DBI
 INHERIT=perl-module
-IUSE=test examples
+IUSE=test test examples
 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=|| ( Artistic GPL-1+ )
-RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=
-RESTRICT=!test? ( test )
+RDEPEND=>=dev-perl/PlRPC-0.200.0 >=virtual/perl-Sys-Syslog-0.170.0 virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-Scalar-List-Utils !<=dev-perl/SQL-Statement-1.330.0 dev-lang/perl:=
+RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/DBI-1.643.tar.gz
-_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0
-_md5_=4b758a3567bd6265e268d361c3634754
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=1a57fc768cbb98bed81385283d8cad70
diff --git a/metadata/md5-cache/dev-perl/Inline-0.860.0 b/metadata/md5-cache/dev-perl/Inline-0.860.0
index 50036a42f0fd..b3fd477a92de 100644
--- a/metadata/md5-cache/dev-perl/Inline-0.860.0
+++ b/metadata/md5-cache/dev-perl/Inline-0.860.0
@@ -1,4 +1,4 @@
-BDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.800.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-Warn-0.230.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+BDEPEND=virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-File-Spec-0.800.0 virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 >=dev-perl/Test-Warn-0.230.0 ) dev-lang/perl test? ( virtual/perl-Test-Simple )
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-lang/perl
 DESCRIPTION=Write Perl subroutines in other languages
@@ -8,9 +8,9 @@ INHERIT=perl-module
 IUSE=test test
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Digest-MD5 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
+RDEPEND=virtual/perl-Digest-MD5 virtual/perl-Encode >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/I/IN/INGY/Inline-0.86.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=9b7157a6670a0e61519a5ac70f0137b8
+_md5_=7c3fce9ed54c817ab7a2b36a4ce1335d
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e96b443d3cab..7620a61d080d 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
index 0b51b0f9569f..531d64d033fa 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.90.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=04e9eca90caaf8e45ba9a91d9d17124c
+_md5_=33d018ace03814e98d5a6961cf5564af
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
new file mode 100644
index 000000000000..c445949418ec
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/openssl:= virtual/perl-MIME-Base64 virtual/perl-ExtUtils-MakeMaker virtual/perl-File-Spec test? ( !minimal? ( dev-perl/Test-Exception dev-perl/Test-Warn dev-perl/Test-NoWarnings ) virtual/perl-Test-Simple ) dev-lang/perl test? ( virtual/perl-Test-Simple )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/openssl:= virtual/perl-MIME-Base64 dev-lang/perl
+DESCRIPTION=Perl extension for using OpenSSL
+EAPI=8
+HOMEPAGE=https://metacpan.org/release/Net-SSLeay
+INHERIT=perl-module
+IUSE=minimal examples test examples
+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=Artistic-2
+RDEPEND=dev-libs/openssl:= virtual/perl-MIME-Base64 dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
+_md5_=255c8e2fcd8fcb14966fbb4b69b53507
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 7f96469bc57e..1c04bc12d63f 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/smarty-4.0.4 b/metadata/md5-cache/dev-php/smarty-4.0.4
deleted file mode 100644
index 5bc3cb8514e2..000000000000
--- a/metadata/md5-cache/dev-php/smarty-4.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=doc? ( app-arch/unzip )
-DEFINED_PHASES=install postinst
-DESCRIPTION=A template engine for PHP
-EAPI=8
-HOMEPAGE=https://www.smarty.net/
-IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-3
-RDEPEND=dev-lang/php:*[unicode]
-SLOT=0
-SRC_URI=https://github.com/smarty-php/smarty/archive/v4.0.4.tar.gz -> smarty-4.0.4.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=e574d64bdd7bc8d33d38122bdae5489d
diff --git a/metadata/md5-cache/dev-php/smarty-4.1.1 b/metadata/md5-cache/dev-php/smarty-4.1.1
index 257480325121..410e74727d58 100644
--- a/metadata/md5-cache/dev-php/smarty-4.1.1
+++ b/metadata/md5-cache/dev-php/smarty-4.1.1
@@ -4,9 +4,9 @@ DESCRIPTION=A template engine for PHP
 EAPI=8
 HOMEPAGE=https://www.smarty.net/
 IUSE=doc
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-3
 RDEPEND=dev-lang/php:*[unicode]
 SLOT=0
 SRC_URI=https://github.com/smarty-php/smarty/archive/v4.1.1.tar.gz -> smarty-4.1.1.tar.gz doc? ( https://www.smarty.net/files/docs/manual-en.3.1.14.zip )
-_md5_=8977f8c76d860dc36b8f3963b5fc1e04
+_md5_=e574d64bdd7bc8d33d38122bdae5489d
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.27 b/metadata/md5-cache/dev-python/GitPython-3.1.27
index 6c5f4bda3558..9177eafab160 100644
--- a/metadata/md5-cache/dev-python/GitPython-3.1.27
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.27
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/
 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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
 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=mirror://pypi/G/GitPython/GitPython-3.1.27.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.27.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.9.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-5.0.0.gitbundle )
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1aee080cf5ced97a02894e70eac95bef
+_md5_=95e090cabdc5a9326f2d68cf010b0d95
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 5db3c9c88b35..0ab5ca9c92d0 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.28.3 b/metadata/md5-cache/dev-python/PyPDF2-1.28.3
new file mode 100644
index 000000000000..d14ac73ada6d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.28.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/py-pdf/PyPDF2/archive/1.28.3.tar.gz -> PyPDF2-1.28.3.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz -> PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz )
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=aee326bfe72bf53c962abebd4f2430e2
diff --git a/metadata/md5-cache/dev-python/PyPDF2-1.28.4 b/metadata/md5-cache/dev-python/PyPDF2-1.28.4
new file mode 100644
index 000000000000..414da3d3ec40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-1.28.4
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Python library to work with PDF files
+EAPI=8
+HOMEPAGE=https://pypi.org/project/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/py-pdf/PyPDF2/archive/1.28.4.tar.gz -> PyPDF2-1.28.4.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/41b5cd4f774f8fbd8ac42d93b9962f0376352a15.tar.gz -> PyPDF2-sample-files-41b5cd4f774f8fbd8ac42d93b9962f0376352a15.gh.tar.gz )
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=aee326bfe72bf53c962abebd4f2430e2
diff --git a/metadata/md5-cache/dev-python/aesara-2.5.3 b/metadata/md5-cache/dev-python/aesara-2.5.3
deleted file mode 100644
index e81b7debd44b..000000000000
--- a/metadata/md5-cache/dev-python/aesara-2.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
-EAPI=8
-HOMEPAGE=https://github.com/aesara-devs/aesara
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aesara-devs/aesara/archive/rel-2.5.3.tar.gz -> aesara-rel-2.5.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e0559fb584d7b284c272288289af8451
diff --git a/metadata/md5-cache/dev-python/aesara-2.6.3 b/metadata/md5-cache/dev-python/aesara-2.6.3
deleted file mode 100644
index 7b8778561cd3..000000000000
--- a/metadata/md5-cache/dev-python/aesara-2.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
-EAPI=8
-HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aesara-devs/aesara/archive/rel-2.6.3.tar.gz -> aesara-rel-2.6.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ea924eef1238af3556731b21255e2b7c
diff --git a/metadata/md5-cache/dev-python/aesara-2.6.4 b/metadata/md5-cache/dev-python/aesara-2.6.4
deleted file mode 100644
index 618acb671371..000000000000
--- a/metadata/md5-cache/dev-python/aesara-2.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
-EAPI=8
-HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aesara-devs/aesara/archive/rel-2.6.4.tar.gz -> aesara-rel-2.6.4.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ea924eef1238af3556731b21255e2b7c
diff --git a/metadata/md5-cache/dev-python/aesara-2.6.5 b/metadata/md5-cache/dev-python/aesara-2.6.5
deleted file mode 100644
index 847bae85968a..000000000000
--- a/metadata/md5-cache/dev-python/aesara-2.6.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Library for operating on mathematical expressions with multi-dimensional arrays
-EAPI=8
-HOMEPAGE=https://github.com/aesara-devs/aesara/ https://pypi.org/project/aesara/
-INHERIT=distutils-r1 multiprocessing optfeature
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=dev-python/cons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/etuples[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/logical-unification[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/minikanren[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/filelock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/aesara-devs/aesara/archive/rel-2.6.5.tar.gz -> aesara-rel-2.6.5.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=eba6bfed8ce2eaef347aa0128518a9de
diff --git a/metadata/md5-cache/dev-python/apsw-3.35.4_p1 b/metadata/md5-cache/dev-python/apsw-3.35.4_p1
deleted file mode 100644
index 4e119fb06175..000000000000
--- a/metadata/md5-cache/dev-python/apsw-3.35.4_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-db/sqlite-3.35.4
-DESCRIPTION=APSW - Another Python SQLite Wrapper
-EAPI=7
-HOMEPAGE=https://github.com/rogerbinns/apsw/
-INHERIT=distutils-r1
-IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~ppc64 x86
-LICENSE=ZLIB
-RDEPEND=>=dev-db/sqlite-3.35.4 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/rogerbinns/apsw/releases/download/3.35.4-r1/apsw-3.35.4-r1.zip -> apsw-3.35.4_p1.zip
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e12f794f15c5023e6f1fdabec3a67634
diff --git a/metadata/md5-cache/dev-python/astor-0.8.1 b/metadata/md5-cache/dev-python/astor-0.8.1
deleted file mode 100644
index d248347e05f5..000000000000
--- a/metadata/md5-cache/dev-python/astor-0.8.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Read/rewrite/write Python ASTs
-EAPI=7
-HOMEPAGE=https://pypi.org/project/astor/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/astor/astor-0.8.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c7f74d25572ca5b9333ec15990eb976c
diff --git a/metadata/md5-cache/dev-python/autopage-0.5.1 b/metadata/md5-cache/dev-python/autopage-0.5.1
new file mode 100644
index 000000000000..47052bc448db
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopage-0.5.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library to provide automatic paging for console output
+EAPI=8
+HOMEPAGE=https://github.com/zaneb/autopage/ https://pypi.org/project/autopage/
+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 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/zaneb/autopage/archive/v0.5.1.tar.gz -> autopage-0.5.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=517bbaefe738fc6acdc11fe85a428711
diff --git a/metadata/md5-cache/dev-python/backoff-1.11.0 b/metadata/md5-cache/dev-python/backoff-1.11.0
deleted file mode 100644
index 75ef633ea69b..000000000000
--- a/metadata/md5-cache/dev-python/backoff-1.11.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/pyproject2setuppy-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Function decoration for backoff and retry
-EAPI=8
-HOMEPAGE=https://github.com/litl/backoff https://pypi.org/project/backoff/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/litl/backoff/archive/v1.11.0.tar.gz -> backoff-1.11.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4764bbf84722b2cf5acb2726be28eff0
diff --git a/metadata/md5-cache/dev-python/backoff-1.11.1 b/metadata/md5-cache/dev-python/backoff-1.11.1
deleted file mode 100644
index ddacc6d753da..000000000000
--- a/metadata/md5-cache/dev-python/backoff-1.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Function decoration for backoff and retry
-EAPI=8
-HOMEPAGE=https://github.com/litl/backoff/ https://pypi.org/project/backoff/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/litl/backoff/archive/v1.11.1.tar.gz -> backoff-1.11.1.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3a2d3875b3c00c6726591e5b9bed5d58
diff --git a/metadata/md5-cache/dev-python/backoff-2.0.0 b/metadata/md5-cache/dev-python/backoff-2.0.0
deleted file mode 100644
index 88992b5eabd7..000000000000
--- a/metadata/md5-cache/dev-python/backoff-2.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Function decoration for backoff and retry
-EAPI=8
-HOMEPAGE=https://github.com/litl/backoff/ https://pypi.org/project/backoff/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/litl/backoff/archive/v2.0.0.tar.gz -> backoff-2.0.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c9ce25cbfb1aa653b31772b5984dd1b9
diff --git a/metadata/md5-cache/dev-python/bandit-1.7.4 b/metadata/md5-cache/dev-python/bandit-1.7.4
index 7c776a28d048..8b59c185ed78 100644
--- a/metadata/md5-cache/dev-python/bandit-1.7.4
+++ b/metadata/md5-cache/dev-python/bandit-1.7.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyCQA/bandit
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/GitPython-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/bandit/bandit-1.7.4.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9e6059bb548e58c710ad3155ae88c3fd
+_md5_=7fd0b5ca358515aaee876095dc3e0f12
diff --git a/metadata/md5-cache/dev-python/beniget-0.4.1-r1 b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
new file mode 100644
index 000000000000..ba60d7c051a2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beniget-0.4.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( =dev-python/gast-0.5*[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extract semantic information about static Python code
+EAPI=8
+HOMEPAGE=https://pypi.org/project/beniget/ https://github.com/serge-sans-paille/beniget/
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND==dev-python/gast-0.5*[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/serge-sans-paille/beniget/archive/0.4.1.tar.gz -> beniget-0.4.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3e225558b97f97cb7de5b55090fe5357
diff --git a/metadata/md5-cache/dev-python/blosc-1.10.5-r1 b/metadata/md5-cache/dev-python/blosc-1.10.5-r1
deleted file mode 100644
index bc2ab473e178..000000000000
--- a/metadata/md5-cache/dev-python/blosc-1.10.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/scikit-build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/c-blosc-1.19.0:=
-DESCRIPTION=High performance compressor optimized for binary data
-EAPI=8
-HOMEPAGE=http://python-blosc.blosc.org
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/Blosc/python-blosc/archive/v1.10.5.tar.gz -> python-blosc-1.10.5.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b7ba2ff6c5a45dce62e21de10ef44bfa
diff --git a/metadata/md5-cache/dev-python/blosc-1.10.6 b/metadata/md5-cache/dev-python/blosc-1.10.6
index ddafd208ba83..8b69508ef7ef 100644
--- a/metadata/md5-cache/dev-python/blosc-1.10.6
+++ b/metadata/md5-cache/dev-python/blosc-1.10.6
@@ -1,17 +1,17 @@
-BDEPEND=dev-python/scikit-build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/scikit-build[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(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-libs/c-blosc-1.19.0:=
 DESCRIPTION=High performance compressor optimized for binary data
 EAPI=8
 HOMEPAGE=https://www.blosc.org/ https://github.com/Blosc/python-blosc/ https://pypi.org/project/blosc/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-libs/c-blosc-1.19.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/Blosc/python-blosc/archive/v1.10.6.tar.gz -> python-blosc-1.10.6.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9798549aa33e764caa4dd5605bec9f65
+_md5_=34fd8b501d75c6a8485cf68421b31901
diff --git a/metadata/md5-cache/dev-python/boto3-1.23.10 b/metadata/md5-cache/dev-python/boto3-1.23.10
new file mode 100644
index 000000000000..04e1ea6d9a55
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.23.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.26.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.26.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.3.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/boto/boto3/archive/1.23.10.tar.gz -> boto3-1.23.10.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=87fea143244769ca5ba22ecf4e9c85c5
diff --git a/metadata/md5-cache/dev-python/botocore-1.26.10 b/metadata/md5-cache/dev-python/botocore-1.26.10
new file mode 100644
index 000000000000..67d617ddb862
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.26.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[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(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[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(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[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(-)?] >=dev-python/urllib3-1.25.4[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/b/botocore/botocore-1.26.10.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee9407b3e9a7645dd37c00caade8c434
diff --git a/metadata/md5-cache/dev-python/cachetools-5.2.0 b/metadata/md5-cache/dev-python/cachetools-5.2.0
new file mode 100644
index 000000000000..c8432be857b8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cachetools-5.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Extensible memoizing collections and decorators
+EAPI=8
+HOMEPAGE=https://github.com/tkem/cachetools/ https://pypi.org/project/cachetools/
+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 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/c/cachetools/cachetools-5.2.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2e0dc338af8109f5467c8541731dc5c4
diff --git a/metadata/md5-cache/dev-python/cfgv-3.3.1 b/metadata/md5-cache/dev-python/cfgv-3.3.1
index 02ecc48b6084..a7bf0bc259ad 100644
--- a/metadata/md5-cache/dev-python/cfgv-3.3.1
+++ b/metadata/md5-cache/dev-python/cfgv-3.3.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.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=Validate configuration and produce human-readable error messages
 EAPI=8
 HOMEPAGE=https://github.com/asottile/cfgv
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/asottile/cfgv/archive/refs/tags/v3.3.1.tar.gz -> cfgv-3.3.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5022918e9018c15d124af71d169ea6af
+_md5_=7d2ddaaf006d56bf9003ed71b1c6d7e2
diff --git a/metadata/md5-cache/dev-python/cgroup-utils-0.8-r1 b/metadata/md5-cache/dev-python/cgroup-utils-0.8-r1
new file mode 100644
index 000000000000..6b570ec92d89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cgroup-utils-0.8-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tools and libraries for control groups of Linux
+EAPI=8
+HOMEPAGE=https://github.com/peo3/cgroup-utils
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/peo3/cgroup-utils/archive/v0.8.tar.gz -> cgroup-utils-0.8.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=064f28d53a67bc1e52cc4b32cc56075a
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.4 b/metadata/md5-cache/dev-python/clang-python-14.0.4
new file mode 100644
index 000000000000..0b6795539ffe
--- /dev/null
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.4
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+DEFINED_PHASES=install prepare test unpack
+DEPEND=>=sys-devel/clang-14.0.4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
+DESCRIPTION=Python bindings for sys-devel/clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org python-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=>=sys-devel/clang-14.0.4:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=2d8fe6fac7a8c51e306d9b9bcedcd58f
diff --git a/metadata/md5-cache/dev-python/cliff-3.10.1 b/metadata/md5-cache/dev-python/cliff-3.10.1
index 08e58df5af41..006eff16db13 100644
--- a/metadata/md5-cache/dev-python/cliff-3.10.1
+++ b/metadata/md5-cache/dev-python/cliff-3.10.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/cliff/ https://github.com/openstack/cliff/ https://pypi.org/project/cliff/
 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 ~mips ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/autopage-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cmd2-0.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prettytable[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-2.1.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/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.12.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/c/cliff/cliff-3.10.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b4d245a765ec6cab3f2415ebfa2c2457
+_md5_=a3625334146b01cf618c29338c52d766
diff --git a/metadata/md5-cache/dev-python/cmd2-2.4.0 b/metadata/md5-cache/dev-python/cmd2-2.4.0
deleted file mode 100644
index 8761b1d9202e..000000000000
--- a/metadata/md5-cache/dev-python/cmd2-2.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-apps/which || ( x11-misc/xclip x11-misc/xsel ) ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Extra features for standard library's cmd module
-EAPI=8
-HOMEPAGE=https://github.com/python-cmd2/cmd2
-INHERIT=distutils-r1 virtualx
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/c/cmd2/cmd2-2.4.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=76a14f8262042c5dd660a45d94129d1a
diff --git a/metadata/md5-cache/dev-python/cmd2-2.4.1 b/metadata/md5-cache/dev-python/cmd2-2.4.1
index c8da89258b11..f3698407eb2b 100644
--- a/metadata/md5-cache/dev-python/cmd2-2.4.1
+++ b/metadata/md5-cache/dev-python/cmd2-2.4.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/python-cmd2/cmd2/ https://pypi.org/project/cmd2/
 INHERIT=distutils-r1 virtualx
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyperclip-1.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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 ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cmd2/cmd2-2.4.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=2cf8c4a835c1d68a9715153d003292bf
+_md5_=df256b7f89239186cd43b122384e1ebd
diff --git a/metadata/md5-cache/dev-python/debtcollector-2.5.0 b/metadata/md5-cache/dev-python/debtcollector-2.5.0
index 08917ff57533..bdb5a0ac49a8 100644
--- a/metadata/md5-cache/dev-python/debtcollector-2.5.0
+++ b/metadata/md5-cache/dev-python/debtcollector-2.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/debtcollector/ https://github.com/openstack/debtcollector/ https://pypi.org/project/debtcollector/
 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 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/wrapt-1.7.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/d/debtcollector/debtcollector-2.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bb1af5b9572dc367c2b375c5a0b674b9
+_md5_=e4caf46848015276f58af426460f20ba
diff --git a/metadata/md5-cache/dev-python/dill-0.3.5.1 b/metadata/md5-cache/dev-python/dill-0.3.5.1
index b44c077907af..bbed4388b0b2 100644
--- a/metadata/md5-cache/dev-python/dill-0.3.5.1
+++ b/metadata/md5-cache/dev-python/dill-0.3.5.1
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/uqfoundation/dill/ https://pypi.org/project/dill/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/uqfoundation/dill/archive/dill-0.3.5.1.tar.gz -> dill-0.3.5.1.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=812d3970e7c4e0b52f26e7dc3c81ce20
+_md5_=d69e4911b80eb15133506de7d432a162
diff --git a/metadata/md5-cache/dev-python/django-cacheops-6.1 b/metadata/md5-cache/dev-python/django-cacheops-6.1
new file mode 100644
index 000000000000..a678f17f3c4d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-cacheops-6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/django-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/funcy-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-db/redis dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ORM cache with automatic granular event-driven invalidation for Django
+EAPI=8
+HOMEPAGE=https://github.com/Suor/django-cacheops/ https://pypi.org/project/django-cacheops/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/django-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/redis-py-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/funcy-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/Suor/django-cacheops/archive/6.1.tar.gz -> django-cacheops-6.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=df2b89ae2c085e57ee2425a39f457330
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-1.1.5 b/metadata/md5-cache/dev-python/dogpile-cache-1.1.5
index 2904594991cb..b718e38b7bab 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-1.1.5
+++ b/metadata/md5-cache/dev-python/dogpile-cache-1.1.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/sqlalchemy/dogpile.cache
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/decorator-4.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-1.1.5.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9eb1e237961f6864b0e150e7ad3ec7e5
+_md5_=35de7e1e3f71339af6c2fc24aed51fac
diff --git a/metadata/md5-cache/dev-python/fakeredis-1.8 b/metadata/md5-cache/dev-python/fakeredis-1.8
new file mode 100644
index 000000000000..c32144742c1c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fakeredis-1.8
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-db/redis dev-python/aioredis[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/redis-py[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Fake implementation of redis API for testing purposes
+EAPI=8
+HOMEPAGE=https://github.com/dsoftwareinc/fakeredis-py/ https://pypi.org/project/fakeredis/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-python/redis-py[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.16.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sortedcontainers-2.4.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dsoftwareinc/fakeredis-py/archive/v1.8.tar.gz -> fakeredis-py-1.8.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1c9d14368e717b5c59baaa8c7a328796
diff --git a/metadata/md5-cache/dev-python/fastimport-0.9.11 b/metadata/md5-cache/dev-python/fastimport-0.9.11
deleted file mode 100644
index c0cadd92a591..000000000000
--- a/metadata/md5-cache/dev-python/fastimport-0.9.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Library for parsing the fastimport VCS serialization format
-EAPI=7
-HOMEPAGE=https://github.com/jelmer/python-fastimport
-INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-SLOT=0
-SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.11.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=badf5d1bcbcc877c0039a9d4274dc4b1
diff --git a/metadata/md5-cache/dev-python/fastimport-0.9.14 b/metadata/md5-cache/dev-python/fastimport-0.9.14
index 87fc44b9a987..69775d486909 100644
--- a/metadata/md5-cache/dev-python/fastimport-0.9.14
+++ b/metadata/md5-cache/dev-python/fastimport-0.9.14
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/jelmer/python-fastimport/ https://pypi.org/project/fastimport/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.14.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6f967019092cf8d4cec39f9b9b2d4689
+_md5_=9625280b6bdd91fdd62a8d0eeabbefa3
diff --git a/metadata/md5-cache/dev-python/flatbuffers-2.0.6 b/metadata/md5-cache/dev-python/flatbuffers-2.0.6
new file mode 100644
index 000000000000..07c14f85e67b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flatbuffers-2.0.6
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=RFC 7049 - Concise Binary Object Representation
+EAPI=8
+HOMEPAGE=https://github.com/google/flatbuffers/ https://pypi.org/project/flatbuffers/
+INHERIT=distutils-r1
+IUSE=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=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/google/flatbuffers/archive/v2.0.6.tar.gz -> flatbuffers-2.0.6.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=885b12f4906d3ca6a481d833007b5c20
diff --git a/metadata/md5-cache/dev-python/flit_scm-1.6.2 b/metadata/md5-cache/dev-python/flit_scm-1.6.2
new file mode 100644
index 000000000000..cc08d5fe56e4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flit_scm-1.6.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[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=A PEP 518 build backend combining flit with setuptools_scm
+EAPI=8
+HOMEPAGE=https://gitlab.com/WillDaSilva/flit_scm/ https://pypi.org/project/flit-scm/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/flit_core-3.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-6.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/tomli-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://gitlab.com/WillDaSilva/flit_scm/-/archive/1.6.2/flit_scm-1.6.2.tar.bz2
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=98f24a9b6f7e9388f99ae792080563c7
diff --git a/metadata/md5-cache/dev-python/fsspec-2022.5.0 b/metadata/md5-cache/dev-python/fsspec-2022.5.0
index 558f36ed90eb..2aed6f2153a8 100644
--- a/metadata/md5-cache/dev-python/fsspec-2022.5.0
+++ b/metadata/md5-cache/dev-python/fsspec-2022.5.0
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/versioneer[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tqdm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=A specification that python filesystems should adhere to
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fsspec/filesystem_spec/archive/2022.5.0.tar.gz -> filesystem_spec-2022.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=130bc3af9500516f9726514cbfa5ae71
+_md5_=23814681124971faf22efeff2ef34ece
diff --git a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha0-r1 b/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha0-r1
deleted file mode 100644
index 6cdd1b9f34bc..000000000000
--- a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Recursive descent parsing library based on functional combinators
-EAPI=8
-HOMEPAGE=https://pypi.org/project/funcparserlib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/vlasovskikh/funcparserlib/archive/1.0.0a0.tar.gz -> funcparserlib-1.0.0_alpha0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=69f8822f4ca586c8a218fca04958483c
diff --git a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha1 b/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha1
deleted file mode 100644
index 559538c9e9b5..000000000000
--- a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Recursive descent parsing library based on functional combinators
-EAPI=8
-HOMEPAGE=https://pypi.org/project/funcparserlib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/vlasovskikh/funcparserlib/archive/1.0.0a1.tar.gz -> funcparserlib-1.0.0_alpha1.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=347223d5a29f46c90b14879806681343
diff --git a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha2 b/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha2
deleted file mode 100644
index c6a2a5cd72cf..000000000000
--- a/metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Recursive descent parsing library based on functional combinators
-EAPI=8
-HOMEPAGE=https://pypi.org/project/funcparserlib/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/vlasovskikh/funcparserlib/archive/1.0.0a2.tar.gz -> funcparserlib-1.0.0_alpha2.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=854a6144eb474fe0dacbb5ca28fc59a3
diff --git a/metadata/md5-cache/dev-python/gast-0.5.3-r1 b/metadata/md5-cache/dev-python/gast-0.5.3-r1
new file mode 100644
index 000000000000..63065100cc26
--- /dev/null
+++ b/metadata/md5-cache/dev-python/gast-0.5.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)
+EAPI=8
+HOMEPAGE=https://pypi.org/project/gast/
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=BSD PSF-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/g/gast/gast-0.5.3.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=02d007e66d51d8ee349967123fe7fb34
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.6 b/metadata/md5-cache/dev-python/genshi-0.7.6
deleted file mode 100644
index 77ff6ee06c50..000000000000
--- a/metadata/md5-cache/dev-python/genshi-0.7.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python toolkit for stream-based generation of output for the web
-EAPI=8
-HOMEPAGE=https://genshi.edgewall.org/ https://pypi.org/project/Genshi/
-INHERIT=distutils-r1
-IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/G/Genshi/Genshi-0.7.6.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fc706aeeb8f5e0405dfb588192777497
diff --git a/metadata/md5-cache/dev-python/genshi-0.7.7 b/metadata/md5-cache/dev-python/genshi-0.7.7
index 253492d7724a..4dc36a8bebd3 100644
--- a/metadata/md5-cache/dev-python/genshi-0.7.7
+++ b/metadata/md5-cache/dev-python/genshi-0.7.7
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/six[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 toolkit for stream-based generation of output for the web
 EAPI=8
 HOMEPAGE=https://genshi.edgewall.org/ https://pypi.org/project/Genshi/
 INHERIT=distutils-r1
-IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+IUSE=doc examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/G/Genshi/Genshi-0.7.7.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=550cc088fd83f38ea511729608c40e2e
+_md5_=97a1bc19f20ada86c40d67a537cc72c5
diff --git a/metadata/md5-cache/dev-python/gitdb-4.0.8 b/metadata/md5-cache/dev-python/gitdb-4.0.8
deleted file mode 100644
index d1e5ec6c6d78..000000000000
--- a/metadata/md5-cache/dev-python/gitdb-4.0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/smmap-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GitDB is a pure-Python git object database
-EAPI=8
-HOMEPAGE=https://github.com/gitpython-developers/gitdb https://pypi.org/project/gitdb/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-python/smmap-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gitdb/gitdb-4.0.8.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b652b93ecb3daf73ab600767efd7a261
diff --git a/metadata/md5-cache/dev-python/gitdb-4.0.9 b/metadata/md5-cache/dev-python/gitdb-4.0.9
deleted file mode 100644
index 8e1ae8ea451b..000000000000
--- a/metadata/md5-cache/dev-python/gitdb-4.0.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/smmap-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=GitDB is a pure-Python git object database
-EAPI=8
-HOMEPAGE=https://github.com/gitpython-developers/gitdb/ https://pypi.org/project/gitdb/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/smmap-3.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/gitdb/gitdb-4.0.9.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=64df6d89da3d684d2ff17fd7a7deecf3
diff --git a/metadata/md5-cache/dev-python/gitdb-4.0.9-r1 b/metadata/md5-cache/dev-python/gitdb-4.0.9-r1
index f7d2570c6853..b0333f3f8844 100644
--- a/metadata/md5-cache/dev-python/gitdb-4.0.9-r1
+++ b/metadata/md5-cache/dev-python/gitdb-4.0.9-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/gitpython-developers/gitdb/ https://pypi.org/project/gitdb/
 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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/smmap-3.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/g/gitdb/gitdb-4.0.9.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a7e5943f4d00ced9f1a2e71ba20f2bc
+_md5_=b0a0ae3fa22dfe53256b2311f1d0ba10
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.7.1-r2 b/metadata/md5-cache/dev-python/google-api-core-2.7.1-r2
deleted file mode 100644
index e87cc3985307..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-2.7.1-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/proto-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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://googleapis.dev/python/google-api-core/latest/index.html
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/googleapis/python-api-core/archive/v2.7.1.tar.gz -> google-api-core-2.7.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b4dbc35093503c775eea010a1be04cc7
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.7.2-r1 b/metadata/md5-cache/dev-python/google-api-core-2.7.2-r1
deleted file mode 100644
index 0df7e82124ef..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-2.7.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/proto-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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://googleapis.dev/python/google-api-core/latest/index.html
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/googleapis/python-api-core/archive/v2.7.2.tar.gz -> google-api-core-2.7.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5b62737a9eed40c7c50e9ef337712683
diff --git a/metadata/md5-cache/dev-python/google-api-core-2.8.0 b/metadata/md5-cache/dev-python/google-api-core-2.8.0
deleted file mode 100644
index cec9074fbc03..000000000000
--- a/metadata/md5-cache/dev-python/google-api-core-2.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/proto-plus[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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://googleapis.dev/python/google-api-core/latest/index.html
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/googleapis-common-protos[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/requests-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/googleapis/python-api-core/archive/v2.8.0.tar.gz -> google-api-core-2.8.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5b62737a9eed40c7c50e9ef337712683
diff --git a/metadata/md5-cache/dev-python/google-auth-2.6.3-r2 b/metadata/md5-cache/dev-python/google-auth-2.6.3-r2
deleted file mode 100644
index 999d5a8ee8fd..000000000000
--- a/metadata/md5-cache/dev-python/google-auth-2.6.3-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[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/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Google Authentication Library
-EAPI=8
-HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/g/google-auth/google-auth-2.6.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=09627420ed88246bc20150ebc9459863
diff --git a/metadata/md5-cache/dev-python/gst-python-1.20.2 b/metadata/md5-cache/dev-python/gst-python-1.20.2
index 20d5b3e4c63b..b1eebeeca70a 100644
--- a/metadata/md5-cache/dev-python/gst-python-1.20.2
+++ b/metadata/md5-cache/dev-python/gst-python-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=meson python-r1 xdg-utils
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=media-libs/gstreamer-1.20.2:1.0[introspection] >=media-libs/gst-plugins-base-1.20.2:1.0[introspection] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3dac74a35a720997fe79893a9b780fb3
+_md5_=58f93719586615bb6bce997b4feb50a0
diff --git a/metadata/md5-cache/dev-python/h5py-3.3.0 b/metadata/md5-cache/dev-python/h5py-3.3.0
deleted file mode 100644
index 21ffb1d013e3..000000000000
--- a/metadata/md5-cache/dev-python/h5py-3.3.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pkgconfig[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/QtPy[testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( sci-libs/hdf5:=[hl(+)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/hdf5:=[hl(+)]
-DESCRIPTION=Simple Python interface to HDF5 files
-EAPI=7
-HOMEPAGE=https://www.h5py.org
-INHERIT=distutils-r1
-IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=sci-libs/hdf5:=[hl(+)] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/h/h5py/h5py-3.3.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fb85bfbfd9af6609417d642cc5d6e59b
diff --git a/metadata/md5-cache/dev-python/h5py-3.6.0 b/metadata/md5-cache/dev-python/h5py-3.6.0
index e1ea5014db93..88a80b960fe1 100644
--- a/metadata/md5-cache/dev-python/h5py-3.6.0
+++ b/metadata/md5-cache/dev-python/h5py-3.6.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.h5py.org/ https://github.com/h5py/h5py/ https://pypi.org/project/h5py/
 INHERIT=distutils-r1
 IUSE=examples test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=sci-libs/hdf5:=[hl(+)] >=dev-python/numpy-1.14.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/h5py/h5py-3.6.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bc7159076d60a75c77ea9f04ff3211e6
+_md5_=7eda29c34cfa65ba42416d716df73845
diff --git a/metadata/md5-cache/dev-python/imageio-2.19.3 b/metadata/md5-cache/dev-python/imageio-2.19.3
new file mode 100644
index 000000000000..1f4f2ec77f99
--- /dev/null
+++ b/metadata/md5-cache/dev-python/imageio-2.19.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-python/fsspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/imageio-ffmpeg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tifffile[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library for reading and writing image data
+EAPI=8
+HOMEPAGE=https://imageio.readthedocs.io/en/stable/ https://github.com/imageio/imageio/ https://pypi.org/project/imageio/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PROPERTIES=test_network
+RDEPEND=>=dev-python/numpy-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pillow-8.3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/freeimage python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/imageio/imageio/archive/v2.19.3.tar.gz -> imageio-2.19.3.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1be6ddbf12ba1226d0caea4060f90b37
diff --git a/metadata/md5-cache/dev-python/installer-0.5.0 b/metadata/md5-cache/dev-python/installer-0.5.0
deleted file mode 100644
index 2c1044f64f1f..000000000000
--- a/metadata/md5-cache/dev-python/installer-0.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A library for installing Python wheels
-EAPI=7
-HOMEPAGE=https://pypi.org/project/installer/ https://github.com/pradyunsg/installer/ https://installer.readthedocs.io/en/latest/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pradyunsg/installer/archive/0.5.0.tar.gz -> installer-0.5.0.gh.tar.gz https://files.pythonhosted.org/packages/py3/i/installer/installer-0.5.0-py3-none-any.whl -> installer-0.5.0-py3-none-any.whl.zip
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2d7635b5e3d2b7d9cd3b87a1e257b580
diff --git a/metadata/md5-cache/dev-python/ipython-7.31.1 b/metadata/md5-cache/dev-python/ipython-7.31.1
deleted file mode 100644
index 12c84845a6c4..000000000000
--- a/metadata/md5-cache/dev-python/ipython-7.31.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Advanced interactive shell for Python
-EAPI=8
-HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
-INHERIT=distutils-r1 optfeature virtualx
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/i/ipython/ipython-7.31.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=c1db58aba0e13e2c8e15fd76f0c22de8
diff --git a/metadata/md5-cache/dev-python/ipython-8.4.0 b/metadata/md5-cache/dev-python/ipython-8.4.0
new file mode 100644
index 000000000000..816dd3f2be77
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipython-8.4.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( app-text/dvipng[truetype] >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testpath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Advanced interactive shell for Python
+EAPI=8
+HOMEPAGE=https://ipython.org/ https://github.com/ipython/ipython/
+INHERIT=distutils-r1 optfeature virtualx
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipywidgets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/widgetsnbextension[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qt5? ( dev-python/qtconsole[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) smp? ( >=dev-python/ipykernel-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipyparallel-6.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+RDEPEND=dev-python/backcall[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jedi-0.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib-inline[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pexpect-4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pickleshare[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prompt_toolkit-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/prompt_toolkit-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stack_data[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] nbconvert? ( dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[readline,sqlite,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[readline,sqlite,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[readline,sqlite,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipython/ipython-8.4.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=009ad32159f51095551053a6ec58ac07
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0 b/metadata/md5-cache/dev-python/jaraco-logging-3.1.0
deleted file mode 100644
index c148dbeda83c..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_10(-)] >=dev-python/rst-linker-1.9[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_9(-)] >=dev-python/rst-linker-1.9[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] >=dev-python/jaraco-packaging-3.2[python_targets_python3_8(-)] >=dev-python/rst-linker-1.9[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] >=dev-python/jaraco-packaging-3.2[python_targets_pypy3(-)] >=dev-python/rst-linker-1.9[python_targets_pypy3(-)] ) ) ) test? ( dev-python/tempora[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Additional facilities to supplement Python's stdlib logging module
-EAPI=7
-HOMEPAGE=https://github.com/jaraco/jaraco.logging
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=dev-python/tempora[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-3.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1dcd33024fe7bd74342e873f22944e45
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1 b/metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1
index 80f024e53aba..0bce5ff46647 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/jaraco.logging
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/tempora[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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=mirror://pypi/j/jaraco.logging/jaraco.logging-3.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e761e5c1e9e4c2508462a916a44d71c1
+_md5_=133ddcd88171c86da64e7d5d73691464
diff --git a/metadata/md5-cache/dev-python/jedi-0.18.0 b/metadata/md5-cache/dev-python/jedi-0.18.0
deleted file mode 100644
index d6daac27f6d2..000000000000
--- a/metadata/md5-cache/dev-python/jedi-0.18.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/parso[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/parso[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/parso[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( =dev-python/parso-0.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Autocompletion library for Python
-EAPI=7
-HOMEPAGE=https://github.com/davidhalter/jedi
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT test? ( Apache-2.0 )
-RDEPEND==dev-python/parso-0.8*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/davidhalter/jedi/archive/v0.18.0.tar.gz -> jedi-0.18.0.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9fe6defd0da5bc0d802a51f37c4c4867
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.1.2 b/metadata/md5-cache/dev-python/jupyter_client-7.1.2
deleted file mode 100644
index 3235fa9e1e91..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/ipykernel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[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/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-14.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.1.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=76640fb9da6c592b8e248673bcf76134
diff --git a/metadata/md5-cache/dev-python/jupyter_client-7.3.0 b/metadata/md5-cache/dev-python/jupyter_client-7.3.0
deleted file mode 100644
index 41dfdefbb773..000000000000
--- a/metadata/md5-cache/dev-python/jupyter_client-7.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/ipykernel-6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-asyncio-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Jupyter protocol implementation and client libraries
-EAPI=8
-HOMEPAGE=https://jupyter.org
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=BSD
-RDEPEND=dev-python/entrypoints[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_core-4.9.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/nest_asyncio-1.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyzmq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jupyter_client/jupyter_client-7.3.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=74a73d8ede865e606bad4031c6a9f7c1
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.0.0 b/metadata/md5-cache/dev-python/jwcrypto-1.0.0
deleted file mode 100644
index 264f63a881ef..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.0.0.tar.gz -> jwcrypto-1.0.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9fbe01fb4c5cec9ea91b227970e9e34d
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.1.0 b/metadata/md5-cache/dev-python/jwcrypto-1.1.0
deleted file mode 100644
index 0287a83cc8d8..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/latchset/jwcrypto/archive/v1.1.0.tar.gz -> jwcrypto-1.1.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f9d01edbdfd3bd325467294ca9a0a370
diff --git a/metadata/md5-cache/dev-python/jwcrypto-1.3.0 b/metadata/md5-cache/dev-python/jwcrypto-1.3.0
deleted file mode 100644
index 59444e6c6079..000000000000
--- a/metadata/md5-cache/dev-python/jwcrypto-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=Implements JWK,JWS,JWE specifications using python-cryptography
-EAPI=8
-HOMEPAGE=https://github.com/latchset/jwcrypto/ https://pypi.org/project/jwcrypto/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-python/cryptography-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/deprecated[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/latchset/jwcrypto/archive/v1.3.0.tar.gz -> jwcrypto-1.3.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=41fa1a2d1fa47b8dc9516252a059b42d
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.6.0 b/metadata/md5-cache/dev-python/keystoneauth-4.6.0
index 5fae705b23d4..07f210a0bf0f 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.6.0
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/keystoneauth
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-service-types-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.6.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=154295015f40dd13e861dee0b4478a45
+_md5_=3b6002a5a5e04037c6de674336561272
diff --git a/metadata/md5-cache/dev-python/lark-0.11.3-r1 b/metadata/md5-cache/dev-python/lark-0.11.3-r1
deleted file mode 100644
index 57a24dcb11e7..000000000000
--- a/metadata/md5-cache/dev-python/lark-0.11.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/atomicwrites[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/regex[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python module to propose a modern general-purpose parsing library for Python
-EAPI=8
-HOMEPAGE=https://github.com/lark-parser/lark
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.3.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d0451a32276a42ebf2be59b6ebeb5005
diff --git a/metadata/md5-cache/dev-python/lark-1.1.2 b/metadata/md5-cache/dev-python/lark-1.1.2
index 8b857530d36d..632ec6a85041 100644
--- a/metadata/md5-cache/dev-python/lark-1.1.2
+++ b/metadata/md5-cache/dev-python/lark-1.1.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lark-parser/lark/ https://pypi.org/project/lark/
 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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=mirror://pypi/l/lark/lark-1.1.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a57fa98544c4c3e7982177e8e4a168ce
+_md5_=6fbce409b2655888eea8451bdc2c3e5f
diff --git a/metadata/md5-cache/dev-python/libarchive-c-4.0 b/metadata/md5-cache/dev-python/libarchive-c-4.0
index b5bd349cd5a3..f9344570eadb 100644
--- a/metadata/md5-cache/dev-python/libarchive-c-4.0
+++ b/metadata/md5-cache/dev-python/libarchive-c-4.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( app-arch/libarchive >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-arch/libarchive >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/setuptools-42.0.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=A Python interface to libarchive
 EAPI=8
 HOMEPAGE=https://github.com/Changaco/python-libarchive-c/ https://pypi.org/project/libarchive-c/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+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=CC0-1.0
-RDEPEND=app-arch/libarchive python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-arch/libarchive python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/Changaco/python-libarchive-c/archive/refs/tags/4.0.tar.gz -> libarchive-c-4.0.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8323ef7c7cba2a52b11f5d4029fd5d8a
+_md5_=3749762bc2407252a371a5df268d2f21
diff --git a/metadata/md5-cache/dev-python/libcloud-3.6.0 b/metadata/md5-cache/dev-python/libcloud-3.6.0
index 7b0cb7002ebc..615abaee65fa 100644
--- a/metadata/md5-cache/dev-python/libcloud-3.6.0
+++ b/metadata/md5-cache/dev-python/libcloud-3.6.0
@@ -5,7 +5,7 @@ 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 ~x86
+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.12_p1-r1:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[ssl(+)] )
 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=mirror://apache/libcloud/apache-libcloud-3.6.0.tar.bz2
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b37f4039e06e822917daedade946e42a
+_md5_=336d18a498715db8809ddd82752bdc82
diff --git a/metadata/md5-cache/dev-python/lit-14.0.4 b/metadata/md5-cache/dev-python/lit-14.0.4
new file mode 100644
index 000000000000..30a9398ed3b4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lit-14.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-devel/llvm ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A stand-alone install of the LLVM suite testing tool
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=distutils-r1 llvm.org
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=341400d05e04f3c2df41ec651e867979
diff --git a/metadata/md5-cache/dev-python/makefun-1.13.1 b/metadata/md5-cache/dev-python/makefun-1.13.1
index 533abe7c6bef..8dbdc972eb60 100644
--- a/metadata/md5-cache/dev-python/makefun-1.13.1
+++ b/metadata/md5-cache/dev-python/makefun-1.13.1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Small library to dynamically create Python functions
 EAPI=8
 HOMEPAGE=https://pypi.org/project/makefun/ https://github.com/smarie/python-makefun
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/m/makefun/makefun-1.13.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8d2a2dbcd7eecf487cae6e9825efde36
+_md5_=05aea2867828e5ed8be6af0da432be6f
diff --git a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0 b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
index 75a0d72e4fad..4e9ab0259e1d 100644
--- a/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
+++ b/metadata/md5-cache/dev-python/markdown-it-py-2.1.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mdurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[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 port of markdown-it, Markdown parser
 EAPI=8
 HOMEPAGE=https://pypi.org/project/markdown-it-py/ https://github.com/executablebooks/markdown-it-py
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=<dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mdurl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=<dev-python/attrs-22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdurl[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/executablebooks/markdown-it-py/archive/v2.1.0.tar.gz -> markdown-it-py-2.1.0.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9044e3f7c8143c029996c9bc7a6c5a65
+_md5_=2e724e966809f95a3157b2748af904ef
diff --git a/metadata/md5-cache/dev-python/markdown2-2.4.3 b/metadata/md5-cache/dev-python/markdown2-2.4.3
index d4f11b7e3fa9..e9e7f262652c 100644
--- a/metadata/md5-cache/dev-python/markdown2-2.4.3
+++ b/metadata/md5-cache/dev-python/markdown2-2.4.3
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 Markdown language reimplementation
 EAPI=8
 HOMEPAGE=https://github.com/trentm/python-markdown2/ https://pypi.org/project/markdown2/
 INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pygments[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/m/markdown2/markdown2-2.4.3.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=94194a5285f3d3643edb72bb6b3c0a51
+_md5_=233ce2b52a8d87ef29ec5d0fe31a6d92
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.16.0 b/metadata/md5-cache/dev-python/marshmallow-3.16.0
new file mode 100644
index 000000000000..589b4a86df3b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.16.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-0.17[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(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for converting to and from native Python datatypes
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/
+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 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-0.17[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/m/marshmallow/marshmallow-3.16.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b69b39800a75a7f345e0321c78f5d513
diff --git a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0 b/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
index 38327b3bf369..53c997853398 100644
--- a/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
+++ b/metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of plugins for markdown-it-py
 EAPI=8
 HOMEPAGE=https://pypi.org/project/mdit-py-plugins/ https://github.com/executablebooks/mdit-py-plugins
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/markdown-it-py[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/executablebooks/mdit-py-plugins/archive/v0.3.0.tar.gz -> mdit-py-plugins-0.3.0.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bcbb847163615400a7361afa1ca135f7
+_md5_=9866f9db719c4a43109228522d4f8ad3
diff --git a/metadata/md5-cache/dev-python/mergedict-1.0.0-r1 b/metadata/md5-cache/dev-python/mergedict-1.0.0-r1
new file mode 100644
index 000000000000..d86d3124a10e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mergedict-1.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python 'dict' with a merge() method
+EAPI=8
+HOMEPAGE=https://github.com/schettino72/mergedict/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/m/mergedict/mergedict-1.0.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=13bd865247b900584fb44f51ae8ff984
diff --git a/metadata/md5-cache/dev-python/mimerender-0.6.0-r1 b/metadata/md5-cache/dev-python/mimerender-0.6.0-r1
new file mode 100644
index 000000000000..150aa7e0aa56
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mimerender-0.6.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-mimeparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2
+EAPI=8
+HOMEPAGE=https://pypi.org/project/mimerender/ https://github.com/martinblech/mimerender/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/python-mimeparse[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/martinblech/mimerender/archive/v0.6.0.tar.gz -> mimerender-0.6.0.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7252a9c68ff12c5217761a48eb680f5d
diff --git a/metadata/md5-cache/dev-python/moto-3.1.7 b/metadata/md5-cache/dev-python/moto-3.1.11
similarity index 53%
rename from metadata/md5-cache/dev-python/moto-3.1.7
rename to metadata/md5-cache/dev-python/moto-3.1.11
index e94a6a3408f9..574bad45bae5 100644
--- a/metadata/md5-cache/dev-python/moto-3.1.7
+++ b/metadata/md5-cache/dev-python/moto-3.1.11
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Mock library for boto
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-3.0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openapi-spec-validator-0.2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.7.tar.gz
+SRC_URI=mirror://pypi/m/moto/moto-3.1.11.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca132afcf6b0877ee64ee7a2b1bb1dbe
+_md5_=ca50c8370633fc990eadfb9ec2834f5c
diff --git a/metadata/md5-cache/dev-python/moto-3.1.5 b/metadata/md5-cache/dev-python/moto-3.1.5
deleted file mode 100644
index 2bd728e8d2fb..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.5.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=93d8d414871607d572d7e75b418f94f9
diff --git a/metadata/md5-cache/dev-python/moto-3.1.6 b/metadata/md5-cache/dev-python/moto-3.1.6
deleted file mode 100644
index 1b63a5470a7a..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.6.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca132afcf6b0877ee64ee7a2b1bb1dbe
diff --git a/metadata/md5-cache/dev-python/moto-3.1.8 b/metadata/md5-cache/dev-python/moto-3.1.8
deleted file mode 100644
index 061ec971ae7a..000000000000
--- a/metadata/md5-cache/dev-python/moto-3.1.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sure-1.4.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Mock library for boto
-EAPI=8
-HOMEPAGE=https://github.com/spulec/moto
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cfn-lint[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cookies[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docker-py-2.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/idna-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.10.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsondiff-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/botocore[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyparsing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretty-yaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.1[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(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-jose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/python-sshpubkeys[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/responses-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xmltodict[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zipp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/moto/moto-3.1.8.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ca132afcf6b0877ee64ee7a2b1bb1dbe
diff --git a/metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1 b/metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1
new file mode 100644
index 000000000000..f00832b75bbb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Multiple dispatch
+EAPI=8
+HOMEPAGE=https://pypi.org/project/multipledispatch/ https://github.com/mrocklin/multipledispatch/
+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 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-python/six[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/mrocklin/multipledispatch/archive/0.6.0.tar.gz -> multipledispatch-0.6.0.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1510c8f49b7ab714907d5b05ea420a43
diff --git a/metadata/md5-cache/dev-python/munkres-1.1.4-r1 b/metadata/md5-cache/dev-python/munkres-1.1.4-r1
new file mode 100644
index 000000000000..95afd3a0f5e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/munkres-1.1.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module implementing munkres algorithm for the Assignment Problem
+EAPI=8
+HOMEPAGE=https://pypi.org/project/munkres/ https://github.com/bmc/munkres
+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=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/bmc/munkres/archive/release-1.1.4.tar.gz -> munkres-1.1.4.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6d2c8fe4bf4d64cf89cabdd66b6da71b
diff --git a/metadata/md5-cache/dev-python/myst_parser-0.17.2 b/metadata/md5-cache/dev-python/myst_parser-0.17.2
index 4ab4d8ec7dd3..f5e65bfca865 100644
--- a/metadata/md5-cache/dev-python/myst_parser-0.17.2
+++ b/metadata/md5-cache/dev-python/myst_parser-0.17.2
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-param-files[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/docutils-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sphinx-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-param-files[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/docutils-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Extended commonmark compliant parser, with bridges to sphinx
 EAPI=8
 HOMEPAGE=https://pypi.org/project/myst-parser/ https://github.com/executablebooks/MyST-Parser
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=<dev-python/docutils-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sphinx-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=<dev-python/docutils-0.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/markdown-it-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mdit-py-plugins[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/sphinx-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/typing-extensions[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/executablebooks/MyST-Parser/archive/v0.17.2.tar.gz -> MyST-Parser-0.17.2.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9f8e3f6fde02b8c3afeefdbc2f92777d
+_md5_=a749c590ae214b8a0ffc148479b00d3b
diff --git a/metadata/md5-cache/dev-python/netifaces-0.11.0 b/metadata/md5-cache/dev-python/netifaces-0.11.0
index 441accdce9b7..83376557deac 100644
--- a/metadata/md5-cache/dev-python/netifaces-0.11.0
+++ b/metadata/md5-cache/dev-python/netifaces-0.11.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://pypi.org/project/netifaces/ https://alastairs-place.net/projects/netifaces/ https://github.com/al45tair/netifaces
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/n/netifaces/netifaces-0.11.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=72b36e50bfffc09643cda69ebdc0bdad
+_md5_=32d9dcaa309b1f588463383d09edd76b
diff --git a/metadata/md5-cache/dev-python/nodeenv-1.6.0 b/metadata/md5-cache/dev-python/nodeenv-1.6.0
index 8deabdfb66cc..796265bc476c 100644
--- a/metadata/md5-cache/dev-python/nodeenv-1.6.0
+++ b/metadata/md5-cache/dev-python/nodeenv-1.6.0
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ekalinin/nodeenv/archive/1.6.0.tar.gz -> nodeenv-1.6.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=10c94877bcfdc702a12f6f900e335dfe
+_md5_=c108c5c0c075ed02dcb1b7ea9885d32e
diff --git a/metadata/md5-cache/dev-python/nuitka-0.8.3 b/metadata/md5-cache/dev-python/nuitka-0.8.3
new file mode 100644
index 000000000000..d6750b77392c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nuitka-0.8.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-util/ccache ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python to native compiler
+EAPI=8
+HOMEPAGE=https://www.nuitka.net
+INHERIT=distutils-r1 flag-o-matic optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~loong ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-util/scons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nuitka.net/releases/Nuitka-0.8.3.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a74a9f966bba95c284e57252c51c882a
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.2 b/metadata/md5-cache/dev-python/numpydoc-1.2
deleted file mode 100644
index bd1baebb152c..000000000000
--- a/metadata/md5-cache/dev-python/numpydoc-1.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension to support docstrings in Numpy format
-EAPI=8
-HOMEPAGE=https://pypi.org/project/numpydoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpydoc/numpydoc-1.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bd64c2cd173679c734a3f65e7a304676
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.2.1-r1 b/metadata/md5-cache/dev-python/numpydoc-1.2.1-r1
deleted file mode 100644
index 41a8ff4a01a2..000000000000
--- a/metadata/md5-cache/dev-python/numpydoc-1.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension to support docstrings in Numpy format
-EAPI=8
-HOMEPAGE=https://pypi.org/project/numpydoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/numpydoc/numpydoc-1.2.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac9a2da44ccc0a8162923e3ef87b4aa1
diff --git a/metadata/md5-cache/dev-python/numpydoc-1.3.0 b/metadata/md5-cache/dev-python/numpydoc-1.3.0
deleted file mode 100644
index c646449715fa..000000000000
--- a/metadata/md5-cache/dev-python/numpydoc-1.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/matplotlib-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx extension to support docstrings in Numpy format
-EAPI=8
-HOMEPAGE=https://numpydoc.readthedocs.io/en/latest/ https://github.com/numpy/numpydoc/ https://pypi.org/project/numpydoc/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
-LICENSE=BSD
-RDEPEND=>=dev-python/jinja-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/numpy/numpydoc/archive/v1.3.0.tar.gz -> numpydoc-1.3.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cf4d13cd2616faea9d3dbc78cf89907a
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-2.4.0 b/metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
index 88b14c49cd81..d38309d529f3 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-2.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5fd69d908da0d551f926602063cc2a1b
+_md5_=376b68dd0860eb6e0af14f1d8df24db2
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.99.0 b/metadata/md5-cache/dev-python/openstacksdk-0.99.0
index ed2500efefe8..25a56f3e83de 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.99.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.99.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/openstacksdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.13[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/appdirs-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/jsonpatch-1.20[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-service-types-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/munch-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/decorator-4.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jmespath-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.99.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3692ad4b028c6ff49242f5c9488aeeb4
+_md5_=4085207db7d5fce6a3e360f7cef5c975
diff --git a/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2 b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
index f7df843e4560..2ca8cd540e0a 100644
--- a/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
+++ b/metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.openstack.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-client-config/os-client-config-2.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c0efcf21e890989ee79cc1e480426907
+_md5_=957ab353bf42f0d670aeb486d79d4d74
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2 b/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
index 61f918df2d29..7eb800f8068b 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
+++ b/metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/os-service-types
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=61c266a3359553eea0b0b4bd57e55a4a
+_md5_=c803bd1d7e1e64fcca24304041a0afb0
diff --git a/metadata/md5-cache/dev-python/osc-lib-2.6.0 b/metadata/md5-cache/dev-python/osc-lib-2.6.0
index efc668a2ab78..e939d91768ac 100644
--- a/metadata/md5-cache/dev-python/osc-lib-2.6.0
+++ b/metadata/md5-cache/dev-python/osc-lib-2.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/osc-lib
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/cliff-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.14.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/osc-lib/osc-lib-2.6.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8d388fb2462c80698061f2eb09c3d8fb
+_md5_=2f0ddc3441f7cbc9e46d708b303aa057
diff --git a/metadata/md5-cache/dev-python/oslo-concurrency-4.5.1 b/metadata/md5-cache/dev-python/oslo-concurrency-4.5.1
index 2b6b06b53567..27624c290a2a 100644
--- a/metadata/md5-cache/dev-python/oslo-concurrency-4.5.1
+++ b/metadata/md5-cache/dev-python/oslo-concurrency-4.5.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/oslo.concurrency/ https://github.com/openstack/oslo.concurrency
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fasteners-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.concurrency/oslo.concurrency-4.5.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9f28ffad67a32ce1e2e9e63c24feaa0e
+_md5_=deb1b501c2354d049f22dcfe6b40dfb2
diff --git a/metadata/md5-cache/dev-python/oslo-config-8.8.0 b/metadata/md5-cache/dev-python/oslo-config-8.8.0
index 7bbd118f7133..a8980f2e3847 100644
--- a/metadata/md5-cache/dev-python/oslo-config-8.8.0
+++ b/metadata/md5-cache/dev-python/oslo-config-8.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rfc3986-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.18.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.config/oslo.config-8.8.0.tar.gz -> oslo-config-8.8.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6773391a7774259d9c13f97666fdcb2b
+_md5_=33743c03326a51bcf4c8631b614fb781
diff --git a/metadata/md5-cache/dev-python/oslo-context-4.1.0 b/metadata/md5-cache/dev-python/oslo-context-4.1.0
index ee5207602d4a..5790966f67e7 100644
--- a/metadata/md5-cache/dev-python/oslo-context-4.1.0
+++ b/metadata/md5-cache/dev-python/oslo-context-4.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/oslo.context/
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.context/oslo.context-4.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=76d75543722fe7950c5515dd1c0111cf
+_md5_=3084ec454252394cfa01aad3bc348337
diff --git a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1 b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1
index 154c256437d8..a7d714a87d0d 100644
--- a/metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/oslo.i18n/ https://github.com/openstack/oslo.i18n/ https://pypi.org/project/oslo.i18n/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.i18n/oslo.i18n-5.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=71ab9950f566b40497bbaa4b871bd751
+_md5_=649a587c05ae9157d7ed986c28c5edd7
diff --git a/metadata/md5-cache/dev-python/oslo-log-5.0.0 b/metadata/md5-cache/dev-python/oslo-log-5.0.0
index cd49bb7a05a5..5caa4a498655 100644
--- a/metadata/md5-cache/dev-python/oslo-log-5.0.0
+++ b/metadata/md5-cache/dev-python/oslo-log-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-3.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-context-2.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-serialization-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyinotify-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.log/oslo.log-5.0.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=95c38623223481a9073c65b6d5d4ac9e
+_md5_=c0f65106f0e7c5fa55bbad152f8e0534
diff --git a/metadata/md5-cache/dev-python/oslo-serialization-4.3.0 b/metadata/md5-cache/dev-python/oslo-serialization-4.3.0
index d743daf7db81..5c27d19a82fb 100644
--- a/metadata/md5-cache/dev-python/oslo-serialization-4.3.0
+++ b/metadata/md5-cache/dev-python/oslo-serialization-4.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/msgpack-0.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.serialization/oslo.serialization-4.3.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cd89dc9d6577b8f9b49dc06f5af2b84e
+_md5_=06a06250c222b6da7dfe435186e3f6d8
diff --git a/metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1 b/metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
index 7a40e73df417..856e818913eb 100644
--- a/metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
+++ b/metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/oslo
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2013.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netifaces-0.10.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyparsing-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslo.utils/oslo.utils-4.13.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7a1323de89541392163d37e4a7d9767a
+_md5_=9a779f32f1fbf78469df0fe118da5491
diff --git a/metadata/md5-cache/dev-python/oslotest-4.5.0-r1 b/metadata/md5-cache/dev-python/oslotest-4.5.0-r2
similarity index 98%
rename from metadata/md5-cache/dev-python/oslotest-4.5.0-r1
rename to metadata/md5-cache/dev-python/oslotest-4.5.0-r2
index 24ce0d22b3bd..22acffe6f084 100644
--- a/metadata/md5-cache/dev-python/oslotest-4.5.0-r1
+++ b/metadata/md5-cache/dev-python/oslotest-4.5.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-4.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=60df22d5f3cb2245d4bab8760d71f5b7
+_md5_=392b09cbe8f3a34672a0e3fc85f77a03
diff --git a/metadata/md5-cache/dev-python/outcome-1.1.0 b/metadata/md5-cache/dev-python/outcome-1.1.0
deleted file mode 100644
index 2944ab9882f4..000000000000
--- a/metadata/md5-cache/dev-python/outcome-1.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinxcontrib-trio[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinxcontrib-trio[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinxcontrib-trio[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/sphinxcontrib-trio[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Capture the outcome of Python function calls
-EAPI=7
-HOMEPAGE=https://github.com/python-trio/outcome https://pypi.org/project/outcome
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=|| ( Apache-2.0 MIT )
-RDEPEND=dev-python/attrs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/python-trio/outcome/archive/v1.1.0.tar.gz -> outcome-1.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a33e3822e63c37006c0feb5976fb80aa
diff --git a/metadata/md5-cache/dev-python/pefile-2022.5.30 b/metadata/md5-cache/dev-python/pefile-2022.5.30
new file mode 100644
index 000000000000..ca3121a6260b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pefile-2022.5.30
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Module to read and work with Portable Executable (PE) files
+EAPI=8
+HOMEPAGE=https://github.com/erocarrera/pefile
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2022.5.30/pefile-2022.5.30.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=909080211d176598639ff1f902355c04
diff --git a/metadata/md5-cache/dev-python/phonenumbers-8.12.49 b/metadata/md5-cache/dev-python/phonenumbers-8.12.49
new file mode 100644
index 000000000000..313f25aaef1e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/phonenumbers-8.12.49
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python port of Google's libphonenumber
+EAPI=8
+HOMEPAGE=https://github.com/daviddrysdale/python-phonenumbers/ https://pypi.org/project/phonenumbers/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/daviddrysdale/python-phonenumbers/archive/v8.12.49.tar.gz -> python-phonenumbers-8.12.49.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=edad0be3a7edc661e4f25ca06ba32ce7
diff --git a/metadata/md5-cache/dev-python/portend-3.0.0 b/metadata/md5-cache/dev-python/portend-3.0.0
deleted file mode 100644
index fc3025a891f8..000000000000
--- a/metadata/md5-cache/dev-python/portend-3.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/pytest-6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=TCP port monitoring utilities
-EAPI=8
-HOMEPAGE=https://pypi.org/project/portend/ https://github.com/jaraco/portend
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/portend/portend-3.0.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=23407ea76c2d1d46690de79d165d1526
diff --git a/metadata/md5-cache/dev-python/pyacoustid-1.2.2 b/metadata/md5-cache/dev-python/pyacoustid-1.2.2
new file mode 100644
index 000000000000..b4c7d31b66bf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyacoustid-1.2.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for Chromaprint and the AcoustID web service
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyacoustid/
+INHERIT=distutils-r1
+IUSE=examples python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/audioread[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-libs/chromaprint python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyacoustid/pyacoustid-1.2.2.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e241beb77207ce810056fcfedfc3241e
diff --git a/metadata/md5-cache/dev-python/pygobject-3.42.1 b/metadata/md5-cache/dev-python/pygobject-3.42.1
index f924c6eb8467..b3521d8a8309 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.42.1
+++ b/metadata/md5-cache/dev-python/pygobject-3.42.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pygobject.readthedocs.io/
 INHERIT=gnome.org meson python-r1 virtualx xdg
 IUSE=+cairo examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-libs/glib-2.56:2 >=dev-libs/gobject-introspection-1.56:= dev-libs/libffi:= cairo? ( >=dev-python/pycairo-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] x11-libs/cairo[glib] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.42/pygobject-3.42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=78e929d2c2d32de78f61471897dc40c5
+_md5_=675519ee8eaa20468f0ff8cecc29cf41
diff --git a/metadata/md5-cache/dev-python/pykka-3.1.1 b/metadata/md5-cache/dev-python/pykka-3.1.1
new file mode 100644
index 000000000000..3a9e815e0404
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pykka-3.1.1
@@ -0,0 +1,16 @@
+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/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python implementation of the actor model
+EAPI=8
+HOMEPAGE=https://pykka.org/en/latest/ https://github.com/jodal/pykka/ https://pypi.org/project/pykka/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/jodal/pykka/archive/v3.1.1.tar.gz -> pykka-3.1.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b4ed3f153bb32a1070214f67fe096ea8
diff --git a/metadata/md5-cache/dev-python/pylast-5.0.0 b/metadata/md5-cache/dev-python/pylast-5.0.0
index 684307d7636c..bb65217262f1 100644
--- a/metadata/md5-cache/dev-python/pylast-5.0.0
+++ b/metadata/md5-cache/dev-python/pylast-5.0.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 interface to last.fm and other api-compatible websites
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pylast/ https://github.com/pylast/pylast/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/httpx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/httpx[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/pylast/pylast/archive/5.0.0.tar.gz -> pylast-5.0.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=27dbc30cc8b4a6c7dc5cf5433e419c19
+_md5_=775f52a42f4aa08ea285dd07e03013a8
diff --git a/metadata/md5-cache/dev-python/pylint-2.13.9 b/metadata/md5-cache/dev-python/pylint-2.13.9
index cd5d2d6ba5ca..a5f09d087119 100644
--- a/metadata/md5-cache/dev-python/pylint-2.13.9
+++ b/metadata/md5-cache/dev-python/pylint-2.13.9
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pylint/ https://github.com/PyCQA/pylint/
 INHERIT=distutils-r1
 IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=<dev-python/astroid-2.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astroid-2.11.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dill-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/isort-4.2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/isort-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mccabe-0.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/mccabe-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycqa/pylint/archive/v2.13.9.tar.gz -> pylint-2.13.9.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=876b8b6b2e5cf9c8e30527bc227e08b9
+_md5_=e7e267c2a05f63bc73403872a63c3a62
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.1.5 b/metadata/md5-cache/dev-python/pyopencl-2022.1.5
new file mode 100644
index 000000000000..7fd81fd1b323
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.1.5
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] opengl? ( media-libs/libglvnd ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/opencl-2
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
+INHERIT=distutils-r1
+IUSE=examples opengl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.1.5.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1c33aeded644b879bc800f90ffcf66ae
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.1 b/metadata/md5-cache/dev-python/pyopenssl-20.0.1
deleted file mode 100644
index b897f513a1b6..000000000000
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( virtual/python-cffi[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flaky[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-3.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0[threads(+)] >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] ) ) ) test? ( >=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to the OpenSSL library
-EAPI=7
-HOMEPAGE=https://www.pyopenssl.org/ https://pypi.org/project/pyOpenSSL/ https://github.com/pyca/pyopenssl/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-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=Apache-2.0
-RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cryptography-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3996beb0290e7850c54547427489f08f
diff --git a/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1 b/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
index f6941ec48929..81cccac3e702 100644
--- a/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
+++ b/metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.pyopenssl.org/ https://pypi.org/project/pyOpenSSL/ https://github.com/pyca/pyopenssl/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=doc 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-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=Apache-2.0
 RDEPEND=>=dev-python/six-1.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-3.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.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_pypy3 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=mirror://pypi/p/pyOpenSSL/pyOpenSSL-20.0.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=489d035532fa66b67ac5f42345ef4156
+_md5_=89f6c91cb7fdb78459eb202424d14166
diff --git a/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1 b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1
new file mode 100644
index 000000000000..6f20fc436262
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=convert python profile data to kcachegrind calltree form
+EAPI=8
+HOMEPAGE=https://pypi.org/project/pyprof2calltree/
+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=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/pwaller/pyprof2calltree/archive/v1.4.5.tar.gz -> pyprof2calltree-1.4.5.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=78e4a8cec9a0654ce101cc3c0c1f9e6b
diff --git a/metadata/md5-cache/dev-python/pyproj-3.3.0 b/metadata/md5-cache/dev-python/pyproj-3.3.0
deleted file mode 100644
index 592e0ece7cce..000000000000
--- a/metadata/md5-cache/dev-python/pyproj-3.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xarray[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/shapely[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=sci-libs/proj-8.0.0:= >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python interface to the PROJ library
-EAPI=8
-HOMEPAGE=https://github.com/pyproj4/pyproj
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=>=sci-libs/proj-8.0.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyproj/pyproj-3.3.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=711b433df62c916ccdd7612a3e8d4669
diff --git a/metadata/md5-cache/dev-python/pysimdjson-5.0.1 b/metadata/md5-cache/dev-python/pysimdjson-5.0.1
new file mode 100644
index 000000000000..d4bd636af71c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pysimdjson-5.0.1
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-libs/simdjson-2.0.1:= >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/simdjson-2.0.1:=
+DESCRIPTION=Python bindings for simdjson
+EAPI=8
+HOMEPAGE=https://github.com/TkTech/pysimdjson/ https://pypi.org/project/pysimdjson/
+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=MIT Apache-2.0
+RDEPEND=>=dev-libs/simdjson-2.0.1:= python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/TkTech/pysimdjson/archive/v5.0.1.tar.gz -> pysimdjson-5.0.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=12416eccb55af2c51d91f024c005b39b
diff --git a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2 b/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
deleted file mode 100644
index ca018aa10124..000000000000
--- a/metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Easily freeze time in pytest test + fixtures
-EAPI=7
-HOMEPAGE=https://github.com/ktosiek/pytest-freezegun
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=MIT
-RDEPEND=dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ktosiek/pytest-freezegun/archive/0.4.2.tar.gz -> pytest-freezegun-0.4.2.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ac9ad05572aa017a32d8f82efcd77a23
diff --git a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24 b/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
deleted file mode 100644
index dae55bad588c..000000000000
--- a/metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Provides a helpers pytest namespace
-EAPI=8
-HOMEPAGE=https://github.com/saltstack/pytest-helpers-namespace
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/saltstack/pytest-helpers-namespace/archive/v2021.3.24.tar.gz -> pytest-helpers-namespace-2021.3.24.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=53dd8074991d4e7c4aec1acfc63ff32b
diff --git a/metadata/md5-cache/dev-python/pytest-param-files-0.3.4 b/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
index 4d05f75f9586..2bb1e014d835 100644
--- a/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
+++ b/metadata/md5-cache/dev-python/pytest-param-files-0.3.4
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pytest parametrize decorators from external files.
 EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest_param_files/ https://github.com/chrisjsewell/pytest-param-files
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/pytest[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/chrisjsewell/pytest-param-files/archive/v0.3.4.tar.gz -> pytest-param-files-0.3.4.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=31fd8e4b02f2baec944371e944e0f625
+_md5_=46239cce8df351dba7a0420099109963
diff --git a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0 b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
index 5dd0401e8ca4..07b5333138eb 100644
--- a/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
+++ b/metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-shell-utilities/ https://github.com/saltstack/pytest-shell-utilities/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-helpers-namespace[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-shell-utilities/archive/1.4.0.tar.gz -> pytest-shell-utilities-1.4.0.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=22631da6dacd752d01ca4bb7e55943b5
+_md5_=fbfd6478ef3b198defdc92927cfef815
diff --git a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1 b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
index ddf208586165..1628bd8a0a84 100644
--- a/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
+++ b/metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pytest-skip-markers.readthedocs.io/en/latest/ https://github.com/saltstack/pytest-skip-markers
 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 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/distro[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/saltstack/pytest-skip-markers/archive/1.3.0.tar.gz -> pytest-skip-markers-1.3.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6213770dd3fbaf07ea39d43a437657fb
+_md5_=632105904173ad1504f94639b38249f4
diff --git a/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2 b/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
index fbeb7270adb4..9201cf769415 100644
--- a/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
+++ b/metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pytest-system-statistics/ https://github.com/saltstack/pytest-system-statistics
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pytest-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-skip-markers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/saltstack/pytest-system-statistics/archive/refs/tags/1.0.2.tar.gz -> pytest-system-statistics-1.0.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5d6776f85228b2fd78203c4d4cb81dda
+_md5_=24f3e4dacc229a0d0e73d2b6c17021f9
diff --git a/metadata/md5-cache/dev-python/pytest-trio-0.7.0 b/metadata/md5-cache/dev-python/pytest-trio-0.7.0
deleted file mode 100644
index 397016ccde92..000000000000
--- a/metadata/md5-cache/dev-python/pytest-trio-0.7.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/hypothesis-3.64[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/async_generator-1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/outcome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trio-0.15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/attrs[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-trio[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/attrs[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-trio[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/attrs[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-trio[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/attrs[python_targets_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-)] dev-python/sphinxcontrib-trio[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=This is a pytest plugin to help you test projects that use Trio
-EAPI=7
-HOMEPAGE=https://github.com/python-trio/pytest-trio https://pypi.org/project/pytest-trio/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86
-LICENSE=|| ( MIT Apache-2.0 )
-RDEPEND=>=dev-python/async_generator-1.9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/outcome[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/trio-0.15[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pytest-trio/pytest-trio-0.7.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f423a3ae16657eee9f2835d667da220c
diff --git a/metadata/md5-cache/dev-python/python-cinderclient-8.3.0 b/metadata/md5-cache/dev-python/python-cinderclient-8.3.0
index 1418b758967c..d091c3019be6 100644
--- a/metadata/md5-cache/dev-python/python-cinderclient-8.3.0
+++ b/metadata/md5-cache/dev-python/python-cinderclient-8.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://launchpad.net/python-cinderclient
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-4.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-5.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pbr-5.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.25.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-cinderclient/python-cinderclient-8.3.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ebb0be59d8de7e2731a08a4c2dc0f9c2
+_md5_=70173260a5328e46190272230361c492
diff --git a/metadata/md5-cache/dev-python/python-cstruct-2.1-r1 b/metadata/md5-cache/dev-python/python-cstruct-2.1-r1
new file mode 100644
index 000000000000..070b62273426
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-cstruct-2.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C-style structs for Python
+EAPI=8
+HOMEPAGE=https://github.com/andreax79/python-cstruct https://pypi.org/project/cstruct/
+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=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/andreax79/python-cstruct/archive/v2.1.tar.gz -> python-cstruct-2.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=43e02cbf910f120ecf1ad92e7e0f9be7
diff --git a/metadata/md5-cache/dev-python/python-daemon-2.3.0-r2 b/metadata/md5-cache/dev-python/python-daemon-2.3.0-r2
new file mode 100644
index 000000000000..36ecefff6913
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-daemon-2.3.0-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/lockfile[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=Library to implement a well-behaved Unix daemon process
+EAPI=8
+HOMEPAGE=https://pypi.org/project/python-daemon/
+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 ~x86
+LICENSE=PSF-2
+RDEPEND=dev-python/lockfile[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/p/python-daemon/python-daemon-2.3.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=eee9d3290f0bd0d0685c8ffc61df02a5
diff --git a/metadata/md5-cache/dev-python/python-glanceclient-4.0.0 b/metadata/md5-cache/dev-python/python-glanceclient-4.0.0
index b15345c7c696..0c0213a185c4 100644
--- a/metadata/md5-cache/dev-python/python-glanceclient-4.0.0
+++ b/metadata/md5-cache/dev-python/python-glanceclient-4.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/python-glanceclient
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/keystoneauth-3.6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyopenssl-17.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/warlock-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/warlock-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-glanceclient/python-glanceclient-4.0.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=00b9521a4e807bcb93cdd39e43f30ede
+_md5_=2f7962bd33b229484feda42b8b4fd53a
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.4.9 b/metadata/md5-cache/dev-python/python-gnupg-0.4.9
index 0ab34d0ad5c2..77b03616386f 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.4.9
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.4.9
@@ -1,17 +1,17 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-vinaysajip ) test? ( app-crypt/gnupg dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-vinaysajip ) test? ( app-crypt/gnupg dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=app-crypt/gnupg
 DESCRIPTION=A Python wrapper for GnuPG
 EAPI=8
 HOMEPAGE=https://docs.red-dove.com/python-gnupg/
 INHERIT=distutils-r1 verify-sig
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=BSD
-RDEPEND=app-crypt/gnupg python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=app-crypt/gnupg python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/vsajip/python-gnupg/releases/download/0.4.9/python-gnupg-0.4.9.tar.gz verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/0.4.9/python-gnupg-0.4.9.tar.gz.asc )
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9dc90bee59d1624a445811173eb8198c
+_md5_=8ec3af07bea4ead4280f3c903ccd41c8
diff --git a/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0 b/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
index ba3c7b3e7eee..12d5b37cc07b 100644
--- a/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
+++ b/metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.openstack.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-keystoneclient/python-keystoneclient-4.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0b1eb4d3926dd08f5b75836398d2f212
+_md5_=70ac0f1b41b3a89cfc6ad9138c98063a
diff --git a/metadata/md5-cache/dev-python/python-libevdev-0.11 b/metadata/md5-cache/dev-python/python-libevdev-0.11
new file mode 100644
index 000000000000..9ce3ddc4d210
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-libevdev-0.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/libevdev ) test? ( dev-libs/libevdev dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 wrappers for the libevdev library
+EAPI=8
+HOMEPAGE=https://gitlab.freedesktop.org/libevdev/python-libevdev/ https://pypi.org/project/libevdev/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/libevdev python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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://gitlab.freedesktop.org/libevdev/python-libevdev/-/archive/0.11/python-libevdev-0.11.tar.bz2
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=019a484392a5a35e7d057c8a479aff12
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.5.2 b/metadata/md5-cache/dev-python/python-ly-0.9.7
similarity index 80%
rename from metadata/md5-cache/dev-python/typed-ast-1.5.2
rename to metadata/md5-cache/dev-python/python-ly-0.9.7
index b22b33e223fd..d20a1d5679f1 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.5.2
+++ b/metadata/md5-cache/dev-python/python-ly-0.9.7
@@ -1,16 +1,16 @@
 BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python typed-ast backported
+DESCRIPTION=Tool and library for manipulating LilyPond files
 EAPI=8
-HOMEPAGE=https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast
+HOMEPAGE=https://github.com/frescobaldi/python-ly https://pypi.org/project/python-ly/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0 MIT
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
+RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.5.2.tar.gz
+SRC_URI=https://github.com/frescobaldi/python-ly/archive/refs/tags/v0.9.7.tar.gz -> python-ly-0.9.7.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2138abf9ed617e615699ecc9ad8d4a04
+_md5_=4a1d78e4f70ba6626a6b26f8cf5ef550
diff --git a/metadata/md5-cache/dev-python/python-nbxmpp-3.1.0 b/metadata/md5-cache/dev-python/python-nbxmpp-3.1.0
new file mode 100644
index 000000000000..92322ff29dab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-nbxmpp-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
+EAPI=8
+HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection net-libs/libsoup[introspection] dev-python/idna[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/precis-i18n[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygobject[python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/3.1.0/python-nbxmpp-3.1.0.tar.bz2
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a639fe05660119d62769e67563c9904a
diff --git a/metadata/md5-cache/dev-python/python-neutronclient-7.8.0 b/metadata/md5-cache/dev-python/python-neutronclient-7.8.0
index 498ff7b1e216..40ea0197895b 100644
--- a/metadata/md5-cache/dev-python/python-neutronclient-7.8.0
+++ b/metadata/md5-cache/dev-python/python-neutronclient-7.8.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://launchpad.net/neutron
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-1.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/os-client-config-1.28.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.14.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/simplejson-3.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-neutronclient/python-neutronclient-7.8.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fe3c5afb4aa06944b79bd1c481449734
+_md5_=cfb60ec156303e06f95af01c549f3c3f
diff --git a/metadata/md5-cache/dev-python/python-novaclient-18.0.0 b/metadata/md5-cache/dev-python/python-novaclient-18.0.0
index ab25a0758abd..ccbc8dc0ceb8 100644
--- a/metadata/md5-cache/dev-python/python-novaclient-18.0.0
+++ b/metadata/md5-cache/dev-python/python-novaclient-18.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/python-novaclient
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/keystoneauth-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/iso8601-0.1.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/oslo-serialization-2.19.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/requests-2.12.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-novaclient/python-novaclient-18.0.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d379f8b095ed300f81dc509f5d63ca68
+_md5_=9ac3b1931ca3614c6244292abd4424ba
diff --git a/metadata/md5-cache/dev-python/python-openstackclient-5.8.0 b/metadata/md5-cache/dev-python/python-openstackclient-5.8.0
index 551151e7a71f..133628ae95c8 100644
--- a/metadata/md5-cache/dev-python/python-openstackclient-5.8.0
+++ b/metadata/md5-cache/dev-python/python-openstackclient-5.8.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/openstack/python-openstackclient
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openstacksdk-0.56.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/osc-lib-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-3.33.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-keystoneclient-3.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-novaclient-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/python-openstackclient/python-openstackclient-5.8.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bf72e15c1cc5b4c983aa30f9e3c59bb6
+_md5_=53d5545e3d1c0ecf849c3177109906bc
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1-r1 b/metadata/md5-cache/dev-python/python-utils-3.3.0
similarity index 66%
rename from metadata/md5-cache/dev-python/testresources-2.0.1-r1
rename to metadata/md5-cache/dev-python/python-utils-3.3.0
index e318adeba1ad..ee35a8aa4774 100644
--- a/metadata/md5-cache/dev-python/testresources-2.0.1-r1
+++ b/metadata/md5-cache/dev-python/python-utils-3.3.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=A pyunit extension for managing expensive test resources
+DESCRIPTION=Collection of small Python functions & classes
 EAPI=8
-HOMEPAGE=https://launchpad.net/testresources/ https://github.com/testing-cabal/testresources/ https://pypi.org/project/testresources/
+HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/t/testresources/testresources-2.0.1.tar.gz
+SRC_URI=mirror://pypi/p/python-utils/python-utils-3.3.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8e022f432993a5ecd0cccc1300258413
+_md5_=b2c08a823fe9f597207b66a006274f25
diff --git a/metadata/md5-cache/dev-python/python-utils-3.3.1 b/metadata/md5-cache/dev-python/python-utils-3.3.1
new file mode 100644
index 000000000000..bf7e54d4f231
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-utils-3.3.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=Collection of small Python functions & classes
+EAPI=8
+HOMEPAGE=https://github.com/WoLpH/python-utils/ https://pypi.org/project/python-utils/
+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 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/p/python-utils/python-utils-3.3.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b2c08a823fe9f597207b66a006274f25
diff --git a/metadata/md5-cache/dev-python/pytimeparse-1.1.8-r1 b/metadata/md5-cache/dev-python/pytimeparse-1.1.8-r1
new file mode 100644
index 000000000000..eb5a486c8fda
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytimeparse-1.1.8-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A small Python module to parse various kinds of time expressions
+EAPI=8
+HOMEPAGE=https://github.com/wroberts/pytimeparse https://pypi.org/project/pytimeparse/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/p/pytimeparse/pytimeparse-1.1.8.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5aba4f023b5628abb2583f0cd7afa381
diff --git a/metadata/md5-cache/dev-python/pytools-2022.1.9 b/metadata/md5-cache/dev-python/pytools-2022.1.9
index 98c45ec66c95..a3f7fd702ca4 100644
--- a/metadata/md5-cache/dev-python/pytools-2022.1.9
+++ b/metadata/md5-cache/dev-python/pytools-2022.1.9
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Collection of tools missing from the Python standard library
 EAPI=8
 HOMEPAGE=https://mathema.tician.de/software/pytools/ https://github.com/inducer/pytools/ https://pypi.org/project/pytools/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=>=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/numpy-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/typing-extensions-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[sqlite] )
+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://pypi/p/pytools/pytools-2022.1.9.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7586fc184a42abdf6068d1e43da1ba23
+_md5_=adcf3413852fddda8c60a47e2633c54f
diff --git a/metadata/md5-cache/dev-python/pyx-0.15_p1 b/metadata/md5-cache/dev-python/pyx-0.15_p1
index 3100b793cd90..0f3207557cc2 100644
--- a/metadata/md5-cache/dev-python/pyx-0.15_p1
+++ b/metadata/md5-cache/dev-python/pyx-0.15_p1
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/tex-base dev-texlive/texlive-basic doc? ( virtual/latex-base || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[latex,python_targets_python3_10(-)] dev-python/sphinx_selective_exclude[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[latex,python_targets_python3_9(-)] dev-python/sphinx_selective_exclude[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[latex,python_targets_python3_8(-)] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)] ) ) ) test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/tex-base virtual/latex-base dev-texlive/texlive-basic doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/sphinx[latex,python_targets_python3_10(-)] dev-python/sphinx_selective_exclude[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/sphinx[latex,python_targets_python3_9(-)] dev-python/sphinx_selective_exclude[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/sphinx[latex,python_targets_python3_8(-)] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)] ) ) ) test? ( dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx_selective_exclude[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/testfixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Python package for the generation of encapsulated PostScript figures
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/tex-base dev-texlive/texlive-basic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/tex-base virtual/latex-base dev-texlive/texlive-basic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/pyx-0.15_p1.tar.bz2 test? ( https://www.w3.org/Graphics/SVG/Test/20110816/archives/W3C_SVG_11_TestSuite.tar.gz )
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dddb536f1f5f1989bb79a5ee08d0b4dc
+_md5_=b49db24f450ec1fc616ec759bd9bd154
diff --git a/metadata/md5-cache/dev-python/radon-5.1.0-r1 b/metadata/md5-cache/dev-python/radon-5.1.0-r1
deleted file mode 100644
index 193350d2cd66..000000000000
--- a/metadata/md5-cache/dev-python/radon-5.1.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Code Metrics in Python
-EAPI=8
-HOMEPAGE=https://radon.readthedocs.io/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flake8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mando[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/radon/radon-5.1.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=80109308efe084614250a31fc4145cf4
diff --git a/metadata/md5-cache/dev-python/random2-1.0.1-r2 b/metadata/md5-cache/dev-python/random2-1.0.1-r2
index a7274c11e271..4e607f4ed4f8 100644
--- a/metadata/md5-cache/dev-python/random2-1.0.1-r2
+++ b/metadata/md5-cache/dev-python/random2-1.0.1-r2
@@ -1,15 +1,15 @@
-BDEPEND=app-arch/unzip python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=app-arch/unzip python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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-2.7 random module ported to python-3
 EAPI=8
 HOMEPAGE=https://pypi.org/project/random2/
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=PSF-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/r/random2/random2-1.0.1.zip
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f391b1d09f2396cf71c964474d1f5dda
+_md5_=c4bc4d5f92e3676062b64558af9932ff
diff --git a/metadata/md5-cache/dev-python/ratelimit-2.2.1-r1 b/metadata/md5-cache/dev-python/ratelimit-2.2.1-r1
new file mode 100644
index 000000000000..e453a2eda928
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ratelimit-2.2.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An API rate limit decorator for Python
+EAPI=8
+HOMEPAGE=https://github.com/tomasbasham/ratelimit
+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=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/tomasbasham/ratelimit/archive/v2.2.1.tar.gz -> ratelimit-2.2.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7d9a0878d2550f309053adf5232fba9b
diff --git a/metadata/md5-cache/dev-python/readme_renderer-34.0 b/metadata/md5-cache/dev-python/readme_renderer-34.0
deleted file mode 100644
index 31acd63c4b35..000000000000
--- a/metadata/md5-cache/dev-python/readme_renderer-34.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=a library for rendering "readme" descriptions for Warehouse
-EAPI=8
-HOMEPAGE=https://github.com/pypa/readme_renderer/ https://pypi.org/project/readme-renderer/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/bleach-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.13.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pygments-2.5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/readme_renderer/readme_renderer-34.0.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ebc3f9e0158b8de4cb79dd153d8df514
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.7.1-r1 b/metadata/md5-cache/dev-python/recommonmark-0.7.1-r1
new file mode 100644
index 000000000000..d274abecbb89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/recommonmark-0.7.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 docutils-compatibility bridge to CommonMark
+EAPI=8
+HOMEPAGE=https://recommonmark.readthedocs.io/
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/commonmark-0.8.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/docutils-0.14[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/rtfd/recommonmark/archive/0.7.1.tar.gz -> recommonmark-0.7.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=84f112922a928fdceffdc6f722ae70b7
diff --git a/metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2 b/metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2
new file mode 100644
index 000000000000..6a534ac2af92
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 Reed Solomon encoder/decoder
+EAPI=8
+HOMEPAGE=https://github.com/tomerfiliba/reedsolomon https://pypi.org/project/reedsolo/
+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 ~x86
+LICENSE=public-domain
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/tomerfiliba/reedsolomon/archive/v1.5.4.tar.gz -> reedsolomon-1.5.4.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=89988f642867a7525f2a971f7b6d6049
diff --git a/metadata/md5-cache/dev-python/reflink-0.2.1-r2 b/metadata/md5-cache/dev-python/reflink-0.2.1-r2
new file mode 100644
index 000000000000..33032c790831
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reflink-0.2.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( sys-fs/btrfs-progs ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] ) ) ) test? ( virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/python-cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Python wrapper around the reflink system calls
+EAPI=8
+HOMEPAGE=https://gitlab.com/rubdos/pyreflink
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=virtual/python-cffi[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/r/reflink/reflink-0.2.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e02490cc28b3c1577513349aed3a7824
diff --git a/metadata/md5-cache/dev-python/regex-2022.3.15 b/metadata/md5-cache/dev-python/regex-2022.3.15
deleted file mode 100644
index fc11509b3708..000000000000
--- a/metadata/md5-cache/dev-python/regex-2022.3.15
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Alternative regular expression module to replace re
-EAPI=8
-HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
-LICENSE=Apache-2.0
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/r/regex/regex-2022.3.15.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=da08087c8a2f0400e3fa08777a066a0b
diff --git a/metadata/md5-cache/dev-python/regex-2022.4.24 b/metadata/md5-cache/dev-python/regex-2022.4.24
index 13ac04235361..9f1928fb71c3 100644
--- a/metadata/md5-cache/dev-python/regex-2022.4.24
+++ b/metadata/md5-cache/dev-python/regex-2022.4.24
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex/ https://pypi.org/project/regex/
 INHERIT=distutils-r1
 IUSE=doc 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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=mirror://pypi/r/regex/regex-2022.4.24.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=66fa7e356741eee0e789a1414547ed9f
+_md5_=88d190d0d3122b83ecad6ab200cd8556
diff --git a/metadata/md5-cache/dev-python/rencode-1.0.6-r3 b/metadata/md5-cache/dev-python/rencode-1.0.6-r3
new file mode 100644
index 000000000000..bc41eebf7dc2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rencode-1.0.6-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=similar to bencode from the BitTorrent project
+EAPI=8
+HOMEPAGE=https://github.com/aresch/rencode
+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 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/aresch/rencode/archive/v1.0.6.tar.gz -> rencode-1.0.6.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5a5ef9d7318239d1b93876a107a9a176
diff --git a/metadata/md5-cache/dev-python/reno-3.5.0 b/metadata/md5-cache/dev-python/reno-3.5.0
index 8755bfc5fb03..30e5b9f87977 100644
--- a/metadata/md5-cache/dev-python/reno-3.5.0
+++ b/metadata/md5-cache/dev-python/reno-3.5.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/reno/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~s390 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 ~riscv ~s390 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dulwich-0.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-3.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ed1902f916ade0dfd859336e052e03af
+_md5_=2b7b8bd81f7f5080318ebd9eb2ec27e0
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.9.3-r1 b/metadata/md5-cache/dev-python/requests-cache-0.9.3-r1
deleted file mode 100644
index 1c69259b24ff..000000000000
--- a/metadata/md5-cache/dev-python/requests-cache-0.9.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-httpbin[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/timeout-decorator[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ujson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Persistent cache for requests library
-EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cattrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/url-normalize-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.9.3.tar.gz -> requests-cache-0.9.3.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c46e089850e68ac075a5d4eb057ffaa1
diff --git a/metadata/md5-cache/dev-python/requests-cache-0.9.4 b/metadata/md5-cache/dev-python/requests-cache-0.9.4
index 5c632defb366..f01623696646 100644
--- a/metadata/md5-cache/dev-python/requests-cache-0.9.4
+++ b/metadata/md5-cache/dev-python/requests-cache-0.9.4
@@ -2,7 +2,7 @@ BDEPEND=test? ( dev-python/itsdangerous[python_targets_python3_8(-)?,python_targ
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Persistent cache for requests library
 EAPI=8
-HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/reclosedev/requests-cache/
+HOMEPAGE=https://pypi.org/project/requests-cache/ https://github.com/requests-cache/requests-cache/
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 x86
@@ -11,6 +11,6 @@ RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/reclosedev/requests-cache/archive/v0.9.4.tar.gz -> requests-cache-0.9.4.gh.tar.gz
+SRC_URI=https://github.com/requests-cache/requests-cache/archive/v0.9.4.tar.gz -> requests-cache-0.9.4.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7e95ea39fe07efb857c92dcaee46cc3e
+_md5_=59c03e2273d66aa56ebdf740ca73c3f9
diff --git a/metadata/md5-cache/dev-python/requests-file-1.5.1-r2 b/metadata/md5-cache/dev-python/requests-file-1.5.1-r2
new file mode 100644
index 000000000000..ef88c2238ab2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-file-1.5.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File transport adapter for Requests
+EAPI=8
+HOMEPAGE=https://pypi.org/project/requests-file/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/r/requests-file/requests-file-1.5.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=53759c7ed1213cd403f3d04aad4a6285
diff --git a/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1 b/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
new file mode 100644
index 000000000000..bb032b846522
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/requests-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Asynchronous Python HTTP for Humans
+EAPI=8
+HOMEPAGE=https://github.com/ross/requests-futures
+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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+PROPERTIES=test_network
+RDEPEND=>=dev-python/requests-1.2.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.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/requests-futures/requests-futures-1.0.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1dc68b3bcefc9157ac3fe591cea3cf51
diff --git a/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1 b/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
index 3aaa4cfb8d90..72633b5839a4 100644
--- a/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
+++ b/metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/requests/requests-kerberos/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=ISC
 RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyspnego[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/gssapi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/krb5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/requests/requests-kerberos/archive/v0.14.0.tar.gz -> requests-kerberos-0.14.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=33a273d55444b2d5715d276478c9379b
+_md5_=b476fbfe7dddef73d930df30d2d98ccb
diff --git a/metadata/md5-cache/dev-python/requests_download-0.1.2-r1 b/metadata/md5-cache/dev-python/requests_download-0.1.2-r1
new file mode 100644
index 000000000000..d0f2def4c895
--- /dev/null
+++ b/metadata/md5-cache/dev-python/requests_download-0.1.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/requests[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.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=A convenient function to download to a file using requests
+EAPI=8
+HOMEPAGE=https://github.com/takluyver/requests_download https://pypi.org/project/requests_download/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=MIT
+RDEPEND=dev-python/requests[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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
+SLOT=0
+SRC_URI=https://github.com/takluyver/requests_download/archive/0.1.2.tar.gz -> requests_download-0.1.2.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c6566b1c1a4946bceb9dce1cbf6d41f6
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index 2d23f4066240..85f6703b9356 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8a357f97f673a50e0fc846ad4311cb45
+_md5_=8c5d66ab40ae3702e16db7d1b0655626
diff --git a/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0 b/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
index b55477fd53fb..f2db8874b2f5 100644
--- a/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
+++ b/metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/docutils-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( >=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Checks PyPI validity of reStructuredText
 EAPI=8
 HOMEPAGE=https://pypi.org/project/restructuredtext-lint/
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Unlicense
-RDEPEND=>=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/docutils-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/docutils-0.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-1.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/r/restructuredtext_lint/restructuredtext_lint-1.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=250d25c26c28408d7a0379db1d8ae16e
+_md5_=782681332b25b0457576095c9a006b7e
diff --git a/metadata/md5-cache/dev-python/retry-decorator-1.1.1-r1 b/metadata/md5-cache/dev-python/retry-decorator-1.1.1-r1
new file mode 100644
index 000000000000..fccb8d1a6024
--- /dev/null
+++ b/metadata/md5-cache/dev-python/retry-decorator-1.1.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Decorator for retrying when exceptions occur
+EAPI=8
+HOMEPAGE=https://github.com/pnpnpn/retry-decorator
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/pnpnpn/retry-decorator/archive/v1.1.1.tar.gz -> retry-decorator-1.1.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=dd0accb12170b5f53aee5b4889c7e053
diff --git a/metadata/md5-cache/dev-python/retrying-1.3.3-r1 b/metadata/md5-cache/dev-python/retrying-1.3.3-r1
new file mode 100644
index 000000000000..7f2c2d39a77b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/retrying-1.3.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/six-1.7.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=General-purpose retrying library
+EAPI=8
+HOMEPAGE=https://github.com/rholder/retrying
+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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/six-1.7.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/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/rholder/retrying/archive/v1.3.3.tar.gz -> retrying-1.3.3.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f6ac64b7daae7337c5b1b3204b1a8709
diff --git a/metadata/md5-cache/dev-python/rich-12.2.0 b/metadata/md5-cache/dev-python/rich-12.2.0
deleted file mode 100644
index 238c1d94653f..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v12.2.0.tar.gz -> rich-12.2.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e561349d264ae2003ad7374fe19a6919
diff --git a/metadata/md5-cache/dev-python/rich-12.3.0 b/metadata/md5-cache/dev-python/rich-12.3.0
deleted file mode 100644
index 2c9721024092..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v12.3.0.tar.gz -> rich-12.3.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e72c625b756c9c32108a5547fc745c69
diff --git a/metadata/md5-cache/dev-python/rich-12.4.0 b/metadata/md5-cache/dev-python/rich-12.4.0
deleted file mode 100644
index 59bf835c6845..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Python library for renrering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich
-INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/Textualize/rich/archive/v12.4.0.tar.gz -> rich-12.4.0.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e72c625b756c9c32108a5547fc745c69
diff --git a/metadata/md5-cache/dev-python/rich-12.4.3 b/metadata/md5-cache/dev-python/rich-12.4.3
deleted file mode 100644
index 165fb13e7181..000000000000
--- a/metadata/md5-cache/dev-python/rich-12.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[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=Python library for rendering rich text, tables, etc. to the terminal
-EAPI=8
-HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
-INHERIT=distutils-r1 optfeature
-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
-LICENSE=MIT
-RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/Textualize/rich/archive/v12.4.3.tar.gz -> rich-12.4.3.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f760106334dd3268291170a76d6fedf
diff --git a/metadata/md5-cache/dev-python/roman-3.3-r1 b/metadata/md5-cache/dev-python/roman-3.3-r1
new file mode 100644
index 000000000000..cff280a4689c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/roman-3.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Integer to Roman numerals converter
+EAPI=8
+HOMEPAGE=https://pypi.org/project/roman/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=PSF-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/r/roman/roman-3.3.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=86850990ffd1a647e998780e9e452feb
diff --git a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r2 b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
index 97139768ca7f..4e7a28e09595 100644
--- a/metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
+++ b/metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 Binding for RTIMULib, a versatile IMU library
 EAPI=8
 HOMEPAGE=https://github.com/RPi-Distro/RTIMULib
 INHERIT=distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/RPi-Distro/RTIMULib/archive/V7.2.1.tar.gz -> RTIMULib-7.2.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=da888e23f71fb2a7af347d2e1641f725
+_md5_=2ad29ac228a46324f369a2536f548491
diff --git a/metadata/md5-cache/dev-python/scikit-build-0.14.1 b/metadata/md5-cache/dev-python/scikit-build-0.14.1
index ae6078f934b2..17803214626c 100644
--- a/metadata/md5-cache/dev-python/scikit-build-0.14.1
+++ b/metadata/md5-cache/dev-python/scikit-build-0.14.1
@@ -1,17 +1,17 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ) ) test? ( dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-python/sphinx-4.4.0[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] ) ) ) test? ( dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[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/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path-py[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(-)?] dev-python/pytest-virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 DESCRIPTION=Improved build system generator for Python C/C++/Fortran/Cython extensions
 EAPI=8
-HOMEPAGE=https://github.com/scikit-build/scikit-build
+HOMEPAGE=https://github.com/scikit-build/scikit-build/ https://pypi.org/project/scikit-build/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+RDEPEND=dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[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/wheel[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/scikit-build/scikit-build-0.14.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=daa878c6c2476b386d737ef8aa49aca4
+_md5_=1398e33e72c13726ceb9b2a30bb0cf4b
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.3.1 b/metadata/md5-cache/dev-python/secretstorage-3.3.1
deleted file mode 100644
index 04fd2f28df8c..000000000000
--- a/metadata/md5-cache/dev-python/secretstorage-3.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( !hppa? ( !sparc? ( !s390? ( sys-apps/dbus virtual/secret-service ) ) ) ) test? ( dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jeepney-0.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/alabaster[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/alabaster[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/alabaster[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.7-r1:0 >=dev-python/sphinx-4.4.0[python_targets_pypy3(-)] dev-python/alabaster[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API
-EAPI=7
-HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
-INHERIT=distutils-r1
-IUSE=test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jeepney-0.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.3.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e9152f79da355a0ac27032f0229ecdb7
diff --git a/metadata/md5-cache/dev-python/service_identity-21.1.0-r1 b/metadata/md5-cache/dev-python/service_identity-21.1.0-r1
index 082f942e811d..5fc64e25cb5d 100644
--- a/metadata/md5-cache/dev-python/service_identity-21.1.0-r1
+++ b/metadata/md5-cache/dev-python/service_identity-21.1.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/pyopenssl[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=Service identity verification for pyOpenSSL
 EAPI=8
@@ -7,10 +7,10 @@ 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 ~x64-macos
 LICENSE=MIT
-RDEPEND=dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-0.14[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-19.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+RDEPEND=>=dev-python/attrs-19.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyasn1-modules[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/pyca/service-identity/archive/21.1.0.tar.gz -> service_identity-21.1.0.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9a21327fccd5d8758b4f5646d283f0d7
+_md5_=6e455fa76224fa70cf1cf92514f0c47e
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2.2 b/metadata/md5-cache/dev-python/setproctitle-1.2.2
deleted file mode 100644
index d6368db5a8e3..000000000000
--- a/metadata/md5-cache/dev-python/setproctitle-1.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Allow customization of the process title
-EAPI=7
-HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setproctitle/setproctitle-1.2.2.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b3e2f701c1dcf865527b0775c955e1d0
diff --git a/metadata/md5-cache/dev-python/setproctitle-1.2.3 b/metadata/md5-cache/dev-python/setproctitle-1.2.3
index e2138f608301..4c6ec9f0c5dc 100644
--- a/metadata/md5-cache/dev-python/setproctitle-1.2.3
+++ b/metadata/md5-cache/dev-python/setproctitle-1.2.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/dvarrazzo/py-setproctitle/ https://pypi.org/project/setproctitle/
 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 ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 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=mirror://pypi/s/setproctitle/setproctitle-1.2.3.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a6097fcc69336c3f287a1a22760b17c3
+_md5_=ecbe00b2782ce3d1976689256a0b9eb8
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.3.0 b/metadata/md5-cache/dev-python/setuptools-rust-1.3.0
index d5fd08441232..62663535c55e 100644
--- a/metadata/md5-cache/dev-python/setuptools-rust-1.3.0
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.3.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/setuptools_scm-6.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/setuptools_scm-6.3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 unpack
 DESCRIPTION=A plugin for setuptools to build Rust Python extensions
 EAPI=8
@@ -7,10 +7,10 @@ INHERIT=distutils-r1 cargo
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
-RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/setuptools-rust/setuptools-rust-1.3.0.tar.gz test? ( https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.1.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/new_debug_unreachable/1.0.4/download -> new_debug_unreachable-1.0.4.crate https://crates.io/api/v1/crates/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.8.0/download -> phf_shared-0.8.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.16.2/download -> pyo3-0.16.2.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.2/download -> pyo3-build-config-0.16.2.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.2/download -> pyo3-ffi-0.16.2.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.2/download -> pyo3-macros-0.16.2.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.2/download -> pyo3-macros-backend-0.16.2.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/stable_deref_trait/1.2.0/download -> stable_deref_trait-1.2.0.crate https://crates.io/api/v1/crates/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8570e778de01928b8a94d93b72f10fc2
+_md5_=24a07993333ab3139d7fab6f86d7b0ea
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.4.1 b/metadata/md5-cache/dev-python/setuptools_scm-6.4.1
deleted file mode 100644
index 336e16fa6d02..000000000000
--- a/metadata/md5-cache/dev-python/setuptools_scm-6.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=!!<dev-python/setuptools_scm-2 test? ( >dev-python/virtualenv-20[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git !sparc? ( dev-vcs/mercurial ) ) test? ( dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,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.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Manage versions by scm tags via setuptools
-EAPI=7
-HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-6.4.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=24020af6e64062a9370283ab8d7112c5
diff --git a/metadata/md5-cache/dev-python/smmap-5.0.0 b/metadata/md5-cache/dev-python/smmap-5.0.0
index fc44b17b395b..c9b8bb5353e1 100644
--- a/metadata/md5-cache/dev-python/smmap-5.0.0
+++ b/metadata/md5-cache/dev-python/smmap-5.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/smmap/ https://github.com/gitpython-developers/smmap/
 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 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/smmap/smmap-5.0.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0a7c95a1525d297ab6188800a7407284
+_md5_=9e71f85b0187ac69cd5dfbb7bd0919de
diff --git a/metadata/md5-cache/dev-python/sphinx-5.0.0 b/metadata/md5-cache/dev-python/sphinx-5.0.0
new file mode 100644
index 000000000000..128e9e671577
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinxcontrib-websupport[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz ) test? ( dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] virtual/imagemagick-tools[jpeg,png,svg] dev-texlive/texlive-fontsextra dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) test? ( <dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib >=dev-python/pytest-7.0.1[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.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 documentation generator
+EAPI=8
+HOMEPAGE=https://www.sphinx-doc.org/ https://github.com/sphinx-doc/sphinx/ https://pypi.org/project/Sphinx/
+INHERIT=distutils-r1
+IUSE=doc latex 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
+RDEPEND=<dev-python/alabaster-0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Babel-1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/docutils-0.19[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/imagesize[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/snowballstemmer-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-applehelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-devhelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-jsmath[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-htmlhelp-2.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinxcontrib-serializinghtml-1.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinxcontrib-qthelp[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) latex? ( dev-texlive/texlive-latexextra dev-texlive/texlive-luatex app-text/dvipng ) !dev-python/namespace-sphinxcontrib python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0=[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] )
+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/S/Sphinx/Sphinx-5.0.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6023c5aed09c192d11598d891b534bf8
diff --git a/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1 b/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1
deleted file mode 100644
index d33694bb1040..000000000000
--- a/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( =dev-python/docutils-0.17*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tabbed views for Sphinx
-EAPI=8
-HOMEPAGE=https://github.com/executablebooks/sphinx-tabs
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND==dev-python/docutils-0.17*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/executablebooks/sphinx-tabs/archive/v3.3.1.tar.gz -> sphinx-tabs-3.3.1.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cf8be8dbd26f637dc233dc2d09157d1a
diff --git a/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1-r1 b/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1-r1
new file mode 100644
index 000000000000..6835cd0ff41a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-tabs-3.3.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-regressions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( =dev-python/docutils-0.17*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/sphinx-4.4.0[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/sphinx-4.4.0[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/sphinx-4.4.0[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Tabbed views for Sphinx
+EAPI=8
+HOMEPAGE=https://github.com/executablebooks/sphinx-tabs/ https://pypi.org/project/sphinx-tabs/
+INHERIT=distutils-r1
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+LICENSE=MIT
+RDEPEND==dev-python/docutils-0.17*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pygments[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/executablebooks/sphinx-tabs/archive/v3.3.1.tar.gz -> sphinx-tabs-3.3.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d997553f08128f3ad641874baf3888e9
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0-r1 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0-r1
new file mode 100644
index 000000000000..87a06c53f5c1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/readthedocs-sphinx-ext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=ReadTheDocs.org theme for Sphinx
+EAPI=8
+HOMEPAGE=https://github.com/readthedocs/sphinx_rtd_theme/ https://pypi.org/project/sphinx-rtd-theme/
+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 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/docutils[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.6[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=964d0b6ff297ef5be06b65d101f90f33
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1 b/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
index 309f16ce6b6c..039371a08af3 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=Organize changelog directives in Sphinx docs
 EAPI=8
 HOMEPAGE=https://github.com/davidism/sphinxcontrib-log-cabinet/ https://pypi.org/project/sphinxcontrib-log-cabinet/
 INHERIT=distutils-r1
-IUSE=python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=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 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/sphinx[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-log_cabinet/sphinxcontrib-log-cabinet-1.0.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fe3d7e2dcbc1f4e83684b7a97962b79b
+_md5_=3ea38b4ac52363c7b82c5a637d3070ab
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.4.1 b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.4.1
new file mode 100644
index 000000000000..bde49306f3e3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-dicts/myspell-en ) test? ( dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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 spelling extension
+EAPI=8
+HOMEPAGE=https://github.com/sphinx-contrib/spelling/ https://pypi.org/project/sphinxcontrib-spelling/
+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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=dev-python/pyenchant[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=aefcefdeeb2494f100ce41cf9538d5a4
diff --git a/metadata/md5-cache/dev-python/starlette-0.20.1 b/metadata/md5-cache/dev-python/starlette-0.20.1
new file mode 100644
index 000000000000..44b3b485e456
--- /dev/null
+++ b/metadata/md5-cache/dev-python/starlette-0.20.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( || ( dev-python/brotlicffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The little ASGI framework that shines
+EAPI=8
+HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1: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/encode/starlette/archive/0.20.1.tar.gz -> starlette-0.20.1.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4e0111439e1a7a616de4fcbac1da210f
diff --git a/metadata/md5-cache/dev-python/statsd-3.3.0 b/metadata/md5-cache/dev-python/statsd-3.3.0
index 0220c5f36232..79ce6af71d48 100644
--- a/metadata/md5-cache/dev-python/statsd-3.3.0
+++ b/metadata/md5-cache/dev-python/statsd-3.3.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/jsocol/pystatsd https://pypi.org/project/statsd
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/statsd/statsd-3.3.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=69b1a20b1e14738b72cade3eb4879a19
+_md5_=e14d78546ca573937a237561217da333
diff --git a/metadata/md5-cache/dev-python/stestr-3.2.1 b/metadata/md5-cache/dev-python/stestr-3.2.1
index 78dad4f51e62..6fc42cac66a1 100644
--- a/metadata/md5-cache/dev-python/stestr-3.2.1
+++ b/metadata/md5-cache/dev-python/stestr-3.2.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mtreinish/stestr
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cliff-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/voluptuous-0.8.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stestr/stestr-3.2.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=50021793fe0d64422befcdb5dd267dfd
+_md5_=954f59e39924ddc32338124658af52e3
diff --git a/metadata/md5-cache/dev-python/stevedore-3.4.0-r1 b/metadata/md5-cache/dev-python/stevedore-3.4.0-r1
index e9518f795130..c921fa9b20a2 100644
--- a/metadata/md5-cache/dev-python/stevedore-3.4.0-r1
+++ b/metadata/md5-cache/dev-python/stevedore-3.4.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://opendev.org/openstack/stevedore/ https://github.com/openstack/stevedore/ https://pypi.org/project/stevedore/
 INHERIT=distutils-r1
 IUSE=test doc 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 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/six-1.10.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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/s/stevedore/stevedore-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=34c4365c3bc8e6b4521f7f2bf1449940
+_md5_=eb393229821475118031801db589db5c
diff --git a/metadata/md5-cache/dev-python/tagpy-2018.1-r3 b/metadata/md5-cache/dev-python/tagpy-2018.1-r3
new file mode 100644
index 000000000000..43e9369842b7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tagpy-2018.1-r3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-libs/boost-1.70:=[python,threads(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8 >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/boost-1.70:=[python,threads(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8
+DESCRIPTION=Python Bindings for TagLib
+EAPI=8
+HOMEPAGE=https://mathema.tician.de//software/tagpy https://pypi.org/project/tagpy/
+INHERIT=edo distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-libs/boost-1.70:=[python,threads(+),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=media-libs/taglib-1.8 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tagpy/tagpy-2018.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9e084bbaa31ec62cfe140b5ad235d9a9
diff --git a/metadata/md5-cache/dev-python/tcolorpy-0.1.2 b/metadata/md5-cache/dev-python/tcolorpy-0.1.2
index 5e8fe93eb84c..7cfe72c5884a 100644
--- a/metadata/md5-cache/dev-python/tcolorpy-0.1.2
+++ b/metadata/md5-cache/dev-python/tcolorpy-0.1.2
@@ -1,6 +1,6 @@
 BDEPEND=test? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=tcolopy is a Python library to apply true color for terminal text
+DESCRIPTION=tcolorpy is a Python library to apply true color for terminal text
 EAPI=8
 HOMEPAGE=https://github.com/thombashi/tcolorpy
 INHERIT=distutils-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tcolorpy/tcolorpy-0.1.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=23040fdc6479cf345da9f421adcafbc0
+_md5_=c70c5cc7e7a91a8b32c7db95ce19f72d
diff --git a/metadata/md5-cache/dev-python/tempest-30.1.0 b/metadata/md5-cache/dev-python/tempest-30.1.0
index 1634511a4257..5eb04f0f3218 100644
--- a/metadata/md5-cache/dev-python/tempest-30.1.0
+++ b/metadata/md5-cache/dev-python/tempest-30.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/tempest/ https://docs.openstack.org/tempest/latest/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=>dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/cliff-2.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/paramiko-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/netaddr-0.7.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-concurrency-3.26.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-config-5.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-log-3.36.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/oslo-utils-4.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fixtures-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/subunit-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/prettytable-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/urllib3-1.21.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/debtcollector-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/tempest/tempest-30.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9d400125c68574dc267bab39e336dd71
+_md5_=f2fb163ab02382b7e07218989b1a1625
diff --git a/metadata/md5-cache/dev-python/testresources-2.0.1-r2 b/metadata/md5-cache/dev-python/testresources-2.0.1-r2
new file mode 100644
index 000000000000..043f09ceee01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/testresources-2.0.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pbr[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=A pyunit extension for managing expensive test resources
+EAPI=8
+HOMEPAGE=https://launchpad.net/testresources/ https://github.com/testing-cabal/testresources/ https://pypi.org/project/testresources/
+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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pbr[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/t/testresources/testresources-2.0.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=14781d0230871d9b4fdf2401220eb516
diff --git a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r2 b/metadata/md5-cache/dev-python/testscenarios-0.5.0-r3
similarity index 54%
rename from metadata/md5-cache/dev-python/testscenarios-0.5.0-r2
rename to metadata/md5-cache/dev-python/testscenarios-0.5.0-r3
index b6d5612fb387..d212326aa388 100644
--- a/metadata/md5-cache/dev-python/testscenarios-0.5.0-r2
+++ b/metadata/md5-cache/dev-python/testscenarios-0.5.0-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pbr-0.11[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[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=A pyunit extension for dependency injection
 EAPI=8
@@ -7,10 +7,10 @@ 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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
-RDEPEND=dev-python/testtools[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+RDEPEND=dev-python/testtools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pbr-0.11[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.7-r1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/t/testscenarios/testscenarios-0.5.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=12309f6d484b3e1c0ba905395da2c9f4
+_md5_=ac806ecb8d76c5bf4ac92a67ac041de8
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.5.3 b/metadata/md5-cache/dev-python/typed-ast-1.5.3
index e941dbe29417..f07026508c50 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.5.3
+++ b/metadata/md5-cache/dev-python/typed-ast-1.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=Apache-2.0 MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/typed_ast/typed_ast-1.5.3.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=08e4414009df81d3c8d879d75beb463b
+_md5_=91d7cf6929ed02389f190831b2077016
diff --git a/metadata/md5-cache/dev-python/versioningit-1.1.1 b/metadata/md5-cache/dev-python/versioningit-1.1.1
new file mode 100644
index 000000000000..f32eec5a11da
--- /dev/null
+++ b/metadata/md5-cache/dev-python/versioningit-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pydantic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=versioningit is a setuptools plugin for versioning based on git tags
+EAPI=8
+HOMEPAGE=https://pypi.org/project/versioningit/ https://github.com/jwodder/versioningit
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/versioningit/versioningit-1.1.1.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=216dc5169328a99bdc234764f74ed01a
diff --git a/metadata/md5-cache/dev-python/voluptuous-0.13.1-r1 b/metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
index 1adc4c844e7a..65b87d05c2cd 100644
--- a/metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
+++ b/metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/alecthomas/voluptuous/
 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 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/alecthomas/voluptuous/archive/0.13.1.tar.gz -> voluptuous-0.13.1.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b51678d12cc0eca9d66be658276b9280
+_md5_=e42850e16df6d3499ce876e50ef1f9f8
diff --git a/metadata/md5-cache/dev-python/warlock-1.3.3-r3 b/metadata/md5-cache/dev-python/warlock-1.3.3-r3
index 843f3155ae8a..b947b61d6cb6 100644
--- a/metadata/md5-cache/dev-python/warlock-1.3.3-r3
+++ b/metadata/md5-cache/dev-python/warlock-1.3.3-r3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/bcwaldon/warlock
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonpatch-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jsonpatch-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-0.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/jsonschema-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/bcwaldon/warlock/archive/1.3.3.tar.gz -> warlock-1.3.3.gh.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f838fa7a1173b62f60b4afe2649b722e
+_md5_=f8d0597a2a3f7011333ed2d094c51975
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.10 b/metadata/md5-cache/dev-python/wstools-0.4.10
deleted file mode 100644
index ac826873bfdf..000000000000
--- a/metadata/md5-cache/dev-python/wstools-0.4.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/pbr-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=WSDL parsing services package for Web Services for Python
-EAPI=8
-HOMEPAGE=https://github.com/pycontribs/wstools/ https://pypi.org/project/wstools/
-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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-python/six[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.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
-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/pycontribs/wstools/archive/0.4.10.tar.gz -> wstools-0.4.10.gh.tar.gz
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=31d0578439a8c7441f3b68ee030f1538
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.10-r1 b/metadata/md5-cache/dev-python/wstools-0.4.10-r1
new file mode 100644
index 000000000000..768151827727
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wstools-0.4.10-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/pbr-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pbr-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.0.1[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.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WSDL parsing services package for Web Services for Python
+EAPI=8
+HOMEPAGE=https://github.com/pycontribs/wstools/ https://pypi.org/project/wstools/
+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 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/pbr-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[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.12_p1-r1:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
+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/pycontribs/wstools/archive/0.4.10.tar.gz -> wstools-0.4.10.gh.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f96be2ab5bd74db65bc12f7f2dc88f63
diff --git a/metadata/md5-cache/dev-python/zope-component-5.0.1 b/metadata/md5-cache/dev-python/zope-component-5.0.1
index be9f3222cad4..36b9442437e7 100644
--- a/metadata/md5-cache/dev-python/zope-component-5.0.1
+++ b/metadata/md5-cache/dev-python/zope-component-5.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.component/ https://github.com/zopefoundation/zope.component/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv
 LICENSE=ZPL
 RDEPEND=dev-python/zope-event[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-hookable-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-5.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-zope python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/z/zope.component/zope.component-5.0.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=34a1178986718395aed0dc9286d1e52d
+_md5_=d7556aea8a0382f5614e4d4324af94b3
diff --git a/metadata/md5-cache/dev-python/zope-hookable-5.1.0 b/metadata/md5-cache/dev-python/zope-hookable-5.1.0
index c448800733c5..82cc261418e1 100644
--- a/metadata/md5-cache/dev-python/zope-hookable-5.1.0
+++ b/metadata/md5-cache/dev-python/zope-hookable-5.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/zope.hookable/ https://github.com/zopefoundation/zope.hookable/
 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 ~riscv
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv
 LICENSE=ZPL
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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=mirror://pypi/z/zope.hookable/zope.hookable-5.1.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7515940b81955af65dd64326b26b3a55
+_md5_=82514ffc300f7aeba6f4ce69eff2ad8b
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 213fd4981ddd..d68a28f4a3a7 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.4 b/metadata/md5-cache/dev-qt/qtcore-5.15.4
deleted file mode 100644
index 29043f421ad7..000000000000
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= ) test? ( =dev-qt/qttest-5.15.4* )
-DESCRIPTION=Cross-platform application development framework
-EAPI=8
-HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtbase https://community.kde.org/Qt5PatchCollection
-INHERIT=linux-info qt5-build
-IUSE=icu old-kernel systemd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
-RESTRICT=test
-SLOT=5/5.15.4
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=9dd39c5171d8438fa9075f352d62fd3a
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.15.4-r1 b/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
similarity index 93%
rename from metadata/md5-cache/dev-qt/qtcore-5.15.4-r1
rename to metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
index 11653024980c..895a17781040 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.15.4-r1
+++ b/metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
@@ -11,6 +11,6 @@ LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,unicode] sys-libs/zlib:= icu? ( dev-libs/icu:= ) !icu? ( virtual/libiconv ) systemd? ( sys-apps/systemd:= )
 RESTRICT=test
 SLOT=5/5.15.4
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7b95bb48dab4ecd1f567903f3e0a6fa1
+_md5_=e4a46ffd26b1aded873677193d910700
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526 b/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
index c9b2959e99cf..5968816a5a49 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
@@ -6,6 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/
 INHERIT=check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
 IUSE=alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-ffmpeg +system-icu widgets debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/re2:= =dev-qt/qtcore-5.15.4* =dev-qt/qtdeclarative-5.15.4* =dev-qt/qtgui-5.15.4* =dev-qt/qtnetwork-5.15.4* =dev-qt/qtprintsupport-5.15.4* =dev-qt/qtwebchannel-5.15.4*[qml] media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc(+)] media-libs/libwebp:= media-libs/opus sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( =dev-qt/designer-5.15.4* ) geolocation? ( =dev-qt/qtpositioning-5.15.4* ) kerberos? ( virtual/krb5 ) pulseaudio? ( media-sound/pulseaudio:= ) screencast? ( media-video/pipewire:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( >=dev-libs/icu-69.1:= ) widgets? ( =dev-qt/qtdeclarative-5.15.4*[widgets] =dev-qt/qtwidgets-5.15.4* )
 REQUIRED_USE=designer? ( widgets )
@@ -13,4 +14,4 @@ RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.4_p20220526.tar.xz https://dev.gentoo.org/~sam/distfiles/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 https://dev.gentoo.org/~asturm/distfiles/qtwebengine-5.15.3_p20220406-patchset.tar.xz ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=650393c78322152e8a8dfec8e6ec387c
+_md5_=27261b03dfc96496dd2ed8f6b5a3146c
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.15.4 b/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
similarity index 93%
rename from metadata/md5-cache/dev-qt/qtwidgets-5.15.4
rename to metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
index d232d35fba85..032c86d4886e 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.15.4
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
@@ -12,6 +12,6 @@ RDEPEND==dev-qt/qtcore-5.15.4*:5= =dev-qt/qtgui-5.15.4*:5=[gles2-only=,png=,X?]
 REQUIRED_USE=gtk? ( dbus )
 RESTRICT=test
 SLOT=5/5.15
-SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-1.tar.xz
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.4/submodules/qtbase-everywhere-opensource-src-5.15.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15.4-gentoo-kde-2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qt5-build	a5a0ff059a4fa28ec744cd82cc8de1d7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=cd68c11d9e0da288cb8208ca2cf367d6
+_md5_=3c1b4448bce0e97e9595719b98303f30
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6c93d7a5529a..0cd2da09ea7b 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.4 b/metadata/md5-cache/dev-ruby/actioncable-6.0.4.4
deleted file mode 100644
index 4e2b2a1f75ef..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=097b36fbb2e1b784de10bea0cf715f29
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.7 b/metadata/md5-cache/dev-ruby/actioncable-6.0.4.7
deleted file mode 100644
index efbdf2714581..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d4fc592a25b4d7d6649b3dee08717dcf
diff --git a/metadata/md5-cache/dev-ruby/actioncable-6.1.5 b/metadata/md5-cache/dev-ruby/actioncable-6.1.5
deleted file mode 100644
index 7b1ea7c4c44b..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] dev-ruby/nio4r:2[ruby_targets_ruby26(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b69731d5104d486cbf1f617ba04c2df1
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.2 b/metadata/md5-cache/dev-ruby/actioncable-7.0.2.2
deleted file mode 100644
index 670335782783..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[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(-)] ) )
-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=Integrated WebSockets for Rails
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.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? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=13ee5cbb3a8846463df23e8eb2a817fb
diff --git a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.3 b/metadata/md5-cache/dev-ruby/actioncable-7.0.2.3
deleted file mode 100644
index 2ae020d28236..000000000000
--- a/metadata/md5-cache/dev-ruby/actioncable-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/railties-4.2.0[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.14.0:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Integrated WebSockets for Rails
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] dev-ruby/nio4r:2[ruby_targets_ruby27(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] dev-ruby/nio4r:2[ruby_targets_ruby30(-)] >=dev-ruby/websocket-driver-0.6.1:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c460056f225257c9e28a9f645288d902
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.4 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.4
deleted file mode 100644
index b59e97f94965..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=46289b2de2a07dddc949696214b957e8
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.7 b/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.7
deleted file mode 100644
index 4844b6613275..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=801da1bc592130766d7329643443c27d
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5 b/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5
deleted file mode 100644
index eddf3873b1ce..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9ff4d57213f5c0f4efaac204da892175
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.2 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.2
deleted file mode 100644
index fc05e86bc45f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[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(-)] ) )
-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=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d01ea2335a2896944dfc0a0964488b70
diff --git a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.3 b/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.3
deleted file mode 100644
index cb39a374760c..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby27(-)] dev-ruby/net-imap[ruby_targets_ruby27(-)] dev-ruby/net-pop[ruby_targets_ruby27(-)] dev-ruby/net-smtp[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.7.1:*[ruby_targets_ruby30(-)] dev-ruby/net-imap[ruby_targets_ruby30(-)] dev-ruby/net-pop[ruby_targets_ruby30(-)] dev-ruby/net-smtp[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b559f5383572c380c5039e9eb0f98edd
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.4 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.4
deleted file mode 100644
index 9680af9d79ec..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e4bf5e9b5c4fa5bcf826300cf4041047
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.7 b/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.7
deleted file mode 100644
index f266bb5af278..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=980245bc503e71f0c30720d6f7950b19
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-6.1.5 b/metadata/md5-cache/dev-ruby/actionmailer-6.1.5
deleted file mode 100644
index 1bdae1600fce..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby26(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=46a8eb84e20a5de30e87719193d8e632
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.2 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.2
deleted file mode 100644
index b862cd3a6c93..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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(-)] ) )
-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=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing: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 ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6d81d070a966e9e6f7a727869ca6915b
diff --git a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.3 b/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.3
deleted file mode 100644
index f2f3991fd328..000000000000
--- a/metadata/md5-cache/dev-ruby/actionmailer-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Framework for designing email-service layers
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby27(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/mail-2.5.4:*[ruby_targets_ruby30(-)] =dev-ruby/mail-2*:*[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0c59f72c1ef6df67dd2b7c73edaac802
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.4 b/metadata/md5-cache/dev-ruby/actionpack-6.0.4.4
deleted file mode 100644
index 4f03b755c7b8..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=92528e955782c570c0e13521c561b30e
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.7 b/metadata/md5-cache/dev-ruby/actionpack-6.0.4.7
deleted file mode 100644
index 2752943e7a69..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-3.35.0[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=006d6c471446b1b35a2d88f8bf45bcd7
diff --git a/metadata/md5-cache/dev-ruby/actionpack-6.1.5 b/metadata/md5-cache/dev-ruby/actionpack-6.1.5
deleted file mode 100644
index 856db1167e67..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] dev-ruby/bundler[ruby_targets_ruby26(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby26(-)] www-servers/puma[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] dev-ruby/rack:2.2[ruby_targets_ruby26(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ef1634e7069b3582ee09f35ecbe4f93b
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.2 b/metadata/md5-cache/dev-ruby/actionpack-7.0.2.2
deleted file mode 100644
index 663d0b959dc4..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] www-servers/puma[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(-)] ) )
-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=Eases web-request routing, handling, and response
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing: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 ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=db4119909dc176b66ac92aacef706ac0
diff --git a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.3 b/metadata/md5-cache/dev-ruby/actionpack-7.0.2.3
deleted file mode 100644
index 8bfb15889ff9..000000000000
--- a/metadata/md5-cache/dev-ruby/actionpack-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby27(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby27(-)] www-servers/puma[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/capybara-2.15[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/rack-cache-1.2:1.2[ruby_targets_ruby30(-)] dev-ruby/selenium-webdriver:4[ruby_targets_ruby30(-)] www-servers/puma[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Eases web-request routing, handling, and response
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/rack:2.2[ruby_targets_ruby27(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/rack:2.2[ruby_targets_ruby30(-)] >=dev-ruby/rack-test-0.6.3:*[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1a6f624e785a340b2a37bfbf9f7aac5a
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.4 b/metadata/md5-cache/dev-ruby/actiontext-6.0.4.4
deleted file mode 100644
index 5983ad9a7369..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=29564b1db7e77d17ae57bafd612c2e32
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.7 b/metadata/md5-cache/dev-ruby/actiontext-6.0.4.7
deleted file mode 100644
index 78dae73824c4..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3fe23a201c9a9ec64ec9b22f0d1a9453
diff --git a/metadata/md5-cache/dev-ruby/actiontext-6.1.5 b/metadata/md5-cache/dev-ruby/actiontext-6.1.5
deleted file mode 100644
index dd1d72bf7c1a..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dd46d30f98b372336929877dd2b46257
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.2 b/metadata/md5-cache/dev-ruby/actiontext-7.0.2.2
deleted file mode 100644
index 9f893dfdfa27..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[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(-)] ) )
-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=Edit and display rich text in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2862296268e6eae15a98694c451edb25
diff --git a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.3 b/metadata/md5-cache/dev-ruby/actiontext-7.0.2.3
deleted file mode 100644
index 9b9f9afe7815..000000000000
--- a/metadata/md5-cache/dev-ruby/actiontext-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/propshaft[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/propshaft[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Edit and display rich text in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.6.0[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=67fc3715479b0b9b9841373c27bd7695
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.4.4 b/metadata/md5-cache/dev-ruby/actionview-6.0.4.4
deleted file mode 100644
index 300754147364..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0e3d4796eb6500dd778e2ebc00a4d649
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.0.4.7 b/metadata/md5-cache/dev-ruby/actionview-6.0.4.7
deleted file mode 100644
index a9619ce16d01..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=19d93f3945764411b228af22a0f5b752
diff --git a/metadata/md5-cache/dev-ruby/actionview-6.1.5 b/metadata/md5-cache/dev-ruby/actionview-6.1.5
deleted file mode 100644
index d208582d0d5f..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby26(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby26(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby26(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby26(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f0b46e64bb679451b1783a844d7a4acf
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.2.2 b/metadata/md5-cache/dev-ruby/actionview-7.0.2.2
deleted file mode 100644
index a80b2a535fe7..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/sqlite3[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(-)] ) )
-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=Simple, battle-tested conventions and helpers for building web pages
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing: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 ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e9dfe37a15e13e5ee568e247c3fb6818
diff --git a/metadata/md5-cache/dev-ruby/actionview-7.0.2.3 b/metadata/md5-cache/dev-ruby/actionview-7.0.2.3
deleted file mode 100644
index 21efec6f4b82..000000000000
--- a/metadata/md5-cache/dev-ruby/actionview-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Simple, battle-tested conventions and helpers for building web pages
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby27(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby27(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby27(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby27(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1:*[ruby_targets_ruby30(-)] =dev-ruby/builder-3*:*[ruby_targets_ruby30(-)] >=dev-ruby/erubi-1.4:0[ruby_targets_ruby30(-)] >=dev-ruby/rails-html-sanitizer-1.2.0:1[ruby_targets_ruby30(-)] dev-ruby/rails-dom-testing:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4bedd7b8d11762be57b49d6b988a61cc
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.4.4 b/metadata/md5-cache/dev-ruby/activejob-6.0.4.4
deleted file mode 100644
index 00e7bf5347e2..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6213115f3a2942546e4768e61cb63199
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.0.4.7 b/metadata/md5-cache/dev-ruby/activejob-6.0.4.7
deleted file mode 100644
index 9f4525884618..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5805ba7eff52e95fb218c7a6f7d93c69
diff --git a/metadata/md5-cache/dev-ruby/activejob-6.1.5 b/metadata/md5-cache/dev-ruby/activejob-6.1.5
deleted file mode 100644
index d917096bbf40..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1dfe144799a05a5582f815d16dd91a93
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.2.2 b/metadata/md5-cache/dev-ruby/activejob-7.0.2.2
deleted file mode 100644
index 8a9db83c6214..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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(-)] ) )
-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=Job framework with pluggable queues
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2b445b43695bad901a8cea560dac3e7e
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.2.3 b/metadata/md5-cache/dev-ruby/activejob-7.0.2.3
deleted file mode 100644
index ca05b148c7af..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[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(-)] ) )
-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=Job framework with pluggable queues
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2b445b43695bad901a8cea560dac3e7e
diff --git a/metadata/md5-cache/dev-ruby/activejob-7.0.2.3-r1 b/metadata/md5-cache/dev-ruby/activejob-7.0.2.3-r1
deleted file mode 100644
index eeaa0eed5313..000000000000
--- a/metadata/md5-cache/dev-ruby/activejob-7.0.2.3-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Job framework with pluggable queues
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/globalid-0.3.6[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=dd610d37f46b7d82a3ac5a133c5bd586
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.4 b/metadata/md5-cache/dev-ruby/activemodel-6.0.4.4
deleted file mode 100644
index eb8369b2e8c8..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ce43575eac41710f9ccd085b2e26dce9
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.7 b/metadata/md5-cache/dev-ruby/activemodel-6.0.4.7
deleted file mode 100644
index dfc43296422a..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8647d354e24ad868b4a52eed0a92f7ca
diff --git a/metadata/md5-cache/dev-ruby/activemodel-6.1.5 b/metadata/md5-cache/dev-ruby/activemodel-6.1.5
deleted file mode 100644
index 17118fe79118..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7c04efc2058ad8e71343be54cb7cadbb
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.2 b/metadata/md5-cache/dev-ruby/activemodel-7.0.2.2
deleted file mode 100644
index 7ba4fd53f378..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[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=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.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 ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=179e7f547ddcc0710cdb3c01fb7044c7
diff --git a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.3 b/metadata/md5-cache/dev-ruby/activemodel-7.0.2.3
deleted file mode 100644
index 242292cfe5e5..000000000000
--- a/metadata/md5-cache/dev-ruby/activemodel-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/test-unit:2[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] >=dev-ruby/bcrypt-ruby-3.1.7[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Toolkit for building modeling frameworks like Active Record and Active Resource
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5cbfdc7ae82dd38703bd4c0408e5af4c
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.4 b/metadata/md5-cache/dev-ruby/activerecord-6.0.4.4
deleted file mode 100644
index 84a51df01e2d..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=489309e78c5039d811bc01192a181e42
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.7 b/metadata/md5-cache/dev-ruby/activerecord-6.0.4.7
deleted file mode 100644
index 021a2e038515..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( dev-ruby/pg:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0d1819adcb39aebc776dd38bbb8b3143
diff --git a/metadata/md5-cache/dev-ruby/activerecord-6.1.5 b/metadata/md5-cache/dev-ruby/activerecord-6.1.5
deleted file mode 100644
index 0a9b0f52fb47..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/minitest:5[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby26(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby26(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e87d678ab2831e32104b2dc1c9576abb
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.2 b/metadata/md5-cache/dev-ruby/activerecord-7.0.2.2
deleted file mode 100644
index 71b8b10e364d..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[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(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1: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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a44777db03dc00de76e9d8af7dbdbaf0
diff --git a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.3 b/metadata/md5-cache/dev-ruby/activerecord-7.0.2.3
deleted file mode 100644
index 1a7932c6a52c..000000000000
--- a/metadata/md5-cache/dev-ruby/activerecord-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ) ruby_targets_ruby27? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby27(-)] dev-ruby/bundler[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/minitest:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/benchmark-ips[ruby_targets_ruby30(-)] dev-ruby/bundler[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/sqlite3-1.4.0[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/minitest:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( >=dev-db/sqlite-3.12.1 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails/
-INHERIT=ruby-fakegem
-IUSE=mysql postgres sqlite test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby27(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby27(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] sqlite? ( >=dev-ruby/sqlite3-1.4[ruby_targets_ruby30(-)] ) mysql? ( dev-ruby/mysql2:0.5[ruby_targets_ruby30(-)] ) postgres? ( >=dev-ruby/pg-1.1:1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6270fc7d042b423998f7e6a81e7c7cc0
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.4 b/metadata/md5-cache/dev-ruby/activestorage-6.0.4.4
deleted file mode 100644
index 4f4c50676e29..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.4:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a55f5571fab3f402fe02583c52456ec5
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.7 b/metadata/md5-cache/dev-ruby/activestorage-6.0.4.7
deleted file mode 100644
index d8122361f449..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.0.4.7:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d60415a2324bfaccd6223c34aedbcbe8
diff --git a/metadata/md5-cache/dev-ruby/activestorage-6.1.5 b/metadata/md5-cache/dev-ruby/activestorage-6.1.5
deleted file mode 100644
index 3a6b8219da36..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby26(-)] dev-ruby/test-unit:2[ruby_targets_ruby26(-)] dev-ruby/mini_magick[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/sqlite3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] dev-ruby/test-unit:2[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5:*[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby26(-)] dev-ruby/marcel:1.0[ruby_targets_ruby26(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actionpack-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=df9b60708243653713bdeadf6b72bc82
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.2 b/metadata/md5-cache/dev-ruby/activestorage-7.0.2.2
deleted file mode 100644
index fa9cf34da23a..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.15.0:5[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] dev-ruby/sqlite3[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(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.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 ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=246ebf7b3a5b95d753de97a2c39ec2c3
diff --git a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.3 b/metadata/md5-cache/dev-ruby/activestorage-7.0.2.3
deleted file mode 100644
index fb4d705fd324..000000000000
--- a/metadata/md5-cache/dev-ruby/activestorage-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.15.0:5[ruby_targets_ruby27(-)] dev-ruby/mini_magick[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/sprockets-rails[ruby_targets_ruby27(-)] dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/image_processing-1.2:0[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.15.0:5[ruby_targets_ruby30(-)] dev-ruby/mini_magick[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/sprockets-rails[ruby_targets_ruby30(-)] dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-video/ffmpeg app-text/poppler[utils] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Attach cloud and local files in Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3:*[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby27(-)] dev-ruby/marcel:1.0[ruby_targets_ruby27(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actionpack-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3:*[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3:*[ruby_targets_ruby30(-)] dev-ruby/marcel:1.0[ruby_targets_ruby30(-)] >=dev-ruby/mini_mime-1.1.0[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e5ae84932cd67ef1d794eefe68d170e3
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.2.8 b/metadata/md5-cache/dev-ruby/activesupport-5.2.8
index af75baa9b07c..8b85f26c9029 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.2.8
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.2.8
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 INHERIT=ruby-fakegem eapi7-ver
 IUSE=test ruby_targets_ruby26 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=5.2
 SRC_URI=https://github.com/rails/rails/archive/v5.2.8.tar.gz -> rails-5.2.8.tgz
 _eclasses_=eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=376c21863193ca0ff4416b2f77dd64bc
+_md5_=175b9d2ad9d7000bb96f707ca5dbeaa6
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.4 b/metadata/md5-cache/dev-ruby/activesupport-6.0.4.4
deleted file mode 100644
index afb88cd48a72..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cec98a525af8b9d47b0e5c9e27ed6d89
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.7 b/metadata/md5-cache/dev-ruby/activesupport-6.0.4.7
deleted file mode 100644
index a723ec169d0d..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.4.5[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.0.5:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b4e56a5349429588f8ae78023eb4ecf1
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.0.5 b/metadata/md5-cache/dev-ruby/activesupport-6.0.5
index 3c4bb6b966e3..5e442f4d0292 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-6.0.5
+++ b/metadata/md5-cache/dev-ruby/activesupport-6.0.5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/rails/rails
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] dev-ruby/i18n:1[ruby_targets_ruby26(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] dev-ruby/i18n:1[ruby_targets_ruby27(-)] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.2:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=6.0
 SRC_URI=https://github.com/rails/rails/archive/v6.0.5.tar.gz -> rails-6.0.5.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b4e56a5349429588f8ae78023eb4ecf1
+_md5_=025e5db2e9430c4a0f6c6612b2d6bc8f
diff --git a/metadata/md5-cache/dev-ruby/activesupport-6.1.5 b/metadata/md5-cache/dev-ruby/activesupport-6.1.5
deleted file mode 100644
index d9b12f4870a2..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby26(-)] dev-ruby/connection_pool[ruby_targets_ruby26(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby26(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby26(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby26(-)] dev-ruby/rack[ruby_targets_ruby26(-)] dev-ruby/rexml[ruby_targets_ruby26(-)] dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-2.2.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby26(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby26(-)] dev-ruby/tzinfo:2[ruby_targets_ruby26(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.3:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b81a73c782ebb248b5892abc06330649
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.2 b/metadata/md5-cache/dev-ruby/activesupport-7.0.2.2
deleted file mode 100644
index c68eb47420e8..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] 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=Utility Classes and Extension to the Standard Library
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[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=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9425399ba2c8f2322c967c4b2088e4c3
diff --git a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.3 b/metadata/md5-cache/dev-ruby/activesupport-7.0.2.3
deleted file mode 100644
index 5234838cb598..000000000000
--- a/metadata/md5-cache/dev-ruby/activesupport-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby27(-)] dev-ruby/connection_pool[ruby_targets_ruby27(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby27(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby27(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rexml[ruby_targets_ruby27(-)] dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/dalli-3.0.1[ruby_targets_ruby30(-)] dev-ruby/connection_pool[ruby_targets_ruby30(-)] >=dev-ruby/nokogiri-1.8.1[ruby_targets_ruby30(-)] >=dev-ruby/builder-3.1.0[ruby_targets_ruby30(-)] >=dev-ruby/listen-3.3:3[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rexml[ruby_targets_ruby30(-)] dev-ruby/mocha[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Utility Classes and Extension to the Standard Library
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby27(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby27(-)] dev-ruby/tzinfo:2[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby30(-)] >=dev-ruby/i18n-1.6:1[ruby_targets_ruby30(-)] dev-ruby/tzinfo:2[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=73c0e9ba5c571e66f930b4be32a01f64
diff --git a/metadata/md5-cache/dev-ruby/digest-3.1.0-r1 b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
new file mode 100644
index 000000000000..f5be374c2d32
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/digest-3.1.0-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=Provides a framework for message digest libraries
+EAPI=8
+HOMEPAGE=https://github.com/ruby/digest
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-2
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby/digest/archive/v3.1.0.tar.gz -> digest-3.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5f1dd1dba2c8608f26a9d1b13b5f6a52
diff --git a/metadata/md5-cache/dev-ruby/mime-types-3.3.1 b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
index 399e8f025ff9..7e0fd246d21f 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-3.3.1
+++ b/metadata/md5-cache/dev-ruby/mime-types-3.3.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/mime-types/ruby-mime-types
 INHERIT=ruby-fakegem
 IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/mime-types-data-3.2015:3[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-3.3.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ec9ad3d8a0f9211c2b642ed758dcbefe
+_md5_=6b15ec3a6e33b483c845e016202140fb
diff --git a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901 b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
index 73873d4574a3..83215f9db7d9 100644
--- a/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
+++ b/metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mime-types/mime-types-data
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/mime-types-data-3.2021.0901.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0360bd7743a1141484a23a1905a2b1cc
+_md5_=b3620756c6eecd4ca9e39afa352e13b3
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.4.3 b/metadata/md5-cache/dev-ruby/msgpack-1.4.3
deleted file mode 100644
index 657288abe9bf..000000000000
--- a/metadata/md5-cache/dev-ruby/msgpack-1.4.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Binary-based efficient data interchange format for ruby binding
-EAPI=8
-HOMEPAGE=https://msgpack.org/
-INHERIT=ruby-fakegem
-IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/msgpack-1.4.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ecc2b3a3177f8059ff8faad38d44178b
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.4.4 b/metadata/md5-cache/dev-ruby/msgpack-1.4.4
deleted file mode 100644
index 73d70b782217..000000000000
--- a/metadata/md5-cache/dev-ruby/msgpack-1.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Binary-based efficient data interchange format for ruby binding
-EAPI=8
-HOMEPAGE=https://msgpack.org/
-INHERIT=ruby-fakegem
-IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://rubygems.org/gems/msgpack-1.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ecc2b3a3177f8059ff8faad38d44178b
diff --git a/metadata/md5-cache/dev-ruby/msgpack-1.5.2 b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
new file mode 100644
index 000000000000..9c7b11010af4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/msgpack-1.5.2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=Binary-based efficient data interchange format for ruby binding
+EAPI=8
+HOMEPAGE=https://msgpack.org/
+INHERIT=ruby-fakegem
+IUSE=doc ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/msgpack-1.5.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b387caf2d359eebd47cee8d609700c54
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.4 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.4
deleted file mode 100644
index 50a40d24c14c..000000000000
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby26(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby27(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby30(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby31(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.13 >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=Nokogiri is an HTML, XML, SAX, and Reader parser
-EAPI=8
-HOMEPAGE=https://www.nokogiri.org/
-INHERIT=ruby-fakegem multilib
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.13:= >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.4.tar.gz -> nokogiri-1.13.4-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=02035fc389063d984e51f7010ff53f84
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.5 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.5
deleted file mode 100644
index e0596b80d057..000000000000
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby26(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] test? ( dev-ruby/minitest[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby27(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] test? ( dev-ruby/minitest[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby30(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] test? ( dev-ruby/minitest[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/mini_portile2:2.8[ruby_targets_ruby31(-)] >=dev-ruby/rexical-1.0.7[ruby_targets_ruby31(-)] dev-ruby/rdoc[ruby_targets_ruby31(-)] test? ( dev-ruby/minitest[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/libxml2-2.9.14 >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=Nokogiri is an HTML, XML, SAX, and Reader parser
-EAPI=8
-HOMEPAGE=https://www.nokogiri.org/
-INHERIT=ruby-fakegem multilib
-IUSE=test ruby_targets_ruby26 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
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.9.14:= >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.5.tar.gz -> nokogiri-1.13.5-git.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c2054770d025e69bf41f4def338d211a
diff --git a/metadata/md5-cache/dev-ruby/nokogiri-1.13.6 b/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
index 213ea2470c89..8840beca8f61 100644
--- a/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
+++ b/metadata/md5-cache/dev-ruby/nokogiri-1.13.6
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.nokogiri.org/
 INHERIT=ruby-fakegem multilib
 IUSE=test ruby_targets_ruby26 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
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libxml2-2.9.14:= >=dev-libs/libxslt-1.1.35 sys-libs/zlib virtual/libiconv ruby_targets_ruby26? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/racc-1.4:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sparklemotion/nokogiri/archive/v1.13.6.tar.gz -> nokogiri-1.13.6-git.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=00fabfdda88ae98706234028ea24c314
+_md5_=3afc25bfc9e13e1d804560bd0a3c905e
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.23.0 b/metadata/md5-cache/dev-ruby/octokit-4.23.0
new file mode 100644
index 000000000000..443328ae7d1d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/octokit-4.23.0
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday:1[ruby_targets_ruby30(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/jwt[ruby_targets_ruby26(-)] dev-ruby/mime-types[ruby_targets_ruby26(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby26(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby26(-)] dev-ruby/vcr[ruby_targets_ruby26(-),json] dev-ruby/webmock:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/jwt[ruby_targets_ruby27(-)] dev-ruby/mime-types[ruby_targets_ruby27(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby27(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby27(-)] dev-ruby/vcr[ruby_targets_ruby27(-),json] dev-ruby/webmock:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/jwt[ruby_targets_ruby30(-)] dev-ruby/mime-types[ruby_targets_ruby30(-)] >=dev-ruby/netrc-0.7.7[ruby_targets_ruby30(-)] >=dev-ruby/rbnacl-7.1.1:6[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-),json] dev-ruby/webmock:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Ruby toolkit for the Github API
+EAPI=8
+HOMEPAGE=https://github.com/octokit/octokit.rb
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/faraday:1[ruby_targets_ruby30(-)] =dev-ruby/sawyer-0.9*[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.23.0.tar.gz -> octokit-4.23.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6d7abb3b45e8abdb04163c6c5ad216e5
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.4.4 b/metadata/md5-cache/dev-ruby/rails-6.0.4.4
deleted file mode 100644
index 26bd2b7ea6b3..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.4[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/rails-6.0.4.4.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b4406b7cb94c9820deaefd0a955b4926
diff --git a/metadata/md5-cache/dev-ruby/rails-6.0.4.7 b/metadata/md5-cache/dev-ruby/rails-6.0.4.7
deleted file mode 100644
index 7b155fae8317..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=7
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.0.4.7[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.3:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.0
-SRC_URI=https://rubygems.org/gems/rails-6.0.4.7.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=59231c0a48c52d6dd4add66b5eb9af54
diff --git a/metadata/md5-cache/dev-ruby/rails-6.1.5 b/metadata/md5-cache/dev-ruby/rails-6.1.5
deleted file mode 100644
index 43dacf103266..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/actioncable-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailbox-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionmailer-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actiontext-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby26(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby26(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/actioncable-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activejob-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/railties-6.1.5[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://rubygems.org/gems/rails-6.1.5.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5902852f39c12e03ef304e53332b240c
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.2.2 b/metadata/md5-cache/dev-ruby/rails-7.0.2.2
deleted file mode 100644
index 7407d5541123..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.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? ( 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=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.2[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.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=7.0
-SRC_URI=https://rubygems.org/gems/rails-7.0.2.2.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=97b4fd4728f9dc59bac87b519f987e05
diff --git a/metadata/md5-cache/dev-ruby/rails-7.0.2.3 b/metadata/md5-cache/dev-ruby/rails-7.0.2.3
deleted file mode 100644
index 2385a017bd7b..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=ruby on rails is a web-application and persistance framework
-EAPI=8
-HOMEPAGE=https://rubyonrails.org
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 doc test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( ~dev-ruby/actioncable-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailbox-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionmailer-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actiontext-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby27(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby27(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/actioncable-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionmailbox-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionmailer-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actiontext-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activejob-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activemodel-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activerecord-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activestorage-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/railties-7.0.2.3[ruby_targets_ruby30(-)] >=dev-ruby/bundler-1.15.0:*[ruby_targets_ruby30(-)] >=dev-ruby/sprockets-rails-2.0.0:*[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://rubygems.org/gems/rails-7.0.2.3.gem
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fd76ced42db48daaa65c3b242f784729
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.4.4 b/metadata/md5-cache/dev-ruby/railties-6.0.4.4
deleted file mode 100644
index 0b9ffd9c464f..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.0.4.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.4[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.4[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.4.tar.gz -> rails-6.0.4.4.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=365c420ae3bb42ed1279e79baeefddd4
diff --git a/metadata/md5-cache/dev-ruby/railties-6.0.4.7 b/metadata/md5-cache/dev-ruby/railties-6.0.4.7
deleted file mode 100644
index a25b12e39557..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.0.4.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=7
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.24 ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.0.4.7[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.0.4.7[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test )
-SLOT=6.0
-SRC_URI=https://github.com/rails/rails/archive/v6.0.4.7.tar.gz -> rails-6.0.4.7.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bc80cb2e3baa5708e24ef7d891818002
diff --git a/metadata/md5-cache/dev-ruby/railties-6.1.5 b/metadata/md5-cache/dev-ruby/railties-6.1.5
deleted file mode 100644
index baddc86ebdac..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( ~dev-ruby/actionview-6.1.5[ruby_targets_ruby26(-)] dev-ruby/mocha:0.14[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-6.1.5[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby26? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby26(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby26(-)] dev-ruby/thor:1[ruby_targets_ruby26(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby26(-)] dev-ruby/method_source[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/activesupport-6.1.5[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-6.1.5[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-0.8.7[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6.1
-SRC_URI=https://github.com/rails/rails/archive/v6.1.5.tar.gz -> rails-6.1.5.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=82142ed1c98c8dab8e9dd1b48f547f1a
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.2.2 b/metadata/md5-cache/dev-ruby/railties-7.0.2.2
deleted file mode 100644
index 7bd3c0b4c3ea..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-7.0.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[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(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.2[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.2[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5: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? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.2.tar.gz -> rails-7.0.2.2.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bbd80e4de3ed04a5308317fbd107fb5f
diff --git a/metadata/md5-cache/dev-ruby/railties-7.0.2.3 b/metadata/md5-cache/dev-ruby/railties-7.0.2.3
deleted file mode 100644
index 3f3161f8ea70..000000000000
--- a/metadata/md5-cache/dev-ruby/railties-7.0.2.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/mocha:0.14[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( ~dev-ruby/actionview-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/mocha:0.14[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-DESCRIPTION=Tools for creating, working with, and running Rails applications
-EAPI=8
-HOMEPAGE=https://github.com/rails/rails
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
-LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.25 ruby_targets_ruby27? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby27(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby27(-)] dev-ruby/thor:1[ruby_targets_ruby27(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby27(-)] dev-ruby/method_source[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/activesupport-7.0.2.3[ruby_targets_ruby30(-)] ~dev-ruby/actionpack-7.0.2.3[ruby_targets_ruby30(-)] dev-ruby/thor:1[ruby_targets_ruby30(-)] >=dev-ruby/rake-12.2[ruby_targets_ruby30(-)] dev-ruby/method_source[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.5:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=test !test? ( test ) !test? ( test ) !test? ( test )
-SLOT=7.0
-SRC_URI=https://github.com/rails/rails/archive/v7.0.2.3.tar.gz -> rails-7.0.2.3.tgz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=127e24521e3d4845bb8544c0f49ef8e8
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.2.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.2.1
deleted file mode 100644
index 9e3b5ec735a0..000000000000
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.2.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby26(-)] dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby27(-)] dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby30(-)] dev-ruby/regexp_property_values[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby31(-)] dev-ruby/regexp_property_values[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=A library for tokenizing, lexing, and parsing Ruby regular expressions
-EAPI=8
-HOMEPAGE=https://github.com/ammar/regexp_parser
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=2
-SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.2.1.tar.gz -> regexp_parser-2.2.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5cab01caa61f76985abe6c009b1c1af4
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1 b/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
index 58f078bb3dff..9b603bd2139e 100644
--- a/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ammar/regexp_parser
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.3.1.tar.gz -> regexp_parser-2.3.1.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c25082651af2e80d19cabbe2858eab8e
+_md5_=cc6caeb2782838b9ab26e07d2d8aeb00
diff --git a/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0 b/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
new file mode 100644
index 000000000000..fd488d2d699a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-ruby/rake[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby26(-)] dev-ruby/regexp_property_values[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( dev-ruby/rake[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby27(-)] dev-ruby/regexp_property_values[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/rake[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby30(-)] dev-ruby/regexp_property_values[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/rake[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] test? ( dev-ruby/ice_nine[ruby_targets_ruby31(-)] dev-ruby/regexp_property_values[ruby_targets_ruby31(-)] dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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==dev-util/ragel-6* ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=A library for tokenizing, lexing, and parsing Ruby regular expressions
+EAPI=8
+HOMEPAGE=https://github.com/ammar/regexp_parser
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/ammar/regexp_parser/archive/v2.5.0.tar.gz -> regexp_parser-2.5.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c25082651af2e80d19cabbe2858eab8e
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
deleted file mode 100644
index fc69d60ac1bb..000000000000
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~net-analyzer/rrdtool-1.7.2[graph=] test? ( ~net-analyzer/rrdtool-1.7.2[graph] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
-DESCRIPTION=Ruby bindings for rrdtool
-EAPI=8
-HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-INHERIT=ruby-ng
-IUSE=graph test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=~net-analyzer/rrdtool-1.7.2[graph=] ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 )
-REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ae0b0cd9b6a0f724bed969630317b974
diff --git a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0 b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
index 18fe5eb49be1..6d931533de43 100644
--- a/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
+++ b/metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 INHERIT=ruby-ng
 IUSE=graph test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=~net-analyzer/rrdtool-1.8.0[graph=] ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 )
 REQUIRED_USE=test? ( graph ) || ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.8.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e25411d46078ea8f7618e63b2206cdfe
+_md5_=fe0d95eb9691219bc41a2cad523c8e26
diff --git a/metadata/md5-cache/dev-ruby/tomlrb-2.0.3 b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
new file mode 100644
index 000000000000..007029e6dfc9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/tomlrb-2.0.3
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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=A racc based toml parser
+EAPI=8
+HOMEPAGE=https://github.com/fbernier/tomlrb/
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) 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_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) 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_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/fbernier/tomlrb/archive/v2.0.3.tar.gz -> tomlrb-2.0.3.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e5ccd9755a41895097655b82beacaaac
diff --git a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1 b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
index 56913ee31982..472545d0b5ca 100644
--- a/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
+++ b/metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/imanel/websocket-ruby
 INHERIT=ruby-fakegem
 IUSE=ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/websocket-1.2.9.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d4a4a04b7ff19fd2f1d8f347dc9906d9
+_md5_=f44d965cf5927ee374ca464673bbf0b3
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index c45f51f7ff67..6dc8f735c360 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/chez-9.5.8 b/metadata/md5-cache/dev-scheme/chez-9.5.8
index 199a0f200f16..4b4694635929 100644
--- a/metadata/md5-cache/dev-scheme/chez-9.5.8
+++ b/metadata/md5-cache/dev-scheme/chez-9.5.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://cisco.github.io/ChezScheme/ https://github.com/cisco/ChezScheme
 INHERIT=toolchain-funcs
 IUSE=X examples ncurses threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0 BSD-2 MIT ZLIB
 RDEPEND=X? ( x11-libs/libX11 ) ncurses? ( sys-libs/ncurses:= )
 SLOT=0/9.5.8
 SRC_URI=https://github.com/cisco/ChezScheme/releases/download/v9.5.8/csv9.5.8.tar.gz -> chez-9.5.8.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8406c481b168be58d68eca0822a17c62
+_md5_=99cd84c7ccdbbb9b4cdcebeef3d58f80
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 775998aec99a..414484766bf0 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bpftool-5.16.15 b/metadata/md5-cache/dev-util/bpftool-5.16.15
deleted file mode 100644
index e7b21f115a53..000000000000
--- a/metadata/md5-cache/dev-util/bpftool-5.16.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchutils || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1: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 ~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.16.15.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.16.tar.xz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=55a737ee352724a65840ce53518cf8ed
diff --git a/metadata/md5-cache/dev-util/bpftool-5.17.4 b/metadata/md5-cache/dev-util/bpftool-5.17.4
index 2a852684a314..fc2851a1dd12 100644
--- a/metadata/md5-cache/dev-util/bpftool-5.17.4
+++ b/metadata/md5-cache/dev-util/bpftool-5.17.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kernel.org/
 INHERIT=estack linux-info optfeature python-any-r1 toolchain-funcs
 IUSE=caps
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~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.17.4.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=223312e21130fe58ea7c24b976d92925
+_md5_=55a737ee352724a65840ce53518cf8ed
diff --git a/metadata/md5-cache/dev-util/buildbot-3.4.0 b/metadata/md5-cache/dev-util/buildbot-3.4.0
index 041369cd3441..78f3b9fb289d 100644
--- a/metadata/md5-cache/dev-util/buildbot-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=BuildBot build automation system
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot/buildbot-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d528bccb1b6716193dd43509cf269e27
+_md5_=2abcfbedc3325e33cf4cd3f8b9207d00
diff --git a/metadata/md5-cache/dev-util/buildbot-3.5.0 b/metadata/md5-cache/dev-util/buildbot-3.5.0
new file mode 100644
index 000000000000..f39b633acad1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-3.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile config configure install postinst prepare test
+DESCRIPTION=BuildBot build automation system
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+INHERIT=readme.gentoo-r1 systemd distutils-r1
+IUSE=crypt docker examples irc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot/buildbot-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=82b898b2645522650de138a29bb353bf
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index a42a0aa310c9..9861f2b96e0b 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-www[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test unpack
 DESCRIPTION=BuildBot build automation system
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=readme.gentoo-r1 git-r3 systemd distutils-r1
 IUSE=crypt docker examples irc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=71d5500c921f6b4dd31412e5ac7c2f39
+_md5_=3b29efcdbffa212627821a2167620129
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.4.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.4.0
index 7aace9a167ca..0db7a6b91408 100644
--- a/metadata/md5-cache/dev-util/buildbot-badges-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a59b8bf0a5b5a384791c709d6fee5139
+_md5_=04e332ae70e40c1ba0123817ff29cd4d
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.5.0 b/metadata/md5-cache/dev-util/buildbot-badges-3.5.0
new file mode 100644
index 000000000000..c89d3d175aa7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=04e332ae70e40c1ba0123817ff29cd4d
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
index db597ad47872..5bd1d2933a30 100644
--- a/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot console-view plugin
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4fa6b9f4109ef1ea430d8a49fc89325a
+_md5_=8b9a30371e09859f3b37d76fa366f5e3
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0
new file mode 100644
index 000000000000..b0fb943c6256
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot console-view plugin
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8b9a30371e09859f3b37d76fa366f5e3
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
index 7ca62ce852f9..fe50b28b6493 100644
--- a/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot grid view web interface
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e31521f27a4432cce637f3257adb527f
+_md5_=5c28b7c52510d477250776aafc5cfcd2
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0
new file mode 100644
index 000000000000..5420fe2b4c2a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot grid view web interface
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5c28b7c52510d477250776aafc5cfcd2
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
index cda5205b8903..7aa08ed6f994 100644
--- a/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot common www build tools for packaging releases
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cf2b581f3056e1d90a8aac6518521469
+_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0 b/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
new file mode 100644
index 000000000000..4986b8c85667
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot common www build tools for packaging releases
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
index 2e90a58a3565..d90d28d9141b 100644
--- a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot waterfall-view plugin
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6c311942c71d76eada419bf96efc7f10
+_md5_=e41f885ae665ad0cff045523e0a56bdd
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
new file mode 100644
index 000000000000..e40de5ec3922
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot waterfall-view plugin
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[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(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e41f885ae665ad0cff045523e0a56bdd
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.4.0 b/metadata/md5-cache/dev-util/buildbot-worker-3.4.0
index d96d742a18a7..e1e33014fa63 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=70cb5f3af2dfee32812b5f4fc450ce5b
+_md5_=7d9d71e51699619763bab5afa79a51de
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1 b/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
new file mode 100644
index 000000000000..cc3d0a62e31a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile config configure install postinst prepare test
+DESCRIPTION=BuildBot Worker (slave) Daemon
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+INHERIT=readme.gentoo-r1 distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3062841e0c855df1ecd4c2ae4d2d4c80
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index 07f0cdb6d882..155a04088008 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=>=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test unpack
 DESCRIPTION=BuildBot Worker (slave) Daemon
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=readme.gentoo-r1 git-r3 distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-user/buildbot >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-17.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=4323ea7cc925b951698eb35f96467aa2
+_md5_=7da30cd01c8a3177961c46dc4bd973e3
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
index ffba065b7b85..e768bc52596f 100644
--- a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=942326ae66a293b0429fd014c8268fe6
+_md5_=d1e58328cf11c13100718fae5fea1c51
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
new file mode 100644
index 000000000000..c0abbd2b8661
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d1e58328cf11c13100718fae5fea1c51
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.4.0 b/metadata/md5-cache/dev-util/buildbot-www-3.4.0
index 2bffc3021156..4def981d6a20 100644
--- a/metadata/md5-cache/dev-util/buildbot-www-3.4.0
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.4.0
@@ -1,4 +1,4 @@
-BDEPEND=~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=~dev-util/buildbot-pkg-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
 EAPI=8
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.4.0.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9ab2d882ced4f2470ea71bdf4e2294d1
+_md5_=a4884cd5285be0a7462ec5c06c684892
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.5.0 b/metadata/md5-cache/dev-util/buildbot-www-3.5.0
new file mode 100644
index 000000000000..d457c3f463e1
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.5.0
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-pkg-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.5.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a4884cd5285be0a7462ec5c06c684892
diff --git a/metadata/md5-cache/dev-util/checkstyle-7.2-r1 b/metadata/md5-cache/dev-util/checkstyle-7.2-r1
deleted file mode 100644
index 2fd007a7398c..000000000000
--- a/metadata/md5-cache/dev-util/checkstyle-7.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:4 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:20 dev-java/jaxb-api:2 >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-DESCRIPTION=Development tool to help write Java code that adheres to a coding standard
-EAPI=8
-HOMEPAGE=https://github.com/checkstyle/checkstyle
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=LGPL-2.1
-RDEPEND=dev-java/ant-core:0 >=dev-java/antlr-2.7.7-r7:0 dev-java/antlr:4 dev-java/commons-beanutils:1.7 dev-java/commons-cli:1 dev-java/commons-logging:0 dev-java/guava:20 dev-java/jaxb-api:2 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://github.com/checkstyle/checkstyle/archive/checkstyle-7.2.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	95922adb58696025c86c401d825178a7	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30
-_md5_=9041b14e990b55d0abdab9613a406364
diff --git a/metadata/md5-cache/dev-util/clippy-8.1-r1 b/metadata/md5-cache/dev-util/clippy-8.1-r1
deleted file mode 100644
index 46cac819dd3f..000000000000
--- a/metadata/md5-cache/dev-util/clippy-8.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/libelf:=
-DESCRIPTION=Standalone clippy tool built from FRR sources
-EAPI=8
-HOMEPAGE=https://frrouting.org/
-INHERIT=autotools python-single-r1
-IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/libelf:=
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.1.tar.gz -> clippy-8.1.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25be5d4d0f7e52c5e612b5c53ba90814
diff --git a/metadata/md5-cache/dev-util/clippy-8.2.2 b/metadata/md5-cache/dev-util/clippy-8.2.2
index aa3d2e88e1b1..da6e42385260 100644
--- a/metadata/md5-cache/dev-util/clippy-8.2.2
+++ b/metadata/md5-cache/dev-util/clippy-8.2.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://frrouting.org/
 INHERIT=autotools python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/libelf:=
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.2.2.tar.gz -> clippy-8.2.2.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2d33dfcade41d88e27135384c4a3b895
+_md5_=5570aa96f88212e22f80ded7873edb4d
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20220526 b/metadata/md5-cache/dev-util/dialog-1.3.20220526
new file mode 100644
index 000000000000..42960887d627
--- /dev/null
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20220526
@@ -0,0 +1,13 @@
+BDEPEND=!minimal? ( sys-devel/libtool ) virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?] nls? ( sys-devel/gettext )
+DESCRIPTION=Tool to display dialog boxes from a shell
+EAPI=7
+HOMEPAGE=https://invisible-island.net/dialog/
+IUSE=examples minimal nls unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
+SLOT=0/15
+SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220526.tgz
+_md5_=bbbca4f84c26fc65fe5dae2f01b62039
diff --git a/metadata/md5-cache/dev-util/diffoscope-214 b/metadata/md5-cache/dev-util/diffoscope-214
new file mode 100644
index 000000000000..87a8cc07b7ab
--- /dev/null
+++ b/metadata/md5-cache/dev-util/diffoscope-214
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Will try to get to the bottom of what makes files or directories different
+EAPI=8
+HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
+INHERIT=distutils-r1
+IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/d/diffoscope/diffoscope-214.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=9b9d6861fbf313bdeb7ed80f78acb6cf
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1 b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
index 4eb046d0cacc..b64196b1535b 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org distutils-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=LGPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5343b2d6a7489f95ab2d02183bd69478
+_md5_=5c0fdb52a6e7514d9f760b862ef8537a
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2 b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
new file mode 100644
index 000000000000..d1b4c768ae45
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
+DESCRIPTION=GDBus code and documentation generator
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=gnome.org distutils-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	gnome.org	429073e99d7067d3462e875bf5c6e14a	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6b5f434b7ee7870b5e8f353f351b15e0
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.72.1 b/metadata/md5-cache/dev-util/glib-utils-2.72.1
index 3a0ed963cdaf..f106f7a659d5 100644
--- a/metadata/md5-cache/dev-util/glib-utils-2.72.1
+++ b/metadata/md5-cache/dev-util/glib-utils-2.72.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome.org python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-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 ~x86-winnt
+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 ~x86-winnt
 LICENSE=LGPL-2.1+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1948132492e57db0e5190cabd62b536f
+_md5_=4ec83230c5b6a750cf8c589c003e8e88
diff --git a/metadata/md5-cache/dev-util/glib-utils-2.72.2 b/metadata/md5-cache/dev-util/glib-utils-2.72.2
new file mode 100644
index 000000000000..4a2727146abb
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glib-utils-2.72.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-arch/xz-utils
+DEFINED_PHASES=compile configure install setup
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+DESCRIPTION=Build utilities for GLib using projects
+EAPI=8
+HOMEPAGE=https://www.gtk.org/
+INHERIT=gnome.org python-single-r1
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+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 ~x86-winnt
+LICENSE=LGPL-2.1+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/glib/2.72/glib-2.72.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=693d8649ce56ef1e7ccf644bd7e4c655
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
new file mode 100644
index 000000000000..b9eb495843d4
--- /dev/null
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
@@ -0,0 +1,15 @@
+BDEPEND==sys-devel/lld-13* || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13= !!sys-devel/llvm:0
+DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
+EAPI=8
+HOMEPAGE=https://github.com/intel/intel-graphics-compiler
+INHERIT=cmake flag-o-matic llvm python-any-r1
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
+SLOT=0
+SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/28ff9ed04d17b5af2002158d51992cbed06e6a95.tar.gz -> intel-graphics-compiler-1.0.11279_p20220528.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3c1a7841a8ce42618ed8392773e03a94
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.4 b/metadata/md5-cache/dev-util/lldb-14.0.4
new file mode 100644
index 000000000000..346accae44c5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/lldb-14.0.4
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( ~dev-python/lit-14.0.4[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-14.0.4[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-14.0.4[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) sys-devel/lld ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-14.0.4 ~sys-devel/llvm-14.0.4 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM debugger
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org python-single-r1
+IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-14.0.4 ~sys-devel/llvm-14.0.4 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=43bd36332b843aa3d6c1e9c34b0278bb
diff --git a/metadata/md5-cache/dev-util/maturin-0.12.18 b/metadata/md5-cache/dev-util/maturin-0.12.18
new file mode 100644
index 000000000000..c92fa9709846
--- /dev/null
+++ b/metadata/md5-cache/dev-util/maturin-0.12.18
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( app-text/mdbook ) test? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/boltons[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Build and publish crates with pyo3, rust-cpython and cffi bindings
+EAPI=8
+HOMEPAGE=https://maturin.rs/
+INHERIT=cargo distutils-r1 flag-o-matic
+IUSE=doc test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 ISC MIT MPL-2.0 openssl doc? ( CC-BY-4.0 OFL-1.1 )
+RDEPEND=python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1: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/PyO3/maturin/archive/refs/tags/v0.12.18.tar.gz -> maturin-0.12.18.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.6.0/download -> aes-0.6.0.crate https://crates.io/api/v1/crates/aes-soft/0.6.4/download -> aes-soft-0.6.4.crate https://crates.io/api/v1/crates/aesni/0.10.0/download -> aesni-0.10.0.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-modes/0.7.0/download -> block-modes-0.7.0.crate https://crates.io/api/v1/crates/block-padding/0.2.1/download -> block-padding-0.2.1.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/bytesize/1.1.0/download -> bytesize-1.1.0.crate https://crates.io/api/v1/crates/bzip2/0.4.3/download -> bzip2-0.4.3.crate https://crates.io/api/v1/crates/bzip2-sys/0.1.11+1.0.8/download -> bzip2-sys-0.1.11+1.0.8.crate https://crates.io/api/v1/crates/cab/0.4.0/download -> cab-0.4.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/camino/1.0.9/download -> camino-1.0.9.crate https://crates.io/api/v1/crates/cargo-options/0.1.4/download -> cargo-options-0.1.4.crate https://crates.io/api/v1/crates/cargo-platform/0.1.2/download -> cargo-platform-0.1.2.crate https://crates.io/api/v1/crates/cargo-xwin/0.8.7/download -> cargo-xwin-0.8.7.crate https://crates.io/api/v1/crates/cargo-zigbuild/0.8.8/download -> cargo-zigbuild-0.8.8.crate https://crates.io/api/v1/crates/cargo_metadata/0.14.2/download -> cargo_metadata-0.14.2.crate https://crates.io/api/v1/crates/cbindgen/0.23.0/download -> cbindgen-0.23.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfb/0.7.0/download -> cfb-0.7.0.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/charset/0.1.3/download -> charset-0.1.3.crate https://crates.io/api/v1/crates/chunked_transfer/1.4.0/download -> chunked_transfer-1.4.0.crate https://crates.io/api/v1/crates/cipher/0.2.5/download -> cipher-0.2.5.crate https://crates.io/api/v1/crates/clap/3.1.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_complete/3.1.4/download -> clap_complete-3.1.4.crate https://crates.io/api/v1/crates/clap_complete_fig/3.1.5/download -> clap_complete_fig-3.1.5.crate https://crates.io/api/v1/crates/clap_derive/3.1.18/download -> clap_derive-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/cli-table/0.4.7/download -> cli-table-0.4.7.crate https://crates.io/api/v1/crates/combine/4.6.4/download -> combine-4.6.4.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/configparser/3.0.0/download -> configparser-3.0.0.crate https://crates.io/api/v1/crates/console/0.15.0/download -> console-0.15.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-deque/0.8.1/download -> crossbeam-deque-0.8.1.crate https://crates.io/api/v1/crates/crossbeam-epoch/0.9.8/download -> crossbeam-epoch-0.9.8.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/crypto-mac/0.10.1/download -> crypto-mac-0.10.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/dialoguer/0.10.1/download -> dialoguer-0.10.1.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dunce/1.0.2/download -> dunce-1.0.2.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/encode_unicode/0.3.6/download -> encode_unicode-0.3.6.crate https://crates.io/api/v1/crates/encoding/0.2.33/download -> encoding-0.2.33.crate https://crates.io/api/v1/crates/encoding-index-japanese/1.20141219.5/download -> encoding-index-japanese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-korean/1.20141219.5/download -> encoding-index-korean-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-simpchinese/1.20141219.5/download -> encoding-index-simpchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-singlebyte/1.20141219.5/download -> encoding-index-singlebyte-1.20141219.5.crate https://crates.io/api/v1/crates/encoding-index-tradchinese/1.20141219.5/download -> encoding-index-tradchinese-1.20141219.5.crate https://crates.io/api/v1/crates/encoding_index_tests/0.1.4/download -> encoding_index_tests-0.1.4.crate https://crates.io/api/v1/crates/encoding_rs/0.8.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enumflags2/0.6.4/download -> enumflags2-0.6.4.crate https://crates.io/api/v1/crates/enumflags2_derive/0.6.4/download -> enumflags2_derive-0.6.4.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/fat-macho/0.4.5/download -> fat-macho-0.4.5.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fs-err/2.7.0/download -> fs-err-2.7.0.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/globset/0.4.8/download -> globset-0.4.8.crate https://crates.io/api/v1/crates/goblin/0.5.1/download -> goblin-0.5.1.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hkdf/0.10.0/download -> hkdf-0.10.0.crate https://crates.io/api/v1/crates/hmac/0.10.1/download -> hmac-0.10.1.crate https://crates.io/api/v1/crates/human-panic/1.0.3/download -> human-panic-1.0.3.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/ignore/0.4.18/download -> ignore-0.4.18.crate https://crates.io/api/v1/crates/indexmap/1.8.2/download -> indexmap-1.8.2.crate https://crates.io/api/v1/crates/indicatif/0.17.0-rc.6/download -> indicatif-0.17.0-rc.6.crate https://crates.io/api/v1/crates/indoc/1.0.6/download -> indoc-1.0.6.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/keyring/1.1.2/download -> keyring-1.1.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lddtree/0.2.9/download -> lddtree-0.2.9.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzxd/0.1.4/download -> lzxd-0.1.4.crate https://crates.io/api/v1/crates/mailparse/0.13.8/download -> mailparse-0.13.8.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mime/0.3.16/download -> mime-0.3.16.crate https://crates.io/api/v1/crates/mime_guess/2.0.4/download -> mime_guess-2.0.4.crate https://crates.io/api/v1/crates/minijinja/0.15.0/download -> minijinja-0.15.0.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/msi/0.5.0/download -> msi-0.5.0.crate https://crates.io/api/v1/crates/multipart/0.18.0/download -> multipart-0.18.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nb-connect/1.2.0/download -> nb-connect-1.2.0.crate https://crates.io/api/v1/crates/nix/0.17.0/download -> nix-0.17.0.crate https://crates.io/api/v1/crates/num/0.3.1/download -> num-0.3.1.crate https://crates.io/api/v1/crates/num-bigint/0.3.3/download -> num-bigint-0.3.3.crate https://crates.io/api/v1/crates/num-complex/0.3.1/download -> num-complex-0.3.1.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-rational/0.3.2/download -> num-rational-0.3.2.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/number_prefix/0.4.0/download -> number_prefix-0.4.0.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.20.0+1.1.1o/download -> openssl-src-111.20.0+1.1.1o.crate https://crates.io/api/v1/crates/openssl-sys/0.9.73/download -> openssl-sys-0.9.73.crate https://crates.io/api/v1/crates/os_str_bytes/6.1.0/download -> os_str_bytes-6.1.0.crate https://crates.io/api/v1/crates/os_type/2.4.0/download -> os_type-2.4.0.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/path-slash/0.1.4/download -> path-slash-0.1.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/plain/0.2.3/download -> plain-0.2.3.crate https://crates.io/api/v1/crates/platform-info/0.2.0/download -> platform-info-0.2.0.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro-crate/0.1.5/download -> proc-macro-crate-0.1.5.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/pyproject-toml/0.3.1/download -> pyproject-toml-0.3.1.crate https://crates.io/api/v1/crates/python-pkginfo/0.5.4/download -> python-pkginfo-0.5.4.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/quoted_printable/0.4.5/download -> quoted_printable-0.4.5.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rfc2047-decoder/0.1.2/download -> rfc2047-decoder-0.1.2.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.20.6/download -> rustls-0.20.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/scroll/0.11.0/download -> scroll-0.11.0.crate https://crates.io/api/v1/crates/scroll_derive/0.11.0/download -> scroll_derive-0.11.0.crate https://crates.io/api/v1/crates/sct/0.7.0/download -> sct-0.7.0.crate https://crates.io/api/v1/crates/secret-service/2.0.1/download -> secret-service-2.0.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/smawk/0.3.1/download -> smawk-0.3.1.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/socks/0.3.4/download -> socks-0.3.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/tar/0.4.38/download -> tar-0.4.38.crate https://crates.io/api/v1/crates/target-lexicon/0.12.4/download -> target-lexicon-0.12.4.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/toml_edit/0.14.4/download -> toml_edit-0.14.4.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/tracing-serde/0.1.3/download -> tracing-serde-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/twox-hash/1.6.3/download -> twox-hash-1.6.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicase/2.6.0/download -> unicase-2.6.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-linebreak/0.1.2/download -> unicode-linebreak-0.1.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/ureq/2.4.0/download -> ureq-2.4.0.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/uuid/0.8.2/download -> uuid-0.8.2.crate https://crates.io/api/v1/crates/uuid/1.1.0/download -> uuid-1.1.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/webpki-roots/0.22.3/download -> webpki-roots-0.22.3.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/which/4.2.5/download -> which-4.2.5.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/xattr/0.2.3/download -> xattr-0.2.3.crate https://crates.io/api/v1/crates/xwin/0.2.4/download -> xwin-0.2.4.crate https://crates.io/api/v1/crates/zbus/1.9.1/download -> zbus-1.9.1.crate https://crates.io/api/v1/crates/zbus_macros/1.9.1/download -> zbus_macros-1.9.1.crate https://crates.io/api/v1/crates/zip/0.6.2/download -> zip-0.6.2.crate https://crates.io/api/v1/crates/zvariant/2.10.0/download -> zvariant-2.10.0.crate https://crates.io/api/v1/crates/zvariant_derive/2.10.0/download -> zvariant_derive-2.10.0.crate test? ( https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libc/0.2.125/download -> libc-0.2.125.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/once_cell/1.11.0/download -> once_cell-1.11.0.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.38/download -> proc-macro2-1.0.38.crate https://crates.io/api/v1/crates/pyo3/0.16.5/download -> pyo3-0.16.5.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.0/download -> pyo3-build-config-0.16.0.crate https://crates.io/api/v1/crates/pyo3-build-config/0.16.5/download -> pyo3-build-config-0.16.5.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.0/download -> pyo3-ffi-0.16.0.crate https://crates.io/api/v1/crates/pyo3-ffi/0.16.5/download -> pyo3-ffi-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros/0.16.5/download -> pyo3-macros-0.16.5.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.16.5/download -> pyo3-macros-backend-0.16.5.crate https://crates.io/api/v1/crates/python3-dll-a/0.2.3/download -> python3-dll-a-0.2.3.crate https://crates.io/api/v1/crates/syn/1.0.94/download -> syn-1.0.94.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/unindent/0.1.9/download -> unindent-0.1.9.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3a28c94e2e28f6b5aff0247ac3f63fc1
diff --git a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0 b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0
index 9f4c394e35ca..3662b492f4a1 100644
--- a/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 SLOT=0
 SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v10.0.0.tar.bz2 mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz mirror://gnu/binutils/binutils-2.37.tar.xz
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2acf7c682b732d03a2eee5e187a4431f
+_md5_=5378ccaa3e9eb7a8ebca7431de559e85
diff --git a/metadata/md5-cache/dev-util/spirv-headers-1.2.198 b/metadata/md5-cache/dev-util/spirv-headers-1.2.198
deleted file mode 100644
index 1caade2e63d2..000000000000
--- a/metadata/md5-cache/dev-util/spirv-headers-1.2.198
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Machine-readable files for the SPIR-V Registry
-EAPI=7
-HOMEPAGE=https://www.khronos.org/registry/spir-v/
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.2.198.0.tar.gz -> spirv-headers-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b73f17c9bd9449cb28ddbb7f8e74cde1
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.2.198 b/metadata/md5-cache/dev-util/spirv-tools-1.2.198
deleted file mode 100644
index 6a0e52d43fde..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-1.2.198
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) ~dev-util/spirv-headers-1.2.198 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-headers-1.2.198
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=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=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.2.198.0.tar.gz -> spirv-tools-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=af8dfc1e0bfeca5272756f9afb9bb5a9
diff --git a/metadata/md5-cache/dev-util/spirv-tools-1.3.211 b/metadata/md5-cache/dev-util/spirv-tools-1.3.211
deleted file mode 100644
index 6ac9570abb73..000000000000
--- a/metadata/md5-cache/dev-util/spirv-tools-1.3.211
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) ~dev-util/spirv-headers-1.3.211 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-headers-1.3.211
-DESCRIPTION=Provides an API and commands for processing SPIR-V modules
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/SPIRV-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-1.3.211.0.tar.gz -> spirv-tools-1.3.211.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d0751cfcb845d3cab2aa831747104a53
diff --git a/metadata/md5-cache/dev-util/sysprof-3.44.0 b/metadata/md5-cache/dev-util/sysprof-3.44.0
index 434eb0b307bc..f0f4431ad2e5 100644
--- a/metadata/md5-cache/dev-util/sysprof-3.44.0
+++ b/metadata/md5-cache/dev-util/sysprof-3.44.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://sysprof.com/
 INHERIT=gnome.org gnome2-utils meson systemd xdg
 IUSE=gtk +unwind
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=>=dev-libs/glib-2.67.4:2 gtk? ( >=x11-libs/gtk+-3.22.0:3 >=dev-libs/libdazzle-3.30.0 ) dev-libs/json-glib >=sys-auth/polkit-0.114 unwind? ( sys-libs/libunwind:= ) >=dev-util/sysprof-common-3.44.0 >=dev-util/sysprof-capture-3.44.0:4
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e795e6f648aa813e4f305a953862084e
+_md5_=876972c4c9b4273ebc05dc8a33c3a37f
diff --git a/metadata/md5-cache/dev-util/sysprof-capture-3.44.0 b/metadata/md5-cache/dev-util/sysprof-capture-3.44.0
index 41763156f004..6a41180a8b27 100644
--- a/metadata/md5-cache/dev-util/sysprof-capture-3.44.0
+++ b/metadata/md5-cache/dev-util/sysprof-capture-3.44.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://sysprof.com/
 INHERIT=gnome.org meson-multilib systemd
 IUSE=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=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=!=dev-util/sysprof-3.34.1-r0
 SLOT=4
 SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=2f1f99d2267d9a6515b74320ba083a86
+_md5_=ec9df6a86b94da59b615247c7630b0f3
diff --git a/metadata/md5-cache/dev-util/sysprof-common-3.44.0 b/metadata/md5-cache/dev-util/sysprof-common-3.44.0
index 36cb683ee9c8..df4c00e8e6d5 100644
--- a/metadata/md5-cache/dev-util/sysprof-common-3.44.0
+++ b/metadata/md5-cache/dev-util/sysprof-common-3.44.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Static library for sysprof capture data generation
 EAPI=8
 HOMEPAGE=http://sysprof.com/
-KEYWORDS=~amd64 ~arm64 ~x86
+INHERIT=gnome.org
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-3+ GPL-2+
 RDEPEND=!=dev-util/sysprof-3.34.1-r0 !=dev-util/sysprof-capture-3.36.0-r0
 SLOT=0
 SRC_URI=mirror://gnome/sources/sysprof/3.44/sysprof-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=ca3eed9acce86faaae8e28196a2ee7e3
+_md5_=a6d1995e38d6bfc177ed43ba30e1a239
diff --git a/metadata/md5-cache/dev-util/umockdev-0.17.13 b/metadata/md5-cache/dev-util/umockdev-0.17.13
new file mode 100644
index 000000000000..4f42783daee7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/umockdev-0.17.13
@@ -0,0 +1,16 @@
+BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) app-arch/xz-utils virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:= test? ( || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-libs/libgudev:=[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=Mock hardware devices for creating unit tests
+EAPI=8
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+INHERIT=meson-multilib python-any-r1 vala
+IUSE=test 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.17.13/umockdev-0.17.13.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8
+_md5_=1bfcd8f9b68b94290217f26b0373bae1
diff --git a/metadata/md5-cache/dev-util/umockdev-0.17.9 b/metadata/md5-cache/dev-util/umockdev-0.17.9
index 057f212b04a7..2a219b4c65dc 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.17.9
+++ b/metadata/md5-cache/dev-util/umockdev-0.17.9
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/martinpitt/umockdev/
 INHERIT=meson-multilib python-any-r1 vala
 IUSE=test 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=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gobject-introspection-1.32:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.17.9/umockdev-0.17.9.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8
-_md5_=d7ec82fe1f4993703963ea73f7781c7b
+_md5_=9fe05823ab6e11177c62fc977d0ed5e4
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-1.2.198 b/metadata/md5-cache/dev-util/vulkan-headers-1.2.198
deleted file mode 100644
index 71c1843510c8..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-headers-1.2.198
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Vulkan Header files and API registry
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
-INHERIT=cmake
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-1.2.198.0.tar.gz -> vulkan-headers-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5b944d5b353dab2cb769fcc817e69be9
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.2.198 b/metadata/md5-cache/dev-util/vulkan-tools-1.2.198
deleted file mode 100644
index 7a96c6573799..000000000000
--- a/metadata/md5-cache/dev-util/vulkan-tools-1.2.198
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=dev-util/cmake-3.10.2 cube? ( ~dev-util/glslang-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~media-libs/vulkan-loader-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ~dev-util/vulkan-headers-1.2.198
-DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
-INHERIT=cmake-multilib python-any-r1
-IUSE=cube wayland +X 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=amd64 arm arm64 ppc ppc64 ~riscv
-LICENSE=Apache-2.0
-RDEPEND=~media-libs/vulkan-loader-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[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=cube? ( ^^ ( X wayland ) )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-1.2.198.0.tar.gz -> vulkan-tools-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9c0c6b767f02105d561b19ae651ed916
diff --git a/metadata/md5-cache/dev-util/web_page_replay_go-20220314 b/metadata/md5-cache/dev-util/web_page_replay_go-20220314
new file mode 100644
index 000000000000..07eb69eeae92
--- /dev/null
+++ b/metadata/md5-cache/dev-util/web_page_replay_go-20220314
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=A performance testing tool for recording and replaying web pages
+EAPI=8
+HOMEPAGE=https://chromium.googlesource.com/catapult/+/refs/heads/main/web_page_replay_go/
+INHERIT=go-module
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/elkablo/web_page_replay_go/archive/refs/tags/v20220314.tar.gz -> web_page_replay_go-20220314.tar.gz https://github.com/elkablo/web_page_replay_go/releases/download/v20220314/web_page_replay_go-20220314-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=4581c0cc1c647f98f16c90b809927cc9
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index b712e3c84c82..c4aadd2365b8 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/pre-commit-2.19.0 b/metadata/md5-cache/dev-vcs/pre-commit-2.19.0
new file mode 100644
index 000000000000..190fa17390a2
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/pre-commit-2.19.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_single_target_python3_8? ( dev-python/pytest-env[python_targets_python3_8(-)] dev-python/re-assert[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest-env[python_targets_python3_9(-)] dev-python/re-assert[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest-env[python_targets_python3_10(-)] dev-python/re-assert[python_targets_python3_10(-)] ) ) test? ( dev-vcs/git python_single_target_python3_8? ( >=dev-python/cfgv-2.0.0[python_targets_python3_8(-)] >=dev-python/identify-1.0.0[python_targets_python3_8(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cfgv-2.0.0[python_targets_python3_9(-)] >=dev-python/identify-1.0.0[python_targets_python3_9(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/cfgv-2.0.0[python_targets_python3_10(-)] >=dev-python/identify-1.0.0[python_targets_python3_10(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=A framework for managing and maintaining multi-language Git pre-commit hooks
+EAPI=8
+HOMEPAGE=https://pre-commit.com/
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=dev-vcs/git python_single_target_python3_8? ( >=dev-python/cfgv-2.0.0[python_targets_python3_8(-)] >=dev-python/identify-1.0.0[python_targets_python3_8(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_8(-)] >=dev-python/pyyaml-5.1[python_targets_python3_8(-)] dev-python/toml[python_targets_python3_8(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/cfgv-2.0.0[python_targets_python3_9(-)] >=dev-python/identify-1.0.0[python_targets_python3_9(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_9(-)] dev-python/toml[python_targets_python3_9(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/cfgv-2.0.0[python_targets_python3_10(-)] >=dev-python/identify-1.0.0[python_targets_python3_10(-)] >=dev-python/nodeenv-0.11.1[python_targets_python3_10(-)] >=dev-python/pyyaml-5.1[python_targets_python3_10(-)] dev-python/toml[python_targets_python3_10(-)] >=dev-python/virtualenv-20.0.8[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pre-commit/pre-commit/archive/refs/tags/v2.19.0.tar.gz -> pre-commit-2.19.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=f71d811ea5fd9bcaea025e23b7d4e8ae
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index b57f692bbdf9..b511bbec44e9 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/polymc-1.3.1 b/metadata/md5-cache/games-action/polymc-1.3.1
new file mode 100644
index 000000000000..4d9144c07d2a
--- /dev/null
+++ b/metadata/md5-cache/games-action/polymc-1.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:= sys-libs/zlib media-libs/libglvnd >=virtual/jdk-1.8.0:* >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A custom, open source Minecraft launcher
+EAPI=8
+HOMEPAGE=https://polymc.org/ https://github.com/PolyMC/PolyMC
+INHERIT=cmake java-pkg-2 optfeature xdg
+IUSE=debug lto
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT
+RDEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:= sys-libs/zlib >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
+REQUIRED_USE=lto? ( !debug )
+SLOT=0
+SRC_URI=https://github.com/PolyMC/PolyMC/releases/download/1.3.1/PolyMC-1.3.1.tar.gz -> polymc-1.3.1.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=74761b1f5d4e05257b3db64d4bfe3641
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 1dd2d6dd10da..aa662ae800e3 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/gnome-chess-42.0 b/metadata/md5-cache/games-board/gnome-chess-42.0
index 1728b4497733..af68678852f3 100644
--- a/metadata/md5-cache/games-board/gnome-chess-42.0
+++ b/metadata/md5-cache/games-board/gnome-chess-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Play the classic two-player boardgame of chess
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Chess
 INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 vala xdg
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.44:2 gui-libs/gtk:4 >=gui-libs/libadwaita-1.0.0:1 >=gnome-base/librsvg-2.46.0:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-chess/42/gnome-chess-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8268dc8f44905c16f5d3c9065ffbc7c9
+_md5_=176415618988ef6b4ac8fbb5e0586be7
diff --git a/metadata/md5-cache/games-board/tali-40.7 b/metadata/md5-cache/games-board/tali-40.7
index 6c8d15de60b3..e7db73c7b78d 100644
--- a/metadata/md5-cache/games-board/tali-40.7
+++ b/metadata/md5-cache/games-board/tali-40.7
@@ -5,10 +5,10 @@ DESCRIPTION=Beat the odds in a poker-style dice game
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Tali https://gitlab.gnome.org/GNOME/tali
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=dev-libs/glib:2 >=x11-libs/gtk+-3.16:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/tali/40/tali-40.7.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=48771ae9e6559bb0a4b59a17d7b4300d
+_md5_=2846bbe5de2680cd2c681728c157831f
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 9bbd334e1c5f..e66d3ad9650d 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/atari800-5.0.0 b/metadata/md5-cache/games-emulation/atari800-5.0.0
new file mode 100644
index 000000000000..e85048f76feb
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/atari800-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=encode-mp3? ( media-sound/lame ) sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) media-libs/libpng:= sys-libs/zlib
+DESCRIPTION=Atari 800 emulator
+EAPI=7
+HOMEPAGE=https://atari800.github.io/
+INHERIT=autotools desktop
+IUSE=encode-mp3 opengl readline +sdl +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=encode-mp3? ( media-sound/lame ) sdl? ( >=media-libs/libsdl-1.2.0[joystick,opengl?,sound?,video] ) !sdl? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= sys-libs/ncurses:= ) media-libs/libpng:= sys-libs/zlib
+REQUIRED_USE=encode-mp3? ( sound ) opengl? ( sdl )
+SLOT=0
+SRC_URI=https://github.com/atari800/atari800/releases/download/ATARI800_5_0_0/atari800-5.0.0-src.tgz https://sourceforge.net/projects/atari800/files/ROM/Original%20XL%20ROM/xf25.zip
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=505cf670fadb006d62261ac7e23eaf90
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index e29a3ca4dae9..fc2b2e143ae7 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/bsd-games-3.1-r2 b/metadata/md5-cache/games-misc/bsd-games-3.1-r2
index 683a62222a19..9e5f2764f75d 100644
--- a/metadata/md5-cache/games-misc/bsd-games-3.1-r2
+++ b/metadata/md5-cache/games-misc/bsd-games-3.1-r2
@@ -5,11 +5,11 @@ DESCRIPTION=collection of games from NetBSD
 EAPI=7
 HOMEPAGE=https://www.polyomino.org.uk/computer/software/bsd-games/
 INHERIT=toolchain-funcs
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~riscv ~x86
 LICENSE=BSD
 RDEPEND=sys-apps/miscfiles sys-libs/ncurses:=[unicode(+)] !games-puzzle/hangman !games-misc/wumpus acct-group/gamestat
 RESTRICT=test
 SLOT=0/3
 SRC_URI=https://github.com/msharov/bsd-games/archive/refs/tags/v3.1.tar.gz -> bsd-games-3.1.tar.gz https://dev.gentoo.org/~sam/distfiles/games-misc/bsd-games/bsd-games-3.1-verbose-build.patch.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=cbfa9ce904c56447be530b217b7d5819
+_md5_=1158ffa797f01988718a92448a473552
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 8fddfd1ca87b..d9c41f3c256e 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/five-or-more-3.32.3 b/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
index fbc04a3c7734..87d6d5871975 100644
--- a/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
+++ b/metadata/md5-cache/games-puzzle/five-or-more-3.32.3
@@ -5,10 +5,10 @@ DESCRIPTION=Remove colored balls from the board by forming lines
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
 INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+ CC-BY-SA-3.0
 RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.20:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32:2
 SLOT=0
 SRC_URI=mirror://gnome/sources/five-or-more/3.32/five-or-more-3.32.3.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8e600aa877f135e5c89b72b5b8ea60ef
+_md5_=ca74e145ec4551226aaf887617d2a40e
diff --git a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0 b/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
index bfd7197a67ad..bde07a619ec9 100644
--- a/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
+++ b/metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Test your logic skills in this number grid puzzle
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-3+ CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] >=x11-libs/gtk+-3.24.0:3[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sudoku/42/gnome-sudoku-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ac8a8ea6c801b0c4491aa8bce9db256f
+_md5_=d9afdfd6c34c952682fd629b43346b4a
diff --git a/metadata/md5-cache/games-puzzle/swell-foop-41.1 b/metadata/md5-cache/games-puzzle/swell-foop-41.1
index 2175aeacdebf..a31f2bebec21 100644
--- a/metadata/md5-cache/games-puzzle/swell-foop-41.1
+++ b/metadata/md5-cache/games-puzzle/swell-foop-41.1
@@ -5,10 +5,10 @@ DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
 INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gtk+-3.24:3 >=media-libs/clutter-1.14.0:1.0 >=media-libs/clutter-gtk-1.5.0:1.0 >=dev-libs/libgnome-games-support-1.7.1:1= >=dev-libs/libgee-0.14.0:0.8=
 SLOT=0
 SRC_URI=mirror://gnome/sources/swell-foop/41/swell-foop-41.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c32d3c17d213821b3b1c6433f0e6b50f
+_md5_=31413e884024f261504eada03ed5992b
diff --git a/metadata/md5-cache/games-simulation/Manifest.gz b/metadata/md5-cache/games-simulation/Manifest.gz
index 6be1ebb141af..373fdb53b063 100644
Binary files a/metadata/md5-cache/games-simulation/Manifest.gz and b/metadata/md5-cache/games-simulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.3.5.1-r1 b/metadata/md5-cache/games-simulation/openrct2-0.3.5.1-r1
deleted file mode 100644
index 9cc1e2efe79d..000000000000
--- a/metadata/md5-cache/games-simulation/openrct2-0.3.5.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dev-cpp/nlohmann_json test? ( dev-cpp/gtest )
-DESCRIPTION=An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2
-EAPI=8
-HOMEPAGE=https://openrct2.org/
-INHERIT=cmake readme.gentoo-r1 xdg-utils
-IUSE=dedicated +lightfx +opengl scripting test +truetype
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.3.5.1.tar.gz -> openrct2-0.3.5.1.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.0.21/objects.zip -> openrct2-objects-1.0.21.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2c/title-sequences.zip -> openrct2-title-sequences-0.1.2c.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.57/replays.zip -> openrct2-replays-0.0.57.zip )
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1854d8394ef357cccef5e290b62a1070
diff --git a/metadata/md5-cache/games-simulation/openrct2-0.4.0 b/metadata/md5-cache/games-simulation/openrct2-0.4.0
index 5d8a4a40556c..799a9e202359 100644
--- a/metadata/md5-cache/games-simulation/openrct2-0.4.0
+++ b/metadata/md5-cache/games-simulation/openrct2-0.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openrct2.org/
 INHERIT=cmake readme.gentoo-r1 xdg-utils
 IUSE=dedicated +lightfx +opengl scripting test +truetype
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/icu:= dev-libs/jansson:= dev-libs/libzip:= media-libs/libpng:0= net-misc/curl[ssl] sys-libs/zlib !dedicated? ( media-libs/libsdl2 media-libs/speexdsp opengl? ( virtual/opengl ) ) dev-libs/openssl:0= scripting? ( dev-lang/duktape:= ) truetype? ( media-libs/fontconfig:1.0 media-libs/freetype:2 ) dedicated? ( acct-group/openrct2 acct-user/openrct2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.4.0.tar.gz -> openrct2-0.4.0.tar.gz https://github.com/OpenRCT2/objects/releases/download/v1.2.7/objects.zip -> openrct2-objects-1.2.7.zip https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.0/title-sequences.zip -> openrct2-title-sequences-0.4.0.zip test? ( https://github.com/OpenRCT2/replays/releases/download/v0.0.67/replays.zip -> openrct2-replays-0.0.67.zip )
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=508d4f55923d0adf269a7af38cfd69f3
+_md5_=f9316541e271868f378a7d7b2be35dad
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 6a049c9bdabe..e37dbf46098f 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/xpadneo-0.9.3 b/metadata/md5-cache/games-util/xpadneo-0.9.3
new file mode 100644
index 000000000000..4b06c5b5c747
--- /dev/null
+++ b/metadata/md5-cache/games-util/xpadneo-0.9.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Advanced Linux Driver for Xbox One Wireless Controller
+EAPI=8
+HOMEPAGE=https://atar-axis.github.io/xpadneo/
+INHERIT=linux-mod toolchain-funcs udev
+IUSE=dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/atar-axis/xpadneo/archive/v0.9.3.tar.gz -> xpadneo-0.9.3.tar.gz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=ebe65ed99541bdafdd12b6aea3197e23
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index 31c6940bb003..e4a4433747d8 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gdm-42.0 b/metadata/md5-cache/gnome-base/gdm-42.0
index ae1d14748869..8b0050446273 100644
--- a/metadata/md5-cache/gnome-base/gdm-42.0
+++ b/metadata/md5-cache/gnome-base/gdm-42.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GDM
 INHERIT=desktop gnome2 meson pam readme.gentoo-r1 systemd udev
 IUSE=accessibility audit bluetooth-sound branding elogind fprint plymouth selinux systemd tcpd test wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
 RDEPEND=virtual/udev >=dev-libs/libgudev-232:= >=dev-libs/glib-2.56:2 >=x11-libs/gtk+-2.91.1:3 >=media-libs/libcanberra-0.4[gtk3] >=sys-apps/accountsservice-0.6.35 x11-libs/libxcb sys-apps/keyutils:= selinux? ( sys-libs/libselinux ) x11-libs/libX11 x11-libs/libXau x11-base/xorg-server[-minimal] x11-libs/libXdmcp tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) systemd? ( >=sys-apps/systemd-186:0=[pam] ) elogind? ( >=sys-auth/elogind-239.3[pam] ) plymouth? ( sys-boot/plymouth ) audit? ( sys-process/audit ) sys-libs/pam sys-auth/pambase[elogind?,systemd?] >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus >=x11-misc/xdg-utils-1.0.2-r3 >=dev-libs/gobject-introspection-0.9.12:= acct-group/gdm acct-user/gdm >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd[pam] )
 REQUIRED_USE=^^ ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gdm/42/gdm-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c112e1a084c255a9371a19c12ada533
+_md5_=5078de917b23e6c851dc8d78d5b0cf69
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-42.1 b/metadata/md5-cache/gnome-base/gnome-control-center-42.1
index f54671387fa0..225a44fe5946 100644
--- a/metadata/md5-cache/gnome-base/gnome-control-center-42.1
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-42.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
 IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
 RDEPEND=gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=gui-libs/libadwaita-1.1:1= >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-control-center/42/gnome-control-center-42.1.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-42.0-patchset.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=79c629326347438587887723034075c9
+_md5_=f255c33049dc9360c80e52eaebf2287f
diff --git a/metadata/md5-cache/gnome-base/gnome-control-center-42.2 b/metadata/md5-cache/gnome-base/gnome-control-center-42.2
new file mode 100644
index 000000000000..87612560c3cb
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-control-center-42.2
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/libxslt app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 x11-base/xorg-proto dev-libs/libxml2:2 dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=gui-libs/libadwaita-1.1:1= >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound
+DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-control-center
+INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
+IUSE=+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+PDEPEND=>=gnome-base/gnome-session-2.91.6-r1 networkmanager? ( gnome-extra/nm-applet )
+RDEPEND=gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= ) >=media-sound/pulseaudio-2.0[glib] >=gui-libs/libadwaita-1.1:1= >=sys-apps/accountsservice-0.6.39 >=x11-misc/colord-0.1.34:0= >=x11-libs/gdk-pixbuf-2.23.0:2 >=dev-libs/glib-2.56.0:2 gnome-base/gnome-desktop:4= >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?] >=gnome-base/gsettings-desktop-schemas-42_alpha dev-libs/libxml2:2 >=sys-power/upower-0.99.8:= >=dev-libs/libgudev-232 x11-libs/libX11 >=x11-libs/libXi-1.2 media-libs/libepoxy app-crypt/gcr:= >=dev-libs/libpwquality-1.2.2 >=gui-libs/gtk-4.4:4[X,wayland=] >=sys-auth/polkit-0.114 cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) ibus? ( >=app-i18n/ibus-1.5.2 ) networkmanager? ( >=net-libs/libnma-1.8.36 >=net-misc/networkmanager-1.24.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) bluetooth? ( net-wireless/gnome-bluetooth:3= ) input_devices_wacom? ( >=dev-libs/libwacom-0.27 ) kerberos? ( app-crypt/mit-krb5 ) x11-libs/cairo[glib] >=x11-libs/colord-gtk-0.3.0 media-libs/fontconfig gnome-base/libgtop:2= >=sys-fs/udisks-2.1.8:2 app-crypt/libsecret net-libs/gnutls:= media-libs/gsound systemd? ( >=sys-apps/systemd-31 ) elogind? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme >=gnome-extra/gnome-color-manager-3.1.2 cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+REQUIRED_USE=^^ ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-control-center/42/gnome-control-center-42.2.tar.xz https://dev.gentoo.org/~mattst88/distfiles/gnome-control-center-42.0-patchset.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a8b788da5d5913bc8b75eaebe7f81fbf
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300 b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
index abcbb3ec31e9..fd5ee341f78b 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 INHERIT=gnome.org meson xdg
 IUSE=debug +introspection seccomp systemd udev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap )
 SLOT=3/19
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3dfe862104a309096d4f041bceebab0
+_md5_=df129a3320d79122391277b94f4802bf
diff --git a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400 b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
index 25f155b56b08..bc2a6a85f116 100644
--- a/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
+++ b/metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-desktop/
 INHERIT=gnome.org meson xdg
 IUSE=debug gtk-doc +introspection seccomp systemd udev
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+ FDL-1.1+
 RDEPEND=>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=gui-libs/gtk-4.4.0:4[introspection?] >=dev-libs/glib-2.53.0:2 >=gnome-base/gsettings-desktop-schemas-3.27.0[introspection?] x11-misc/xkeyboard-config x11-libs/libxkbcommon app-text/iso-codes systemd? ( sys-apps/systemd:= ) udev? ( virtual/libudev:= ) seccomp? ( sys-libs/libseccomp ) x11-libs/cairo:= introspection? ( >=dev-libs/gobject-introspection-1.54:= ) seccomp? ( sys-apps/bubblewrap ) !<gnome-base/gnome-desktop-42.1:3
 SLOT=4/1
 SRC_URI=mirror://gnome/sources/gnome-desktop/42/gnome-desktop-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3f534817bc66e0b461aab0ea02f0ea58
+_md5_=0fdf970c4c430fddbbd76aa7a5454610
diff --git a/metadata/md5-cache/gnome-base/gnome-session-42.0 b/metadata/md5-cache/gnome-base/gnome-session-42.0
index 714278543775..7a9ff767d670 100644
--- a/metadata/md5-cache/gnome-base/gnome-session-42.0
+++ b/metadata/md5-cache/gnome-base/gnome-session-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-session
 INHERIT=desktop gnome.org gnome2-utils meson xdg
 IUSE=doc elogind systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.46.0:2 >=x11-libs/gtk+-3.22.0:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=gnome-base/gnome-desktop-3.34.2:3= >=dev-libs/json-glib-0.10 media-libs/mesa[egl(+),gles2,X(+)] media-libs/libepoxy x11-libs/libXcomposite systemd? ( >=sys-apps/systemd-242:0= ) elogind? ( >=sys-auth/elogind-239.4 ) >=gnome-base/gnome-settings-daemon-3.35.91 >=gnome-base/gsettings-desktop-schemas-0.1.7 sys-apps/dbus[X] x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-session/42/gnome-session-42.0.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4ce0c3ca437dd1608621ddf4033d34f0
+_md5_=352ab1b64794b7f07a5c72ab4f771968
diff --git a/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1 b/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1
index 2ffb1e8ca3ca..e50425a24c80 100644
--- a/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1
+++ b/metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-settings-daemon
 INHERIT=gnome.org gnome2-utils python-any-r1 meson udev virtualx xdg
 IUSE=+colord +cups debug elogind input_devices_wacom modemmanager networkmanager smartcard systemd test +udev wayland test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=sci-geosciences/geocode-glib-3.10 >=dev-libs/glib-2.58:2 >=gnome-base/gnome-desktop-3.37.1:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=dev-libs/libgweather-4.0.0:4= colord? ( >=x11-misc/colord-1.4.5:= >=media-libs/lcms-2.2:2 ) media-libs/libcanberra[gtk3] >=app-misc/geoclue-2.3.1:2.0 >=x11-libs/libnotify-0.7.3 >=media-sound/pulseaudio-12.99.3[glib] >=sys-auth/polkit-0.114 >=sys-power/upower-0.99.12:= x11-libs/libX11 >=x11-libs/libXfixes-6.0.0 udev? ( dev-libs/libgudev:= ) wayland? ( dev-libs/wayland ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20.0 x11-libs/gdk-pixbuf:2 ) smartcard? ( >=dev-libs/nss-3.11.2 ) cups? ( >=net-print/cups-1.4[dbus] ) modemmanager? ( >=app-crypt/gcr-3.7.5:= >=net-misc/modemmanager-1.0:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) media-libs/alsa-lib x11-libs/libXi x11-libs/libXext media-libs/fontconfig systemd? ( >=sys-apps/systemd-243 ) gnome-base/dconf elogind? ( sys-auth/elogind ) !<gnome-base/gnome-session-3.33.90 !<gnome-base/gdm-3.33.90 !<gnome-extra/gnome-shell-extensions-3.34.1 !<gnome-base/gnome-flashback-3.33.1
 REQUIRED_USE=^^ ( elogind systemd ) input_devices_wacom? ( udev ) wayland? ( udev )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-settings-daemon/42/gnome-settings-daemon-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4c61ee65ede80f582264b521d3fbb4fd
+_md5_=10c047dd74f66ee5b9ee4b27cc6da38b
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-42.1 b/metadata/md5-cache/gnome-base/gnome-shell-42.1
index ea403fa20783..545faa07411d 100644
--- a/metadata/md5-cache/gnome-base/gnome-shell-42.1
+++ b/metadata/md5-cache/gnome-base/gnome-shell-42.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
 INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
 IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
 RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell sys-apps/xdg-desktop-portal-gtk
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0f54b8658cbd796ab2fd281d860ab21f
+_md5_=5a5a65d7083d2ac35549e8d92ede5d45
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-42.2 b/metadata/md5-cache/gnome-base/gnome-shell-42.2
new file mode 100644
index 000000000000..a54f6cb0a724
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-42.2
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.5 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)]
+DESCRIPTION=Provides core UI functions for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+INHERIT=gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection(+)] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.68:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.71.1 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-42.0:0/10[introspection,test?] >=sys-auth/polkit-0.120_p20220509[introspection] >=gnome-base/gsettings-desktop-schemas-42_beta[introspection] >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.19 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( net-wireless/gnome-bluetooth:3=[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 >=media-video/pipewire-0.3.0:= networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-242 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 gui-libs/gtk:4[introspection] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] media-libs/graphene[introspection] >=dev-libs/libgweather-4.0.0:4[introspection] x11-libs/pango[introspection] net-libs/libsoup:2.4[introspection] >=sys-power/upower-0.99:=[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.5.26[gtk3,gtk4,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell || ( sys-apps/xdg-desktop-portal-gnome <sys-apps/xdg-desktop-portal-gtk-1.14.0 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/42/gnome-shell-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d1b8556cb9669cde886236da3f04ee17
diff --git a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5 b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
deleted file mode 100644
index 1b1892808bf0..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glib-utils sys-devel/gettext gnome-base/gnome-common >=dev-util/intltool-0.40 virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( >=sys-apps/acl-2.2.52-r1[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-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] !gnome-extra/gnome-vfs-sftp ) ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Gnome Virtual Filesystem
-EAPI=7
-HOMEPAGE=https://www.gnome.org/
-INHERIT=gnome2 multilib-minimal virtualx
-IUSE=acl gnutls ipv6 kerberos samba ssl zeroconf 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
-KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( >=sys-apps/acl-2.2.52-r1[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-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] !gnome-extra/gnome-vfs-sftp ) ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=2
-SRC_URI=mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d2fdbd4a63d65860be5808fdf8a501a3
diff --git a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
index 06c76ec65e37..ec5aa25e1920 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/42/gsettings-desktop-schemas-42.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=803a811408582f9aa1448a45a0c22b4e
+_md5_=9147423f845964698f79067aec52afde
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.50.1-r1 b/metadata/md5-cache/gnome-base/gvfs-1.50.1-r1
index fb807c44b875..969c97b3696a 100644
--- a/metadata/md5-cache/gnome-base/gvfs-1.50.1-r1
+++ b/metadata/md5-cache/gnome-base/gvfs-1.50.1-r1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
 INHERIT=gnome.org gnome2-utils meson systemd tmpfiles xdg
 IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
 REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gvfs/1.50/gvfs-1.50.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e551fc6e92045ca577161cb115e657c2
+_md5_=563d0822acfa830923e971172b7d672f
diff --git a/metadata/md5-cache/gnome-base/gvfs-1.50.2 b/metadata/md5-cache/gnome-base/gvfs-1.50.2
new file mode 100644
index 000000000000..99c69e384f15
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gvfs-1.50.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=sys-devel/gettext-0.19.8 virtual/pkgconfig dev-util/gdbus-codegen test? ( dev-libs/libgdata ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
+DESCRIPTION=Virtual filesystem implementation for GIO
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+INHERIT=gnome.org gnome2-utils meson systemd tmpfiles xdg
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.70.0:2 >=gnome-base/gsettings-desktop-schemas-3.33.0 afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) sys-apps/dbus app-crypt/gcr:= policykit? ( >=sys-auth/polkit-0.114 sys-libs/libcap ) http? ( dev-libs/libxml2:2 >=net-libs/libsoup-3.0.0:3.0 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) udev? ( >=dev-libs/libgudev-147:= ) fuse? ( >=sys-fs/fuse-3.0.0:3 virtual/tmpfiles ) udisks? ( >=sys-fs/udisks-1.97:2 ) systemd? ( >=sys-apps/systemd-206:0= ) elogind? ( >=sys-auth/elogind-229:0= ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.17.1:= ) gnome-keyring? ( app-crypt/libsecret ) bluray? ( media-libs/libbluray:= ) mtp? ( virtual/libusb:1 >=media-libs/libmtp-1.1.15 ) samba? ( >=net-fs/samba-4[client] ) archive? ( app-arch/libarchive:= ) cdda? ( dev-libs/libcdio:0= >=dev-libs/libcdio-paranoia-0.78.2 ) google? ( >=dev-libs/libgdata-0.18.0:=[crypt,gnome-online-accounts] ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) nfs? ( >=net-fs/libnfs-1.9.8:= ) net-misc/openssh
+REQUIRED_USE=?? ( elogind systemd ) cdda? ( udev ) google? ( gnome-online-accounts ) gphoto2? ( udev ) mtp? ( udev ) udisks? ( udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.50/gvfs-1.50.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5085bb09bbfd6ad551c5f27eebf7e45c
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.54.3 b/metadata/md5-cache/gnome-base/librsvg-2.54.3
index f4fcd303b45a..97cd8b38c504 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.54.3
+++ b/metadata/md5-cache/gnome-base/librsvg-2.54.3
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg https://gitlab.gnome.org/GNOME/librsvg
 INHERIT=gnome2 multilib-minimal python-any-r1 rust-toolchain vala
 IUSE=gtk-doc +introspection +vala 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.16.0[glib,svg,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.9:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.20:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.50.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.0.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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.48.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.54/librsvg-2.54.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=08c8bba0d3927e3aa840cb37bb6dfa0b
+_md5_=b5a784050c15831f6794aea2e937f821
diff --git a/metadata/md5-cache/gnome-base/nautilus-42.1.1 b/metadata/md5-cache/gnome-base/nautilus-42.1.1
index 449a9ad419a8..1971498c3ffa 100644
--- a/metadata/md5-cache/gnome-base/nautilus-42.1.1
+++ b/metadata/md5-cache/gnome-base/nautilus-42.1.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
 INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
 IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+ LGPL-2.1+
 PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
 RDEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.14.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-3.0.0:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.5.0:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/nautilus/42/nautilus-42.1.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1bad512bcfee51da0f0fff07c2b05e43
+_md5_=9151b1a947e7dfe7188c55e459510655
diff --git a/metadata/md5-cache/gnome-base/nautilus-42.2 b/metadata/md5-cache/gnome-base/nautilus-42.2
new file mode 100644
index 000000000000..c58400e2ae49
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/nautilus-42.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/gdbus-codegen-2.51.2 >=dev-util/meson-0.57.2 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.10 app-text/docbook-xml-dtd:4.1.2 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.14.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-3.0.0:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.5.0:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+DESCRIPTION=Default file manager for the GNOME desktop
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+INHERIT=gnome.org gnome2-utils meson readme.gentoo-r1 virtualx xdg
+IUSE=gnome +gstreamer gtk-doc +introspection +previewer selinux sendto test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+ LGPL-2.1+
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk(+)]
+RDEPEND=>=dev-libs/glib-2.67.1:2 >=media-libs/gexiv2-0.14.0 gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=app-arch/gnome-autoar-0.4.0 >=gnome-base/gnome-desktop-3.0.0:3= >=gnome-base/gsettings-desktop-schemas-42 >=x11-libs/gtk+-3.22.27:3[X,introspection?] >=gui-libs/libhandy-1.5.0:1 >=x11-libs/pango-1.28.3 selinux? ( >=sys-libs/libselinux-2.0 ) >=app-misc/tracker-3.0:3= x11-libs/libX11 >=dev-libs/libxml2-2.7.8:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) >=app-misc/tracker-miners-3.0:3=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/42/nautilus-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1bad512bcfee51da0f0fff07c2b05e43
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 173bf022420d..0abfde515f58 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
index 1021f56d35a1..fed5409550c2 100644
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
 IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
 RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=0/63-26-20
 SRC_URI=mirror://gnome/sources/evolution-data-server/3.44/evolution-data-server-3.44.1.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8bac3480c561d4da41316e0035ae8b2d
+_md5_=f9585bfa8ff6e3b5f30d20e8ef994884
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.2
new file mode 100644
index 000000000000..f0562d9fe8ec
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-data-server-3.44.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gperf gtk-doc? ( >=dev-util/gtk-doc-1.14 app-text/docbook-xml-dtd:4.1.2 ) >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= ) vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) net-libs/libsoup:2.4[vala] dev-libs/libical[vala] oauth? ( dev-libs/libgdata[vala] ) gnome-online-accounts? ( dev-libs/libgdata[vala] ) )
+DESCRIPTION=Evolution groupware backend
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake db-use flag-o-matic gnome2 vala virtualx
+IUSE=berkdb +gnome-online-accounts +gtk gtk-doc +introspection ipv6 ldap kerberos oauth vala +weather test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.70:2 >=dev-libs/libical-3.0.8:=[glib,introspection?] >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.58:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.16:3 >=media-libs/libcanberra-0.25[gtk3] ) oauth? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.28.0:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test !test? ( test ) !test? ( test )
+SLOT=0/63-26-20
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.44/evolution-data-server-3.44.2.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	db-use	867a9246a45efc09934e0f8e3380c813	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=8bac3480c561d4da41316e0035ae8b2d
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
index a923d5a127ba..0f8aae313206 100644
--- a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 INHERIT=cmake gnome2 optfeature
 IUSE=test
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.1:0= >=mail-client/evolution-3.44.1:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/evolution-ews/3.44/evolution-ews-3.44.1.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0a0878babc442a9ec8ec81d666ac1793
+_md5_=e5e86879a4e929065104f7448e1ae94d
diff --git a/metadata/md5-cache/gnome-extra/evolution-ews-3.44.2 b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.2
new file mode 100644
index 000000000000..ffdeb6f305ad
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/evolution-ews-3.44.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.2:0= >=mail-client/evolution-3.44.2:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3 test? ( net-libs/uhttpmock )
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake gnome2 optfeature
+IUSE=test
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.62:2 >=dev-libs/libical-3.0.5:0=[introspection(-)] >=dev-libs/json-glib-1.0.4 >=dev-libs/libmspack-0.4 dev-libs/libxml2:2 >=gnome-extra/evolution-data-server-3.44.2:0= >=mail-client/evolution-3.44.2:2.0 >=net-libs/libsoup-2.58:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.44/evolution-ews-3.44.2.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0a0878babc442a9ec8ec81d666ac1793
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1 b/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
index 2ae9216cbdbf..3ec7c37922eb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
 INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
 IUSE=rdp
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=LGPL-2+ CC-BY-2.0
 RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-boxes/42/gnome-boxes-42.0.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1ec43277387678d5e77f3ba7c70bc78c
+_md5_=0edda716b0ffcf999bad0c78428f094a
diff --git a/metadata/md5-cache/gnome-extra/gnome-boxes-42.1 b/metadata/md5-cache/gnome-extra/gnome-boxes-42.1
new file mode 100644
index 000000000000..95eb3834845d
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-boxes-42.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) net-libs/gtk-vnc[vala] sys-libs/libosinfo[vala] app-crypt/libsecret[vala] net-libs/libsoup:2.4[vala] app-emulation/libvirt-glib[vala] net-misc/spice-gtk[vala] x11-libs/vte:2.91[vala] dev-libs/appstream-glib rdp? ( x11-libs/gtk+:3[introspection] ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= )
+DESCRIPTION=Simple GNOME application to access remote or virtual systems
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+INHERIT=gnome.org gnome2-utils linux-info meson readme.gentoo-r1 vala xdg
+IUSE=rdp
+KEYWORDS=~amd64
+LICENSE=LGPL-2+ CC-BY-2.0
+RDEPEND=>=app-arch/libarchive-3.0.0:= >=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.24.1:3 >=net-libs/gtk-vnc-0.8.0-r1[gtk3(+)] >=gui-libs/libhandy-1.5.0:1= >=sys-libs/libosinfo-1.7.0 app-crypt/libsecret >=net-libs/libsoup-2.44:2.4 virtual/libusb:1 >=app-emulation/libvirt-glib-4.0.0 >=dev-libs/libxml2-2.7.8:2 >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] app-misc/tracker:3 >=net-libs/webkit-gtk-2.26.0:4 >=dev-libs/gobject-introspection-1.56:= >=dev-libs/libgudev-165:= rdp? ( >=net-misc/freerdp-2.0.0:= ) app-cdr/cdrtools app-misc/tracker-miners:3[iso] app-emulation/spice[smartcard] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] sys-fs/mtools sys-auth/polkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/42/gnome-boxes-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1ec43277387678d5e77f3ba7c70bc78c
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-42.0 b/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
index 8a47ad2e3860..45cebb8a62f5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala virtualx xdg
 IUSE=+introspection test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calculator/42/gnome-calculator-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=446c9bdd6d730a02b0dc7cf8b4cc97fd
+_md5_=ff666c3811043d1970232a7a1c2af585
diff --git a/metadata/md5-cache/gnome-extra/gnome-calculator-42.1 b/metadata/md5-cache/gnome-extra/gnome-calculator-42.1
new file mode 100644
index 000000000000..1e1068f4431f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-calculator-42.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 dev-lang/vala:0.48 dev-lang/vala:0.46 ) net-libs/libsoup:2.4[vala] gui-libs/gtksourceview:5[vala] gui-libs/libhandy:1[vala] app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+DESCRIPTION=A calculator application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+INHERIT=gnome.org gnome2-utils meson vala virtualx xdg
+IUSE=+introspection test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 >=dev-libs/libgee-0.20.0:0.8 dev-libs/mpc:= dev-libs/mpfr:0= >=gui-libs/gtk-4.4.1:4 >=gui-libs/libadwaita-1.0.0:1 >=gui-libs/gtksourceview-5.3.0:5 introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calculator/42/gnome-calculator-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=75f5950443047921cf272e63ccc6c872
diff --git a/metadata/md5-cache/gnome-extra/gnome-calendar-42.1 b/metadata/md5-cache/gnome-extra/gnome-calendar-42.1
index a75e1aaea151..0ab785b53dfc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-calendar-42.1
+++ b/metadata/md5-cache/gnome-extra/gnome-calendar-42.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
 INHERIT=gnome.org gnome2-utils meson virtualx xdg
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/libical-1.0.1:0= >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-extra/evolution-data-server-3.33.2:=[gtk] net-libs/libsoup:2.4 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/glib-2.67.5:2 >=gui-libs/gtk-4.6.0:4 >=dev-libs/libgweather-4.0.0:4= >=app-misc/geoclue-2.4:2.0 >=sci-geosciences/geocode-glib-3.23
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-calendar/42/gnome-calendar-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3f1136ee944a3adabae684ae7d5137b8
+_md5_=4a9b9f7b8a653e88a5cc8411e18c84f0
diff --git a/metadata/md5-cache/gnome-extra/gnome-characters-42.0 b/metadata/md5-cache/gnome-extra/gnome-characters-42.0
index 1c13f3a48e66..703ac0c0522c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-characters-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-characters-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Unicode character map viewer and library
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
 INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ BSD
 RDEPEND=>=dev-libs/gjs-1.50 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5:= >=gui-libs/gtk-4.6:4[introspection] >=gui-libs/libadwaita-1.0:1= x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.36[introspection] gnome-base/gnome-desktop:3[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-characters/42/gnome-characters-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=23f36a01b68e3687b0072b8108d071bf
+_md5_=9636fdf5e99a2056211494c0695ce89c
diff --git a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0 b/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
index fd2fdd935684..3442877d9c2b 100644
--- a/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-clocks-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Clocks application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
 INHERIT=gnome.org gnome2-utils meson vala xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.68:2 >=gui-libs/gtk-4.5:4 >=media-libs/gsound-0.98 >=dev-libs/libgweather-4.0.0:4= gnome-base/gnome-desktop:4 >=sci-geosciences/geocode-glib-1 >=app-misc/geoclue-2.4:2.0 >=gui-libs/libadwaita-1.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-clocks/42/gnome-clocks-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=85994b6e26d68c4bfa570d607776aadb
+_md5_=190982a312691d13f2060a164b5059b9
diff --git a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0 b/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
index 8f5c4e1afed1..8500e6a596f2 100644
--- a/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-contacts-42.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=telepathy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2+
 RDEPEND=>=gnome-extra/evolution-data-server-3.30:=[gnome-online-accounts] >=dev-libs/folks-0.11.4:=[eds,telepathy?] >=dev-libs/glib-2.58:2 >=dev-libs/libgee-0.10:0.8 net-libs/gnome-online-accounts:= >=gui-libs/gtk-4.6:4 gui-libs/libadwaita:1 telepathy? ( >=net-libs/telepathy-glib-0.22 ) >=gui-libs/libhandy-1.0.0:1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-contacts/42/gnome-contacts-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=083c3e68c1a1b5a30e7fe0be1b591f79
+_md5_=e312fcc8605ee20a53245e5fb089dff6
diff --git a/metadata/md5-cache/gnome-extra/gnome-logs-42.0 b/metadata/md5-cache/gnome-extra/gnome-logs-42.0
index 72a2bcd46c4e..316478f6bb54 100644
--- a/metadata/md5-cache/gnome-extra/gnome-logs-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-logs-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Log viewer for the systemd journal
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Logs
 INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=gnome-base/gsettings-desktop-schemas >=dev-libs/glib-2.43.90:2 >=x11-libs/gtk+-3.22:3 >=gui-libs/libhandy-1.5.0:1 sys-apps/systemd:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-logs/42/gnome-logs-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=22aeed839d036b472570ab7efa07d0a8
+_md5_=60de8305c4fe63c180198121e3cf2fcb
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-19.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-19.0
deleted file mode 100644
index 3e97bd5de2d9..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-19.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst
-DESCRIPTION=Restore the alphabetical ordering of the app grid
-EAPI=8
-HOMEPAGE=https://github.com/stuarthayhurst/alphabetical-grid-extension
-INHERIT=gnome2-utils
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v19.0.tar.gz -> gnome-shell-extension-alphabetical-grid-19.0.tar.gz
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dfbee3466ab6e17a5ccaec34c93d69c5
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-22.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-24.0
similarity index 79%
rename from metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-22.0
rename to metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-24.0
index 725d13dfefcf..73ac1d6cfb88 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-22.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-24.0
@@ -3,11 +3,11 @@ DESCRIPTION=Restore the alphabetical ordering of the app grid
 EAPI=8
 HOMEPAGE=https://github.com/stuarthayhurst/alphabetical-grid-extension
 INHERIT=gnome2-utils
-KEYWORDS=amd64 x86
+KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v22.0.tar.gz -> gnome-shell-extension-alphabetical-grid-22.0.tar.gz
+SRC_URI=https://github.com/stuarthayhurst/alphabetical-grid-extension/archive/refs/tags/v24.0.tar.gz -> gnome-shell-extension-alphabetical-grid-24.0.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=26d19112e04648fb58b36c333f8f94ad
+_md5_=4bf462cfd03ef0186c78992c65668f7f
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
index 66f1636399ed..3def085eb426 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
@@ -4,10 +4,10 @@ DESCRIPTION=Support Ubuntu AppIndicators and KStatusNotifierItems in Gnome
 EAPI=8
 HOMEPAGE=https://github.com/ubuntu/gnome-shell-extension-appindicator
 INHERIT=gnome2-utils meson
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=app-eselect/eselect-gnome-shell-extensions dev-libs/libappindicator:3 >=gnome-base/gnome-shell-3.34
 SLOT=0
 SRC_URI=https://github.com/ubuntu/gnome-shell-extension-appindicator/archive/v42.tar.gz -> gnome-shell-extension-appindicator-42.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e1b425c0b4d407c000220a3d683caba
+_md5_=24a3773206f2dac398b4fc1aea47efc6
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
index de7bcfcd3d30..ac6b76f61634 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
@@ -3,10 +3,10 @@ DESCRIPTION=Show tooltip with full name and description
 EAPI=8
 HOMEPAGE=https://github.com/RaphaelRochet/applications-overview-tooltip
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=public-domain
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
 SLOT=0
 SRC_URI=https://github.com/RaphaelRochet/applications-overview-tooltip/archive/v15.tar.gz -> gnome-shell-extension-applications-overview-tooltip-15.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b2f31a0c13ea6f4b98ce5ff7fda721b1
+_md5_=bdeccad5a18ff8045a0dd6dfa2222c71
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
index bfca4ac78eb5..e5c8510b54eb 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
@@ -3,10 +3,10 @@ DESCRIPTION=Changes your wallpaper daily to the bing.com background image
 EAPI=8
 HOMEPAGE=https://github.com/neffo/bing-wallpaper-gnome-extension
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.36
 SLOT=0
 SRC_URI=https://github.com/neffo/bing-wallpaper-gnome-extension/archive/v40.tar.gz -> gnome-shell-extension-bing-wallpaper-40.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5dd7b51ad8881281633d09f88016b2f3
+_md5_=983b872d4177142bfcffda412f925ed8
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
index 7719d4e4ba89..6fe85e7edfd5 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
@@ -3,10 +3,10 @@ DESCRIPTION=Allow to connect bluetooth paired devices from gnome control panel
 EAPI=8
 HOMEPAGE=https://github.com/bjarosze/gnome-bluetooth-quick-connect
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=net-wireless/bluez app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
 SLOT=0
 SRC_URI=https://github.com/bjarosze/gnome-bluetooth-quick-connect/archive/v29.tar.gz -> gnome-shell-extension-bluetooth-quick-connect-29.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=10ac22ee68fb443ca1fd02f1d9499db7
+_md5_=f136848a651b576f14e06310799ec5b3
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
index 033b0a900788..b887bb19741a 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
@@ -4,10 +4,10 @@ DESCRIPTION=Control the blur effect on gnome-shell lock screen
 EAPI=8
 HOMEPAGE=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-40
 SLOT=0
 SRC_URI=https://github.com/PRATAP-KUMAR/Control_Blur_Effect_On_Lock_Screen/archive/f24d6eda9bd1c625f5f35ab50a1caf5fef646a72.tar.gz -> gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=669bb8fab0d659edc24c0e75dc15cbee
+_md5_=163fe0129711607bc2607963b8ea7e65
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46
index 19b912c1bb85..5b6a50c28c8c 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
 INHERIT=gnome2-utils
 IUSE=branding
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-41
 SLOT=0
 SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v46.tar.gz -> gnome-shell-extension-dash-to-panel-46.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfdf5eef0ad1c6ea1293b974c4980c00
+_md5_=f3fb71bfe76075dc2d11eeb469633392
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
index 99b77462b21e..1d43d4068f59 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/home-sweet-gnome/dash-to-panel
 INHERIT=gnome2-utils
 IUSE=branding
-KEYWORDS=~amd64 ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-41
 SLOT=0
 SRC_URI=https://github.com/home-sweet-gnome/dash-to-panel/archive/v50.tar.gz -> gnome-shell-extension-dash-to-panel-50.tar.gz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bfdf5eef0ad1c6ea1293b974c4980c00
+_md5_=f3fb71bfe76075dc2d11eeb469633392
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
index f7ea79a988ad..8164b65d0310 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
@@ -5,10 +5,10 @@ DESCRIPTION=Fork from the desktop-icons project, with several enhancements like
 EAPI=8
 HOMEPAGE=https://gitlab.com/rastersoft/desktop-icons-ng
 INHERIT=gnome2-utils meson
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 >=gnome-base/nautilus-3.38
 SLOT=0
 SRC_URI=https://gitlab.com/rastersoft/desktop-icons-ng/uploads/eaa0b5e8e61258bd108897fc2fbd2da2/ding-45.0.tar.xz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=50264e37074c844e4b1e56e42416c97f
+_md5_=6e6ac714290a5d19025426a0739458d5
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
index 51484115b106..42fd9f796241 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/GSConnect/gnome-shell-extension-gsconnect
 INHERIT=gnome2-utils meson readme.gentoo-r1 xdg
 IUSE=nautilus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.68 =gnome-base/gnome-shell-42* gnome-base/gvfs gnome-extra/evolution-data-server || ( media-libs/libcanberra media-libs/gsound ) nautilus? ( dev-python/nautilus-python gnome-base/nautilus[introspection] )
 SLOT=0
 SRC_URI=https://github.com/GSConnect/gnome-shell-extension-gsconnect/archive/v50.tar.gz -> gnome-shell-extension-gsconnect-50.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d999f9ee2366a645d21b3aabcefe4f51
+_md5_=3fb2ba25e7ed53652835c3b8c3132e11
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504 b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
index 60b1a55cd188..50769a615448 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
@@ -3,10 +3,10 @@ DESCRIPTION=Display the current weather in the clock
 EAPI=8
 HOMEPAGE=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock
 INHERIT=gnome2-utils
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3+
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.38 gnome-extra/gnome-weather
 SLOT=0
 SRC_URI=https://github.com/JasonLG1979/gnome-shell-extension-weather-in-the-clock/archive/4c8dbc0831515e1b22d9b37601e83cebc2cc127d.tar.gz -> gnome-shell-extension-weather-in-the-clock-20220504.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d0c830a5296397baf999ab728b31fe89
+_md5_=500f0ef14de68204305d660c94178e28
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
index 096ee3b99286..ffca96138dcc 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
@@ -5,10 +5,10 @@ DESCRIPTION=JavaScript extensions for GNOME Shell
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
 INHERIT=gnome.org readme.gentoo-r1 meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-shell-extensions/42/gnome-shell-extensions-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2523405f0125c5889002381b349729cd
+_md5_=5c51656c3897b3322a7d0eb280226ae6
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.2 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.2
new file mode 100644
index 000000000000..09b14e739d2f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.2
@@ -0,0 +1,14 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+INHERIT=gnome.org readme.gentoo-r1 meson xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-42* media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme >=x11-wm/mutter-3.32[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/42/gnome-shell-extensions-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2523405f0125c5889002381b349729cd
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0 b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0
index 1c9423e12218..920448d4911e 100644
--- a/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install postinst
 DESCRIPTION=Unofficial extension pack providing GNOME 2-like features
 EAPI=8
 HOMEPAGE=http://frippery.org/extensions/index.html
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gui-libs/gtk:4[introspection] gnome-base/gnome-menus:3[introspection] =gnome-base/gnome-shell-41* media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
 SLOT=0
 SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-42.0.tgz
-_md5_=b7a4703fb5cadcb191306602c856f273
+_md5_=bcb46d3060b09e5b2ce382aa2f1972d4
diff --git a/metadata/md5-cache/gnome-extra/gnome-software-42.2 b/metadata/md5-cache/gnome-extra/gnome-software-42.2
new file mode 100644
index 000000000000..db69ad648a63
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-software-42.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/libxml2:2 dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+DESCRIPTION=Gnome install & update software
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Software
+INHERIT=gnome.org gnome2-utils meson virtualx xdg
+IUSE=flatpak +firmware gnome gtk-doc sysprof udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/appstream-0.14.0:0= >=x11-libs/gdk-pixbuf-2.32.0:2 >=dev-libs/libxmlb-0.1.7:= >=gui-libs/gtk-4.6:4 >=dev-libs/glib-2.66.0:2 >=dev-libs/json-glib-1.6.0 >=net-libs/libsoup-2.52.0:2.4 >=gui-libs/libadwaita-1.0.1:1 sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) gnome? ( >=gnome-base/gsettings-desktop-schemas-3.18.0 ) sys-auth/polkit firmware? ( >=sys-apps/fwupd-1.5.6 ) flatpak? ( >=sys-apps/flatpak-1.9.1 dev-util/ostree ) udev? ( dev-libs/libgudev ) >=gnome-base/gsettings-desktop-schemas-3.11.5
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/42/gnome-software-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=531dc3fa4709fa24c7ec339c64353908
diff --git a/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0 b/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
index 1537a0827586..a4f7bd59af7d 100644
--- a/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/stable/
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=systemd X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-cpp/glibmm-2.46:2 >=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/atkmm-2.28:0 >=gnome-base/libgtop-2.37.2:2= >=gui-libs/libhandy-1.5.0:1= >=gnome-base/librsvg-2.35:2 >=dev-libs/libxml2-2.0:2 X? ( >=x11-libs/libwnck-2.91.0:3 ) systemd? ( >=sys-apps/systemd-44:0= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-system-monitor/42/gnome-system-monitor-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7ff65816e2c0a71edb040d947f6bea57
+_md5_=919f27bea33c83df361a177fd0ac2313
diff --git a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10 b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
index 9b67ba6835e9..2a7dd5545ff8 100644
--- a/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
+++ b/metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Tweaks
 INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+ CC0-1.0
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.10.2:3[python_targets_python3_10(-)] ) >=gnome-base/gnome-settings-daemon-3 x11-themes/sound-theme-freedesktop >=dev-libs/glib-2.58:2 >=x11-libs/gtk+-3.12:3[introspection] >=gnome-base/gnome-desktop-3.30:3[introspection] gui-libs/libhandy:1[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gsettings-desktop-schemas-40.0 >=gnome-base/gnome-shell-3.24 x11-wm/mutter
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-tweaks/40/gnome-tweaks-40.10.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1324959bdc8d401dbac4fd0a09b51343
+_md5_=8960e5613e50fa7f9698a931cf9b531e
diff --git a/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0 b/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
index 26c4d7886493..ae4d303fa519 100644
--- a/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-user-docs
 INHERIT=gnome2
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=CC-BY-3.0
 RESTRICT=binchecks strip !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-user-docs/42/gnome-user-docs-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cae301cf07a44e7f924328d61513f7b9
+_md5_=06e8886ad60c582519c55cc79ad71f87
diff --git a/metadata/md5-cache/gnome-extra/gnome-weather-42.0 b/metadata/md5-cache/gnome-extra/gnome-weather-42.0
index c38b22b8a85e..8eda67cb5072 100644
--- a/metadata/md5-cache/gnome-extra/gnome-weather-42.0
+++ b/metadata/md5-cache/gnome-extra/gnome-weather-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=A weather application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
 INHERIT=gnome.org gnome2-utils meson xdg
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.56:= >=gui-libs/gtk-4.5:4 >=dev-libs/gjs-1.71.0 >=app-misc/geoclue-2.3.1:2.0 >=gui-libs/libadwaita-1.0.0:1= >=dev-libs/libgweather-3.90.0:4= gnome-base/gsettings-desktop-schemas
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-weather/42/gnome-weather-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=92af0e8e00d684139c1d5548bbf437a0
+_md5_=0b3bd067db52122ec63114fe98398bc3
diff --git a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3 b/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
index 81271c398c90..6125db8f0544 100644
--- a/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
+++ b/metadata/md5-cache/gnome-extra/gucharmap-14.0.3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap https://gitlab.gnome.org/GNOME/gucharmap/
 INHERIT=gnome2-utils meson python-any-r1 vala xdg
 IUSE=+introspection gtk-doc vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+
 RDEPEND=media-libs/freetype:2 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/libpcre2-10.21:= =app-i18n/unicode-data-14.0* >=x11-libs/pango-1.42.4-r2[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.90
 SRC_URI=https://gitlab.gnome.org/GNOME/gucharmap/-/archive/14.0.3/gucharmap-14.0.3.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=541df7ed9df49d1b1c0b6d5d8a5c209b
+_md5_=299393a9c231bc66346eab938fe9c532
diff --git a/metadata/md5-cache/gnome-extra/libgsf-1.14.49 b/metadata/md5-cache/gnome-extra/libgsf-1.14.49
index c44a1683124c..98475c62711b 100644
--- a/metadata/md5-cache/gnome-extra/libgsf-1.14.49
+++ b/metadata/md5-cache/gnome-extra/libgsf-1.14.49
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libgsf
 INHERIT=gnome2
 IUSE=bzip2 gtk +introspection test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
 RESTRICT=!test? ( test )
 SLOT=0/114
 SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.49.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3695f1dba02ab8a3ce55937147277f76
+_md5_=f4bc2a2e03869cd87523d518ba6c34b5
diff --git a/metadata/md5-cache/gnome-extra/nm-applet-1.26.0 b/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
index 18a04a421a37..7ce27f2b6f70 100644
--- a/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
+++ b/metadata/md5-cache/gnome-extra/nm-applet-1.26.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome.org meson xdg
 IUSE=appindicator modemmanager selinux teamd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.38:2 >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.8.27 >=x11-libs/gtk+-3.10:3 >=dev-libs/libgudev-147:= >=x11-libs/libnotify-0.7.0 >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?] appindicator? ( dev-libs/libappindicator:3 >=dev-libs/libdbusmenu-16.04.0 ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7:= ) virtual/freedesktop-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/network-manager-applet/1.26/network-manager-applet-1.26.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fd13dfc7748b312da477fd4f666f7a3e
+_md5_=f2bb48739ddfbca669e188237d058855
diff --git a/metadata/md5-cache/gnome-extra/pch-session-42.0 b/metadata/md5-cache/gnome-extra/pch-session-42.0
index e27f621ecf91..65f0d8a6ae32 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-42.0
+++ b/metadata/md5-cache/gnome-extra/pch-session-42.0
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.com/pachoramos/pch-session
 INHERIT=gnome2-utils
 IUSE=bluetooth qt5 webp
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=gnome-base/gnome-shell-42 >=gnome-extra/gnome-shell-extensions-42 >=gnome-extra/gnome-shell-extension-alphabetical-grid-23.0 >=gnome-extra/gnome-shell-extension-appindicator-42 >=gnome-extra/gnome-shell-extension-applications-overview-tooltip-15 >=gnome-extra/gnome-shell-extension-bing-wallpaper-40 >=gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323 >=gnome-extra/gnome-shell-extension-dash-to-panel-47 >=gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0 >=gnome-extra/gnome-shell-extension-gsconnect-50 >=gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1 >=gnome-extra/gnome-tweaks-40.10 gnome-extra/gnome-clocks gnome-extra/seahorse-nautilus >=media-fonts/fonts-meta-2 bluetooth? ( >=gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29 ) qt5? ( x11-themes/adwaita-qt ) webp? ( gui-libs/gdk-pixbuf-loader-webp )
 SLOT=0
 SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/42.0/pch-session-42.0.tar.bz2
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e3b6ed852d37df619fc288e57c787e8d
+_md5_=0f5d3d78dd054303a35fdda4b5492b57
diff --git a/metadata/md5-cache/gnome-extra/sushi-41.2 b/metadata/md5-cache/gnome-extra/sushi-41.2
index 4d5823a6f32c..f864bcdfdc2f 100644
--- a/metadata/md5-cache/gnome-extra/sushi-41.2
+++ b/metadata/md5-cache/gnome-extra/sushi-41.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/sushi
 INHERIT=gnome.org meson xdg
 IUSE=office wayland +X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/libepoxy >=app-text/evince-3.0[introspection] media-libs/freetype:2 >=x11-libs/gdk-pixbuf-2.23.0[introspection] >=dev-libs/glib-2.29.14:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[introspection,wayland?,X?] >=x11-libs/gtksourceview-4.0.3:4[introspection] >=media-libs/harfbuzz-0.9.9:= >=dev-libs/gobject-introspection-1.54:= >=net-libs/webkit-gtk-2.34:4[introspection] >=dev-libs/gjs-1.40 >=gnome-base/nautilus-3.1.90 media-plugins/gst-plugins-gtk:1.0[wayland?,X?] office? ( app-office/libreoffice )
 REQUIRED_USE=|| ( wayland X )
 SLOT=0
 SRC_URI=mirror://gnome/sources/sushi/41/sushi-41.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f9913508614657123e66855bfa82a620
+_md5_=7965e0c65554e4ae7e18476b6df7926a
diff --git a/metadata/md5-cache/gnome-extra/yelp-42.1 b/metadata/md5-cache/gnome-extra/yelp-42.1
index 58307c30ba9f..90970fbd5a66 100644
--- a/metadata/md5-cache/gnome-extra/yelp-42.1
+++ b/metadata/md5-cache/gnome-extra/yelp-42.1
@@ -5,10 +5,10 @@ DESCRIPTION=Help browser for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
 INHERIT=gnome2
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp/42/yelp-42.1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0352f99e01c2d37174ece687eb886ab4
+_md5_=05ee493d70abed269ab159d2422556e1
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0 b/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
index 030c9222b0c1..e799d34b7833 100644
--- a/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=XSL stylesheets for yelp
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/yelp-xsl
 INHERIT=gnome2
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
 RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
 SLOT=0
 SRC_URI=mirror://gnome/sources/yelp-xsl/42/yelp-xsl-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=616d44c1ad5533249fd731ff5aebfdf2
+_md5_=c6b7708d5bc32a3db0c1addaaf449e89
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.42.1 b/metadata/md5-cache/gnome-extra/zenity-3.42.1
index b5c9e696e116..c39ef8dbe5a9 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.42.1
+++ b/metadata/md5-cache/gnome-extra/zenity-3.42.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=libnotify webkit
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/gtk+-3.16.0:3[X] >=dev-libs/glib-2.43.4:2 libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) x11-libs/libX11 x11-libs/gdk-pixbuf:2 x11-libs/pango
 SLOT=0
 SRC_URI=mirror://gnome/sources/zenity/3.42/zenity-3.42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a713bedc64b9b64ad2c2ab90fd10875b
+_md5_=770cafdb14d943098277c00f194253da
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index 94b4d9de6ced..f8532cfa8ba6 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/amtk-5.4.1 b/metadata/md5-cache/gui-libs/amtk-5.4.1
new file mode 100644
index 000000000000..c0af233ae4dd
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/amtk-5.4.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+DESCRIPTION=Actions, Menus and Toolbars Kit for GTK+ applications
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Projects/Amtk https://gitlab.gnome.org/swilmet/amtk
+INHERIT=gnome2 meson
+IUSE=+introspection gtk-doc
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+SLOT=5
+SRC_URI=mirror://gnome/sources/amtk/5.4/amtk-5.4.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d582d072f91938b7abda75e357424fe7
diff --git a/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4 b/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
index a995920ee9da..b349522462e4 100644
--- a/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
+++ b/metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/aruiz/webp-pixbuf-loader
 INHERIT=gnome2-utils meson-multilib
 IUSE=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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2+
 RDEPEND=>x11-libs/gdk-pixbuf-2.22.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >media-libs/libwebp-0.4.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://github.com/aruiz/webp-pixbuf-loader/archive/0.0.4.tar.gz -> gdk-pixbuf-loader-webp-0.0.4.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ca1f4c03ab51678d941d203bad18c06d
+_md5_=0f03c26d52d214b4d60c3013f63a75df
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.1 b/metadata/md5-cache/gui-libs/gtk-4.6.1
deleted file mode 100644
index dec06d36c915..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.6.1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=7
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-INHERIT=gnome.org gnome2-utils meson optfeature virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e2ac083f94568c19745c0e41234a6681
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.2 b/metadata/md5-cache/gui-libs/gtk-4.6.2
deleted file mode 100644
index 6390ff60c661..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.6.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=7
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.2.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=88974e6af473f882aaf1c0becfd1a5c4
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.3 b/metadata/md5-cache/gui-libs/gtk-4.6.3
deleted file mode 100644
index 4dee865b052e..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.6.3
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=7
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5742c6a9a642917fafa25c94afc004d
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.4 b/metadata/md5-cache/gui-libs/gtk-4.6.4
deleted file mode 100644
index 82800af2d214..000000000000
--- a/metadata/md5-cache/gui-libs/gtk-4.6.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
-EAPI=8
-HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
-INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
-IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=LGPL-2+
-PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
-RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
-REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
-RESTRICT=!test? ( test )
-SLOT=4
-SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.4.tar.xz
-_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5c92a5ee53e8ce1a633e646d422e84a2
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.4-r1 b/metadata/md5-cache/gui-libs/gtk-4.6.4-r1
index 3d805ce83cdd..cb6109719197 100644
--- a/metadata/md5-cache/gui-libs/gtk-4.6.4-r1
+++ b/metadata/md5-cache/gui-libs/gtk-4.6.4-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
 INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
 IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
 RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fcc1a871a9ad1168788f7345e808c381
+_md5_=af6d3c8040e0aedc36474782ec31535a
diff --git a/metadata/md5-cache/gui-libs/gtk-4.6.5 b/metadata/md5-cache/gui-libs/gtk-4.6.5
new file mode 100644
index 000000000000..f239ceee61f3
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/gtk-4.6.5
@@ -0,0 +1,18 @@
+BDEPEND=dev-libs/gobject-introspection-common introspection? ( || ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/pygobject:3[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pygobject:3[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pygobject:3[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pygobject:3[python_targets_python3_8(-)] ) ) ) dev-python/docutils >=dev-util/gdbus-codegen-2.48 dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig test? ( dev-libs/glib:2 wayland? ( dev-libs/weston[headless] ) ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=GTK is a multi-platform toolkit for creating graphical user interfaces
+EAPI=8
+HOMEPAGE=https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/
+INHERIT=gnome.org gnome2-utils meson optfeature python-any-r1 virtualx xdg
+IUSE=aqua broadway colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+
+PDEPEND=gnome-base/librsvg >=x11-themes/adwaita-icon-theme-3.14
+RDEPEND=>=dev-libs/fribidi-0.19.7 >=dev-libs/glib-2.66.0:2 >=media-libs/graphene-1.9.1[introspection?] >=media-libs/libepoxy-1.4[egl,X(+)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?] >=x11-libs/pango-1.50.0[introspection?] media-libs/libpng:0= media-libs/tiff:0= media-libs/libjpeg-turbo:0= >=media-libs/harfbuzz-2.1.0:= x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9:0= ) cups? ( >=net-print/cups-2.0 ) ffmpeg? ( media-video/ffmpeg ) gstreamer? ( >=media-libs/gst-plugins-bad-1.12.3 >=media-libs/gst-plugins-base-1.12.3[opengl] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) vulkan? ( media-libs/vulkan-loader:= ) wayland? ( >=dev-libs/wayland-1.20.0 >=dev-libs/wayland-protocols-1.23 media-libs/mesa[wayland] >=x11-libs/libxkbcommon-0.2 ) X? ( >=app-accessibility/at-spi2-atk-2.5.3 media-libs/fontconfig media-libs/mesa[X(+)] x11-libs/libX11 >=x11-libs/libXi-1.8 x11-libs/libXext >=x11-libs/libXrandr-1.5 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXinerama ) >=dev-util/gtk-update-icon-cache-3
+REQUIRED_USE=|| ( aqua wayland X ) test? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=4
+SRC_URI=mirror://gnome/sources/gtk/4.6/gtk-4.6.5.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4dfb3efcfefc8b0242a7facf9e1ca62c
diff --git a/metadata/md5-cache/gui-libs/gtksourceview-5.4.1 b/metadata/md5-cache/gui-libs/gtksourceview-5.4.1
index 9b5d86f1e023..6d989dc539c3 100644
--- a/metadata/md5-cache/gui-libs/gtksourceview-5.4.1
+++ b/metadata/md5-cache/gui-libs/gtksourceview-5.4.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 INHERIT=gnome.org meson vala virtualx xdg
 IUSE=gtk-doc +introspection sysprof +vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.70:2 >=gui-libs/gtk-4.5:4[introspection?] >=dev-libs/libxml2-2.6:2 introspection? ( >=dev-libs/gobject-introspection-1.70.0:= ) >=dev-libs/fribidi-0.19.7 media-libs/fontconfig x11-libs/pango[introspection?] >=dev-libs/libpcre2-10.21:=[-recursion-limit(-)] sysprof? ( dev-util/sysprof-capture:4 )
 REQUIRED_USE=gtk-doc? ( introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://gnome/sources/gtksourceview/5.4/gtksourceview-5.4.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d15bba6963994685ac69506b17cc3f82
+_md5_=c943abc1052aa96910368f60b7330b12
diff --git a/metadata/md5-cache/gui-libs/libadwaita-1.1.1 b/metadata/md5-cache/gui-libs/libadwaita-1.1.1
index 0de94afd80a8..00d042cffd85 100644
--- a/metadata/md5-cache/gui-libs/libadwaita-1.1.1
+++ b/metadata/md5-cache/gui-libs/libadwaita-1.1.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gnome.pages.gitlab.gnome.org/libadwaita/ https://gitlab.gnome.org/GNOME/libadwaita
 INHERIT=gnome.org meson python-any-r1 vala virtualx
 IUSE=+introspection test +vala test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.66:2 >=gui-libs/gtk-4.5.0:4[introspection?] dev-libs/fribidi introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libadwaita/1.1/libadwaita-1.1.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=5b4d8815bd86f46339171681a9d15cba
+_md5_=5e093c5d11ace7102a2ee9a225f13091
diff --git a/metadata/md5-cache/gui-libs/libhandy-1.6.2 b/metadata/md5-cache/gui-libs/libhandy-1.6.2
index 973bc55259b0..11ec4b1b1296 100644
--- a/metadata/md5-cache/gui-libs/libhandy-1.6.2
+++ b/metadata/md5-cache/gui-libs/libhandy-1.6.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libhandy/
 INHERIT=gnome.org meson xdg vala virtualx
 IUSE=examples glade gtk-doc +introspection test +vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.24.1:3[introspection?] glade? ( dev-util/glade:3.10= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 REQUIRED_USE=vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1
 SRC_URI=mirror://gnome/sources/libhandy/1.6/libhandy-1.6.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3c87d4797108946fd2d46e60c73ad32c
+_md5_=1aa2a9c1b16aa03ff5e37b64e28c4333
diff --git a/metadata/md5-cache/gui-libs/tepl-6.0.2 b/metadata/md5-cache/gui-libs/tepl-6.0.2
new file mode 100644
index 000000000000..8cd4f9261593
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/tepl-6.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.25 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.6 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/glib-2.62:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-4.0:4[introspection?] >=gui-libs/amtk-5.0:5[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+DESCRIPTION=GtkSourceView-based text editors and IDE helper library
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/swilmet/tepl
+INHERIT=gnome.org meson virtualx
+IUSE=+introspection gtk-doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=dev-libs/glib-2.62:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-4.0:4[introspection?] >=gui-libs/amtk-5.0:5[introspection?] dev-libs/icu:= introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=6
+SRC_URI=mirror://gnome/sources/tepl/6.0/tepl-6.0.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
+_md5_=392602926c2982157dcc22502925d9e3
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 28a9f7e8e706..aa28643cc2f6 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
similarity index 98%
rename from metadata/md5-cache/kde-frameworks/knewstuff-5.94.0
rename to metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
index 6bd078f7e761..c74550c68039 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
@@ -12,4 +12,4 @@ RDEPEND=>=dev-qt/qtdeclarative-5.15.3:5 >=dev-qt/qtgui-5.15.3:5 >=dev-qt/qtnetwo
 SLOT=5/5.94
 SRC_URI=mirror://kde/stable/frameworks/5.94/knewstuff-5.94.0.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98716bc6bf18e85fbc9ba3357cbf44a4
+_md5_=fd8307df58357e583bdd73662e67fff1
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 30e873cd1e47..cb283eb10ba5 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.24.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.24.4
deleted file mode 100644
index 9bcbcaa27bee..000000000000
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=Bluetooth stack for KDE Plasma
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/bluedevil
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0b3af905449cf084509847a9b7ce30fe
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.24.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.24.5
index 2e443b6bb498..37a5a9c70659 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.24.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/bluedevil
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/bluedevil-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=299d8e53d70c633a551d64c0f47c50e1
+_md5_=0b3af905449cf084509847a9b7ce30fe
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.24.4 b/metadata/md5-cache/kde-plasma/breeze-5.24.4
deleted file mode 100644
index 23c1cb62e365..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 X? ( x11-libs/libxcb ) dev-qt/qtcore:5
-DESCRIPTION=Breeze visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze
-INHERIT=ecm kde.org
-IUSE=X debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/breeze-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f826f84af720eeb35090c4709021a67b
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.24.5 b/metadata/md5-cache/kde-plasma/breeze-5.24.5
index 4c830e592f06..fd6d92a82463 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.24.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/breeze
 INHERIT=ecm kde.org
 IUSE=X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-frameworks/breeze-icons-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.5:5 X? ( x11-libs/libxcb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/breeze-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a19b3d85831956f8511b8db932583f4d
+_md5_=f826f84af720eeb35090c4709021a67b
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.24.4 b/metadata/md5-cache/kde-plasma/breeze-grub-5.24.4
deleted file mode 100644
index 6f32d944830c..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.24.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch prepare unpack
-DESCRIPTION=Breeze theme for GRUB
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=kde.org
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-3+
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz
-_eclasses_=kde.org	916c61efa7151f09c7701328b88cafc1
-_md5_=86a1a2dcc5c2ad2e6f3e7999614ee1fb
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.24.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.24.5
index 6331c7ed7676..74d789f4b345 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.24.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.24.5
@@ -3,9 +3,9 @@ DESCRIPTION=Breeze theme for GRUB
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/breeze-grub-5.24.5.tar.xz
 _eclasses_=kde.org	916c61efa7151f09c7701328b88cafc1
-_md5_=bac7fc1ec788f5e9e86adc06cf0f3f14
+_md5_=509f84b9eea6038f9acf3da62b3f8924
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.4
deleted file mode 100644
index 87205987c813..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/sassc || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/pycairo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/pycairo[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/pycairo[python_targets_python3_8(-)] ) ) >=kde-plasma/breeze-5.24.4:5 dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.82.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-qt/qtcore:5
-DESCRIPTION=Official GTK+ port of Plasma's Breeze widget style
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
-INHERIT=ecm kde.org python-any-r1
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1+
-RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c1d9dedf3ffddd9e83e4c85454668674
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
index 4a2abb03ae70..b8065c1462b3 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/breeze-gtk
 INHERIT=ecm kde.org python-any-r1
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/breeze-gtk-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=02d0f724ee67355eb292d5c94b8bf7f7
+_md5_=c1d9dedf3ffddd9e83e4c85454668674
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.4 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.4
deleted file mode 100644
index 98aba569a7c9..000000000000
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=kde-frameworks/extra-cmake-modules-5.90.0:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=sys-boot/plymouth
-DESCRIPTION=Breeze theme for Plymouth
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=cmake kde.org
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+ GPL-3+
-RDEPEND=sys-boot/plymouth
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0c0ed339a6b6080a3760161636bfd286
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5
index 02b6d22c1ca0..4be9c82f5d8c 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5
@@ -5,10 +5,10 @@ DESCRIPTION=Breeze theme for Plymouth
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=cmake kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/breeze-plymouth-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d018c1e16a193f848bf4cfd91a962d3e
+_md5_=0c0ed339a6b6080a3760161636bfd286
diff --git a/metadata/md5-cache/kde-plasma/discover-5.24.4 b/metadata/md5-cache/kde-plasma/discover-5.24.4
deleted file mode 100644
index 5c981c26f900..000000000000
--- a/metadata/md5-cache/kde-plasma/discover-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma resources management GUI
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/Discover
-INHERIT=ecm kde.org
-IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/discover-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dcad4a334d4643eb58ea1ce6458f5ff4
diff --git a/metadata/md5-cache/kde-plasma/discover-5.24.5 b/metadata/md5-cache/kde-plasma/discover-5.24.5
index ec2f04f7496a..0c2db48d00b6 100644
--- a/metadata/md5-cache/kde-plasma/discover-5.24.5
+++ b/metadata/md5-cache/kde-plasma/discover-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://userbase.kde.org/Discover
 INHERIT=ecm kde.org
 IUSE=+firmware flatpak telemetry test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) flatpak? ( >=dev-libs/appstream-0.14.4:= sys-apps/flatpak ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/discover-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c6145a0bd3253ac017ac6a06995fec0f
+_md5_=dcad4a334d4643eb58ea1ce6458f5ff4
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.24.4 b/metadata/md5-cache/kde-plasma/drkonqi-5.24.4
deleted file mode 100644
index 5c09f9c8a46e..000000000000
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/syntax-highlighting-5.90.0:5 >=dev-qt/qtconcurrent-5.15.2:5 dev-qt/qtcore:5
-DESCRIPTION=Plasma crash handler, gives the user feedback if a program crashed
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/syntax-highlighting-5.90.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8cb4c8272e00ceaa32050687d644bd5b
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.24.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.24.5
index 6de8a44842d5..325054efaa11 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.24.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/syntax-highlighting-5.90.0:5 || ( sys-devel/gdb dev-util/lldb ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/drkonqi-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f0dff76bb6e1ba77002fa08deb65e988
+_md5_=8cb4c8272e00ceaa32050687d644bd5b
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.4 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.4
deleted file mode 100644
index 1b290539f8ca..000000000000
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 dev-libs/boost dev-qt/qtcore:5
-DESCRIPTION=System service to manage user's activities, track the usage patterns etc.
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=848cb68377bfc1677b68af822d2e7c14
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5
index f8274780afaa..ddf8407a5015 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsql-5.15.2:5[sqlite] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kactivitymanagerd-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=91216a7a50112bfa30d0ec75e9e5244a
+_md5_=848cb68377bfc1677b68af822d2e7c14
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.4
deleted file mode 100644
index 4bd136b8897f..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 kdesu? ( >=kde-frameworks/kdesu-5.90.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
-INHERIT=ecm kde.org
-IUSE=kdesu X test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 kdesu? ( >=kde-frameworks/kdesu-5.90.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=kdesu? ( X )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4ae46a7e29b3d4f61d26fedb39971d76
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5
index 215e9cbe2939..af47f0ca95f0 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kde-cli-tools
 INHERIT=ecm kde.org
 IUSE=kdesu X test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/libkworkspace-5.24.5:5 kdesu? ( >=kde-frameworks/kdesu-5.90.0:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 ) kdesu? ( sys-apps/dbus[X] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=kdesu? ( X )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kde-cli-tools-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fc364b325edc5018df60fa62763af7ce
+_md5_=4ae46a7e29b3d4f61d26fedb39971d76
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.4 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.4
deleted file mode 100644
index 85637fe5d188..000000000000
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/sassc dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 x11-libs/gtk+:3 dev-qt/qtcore:5
-DESCRIPTION=Syncs KDE Plasma theme settings to GTK applications
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
-INHERIT=ecm kde.org
-IUSE=test debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3
-RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.24.4:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=15a150176fd40c873b39ed245565c9b5
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5
index e4f8dd729a36..f51b45cbafc0 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kde-gtk-config
 INHERIT=ecm kde.org
 IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 gnome-base/gsettings-desktop-schemas >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-plasma/kdecoration-5.24.5:5 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.24.5:5 x11-misc/xsettingsd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kde-gtk-config-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=15a553d7a43e335cbef9ec4046567f73
+_md5_=15a150176fd40c873b39ed245565c9b5
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.24.4 b/metadata/md5-cache/kde-plasma/kdecoration-5.24.4
deleted file mode 100644
index 966a8c4e46f0..000000000000
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin based library to create window decorations
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f2fe253e0a666ea72ba29386c99e0654
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.24.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.24.5
index 649e73bdfd65..a28078ad2907 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kdecoration-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=806c3e1e612c8e78c4f5025d162cf544
+_md5_=f2fe253e0a666ea72ba29386c99e0654
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.4-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.4-r1
deleted file mode 100644
index 015df5632d19..000000000000
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kholidays-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 share? ( >=kde-frameworks/purpose-5.90.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) dev-qt/qtcore:5
-DESCRIPTION=Extra Plasma applets and engines
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org optfeature
-IUSE=share webengine test debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kholidays-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 share? ( >=kde-frameworks/purpose-5.90.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=092451e3113ed32e530428e12b1c3eb6
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1
index 80b473f3b4be..eddae179f754 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org optfeature
 IUSE=share webengine test debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kholidays-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 share? ( >=kde-frameworks/purpose-5.90.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.15.2:5 ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-plasma/plasma-workspace-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kdeplasma-addons-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e01f6c68b49eb44da71dbc24b61e6c88
+_md5_=6e17836cd9380d9ffcb613796af2fcd4
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.24.4 b/metadata/md5-cache/kde-plasma/kgamma-5.24.4
deleted file mode 100644
index e31189f7690c..000000000000
--- a/metadata/md5-cache/kde-plasma/kgamma-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto dev-qt/qtcore:5
-DESCRIPTION=Screen gamma values kcontrol module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2e08160361064041e892efe8fb3b1df0
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.24.5 b/metadata/md5-cache/kde-plasma/kgamma-5.24.5
index cddddd12d97b..1ec93f9256e6 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 x11-libs/libX11 x11-libs/libXxf86vm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kgamma5-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d050210bed8fc480fe557fd4fc4d3c4e
+_md5_=2e08160361064041e892efe8fb3b1df0
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.24.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.24.4
deleted file mode 100644
index 659bca0368cc..000000000000
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5[X] >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace hotkey module
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5[X] >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9bb1bc32be2a9ceb7e586f87c4b4b1de
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.24.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.24.5
index 17c781ac0e33..85ee172e56d8 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.24.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5[X] >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.5:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/khotkeys-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98d501d7312b39e38ce2dbc3df268171
+_md5_=9bb1bc32be2a9ceb7e586f87c4b4b1de
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.24.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.24.4
deleted file mode 100644
index 06f4a53fa99f..000000000000
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) dev-qt/qtcore:5
-DESCRIPTION=Utility providing information about the computer hardware
-EAPI=8
-HOMEPAGE=https://userbase.kde.org/KInfoCenter
-INHERIT=ecm kde.org optfeature
-IUSE=gles2-only usb debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5 >=kde-plasma/systemsettings-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bd1d9a179f3e63049b4e5872f147f6c8
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.24.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.24.5
index b804c4e1ce9c..dd82377ece0e 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://userbase.kde.org/KInfoCenter
 INHERIT=ecm kde.org optfeature
 IUSE=gles2-only usb debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[gles2-only=] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5 >=kde-plasma/systemsettings-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kinfocenter-5.24.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f570033644ba38299bf4f1b9c6dbe92
+_md5_=bd1d9a179f3e63049b4e5872f147f6c8
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.24.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.24.4
deleted file mode 100644
index 610a3f285802..000000000000
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma menu editor
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f308fe0e4dcf9f639c88eef1b513bfd3
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.24.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.24.5
index 344729766b3c..06c8965bdf5d 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kmenuedit
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kmenuedit-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=71ee98063ee1f68603091d94f78b9885
+_md5_=f308fe0e4dcf9f639c88eef1b513bfd3
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1 b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1
index 3dc292d52122..af6b9656b0ec 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.5:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1bb04af3918b64ef0fd263e42bf18130
+_md5_=709f97e86eda42e10599e4944c315f55
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.24.4 b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
similarity index 86%
rename from metadata/md5-cache/kde-plasma/kscreen-5.24.4
rename to metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
index 8efdd6180f4a..a00385ff47d3 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.24.4
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
 DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.4:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
+DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.5:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
 DESCRIPTION=KDE Plasma screen management
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kscreen
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.4:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
+RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtsensors-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/libkscreen-5.24.5:5 >=dev-qt/qtgraphicaleffects-5.15.2:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.24.5/kscreen-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1324cd1455328d04e3259df4478de81a
+_md5_=f225a4066d6124a5751c0dcac7e5a34a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.4
deleted file mode 100644
index 2ff1250fc25c..000000000000
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/layer-shell-qt-5.24.4:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Library and components for secure lock screen architecture
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org pam
-IUSE=+pam test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.24.4:5
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/layer-shell-qt-5.24.4:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=07c7bd033c70f6e5466b892616996a9a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5
index 7c3f493f3ee5..0866aba4a133 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org pam
 IUSE=+pam test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.5:5
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/layer-shell-qt-5.24.5:5 x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( sys-libs/pam ) >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kscreenlocker-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c4fe728d2a39e9557c40d76b376a2afa
+_md5_=07c7bd033c70f6e5466b892616996a9a
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.4 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.4
deleted file mode 100644
index e73f1609f01b..000000000000
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=Implementation of ssh-askpass with KDE Wallet integration
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2ebd80f63a3bdd3f4003556a02a6c9af
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5
index 1bb6d04c5397..791d7bf2a98d 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop https://invent.kde.org/plasma/ksshaskpass
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/ksshaskpass-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=46d7b0387fee067528d43a23e6960d3a
+_md5_=2ebd80f63a3bdd3f4003556a02a6c9af
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.24.4 b/metadata/md5-cache/kde-plasma/ksystemstats-5.24.4
deleted file mode 100644
index 4a7bd0195f2c..000000000000
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plugin-based system monitoring daemon
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=networkmanager test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3ecf66e2f260deed9339655e51d567dc
diff --git a/metadata/md5-cache/kde-plasma/ksystemstats-5.24.5 b/metadata/md5-cache/kde-plasma/ksystemstats-5.24.5
index 7585fb04bebc..709ae515c910 100644
--- a/metadata/md5-cache/kde-plasma/ksystemstats-5.24.5
+++ b/metadata/md5-cache/kde-plasma/ksystemstats-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=networkmanager test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libksysguard-5.24.5:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) !<kde-plasma/ksysguard-5.21.90:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/ksystemstats-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=be5168175e91c266033611fbacc665bb
+_md5_=3ecf66e2f260deed9339655e51d567dc
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.4 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.4
deleted file mode 100644
index e42ed6f979b0..000000000000
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.90.0:5 sys-libs/pam dev-qt/qtcore:5
-DESCRIPTION=PAM module to not enter KWallet password again after login
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.90.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e9f748d50dca34a8eb9a3141a2bbc0cd
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5
index 92ca2395f0b7..1046b8da34c4 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt:0= >=kde-frameworks/kwallet-5.90.0:5 sys-libs/pam net-misc/socat || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kwallet-pam-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=08fad2ce72842170841c6471e5d9793d
+_md5_=e9f748d50dca34a8eb9a3141a2bbc0cd
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.4 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.4
deleted file mode 100644
index 2f9430c4fbca..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.2:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5= x11-libs/libxkbcommon test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Provides integration plugins for various KDE frameworks for Wayland
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7d6406bf02a9b59ed9a9151f8b614606
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5
index 8348d0444b51..be16ee42cb8b 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-integration
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.15 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kwayland-integration-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a6c05647401c2a57fa5725d88cfa3da2
+_md5_=7d6406bf02a9b59ed9a9151f8b614606
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.24.4-r2 b/metadata/md5-cache/kde-plasma/kwayland-server-5.24.4-r2
deleted file mode 100644
index 37eea444fd3e..000000000000
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.24.4-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.2:5 dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.90.0:5 media-libs/libglvnd >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-libs/wayland-protocols-1.24 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Wayland Server Components built on KDE Frameworks
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
-INHERIT=ecm kde.org
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.90.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c5621c9eb8a3ac2f62e1c1236bf8b37b
diff --git a/metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1 b/metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1
index 78df05afe293..95ee10749c43 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/kwayland-server
 INHERIT=ecm kde.org
 IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/wayland-1.19.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtgui-5.15.2:5[egl] >=dev-qt/qtwayland-5.15.2:5 >=kde-frameworks/kwayland-5.90.0:5 media-libs/libglvnd || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kwayland-server-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=adda4cc4f4415c0b96f8c886c7c2ed2a
+_md5_=1274b7fba4f5ff53677f5bfafec3c3a3
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.24.4-r1 b/metadata/md5-cache/kde-plasma/kwin-5.24.4-r1
deleted file mode 100644
index 8d654ca60523..000000000000
--- a/metadata/md5-cache/kde-plasma/kwin-5.24.4-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( >=dev-qt/qtwaylandscanner-5.15.2:5 ) dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5= >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5=[X] >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 >=kde-plasma/kdecoration-5.24.4:5 >=kde-plasma/kscreenlocker-5.24.4:5 >=kde-plasma/kwayland-server-5.24.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.90.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/designer-5.15.2:5 >=dev-qt/qtconcurrent-5.15.2:5 x11-base/xorg-proto test? ( dev-libs/plasma-wayland-protocols >=dev-libs/wayland-protocols-1.19 ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Flexible, composited Window Manager for windowing systems on Linux
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org optfeature
-IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.24.4:5
-RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5= >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5=[X] >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 >=kde-plasma/kdecoration-5.24.4:5 >=kde-plasma/kscreenlocker-5.24.4:5 >=kde-plasma/kwayland-server-5.24.4:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.90.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kwin-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6bb2ce11607db12109d25e80e79a0fb1
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.24.5-r2 b/metadata/md5-cache/kde-plasma/kwin-5.24.5-r2
index e2fb2b9deabd..a894c1c73d36 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.24.5-r2
+++ b/metadata/md5-cache/kde-plasma/kwin-5.24.5-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org optfeature
 IUSE=accessibility caps gles2-only multimedia plasma screencast test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.5:5
 RDEPEND=>=dev-libs/libinput-1.19 >=dev-libs/wayland-1.2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[gles2-only=,libinput] >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5= >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5= >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5=[X] >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-plasma/breeze-5.24.5:5 >=kde-plasma/kdecoration-5.24.5:5 >=kde-plasma/kscreenlocker-5.24.5:5 >=kde-plasma/kwayland-server-5.24.5:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) plasma? ( >=kde-frameworks/krunner-5.90.0:5 ) screencast? ( >=media-video/pipewire-0.3:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtvirtualkeyboard-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] sys-apps/hwdata x11-base/xwayland multimedia? ( >=dev-qt/qtmultimedia-5.15.2:5[gstreamer,qml] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kwin-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e4f8bc77795317e0beb206b4044b0f92
+_md5_=2cbf8cef8349b0ba812ef73ac6b9fd15
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.24.4 b/metadata/md5-cache/kde-plasma/kwrited-5.24.4
deleted file mode 100644
index 71d35c7c89ff..000000000000
--- a/metadata/md5-cache/kde-plasma/kwrited-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpty-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma daemon listening for wall and write messages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpty-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c7c9c941144c036c85a7a8448ead8b59
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.24.5 b/metadata/md5-cache/kde-plasma/kwrited-5.24.5
index 3e2331316070..5df994da7871 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.24.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpty-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/kwrited-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=48781428afa3f6a2c92a68e98be51c2b
+_md5_=c7c9c941144c036c85a7a8448ead8b59
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.4 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.4
deleted file mode 100644
index 067c54b644f5..000000000000
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.2:5 dev-util/wayland-scanner virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon dev-libs/wayland-protocols dev-qt/qtcore:5
-DESCRIPTION=Qt component to allow applications make use of Wayland wl-layer-shell protocol
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d1cd6bb9459a0c9cc8c542c83a27de7f
diff --git a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5 b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5
index 1e9d3f024c86..9f1982b52fce 100644
--- a/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5
+++ b/metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-3+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdeclarative-5.15.2:5 || ( >=dev-qt/qtgui-5.15.2:5[libinput] >=dev-qt/qtgui-5.15.2:5[X] ) >=dev-qt/qtwayland-5.15.2:5= x11-libs/libxkbcommon || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/layer-shell-qt-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bdd4e803c2ed405bb20a172788d5de3c
+_md5_=d1cd6bb9459a0c9cc8c542c83a27de7f
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.24.4 b/metadata/md5-cache/kde-plasma/libkscreen-5.24.4
deleted file mode 100644
index 7091ab3f5198..000000000000
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.2:5 dev-util/wayland-scanner dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) doc? ( >=app-doc/doxygen-1.8.13-r1 dev-qt/qthelp:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 x11-libs/libxcb >=dev-libs/plasma-wayland-protocols-1.6.0 test? ( dev-qt/qttest:5 ) doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma screen management library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=test debug doc test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7424e76c0fa5cd83983627a5e8ee65b4
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.24.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.24.5
index 4cdefc12e8e8..dd199a1fcb32 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.24.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/wayland >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 x11-libs/libxcb || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 doc? ( dev-qt/qt-docs:5 ) dev-qt/qtcore:5
 RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.24.5/libkscreen-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4d67417b2ff4c5726939e29ee10e7bf3
+_md5_=ee6b28f28dd4c6dd30600079879533c1
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.24.4 b/metadata/md5-cache/kde-plasma/libksysguard-5.24.4
deleted file mode 100644
index af34cde6723d..000000000000
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) designer? ( dev-qt/designer:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.90.0:5 X? ( x11-base/xorg-proto ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Task management and system monitoring library
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=webengine X test debug designer test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5/9
-SRC_URI=mirror://kde/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d87b8fac56cb85ac6fbe38aef160bef0
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1 b/metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1
index 03cc0b66a889..9d2d632df6bc 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=webengine X test debug designer test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=dev-libs/libnl:3 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.15.2:5 >=dev-qt/qtwebengine-5.15.2:5 ) X? ( >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libX11 x11-libs/libXres ) !<kde-plasma/ksysguard-5.21.90:5 !<kde-plasma/plasma-workspace-5.18.80:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5/9
 SRC_URI=mirror://kde/stable/plasma/5.24.5/libksysguard-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7e3c2f9c566885aba59fb4e9a4533a7d
+_md5_=a3682db80c596c91419b8700193e6fd2
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.24.4 b/metadata/md5-cache/kde-plasma/libkworkspace-5.24.4
deleted file mode 100644
index 8fd249cd7c76..000000000000
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kscreenlocker-5.24.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau >=kde-frameworks/kinit-5.90.0:5 >=kde-plasma/kwin-5.24.4:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Workspace library to interact with the Plasma session manager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kscreenlocker-5.24.4:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=45d430422f9d03b04245664b72bd5551
diff --git a/metadata/md5-cache/kde-plasma/libkworkspace-5.24.5 b/metadata/md5-cache/kde-plasma/libkworkspace-5.24.5
index 92210ed8e94c..c735f253dcb0 100644
--- a/metadata/md5-cache/kde-plasma/libkworkspace-5.24.5
+++ b/metadata/md5-cache/kde-plasma/libkworkspace-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kscreenlocker-5.24.5:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=679a2bd59a459e2a7eb036cee154d936
+_md5_=45d430422f9d03b04245664b72bd5551
diff --git a/metadata/md5-cache/kde-plasma/milou-5.24.4 b/metadata/md5-cache/kde-plasma/milou-5.24.4
deleted file mode 100644
index 48b8553e48b0..000000000000
--- a/metadata/md5-cache/kde-plasma/milou-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Dedicated search application built on top of Baloo
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/milou
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/milou-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74fe76b75b914531c8faa4e2327f0ad3
diff --git a/metadata/md5-cache/kde-plasma/milou-5.24.5 b/metadata/md5-cache/kde-plasma/milou-5.24.5
index b6b617359115..b66b28c5ba28 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.24.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/milou
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/milou-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=861e8eb810a5bd05c0b8e4c9e059d047
+_md5_=74fe76b75b914531c8faa4e2327f0ad3
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.24.4 b/metadata/md5-cache/kde-plasma/oxygen-5.24.4
deleted file mode 100644
index b59199be6f1a..000000000000
--- a/metadata/md5-cache/kde-plasma/oxygen-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.90.0:5 ) >=kde-frameworks/kservice-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=Oxygen visual style for the Plasma desktop
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/oxygen
-INHERIT=ecm kde.org
-IUSE=wayland debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.24.4:5
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.4:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.90.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6f6038416db20542d0e30f0666c27050
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.24.5 b/metadata/md5-cache/kde-plasma/oxygen-5.24.5
index 277f534cdf7b..2ba3fcacc511 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.24.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/oxygen
 INHERIT=ecm kde.org
 IUSE=wayland debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.5:5
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/frameworkintegration-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-plasma/kdecoration-5.24.5:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.90.0:5 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/oxygen-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=039b5a28bb2fe1b8d1597a8263965703
+_md5_=6f6038416db20542d0e30f0666c27050
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.4-r1 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.4-r1
deleted file mode 100644
index e6a36891b851..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.4-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kfilemetadata-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/purpose-5.90.0:5 >=kde-plasma/plasma-workspace-5.24.4:5 dev-qt/qtcore:5
-DESCRIPTION=Integrate Chrome/Firefox better into Plasma through browser extensions
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-3+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kfilemetadata-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/purpose-5.90.0:5 >=kde-plasma/plasma-workspace-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=17da28be69772781b20bcf1db38167d6
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5
index 26be8adbf52e..1b85e6f81a8d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop https://community.kde.org/Plasma/Browser_Integration
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kfilemetadata-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/purpose-5.90.0:5 >=kde-plasma/plasma-workspace-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-browser-integration-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=467490542fcbe4e9a2cfc5e84b7daea8
+_md5_=17da28be69772781b20bcf1db38167d6
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.4-r1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.4-r1
deleted file mode 100644
index d8de1e84603f..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.4-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kparts-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 >=kde-plasma/kwin-5.24.4:5 >=kde-plasma/libksysguard-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 >=kde-plasma/plasma-workspace-5.24.4:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) dev-libs/boost x11-base/xorg-proto test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org optfeature
-IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kparts-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 >=kde-plasma/kwin-5.24.4:5 >=kde-plasma/libksysguard-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 >=kde-plasma/plasma-workspace-5.24.4:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/qqc2-desktop-style-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5 >=kde-plasma/oxygen-5.24.4:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=27c1cb2ca85472ab30aae29a247f51fd
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5
index 6ce90baba9a2..cb960b4a246a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org optfeature
 IUSE=emoji ibus +kaccounts scim +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtconcurrent-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/attica-5.90.0:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kdelibs4support-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kparts-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-frameworks/sonnet-5.90.0:5 >=kde-plasma/kwin-5.24.5:5 >=kde-plasma/libksysguard-5.24.5:5 >=kde-plasma/libkworkspace-5.24.5:5 >=kde-plasma/plasma-workspace-5.24.5:5 >=media-libs/phonon-4.11.0 x11-libs/libX11 x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb[xkb] x11-libs/libxkbfile emoji? ( app-i18n/ibus[emoji] dev-libs/glib:2 media-fonts/noto-emoji ) ibus? ( app-i18n/ibus dev-libs/glib:2 >=dev-qt/qtx11extras-5.15.2:5 x11-libs/libxcb x11-libs/xcb-util-keysyms ) kaccounts? ( kde-apps/kaccounts-integration:5 net-libs/accounts-qt ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) !kde-plasma/user-manager >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/qqc2-desktop-style-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5 >=kde-plasma/oxygen-5.24.5:5 sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs kaccounts? ( net-libs/signon-oauth2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-desktop-5.24.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/plasma-desktop-override-include-dirs-1.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae04de0be3b2543e710802586d07edc5
+_md5_=12b68c328cb42a34efb1b410f0b26ff1
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-disks-5.24.4
deleted file mode 100644
index 80565b0b4ebb..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 sys-apps/smartmontools dev-qt/qtcore:5
-DESCRIPTION=Monitors S.M.A.R.T. capable devices for imminent failure
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9e0e534ba941e0dc0a3fe66be2d83f0e
diff --git a/metadata/md5-cache/kde-plasma/plasma-disks-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-disks-5.24.5
index 9b0385b0937a..f37eb0511bfb 100644
--- a/metadata/md5-cache/kde-plasma/plasma-disks-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-disks-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/plasma-disks
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 sys-apps/smartmontools kde-plasma/kinfocenter:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-disks-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef006f7d0c3cc3ede74f45d6c8d858e7
+_md5_=9e0e534ba941e0dc0a3fe66be2d83f0e
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.4
deleted file mode 100644
index f9bdde8400b3..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=Plasma frontend for Firewalld or UFW
-EAPI=8
-HOMEPAGE=https://invent.kde.org/network/plasma-firewall
-INHERIT=ecm kde.org python-single-r1
-IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=21a24d68691c5962214c050691ba8901
diff --git a/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
index d0cb7085eb33..67601faad076 100644
--- a/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/network/plasma-firewall
 INHERIT=ecm kde.org python-single-r1
 IUSE=firewalld +ufw debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( firewalld ufw )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-firewall-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=454acd98cbb6af86ca4e0acae4ec1c7b
+_md5_=21a24d68691c5962214c050691ba8901
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-integration-5.24.4
deleted file mode 100644
index 1c2050c2b79e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 x11-libs/libXcursor x11-libs/libxcb dev-qt/qtcore:5
-DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=test debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4a22bb4b6a3b785f6d298d2226547378
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.24.5
index b36487f8a1ff..d45762fe6815 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=test debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5=[dbus] >=dev-qt/qtquickcontrols2-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/breeze-5.24.5:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-integration-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7e63c9e8d761ba5b33fd35437b81e76b
+_md5_=4a22bb4b6a3b785f6d298d2226547378
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.24.4
deleted file mode 100644
index d86a054b110c..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.24.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop/
-IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.24.4:5 >=kde-plasma/kactivitymanagerd-5.24.4:5 >=kde-plasma/kde-cli-tools-5.24.4:5 >=kde-plasma/kdecoration-5.24.4:5 >=kde-plasma/kdeplasma-addons-5.24.4:5 >=kde-plasma/kgamma-5.24.4:5 >=kde-plasma/khotkeys-5.24.4:5 >=kde-plasma/kinfocenter-5.24.4:5 >=kde-plasma/kmenuedit-5.24.4:5 >=kde-plasma/kscreen-5.24.4:5 >=kde-plasma/kscreenlocker-5.24.4:5 >=kde-plasma/ksshaskpass-5.24.4:5 >=kde-plasma/ksystemstats-5.24.4:5 >=kde-plasma/kwayland-integration-5.24.4:5 >=kde-plasma/kwayland-server-5.24.4:5 >=kde-plasma/kwin-5.24.4:5 >=kde-plasma/kwrited-5.24.4:5 >=kde-plasma/layer-shell-qt-5.24.4:5 >=kde-plasma/libkscreen-5.24.4:5 >=kde-plasma/libksysguard-5.24.4:5 >=kde-plasma/milou-5.24.4:5 >=kde-plasma/oxygen-5.24.4:5 >=kde-plasma/plasma-desktop-5.24.4:5 >=kde-plasma/plasma-integration-5.24.4:5 >=kde-plasma/plasma-systemmonitor-5.24.4:5 >=kde-plasma/plasma-workspace-5.24.4:5 >=kde-plasma/polkit-kde-agent-5.24.4:5 >=kde-plasma/powerdevil-5.24.4:5 >=kde-plasma/systemsettings-5.24.4:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.24.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.24.4:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.24.4:5 ) crypt? ( >=kde-plasma/plasma-vault-5.24.4:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.24.4:5 ) discover? ( >=kde-plasma/discover-5.24.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.24.4:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.24.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.24.4:5 >=kde-plasma/kde-gtk-config-5.24.4:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.24.4:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.24.4:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.24.4:5 net-misc/networkmanager[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.24.4:5 >=kde-plasma/plymouth-kcm-5.24.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.24.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.24.4:5 ) smart? ( >=kde-plasma/plasma-disks-5.24.4:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.24.4:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.24.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.24.4:5 ) accessibility? ( app-accessibility/orca )
-REQUIRED_USE=^^ ( elogind systemd )
-SLOT=5
-_md5_=73e2f628abd076e597db2aefaadccbca
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.24.5
index 3a5d42547e73..635b838d575b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.24.5
@@ -3,9 +3,9 @@ DESCRIPTION=Merge this to pull in all Plasma 5 packages
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop/
 IUSE=accessibility bluetooth +browser-integration colord +crash-handler crypt +desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart systemd thunderbolt +wallpapers
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.24.5:5 >=kde-plasma/kactivitymanagerd-5.24.5:5 >=kde-plasma/kde-cli-tools-5.24.5:5 >=kde-plasma/kdecoration-5.24.5:5 >=kde-plasma/kdeplasma-addons-5.24.5:5 >=kde-plasma/kgamma-5.24.5:5 >=kde-plasma/khotkeys-5.24.5:5 >=kde-plasma/kinfocenter-5.24.5:5 >=kde-plasma/kmenuedit-5.24.5:5 >=kde-plasma/kscreen-5.24.5:5 >=kde-plasma/kscreenlocker-5.24.5:5 >=kde-plasma/ksshaskpass-5.24.5:5 >=kde-plasma/ksystemstats-5.24.5:5 >=kde-plasma/kwayland-integration-5.24.5:5 >=kde-plasma/kwayland-server-5.24.5:5 >=kde-plasma/kwin-5.24.5:5 >=kde-plasma/kwrited-5.24.5:5 >=kde-plasma/layer-shell-qt-5.24.5:5 >=kde-plasma/libkscreen-5.24.5:5 >=kde-plasma/libksysguard-5.24.5:5 >=kde-plasma/milou-5.24.5:5 >=kde-plasma/oxygen-5.24.5:5 >=kde-plasma/plasma-desktop-5.24.5:5 >=kde-plasma/plasma-integration-5.24.5:5 >=kde-plasma/plasma-systemmonitor-5.24.5:5 >=kde-plasma/plasma-workspace-5.24.5:5 >=kde-plasma/polkit-kde-agent-5.24.5:5 >=kde-plasma/powerdevil-5.24.5:5 >=kde-plasma/systemsettings-5.24.5:5 sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-5.24.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.24.5:5 ) colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-5.24.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.24.5:5 ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-5.24.5:5 ) discover? ( >=kde-plasma/discover-5.24.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.24.5:5 x11-misc/sddm[elogind?,systemd?] ) !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) grub? ( >=kde-plasma/breeze-grub-5.24.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.24.5:5 >=kde-plasma/kde-gtk-config-5.24.5:5 x11-misc/appmenu-gtk-module ) handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-5.24.5:5 ) legacy-systray? ( >=kde-plasma/xembed-sni-proxy-5.24.5:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.24.5:5 net-misc/networkmanager[elogind?,systemd?] ) plymouth? ( >=kde-plasma/breeze-plymouth-5.24.5:5 >=kde-plasma/plymouth-kcm-5.24.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.24.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.24.5:5 ) smart? ( >=kde-plasma/plasma-disks-5.24.5:5 ) systemd? ( sys-apps/systemd[pam] firewall? ( >=kde-plasma/plasma-firewall-5.24.5:5 ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-5.24.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.24.5:5 ) accessibility? ( app-accessibility/orca )
 REQUIRED_USE=^^ ( elogind systemd )
 SLOT=5
-_md5_=3c8b2e7a0290b1bec6ec653bcec0aeaf
+_md5_=73e2f628abd076e597db2aefaadccbca
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.24.4
deleted file mode 100644
index 364bc423f110..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5[teamd=] >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.90.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma applet for NetworkManager
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5[teamd=] >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.90.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c4478a72b7e34d5f30445f8019e963c4
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.24.5
index d4dee43ca8ed..4151bfc07f04 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=modemmanager openconnect teamd debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5[teamd=] >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 net-misc/networkmanager[teamd=] modemmanager? ( >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/modemmanager-qt-5.90.0:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.15.2:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-nm-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6689445b2ed5825942b8670199d9af0b
+_md5_=c4478a72b7e34d5f30445f8019e963c4
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-pa-5.24.4
deleted file mode 100644
index 30af18c8b3d3..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 media-libs/libcanberra media-sound/pulseaudio dev-qt/qtcore:5
-DESCRIPTION=Plasma applet for audio volume management using PulseAudio
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=48f769cc3679d3b14fbb774c84ea5b61
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.24.5
index c48129d4f674..e80eebc48e30 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 media-libs/libcanberra media-sound/pulseaudio >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) x11-themes/sound-theme-freedesktop || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-pa-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8a04bfa0820655eac6eb02f2613f8d55
+_md5_=48f769cc3679d3b14fbb774c84ea5b61
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.4
deleted file mode 100644
index d9684a4a2d9e..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Useful applications for Plasma development
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=test debug test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4d83774aaa2613a40b1d3b2fa2dc5b1b
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5
index 15d00f3542ee..873806cdeded 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-sdk-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=552f631a3bb265dc8be6cc6d68dd1831
+_md5_=4d83774aaa2613a40b1d3b2fa2dc5b1b
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.4
deleted file mode 100644
index 1abd76f1041d..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 dev-qt/qtcore:5
-DESCRIPTION=Monitor system sensors, process information and other system resources
-EAPI=8
-HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=|| ( GPL-3 GPL-2 )
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] >=kde-frameworks/kquickcharts-5.90.0:5 >=kde-plasma/ksystemstats-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=64442bc7d408c995f03404f86f873779
diff --git a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5
index b2d4bd476f2d..9c67eb1bbf8e 100644
--- a/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://apps.kde.org/plasma-systemmonitor/
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( GPL-3 GPL-2 )
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-plasma/libksysguard-5.24.5:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] >=kde-frameworks/kquickcharts-5.90.0:5 >=kde-plasma/ksystemstats-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-systemmonitor-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=84d9996e0c06f1832e65188bc43eab84
+_md5_=64442bc7d408c995f03404f86f873779
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.4
deleted file mode 100644
index 9d9cebaa7603..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma integration for controlling Thunderbolt devices
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
-INHERIT=ecm kde.org
-IUSE=debug test
-KEYWORDS=amd64 ~riscv x86
-LICENSE=|| ( GPL-2 GPL-3+ )
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-RESTRICT=test !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c72604481fc5273bb90fd1f0e069c31f
diff --git a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5
index 2d0b67306f8f..10fba8117740 100644
--- a/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/plasma-thunderbolt
 INHERIT=ecm kde.org
 IUSE=debug test
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3+ )
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 sys-apps/bolt || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 RESTRICT=test !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-thunderbolt-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6cfbc6cbad7d145b255eb645d3ecc072
+_md5_=c72604481fc5273bb90fd1f0e069c31f
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-vault-5.24.4
deleted file mode 100644
index 8a2c3e006df1..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Plasma applet and services for creating encrypted vaults
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
-INHERIT=ecm kde.org
-IUSE=networkmanager debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=LGPL-3
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-plasma/libksysguard-5.24.4:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9082045f000246e407b91bbfe7679799
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.24.5
index b8b613cf9be7..849fade2cad0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
 INHERIT=ecm kde.org
 IUSE=networkmanager debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-3
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kcodecs-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-plasma/libksysguard-5.24.5:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) >=dev-qt/qtquickcontrols2-5.15.2:5 || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-vault-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9cadd38685e7101c773434c634a693ff
+_md5_=9082045f000246e407b91bbfe7679799
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.4
deleted file mode 100644
index 2d8367718040..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.4
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-qt/qtwaylandscanner-5.15.2:5 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kinit-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kpeople-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/prison-5.90.0:5[qml] >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 >=kde-plasma/kscreenlocker-5.24.4:5 >=kde-plasma/kwin-5.24.4:5 >=kde-plasma/layer-shell-qt-5.24.4:5 >=kde-plasma/libkscreen-5.24.4:5 >=kde-plasma/libksysguard-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.90.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) >=dev-libs/plasma-wayland-protocols-1.6.0 >=dev-qt/qtconcurrent-5.15.2:5 >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) test? ( dev-qt/qttest:5 ) dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org
-IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.24.4:5
-RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kinit-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kpeople-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/prison-5.90.0:5[qml] >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/breeze-5.24.4:5 >=kde-plasma/kscreenlocker-5.24.4:5 >=kde-plasma/kwin-5.24.4:5 >=kde-plasma/layer-shell-qt-5.24.4:5 >=kde-plasma/libkscreen-5.24.4:5 >=kde-plasma/libksysguard-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.90.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:* >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kquickcharts-5.90.0:5 >=kde-plasma/milou-5.24.4:5 >=kde-plasma/plasma-integration-5.24.4:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-REQUIRED_USE=gps? ( geolocation )
-RESTRICT=test !test? ( test ) !test? ( test )
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e2ca41c6b422213f91bf31b51cf4b4c3
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1
index 85a1d609e735..269597291ae5 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=appstream +calendar +fontconfig geolocation gps +policykit screencast +semantic-desktop telemetry test debug +handbook test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 PDEPEND=>=kde-plasma/kde-cli-tools-5.24.5:5
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5=[jpeg,libinput] >=dev-qt/qtnetwork-5.15.2:5 >=dev-qt/qtsql-5.15.2:5 >=dev-qt/qtsvg-5.15.2:5 >=dev-qt/qtwayland-5.15.2:5= >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=dev-qt/qtxml-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kbookmarks-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kded-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kinit-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/kjobwidgets-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/kpeople-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/ktexteditor-5.90.0:5 >=kde-frameworks/ktextwidgets-5.90.0:5 >=kde-frameworks/kunitconversion-5.90.0:5 >=kde-frameworks/kwallet-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 >=kde-frameworks/prison-5.90.0:5[qml] >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/breeze-5.24.5:5 >=kde-plasma/kscreenlocker-5.24.5:5 >=kde-plasma/kwin-5.24.5:5 >=kde-plasma/layer-shell-qt-5.24.5:5 >=kde-plasma/libkscreen-5.24.5:5 >=kde-plasma/libksysguard-5.24.5:5 >=kde-plasma/libkworkspace-5.24.5:5 >=media-libs/phonon-4.11.0 sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.90.0:5 ) fontconfig? ( >=dev-qt/qtprintsupport-5.15.2:5 media-libs/fontconfig x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.90.0:5 ) gps? ( sci-geosciences/gpsd ) policykit? ( virtual/libcrypt:= ) screencast? ( >=dev-qt/qtgui-5.15.2:5=[egl] media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-5.90.0:5 ) telemetry? ( dev-libs/kuserfeedback:5 ) app-text/iso-codes >=dev-qt/qdbus-5.15.2:* >=dev-qt/qtgraphicaleffects-5.15.2:5 >=dev-qt/qtpaths-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5[widgets] >=dev-qt/qtquickcontrols2-5.15.2:5 kde-apps/kio-extras:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kquickcharts-5.90.0:5 >=kde-plasma/milou-5.24.5:5 >=kde-plasma/plasma-integration-5.24.5:5 sys-apps/dbus x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot !<kde-plasma/breeze-5.22.90:5 !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -15,4 +15,4 @@ RESTRICT=test !test? ( test ) !test? ( test )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a1718fceb1fb5daaf1d203e18acbb820
+_md5_=00ee13bf70134d2f8cc925733006bc44
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.4
deleted file mode 100644
index 662219db575b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-qt/qtcore:5 kde-frameworks/extra-cmake-modules:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DESCRIPTION=Wallpapers for the Plasma workspace
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=cmake kde.org
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1e80922bc729d1810ada853d24f5fc50
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5
index b3198fa981d1..371b42182acd 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5
@@ -4,9 +4,9 @@ DESCRIPTION=Wallpapers for the Plasma workspace
 EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=cmake kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-workspace-wallpapers-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=70fa623e6493a4982988b1535537e46e
+_md5_=1e80922bc729d1810ada853d24f5fc50
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.4 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.4
deleted file mode 100644
index 8eebb00fe769..000000000000
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 sys-boot/plymouth dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for Plymouth
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.24.4:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c233ca73fffc9d2a6079045edad24aef
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5
index 0f896f75f633..798d4c9337b0 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/plymouth-kcm
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtquickcontrols-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.24.5:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plymouth-kcm-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=79a6fb97ec5588cb1078cb16d333be74
+_md5_=c233ca73fffc9d2a6079045edad24aef
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.4
deleted file mode 100644
index 9bd93b21becd..000000000000
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=sys-auth/polkit-qt-0.113.0 dev-qt/qtcore:5
-DESCRIPTION=PolKit agent module for KDE Plasma
-EAPI=8
-HOMEPAGE=https://kde.org/
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=448d954d1b55b2e3a43a341f46507218
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5
index 75c03cb8e3f4..43218ec55bf4 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=sys-auth/polkit-qt-0.113.0 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/polkit-kde-agent-1-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=26fd54f14a06ca0cc79d1dd47250c5be
+_md5_=448d954d1b55b2e3a43a341f46507218
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.24.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.24.4
deleted file mode 100644
index 4df1cad8f75e..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5[policykit] >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libkscreen-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5 ) dev-qt/qtcore:5
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/powerdevil
-INHERIT=ecm kde.org
-IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5[policykit] >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libkscreen-5.24.4:5 >=kde-plasma/libkworkspace-5.24.4:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5 ) >=kde-plasma/kde-cli-tools-5.24.4:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c03edfb6bf7635979eefa27a8e433930
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.24.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.24.5
index 300e9374ddac..3d04d2aebe5c 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.24.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/powerdevil
 INHERIT=ecm kde.org
 IUSE=brightness-control caps +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5[policykit] >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kglobalaccel-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kidletime-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/knotifyconfig-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-frameworks/solid-5.90.0:5 >=kde-plasma/libkscreen-5.24.5:5 >=kde-plasma/libkworkspace-5.24.5:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-5.90.0:5 >=kde-frameworks/networkmanager-qt-5.90.0:5 ) >=kde-plasma/kde-cli-tools-5.24.5:5 >=sys-power/upower-0.9.23 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/powerdevil-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d3b1586a3feeb781dc72738d8bacbe11
+_md5_=c03edfb6bf7635979eefa27a8e433930
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.4 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.4
deleted file mode 100644
index 6b27009d671a..000000000000
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 dev-qt/qtcore:5
-DESCRIPTION=KDE Plasma control module for SDDM
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
-INHERIT=ecm kde.org
-IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] >=kde-plasma/kde-cli-tools-5.24.4:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=708205c6fe563ec2a10dbada1b702138
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5
index abe6afb55470..c453c8d20e9a 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/sddm-kcm
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/karchive-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/knewstuff-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=dev-qt/qtquickcontrols2-5.15.2:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5[qml] >=kde-plasma/kde-cli-tools-5.24.5:5 x11-misc/sddm || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/sddm-kcm-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6a4195ee8286f89f6e5856e0c6c29b9b
+_md5_=708205c6fe563ec2a10dbada1b702138
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.24.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.24.4
deleted file mode 100644
index 1f7ca411e6c1..000000000000
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.24.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 handbook? ( >=kde-frameworks/kdoctools-5.90.0:5 ) >=kde-frameworks/extra-cmake-modules-5.90.0:5
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 dev-qt/qtcore:5
-DESCRIPTION=Control Center to configure KDE Plasma desktop
-EAPI=8
-HOMEPAGE=https://kde.org/plasma-desktop
-INHERIT=ecm kde.org optfeature
-IUSE=debug +handbook
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.4:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e7aa93c0f6dedf9290648bbb3acbb57d
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1 b/metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1
index 7f681d29dd41..347a0a223f24 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org optfeature
 IUSE=debug +handbook
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5[widgets] >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kactivities-5.90.0:5 >=kde-frameworks/kactivities-stats-5.90.0:5 >=kde-frameworks/kauth-5.90.0:5 >=kde-frameworks/kcmutils-5.90.0:5 >=kde-frameworks/kcompletion-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kconfigwidgets-5.90.0:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kcrash-5.90.0:5 >=kde-frameworks/kdbusaddons-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/kguiaddons-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kiconthemes-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/kitemmodels-5.90.0:5 >=kde-frameworks/kitemviews-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kpackage-5.90.0:5 >=kde-frameworks/krunner-5.90.0:5 >=kde-frameworks/kservice-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kxmlgui-5.90.0:5 >=kde-plasma/libkworkspace-5.24.5:5 >=dev-qt/qtquickcontrols2-5.15.2:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/systemsettings-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2081ae788de98919c43ae1cc2723cbfe
+_md5_=80b9b6e6ddf2307c3a2d74ba63e446d7
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1
index a887d317de67..4317e4738b29 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9b3b008fc5b1b4485c5c25b0fa408e8e
+_md5_=06cf0ec9fc23cb5bad169b51f3ff8716
diff --git a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.4-r1 b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
similarity index 93%
rename from metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.4-r1
rename to metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
index 46f5e89cc981..7c222cfc32b5 100644
--- a/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.4-r1
+++ b/metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kde.org/plasma-desktop
 INHERIT=ecm kde.org
 IUSE=debug
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/wayland-1.15 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtdeclarative-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtprintsupport-5.15.2:5[cups] >=dev-qt/qtwidgets-5.15.2:5 >=kde-frameworks/kcoreaddons-5.90.0:5 >=kde-frameworks/kconfig-5.90.0:5 >=kde-frameworks/kdeclarative-5.90.0:5 >=kde-frameworks/ki18n-5.90.0:5 >=kde-frameworks/kio-5.90.0:5 >=kde-frameworks/kirigami-5.90.0:5 >=kde-frameworks/knotifications-5.90.0:5 >=kde-frameworks/kwidgetsaddons-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5 >=kde-frameworks/kwayland-5.90.0:5 >=kde-frameworks/plasma-5.90.0:5 sys-apps/xdg-desktop-portal || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
 SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.24.5/xdg-desktop-portal-kde-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	ecm	542fb4c59adc3702f566140a9bdf49f8	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d9811b90fb47c65a8bda30a3af07a2b4
+_md5_=adc2ecdd7c2c7400f34b609e377c022f
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.4 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.4
deleted file mode 100644
index 31803b1b10bd..000000000000
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install nofetch prepare test unpack
-DEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image
-DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
-EAPI=8
-HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
-INHERIT=cmake kde.org
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c62210a6b30347a8428a7b56acb42285
diff --git a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5 b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
index 676b7570bb69..527558b0eb03 100644
--- a/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
+++ b/metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
@@ -5,10 +5,10 @@ DESCRIPTION=Legacy xembed tray icons support for SNI-only system trays
 EAPI=8
 HOMEPAGE=https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md
 INHERIT=cmake kde.org
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.15.2:5 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5 >=dev-qt/qtx11extras-5.15.2:5 >=kde-frameworks/extra-cmake-modules-5.90.0:5 >=kde-frameworks/kwindowsystem-5.90.0:5[X] x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image !kde-plasma/xembed-sni-proxy:0
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.24.5/plasma-workspace-5.24.5.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	kde.org	916c61efa7151f09c7701328b88cafc1	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aec4ac1c8dda341af5241adabc8d4435
+_md5_=c62210a6b30347a8428a7b56acb42285
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index e1df2d49dd2a..f55389448279 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/evolution-3.44.1 b/metadata/md5-cache/mail-client/evolution-3.44.1
index 0c662093e84b..b7d8876640c9 100644
--- a/metadata/md5-cache/mail-client/evolution-3.44.1
+++ b/metadata/md5-cache/mail-client/evolution-3.44.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
 INHERIT=cmake gnome2 readme.gentoo-r1
 IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
 RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.44.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/evolution/3.44/evolution-3.44.1.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=eb78f42e838a91a72bafe898f7a9f52f
+_md5_=1a4f5ba02f1b3734c032986c030a70d4
diff --git a/metadata/md5-cache/mail-client/evolution-3.44.2 b/metadata/md5-cache/mail-client/evolution-3.44.2
new file mode 100644
index 000000000000..3fe3ef47ff50
--- /dev/null
+++ b/metadata/md5-cache/mail-client/evolution-3.44.2
@@ -0,0 +1,15 @@
+BDEPEND=app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.3 ) >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.18.3 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.44.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= ) ytnef? ( net-mail/ytnef )
+DESCRIPTION=Integrated mail, addressbook and calendaring functionality
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+INHERIT=cmake gnome2 readme.gentoo-r1
+IUSE=archive +bogofilter geolocation gtk-doc highlight ldap spamassassin spell ssl +weather ytnef
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
+RDEPEND=>=app-crypt/gcr-3.4:=[gtk] >=app-text/enchant-2.2.0:2 >=dev-db/sqlite-3.7.17 >=dev-libs/glib-2.56:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.44.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.28.0:4[spell?] >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 app-text/cmark:= >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf x11-libs/libSM x11-libs/libICE archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] ) bogofilter? ( mail-filter/bogofilter ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 ) ldap? ( >=net-nds/openldap-2:= ) spamassassin? ( mail-filter/spamassassin ) spell? ( >=app-text/gspell-1.8:= ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.91.0:4= ) ytnef? ( net-mail/ytnef ) highlight? ( app-text/highlight )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/evolution/3.44/evolution-3.44.2.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eb78f42e838a91a72bafe898f7a9f52f
diff --git a/metadata/md5-cache/mail-client/thunderbird-91.9.0 b/metadata/md5-cache/mail-client/thunderbird-91.9.0
deleted file mode 100644
index c6212e831de2..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-91.9.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.51.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.thunderbird.net/
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils llvm multiprocessing optfeature pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.68 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libxcb:= x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.8.1:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-69.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus )
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/source/thunderbird-91.9.0.source.tar.xz -> thunderbird-91.9.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-06j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-06j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-06j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/af.xpi -> thunderbird-91.9.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ar.xpi -> thunderbird-91.9.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ast.xpi -> thunderbird-91.9.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/be.xpi -> thunderbird-91.9.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/bg.xpi -> thunderbird-91.9.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/br.xpi -> thunderbird-91.9.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ca.xpi -> thunderbird-91.9.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/cak.xpi -> thunderbird-91.9.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/cs.xpi -> thunderbird-91.9.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/cy.xpi -> thunderbird-91.9.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/da.xpi -> thunderbird-91.9.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/de.xpi -> thunderbird-91.9.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-91.9.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/el.xpi -> thunderbird-91.9.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-91.9.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-91.9.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-91.9.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-91.9.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/et.xpi -> thunderbird-91.9.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/eu.xpi -> thunderbird-91.9.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/fi.xpi -> thunderbird-91.9.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/fr.xpi -> thunderbird-91.9.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-91.9.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-91.9.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/gd.xpi -> thunderbird-91.9.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/gl.xpi -> thunderbird-91.9.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/he.xpi -> thunderbird-91.9.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/hr.xpi -> thunderbird-91.9.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-91.9.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/hu.xpi -> thunderbird-91.9.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/id.xpi -> thunderbird-91.9.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/is.xpi -> thunderbird-91.9.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/it.xpi -> thunderbird-91.9.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ja.xpi -> thunderbird-91.9.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ka.xpi -> thunderbird-91.9.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/kab.xpi -> thunderbird-91.9.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/kk.xpi -> thunderbird-91.9.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ko.xpi -> thunderbird-91.9.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/lt.xpi -> thunderbird-91.9.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/lv.xpi -> thunderbird-91.9.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ms.xpi -> thunderbird-91.9.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-91.9.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/nl.xpi -> thunderbird-91.9.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-91.9.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-91.9.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/pl.xpi -> thunderbird-91.9.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-91.9.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-91.9.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/rm.xpi -> thunderbird-91.9.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ro.xpi -> thunderbird-91.9.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/ru.xpi -> thunderbird-91.9.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/sk.xpi -> thunderbird-91.9.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/sl.xpi -> thunderbird-91.9.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/sq.xpi -> thunderbird-91.9.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/sr.xpi -> thunderbird-91.9.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-91.9.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/th.xpi -> thunderbird-91.9.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/tr.xpi -> thunderbird-91.9.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/uk.xpi -> thunderbird-91.9.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/uz.xpi -> thunderbird-91.9.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/vi.xpi -> thunderbird-91.9.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-91.9.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/91.9.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-91.9.0-zh-TW.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f3d2a77f77b023653d6d0dc9cef42140
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 19deb22d2b3f..1964ec473d5d 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/postfix-3.8_pre20220509 b/metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
similarity index 98%
rename from metadata/md5-cache/mail-mta/postfix-3.8_pre20220509
rename to metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
index e06c54764d8e..fd9271b4000a 100644
--- a/metadata/md5-cache/mail-mta/postfix-3.8_pre20220509
+++ b/metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
@@ -11,6 +11,6 @@ LICENSE=|| ( IBM EPL-2.0 )
 RDEPEND=acct-group/postfix acct-group/postdrop acct-user/postfix dev-libs/libpcre2:0 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap:= ) ldap-bind? ( net-nds/openldap:=[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11:= ) mysql? ( dev-db/mysql-connector-c:0= ) nis? ( net-libs/libnsl:= ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/sendmail !mail-mta/opensmtpd !mail-mta/ssmtp[mta] selinux? ( sec-policy/selinux-postfix )
 REQUIRED_USE=ldap-bind? ( ldap sasl )
 SLOT=0
-SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20220509.tar.gz
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.8-20220527.tar.gz
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=0fa3938a3b3aa19f5359393d0225f32e
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0 b/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0
new file mode 100644
index 000000000000..5641f7d0b84f
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare test unpack
+DEPEND=app-crypt/libsecret
+DESCRIPTION=Serves ProtonMail to IMAP/SMTP clients
+EAPI=8
+HOMEPAGE=https://proton.me/mail/bridge https://github.com/ProtonMail/proton-bridge/
+INHERIT=go-module systemd xdg-utils
+IUSE=gui
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense
+PROPERTIES=test_network
+RDEPEND=app-crypt/libsecret
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.2.0.tar.gz -> protonmail-bridge-2.2.0.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/protonmail-bridge/protonmail-bridge-2.2.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2d808b394b98dcf04ff0a59308bca1dc
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index 2fe044d774ad..0c719c9b6434 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/cantarell-0.303.1 b/metadata/md5-cache/media-fonts/cantarell-0.303.1
index 8a92395b4048..4eeb9abcb0b8 100644
--- a/metadata/md5-cache/media-fonts/cantarell-0.303.1
+++ b/metadata/md5-cache/media-fonts/cantarell-0.303.1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/CantarellFonts
 INHERIT=font gnome.org meson
 IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=OFL-1.1
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/cantarell-fonts/0.303/cantarell-fonts-0.303.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	font	d31f12a0f6e13d56dc3062e76ae58a61	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d38ed401abc8196e18a5f8704365bcd1
+_md5_=bbe1b4ba1b1e442b0e218728ae329283
diff --git a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.234.56 b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.235
similarity index 92%
rename from metadata/md5-cache/media-fonts/lxgw-wenkai-1.234.56
rename to metadata/md5-cache/media-fonts/lxgw-wenkai-1.235
index 022957920b6b..824bb7eede4d 100644
--- a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.234.56
+++ b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.235
@@ -8,6 +8,6 @@ IUSE=X
 KEYWORDS=~amd64 ~loong
 LICENSE=OFL-1.1
 SLOT=0
-SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.234.56/lxgw-wenkai-v1.234.56.tar.gz
+SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.235/lxgw-wenkai-v1.235.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61
 _md5_=2f7cad6192761165d7dc8f267b6cdefe
diff --git a/metadata/md5-cache/media-fonts/unifont-14.0.03 b/metadata/md5-cache/media-fonts/unifont-14.0.03
index 12c87f0051d3..0f8b54262765 100644
--- a/metadata/md5-cache/media-fonts/unifont-14.0.03
+++ b/metadata/md5-cache/media-fonts/unifont-14.0.03
@@ -11,4 +11,4 @@ RDEPEND=utils? ( dev-lang/perl dev-perl/GD[png(+)] )
 SLOT=0
 SRC_URI=mirror://gnu/unifont/unifont-14.0.03/unifont-14.0.03.tar.gz
 _eclasses_=font	d31f12a0f6e13d56dc3062e76ae58a61	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5079f2a68e9a44a8eee88c11c929916e
+_md5_=534dd3c952c84907f12647a41ff6c6d6
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 7915f549d446..9e86913c246f 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/eog-42.1 b/metadata/md5-cache/media-gfx/eog-42.1
index 281d26038141..884c29a19437 100644
--- a/metadata/md5-cache/media-gfx/eog-42.1
+++ b/metadata/md5-cache/media-gfx/eog-42.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
 REQUIRED_USE=exif? ( jpeg )
 SLOT=1
 SRC_URI=mirror://gnome/sources/eog/42/eog-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb4b94356c831b99d542f585a75a99ee
+_md5_=ae6d1dcaa0e8871e31cd3458a6d64d5c
diff --git a/metadata/md5-cache/media-gfx/eog-42.2 b/metadata/md5-cache/media-gfx/eog-42.2
new file mode 100644
index 000000000000..9e5bdde97b5c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eog-42.2
@@ -0,0 +1,16 @@
+BDEPEND=gtk-doc? ( dev-util/gi-docgen app-text/docbook-xml-dtd:4.1.2 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+DESCRIPTION=The Eye of GNOME image viewer
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome https://gitlab.gnome.org/GNOME/eog
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-0.7.4:=[gtk] >=gnome-base/gnome-desktop-2.91.2:3= >=gnome-base/gsettings-desktop-schemas-42_beta >=x11-misc/shared-mime-info-0.20 >=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?] >=x11-libs/gtk+-3.24.15:3[introspection,X] >=gui-libs/libhandy-1.5.0:1 sys-libs/zlib exif? ( >=media-libs/libexif-0.6.14 ) lcms? ( media-libs/lcms:2 ) xmp? ( media-libs/exempi:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) svg? ( >=gnome-base/librsvg-2.44.0:2 ) x11-libs/libX11
+REQUIRED_USE=exif? ( jpeg )
+SLOT=1
+SRC_URI=mirror://gnome/sources/eog/42/eog-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=fb4b94356c831b99d542f585a75a99ee
diff --git a/metadata/md5-cache/media-gfx/eog-plugins-42.1 b/metadata/md5-cache/media-gfx/eog-plugins-42.1
index 8658c0b9a5c2..3dc4540778ab 100644
--- a/metadata/md5-cache/media-gfx/eog-plugins-42.1
+++ b/metadata/md5-cache/media-gfx/eog-plugins-42.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/EyeOfGnome/Plugins https://gitlab.gnome.org/GNOME/eog-plugins
 INHERIT=gnome.org meson python-single-r1
 IUSE=+exif map picasa +python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.53.4:2 >=dev-libs/libpeas-1.14.1:= >=media-gfx/eog-41.0 exif? ( >=media-libs/libexif-0.6.16 ) map? ( media-libs/libchamplain:0.12[gtk] >=media-libs/clutter-1.9.4:1.0 >=media-libs/clutter-gtk-1.1.2:1.0 ) picasa? ( >=dev-libs/libgdata-0.9.1:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-libs/glib[dbus] dev-libs/libpeas:=[gtk,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) gnome-base/gsettings-desktop-schemas media-gfx/eog[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] )
 REQUIRED_USE=map? ( exif ) python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnome/sources/eog-plugins/42/eog-plugins-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bfc769b287893dff3b6ab89e8c807a80
+_md5_=4b2d0d7e054392da902a1d09a4244dd7
diff --git a/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0 b/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
index 6a384998ec46..6a40494d5c9d 100644
--- a/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
+++ b/metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Font viewer utility for GNOME
 EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-font-viewer
 INHERIT=gnome.org meson xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=gui-libs/gtk-4.5.0:4 >=gui-libs/libadwaita-1.0.0:1= >=media-libs/harfbuzz-0.9.9:= media-libs/fontconfig:1.0 media-libs/freetype:2 gnome-base/gnome-desktop:4=
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-font-viewer/42/gnome-font-viewer-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8f9beb3b51a973d93976a71bac9f4505
+_md5_=536e357845a37c08b92282b1f1ff938f
diff --git a/metadata/md5-cache/media-gfx/gnome-photos-42.0 b/metadata/md5-cache/media-gfx/gnome-photos-42.0
index dcec8a81bc3c..9bc946f15a85 100644
--- a/metadata/md5-cache/media-gfx/gnome-photos-42.0
+++ b/metadata/md5-cache/media-gfx/gnome-photos-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Photos
 INHERIT=gnome.org gnome2-utils meson python-any-r1 virtualx xdg
 IUSE=flickr test upnp-av test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-3+ LGPL-2+ CC0-1.0
 RDEPEND=media-libs/babl >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36.8:2 >=media-libs/gegl-0.4.0:0.4[cairo,raw] sci-geosciences/geocode-glib >=media-libs/gexiv2-0.10.8 >=dev-libs/glib-2.62.0:2 >=net-libs/gnome-online-accounts-3.8.0:= >=media-libs/grilo-0.3.5:0.3= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.22.16:3 >=dev-libs/libdazzle-3.26.0 >=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts] >=net-libs/libgfbgraph-0.2.1:0.2 >=gui-libs/libhandy-1.1.90:1= virtual/jpeg:0 >=media-libs/libpng-1.6:0= app-misc/tracker:3= sys-apps/dbus net-misc/gnome-online-miners[flickr?] upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] ) flickr? ( media-plugins/grilo-plugins:0.3[flickr] ) app-misc/tracker-miners:3
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-photos/42/gnome-photos-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0443bf2a3f32b4c7534d296cf107bc6f
+_md5_=3d4f612f2035c7a14e768f319b126a8e
diff --git a/metadata/md5-cache/media-gfx/gthumb-3.12.2-r2 b/metadata/md5-cache/media-gfx/gthumb-3.12.2-r2
index fcdb64c6377a..8106e10706bc 100644
--- a/metadata/md5-cache/media-gfx/gthumb-3.12.2-r2
+++ b/metadata/md5-cache/media-gfx/gthumb-3.12.2-r2
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Gthumb
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
 IUSE=cdr colord exif gnome-keyring gstreamer heif http jpegxl lcms raw slideshow svg tiff webp
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=x11-libs/libX11 >=dev-libs/glib-2.54.0:2 >=x11-libs/gtk+-3.16.0:3 exif? ( >=media-gfx/exiv2-0.21:= ) slideshow? ( >=media-libs/clutter-1.12.0:1.0 >=media-libs/clutter-gtk-1:1.0 ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-plugins/gst-plugins-gtk:1.0 ) raw? ( >=media-libs/libraw-0.14:= ) http? ( >=net-libs/libsoup-2.42.0:2.4 >=dev-libs/json-glib-0.15.0 >=net-libs/webkit-gtk-1.10.0:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.11 ) cdr? ( >=app-cdr/brasero-3.2.0 ) svg? ( >=gnome-base/librsvg-2.34:2 ) webp? ( >=media-libs/libwebp-0.2.0:= ) jpegxl? ( >=media-libs/libjxl-0.3.0 ) heif? ( >=media-libs/libheif-1.11:0= ) lcms? ( >=media-libs/lcms-2.6:2 ) colord? ( >=x11-misc/colord-1.3 >=media-libs/lcms-2.6:2 ) sys-libs/zlib media-libs/libjpeg-turbo:0= tiff? ( media-libs/tiff:= ) media-libs/libpng:0= >=gnome-base/gsettings-desktop-schemas-0.1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gthumb/3.12/gthumb-3.12.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d5373a181b968533fda093e60efdebbe
+_md5_=542e451e5b48bd048d5eb7a42ada478c
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.1.2-r1 b/metadata/md5-cache/media-gfx/inkscape-1.1.2-r1
index 75b48bc1aeb8..c11cffb9047f 100644
--- a/metadata/md5-cache/media-gfx/inkscape-1.1.2-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-1.1.2-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://inkscape.org/
 INHERIT=cmake flag-o-matic xdg toolchain-funcs python-single-r1
 IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= x11-libs/libX11 >=x11-libs/pango-1.37.2 x11-libs/gtk+:3 python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.inkscape.org/dl/resources/file/inkscape-1.1.2.tar.xz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a80e5d7d3f8dbcd3e8aef098b7fbf8b9
+_md5_=c781eea996befb257939b0a41f540113
diff --git a/metadata/md5-cache/media-gfx/inkscape-1.2 b/metadata/md5-cache/media-gfx/inkscape-1.2
new file mode 100644
index 000000000000..ee96d832b6c7
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/inkscape-1.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( virtual/imagemagick-tools ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) test? ( dev-cpp/gtest )
+DESCRIPTION=SVG based generic vector-drawing program
+EAPI=8
+HOMEPAGE=https://inkscape.org/ https://gitlab.com/inkscape/inkscape/
+INHERIT=cmake flag-o-matic xdg toolchain-funcs python-single-r1
+IUSE=cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.inkscape.org/dl/resources/file/inkscape-1.2.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7f423ddba9c5eddf4996657e15d227de
diff --git a/metadata/md5-cache/media-gfx/inkscape-9999 b/metadata/md5-cache/media-gfx/inkscape-9999
index c2ad992868c3..5fddaa019213 100644
--- a/metadata/md5-cache/media-gfx/inkscape-9999
+++ b/metadata/md5-cache/media-gfx/inkscape-9999
@@ -1,16 +1,16 @@
 BDEPEND=dev-util/glib-utils >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig test? ( virtual/imagemagick-tools ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.37.2 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) test? ( dev-cpp/gtest )
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/libepoxy media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) test? ( dev-cpp/gtest )
 DESCRIPTION=SVG based generic vector-drawing program
 EAPI=8
-HOMEPAGE=https://inkscape.org/
+HOMEPAGE=https://inkscape.org/ https://gitlab.com/inkscape/inkscape/
 INHERIT=cmake flag-o-matic xdg toolchain-funcs python-single-r1 git-r3
-IUSE=cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=cdr dia exif graphicsmagick imagemagick inkjar jemalloc jpeg openmp postscript readline spell svg2 test visio wpg X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=GPL-2 LGPL-2.1
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.37.2 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) dbus? ( dev-libs/dbus-glib ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) >=app-text/poppler-0.57.0:=[cairo] >=dev-cpp/cairomm-1.12:0 >=dev-cpp/glibmm-2.54.1:2 dev-cpp/gtkmm:3.0 >=dev-cpp/pangomm-2.40:1.4 >=dev-libs/boehm-gc-7.1:= >=dev-libs/boost-1.65:= dev-libs/double-conversion:= >=dev-libs/glib-2.41 >=dev-libs/libsigc++-2.8:2 >=dev-libs/libxml2-2.7.4 >=dev-libs/libxslt-1.1.25 dev-libs/gdl:3 dev-libs/popt media-gfx/potrace media-libs/libepoxy media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 media-libs/libpng:0= net-libs/libsoup:2.4 sci-libs/gsl:= >=x11-libs/pango-1.44 x11-libs/gtk+:3[X?] X? ( x11-libs/libX11 ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] media-gfx/scour[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] media-gfx/scour[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] media-gfx/scour[python_targets_python3_10(-)] ) cdr? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libcdr ) exif? ( media-libs/libexif ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) jemalloc? ( dev-libs/jemalloc ) jpeg? ( media-libs/libjpeg-turbo:= ) readline? ( sys-libs/readline:= ) spell? ( app-text/gspell ) visio? ( app-text/libwpg:0.3 dev-libs/librevenge media-libs/libvisio ) wpg? ( app-text/libwpg:0.3 dev-libs/librevenge ) python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) dia? ( app-office/dia ) postscript? ( app-text/ghostscript-gpl )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e6675a3a2171ee9f288bb11283be0fee
+_md5_=7849ab837c297d874e4cf42d4d5d9fce
diff --git a/metadata/md5-cache/media-gfx/pstoedit-3.75 b/metadata/md5-cache/media-gfx/pstoedit-3.75
index e56d7250445d..2129ffbc6289 100644
--- a/metadata/md5-cache/media-gfx/pstoedit-3.75
+++ b/metadata/md5-cache/media-gfx/pstoedit-3.75
@@ -12,4 +12,4 @@ RDEPEND=>=app-text/ghostscript-gpl-8.71-r1 >=media-libs/gd-2.0.35-r1:= emf? ( >=
 SLOT=0
 SRC_URI=mirror://sourceforge/pstoedit/pstoedit-3.75.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b9aa22095dac1c90b77cd28cd982f6e0
+_md5_=c1a99ecbdd979400545ef5f690c3bedd
diff --git a/metadata/md5-cache/media-gfx/qrencode-4.1.1 b/metadata/md5-cache/media-gfx/qrencode-4.1.1
index 6592628a2279..2aa7b99f2369 100644
--- a/metadata/md5-cache/media-gfx/qrencode-4.1.1
+++ b/metadata/md5-cache/media-gfx/qrencode-4.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=C library for encoding data in a QR Code symbol
 EAPI=7
 HOMEPAGE=https://fukuchi.org/works/qrencode/
 IUSE=png test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=LGPL-2
 RDEPEND=png? ( media-libs/libpng:0= )
 RESTRICT=!test? ( test )
 SLOT=0/4
 SRC_URI=https://fukuchi.org/works/qrencode/qrencode-4.1.1.tar.bz2
-_md5_=9b79f423988c5c3d26bb182d8d4d309d
+_md5_=a75c9147c21a602638eaef19a55387fe
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.30.15 b/metadata/md5-cache/media-gfx/shotwell-0.30.15
index 9e4ef007ea5f..30424160fde6 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.30.15
+++ b/metadata/md5-cache/media-gfx/shotwell-0.30.15
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=opencv udev
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-3.22.0:3 >=dev-libs/glib-2.40.0:2 >=dev-libs/libgee-0.8.5:0.8 >=net-libs/webkit-gtk-2.26:4 >=dev-libs/json-glib-0.7.6 >=dev-libs/libxml2-2.6.32:2 x11-libs/gdk-pixbuf:2 >=dev-db/sqlite-3.5.9:3 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libgphoto2-2.5:= udev? ( >=dev-libs/libgudev-145:= ) >=media-libs/gexiv2-0.10.4 >=media-libs/libraw-0.13.2:= >=media-libs/libexif-0.6.16:= dev-libs/libgdata >=app-crypt/gcr-3:=[gtk] x11-libs/cairo opencv? ( >=media-libs/opencv-2.3.0:= ) media-plugins/gst-plugins-gdkpixbuf:1.0 media-plugins/gst-plugins-meta:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.30/shotwell-0.30.15.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=11a75c82b991ad5c75074a8eb0d19f37
+_md5_=3787ed6241d9c32039cfd40970ab0372
diff --git a/metadata/md5-cache/media-gfx/simple-scan-42.1 b/metadata/md5-cache/media-gfx/simple-scan-42.1
index 51d8539905d7..42d5d045b226 100644
--- a/metadata/md5-cache/media-gfx/simple-scan-42.1
+++ b/metadata/md5-cache/media-gfx/simple-scan-42.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/simple-scan
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
 IUSE=colord webp
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.24:3 >=gui-libs/libhandy-1.5.0:1= >=sys-libs/zlib-1.2.3.1:= x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=dev-libs/libgusb-0.2.7 colord? ( >=x11-misc/colord-0.1.24:=[udev(+)] ) webp? ( media-libs/libwebp ) >=media-gfx/sane-backends-1.0.20:= virtual/jpeg:0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://gnome/sources/simple-scan/42/simple-scan-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=de0a4511ad14cc3ef82deaf7e8249ef8
+_md5_=c4c929e85d70b1f32ad99874c33d65cf
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index c501944aee7d..802bfaae7013 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r2 b/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r2
new file mode 100644
index 000000000000..99d2f4cb7aed
--- /dev/null
+++ b/metadata/md5-cache/media-libs/clutter-gst-3.0.27-r2
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/glib-utils >=dev-util/gtk-doc-am-1.11 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[X=,introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8:= ) udev? ( dev-libs/libgudev )
+DESCRIPTION=GStreamer integration library for Clutter
+EAPI=8
+HOMEPAGE=https://blogs.gnome.org/clutter/
+INHERIT=gnome2
+IUSE=X debug +introspection udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.20:1.0=[X=,introspection?] >=media-libs/cogl-1.18:1.0=[introspection?] >=media-libs/gstreamer-1.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.4:1.0 >=media-libs/gst-plugins-base-1.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8:= ) udev? ( dev-libs/libgudev ) >=media-libs/gst-plugins-good-1.4:1.0 !udev? ( media-plugins/gst-plugins-v4l2 )
+SLOT=3.0
+SRC_URI=mirror://gnome/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=18a6da00a4076f6797813c38657f07c4
diff --git a/metadata/md5-cache/media-libs/freeglut-3.2.1-r2 b/metadata/md5-cache/media-libs/freeglut-3.2.1-r2
deleted file mode 100644
index 7c4efc07935c..000000000000
--- a/metadata/md5-cache/media-libs/freeglut-3.2.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto
-DESCRIPTION=A free OpenGL utility toolkit, the open-sourced alternative to the GLUT library
-EAPI=7
-HOMEPAGE=http://freeglut.sourceforge.net/
-INHERIT=cmake-multilib
-IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=mirror://sourceforge/freeglut/freeglut-3.2.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3a81e6ddd8857bdee9f52e83c7adcbaf
diff --git a/metadata/md5-cache/media-libs/freeglut-3.2.2 b/metadata/md5-cache/media-libs/freeglut-3.2.2
index 20c50c201ed8..f0e4fe3a88ac 100644
--- a/metadata/md5-cache/media-libs/freeglut-3.2.2
+++ b/metadata/md5-cache/media-libs/freeglut-3.2.2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://freeglut.sourceforge.net/
 INHERIT=cmake-multilib
 IUSE=static-libs 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 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-3.2.2.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cca40af98bb86a10211e5a38b522bf38
+_md5_=66b77d77dc9b66c6d363ba575a370724
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r6 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r6
deleted file mode 100644
index b362cf803c54..000000000000
--- a/metadata/md5-cache/media-libs/freeimage-3.18.0-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
-DESCRIPTION=Image library supporting many formats
-EAPI=8
-HOMEPAGE=https://freeimage.sourceforge.io/
-INHERIT=edos2unix toolchain-funcs
-IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 FIPL-1.0 )
-RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
-SLOT=0
-SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f9513e97322a1e90195c7857927da192
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r7 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r7
new file mode 100644
index 000000000000..5f57ce64525d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r7
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= <media-libs/tiff-4.4.0 ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=Image library supporting many formats
+EAPI=8
+HOMEPAGE=https://freeimage.sourceforge.io/
+INHERIT=edos2unix toolchain-funcs
+IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
+KEYWORDS=amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 FIPL-1.0 )
+RDEPEND=sys-libs/zlib jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= <media-libs/tiff-4.4.0 ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=6d16cf62816cd3640779a1df761a474e
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0-r8 b/metadata/md5-cache/media-libs/freeimage-3.18.0-r8
new file mode 100644
index 000000000000..e36d599fcf40
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0-r8
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= >=media-libs/tiff-4.4.0 ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=Image library supporting many formats
+EAPI=8
+HOMEPAGE=https://freeimage.sourceforge.io/
+INHERIT=edos2unix toolchain-funcs
+IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 FIPL-1.0 )
+RDEPEND=sys-libs/zlib jpeg? ( media-libs/libjpeg-turbo:= ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( >=dev-libs/imath-3.1.4-r2:= >=media-libs/openexr-3:0= >=media-libs/tiff-4.4.0 ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=218452233cb387e6b4b088e6b8b66ab5
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.14.0 b/metadata/md5-cache/media-libs/gexiv2-0.14.0
index 490962085651..d36cbf69628f 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.14.0
+++ b/metadata/md5-cache/media-libs/gexiv2-0.14.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
 INHERIT=meson python-r1 vala
 IUSE=gtk-doc +introspection python static-libs test +vala python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+ GPL-2
 RDEPEND=>=media-gfx/exiv2-0.26:= >=dev-libs/glib-2.46.0:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/pygobject:3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
 REQUIRED_USE=python? ( introspection || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( python introspection ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gexiv2/0.14/gexiv2-0.14.0.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8
-_md5_=9db12e4efb035105eaa3bb699b1ed4e0
+_md5_=30b5468591665b7c382d23105d6a39f7
diff --git a/metadata/md5-cache/media-libs/graphene-1.10.8 b/metadata/md5-cache/media-libs/graphene-1.10.8
index 3a8976b76f01..9d7d86912345 100644
--- a/metadata/md5-cache/media-libs/graphene-1.10.8
+++ b/metadata/md5-cache/media-libs/graphene-1.10.8
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://ebassi.github.io/graphene/
 INHERIT=xdg-utils meson-multilib python-any-r1
 IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ebassi/graphene/archive/refs/tags/1.10.8.tar.gz -> graphene-1.10.8.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7e5bbc02f25d8591ca6c44da24c58e49
+_md5_=65f85a2f33c0219621172c25d46cf853
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2
index a74e04d26ca5..1cc5d85e974d 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=flag-o-matic gstreamer-meson python-any-r1
 IUSE=X bzip2 +egl gles2 gtk +introspection +opengl +orc vnc wayland test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2
 RDEPEND=!media-plugins/gst-transcoder >=media-libs/gstreamer-1.20.2:1.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(-)?,introspection?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?,egl?,introspection?,gles2=,opengl=] introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vnc? ( X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) wayland? ( >=dev-libs/wayland-1.4.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(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0e343bfa83483368cb66852d7615014a
+_md5_=5a6591b19530e54845ce4f2c8d36acbc
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.20.2 b/metadata/md5-cache/media-libs/gst-plugins-base-1.20.2
index 9af4358bd14b..a5f0bc87e267 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.20.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.20.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=flag-o-matic gstreamer-meson
 IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=app-text/iso-codes >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.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(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) >=media-libs/graphene-1.4.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(-)?] media-libs/libpng: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(-)?] media-libs/libjpeg-turbo: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(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl(+)?,gbm(+)?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.15 ) >=media-libs/graphene-1.4.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(-)?] media-libs/libpng: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(-)?] media-libs/libjpeg-turbo: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(-)?] ) !<media-libs/gst-plugins-bad-1.15.0:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=28b48d0dee99a28f2857874a7c0c15cd
+_md5_=04579adcbac5b635b33eb97ee39fcae6
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.20.2 b/metadata/md5-cache/media-libs/gst-plugins-good-1.20.2
index caf23f5fc709..9748208c4ebf 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.20.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=flag-o-matic gstreamer-meson
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=app-arch/bzip2-1.0.6-r4[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-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f84a04d2a0779903605efcdfda503e26
+_md5_=c0118ca560b17155d0707262d1979abf
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2
index 9a0fa3527544..f555c8e1f7fd 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson python-any-r1
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=604f50df87e2f294f1b8dc1566e6229c
+_md5_=091656cf62313d6984bc613a482d06ad
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.20.2 b/metadata/md5-cache/media-libs/gstreamer-1.20.2
index f3f4fe34a114..016c55a1bf9d 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.20.2
+++ b/metadata/md5-cache/media-libs/gstreamer-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson pax-utils
 IUSE=+caps +introspection +orc unwind test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] caps? ( sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) unwind? ( >=sys-libs/libunwind-1.2_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/elfutils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=05b3141921ecd48b2d7684dd37c98f14
+_md5_=636c54b2f53cc914950c9ec31fdebe24
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.18.4 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.18.4
new file mode 100644
index 000000000000..3a6b98cc91e9
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.18.4
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=media-libs/gstreamer-1.18.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.18.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+DESCRIPTION=SDK for making video editors and more
+EAPI=8
+HOMEPAGE=http://wiki.pitivi.org/wiki/GES
+INHERIT=meson python-r1
+IUSE=+introspection test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=media-libs/gstreamer-1.18.4:1.0[introspection?] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection?] >=media-libs/gst-plugins-bad-1.18.4:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.18.4.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e19a13aa9d1a61364e6b20d357462002
diff --git a/metadata/md5-cache/media-libs/gstreamer-editing-services-1.20.2 b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.20.2
new file mode 100644
index 000000000000..1a17528e3b1a
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gstreamer-editing-services-1.20.2
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=media-libs/gstreamer-1.20.2:1.0[introspection?] >=media-libs/gst-plugins-base-1.20.2:1.0[introspection?] >=media-libs/gst-plugins-bad-1.20.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+DESCRIPTION=SDK for making video editors and more
+EAPI=8
+HOMEPAGE=http://wiki.pitivi.org/wiki/GES
+INHERIT=meson python-r1
+IUSE=+introspection test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.40.0:2 dev-libs/libxml2:2 >=media-libs/gstreamer-1.20.2:1.0[introspection?] >=media-libs/gst-plugins-base-1.20.2:1.0[introspection?] >=media-libs/gst-plugins-bad-1.20.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=1.0
+SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.20.2.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e19a13aa9d1a61364e6b20d357462002
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.10 b/metadata/md5-cache/media-libs/libepoxy-1.5.10
index 8ec8fc2c7230..288225decb95 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.10
+++ b/metadata/md5-cache/media-libs/libepoxy-1.5.10
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/anholt/libepoxy
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=+egl test +X 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.10.tar.gz -> libepoxy-1.5.10.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=7b48b492da83dd8213277992397ec1cd
+_md5_=84171e38518fd448e14b91349ff7554a
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.5.9-r1 b/metadata/md5-cache/media-libs/libepoxy-1.5.9-r1
deleted file mode 100644
index 5d0dcd66ce8e..000000000000
--- a/metadata/md5-cache/media-libs/libepoxy-1.5.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[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=Library for handling OpenGL function pointer management
-EAPI=7
-HOMEPAGE=https://github.com/anholt/libepoxy
-INHERIT=meson-multilib python-any-r1 virtualx
-IUSE=+egl test +X 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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=egl? ( media-libs/mesa[egl(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/anholt/libepoxy/archive/1.5.9.tar.gz -> libepoxy-1.5.9.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=73900a9e281fbc94cf5a24e235942545
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.29 b/metadata/md5-cache/media-libs/libgphoto2-2.5.29
index 0a813f0ca662..9a40b62256fe 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.29
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.29
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.gphoto.org/
 INHERIT=autotools multilib-minimal udev
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=acct-group/plugdev >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.29.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=14be6fb4c9873db4a280b9d1476ad3f2
+_md5_=7552df1d097ab89129eca523d631dd35
diff --git a/metadata/md5-cache/media-libs/libmediaart-1.9.5 b/metadata/md5-cache/media-libs/libmediaart-1.9.5
index b7be4c0f587d..10cccd967158 100644
--- a/metadata/md5-cache/media-libs/libmediaart-1.9.5
+++ b/metadata/md5-cache/media-libs/libmediaart-1.9.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/libmediaart
 INHERIT=gnome2 meson vala
 IUSE=gtk gtk-doc +introspection qt5 vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.38.0:2 gtk? ( >=x11-libs/gdk-pixbuf-2.12:2 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) qt5? ( dev-qt/qtgui:5 )
 REQUIRED_USE=^^ ( gtk qt5 ) vala? ( introspection )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libmediaart/1.9/libmediaart-1.9.5.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=71afcf476f614dc4c3c3c6db3698f3b3
+_md5_=3a61a7d355addf67a8fb359aa4be26b2
diff --git a/metadata/md5-cache/media-libs/libpulse-15.99.1-r1 b/metadata/md5-cache/media-libs/libpulse-16.0
similarity index 73%
rename from metadata/md5-cache/media-libs/libpulse-15.99.1-r1
rename to metadata/md5-cache/media-libs/libpulse-16.0
index 2468f0ad50e1..0eba40cdc2a8 100644
--- a/metadata/md5-cache/media-libs/libpulse-15.99.1-r1
+++ b/metadata/md5-cache/media-libs/libpulse-16.0
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext sys-devel/m4 virtual/libiconv virtual/libintl virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Libraries for PulseAudio clients
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd udev
-IUSE=+asyncns dbus doc +glib gtk selinux systemd tcpd test X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=+asyncns dbus doc +glib gtk selinux systemd tcpd test valgrind X 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
+RDEPEND=dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:3 ) selinux? ( sec-policy/selinux-pulseaudio ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) !<media-sound/pulseaudio-15.0-r100
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.99.1.tar.xz
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a8715fe89d55b777d37f2175da207bf4
+_md5_=10f085a5c0d2b822043bf5f293f6a564
diff --git a/metadata/md5-cache/media-libs/lilv-0.24.14 b/metadata/md5-cache/media-libs/lilv-0.24.14
new file mode 100644
index 000000000000..9bc1b682193d
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lilv-0.24.14
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) dev-libs/serd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/sord[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/sratom[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=Library to make the use of LV2 plugins as simple as possible for applications
+EAPI=7
+HOMEPAGE=http://drobilla.net/software/lilv/
+INHERIT=python-single-r1 waf-utils bash-completion-r1 multilib-build multilib-minimal
+IUSE=doc +dyn-manifest static-libs test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] ) dev-libs/serd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/sord[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libsndfile media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/sratom[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=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/lilv-0.24.14.tar.bz2
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=90c276d2d7fc2a5d52ffdc99072a2707
diff --git a/metadata/md5-cache/media-libs/lv2-1.18.4 b/metadata/md5-cache/media-libs/lv2-1.18.4
new file mode 100644
index 000000000000..e91e0266e716
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lv2-1.18.4
@@ -0,0 +1,16 @@
+BDEPEND=plugins? ( virtual/pkgconfig ) doc? ( app-doc/doxygen dev-python/rdflib )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) doc? ( dev-python/markdown )
+DESCRIPTION=A simple but extensible successor of LADSPA
+EAPI=7
+HOMEPAGE=https://lv2plug.in/
+INHERIT=python-single-r1 waf-utils multilib-build multilib-minimal
+IUSE=doc plugins python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] dev-python/pygments[python_targets_python3_8(-)] dev-python/rdflib[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-python/rdflib[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-python/rdflib[python_targets_python3_10(-)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://lv2plug.in/spec/lv2-1.18.4.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=0a2bc17accb47f5a958b6669644ea7c6
diff --git a/metadata/md5-cache/media-libs/mesa-22.0.3 b/metadata/md5-cache/media-libs/mesa-22.0.3
index ecd6a977585e..411ec025ef7c 100644
--- a/metadata/md5-cache/media-libs/mesa-22.0.3
+++ b/metadata/md5-cache/media-libs/mesa-22.0.3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libglvnd-1.3.2[X?,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-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf: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(-)?] ) video_cards_r600? ( virtual/libelf: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(-)?] ) video_cards_radeon? ( virtual/libelf: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(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf: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(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.18.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(-)?] ) >=x11-libs/libdrm-2.4.109[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang: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(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.109[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:13[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/clang:12[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/clang-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:13[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-14:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:13[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/llvm:12[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/llvm-14:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.0.3.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8508d1f1ee71bdb48fd7f07d638bc302
+_md5_=e96505f007ddd0571776cddeee4584ac
diff --git a/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1 b/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1
index 4b4f7686b345..908cc72ea7d0 100644
--- a/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1
+++ b/metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=compile install
 DESCRIPTION=FFmpeg version of headers required to interface with Nvidias codec APIs
 EAPI=8
 HOMEPAGE=https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.1/nv-codec-headers-11.1.5.1.tar.gz
-_md5_=48e5f3d98dfe7a331be86199190da1e9
+_md5_=628a562bf990c34d87009d3fba05e9b7
diff --git a/metadata/md5-cache/media-libs/shaderc-2021.3 b/metadata/md5-cache/media-libs/shaderc-2021.3
deleted file mode 100644
index 100eac54cf03..000000000000
--- a/metadata/md5-cache/media-libs/shaderc-2021.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/glslang-1.2.198[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-util/spirv-tools-1.2.198[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ~dev-util/spirv-headers-1.2.198 doc? ( dev-ruby/asciidoctor ) test? ( dev-cpp/gtest || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/nose[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/nose[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/nose[python_targets_python3_8(-)] ) ) )
-DESCRIPTION=Collection of tools, libraries and tests for shader compilation
-EAPI=7
-HOMEPAGE=https://github.com/google/shaderc
-INHERIT=cmake-multilib python-any-r1
-IUSE=doc test 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=amd64 ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-util/glslang-1.2.198[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-util/spirv-tools-1.2.198[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/shaderc/archive/v2021.3.tar.gz -> shaderc-2021.3.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=381f323d75eed0a0a2266809feeb9f86
diff --git a/metadata/md5-cache/media-libs/sratom-0.6.10 b/metadata/md5-cache/media-libs/sratom-0.6.10
new file mode 100644
index 000000000000..41ed2d161e5e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/sratom-0.6.10
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/serd dev-libs/sord media-libs/lv2 || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
+DESCRIPTION=Library for serialising LV2 atoms to/from RDF, particularly the Turtle syntax
+EAPI=7
+HOMEPAGE=http://drobilla.net/software/sratom/
+INHERIT=python-any-r1 waf-utils multilib-build multilib-minimal
+IUSE=doc static-libs test 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 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=ISC
+RDEPEND=dev-libs/serd dev-libs/sord media-libs/lv2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://download.drobilla.net/sratom-0.6.10.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=3b94eebcf1ddf2cc64f58ce128b454ae
diff --git a/metadata/md5-cache/media-libs/suil-0.10.12 b/metadata/md5-cache/media-libs/suil-0.10.12
new file mode 100644
index 000000000000..c733a4cbf450
--- /dev/null
+++ b/metadata/md5-cache/media-libs/suil-0.10.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] )
+DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
+EAPI=7
+HOMEPAGE=http://drobilla.net/software/suil/
+INHERIT=python-any-r1 waf-utils
+IUSE=doc gtk qt5
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=ISC
+RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
+SLOT=0
+SRC_URI=http://download.drobilla.net/suil-0.10.12.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
+_md5_=ffd64d867a50b93ee5d219c86fcf5472
diff --git a/metadata/md5-cache/media-libs/tiff-4.4.0_rc1 b/metadata/md5-cache/media-libs/tiff-4.4.0
similarity index 89%
rename from metadata/md5-cache/media-libs/tiff-4.4.0_rc1
rename to metadata/md5-cache/media-libs/tiff-4.4.0
index c3919de330a9..ee32ecc320ce 100644
--- a/metadata/md5-cache/media-libs/tiff-4.4.0_rc1
+++ b/metadata/md5-cache/media-libs/tiff-4.4.0
@@ -6,11 +6,12 @@ EAPI=8
 HOMEPAGE=http://libtiff.maptools.org
 INHERIT=multilib-minimal verify-sig
 IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+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=libtiff
 RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[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? ( jpeg )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0rc1.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0rc1.tar.xz.sig )
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz.sig )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=19601b26f71f5586eb0a06e5dce1ca17
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.2.198-r1 b/metadata/md5-cache/media-libs/vulkan-layers-1.2.198-r1
deleted file mode 100644
index 08ff5735dd0b..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-layers-1.2.198-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=~dev-util/spirv-tools-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-cpp/robin-hood-hashing ~dev-util/glslang-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-util/vulkan-headers-1.2.198 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[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=Vulkan Validation Layers
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
-INHERIT=cmake-multilib python-any-r1
-IUSE=wayland X 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=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-RDEPEND=~dev-util/spirv-tools-1.2.198:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-1.2.198.0.tar.gz -> vulkan-layers-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e045d22fb132f01d34a39f4b5ba620d
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.198 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.198
deleted file mode 100644
index 86ff9c920d74..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.198
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=~dev-util/vulkan-headers-1.2.198 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[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=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-INHERIT=flag-o-matic cmake-multilib toolchain-funcs
-IUSE=layers wayland X 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=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.198.0.tar.gz -> vulkan-loader-1.2.198.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=52474896087fb0f3d4057a9f71227ea6
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.2.198-r1 b/metadata/md5-cache/media-libs/vulkan-loader-1.2.198-r1
deleted file mode 100644
index 8ea2e603909c..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.2.198-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.10.2 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=~dev-util/vulkan-headers-1.2.198 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[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=Vulkan Installable Client Driver (ICD) Loader
-EAPI=7
-HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
-INHERIT=flag-o-matic cmake-multilib toolchain-funcs
-IUSE=layers wayland X 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=Apache-2.0
-PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-1.2.198.1.tar.gz -> vulkan-loader-1.2.198.1.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2ede0f4405ec49249975f1e3a697b3e0
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 5515e3357aed..88d200969bf3 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2
index 74b78bec803a..1a99a0abd7b4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=+orc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] orc? ( >=dev-lang/orc-0.4.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef21fb0859936cfa13bdd48f5c6afb84
+_md5_=aa14238b2ae428a1e0320f729f220729
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2
index 01f98b3884d2..e23278e907fe 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2d1ddab19fd0ef8fa3771aeac029dd1b
+_md5_=fb90e5ec01f046bd06c3262d38558606
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2
index 6a72fe81d7b7..a72598e3b321 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=49eb41edb66acfc0249d3f80bb09d94e
+_md5_=9c389cfe597e334db9ae4752f685f9f3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2
index bad9c53c5d06..5378181a938f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3bdbc62e396416cca6c0b1dd41e3cbd5
+_md5_=837c6cd4b41464c290ed28610e6b2571
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2
index 3de38c281985..0d5136fb3674 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=128ae04befc79470bcf8bb8c635eb1b3
+_md5_=284da2881c0c23f5b9d89fc2bf896895
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2
index f58f3683b44f..a99b828a8892 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=365b63768b1ccfecbcdc71abdb18bdba
+_md5_=66651d6b51edc2d14b5bf26d4755b087
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2
index 050903ed873b..474621d85662 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~mips ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=09272a1247e2604640bf423d7e056b6b
+_md5_=2177aa14a8236bddefabfdc4babb3dd6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2
index 623a91ec4ee4..791f8ddc3808 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8c8f3d87f58728cc6c1b24dc9fd9b4be
+_md5_=0ff9ab749d00ebfe3ff1ea381c34d538
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2
index b681fef930b5..b3cbc6d1e846 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=196a73c92029e2e79b84c766df3f8a80
+_md5_=4c0c71d25bf2b79c698e5520e225ad58
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2
index 13e8e6d7c172..e2acbb0ee2a7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=49d2c65cb186307a39b26e31c36d6549
+_md5_=a1144d3bd8a47f79bb1b5a8b6172c483
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2
index 7e2cb9f273c3..07219a15e38a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4e9cc7cec0afd0e20abd2ab4dcbe8203
+_md5_=8821b3614821296947dbafbef1b8527d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2
index 915bc9bfd8ce..d928170186ef 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=76003daeade67dc6bf74cd5bf72b1e3a
+_md5_=2f68c981d4dc7dcd27b1b08c34ac127b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2
index 3668a40c3b37..8474b8b1da29 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=+egl gles2 +opengl wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?,egl=,gles2=,opengl=,wayland=,X=] >=x11-libs/gtk+-3.15:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gles2? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<media-libs/gst-plugins-bad-1.13.1:1.0 >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6252887432bc08f026e5129ecb5c7813
+_md5_=8c68b52e71cbbf89102c1f7f31166531
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2
index 182c15987a39..7d7164082652 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=|| ( media-sound/jack2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-video/pipewire[jack-sdk(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=746610c679a8c4a423de7aeb3eb43ca3
+_md5_=bd74ff9b9e5ed18da65a9c25f49e7a52
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2
index d4d98a33de28..1ce8ea4a7e6c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libjpeg-turbo: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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d3c8db592283b208e03f92b419d4960d
+_md5_=f812aef8484fc37346836925fece6fdd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2
index 9af99b54a0f2..01fafce48ac8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae7b704f24dadf6063da400b061f51b5
+_md5_=b81b7ac3fe1a00a02bac1b0426bb04d8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2
index 79ab5ee0d438..4c518d81d787 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=media-libs/libldac[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e4b7bebfec7a9f19ff1e2b8c917c55df
+_md5_=937c6f95436eeb50722767674c0b8cc4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2
index 2a8e1dfb594f..5520075f73c8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/modules/gst-libav.html
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20.2:1.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(-)?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=media-video/ffmpeg-4: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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?]
 RESTRICT=!test? ( test )
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6d35f7be67b9634a0ad0a1cb60fb8f62
+_md5_=94bfba75705fd48e99b84050a1dd76a6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18
index 83b921c011e7..b674d3af3275 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://nice.freedesktop.org/wiki/
 INHERIT=meson-multilib
 IUSE=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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/gstreamer:1.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(-)?] media-libs/gst-plugins-base:1.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(-)?]
 SLOT=1.0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.18.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d4e3c1ee6d7c111278cd988d99e9d63c
+_md5_=86633be350ad0c4a04dbb2df32a3bf6b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2
index 21ab98c3d091..db44c90c8025 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libpng-1.6.10: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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5b531b5a7b0f4a3bf972d5df13304d9e
+_md5_=36eeed3fb34cf36665dc43933c06a5ed
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2
index 1b4748a35882..52d037ac8c6f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-plugins/libvisual-plugins-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c944012e2bcf01ab5f49bf8b5cf1b8db
+_md5_=771acbeed6325316057c35bf34fb38eb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2
index dff72d911ceb..f2f92d6ae97d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2
@@ -4,10 +4,10 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=multilib-build
 IUSE=aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.20.2:1.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(-)?] >=media-libs/gst-plugins-base-1.20.2:1.0[alsa?,ogg?,theora?,vorbis?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.20.2:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.20.2:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.20.2:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.20.2:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.20.2:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.20.2:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.20.2:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.20.2:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.20.2:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.20.2:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.20.2:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.20.2:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.20.2:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.20.2:1.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.20.2:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-mpg123-1.20.2:1.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.20.2:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.20.2:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.20.2:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.20.2:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.20.2:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.20.2:1.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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-1.20.2:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.20.2:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.20.2:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.20.2:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.20.2:1.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=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=fdb11ae8a602b56b6e1226afcf635a2a
+_md5_=9ae1cfa5574ab312d56c59976f118010
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2
index 0315efaf58d0..8d8823809234 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm64 ~hppa ~mips ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=546328f5ca5afee09aa8e66a8a640dc9
+_md5_=c9da9086a3e5b2a07b049dff03baaf51
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2
index 7a3115252434..366ba876d2b5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b386b9c5289b71606e301ad8267efbc6
+_md5_=044146e8c0f769131e5863b378740bba
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2
index 196e9a9422e3..92a5ae9a580d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/mpg123-1.23[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b51e348b8cf02400fd30c29b4fe22aaf
+_md5_=90964520f5e743004a7521e2d6d6a7bf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2
index 483fa1849f03..0213d8114d33 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/neon-0.30.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(-)?] <=net-libs/neon-0.32.99[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=edb6435b13d60955ed2a139d82c8fa33
+_md5_=6da420d6e0cbc29a772ad3940d1707e0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2
index c7de6e87834b..16370a158fc0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 arm arm64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=|| ( >=media-libs/libfreeaptx-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =media-libs/libopenaptx-0.2.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(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=980d9a797f7053ab66075d73290a4914
+_md5_=d397da7348bc54aca42d594970bd8993
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2
index ed659270507a..b91c3ad44991 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/opus-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !media-plugins/gst-plugins-opusparse >=media-libs/gst-plugins-base-1.20.2:1.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(-)?,ogg] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.20.2.tar.xz https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dd2440b630d11a97927a7692dc65b240
+_md5_=9d5e4c2af51a2aae135b5d0cc672ec81
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2
index 48cc9deeb518..f5e9eb289aa7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=058660203c236867b72f1be30461b903
+_md5_=8a2fc21ca01ed644e57c494d46ff0e29
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2
index 45d5dc2c9af3..4ee130590c2f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e2d093894fed9a5a243df6338c7d1572
+_md5_=841fa25f3244cf80bb07f01af48db29a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2
index 9703e8ae6b31..c7de04a0a561 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libiec61883-1.2.0-r1[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-libs/libraw1394-2.1.0-r1[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-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f7ac1e4cfd40f4f9895606a4a91a4bc
+_md5_=0af01c8f0f124992fbeea0ee517be7c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2
index b2a5e13caf9c..00264770d5e8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdnav-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libdvdread-4.2.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2cfbbc2077f5eb573328ef10da1aeff6
+_md5_=0be7bd602a3f11b73aa41a955c8a7027
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2
index 4e5b53da08d6..4a3eebbf1ec3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6fec1f42bdf6dc875bb175be3b29f36d
+_md5_=84785b831353d1cd072b052609765255
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2
index 4ad8fb8f1df6..d6ca0566dc53 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fb1efa0d75cb0b62099c266409296f42
+_md5_=0ea62816d62d86e72a3a11db14bebc6a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2
index a24353d2ad95..c1d134c9d8fb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b677d2efd5d36afecaa5c4fadc14b69a
+_md5_=bee163e29887b634c3a36e44093f7e33
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2
index 47861fd18f1a..a2e304fb4392 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~x64-macos
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsoup-2.48:2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0a9c6d03ec496cfcf24deb9c723051bb
+_md5_=f8b24ccfb3a358ff64744186c752d973
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2
index ad69b65b5a4d..e0df7e43893f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b03a6a8251833cd072b9f8e7676369e9
+_md5_=abeb142cb307664a89cc5ce15bd6a243
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2
index 3407373534b2..4701f5f8b8e7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ia64 ~ppc ~ppc64 ~riscv x86
+KEYWORDS=~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=net-libs/libsrtp-2.1.0:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bde63776132e36f654bcbfb18cf2c515
+_md5_=9d6e212310a7255e3dfd8b3dab0bb84e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2
index 802b229490fb..0a1f15d2ced0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0126782e8e2efad0fb2e72b71c4fc8f4
+_md5_=f35d0a9257cfd54a62496b4ee309af6a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2
index d1a4dcec23bb..6262e08a508c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2999e635e93466e6feed4989b06adbec
+_md5_=b42cc0d3f97074f297d887320e48942b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2
index 977222b622af..00f701ebd125 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=udev test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-base-1.20.2:1.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(-)?] udev? ( >=dev-libs/libgudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4026670f167a804c174204597ae5e5c5
+_md5_=fac1b28876d8f072513680a2acf7f454
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2
index aae1ec587756..aebc908d6527 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi
 INHERIT=gstreamer-meson python-any-r1
 IUSE=+drm +egl gles2 +opengl wayland +X test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 nls test
-KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?] >=x11-libs/libva-1.4.0:=[drm(+)?,wayland?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] drm? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.98[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/gst-plugins-base-1.20.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl(+)?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/gst-plugins-base-1.20.2:1.0[egl?,gles2?,opengl?,wayland?,X?] media-libs/mesa[gles2?,egl(+)?,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrender[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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=|| ( drm gles2 opengl wayland X ) gles2? ( egl ) opengl? ( || ( egl X ) )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=17b77025006529efc6ef6de51dcd50b2
+_md5_=463adcd585a4e48cec08a3133d3cd989
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2
index aafeed2824d3..cf7b799c4121 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libvpx-1.7.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(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=83beb9dc7268847624d11897650d72fe
+_md5_=1b9392e5266607f5696e7c7351caf888
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2
index 42be45086070..8e54fa03b0d8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7bd6ec07efa76915be901b1eaa29ec1b
+_md5_=333251bbaa59d7fa9e5a156c5d7a0668
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2
index a2b31c775ac7..0e3dbed8c92e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?] >=media-plugins/gst-plugins-sctp-1.20.2:1.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(-)?] >=media-libs/webrtc-audio-processing-0.2: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(-)?] <media-libs/webrtc-audio-processing-0.4:0 >=net-libs/libnice-0.1.17[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-bad-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e641697ff9a184f108a667730467e7a5
+_md5_=62b9979792a018c57560c5b8e928648b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2
index 4b2a3b9516f0..c7101a761206 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-ugly-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8acfc51ee58f1dbbe6aecc78ff3fa51c
+_md5_=0860501f5b9e640ae426326a05e00b3e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2
index d8b13dff0a58..1f64e7783154 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gstreamer.freedesktop.org/
 INHERIT=gstreamer-meson
 IUSE=test 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=amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/gst-plugins-base-1.20.2:1.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(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.20:1.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(-)?] >=media-libs/gst-plugins-good-1.20.2:1.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(-)?]
 RESTRICT=test
 SLOT=1.0
 SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.20.2.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gstreamer-meson	6c38e47af358e7df5ba1ed366493e4eb	meson	8f48ffde53174aba67239f0da61ac9d3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a706498e806c0957443314c5791d5d42
+_md5_=3565e81d748186dce1be60c66abb3b9a
diff --git a/metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r2 b/metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r2
new file mode 100644
index 000000000000..1aa98d6d55d6
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/ladspa-sdk >=media-libs/libbs2b-3.1.0
+DESCRIPTION=LADSPA plugin for bs2b headphone filter
+EAPI=8
+HOMEPAGE=http://bs2b.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=media-libs/ladspa-sdk >=media-libs/libbs2b-3.1.0
+SLOT=0
+SRC_URI=mirror://sourceforge/bs2b/plugins/LADSPA%20plugin/0.9.1/ladspa-bs2b-0.9.1.tar.bz2
+_md5_=bde0a6c1b5828014c7e15c424528a606
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index ab89db13135f..02c3c6792e52 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/flrig-1.4.5 b/metadata/md5-cache/media-radio/flrig-1.4.5
index 5c5f1fd8e124..29e9b09422d6 100644
--- a/metadata/md5-cache/media-radio/flrig-1.4.5
+++ b/metadata/md5-cache/media-radio/flrig-1.4.5
@@ -4,9 +4,9 @@ DESCRIPTION=Transceiver control program for Amateur Radio use
 EAPI=8
 HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
 IUSE=nls
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
 SLOT=0
 SRC_URI=mirror://sourceforge/fldigi/flrig-1.4.5.tar.gz
-_md5_=cf9ccd84a683f68505980f614568f9fb
+_md5_=0de23162ac0784e65ac8afdcfbd21430
diff --git a/metadata/md5-cache/media-radio/gpredict-2.3-r1 b/metadata/md5-cache/media-radio/gpredict-2.3-r1
index ea56410b6706..844dd9cac919 100644
--- a/metadata/md5-cache/media-radio/gpredict-2.3-r1
+++ b/metadata/md5-cache/media-radio/gpredict-2.3-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Real-time satellite tracking and orbit prediction application
 EAPI=7
 HOMEPAGE=http://gpredict.oz9aec.net
 INHERIT=autotools
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gdk-pixbuf[jpeg] x11-libs/gtk+:3 x11-libs/goocanvas:2.0 net-misc/curl
 SLOT=0
 SRC_URI=https://github.com/csete/gpredict/archive/v2.3.tar.gz -> gpredict-2.3.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8163025d0abae70135de77279037a21f
+_md5_=c1dbc4a49599ce633230cd65f9592cb8
diff --git a/metadata/md5-cache/media-radio/tqsl-2.6.3 b/metadata/md5-cache/media-radio/tqsl-2.6.3
new file mode 100644
index 000000000000..47a463ba8b6a
--- /dev/null
+++ b/metadata/md5-cache/media-radio/tqsl-2.6.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= dev-db/lmdb:= sys-libs/zlib:= x11-libs/wxGTK:3.0-gtk3=
+DESCRIPTION=ARRL Logbook of the World
+EAPI=8
+HOMEPAGE=https://www.arrl.org/tqsl-download
+INHERIT=cmake wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=LOTW
+RDEPEND=dev-libs/expat:= dev-libs/openssl:0= net-misc/curl:= dev-db/lmdb:= sys-libs/zlib:= x11-libs/wxGTK:3.0-gtk3=
+SLOT=0
+SRC_URI=https://www.arrl.org/tqsl/tqsl-2.6.3.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=93a5c800602a002b34624f3204647952
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 95ac1991ad61..391fd9fdc4fc 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/abcmidi-2022.04.06 b/metadata/md5-cache/media-sound/abcmidi-2022.04.06
deleted file mode 100644
index 0878b8156fed..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2022.04.06
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=install prepare
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=8
-HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
-INHERIT=autotools
-IUSE=examples
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2022.04.06.zip
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=383f6d93d617c76dbecf74b406c2cc2d
diff --git a/metadata/md5-cache/media-sound/abcmidi-2022.04.28 b/metadata/md5-cache/media-sound/abcmidi-2022.04.28
index 9b193755147c..4755645ecf89 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2022.04.28
+++ b/metadata/md5-cache/media-sound/abcmidi-2022.04.28
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://ifdo.ca/~seymour/runabc/top.html
 INHERIT=autotools
 IUSE=examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://ifdo.ca/~seymour/runabc/abcMIDI-2022.04.28.zip
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6472bf39705eebc0d5dee53ab12c1973
+_md5_=383f6d93d617c76dbecf74b406c2cc2d
diff --git a/metadata/md5-cache/media-sound/easyeffects-6.2.5 b/metadata/md5-cache/media-sound/easyeffects-6.2.5
new file mode 100644
index 000000000000..f218e0f1900e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/easyeffects-6.2.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-util/desktop-file-utils dev-util/itstool media-libs/libsamplerate sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm pretend test
+DEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/fftw:3.0
+DESCRIPTION=Limiter, auto volume and many other plugins for PipeWire applications
+EAPI=8
+HOMEPAGE=https://github.com/wwmm/easyeffects
+INHERIT=gnome2-utils flag-o-matic meson
+IUSE=calf +doc mda-lv2 zamaudio
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/nlohmann_json dev-cpp/tbb >=dev-libs/glib-2.56:2 dev-libs/libfmt >=dev-libs/libsigc++-3.0.6:3 >=gui-libs/gtk-4.2.1:4 gui-libs/libadwaita:1 media-libs/libbs2b >=media-libs/libebur128-1.2.0 media-libs/libsndfile >=media-libs/lilv-0.22 >=media-libs/lv2-1.18.2 media-libs/rnnoise media-libs/rubberband[ladspa] media-libs/speexdsp >=media-libs/zita-convolver-3.0.0 >=media-video/pipewire-0.3.41 sci-libs/fftw:3.0 >=media-libs/lsp-plugins-1.1.24[lv2] sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) mda-lv2? ( media-plugins/mda-lv2 ) zamaudio? ( media-plugins/zam-plugins )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v6.2.5.tar.gz -> easyeffects-6.2.5.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=f78af22f929298e29458f8152662689a
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.6 b/metadata/md5-cache/media-sound/fluidsynth-2.2.6
deleted file mode 100644
index 73938aade84c..000000000000
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[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=Software real-time synthesizer based on the Soundfont 2 specifications
-EAPI=8
-HOMEPAGE=https://www.fluidsynth.org
-INHERIT=cmake-multilib systemd toolchain-funcs
-IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0/3
-SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.6.tar.gz -> fluidsynth-2.2.6.tar.gz
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=81bbb0455e8a4c9bc1b7c1c42ff27744
diff --git a/metadata/md5-cache/media-sound/fluidsynth-2.2.7 b/metadata/md5-cache/media-sound/fluidsynth-2.2.7
index 22d65a1c907e..cc469c9e22f4 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-2.2.7
+++ b/metadata/md5-cache/media-sound/fluidsynth-2.2.7
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.fluidsynth.org
 INHERIT=cmake-multilib systemd toolchain-funcs
 IUSE=alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ppc ppc64 ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] lash? ( media-sound/lash[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ladspa? ( media-libs/ladspa-sdk[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/cmt-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[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(-)?] ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndfile? ( media-libs/libsndfile[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/3
 SRC_URI=https://github.com/FluidSynth/fluidsynth/archive/v2.2.7.tar.gz -> fluidsynth-2.2.7.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7063c868d65d7e90eb752534c07a36d5
+_md5_=81bbb0455e8a4c9bc1b7c1c42ff27744
diff --git a/metadata/md5-cache/media-sound/gnome-music-42.1 b/metadata/md5-cache/media-sound/gnome-music-42.1
index d32f2cc51605..6d18d9117d77 100644
--- a/metadata/md5-cache/media-sound/gnome-music-42.1
+++ b/metadata/md5-cache/media-sound/gnome-music-42.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Music https://gitlab.gnome.org/GNOME/gnome-music/
 INHERIT=gnome.org gnome2-utils meson python-single-r1 xdg
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-libs/glib-2.67.1:2 >=net-libs/gnome-online-accounts-3.35.90[introspection] >=dev-libs/gobject-introspection-1.54:= >=gui-libs/gtk-4.5.0:4[introspection] >=gui-libs/libadwaita-1.0:1=[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] net-libs/libsoup:2.4[introspection] app-misc/tracker:3=[introspection(+)] >=x11-libs/pango-1.44:= python_single_target_python3_8? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_8(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_9(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-3.36.1:3[cairo,python_targets_python3_10(-)] >=dev-python/pycairo-1.14.0[python_targets_python3_10(-)] ) >=media-libs/grilo-0.3.13:0.3[introspection] >=media-plugins/grilo-plugins-0.3.13:0.3 || ( app-misc/tracker-miners:3[gstreamer] app-misc/tracker-miners:3[ffmpeg] ) x11-libs/libnotify[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-music/42/gnome-music-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5cc1443501763e4a624ed48caea10725
+_md5_=bc39f0d22960d07b55552b1906c59c33
diff --git a/metadata/md5-cache/media-sound/gnome-sound-recorder-42.0 b/metadata/md5-cache/media-sound/gnome-sound-recorder-42.0
index 6612d299c0a4..df9bbe6279c4 100644
--- a/metadata/md5-cache/media-sound/gnome-sound-recorder-42.0
+++ b/metadata/md5-cache/media-sound/gnome-sound-recorder-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Simple sound recorder
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Design/Apps/SoundRecorder https://gitlab.gnome.org/GNOME/gnome-sound-recorder
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/gjs-1.54.0 >=dev-libs/glib-2.46:2 >=gui-libs/gtk-4.4.0:4[introspection] media-libs/gst-plugins-bad:1.0 >=gui-libs/libadwaita-1.1.0:1= >=dev-libs/gobject-introspection-1.31.6 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection,ogg] x11-libs/gdk-pixbuf:2[introspection] media-libs/gst-plugins-good:1.0 media-plugins/gst-plugins-flac:1.0 media-plugins/gst-plugins-pulse:1.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-sound-recorder/42/gnome-sound-recorder-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98d986f1b436410dbc9becf099dd6b72
+_md5_=51a031b4d95c06d95b2b36c4bf6222a7
diff --git a/metadata/md5-cache/media-sound/kmidimon-1.2.0 b/metadata/md5-cache/media-sound/kmidimon-1.2.0
deleted file mode 100644
index 425192151322..000000000000
--- a/metadata/md5-cache/media-sound/kmidimon-1.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip dev-qt/linguist-tools:5 dev-util/ninja >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-2.4.0
-DESCRIPTION=MIDI monitor for ALSA sequencer
-EAPI=8
-HOMEPAGE=https://kmidimon.sourceforge.io/
-INHERIT=cmake xdg
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-2.4.0
-SLOT=0
-SRC_URI=mirror://sourceforge/kmidimon/kmidimon-1.2.0.tar.bz2
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d39ddc961b8b2a78b208e9d97bee7a67
diff --git a/metadata/md5-cache/media-sound/kmidimon-1.3.0 b/metadata/md5-cache/media-sound/kmidimon-1.3.0
index d988c6d3139d..844d12ba54a5 100644
--- a/metadata/md5-cache/media-sound/kmidimon-1.3.0
+++ b/metadata/md5-cache/media-sound/kmidimon-1.3.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://kmidimon.sourceforge.io/
 INHERIT=cmake xdg
 IUSE=debug
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/alsa-lib >=media-sound/drumstick-2.4.0
 SLOT=0
 SRC_URI=mirror://sourceforge/kmidimon/kmidimon-1.3.0.tar.bz2
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b3cfb4dc088af669844fa32f0991a41f
+_md5_=6ed280eac34eda5cc471573a5ee970b1
diff --git a/metadata/md5-cache/media-sound/patchage-1.0.6 b/metadata/md5-cache/media-sound/patchage-1.0.6
new file mode 100644
index 000000000000..8c1abe75267f
--- /dev/null
+++ b/metadata/md5-cache/media-sound/patchage-1.0.6
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[threads(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] >=dev-lang/python-3.9.9-r1:3.9[threads(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus ) dev-libs/boost dev-libs/libfmt:= dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Modular patch bay for JACK-based audio and MIDI systems
+EAPI=7
+HOMEPAGE=https://drobilla.net/software/patchage
+INHERIT=waf-utils python-any-r1 xdg
+IUSE=alsa debug jack-dbus
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 media-libs/ganv virtual/jack alsa? ( media-libs/alsa-lib ) jack-dbus? ( dev-libs/dbus-glib sys-apps/dbus )
+SLOT=0
+SRC_URI=https://download.drobilla.net/patchage-1.0.6.tar.bz2
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=82bfc673c0374b3ca2c8486c475a1725
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.0-r3 b/metadata/md5-cache/media-sound/pulseaudio-15.0-r3
index c43aa7e319b5..4d4870bec3ca 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-15.0-r3
+++ b/metadata/md5-cache/media-sound/pulseaudio-15.0-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
 INHERIT=bash-completion-r1 gnome2-utils meson-multilib optfeature systemd tmpfiles udev
 IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus +daemon doc elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf 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 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
 LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
 PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 RDEPEND=>=media-libs/libsndfile-1.0.20[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/speexdsp-1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libc alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) daemon? ( dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 ) dbus? ( >=sys-apps/dbus-1.4.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) daemon? ( bluetooth? ( gstreamer? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) ) ) virtual/tmpfiles
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba0e10f94696fe644f1104618b9eaeaa
+_md5_=4141675a48146b57102fe27dc2c93888
diff --git a/metadata/md5-cache/media-sound/pulseaudio-15.99.1-r1 b/metadata/md5-cache/media-sound/pulseaudio-16.0
similarity index 58%
rename from metadata/md5-cache/media-sound/pulseaudio-15.99.1-r1
rename to metadata/md5-cache/media-sound/pulseaudio-16.0
index d1c7fd7d2e39..56a8128c6704 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-15.99.1-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-16.0
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install test
-DEPEND=>=media-libs/libpulse-15.99.1[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-15.99.1[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
+DEPEND=>=media-libs/libpulse-16.0[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.0[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
 DESCRIPTION=A networked sound server with an advanced plugin system
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
@@ -7,7 +7,7 @@ INHERIT=multilib-minimal
 IUSE=bluetooth +daemon +glib jack native-headset ofono-headset 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=metapackage
-RDEPEND=>=media-libs/libpulse-15.99.1[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-15.99.1[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
+RDEPEND=>=media-libs/libpulse-16.0[glib?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] daemon? ( >=media-sound/pulseaudio-daemon-16.0[bluetooth?,glib?,jack?,native-headset?,ofono-headset?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=620966f3129275297047cbbec78074c8
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-15.99.1-r2 b/metadata/md5-cache/media-sound/pulseaudio-daemon-15.99.1-r2
deleted file mode 100644
index dbc77f5548b7..000000000000
--- a/metadata/md5-cache/media-sound/pulseaudio-daemon-15.99.1-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=media-libs/libpulse-15.99.1[dbus?,glib?,systemd?,tcpd?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
-DESCRIPTION=A networked sound server with an advanced plugin system
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
-INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
-IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev +webrtc-aec +X zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
-PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
-RDEPEND=>=media-libs/libpulse-15.99.1[dbus?,glib?,systemd?,tcpd?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( gstreamer? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) ) virtual/tmpfiles
-REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) ?? ( elogind systemd ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-15.99.1.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cee25bf6536eb32eb3796b9f140b8498
diff --git a/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0 b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0
new file mode 100644
index 000000000000..d859a8436be5
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pulseaudio-daemon-16.0
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl dev-perl/XML-Parser sys-devel/gettext virtual/libiconv virtual/libintl virtual/pkgconfig orc? ( >=dev-lang/orc-0.4.15 ) system-wide? ( dev-util/unifdef ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 test? ( >=dev-libs/check-0.9.10 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=A networked sound server with an advanced plugin system
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/PulseAudio/
+INHERIT=bash-completion-r1 gnome2-utils meson optfeature systemd tmpfiles udev
+IUSE=+alsa +alsa-plugin aptx +asyncns bluetooth dbus elogind equalizer +gdbm gstreamer +glib gtk ipv6 jack ldac lirc native-headset ofono-headset +orc oss selinux sox ssl systemd system-wide tcpd test +udev valgrind +webrtc-aec +X zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )
+PDEPEND=alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] ) )
+RDEPEND=>=media-libs/libpulse-16.0[dbus?,glib?,systemd?,tcpd?,valgrind?,X?] dev-libs/libatomic_ops >=media-libs/libsndfile-1.0.20 >=media-libs/speexdsp-1.2 || ( elibc_glibc? ( virtual/libc ) dev-libs/libpcre:3 ) alsa? ( >=media-libs/alsa-lib-1.0.24 ) asyncns? ( >=net-libs/libasyncns-0.1 ) bluetooth? ( >=net-wireless/bluez-5 media-libs/sbc ) dev-libs/libltdl sys-kernel/linux-headers >=sys-libs/libcap-2.22-r2 dbus? ( >=sys-apps/dbus-1.4.12 ) elogind? ( sys-auth/elogind ) equalizer? ( sci-libs/fftw:3.0 ) gdbm? ( sys-libs/gdbm:= ) glib? ( >=dev-libs/glib-2.28.0:2 ) gstreamer? ( media-libs/gst-plugins-base >=media-libs/gstreamer-1.14 ) gtk? ( x11-libs/gtk+:3 ) jack? ( virtual/jack ) lirc? ( app-misc/lirc ) ofono-headset? ( >=net-misc/ofono-1.13 ) orc? ( >=dev-lang/orc-0.4.15 ) selinux? ( sec-policy/selinux-pulseaudio ) sox? ( >=media-libs/soxr-0.1.1 ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) udev? ( >=virtual/udev-143[hwdb(+)] ) valgrind? ( dev-util/valgrind ) webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2:0 ) X? ( >=x11-libs/libxcb-1.6 x11-libs/libICE x11-libs/libSM >=x11-libs/libX11-1.4.0 >=x11-libs/libXtst-1.0.99.2 ) zeroconf? ( >=net-dns/avahi-0.6.12[dbus] ) !<media-sound/pulseaudio-15.0-r100 system-wide? ( alsa? ( media-sound/alsa-utils ) acct-user/pulse acct-group/audio acct-group/pulse-access ) bluetooth? ( gstreamer? ( ldac? ( media-plugins/gst-plugins-ldac ) aptx? ( media-plugins/gst-plugins-openaptx ) ) ) virtual/tmpfiles
+REQUIRED_USE=alsa-plugin? ( alsa ) bluetooth? ( dbus ) ?? ( elogind systemd ) equalizer? ( dbus ) native-headset? ( bluetooth ) ofono-headset? ( bluetooth ) udev? ( || ( alsa oss ) ) zeroconf? ( dbus )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-16.0.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cd4f5d1e2f669db1f50f7df013a53209
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.8.6 b/metadata/md5-cache/media-sound/pulseeffects-4.8.7
similarity index 94%
rename from metadata/md5-cache/media-sound/pulseeffects-4.8.6
rename to metadata/md5-cache/media-sound/pulseeffects-4.8.7
index 2ec1ddba7eb2..fb8e39745ecd 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.8.6
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.8.7
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=!media-sound/easyeffects >=dev-libs/boost-1.72:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=media-libs/gstreamer-1.12.5:1.0 media-libs/gst-plugins-base >=media-libs/gst-plugins-bad-1.12.5:1.0 media-libs/libebur128 media-libs/libsndfile >=media-libs/lilv-0.24.2-r1 >=media-libs/zita-convolver-3.0.0 media-sound/pulseaudio >=x11-libs/gtk+-3.20:3 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 ) rnnoise? ( media-libs/rnnoise ) >=media-libs/gst-plugins-good-1.12.5:1.0 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-plugins/gst-plugins-ladspa-1.12.5:1.0 >=media-plugins/gst-plugins-lv2-1.12.5:1.0 >=media-plugins/gst-plugins-pulse-1.12.5:1.0 sys-apps/dbus calf? ( >=media-plugins/calf-0.90.1[lv2] ) doc? ( gnome-extra/yelp ) rubberband? ( media-libs/rubberband[ladspa] ) webrtc? ( media-plugins/gst-plugins-webrtc ) zamaudio? ( media-plugins/zam-plugins )
 SLOT=0
-SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.6.tar.gz -> pulseeffects-4.8.6.tar.gz
+SRC_URI=https://github.com/wwmm/easyeffects/archive/v4.8.7.tar.gz -> pulseeffects-4.8.7.tar.gz
 _eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a9909c89cd5fbdddfa9853fc746a3380
+_md5_=4e2e4fff092a75254525bcc4d7a908e5
diff --git a/metadata/md5-cache/media-sound/rhythmbox-3.4.5 b/metadata/md5-cache/media-sound/rhythmbox-3.4.5
index bc4434e932ab..4d514f7e2996 100644
--- a/metadata/md5-cache/media-sound/rhythmbox-3.4.5
+++ b/metadata/md5-cache/media-sound/rhythmbox-3.4.5
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/rhythmbox/3.4/rhythmbox-3.4.5.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5fa2bbee5b5b7239301081832f346a36
+_md5_=1a32070e7c42687840281bcb18897904
diff --git a/metadata/md5-cache/media-sound/sonata-1.7.0-r1 b/metadata/md5-cache/media-sound/sonata-1.7.0-r1
new file mode 100644
index 000000000000..c4a88a5957ad
--- /dev/null
+++ b/metadata/md5-cache/media-sound/sonata-1.7.0-r1
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-mpd[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-mpd[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-mpd[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-python/unittest-or-fail[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/unittest-or-fail[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/unittest-or-fail[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=Elegant GTK+ music client for the Music Player Daemon (MPD)
+EAPI=8
+HOMEPAGE=https://www.nongnu.org/sonata/
+INHERIT=desktop distutils-r1 xdg
+IUSE=dbus taglib test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/python-mpd[python_targets_python3_8(-)] dbus? ( dev-python/dbus-python[python_targets_python3_8(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] dev-python/python-mpd[python_targets_python3_9(-)] dbus? ( dev-python/dbus-python[python_targets_python3_9(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] dev-python/python-mpd[python_targets_python3_10(-)] dbus? ( dev-python/dbus-python[python_targets_python3_10(-)] ) taglib? ( dev-python/tagpy[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/multani/sonata/archive/refs/tags/v1.7.0.tar.gz -> sonata-1.7.0.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6f4d6fdfc431334b74aba77fd566a14d
diff --git a/metadata/md5-cache/media-sound/soundconverter-4.0.3 b/metadata/md5-cache/media-sound/soundconverter-4.0.3
new file mode 100644
index 000000000000..e8f358b0400b
--- /dev/null
+++ b/metadata/md5-cache/media-sound/soundconverter-4.0.3
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_python3_8? ( dev-python/python-distutils-extra[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/python-distutils-extra[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/python-distutils-extra[python_targets_python3_10(-)] ) test? ( media-plugins/gst-plugins-flac:1.0 media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 media-plugins/gst-plugins-faac:1.0 media-plugins/gst-plugins-opus:1.0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DESCRIPTION=A simple audiofile converter application for the GNOME environment
+EAPI=8
+HOMEPAGE=https://soundconverter.org/
+INHERIT=gnome2-utils distutils-r1 virtualx xdg
+IUSE=aac flac mp3 ogg opus vorbis python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] x11-libs/pango[introspection] python_single_target_python3_8? ( dev-python/gst-python[python_targets_python3_8(-)] dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/gst-python[python_targets_python3_9(-)] dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/gst-python[python_targets_python3_10(-)] dev-python/pygobject[python_targets_python3_10(-)] ) media-libs/gst-plugins-base:1.0[vorbis?,ogg?] media-plugins/gst-plugins-meta:1.0 flac? ( media-plugins/gst-plugins-flac:1.0 ) media-libs/gst-plugins-good:1.0 mp3? ( media-libs/gst-plugins-bad:1.0 media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-lame:1.0 ) aac? ( media-plugins/gst-plugins-faac:1.0 ) opus? ( media-plugins/gst-plugins-opus:1.0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kassoulet/soundconverter/archive/4.0.3.tar.gz -> soundconverter-4.0.3.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=109d1a96bd359832cadd56e95555a97d
diff --git a/metadata/md5-cache/media-sound/xmms2-0.9.1 b/metadata/md5-cache/media-sound/xmms2-0.9.1
index 754758ab9070..9ce7537d9698 100644
--- a/metadata/md5-cache/media-sound/xmms2-0.9.1
+++ b/metadata/md5-cache/media-sound/xmms2-0.9.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/XMMS2
 INHERIT=multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
 IUSE=cxx mlib-update perl python server test aac airplay alsa ao cdda curl ffmpeg flac fluidsynth gme ices jack mac +mad mms modplug mp3 musepack ofa opus oss pulseaudio samba sid sndfile speex tremor vocoder +vorbis wavpack xml zeroconf +server valgrind python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm ppc ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=dev-libs/glib:2 sys-libs/readline:= server? ( aac? ( media-libs/faad2 ) airplay? ( dev-libs/openssl:= ) alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) cdda? ( dev-libs/libcdio-paranoia:= dev-libs/libcdio:= media-libs/libdiscid ) curl? ( net-misc/curl ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac ) fluidsynth? ( media-sound/fluidsynth:= ) gme? ( media-libs/game-music-emu ) ices? ( media-libs/libogg media-libs/libshout media-libs/libvorbis ) jack? ( virtual/jack ) mac? ( media-sound/mac ) mad? ( media-libs/libmad ) mms? ( media-libs/libmms media-video/ffmpeg:= ) modplug? ( media-libs/libmodplug ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) ofa? ( dev-libs/expat media-libs/libofa sci-libs/fftw:3.0= ) opus? ( media-libs/libogg media-libs/opus media-libs/opusfile ) pulseaudio? ( || ( media-libs/libpulse media-sound/pulseaudio ) ) samba? ( net-fs/samba ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/libogg media-libs/speex ) tremor? ( media-libs/tremor ) vocoder? ( media-libs/libsamplerate sci-libs/fftw:3.0= ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) xml? ( dev-libs/libxml2 ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] net-misc/curl ) ) perl? ( dev-lang/perl dev-perl/glib-perl virtual/perl-Carp virtual/perl-IO virtual/perl-Scalar-List-Utils ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_single_target_python3_8? ( dev-python/pygobject[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject[python_targets_python3_10(-)] ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !server? ( test )
 SLOT=0
 SRC_URI=https://github.com/xmms2/xmms2-devel/releases/download/0.9.1/xmms2-0.9.1.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	perl-functions	fea344a91ebf37efadf172c6a3de5a72	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ff651bb174efaa718c13d5dd0c1b24ad
+_md5_=38d9859c96b82a9b02b4a6e91b24da82
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index c1a4c73fd2e3..7bb11d1eb0c7 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.22.1 b/metadata/md5-cache/media-tv/v4l-utils-1.22.1
index cb3c8dab2943..709b2056147f 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.22.1
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.22.1
@@ -12,4 +12,4 @@ RDEPEND=>=media-libs/libv4l-1.22.1[dvb?,jpeg] >=virtual/jpeg-0-r2:0= bpf? ( virt
 SLOT=0
 SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.22.1.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2f6e4622c4e6dbd53f91db17a8259708
+_md5_=12c1f5a224f7ca8c76f4b0158b4cf721
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 2aef52396458..e1e5f0cc2eb4 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4.2 b/metadata/md5-cache/media-video/ffmpeg-4.4.2
index 5da31b567477..40406821eac6 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4.2
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4.2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://ffmpeg.org/
 INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs verify-sig
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r vmaf fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amf amrenc kvazaar libaom mp3 openh264 rav1e snappy svt-av1 theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amf? ( media-video/amdgpu-pro-amf ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0: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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libogg-1.3.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(-)?] >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.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(-)?] ) gme? ( >=media-libs/game-music-emu-0.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(-)?] ) gmp? ( >=dev-libs/gmp-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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[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-libs/libraw1394-2.1.0-r1[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-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[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-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5:=[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.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(-)?] ) vmaf? ( media-libs/libvmaf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.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(-)?] ) vpx? ( >=media-libs/libvpx-1.4.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(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[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=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-4.4.2.tar.xz.asc )
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=f27db5aedaea71bcb3a22711e08ac9ff
+_md5_=d2858f2209bb2243e82c30ef9877830e
diff --git a/metadata/md5-cache/media-video/ffmpeg-5.0.1 b/metadata/md5-cache/media-video/ffmpeg-5.0.1
index 8b94d96adff0..17656e2482f5 100644
--- a/metadata/md5-cache/media-video/ffmpeg-5.0.1
+++ b/metadata/md5-cache/media-video/ffmpeg-5.0.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 INHERIT=flag-o-matic multilib multilib-minimal toolchain-funcs verify-sig
 IUSE=alsa chromium doc +encode oss pic sndio static-libs test v4l +bzip2 cpudetection debug gcrypt +gnutls gmp +gpl hardcoded-tables +iconv libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau vulkan X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 +dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg nvenc vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r vmaf fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amf amrenc kvazaar libaom mp3 openh264 rav1e snappy svt-av1 theora twolame webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amf? ( media-video/amdgpu-pro-amf ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0: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(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rav1e? ( >=media-video/rav1e-0.4:=[capi] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libogg-1.3.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(-)?] >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.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(-)?] ) gme? ( >=media-libs/game-music-emu-0.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(-)?] ) gmp? ( >=dev-libs/gmp-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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[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-libs/libraw1394-2.1.0-r1[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-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1:2=[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-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.11.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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5:=[sftp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( >=media-libs/nv-codec-headers-9.1.23.1 ) svt-av1? ( >=media-libs/svt-av1-0.8.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.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(-)?] ) vmaf? ( media-libs/libvmaf[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.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(-)?] ) vpx? ( >=media-libs/libvpx-1.4.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(-)?] ) vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[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=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) vidstab? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/57.59.59
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-5.0.1.tar.xz.asc )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d0c18081b9a350ed8d6a0988a1ff70e4
+_md5_=c47547364e7bb5ada6147b89f5180b57
diff --git a/metadata/md5-cache/media-video/ffmpeg-chromium-102 b/metadata/md5-cache/media-video/ffmpeg-chromium-102
new file mode 100644
index 000000000000..86a93b167891
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffmpeg-chromium-102
@@ -0,0 +1,17 @@
+BDEPEND=>=sys-devel/make-3.81 virtual/pkgconfig cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
+DEFINED_PHASES=compile configure install prepare
+DEPEND=mmal? ( media-libs/raspberrypi-userland ) opus? ( >=media-libs/opus-1.0.2-r2 ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0= ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 ) vdpau? ( >=x11-libs/libvdpau-0.7 ) vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
+DESCRIPTION=FFmpeg built specifically for codec support in Chromium-based browsers
+EAPI=8
+HOMEPAGE=https://ffmpeg.org/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=cpudetection debug +gpl vaapi vdpau vulkan mmal +opus video_cards_nvidia +threads cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 )
+RDEPEND=mmal? ( media-libs/raspberrypi-userland ) opus? ( >=media-libs/opus-1.0.2-r2 ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0= ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 ) vdpau? ( >=x11-libs/libvdpau-0.7 ) vulkan? ( >=media-libs/vulkan-loader-1.2.189:= )
+REQUIRED_USE=arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
+RESTRICT=test
+SLOT=102
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ffmpeg-chromium-102.tar.gz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c0b83b4bf6ebfa253b725363350ed2f2
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-67.0.0 b/metadata/md5-cache/media-video/mkvtoolnix-67.0.0
index 5ccebb647d46..58daf9e25cb3 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-67.0.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-67.0.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix
 INHERIT=autotools flag-o-matic multiprocessing qmake-utils xdg
 IUSE=dbus debug dvd gui nls pch test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/boost-1.66:= dev-libs/gmp:= >=dev-libs/libebml-1.4.2:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 gui? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtmultimedia:5 ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://mkvtoolnix.download/sources/mkvtoolnix-67.0.0.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ff761cff5f2efe33be109059a19a6570
+_md5_=90f6a347dc4aa48e3c9b86d23b730fe4
diff --git a/metadata/md5-cache/media-video/pitivi-2021.05-r1 b/metadata/md5-cache/media-video/pitivi-2021.05-r1
new file mode 100644
index 000000000000..4d92578b4a4e
--- /dev/null
+++ b/metadata/md5-cache/media-video/pitivi-2021.05-r1
@@ -0,0 +1,16 @@
+BDEPEND=app-text/yelp-tools python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) >=dev-util/intltool-0.35.5 dev-util/itstool sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pycairo-1.10[python_targets_python3_10(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.18.4:1.0[introspection] >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-libs/libpeas[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_10(-)] ) gnome-base/librsvg:= >=media-libs/gstreamer-editing-services-1.18.4:1.0[introspection] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.18.4:1.0 >=media-plugins/gst-plugins-gtk-1.18.4:1.0 >=media-libs/gst-plugins-good-1.18.4:1.0 >=media-plugins/gst-plugins-libav-1.18.4:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.18.4:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection]
+DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
+EAPI=8
+HOMEPAGE=https://www.pitivi.org
+INHERIT=gnome.org meson python-single-r1 xdg
+IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite] ) python_single_target_python3_8? ( >=dev-python/pycairo-1.10[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pycairo-1.10[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pycairo-1.10[python_targets_python3_10(-)] ) >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.18.4:1.0[introspection] >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-libs/libpeas[python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-)] dev-python/numpy[python_targets_python3_8(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-)] dev-python/numpy[python_targets_python3_9(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] >=dev-python/gst-python-1.4:1.0[python_targets_python3_10(-)] dev-python/matplotlib[python_targets_python3_10(-)] dev-python/numpy[python_targets_python3_10(-)] >=dev-python/pygobject-3.8:3[python_targets_python3_10(-)] ) gnome-base/librsvg:= >=media-libs/gstreamer-editing-services-1.18.4:1.0[introspection] >=media-libs/gst-plugins-base-1.18.4:1.0[introspection,theora] >=media-libs/gst-plugins-bad-1.18.4:1.0 >=media-plugins/gst-plugins-gtk-1.18.4:1.0 >=media-libs/gst-plugins-good-1.18.4:1.0 >=media-plugins/gst-plugins-libav-1.18.4:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.18.4:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection]
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/pitivi/2021/pitivi-2021.05.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=bf97617c6931b8d465df1daa7c7e5c51
diff --git a/metadata/md5-cache/media-video/totem-42.0-r1 b/metadata/md5-cache/media-video/totem-42.0-r1
index ec9989b1fd89..e493f1b8ecd2 100644
--- a/metadata/md5-cache/media-video/totem-42.0-r1
+++ b/metadata/md5-cache/media-video/totem-42.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Videos https://gitlab.gnome.org/GNOME/totem/
 INHERIT=gnome.org gnome2-utils meson virtualx xdg python-single-r1
 IUSE=gtk-doc +python test test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/glib-2.56.0:2 >=x11-libs/gtk+-3.22.0:3[introspection] >=gui-libs/libhandy-1.5.0:1 >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 >=dev-libs/gobject-introspection-1.54:= python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) python_single_target_python3_8? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pygobject-2.90.3:3[python_targets_python3_10(-)] ) ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-gtk:1.0[opengl] media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( x11-libs/pango[introspection] >=dev-libs/libpeas-1.1.0[python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/totem/42/totem-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0b717889ce542b41e6e9ca3ec50e9665
+_md5_=d47464200c0136ef8580e3a081714efd
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10 b/metadata/md5-cache/media-video/wireplumber-0.4.10
deleted file mode 100644
index f13c2dcf9c4d..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Replacement for pipewire-media-session
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
-INHERIT=lua-single meson systemd
-IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.48:= virtual/libc virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
-_eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=b55190120928fcd5a5d841aabe4a0649
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.10-r2 b/metadata/md5-cache/media-video/wireplumber-0.4.10-r3
similarity index 97%
rename from metadata/md5-cache/media-video/wireplumber-0.4.10-r2
rename to metadata/md5-cache/media-video/wireplumber-0.4.10-r3
index 2d278c404a78..28b379ebb0f9 100644
--- a/metadata/md5-cache/media-video/wireplumber-0.4.10-r2
+++ b/metadata/md5-cache/media-video/wireplumber-0.4.10-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.10/wireplumber-0.4.10.tar.gz
 _eclasses_=lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=32d591b864a9b2ce2dd4835a20d3bee4
+_md5_=67dc5638d87e217d84b5bcfb9b079958
diff --git a/metadata/md5-cache/media-video/wireplumber-9999 b/metadata/md5-cache/media-video/wireplumber-9999
index 739f85e8e8a0..aa2e3c886a26 100644
--- a/metadata/md5-cache/media-video/wireplumber-9999
+++ b/metadata/md5-cache/media-video/wireplumber-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogi
 RESTRICT=!test? ( test )
 SLOT=0/0.4
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=812271c8eb354629e8844bfc6538b732
+_md5_=91b581d46c59518658a1132cd41a0eca
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 536532c5ad38..e69cdf3e45fb 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4 b/metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4
index fa72ea9a34bd..d4a503ef1688 100644
--- a/metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4
+++ b/metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
 DESCRIPTION=Utility for viewing/manipulating the MAC address of network interfaces
 EAPI=7
 HOMEPAGE=https://github.com/alobbs/macchanger
-KEYWORDS=amd64 arm ~arm64 ppc sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/alobbs/macchanger/releases/download/1.7.0/macchanger-1.7.0.tar.gz mirror://debian/pool/main/m/macchanger/macchanger_1.7.0-5.4.debian.tar.xz
-_md5_=cc877ae6050ebbfc6671b70f4d3543f3
+_md5_=fb5b5c38dccf7ec6ba02ef80ca8d04ba
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100 b/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
deleted file mode 100644
index 9bc20ed24480..000000000000
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-apps/groff virtual/pkgconfig virtual/awk python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) test? ( sys-devel/bc lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-DESCRIPTION=A system to store and display time-series data
-EAPI=7
-HOMEPAGE=https://oss.oetiker.ch/rrdtool/
-INHERIT=autotools lua perl-module distutils-r1 flag-o-matic
-IUSE=dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.7.2 )
-RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) rados? ( sys-cluster/ceph ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ) lua? ( || ( lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 ) test? ( graph ) )
-RESTRICT=!test? ( test )
-SLOT=0/8.0.0
-SRC_URI=https://oss.oetiker.ch/rrdtool/pub/rrdtool-1.7.2.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a545920e50e3ae6d500ff7f25cad480c
diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.8.0 b/metadata/md5-cache/net-analyzer/rrdtool-1.8.0
index be76693c1bd3..96f0eccc10fe 100644
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.8.0
+++ b/metadata/md5-cache/net-analyzer/rrdtool-1.8.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://oss.oetiker.ch/rrdtool/
 INHERIT=autotools lua perl-module distutils-r1 flag-o-matic
 IUSE=dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test lua_targets_luajit lua_targets_lua5-1 lua_targets_lua5-3 lua_targets_lua5-4 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=ruby? ( ~dev-ruby/rrdtool-bindings-1.8.0 )
 RDEPEND=dev-libs/glib:2[static-libs(+)?] dev-libs/libxml2:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( media-libs/libpng:0=[static-libs(+)?] x11-libs/cairo[svg,static-libs(+)?] x11-libs/pango ) lua? ( lua_targets_luajit? ( dev-lang/luajit:= ) lua_targets_lua5-1? ( dev-lang/lua:5.1 ) lua_targets_lua5-3? ( dev-lang/lua:5.3 ) lua_targets_lua5-4? ( dev-lang/lua:5.4 ) ) perl? ( dev-lang/perl:= ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) rados? ( sys-cluster/ceph ) rrdcached? ( acct-group/rrdcached acct-user/rrdcached ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/8.0.0
 SRC_URI=https://github.com/oetiker/rrdtool-1.x/releases/download/v1.8.0/rrdtool-1.8.0.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua	d5c7dbcaf69f3065f5d7ce3b172c2214	lua-utils	e69ff116248d78546ae1a234c086fe80	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	8eed4e2982026c684ff7c19cd4c88ed0	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f9251af3592e33a6ad70c3dda4d33456
+_md5_=06db7c2067660c96c3d98c465c6af6ff
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.5 b/metadata/md5-cache/net-analyzer/ssldump-1.5
new file mode 100644
index 000000000000..5d0e09695d85
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/json-c:= dev-libs/openssl:= net-libs/libnet:1.1 net-libs/libpcap
+DESCRIPTION=An SSLv3/TLS network protocol analyzer
+EAPI=8
+HOMEPAGE=https://github.com/adulau/ssldump/
+INHERIT=autotools
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=openssl
+RDEPEND=dev-libs/json-c:= dev-libs/openssl:= net-libs/libnet:1.1 net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/adulau/ssldump/archive/v1.5.tar.gz -> ssldump-1.5.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=247b307411b71d134eb7c32a4d133f63
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index cd48380a8e6c..59104c2d8853 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/bind-9.16.29 b/metadata/md5-cache/net-dns/bind-9.16.29
new file mode 100644
index 000000000000..722c30fbc5b2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.16.29
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile config configure install postinst prepare
+DEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:=
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+INHERIT=python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles
+IUSE=berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=acct-group/named acct-user/named berkdb? ( sys-libs/db:= ) dev-libs/openssl:=[-bindist(-)] mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap:= ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( dev-libs/libmaxminddb:= ) geoip2? ( dev-libs/libmaxminddb:= ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb:= ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/ply[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-libs/libuv:= selinux? ( sec-policy/selinux-bind ) sys-process/psmisc virtual/tmpfiles
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) dnsrps? ( dlz ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.29/bind-9.16.29.tar.xz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	db-use	867a9246a45efc09934e0f8e3380c813	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=b4af2280902ef0e52c17e3a1e82aa224
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.16.29 b/metadata/md5-cache/net-dns/bind-tools-9.16.29
new file mode 100644
index 000000000000..c58fadf6bea3
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.16.29
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( dev-python/sphinx ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) dev-libs/openssl:= xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+INHERIT=autotools flag-o-matic toolchain-funcs
+IUSE=+caps doc gssapi idn ipv6 libedit readline xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=dev-libs/libuv:= caps? ( sys-libs/libcap ) dev-libs/openssl:= xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:= ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.16.29/bind-9.16.29.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=77cdf2b03cd1496359baf72b6c6f198d
diff --git a/metadata/md5-cache/net-dns/coredns-1.9.3 b/metadata/md5-cache/net-dns/coredns-1.9.3
new file mode 100644
index 000000000000..40bc0bf8c98f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/coredns-1.9.3
@@ -0,0 +1,15 @@
+BDEPEND=filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DESCRIPTION=A DNS server that chains middleware
+EAPI=7
+HOMEPAGE=https://github.com/coredns/coredns
+INHERIT=fcaps go-module systemd tmpfiles
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2
+RDEPEND=acct-user/coredns acct-group/coredns filecaps? ( sys-libs/libcap ) virtual/tmpfiles
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/coredns/coredns/archive/v1.9.3.tar.gz -> coredns-1.9.3.tar.gz https://dev.gentoo.org/~zmedico/dist/coredns-1.9.3-deps.tar.xz
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=12602d342e40a170fa633432d7686ff3
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 0d84dfe691a8..4c840eb00279 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.8-r2 b/metadata/md5-cache/net-firewall/iptables-1.8.8-r2
index ff22a3d981ab..a7e8815d027d 100644
--- a/metadata/md5-cache/net-firewall/iptables-1.8.8-r2
+++ b/metadata/md5-cache/net-firewall/iptables-1.8.8-r2
@@ -12,4 +12,4 @@ RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-li
 SLOT=0/1.8.3
 SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.8.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=698fb2ee1911891ebfb239d72d8933a6
+_md5_=76fecb65246810b2fc92def0f0736fc7
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index 9176a8bcb218..1f1d2864b841 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r6 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r6
deleted file mode 100644
index cfd5ad97cbec..000000000000
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
-DESCRIPTION=Fast, production-quality, standard-conformant FTP server
-EAPI=7
-HOMEPAGE=http://www.pureftpd.org/
-INHERIT=autotools flag-o-matic
-IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
-REQUIRED_USE=implicittls? ( ssl )
-SLOT=0
-SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.49.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=826b858389fd2c8d2bc1247ac374fd9a
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r1 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r1
deleted file mode 100644
index cb7d1ca1e2e9..000000000000
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd )
-DESCRIPTION=Fast, production-quality, standard-conformant FTP server
-EAPI=8
-HOMEPAGE=http://www.pureftpd.org/
-INHERIT=flag-o-matic
-IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
-REQUIRED_USE=implicittls? ( ssl )
-SLOT=0
-SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.50.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.50.tar.bz2
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a33b7f0093f35f97394f178e8c84856a
diff --git a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3 b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
index cbc90736c305..a938b7e7fd85 100644
--- a/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
+++ b/metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.pureftpd.org/project/pure-ftpd/
 INHERIT=flag-o-matic
 IUSE=anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( dev-db/mariadb-connector-c dev-db/mysql-connector-c ) ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) ssl? ( dev-libs/openssl:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp )
 REQUIRED_USE=implicittls? ( ssl )
 SLOT=0
 SRC_URI=ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.50.tar.bz2 http://download.pureftpd.org/pub/pure-ftpd/releases/pure-ftpd-1.0.50.tar.bz2
 _eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=318dd23542724b3f09022af65bd690e5
+_md5_=c55adce63726d007d80bd7ae4755d14c
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index a3b591857352..6c13cacd038e 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/gajim-1.4.2 b/metadata/md5-cache/net-im/gajim-1.4.2
new file mode 100644
index 000000000000..b657667f0e8c
--- /dev/null
+++ b/metadata/md5-cache/net-im/gajim-1.4.2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,xml] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-42.0.2[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 app-arch/unzip virtual/pkgconfig >=sys-devel/gettext-0.17-r1
+DESCRIPTION=Jabber client written in PyGTK
+EAPI=7
+HOMEPAGE=https://gajim.org/
+INHERIT=distutils-r1 xdg-utils
+IUSE=+crypt geolocation jingle omemo remote rst +spell upnp +webp python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/gobject-introspection[cairo(+)] >=x11-libs/gtk+-3.22:3[introspection] x11-libs/gtksourceview:4 python_single_target_python3_9? ( dev-python/idna[python_targets_python3_9(-)] dev-python/precis-i18n[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pycairo[python_targets_python3_9(-)] dev-python/pycurl[python_targets_python3_9(-)] dev-python/pygobject:3[cairo,python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] >=dev-python/python-nbxmpp-3.0.0[python_targets_python3_9(-)] <dev-python/python-nbxmpp-4.0.0[python_targets_python3_9(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_9(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_9(-)] dev-python/css-parser[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_9(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_9(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_9(-)] dev-python/qrcode[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_9(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_9(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/idna[python_targets_python3_10(-)] dev-python/precis-i18n[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pycairo[python_targets_python3_10(-)] dev-python/pycurl[python_targets_python3_10(-)] dev-python/pygobject:3[cairo,python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] >=dev-python/python-nbxmpp-3.0.0[python_targets_python3_10(-)] <dev-python/python-nbxmpp-4.0.0[python_targets_python3_10(-)] x11-libs/libXScrnSaver app-crypt/libsecret[crypt,introspection] dev-python/keyring[python_targets_python3_10(-)] >=dev-python/secretstorage-3.1.1[python_targets_python3_10(-)] dev-python/css-parser[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] net-libs/libsoup[introspection] media-libs/gsound[introspection] crypt? ( dev-python/pycryptodome[python_targets_python3_10(-)] >=dev-python/python-gnupg-0.4.0[python_targets_python3_10(-)] ) geolocation? ( app-misc/geoclue[introspection] ) jingle? ( net-libs/farstream:0.2[introspection] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-libs/gst-plugins-ugly:1.0 media-plugins/gst-plugins-gtk ) omemo? ( dev-python/python-axolotl[python_targets_python3_10(-)] dev-python/qrcode[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] ) remote? ( >=dev-python/dbus-python-1.2.0[python_targets_python3_10(-)] sys-apps/dbus[X] ) rst? ( dev-python/docutils[python_targets_python3_10(-)] ) spell? ( app-text/gspell[introspection] app-text/hunspell ) upnp? ( net-libs/gupnp-igd[introspection] ) webp? ( dev-python/pillow[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,xml] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gajim.org/downloads/1.4/gajim-1.4.2.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6d1e30ed8e52f6a06108566f02ddca82
diff --git a/metadata/md5-cache/net-im/jabber-base-0.01-r3 b/metadata/md5-cache/net-im/jabber-base-0.01-r3
deleted file mode 100644
index f817b9625b5c..000000000000
--- a/metadata/md5-cache/net-im/jabber-base-0.01-r3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Base layout package for various jabber services
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=acct-group/jabber acct-user/jabber
-SLOT=0
-_md5_=25c5b9ce02fa090f42fbf0ad3db1557c
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index dad3cdef2234..91bd7941ef07 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/anope-2.0.11 b/metadata/md5-cache/net-irc/anope-2.0.11
index af7ab5d1de30..5674e5a2c129 100644
--- a/metadata/md5-cache/net-irc/anope-2.0.11
+++ b/metadata/md5-cache/net-irc/anope-2.0.11
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://anope.org/ https://github.com/anope/anope/
 INHERIT=cmake
 IUSE=gnutls ldap mysql pcre sql sqlite ssl tre
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm arm64 x86
 LICENSE=GPL-2
 RDEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) ldap? ( net-nds/openldap:= ) pcre? ( dev-libs/libpcre ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl
 REQUIRED_USE=sql? ( || ( mysql sqlite ) )
 SLOT=0
 SRC_URI=https://github.com/anope/anope/archive/2.0.11.tar.gz -> anope-2.0.11.tar.gz
 _eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=53237718b47fdc173cadea78e57cf3a8
+_md5_=bc6b08eca368c16131fcb4e5e8e01e20
diff --git a/metadata/md5-cache/net-irc/polari-42.0 b/metadata/md5-cache/net-irc/polari-42.0
new file mode 100644
index 000000000000..855d544e6688
--- /dev/null
+++ b/metadata/md5-cache/net-irc/polari-42.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/appstream-glib dev-libs/libxml2:2 dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( dev-libs/json-glib ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.43.4:2 net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.69.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection]
+DESCRIPTION=An IRC client for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari
+INHERIT=gnome.org gnome2-utils meson xdg
+IUSE=test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.43.4:2 net-libs/telepathy-glib[introspection] >=dev-libs/gobject-introspection-1.50:= >=dev-libs/gjs-1.69.2 x11-libs/gdk-pixbuf:2[introspection] >=app-text/gspell-1.4.0[introspection] x11-libs/pango[introspection] app-crypt/libsecret[introspection] net-libs/libsoup:2.4[introspection] net-im/telepathy-logger[introspection] >=net-irc/telepathy-idle-0.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/polari/42/polari-42.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=70f713e13f6c120fa1925256cf53e622
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 3da2e5598ee7..6a5baea12692 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.72.0-r1 b/metadata/md5-cache/net-libs/glib-networking-2.72.0-r1
index 7c9ed940c483..d0b88d07cb84 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.72.0-r1
+++ b/metadata/md5-cache/net-libs/glib-networking-2.72.0-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/glib-networking
 INHERIT=gnome.org gnome2-utils meson-multilib xdg
 IUSE=+gnome +libproxy +ssl test 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.69.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=net-libs/gnutls-3.7.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ssl? ( app-misc/ca-certificates ) gnome? ( gnome-base/gsettings-desktop-schemas )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib-networking/2.72/glib-networking-2.72.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a12d68e74b912d255ce2fc698f3122da
+_md5_=0cff0f873da3f3046261dde00fc61e41
diff --git a/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0 b/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
index 8872a64242ab..8a35ecdac653 100644
--- a/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
+++ b/metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeOnlineAccounts
 INHERIT=gnome2 vala
 IUSE=debug gnome +introspection kerberos +vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2+
 PDEPEND=gnome? ( >=gnome-base/gnome-control-center-3.2[gnome-online-accounts(+)] )
 RDEPEND=>=dev-libs/glib-2.52:2 >=app-crypt/libsecret-0.5 >=dev-libs/json-glib-0.16 dev-libs/libxml2:2 >=net-libs/libsoup-2.42:2.4 net-libs/rest:0.7 >=net-libs/webkit-gtk-2.26.0:4 >=x11-libs/gtk+-3.19.12:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) kerberos? ( app-crypt/gcr:0=[gtk] app-crypt/mit-krb5 )
@@ -14,4 +14,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/gnome-online-accounts/3.44/gnome-online-accounts-3.44.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=22434717403fb47b5e5bf5bb48186b80
+_md5_=1b67457c7da41276f21372b6fb31c938
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.6 b/metadata/md5-cache/net-libs/gnutls-3.7.6
new file mode 100644
index 000000000000..d4348a9df692
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.6
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/gtk-doc-am >=virtual/pkgconfig-0-r1 doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) valgrind? ( dev-util/valgrind ) test-full? ( app-crypt/dieharder >=app-misc/datefudge-1.22 dev-libs/softhsm:2[-bindist(-)] net-dialup/ppp net-misc/socat ) verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.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(-)?] ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( 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(-)?] ) zstd? ( >=app-arch/zstd-1.3.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? ( seccomp? ( sys-libs/libseccomp ) )
+DESCRIPTION=A secure communications library implementing the SSL, TLS and DTLS protocols
+EAPI=7
+HOMEPAGE=https://www.gnutls.org/
+INHERIT=libtool multilib-minimal verify-sig
+IUSE=brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+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=GPL-3 LGPL-2.1+
+RDEPEND=>=dev-libs/libtasn1-4.9:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/nettle-3.6:=[gmp,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/gmp-5.1.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] brotli? ( >=app-arch/brotli-1.0.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(-)?] ) dane? ( >=net-dns/unbound-1.4.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) guile? ( >=dev-scheme/guile-2:=[networking] ) nls? ( >=virtual/libintl-0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( >=net-dns/libidn2-0.16-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( 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(-)?] ) zstd? ( >=app-arch/zstd-1.3.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-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )
+RESTRICT=!test? ( test )
+SLOT=0/30.30
+SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz.sig )
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ddc7528f6ef9b412a4c533cde3542068
diff --git a/metadata/md5-cache/net-libs/libmbim-1.26.4 b/metadata/md5-cache/net-libs/libmbim-1.26.4
index d7456baad9fe..a63bcda10d19 100644
--- a/metadata/md5-cache/net-libs/libmbim-1.26.4
+++ b/metadata/md5-cache/net-libs/libmbim-1.26.4
@@ -5,10 +5,10 @@ DESCRIPTION=Mobile Broadband Interface Model (MBIM) modem protocol helper librar
 EAPI=8
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libmbim/ https://gitlab.freedesktop.org/mobile-broadband/libmbim
 INHERIT=python-any-r1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.56:2
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f2b59f26ef07f8a259851ed856f36694
+_md5_=a6d7dd0422435e5532ebc5dcfcef54e2
diff --git a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75 b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
index e41add86e21d..e8de608fc8eb 100644
--- a/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
+++ b/metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.gnu.org/software/libmicrohttpd/
 INHERIT=multilib-minimal
 IUSE=+epoll ssl static-libs test +thread-names 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=ssl? ( >net-libs/gnutls-2.12.20:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/12
 SRC_URI=mirror://gnu/libmicrohttpd/libmicrohttpd-0.9.75.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=77599a6d6bd3e9efaf2ce341bdfde3cd
+_md5_=af32527d5aebcfa253f54da2bc8c0b1f
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.18 b/metadata/md5-cache/net-libs/libnice-0.1.18
index a1e2fbb033d5..d415df4d3730 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.18
+++ b/metadata/md5-cache/net-libs/libnice-0.1.18
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://nice.freedesktop.org/wiki/
 INHERIT=meson-multilib xdg
 IUSE=+gnutls +introspection +upnp 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=>=dev-libs/glib-2.54:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) gnutls? ( >=net-libs/gnutls-2.12.0: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(-)?] ) !gnutls? ( dev-libs/openssl: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(-)?] ) upnp? ( >=net-libs/gupnp-igd-0.2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=https://nice.freedesktop.org/releases/libnice-0.1.18.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b1a10c122ae81f3af2928f78d74dc7d8
+_md5_=0acdd93bbbe818595bfb5e83912665be
diff --git a/metadata/md5-cache/net-libs/libnma-1.8.38 b/metadata/md5-cache/net-libs/libnma-1.8.38
index eda3a28b6f15..27737caee2d0 100644
--- a/metadata/md5-cache/net-libs/libnma-1.8.38
+++ b/metadata/md5-cache/net-libs/libnma-1.8.38
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome.org gnome2-utils meson xdg vala
 IUSE=gtk-doc +introspection +pkcs11 vala
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=gui-libs/gtk-4.0:4 app-text/iso-codes net-misc/mobile-broadband-provider-info >=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.12:3[introspection?] >=net-misc/networkmanager-1.7[introspection?] pkcs11? ( >=app-crypt/gcr-3.14:= ) introspection? ( >=dev-libs/gobject-introspection-1.56:= ) !<gnome-extra/nm-applet-1.16.0
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnma/1.8/libnma-1.8.38.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9d0e826ef165050586b91b6ca71ab951
+_md5_=6162c614b36e41c3228fe76104221eac
diff --git a/metadata/md5-cache/net-libs/libqmi-1.30.6 b/metadata/md5-cache/net-libs/libqmi-1.30.6
index 04514e33fede..82caf4a59d65 100644
--- a/metadata/md5-cache/net-libs/libqmi-1.30.6
+++ b/metadata/md5-cache/net-libs/libqmi-1.30.6
@@ -5,9 +5,9 @@ DESCRIPTION=Qualcomm MSM (Mobile Station Modem) Interface (QMI) modem protocol l
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libqmi/ https://gitlab.freedesktop.org/mobile-broadband/libqmi
 IUSE=gtk-doc +mbim
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv x86
 LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.56 >=dev-libs/libgudev-232 mbim? ( >=net-libs/libmbim-1.18.0 )
 SLOT=0/5.8
 SRC_URI=https://www.freedesktop.org/software/libqmi/libqmi-1.30.6.tar.xz
-_md5_=a401286d44006c4868387903a6cb88ac
+_md5_=f4d0aa27a345a88291b0ed9af373ea4a
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.36.3 b/metadata/md5-cache/net-libs/webkit-gtk-2.36.3
new file mode 100644
index 000000000000..ad48de3b2f22
--- /dev/null
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.36.3
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11[xml(+)] >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+)] >=dev-lang/python-3.9.9-r1:3.9[xml(+)] >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+)] ) || ( dev-lang/ruby:2.7 dev-lang/ruby:3.0 dev-lang/ruby:3.1 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 dev-util/glib-utils >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 ) sys-devel/gettext virtual/pkgconfig >=dev-lang/perl-5.10 virtual/perl-Data-Dumper virtual/perl-Carp virtual/perl-JSON-PP gtk-doc? ( >=dev-util/gtk-doc-1.32 ) geolocation? ( dev-util/gdbus-codegen ) >=dev-util/cmake-3.10 >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Open source web browser engine
+EAPI=7
+HOMEPAGE=https://www.webkitgtk.org
+INHERIT=check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+IUSE=aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=LGPL-2+ BSD
+RDEPEND=>=x11-libs/cairo-1.16.0:=[X?] >=media-libs/fontconfig-2.13.0:1.0 >=media-libs/freetype-2.9.0:2 >=dev-libs/libgcrypt-1.7.0:0= >=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?] >=media-libs/harfbuzz-1.4.2:=[icu(+)] >=dev-libs/icu-61.2:= media-libs/libjpeg-turbo:0= >=net-libs/libsoup-2.54:2.4[introspection?] >=dev-libs/libxml2-2.8.0:2 >=media-libs/libpng-1.4:0= dev-db/sqlite:3= sys-libs/zlib:0 >=dev-libs/atk-2.16.0 media-libs/libwebp:= >=dev-libs/glib-2.67.1:2 >=dev-libs/libxslt-1.1.7 media-libs/woff2 gnome-keyring? ( app-crypt/libsecret ) introspection? ( >=dev-libs/gobject-introspection-1.59.1:= ) dev-libs/libtasn1:= spell? ( >=app-text/enchant-0.22:2 ) gstreamer? ( >=media-libs/gstreamer-1.20:1.0 >=media-libs/gst-plugins-base-1.20:1.0[egl?,X?] gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] ) !gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] ) >=media-plugins/gst-plugins-opus-1.20:1.0 >=media-libs/gst-plugins-bad-1.20:1.0 ) X? ( x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXrender x11-libs/libXt ) libnotify? ( x11-libs/libnotify ) dev-libs/hyphen jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= ) avif? ( >=media-libs/libavif-0.9.0:= ) lcms? ( media-libs/lcms:2 ) egl? ( media-libs/mesa[egl(+)] ) gles2-only? ( media-libs/mesa[gles2] ) !gles2-only? ( virtual/opengl ) wayland? ( dev-libs/wayland >=dev-libs/wayland-protocols-1.12 >=gui-libs/libwpe-1.5.0:1.0 >=gui-libs/wpebackend-fdo-1.7.0:1.0 ) seccomp? ( >=sys-apps/bubblewrap-0.3.1 sys-libs/libseccomp sys-apps/xdg-dbus-proxy ) systemd? ( sys-apps/systemd:= ) gamepad? ( >=dev-libs/libmanette-0.2.4 ) geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+REQUIRED_USE=gles2-only? ( egl ) gstreamer? ( egl ) wayland? ( egl ) || ( aqua wayland X )
+RESTRICT=test
+SLOT=4/37
+SRC_URI=https://www.webkitgtk.org/releases/webkitgtk-2.36.3.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	ruby-single	d832a35ebec5113ec8d275b948432e59	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b9415c902348b255535d3ab63bd347da
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index d2556763a369..bc3f24f8aa9f 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/getmail-6.18.9 b/metadata/md5-cache/net-mail/getmail-6.18.9
index 9b469f773d19..1092b81f78d8 100644
--- a/metadata/md5-cache/net-mail/getmail-6.18.9
+++ b/metadata/md5-cache/net-mail/getmail-6.18.9
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://www.getmail6.org/ https://github.com/getmail6/getmail6
 INHERIT=distutils-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ssl] )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/getmail6/getmail6/archive/v6.18.9.tar.gz -> getmail-6.18.9.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f2ae5f7076d056f997db35c744892648
+_md5_=7b4676f52878efe08e6142bf0020b813
diff --git a/metadata/md5-cache/net-mail/mailbase-1.8.1 b/metadata/md5-cache/net-mail/mailbase-1.8.1
new file mode 100644
index 000000000000..5ff6a197615f
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailbase-1.8.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=MTA layout package
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+INHERIT=pam
+IUSE=pam
+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=GPL-2
+RDEPEND=acct-group/mail acct-user/mail acct-user/postmaster pam? ( sys-libs/pam )
+SLOT=0
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=e4114a201c11ad66970bef807c12e6cb
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index ed1cb13c3d9f..f1d009c22da9 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.2.10 b/metadata/md5-cache/net-misc/electron-cash-4.2.10
new file mode 100644
index 000000000000..3fe7acba1b5d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electron-cash-4.2.10
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonrpclib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathvalidate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/stem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amodem? ( dev-python/amodem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DESCRIPTION=Lightweight Bitcoin Cash client (BCH fork of Electrum)
+EAPI=7
+HOMEPAGE=https://github.com/Electron-Cash/Electron-Cash
+INHERIT=desktop distutils-r1 xdg-utils
+IUSE=amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb l10n_es l10n_ja l10n_pt l10n_zh-CN test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonrpclib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathvalidate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/stem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amodem? ( dev-python/amodem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/4.2.10.tar.gz -> electron-cash-4.2.10.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=b2ce54ee613ce008b2eb1b544b812ba2
diff --git a/metadata/md5-cache/net-misc/electron-cash-4.2.9 b/metadata/md5-cache/net-misc/electron-cash-4.2.9
index a7e2a920ce49..9b482f89e09a 100644
--- a/metadata/md5-cache/net-misc/electron-cash-4.2.9
+++ b/metadata/md5-cache/net-misc/electron-cash-4.2.9
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
 DESCRIPTION=Lightweight Bitcoin Cash client (BCH fork of Electrum)
 EAPI=7
 HOMEPAGE=https://github.com/Electron-Cash/Electron-Cash
-INHERIT=desktop distutils-r1 gnome2-utils xdg-utils
-IUSE=amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb l10n_es l10n_ja l10n_pt l10n_zh-CN python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=desktop distutils-r1 xdg-utils
+IUSE=amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb l10n_es l10n_ja l10n_pt l10n_zh-CN python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
 RDEPEND=dev-python/dnspython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ecdsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonrpclib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathvalidate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] net-libs/stem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] amodem? ( dev-python/amodem[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] )
-REQUIRED_USE=!audio_modem || ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+REQUIRED_USE=|| ( cli ncurses qt5 ) amodem? ( qt5 ) cosign? ( qt5 ) digitalbitbox? ( qt5 ) email? ( qt5 ) qrcode? ( qt5 ) sync? ( qt5 ) vkb? ( qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/4.2.9.tar.gz -> electron-cash-4.2.9.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=55de509735824d61a03cf6aacaaafc4c
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=dc04a119d67a72836788b329f7b44cce
diff --git a/metadata/md5-cache/net-misc/electrum-4.2.2 b/metadata/md5-cache/net-misc/electrum-4.2.2
new file mode 100644
index 000000000000..256686cd51d0
--- /dev/null
+++ b/metadata/md5-cache/net-misc/electrum-4.2.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] ) >=dev-python/gpep517-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DESCRIPTION=User friendly Bitcoin client
+EAPI=8
+HOMEPAGE=https://electrum.org/
+INHERIT=desktop distutils-r1 xdg-utils
+IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses?] )
+REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spesmilo/electrum/archive/4.2.2.tar.gz -> electrum-4.2.2.gh.tar.gz
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=58ff6817c36c109c8d5db7c6e8cd9c18
diff --git a/metadata/md5-cache/net-misc/frr-8.1-r1 b/metadata/md5-cache/net-misc/frr-8.1-r1
deleted file mode 100644
index 929805cd5a3f..000000000000
--- a/metadata/md5-cache/net-misc/frr-8.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=~dev-util/clippy-8.1 sys-devel/flex virtual/yacc doc? ( dev-python/sphinx ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) elibc_musl? ( sys-libs/queue-standalone ) test? ( python_single_target_python3_8? ( dev-python/pytest[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pytest[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pytest[python_targets_python3_10(-)] ) )
-DESCRIPTION=The FRRouting Protocol Suite
-EAPI=7
-HOMEPAGE=https://frrouting.org/
-INHERIT=autotools pam python-single-r1 systemd
-IUSE=doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) !net-misc/quagga
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.1.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6645fe3fd3a26258cad2fa7d718ceb34
diff --git a/metadata/md5-cache/net-misc/frr-8.2.2 b/metadata/md5-cache/net-misc/frr-8.2.2
index b5dee3faad6e..bbfaa341cf79 100644
--- a/metadata/md5-cache/net-misc/frr-8.2.2
+++ b/metadata/md5-cache/net-misc/frr-8.2.2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://frrouting.org/
 INHERIT=autotools pam python-single-r1 systemd
 IUSE=doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) acct-user/frr dev-libs/json-c:0= >=net-libs/libyang-2.0.0 sys-libs/libcap sys-libs/readline:0= virtual/libcrypt:= grpc? ( net-libs/grpc:= ) nhrp? ( net-dns/c-ares:0= ) pam? ( sys-libs/pam ) rpki? ( >=net-libs/rtrlib-0.6.3[ssh] ) snmp? ( net-analyzer/net-snmp:= ) python_single_target_python3_8? ( dev-python/ipaddr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ipaddr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ipaddr[python_targets_python3_10(-)] ) !net-misc/quagga
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/FRRouting/frr/archive/frr-8.2.2.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=109e45455508f81ae714832caa60fff6
+_md5_=6645fe3fd3a26258cad2fa7d718ceb34
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.21.1 b/metadata/md5-cache/net-misc/gallery-dl-1.21.1
index 536212c43883..24ca084ef11d 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.21.1
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.21.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mikf/gallery-dl
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 arm arm64 hppa ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl,xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl,xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl,xml] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.21.1.tar.gz -> gallery-dl-1.21.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bb43fd5a3874d99d2f3a0a2442b0e3af
+_md5_=331b1b1f4ce34ad70ec66ed9ff9b3646
diff --git a/metadata/md5-cache/net-misc/gallery-dl-1.21.2 b/metadata/md5-cache/net-misc/gallery-dl-1.21.2
index cacf01813e6e..e5ccbb70c3ea 100644
--- a/metadata/md5-cache/net-misc/gallery-dl-1.21.2
+++ b/metadata/md5-cache/net-misc/gallery-dl-1.21.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/mikf/gallery-dl
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=>=dev-python/requests-2.11.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[sqlite,ssl,xml] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[sqlite,ssl,xml] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[sqlite,ssl,xml] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mikf/gallery-dl/archive/v1.21.2.tar.gz -> gallery-dl-1.21.2.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=bb43fd5a3874d99d2f3a0a2442b0e3af
+_md5_=bba7e3f096ede3dfa528fdd3c821d2a9
diff --git a/metadata/md5-cache/net-misc/gnome-remote-desktop-42.2 b/metadata/md5-cache/net-misc/gnome-remote-desktop-42.2
new file mode 100644
index 000000000000..e6f8e279ec10
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gnome-remote-desktop-42.2
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/gdbus-codegen dev-util/glib-utils virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=x11-libs/cairo >=dev-libs/glib-2.68:2 >=media-video/pipewire-0.3.0:= app-crypt/libsecret x11-libs/libnotify media-libs/libepoxy x11-libs/libdrm rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.5.0:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 ) vnc? ( net-libs/libvncserver )
+DESCRIPTION=Remote desktop daemon for GNOME using pipewire
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-remote-desktop
+INHERIT=gnome.org gnome2-utils meson python-any-r1 systemd xdg
+IUSE=+rdp systemd +vnc
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=x11-libs/cairo >=dev-libs/glib-2.68:2 >=media-video/pipewire-0.3.0:= app-crypt/libsecret x11-libs/libnotify media-libs/libepoxy x11-libs/libdrm rdp? ( >=media-libs/nv-codec-headers-11.1.5.0 >=net-misc/freerdp-2.5.0:=[server] >=sys-fs/fuse-3.9.1 >=x11-libs/libxkbcommon-1.0.0 ) vnc? ( net-libs/libvncserver ) x11-wm/mutter[screencast]
+REQUIRED_USE=|| ( rdp vnc )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-remote-desktop/42/gnome-remote-desktop-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a6d85e6e6fe22608d1f66518484e68f0
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315
index 4329cf970148..d8c86db96429 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315
@@ -3,11 +3,12 @@ DEFINED_PHASES=-
 DESCRIPTION=Database of mobile broadband service providers
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
+INHERIT=gnome.org
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86
 LICENSE=CC-PD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20220315/mobile-broadband-provider-info-20220315.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a
-_md5_=357f5d7a4732d194d71282e1e6979d74
+_md5_=a1e0f656faf07f46717be4c2869c8928
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.18.8 b/metadata/md5-cache/net-misc/modemmanager-1.18.8
index 858806c3d42d..c72edab99cb9 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.18.8
+++ b/metadata/md5-cache/net-misc/modemmanager-1.18.8
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
 INHERIT=gnome2 python-any-r1 readme.gentoo-r1 systemd udev vala
 IUSE=elogind +introspection mbim policykit +qmi systemd test +udev vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.56.0:2 udev? ( >=dev-libs/libgudev-232:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.26.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection?] ) qmi? ( >=net-libs/libqmi-1.30.2:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 ) policykit? ( acct-group/plugdev )
 REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	vala	9badd41d5aab740ae5ac301c4416c5f8	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ef714151490484a7120ccce423721049
+_md5_=56bee1010a0869555a2df086e74282e1
diff --git a/metadata/md5-cache/net-misc/ndisc6-1.0.5 b/metadata/md5-cache/net-misc/ndisc6-1.0.5
index 7515d546aaff..06a26b4cbe94 100644
--- a/metadata/md5-cache/net-misc/ndisc6-1.0.5
+++ b/metadata/md5-cache/net-misc/ndisc6-1.0.5
@@ -4,8 +4,8 @@ DESCRIPTION=Recursive DNS Servers discovery Daemon (rdnssd) for IPv6
 EAPI=7
 HOMEPAGE=https://www.remlab.net/ndisc6/
 IUSE=debug
-KEYWORDS=amd64 arm arm64 ~loong x86 ~x64-macos
+KEYWORDS=amd64 arm arm64 ~loong ~riscv x86 ~x64-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.remlab.net/files/ndisc6/ndisc6-1.0.5.tar.bz2
-_md5_=cd2a1cc26fa112cb8e4892ac2129b605
+_md5_=a3dfb60f380a170ac5b149fb2785dbdf
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.36.4 b/metadata/md5-cache/net-misc/networkmanager-1.36.4
index 223748e38d6f..19dd0d13f3a4 100644
--- a/metadata/md5-cache/net-misc/networkmanager-1.36.4
+++ b/metadata/md5-cache/net-misc/networkmanager-1.36.4
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome.org linux-info meson-multilib python-any-r1 readme.gentoo-r1 systemd toolchain-funcs udev vala virtualx
 IUSE=audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit lto +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] elogind? ( >=sys-auth/elogind-219 ) >=virtual/libudev-175:=[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-apps/dbus net-libs/libndp systemd? ( >=sys-apps/systemd-209:0= ) >=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) selinux? ( sys-libs/libselinux ) audit? ( sys-process/audit ) teamd? ( >=dev-libs/jansson-2.7:= >=net-misc/libteam-1.9 ) policykit? ( >=sys-auth/polkit-0.106 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) modemmanager? ( net-misc/mobile-broadband-provider-info >=net-misc/modemmanager-0.7.991:0= ) bluetooth? ( >=net-wireless/bluez-5 ) ofono? ( net-misc/ofono ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) ovs? ( >=dev-libs/jansson-2.7:= ) resolvconf? ( virtual/resolvconf ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] iptables? ( net-firewall/iptables ) nftables? ( net-firewall/nftables ) ) psl? ( net-libs/libpsl ) concheck? ( net-misc/curl ) tools? ( >=dev-libs/newt-0.52.15 libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
 REQUIRED_USE=bluetooth? ( modemmanager ) connection-sharing? ( || ( iptables nftables ) ) gtk-doc? ( introspection ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) ^^ ( gnutls nss ) ?? ( elogind systemd ) ?? ( dhclient dhcpcd ) ?? ( syslog systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager/1.36/NetworkManager-1.36.4.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	vala	9badd41d5aab740ae5ac301c4416c5f8	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=1ee4b078f2a5a6d43942fde0b0161452
+_md5_=805f5bab911a2363f7356807644d35f3
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r3 b/metadata/md5-cache/net-misc/ntpsec-1.2.1-r3
index 654f21f04123..939e4f11e473 100644
--- a/metadata/md5-cache/net-misc/ntpsec-1.2.1-r3
+++ b/metadata/md5-cache/net-misc/ntpsec-1.2.1-r3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.ntpsec.org/
 INHERIT=distutils-r1 flag-o-matic waf-utils systemd
 IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_modem rclock_local debug doc early gdb heat libbsd nist ntpviz samba seccomp smear python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~riscv ~x86
 LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] ) dev-libs/openssl:= dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sys-libs/libcap libbsd? ( dev-libs/libbsd:0= ) seccomp? ( sys-libs/libseccomp ) rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) !net-misc/ntp !net-misc/openntpd acct-group/ntp acct-user/ntp ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) nist? ( rclock_local ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.2.1.tar.gz
 _eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=bbd4e962b41993c305c6eb406dbce400
+_md5_=e7416c433dc6288ea77125f91e2cb83c
diff --git a/metadata/md5-cache/net-misc/putty-0.77 b/metadata/md5-cache/net-misc/putty-0.77
new file mode 100644
index 000000000000..852d62d647b2
--- /dev/null
+++ b/metadata/md5-cache/net-misc/putty-0.77
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
+DESCRIPTION=A Free Telnet/SSH Client
+EAPI=8
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
+INHERIT=cmake desktop xdg-utils
+IUSE=debug +gtk gtk2 ipv6 gssapi
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
+REQUIRED_USE=gtk2? ( gtk )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.77/putty-0.77.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6253432cc6e83eaa71c818fff90dd91f
diff --git a/metadata/md5-cache/net-misc/putty-9999 b/metadata/md5-cache/net-misc/putty-9999
index 1c0b3961b14b..dd01ae08e91d 100644
--- a/metadata/md5-cache/net-misc/putty-9999
+++ b/metadata/md5-cache/net-misc/putty-9999
@@ -1,16 +1,16 @@
-BDEPEND=app-doc/halibut dev-lang/perl virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
 DEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 DESCRIPTION=A Free Telnet/SSH Client
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
-INHERIT=autotools desktop git-r3 toolchain-funcs xdg-utils
-IUSE=doc +gtk gtk2 ipv6 gssapi
+INHERIT=cmake desktop xdg-utils git-r3
+IUSE=debug +gtk gtk2 ipv6 gssapi
 LICENSE=MIT
 PROPERTIES=live
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 REQUIRED_USE=gtk2? ( gtk )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~polynomial-c/putty-icons.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b6bc3e6cbe002777e0e7b9bc24a716ed
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6253432cc6e83eaa71c818fff90dd91f
diff --git a/metadata/md5-cache/net-misc/rdate-1.11 b/metadata/md5-cache/net-misc/rdate-1.11
index 44c17430e771..afa5538ceffc 100644
--- a/metadata/md5-cache/net-misc/rdate-1.11
+++ b/metadata/md5-cache/net-misc/rdate-1.11
@@ -5,10 +5,10 @@ DESCRIPTION=Use TCP or UDP to retrieve the current time of another machine
 EAPI=8
 HOMEPAGE=https://github.com/resurrecting-open-source-projects/openrdate
 INHERIT=autotools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD-4
 RDEPEND=dev-libs/libbsd
 SLOT=0
 SRC_URI=https://github.com/resurrecting-open-source-projects/openrdate/archive/1.11.tar.gz -> rdate-1.11.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3d63650bbd96ecfd03e9b6e24fbfa818
+_md5_=cd5322e4974ff179b9809c599fdc83bc
diff --git a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2 b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
index 7460a5ddf865..50634e628a9c 100644
--- a/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
+++ b/metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=http://www.rdesktop.org/
 INHERIT=autotools
 IUSE=alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=dev-libs/nettle:0= >=net-libs/gnutls-3.2.0:0= x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib media-libs/libsamplerate ) ao? ( >=media-libs/libao-0.8.6 media-libs/libsamplerate ) kerberos? ( virtual/krb5 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) oss? ( media-libs/libsamplerate ) pulseaudio? ( media-libs/libsamplerate media-sound/pulseaudio ) xrandr? ( x11-libs/libXrandr )
 SLOT=0
 SRC_URI=https://github.com/rdesktop/rdesktop/releases/download/v1.9.0/rdesktop-1.9.0.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5c8178507cda215210df4c531564a130
+_md5_=4a8c0218b928a7b6790828bddf18dc5c
diff --git a/metadata/md5-cache/net-misc/streamlink-4.1.0 b/metadata/md5-cache/net-misc/streamlink-4.1.0
new file mode 100644
index 000000000000..532d6bfd9981
--- /dev/null
+++ b/metadata/md5-cache/net-misc/streamlink-4.1.0
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( dev-python/versioningit[python_targets_python3_8(-)] test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/versioningit[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/versioningit[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/rtmpdump media-video/ffmpeg python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] )
+DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
+EAPI=8
+HOMEPAGE=https://streamlink.github.io/
+INHERIT=distutils-r1
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64
+LICENSE=BSD-2 Apache-2.0
+RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/rtmpdump media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+),threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/streamlink/streamlink/releases/download/4.1.0/streamlink-4.1.0.tar.gz
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=006b747e37f5571f56d8cef1ced18428
diff --git a/metadata/md5-cache/net-misc/streamlink-9999 b/metadata/md5-cache/net-misc/streamlink-9999
index d9ad913c1dbe..ef4987d786cf 100644
--- a/metadata/md5-cache/net-misc/streamlink-9999
+++ b/metadata/md5-cache/net-misc/streamlink-9999
@@ -1,16 +1,16 @@
-BDEPEND=python_single_target_python3_8? ( test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_single_target_python3_8? ( dev-python/versioningit[python_targets_python3_8(-)] test? ( dev-python/mock[python_targets_python3_8(-)] dev-python/requests-mock[python_targets_python3_8(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/versioningit[python_targets_python3_9(-)] test? ( dev-python/mock[python_targets_python3_9(-)] dev-python/requests-mock[python_targets_python3_9(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/versioningit[python_targets_python3_10(-)] test? ( dev-python/mock[python_targets_python3_10(-)] dev-python/requests-mock[python_targets_python3_10(-)] >=dev-python/freezegun-1.0.0[python_targets_python3_10(-)] ) ) test? ( python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/rtmpdump media-video/ffmpeg python_single_target_python3_8? ( >=dev-python/pytest-7.0.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.0.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.0.1[python_targets_python3_10(-)] ) ) >=dev-vcs/git-1.8.2.1[curl] python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+),threads(+)] ) python_single_target_python3_8? ( >=dev-python/gpep517-3[python_targets_python3_8(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-3[python_targets_python3_9(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-3[python_targets_python3_10(-)] >=dev-python/setuptools-60.5.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] )
+DEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] )
 DESCRIPTION=CLI for extracting streams from websites to a video player of your choice
-EAPI=7
+EAPI=8
 HOMEPAGE=https://streamlink.github.io/
-INHERIT=distutils-r1 git-r3
-IUSE=test python_single_target_python3_8 python_single_target_python3_9
+INHERIT=git-r3 distutils-r1
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 LICENSE=BSD-2 Apache-2.0
 PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] ) media-video/rtmpdump media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+RDEPEND=python_single_target_python3_8? ( >dev-python/requests-2.21.0[python_targets_python3_8(-)] dev-python/isodate[python_targets_python3_8(-)] dev-python/websocket-client[python_targets_python3_8(-)] dev-python/pycountry[python_targets_python3_8(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_8(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >dev-python/requests-2.21.0[python_targets_python3_9(-)] dev-python/isodate[python_targets_python3_9(-)] dev-python/websocket-client[python_targets_python3_9(-)] dev-python/pycountry[python_targets_python3_9(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_9(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >dev-python/requests-2.21.0[python_targets_python3_10(-)] dev-python/isodate[python_targets_python3_10(-)] dev-python/websocket-client[python_targets_python3_10(-)] dev-python/pycountry[python_targets_python3_10(-)] >=dev-python/pycryptodome-3.4.3[python_targets_python3_10(-)] >=dev-python/versioningit-1.1.1[python_targets_python3_10(-)] ) media-video/rtmpdump media-video/ffmpeg python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml(+),threads(+)] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=12b6d198b592976327f53f8a76779184
+_eclasses_=distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=006b747e37f5571f56d8cef1ced18428
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r3 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
index e03cce2e046d..8c7d5a2031b0 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
 INHERIT=autotools toolchain-funcs
 IUSE=nls xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=93efb5ef9b3fb7e8b28897836c08aa7e
+_md5_=6e795ab2a89d84508c9b370123b44c64
diff --git a/metadata/md5-cache/net-misc/vconfig-1.9 b/metadata/md5-cache/net-misc/vconfig-1.9
index 713adc7705d9..26da32e8a4f4 100644
--- a/metadata/md5-cache/net-misc/vconfig-1.9
+++ b/metadata/md5-cache/net-misc/vconfig-1.9
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=http://www.candelatech.com/~greear/vlan.html
 INHERIT=flag-o-matic toolchain-funcs
 IUSE=static
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.candelatech.com/~greear/vlan/vlan.1.9.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d412225d38fd10bc0ef6de6af65aa985
+_md5_=f4950c0b45e8f9807ee268821e69d566
diff --git a/metadata/md5-cache/net-misc/wget2-2.0.1 b/metadata/md5-cache/net-misc/wget2-2.0.1
new file mode 100644
index 000000000000..f5185a369f29
--- /dev/null
+++ b/metadata/md5-cache/net-misc/wget2-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) !gnutls? ( dev-libs/libgcrypt:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) gpgme? ( app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) idn? ( net-dns/libidn2:= ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre2 ) psl? ( net-libs/libpsl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+DESCRIPTION=GNU Wget2 is a file and recursive website downloader
+EAPI=8
+HOMEPAGE=https://gitlab.com/gnuwget/wget2
+IUSE=brotli bzip2 doc +gnutls gpgme +http2 idn lzma openssl pcre psl +ssl test valgrind xattr zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) !gnutls? ( dev-libs/libgcrypt:= ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( dev-libs/openssl:0= ) ) gpgme? ( app-crypt/gpgme:= dev-libs/libassuan dev-libs/libgpg-error ) http2? ( net-libs/nghttp2 ) idn? ( net-dns/libidn2:= ) lzma? ( app-arch/xz-utils ) pcre? ( dev-libs/libpcre2 ) psl? ( net-libs/libpsl ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=valgrind? ( test )
+RESTRICT=!test? ( test )
+SLOT=0/0
+SRC_URI=mirror://gnu/wget/wget2-2.0.1.tar.gz
+_md5_=2fe854150fb5891d0d7d9d681c320aca
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 3fb59d95cd07..7360f5d26f90 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/arti-0.1.0 b/metadata/md5-cache/net-p2p/arti-0.1.0
deleted file mode 100644
index 42d0d955aa20..000000000000
--- a/metadata/md5-cache/net-p2p/arti-0.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
-DESCRIPTION=An implementation of Tor, in Rust.
-EAPI=8
-HOMEPAGE=https://gitlab.torproject.org/tpo/core/arti/
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0
-RDEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v0.1.0/arti-arti-v0.1.0.tar.gz -> arti-0.1.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.55/download -> anyhow-1.0.55.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/asynchronous-codec/0.6.0/download -> asynchronous-codec-0.6.0.crate https://crates.io/api/v1/crates/async-broadcast/0.3.4/download -> async-broadcast-0.3.4.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-compression/0.3.12/download -> async-compression-0.3.12.crate https://crates.io/api/v1/crates/async-ctrlc/1.2.0/download -> async-ctrlc-1.2.0.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-global-executor/2.0.2/download -> async-global-executor-2.0.2.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-native-tls/0.4.0/download -> async-native-tls-0.4.0.crate https://crates.io/api/v1/crates/async-process/1.3.0/download -> async-process-1.3.0.crate https://crates.io/api/v1/crates/async-rustls/0.2.0/download -> async-rustls-0.2.0.crate https://crates.io/api/v1/crates/async-std/1.10.0/download -> async-std-1.10.0.crate https://crates.io/api/v1/crates/async-task/4.1.0/download -> async-task-4.1.0.crate https://crates.io/api/v1/crates/async-trait/0.1.52/download -> async-trait-0.1.52.crate https://crates.io/api/v1/crates/async_executors/0.4.2/download -> async_executors-0.4.2.crate https://crates.io/api/v1/crates/atomic/0.5.1/download -> atomic-0.5.1.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.8/download -> autocfg-0.1.8.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.64/download -> backtrace-0.3.64.crate https://crates.io/api/v1/crates/base64ct/1.1.1/download -> base64ct-1.1.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blanket/0.2.0/download -> blanket-0.2.0.crate https://crates.io/api/v1/crates/blocking/1.1.0/download -> blocking-1.1.0.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bounded-vec-deque/0.1.1/download -> bounded-vec-deque-0.1.1.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/coarsetime/0.1.21/download -> coarsetime-0.1.21.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/config/0.12.0/download -> config-0.12.0.crate https://crates.io/api/v1/crates/const-oid/0.6.2/download -> const-oid-0.6.2.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.1/download -> cpufeatures-0.2.1.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.2/download -> crossbeam-channel-0.5.2.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.4/download -> crossbeam-queue-0.3.4.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.7/download -> crossbeam-utils-0.8.7.crate https://crates.io/api/v1/crates/crypto-bigint/0.2.11/download -> crypto-bigint-0.2.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/ctor/0.1.21/download -> ctor-0.1.21.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/ctr/0.8.0/download -> ctr-0.8.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.1/download -> curve25519-dalek-3.2.1.crate https://crates.io/api/v1/crates/darling/0.12.4/download -> darling-0.12.4.crate https://crates.io/api/v1/crates/darling_core/0.12.4/download -> darling_core-0.12.4.crate https://crates.io/api/v1/crates/darling_macro/0.12.4/download -> darling_macro-0.12.4.crate https://crates.io/api/v1/crates/derive_builder/0.10.2/download -> derive_builder-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_core/0.10.2/download -> derive_builder_core-0.10.2.crate https://crates.io/api/v1/crates/derive_builder_macro/0.10.2/download -> derive_builder_macro-0.10.2.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/der/0.4.5/download -> der-0.4.5.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.6/download -> dirs-sys-0.3.6.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/easy-parallel/3.2.0/download -> easy-parallel-3.2.0.crate https://crates.io/api/v1/crates/ed25519/1.4.0/download -> ed25519-1.4.0.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/float-ord/0.3.2/download -> float-ord-0.3.2.crate https://crates.io/api/v1/crates/float_eq/0.7.0/download -> float_eq-0.7.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-await-test/0.3.0/download -> futures-await-test-0.3.0.crate https://crates.io/api/v1/crates/futures-await-test-macro/0.3.0/download -> futures-await-test-macro-0.3.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.5/download -> getrandom-0.2.5.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/gloo-timers/0.2.3/download -> gloo-timers-0.2.3.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.7.0/download -> hashlink-0.7.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hex-literal/0.3.4/download -> hex-literal-0.3.4.crate https://crates.io/api/v1/crates/hkdf/0.12.3/download -> hkdf-0.12.3.crate https://crates.io/api/v1/crates/hmac/0.12.1/download -> hmac-0.12.1.crate https://crates.io/api/v1/crates/httparse/1.6.0/download -> httparse-1.6.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/http/0.2.6/download -> http-0.2.6.crate https://crates.io/api/v1/crates/http-body/0.4.4/download -> http-body-0.4.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.0.1/download -> humantime-serde-1.0.1.crate https://crates.io/api/v1/crates/hyper/0.14.17/download -> hyper-0.14.17.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.56/download -> js-sys-0.3.56.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.119/download -> libc-0.2.119.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.23.2/download -> libsqlite3-sys-0.23.2.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/lzma-sys/0.1.17/download -> lzma-sys-0.1.17.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.5.3/download -> memmap2-0.5.3.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/merlin/2.0.1/download -> merlin-2.0.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.0/download -> mio-0.8.0.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/native-tls/0.2.8/download -> native-tls-0.2.8.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/7.1.0/download -> nom-7.1.0.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-bigint-dig/0.7.0/download -> num-bigint-dig-0.7.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.3/download -> num_threads-0.1.3.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.1.crate https://crates.io/api/v1/crates/once_cell/1.9.0/download -> once_cell-1.9.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.38/download -> openssl-0.10.38.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.17.0+1.1.1m/download -> openssl-src-111.17.0+1.1.1m.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.1/download -> parking_lot_core-0.9.1.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.crate https://crates.io/api/v1/crates/pem-rfc7468/0.2.4/download -> pem-rfc7468-0.2.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project/1.0.10/download -> pin-project-1.0.10.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download -> pin-project-internal-1.0.10.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkcs1/0.2.4/download -> pkcs1-0.2.4.crate https://crates.io/api/v1/crates/pkcs8/0.7.6/download -> pkcs8-0.7.6.crate https://crates.io/api/v1/crates/pkg-config/0.3.24/download -> pkg-config-0.3.24.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/postage/0.4.1/download -> postage-0.4.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.15/download -> quote-1.0.15.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.crate https://crates.io/api/v1/crates/redox_users/0.4.0/download -> redox_users-0.4.0.crate https://crates.io/api/v1/crates/regex/1.5.4/download -> regex-1.5.4.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/retain_mut/0.1.7/download -> retain_mut-0.1.7.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rlimit/0.7.0/download -> rlimit-0.7.0.crate https://crates.io/api/v1/crates/rsa/0.5.0/download -> rsa-0.5.0.crate https://crates.io/api/v1/crates/rusqlite/0.26.3/download -> rusqlite-0.26.3.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/sanitize-filename/0.3.0/download -> sanitize-filename-0.3.0.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/serde_test/1.0.136/download -> serde_test-1.0.136.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha3/0.10.1/download -> sha3-0.10.1.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/sha-1/0.10.0/download -> sha-1-0.10.0.crate https://crates.io/api/v1/crates/shellexpand/2.1.0/download -> shellexpand-2.1.0.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/signature/1.5.0/download -> signature-1.5.0.crate https://crates.io/api/v1/crates/simple_asn1/0.6.1/download -> simple_asn1-0.6.1.crate https://crates.io/api/v1/crates/siphasher/0.3.9/download -> siphasher-0.3.9.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spki/0.4.1/download -> spki-0.4.1.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/syn/1.0.86/download -> syn-1.0.86.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.2/download -> termcolor-1.1.2.crate https://crates.io/api/v1/crates/test-cert-gen/0.7.0/download -> test-cert-gen-0.7.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.7/download -> time-0.3.7.crate https://crates.io/api/v1/crates/time-macros/0.2.3/download -> time-macros-0.2.3.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tls-api/0.7.0/download -> tls-api-0.7.0.crate https://crates.io/api/v1/crates/tls-api-native-tls/0.7.0/download -> tls-api-native-tls-0.7.0.crate https://crates.io/api/v1/crates/tls-api-test/0.7.0/download -> tls-api-test-0.7.0.crate https://crates.io/api/v1/crates/tokio/1.17.0/download -> tokio-1.17.0.crate https://crates.io/api/v1/crates/tokio-macros/1.7.0/download -> tokio-macros-1.7.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.0/download -> tokio-util-0.7.0.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.31/download -> tracing-0.1.31.crate https://crates.io/api/v1/crates/tracing-appender/0.2.1/download -> tracing-appender-0.2.1.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.19/download -> tracing-attributes-0.1.19.crate https://crates.io/api/v1/crates/tracing-core/0.1.22/download -> tracing-core-0.1.22.crate https://crates.io/api/v1/crates/tracing-journald/0.2.3/download -> tracing-journald-0.2.3.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.9/download -> tracing-subscriber-0.3.9.crate https://crates.io/api/v1/crates/tracing-test/0.2.1/download -> tracing-test-0.2.1.crate https://crates.io/api/v1/crates/tracing-test-macro/0.2.1/download -> tracing-test-macro-0.2.1.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/value-bag/1.0.0-alpha.8/download -> value-bag-1.0.0-alpha.8.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.79/download -> wasm-bindgen-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.79/download -> wasm-bindgen-backend-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.29/download -> wasm-bindgen-futures-0.4.29.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.79/download -> wasm-bindgen-macro-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.79/download -> wasm-bindgen-macro-support-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.79/download -> wasm-bindgen-shared-0.2.79.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/web-sys/0.3.56/download -> web-sys-0.3.56.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.32.0/download -> windows-sys-0.32.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.32.0/download -> windows_aarch64_msvc-0.32.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.32.0/download -> windows_i686_gnu-0.32.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.32.0/download -> windows_i686_msvc-0.32.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.32.0/download -> windows_x86_64_gnu-0.32.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.32.0/download -> windows_x86_64_msvc-0.32.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x509-signature/0.5.0/download -> x509-signature-0.5.0.crate https://crates.io/api/v1/crates/x25519-dalek/1.2.0/download -> x25519-dalek-1.2.0.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.3.2/download -> zeroize_derive-1.3.2.crate https://crates.io/api/v1/crates/zstd/0.10.0+zstd.1.5.2/download -> zstd-0.10.0+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-safe/4.1.4+zstd.1.5.2/download -> zstd-safe-4.1.4+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-sys/1.6.3+zstd.1.5.2/download -> zstd-sys-1.6.3+zstd.1.5.2.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=d6beda584dc90416ca564a34da45a192
diff --git a/metadata/md5-cache/net-p2p/arti-0.2.0 b/metadata/md5-cache/net-p2p/arti-0.2.0
deleted file mode 100644
index 3d4a109d2674..000000000000
--- a/metadata/md5-cache/net-p2p/arti-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=virtual/rust-1.53
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
-DESCRIPTION=An implementation of Tor, in Rust.
-EAPI=8
-HOMEPAGE=https://gitlab.torproject.org/tpo/core/arti/
-INHERIT=cargo
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=MIT Apache-2.0
-RDEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
-SLOT=0
-SRC_URI=https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v0.2.0/arti-arti-v0.2.0.tar.gz -> arti-0.2.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.7.5/download -> aes-0.7.5.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.56/download -> anyhow-1.0.56.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/asynchronous-codec/0.6.0/download -> asynchronous-codec-0.6.0.crate https://crates.io/api/v1/crates/async-broadcast/0.4.0/download -> async-broadcast-0.4.0.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-compression/0.3.12/download -> async-compression-0.3.12.crate https://crates.io/api/v1/crates/async-ctrlc/1.2.0/download -> async-ctrlc-1.2.0.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-global-executor/2.0.4/download -> async-global-executor-2.0.4.crate https://crates.io/api/v1/crates/async-io/1.6.0/download -> async-io-1.6.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-native-tls/0.4.0/download -> async-native-tls-0.4.0.crate https://crates.io/api/v1/crates/async-process/1.3.0/download -> async-process-1.3.0.crate https://crates.io/api/v1/crates/async-rustls/0.2.0/download -> async-rustls-0.2.0.crate https://crates.io/api/v1/crates/async-std/1.11.0/download -> async-std-1.11.0.crate https://crates.io/api/v1/crates/async-task/4.2.0/download -> async-task-4.2.0.crate https://crates.io/api/v1/crates/async-trait/0.1.53/download -> async-trait-0.1.53.crate https://crates.io/api/v1/crates/async_executors/0.4.2/download -> async_executors-0.4.2.crate https://crates.io/api/v1/crates/atomic/0.5.1/download -> atomic-0.5.1.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.8/download -> autocfg-0.1.8.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.64/download -> backtrace-0.3.64.crate https://crates.io/api/v1/crates/base64ct/1.1.1/download -> base64ct-1.1.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blanket/0.2.0/download -> blanket-0.2.0.crate https://crates.io/api/v1/crates/blocking/1.2.0/download -> blocking-1.2.0.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bounded-vec-deque/0.1.1/download -> bounded-vec-deque-0.1.1.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cargo-husky/1.5.0/download -> cargo-husky-1.5.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cipher/0.3.0/download -> cipher-0.3.0.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/coarsetime/0.1.22/download -> coarsetime-0.1.22.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/config/0.12.0/download -> config-0.12.0.crate https://crates.io/api/v1/crates/const-oid/0.6.2/download -> const-oid-0.6.2.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.5/download -> crossbeam-queue-0.3.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-bigint/0.2.11/download -> crypto-bigint-0.2.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/ctrlc/3.2.1/download -> ctrlc-3.2.1.crate https://crates.io/api/v1/crates/ctr/0.8.0/download -> ctr-0.8.0.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.1/download -> curve25519-dalek-3.2.1.crate https://crates.io/api/v1/crates/darling/0.12.4/download -> darling-0.12.4.crate https://crates.io/api/v1/crates/darling_core/0.12.4/download -> darling_core-0.12.4.crate https://crates.io/api/v1/crates/darling_macro/0.12.4/download -> darling_macro-0.12.4.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derive_builder/0.11.1/download -> derive_builder-0.11.1.crate https://crates.io/api/v1/crates/derive_builder_core/0.11.1/download -> derive_builder_core-0.11.1.crate https://crates.io/api/v1/crates/derive_builder_macro/0.11.1/download -> derive_builder_macro-0.11.1.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/der/0.4.5/download -> der-0.4.5.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dyn-clone/1.0.5/download -> dyn-clone-1.0.5.crate https://crates.io/api/v1/crates/easy-parallel/3.2.0/download -> easy-parallel-3.2.0.crate https://crates.io/api/v1/crates/ed25519/1.4.1/download -> ed25519-1.4.1.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/educe/0.4.19/download -> educe-0.4.19.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/enum-as-inner/0.4.0/download -> enum-as-inner-0.4.0.crate https://crates.io/api/v1/crates/enum-ordinalize/3.1.11/download -> enum-ordinalize-3.1.11.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/filetime/0.2.15/download -> filetime-0.2.15.crate https://crates.io/api/v1/crates/flate2/1.0.22/download -> flate2-1.0.22.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/float-ord/0.3.2/download -> float-ord-0.3.2.crate https://crates.io/api/v1/crates/float_eq/0.7.0/download -> float_eq-0.7.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/fuchsia-cprng/0.1.1/download -> fuchsia-cprng-0.1.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-await-test/0.3.0/download -> futures-await-test-0.3.0.crate https://crates.io/api/v1/crates/futures-await-test-macro/0.3.0/download -> futures-await-test-macro-0.3.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/gloo-timers/0.2.3/download -> gloo-timers-0.2.3.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.7.0/download -> hashlink-0.7.0.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hex-literal/0.3.4/download -> hex-literal-0.3.4.crate https://crates.io/api/v1/crates/hkdf/0.12.3/download -> hkdf-0.12.3.crate https://crates.io/api/v1/crates/hmac/0.12.1/download -> hmac-0.12.1.crate https://crates.io/api/v1/crates/httparse/1.6.0/download -> httparse-1.6.0.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/http/0.2.6/download -> http-0.2.6.crate https://crates.io/api/v1/crates/http-body/0.4.4/download -> http-body-0.4.4.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/hyper/0.14.18/download -> hyper-0.14.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.4.0/download -> ipnet-2.4.0.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.1/download -> itoa-1.0.1.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.56/download -> js-sys-0.3.56.crate https://crates.io/api/v1/crates/keccak/0.1.0/download -> keccak-0.1.0.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.24.2/download -> libsqlite3-sys-0.24.2.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.16/download -> log-0.4.16.crate https://crates.io/api/v1/crates/lzma-sys/0.1.17/download -> lzma-sys-0.1.17.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.4.1/download -> memchr-2.4.1.crate https://crates.io/api/v1/crates/memmap2/0.5.3/download -> memmap2-0.5.3.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/merlin/2.0.1/download -> merlin-2.0.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.4.4/download -> miniz_oxide-0.4.4.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/miow/0.3.7/download -> miow-0.3.7.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.2/download -> mio-0.8.2.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/ntapi/0.3.7/download -> ntapi-0.3.7.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-bigint-dig/0.7.0/download -> num-bigint-dig-0.7.0.crate https://crates.io/api/v1/crates/num-integer/0.1.44/download -> num-integer-0.1.44.crate https://crates.io/api/v1/crates/num-iter/0.1.42/download -> num-iter-0.1.42.crate https://crates.io/api/v1/crates/num-traits/0.2.14/download -> num-traits-0.2.14.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.5/download -> num_threads-0.1.5.crate https://crates.io/api/v1/crates/object/0.27.1/download -> object-0.27.1.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.38/download -> openssl-0.10.38.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.18.0+1.1.1n/download -> openssl-src-111.18.0+1.1.1n.crate https://crates.io/api/v1/crates/openssl-sys/0.9.72/download -> openssl-sys-0.9.72.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.2/download -> parking_lot_core-0.9.2.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.crate https://crates.io/api/v1/crates/pem-rfc7468/0.2.4/download -> pem-rfc7468-0.2.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project/1.0.10/download -> pin-project-1.0.10.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download -> pin-project-internal-1.0.10.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.8/download -> pin-project-lite-0.2.8.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkcs1/0.2.4/download -> pkcs1-0.2.4.crate https://crates.io/api/v1/crates/pkcs8/0.7.6/download -> pkcs8-0.7.6.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/postage/0.4.1/download -> postage-0.4.1.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.17/download -> quote-1.0.17.crate https://crates.io/api/v1/crates/rand/0.4.6/download -> rand-0.4.6.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.3.1/download -> rand_core-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.4.2/download -> rand_core-0.4.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rdrand/0.4.0/download -> rdrand-0.4.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.5/download -> regex-1.5.5.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.25/download -> regex-syntax-0.6.25.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/retain_mut/0.1.7/download -> retain_mut-0.1.7.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rlimit/0.8.0/download -> rlimit-0.8.0.crate https://crates.io/api/v1/crates/rsa/0.5.0/download -> rsa-0.5.0.crate https://crates.io/api/v1/crates/rusqlite/0.27.0/download -> rusqlite-0.27.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/ryu/1.0.9/download -> ryu-1.0.9.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/sanitize-filename/0.3.0/download -> sanitize-filename-0.3.0.crate https://crates.io/api/v1/crates/schannel/0.1.19/download -> schannel-0.1.19.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.7/download -> semver-1.0.7.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/serde_derive/1.0.136/download -> serde_derive-1.0.136.crate https://crates.io/api/v1/crates/serde_json/1.0.79/download -> serde_json-1.0.79.crate https://crates.io/api/v1/crates/serde_test/1.0.136/download -> serde_test-1.0.136.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha3/0.10.1/download -> sha3-0.10.1.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/sha-1/0.10.0/download -> sha-1-0.10.0.crate https://crates.io/api/v1/crates/shellexpand-fork/2.1.1/download -> shellexpand-fork-2.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.3.13/download -> signal-hook-0.3.13.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/signature/1.5.0/download -> signature-1.5.0.crate https://crates.io/api/v1/crates/simple_asn1/0.6.1/download -> simple_asn1-0.6.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.5/download -> slab-0.4.5.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spki/0.4.1/download -> spki-0.4.1.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/syn/1.0.90/download -> syn-1.0.90.crate https://crates.io/api/v1/crates/tempdir/0.3.7/download -> tempdir-0.3.7.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/test-cert-gen/0.7.0/download -> test-cert-gen-0.7.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.30/download -> thiserror-1.0.30.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.30/download -> thiserror-impl-1.0.30.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinyvec/1.5.1/download -> tinyvec-1.5.1.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tls-api/0.7.0/download -> tls-api-0.7.0.crate https://crates.io/api/v1/crates/tls-api-native-tls/0.7.0/download -> tls-api-native-tls-0.7.0.crate https://crates.io/api/v1/crates/tls-api-test/0.7.0/download -> tls-api-test-0.7.0.crate https://crates.io/api/v1/crates/tokio/1.17.0/download -> tokio-1.17.0.crate https://crates.io/api/v1/crates/tokio-macros/1.7.0/download -> tokio-macros-1.7.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.1/download -> tokio-util-0.7.1.crate https://crates.io/api/v1/crates/toml/0.5.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.32/download -> tracing-0.1.32.crate https://crates.io/api/v1/crates/tracing-appender/0.2.2/download -> tracing-appender-0.2.2.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.20/download -> tracing-attributes-0.1.20.crate https://crates.io/api/v1/crates/tracing-core/0.1.23/download -> tracing-core-0.1.23.crate https://crates.io/api/v1/crates/tracing-journald/0.2.4/download -> tracing-journald-0.2.4.crate https://crates.io/api/v1/crates/tracing-log/0.1.2/download -> tracing-log-0.1.2.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.9/download -> tracing-subscriber-0.3.9.crate https://crates.io/api/v1/crates/tracing-test/0.2.1/download -> tracing-test-0.2.1.crate https://crates.io/api/v1/crates/tracing-test-macro/0.2.1/download -> tracing-test-macro-0.2.1.crate https://crates.io/api/v1/crates/trust-dns-proto/0.21.2/download -> trust-dns-proto-0.21.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.7/download -> unicode-bidi-0.3.7.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/value-bag/1.0.0-alpha.8/download -> value-bag-1.0.0-alpha.8.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/visibility/0.0.1/download -> visibility-0.0.1.crate https://crates.io/api/v1/crates/visible/0.0.1/download -> visible-0.0.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.79/download -> wasm-bindgen-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.79/download -> wasm-bindgen-backend-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.29/download -> wasm-bindgen-futures-0.4.29.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.79/download -> wasm-bindgen-macro-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.79/download -> wasm-bindgen-macro-support-0.2.79.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.79/download -> wasm-bindgen-shared-0.2.79.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/web-sys/0.3.56/download -> web-sys-0.3.56.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.34.0/download -> windows-sys-0.34.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.34.0/download -> windows_aarch64_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.34.0/download -> windows_i686_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.34.0/download -> windows_i686_msvc-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.34.0/download -> windows_x86_64_gnu-0.34.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.34.0/download -> windows_x86_64_msvc-0.34.0.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x509-signature/0.5.0/download -> x509-signature-0.5.0.crate https://crates.io/api/v1/crates/x25519-dalek/1.2.0/download -> x25519-dalek-1.2.0.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.3.2/download -> zeroize_derive-1.3.2.crate https://crates.io/api/v1/crates/zstd/0.10.0+zstd.1.5.2/download -> zstd-0.10.0+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-safe/4.1.4+zstd.1.5.2/download -> zstd-safe-4.1.4+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-sys/1.6.3+zstd.1.5.2/download -> zstd-sys-1.6.3+zstd.1.5.2.crate
-_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c33b649b59dd36fc4c9987e5ce266bb0
diff --git a/metadata/md5-cache/net-p2p/arti-0.4.0 b/metadata/md5-cache/net-p2p/arti-0.4.0
new file mode 100644
index 000000000000..38aa7cad03b0
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/arti-0.4.0
@@ -0,0 +1,15 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
+DESCRIPTION=An implementation of Tor, in Rust.
+EAPI=8
+HOMEPAGE=https://gitlab.torproject.org/tpo/core/arti/
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0
+RDEPEND=app-arch/xz-utils dev-db/sqlite:3 dev-libs/openssl:=
+SLOT=0
+SRC_URI=https://gitlab.torproject.org/tpo/core/arti/-/archive/arti-v0.4.0/arti-arti-v0.4.0.tar.gz -> arti-0.4.0.tar.gz https://crates.io/api/v1/crates/addr2line/0.17.0/download -> addr2line-0.17.0.crate https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aes/0.8.1/download -> aes-0.8.1.crate https://crates.io/api/v1/crates/ahash/0.7.6/download -> ahash-0.7.6.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/anyhow/1.0.57/download -> anyhow-1.0.57.crate https://crates.io/api/v1/crates/arrayref/0.3.6/download -> arrayref-0.3.6.crate https://crates.io/api/v1/crates/asynchronous-codec/0.6.0/download -> asynchronous-codec-0.6.0.crate https://crates.io/api/v1/crates/async-broadcast/0.4.0/download -> async-broadcast-0.4.0.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-compression/0.3.14/download -> async-compression-0.3.14.crate https://crates.io/api/v1/crates/async-ctrlc/1.2.0/download -> async-ctrlc-1.2.0.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-global-executor/2.0.4/download -> async-global-executor-2.0.4.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-mutex/1.4.0/download -> async-mutex-1.4.0.crate https://crates.io/api/v1/crates/async-native-tls/0.4.0/download -> async-native-tls-0.4.0.crate https://crates.io/api/v1/crates/async-process/1.4.0/download -> async-process-1.4.0.crate https://crates.io/api/v1/crates/async-rustls/0.2.0/download -> async-rustls-0.2.0.crate https://crates.io/api/v1/crates/async-std/1.11.0/download -> async-std-1.11.0.crate https://crates.io/api/v1/crates/async-task/4.2.0/download -> async-task-4.2.0.crate https://crates.io/api/v1/crates/async-trait/0.1.53/download -> async-trait-0.1.53.crate https://crates.io/api/v1/crates/async_executors/0.6.0/download -> async_executors-0.6.0.crate https://crates.io/api/v1/crates/atomic/0.5.1/download -> atomic-0.5.1.crate https://crates.io/api/v1/crates/atomic-waker/1.0.0/download -> atomic-waker-1.0.0.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/0.1.8/download -> autocfg-0.1.8.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/backtrace/0.3.65/download -> backtrace-0.3.65.crate https://crates.io/api/v1/crates/base64ct/1.1.1/download -> base64ct-1.1.1.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/blanket/0.2.0/download -> blanket-0.2.0.crate https://crates.io/api/v1/crates/blocking/1.2.0/download -> blocking-1.2.0.crate https://crates.io/api/v1/crates/block-buffer/0.9.0/download -> block-buffer-0.9.0.crate https://crates.io/api/v1/crates/block-buffer/0.10.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bounded-vec-deque/0.1.1/download -> bounded-vec-deque-0.1.1.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.1.0/download -> bytes-1.1.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cipher/0.4.3/download -> cipher-0.4.3.crate https://crates.io/api/v1/crates/clap/2.34.0/download -> clap-2.34.0.crate https://crates.io/api/v1/crates/coarsetime/0.1.22/download -> coarsetime-0.1.22.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/config/0.13.1/download -> config-0.13.1.crate https://crates.io/api/v1/crates/const-oid/0.6.2/download -> const-oid-0.6.2.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/crossbeam-channel/0.5.4/download -> crossbeam-channel-0.5.4.crate https://crates.io/api/v1/crates/crossbeam-queue/0.3.5/download -> crossbeam-queue-0.3.5.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.8/download -> crossbeam-utils-0.8.8.crate https://crates.io/api/v1/crates/crypto-bigint/0.2.11/download -> crypto-bigint-0.2.11.crate https://crates.io/api/v1/crates/crypto-common/0.1.3/download -> crypto-common-0.1.3.crate https://crates.io/api/v1/crates/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/ctrlc/3.2.2/download -> ctrlc-3.2.2.crate https://crates.io/api/v1/crates/ctr/0.9.1/download -> ctr-0.9.1.crate https://crates.io/api/v1/crates/curve25519-dalek/3.2.1/download -> curve25519-dalek-3.2.1.crate https://crates.io/api/v1/crates/darling/0.14.1/download -> darling-0.14.1.crate https://crates.io/api/v1/crates/darling_core/0.14.1/download -> darling_core-0.14.1.crate https://crates.io/api/v1/crates/darling_macro/0.14.1/download -> darling_macro-0.14.1.crate https://crates.io/api/v1/crates/data-encoding/2.3.2/download -> data-encoding-2.3.2.crate https://crates.io/api/v1/crates/derive_builder_core_fork_arti/0.11.2/download -> derive_builder_core_fork_arti-0.11.2.crate https://crates.io/api/v1/crates/derive_builder_fork_arti/0.11.2/download -> derive_builder_fork_arti-0.11.2.crate https://crates.io/api/v1/crates/derive_builder_macro_fork_arti/0.11.2/download -> derive_builder_macro_fork_arti-0.11.2.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/der/0.4.5/download -> der-0.4.5.crate https://crates.io/api/v1/crates/digest/0.9.0/download -> digest-0.9.0.crate https://crates.io/api/v1/crates/digest/0.10.3/download -> digest-0.10.3.crate https://crates.io/api/v1/crates/directories/4.0.1/download -> directories-4.0.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/displaydoc/0.2.3/download -> displaydoc-0.2.3.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/dyn-clone/1.0.5/download -> dyn-clone-1.0.5.crate https://crates.io/api/v1/crates/easy-parallel/3.2.0/download -> easy-parallel-3.2.0.crate https://crates.io/api/v1/crates/ed25519/1.5.2/download -> ed25519-1.5.2.crate https://crates.io/api/v1/crates/ed25519-dalek/1.0.1/download -> ed25519-dalek-1.0.1.crate https://crates.io/api/v1/crates/educe/0.4.19/download -> educe-0.4.19.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/enum-as-inner/0.4.0/download -> enum-as-inner-0.4.0.crate https://crates.io/api/v1/crates/enum-ordinalize/3.1.11/download -> enum-ordinalize-3.1.11.crate https://crates.io/api/v1/crates/env_logger/0.5.13/download -> env_logger-0.5.13.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fallible-iterator/0.2.0/download -> fallible-iterator-0.2.0.crate https://crates.io/api/v1/crates/fallible-streaming-iterator/0.1.9/download -> fallible-streaming-iterator-0.1.9.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/filetime/0.2.16/download -> filetime-0.2.16.crate https://crates.io/api/v1/crates/flate2/1.0.23/download -> flate2-1.0.23.crate https://crates.io/api/v1/crates/float-cmp/0.9.0/download -> float-cmp-0.9.0.crate https://crates.io/api/v1/crates/float-ord/0.3.2/download -> float-ord-0.3.2.crate https://crates.io/api/v1/crates/float_eq/0.7.0/download -> float_eq-0.7.0.crate https://crates.io/api/v1/crates/fluid-let/1.0.0/download -> fluid-let-1.0.0.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/fsevent/0.4.0/download -> fsevent-0.4.0.crate https://crates.io/api/v1/crates/fsevent-sys/2.0.1/download -> fsevent-sys-2.0.1.crate https://crates.io/api/v1/crates/fslock/0.2.1/download -> fslock-0.2.1.crate https://crates.io/api/v1/crates/fuchsia-zircon/0.3.3/download -> fuchsia-zircon-0.3.3.crate https://crates.io/api/v1/crates/fuchsia-zircon-sys/0.3.3/download -> fuchsia-zircon-sys-0.3.3.crate https://crates.io/api/v1/crates/futures/0.3.21/download -> futures-0.3.21.crate https://crates.io/api/v1/crates/futures-await-test/0.3.0/download -> futures-await-test-0.3.0.crate https://crates.io/api/v1/crates/futures-await-test-macro/0.3.0/download -> futures-await-test-macro-0.3.0.crate https://crates.io/api/v1/crates/futures-channel/0.3.21/download -> futures-channel-0.3.21.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-executor/0.3.21/download -> futures-executor-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-macro/0.3.21/download -> futures-macro-0.3.21.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/getrandom/0.2.6/download -> getrandom-0.2.6.crate https://crates.io/api/v1/crates/gimli/0.26.1/download -> gimli-0.26.1.crate https://crates.io/api/v1/crates/gloo-timers/0.2.4/download -> gloo-timers-0.2.4.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hashlink/0.7.0/download -> hashlink-0.7.0.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/hex-literal/0.3.4/download -> hex-literal-0.3.4.crate https://crates.io/api/v1/crates/hkdf/0.12.3/download -> hkdf-0.12.3.crate https://crates.io/api/v1/crates/hmac/0.12.1/download -> hmac-0.12.1.crate https://crates.io/api/v1/crates/httparse/1.7.1/download -> httparse-1.7.1.crate https://crates.io/api/v1/crates/httpdate/1.0.2/download -> httpdate-1.0.2.crate https://crates.io/api/v1/crates/http/0.2.7/download -> http-0.2.7.crate https://crates.io/api/v1/crates/http-body/0.4.5/download -> http-body-0.4.5.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/humantime-serde/1.1.1/download -> humantime-serde-1.1.1.crate https://crates.io/api/v1/crates/hyper/0.14.18/download -> hyper-0.14.18.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/inotify/0.7.1/download -> inotify-0.7.1.crate https://crates.io/api/v1/crates/inotify-sys/0.1.5/download -> inotify-sys-0.1.5.crate https://crates.io/api/v1/crates/inout/0.1.3/download -> inout-0.1.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/iovec/0.1.4/download -> iovec-0.1.4.crate https://crates.io/api/v1/crates/ipnet/2.5.0/download -> ipnet-2.5.0.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/jobserver/0.1.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/js-sys/0.3.57/download -> js-sys-0.3.57.crate https://crates.io/api/v1/crates/keccak/0.1.2/download -> keccak-0.1.2.crate https://crates.io/api/v1/crates/kernel32-sys/0.2.2/download -> kernel32-sys-0.2.2.crate https://crates.io/api/v1/crates/kv-log-macro/1.0.7/download -> kv-log-macro-1.0.7.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libm/0.2.2/download -> libm-0.2.2.crate https://crates.io/api/v1/crates/libsqlite3-sys/0.24.2/download -> libsqlite3-sys-0.24.2.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/lzma-sys/0.1.17/download -> lzma-sys-0.1.17.crate https://crates.io/api/v1/crates/matchers/0.1.0/download -> matchers-0.1.0.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.5.3/download -> memmap2-0.5.3.crate https://crates.io/api/v1/crates/merlin/2.0.1/download -> merlin-2.0.1.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.1/download -> miniz_oxide-0.5.1.crate https://crates.io/api/v1/crates/miow/0.2.2/download -> miow-0.2.2.crate https://crates.io/api/v1/crates/mio/0.6.23/download -> mio-0.6.23.crate https://crates.io/api/v1/crates/mio/0.8.3/download -> mio-0.8.3.crate https://crates.io/api/v1/crates/mio-extras/2.0.6/download -> mio-extras-2.0.6.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/net2/0.2.37/download -> net2-0.2.37.crate https://crates.io/api/v1/crates/nix/0.24.1/download -> nix-0.24.1.crate https://crates.io/api/v1/crates/nom/7.1.1/download -> nom-7.1.1.crate https://crates.io/api/v1/crates/notify/4.0.17/download -> notify-4.0.17.crate https://crates.io/api/v1/crates/num-bigint/0.4.3/download -> num-bigint-0.4.3.crate https://crates.io/api/v1/crates/num-bigint-dig/0.7.0/download -> num-bigint-dig-0.7.0.crate https://crates.io/api/v1/crates/num-integer/0.1.45/download -> num-integer-0.1.45.crate https://crates.io/api/v1/crates/num-iter/0.1.43/download -> num-iter-0.1.43.crate https://crates.io/api/v1/crates/num-traits/0.2.15/download -> num-traits-0.2.15.crate https://crates.io/api/v1/crates/num_cpus/1.13.1/download -> num_cpus-1.13.1.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/object/0.28.4/download -> object-0.28.4.crate https://crates.io/api/v1/crates/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/opaque-debug/0.3.0/download -> opaque-debug-0.3.0.crate https://crates.io/api/v1/crates/openssl/0.10.40/download -> openssl-0.10.40.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-src/111.20.0+1.1.1o/download -> openssl-src-111.20.0+1.1.1o.crate https://crates.io/api/v1/crates/openssl-sys/0.9.73/download -> openssl-sys-0.9.73.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot/0.12.0/download -> parking_lot-0.12.0.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.crate https://crates.io/api/v1/crates/paste/1.0.7/download -> paste-1.0.7.crate https://crates.io/api/v1/crates/pathdiff/0.2.1/download -> pathdiff-0.2.1.crate https://crates.io/api/v1/crates/pem/0.8.3/download -> pem-0.8.3.crate https://crates.io/api/v1/crates/pem-rfc7468/0.2.4/download -> pem-rfc7468-0.2.4.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/phf/0.10.1/download -> phf-0.10.1.crate https://crates.io/api/v1/crates/phf_generator/0.10.0/download -> phf_generator-0.10.0.crate https://crates.io/api/v1/crates/phf_macros/0.10.0/download -> phf_macros-0.10.0.crate https://crates.io/api/v1/crates/phf_shared/0.10.0/download -> phf_shared-0.10.0.crate https://crates.io/api/v1/crates/pin-project/1.0.10/download -> pin-project-1.0.10.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.10/download -> pin-project-internal-1.0.10.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkcs1/0.2.4/download -> pkcs1-0.2.4.crate https://crates.io/api/v1/crates/pkcs8/0.7.6/download -> pkcs8-0.7.6.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/postage/0.5.0/download -> postage-0.5.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-automata/0.1.10/download -> regex-automata-0.1.10.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/retain_mut/0.1.9/download -> retain_mut-0.1.9.crate https://crates.io/api/v1/crates/ring/0.16.20/download -> ring-0.16.20.crate https://crates.io/api/v1/crates/rlimit/0.8.3/download -> rlimit-0.8.3.crate https://crates.io/api/v1/crates/rmp/0.8.11/download -> rmp-0.8.11.crate https://crates.io/api/v1/crates/rmp-serde/1.1.0/download -> rmp-serde-1.1.0.crate https://crates.io/api/v1/crates/rsa/0.5.0/download -> rsa-0.5.0.crate https://crates.io/api/v1/crates/rusqlite/0.27.0/download -> rusqlite-0.27.0.crate https://crates.io/api/v1/crates/rustc-demangle/0.1.21/download -> rustc-demangle-0.1.21.crate https://crates.io/api/v1/crates/rustc_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustls/0.19.1/download -> rustls-0.19.1.crate https://crates.io/api/v1/crates/rustversion/1.0.6/download -> rustversion-1.0.6.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/sanitize-filename/0.4.0/download -> sanitize-filename-0.4.0.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/sct/0.6.1/download -> sct-0.6.1.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/semver/1.0.9/download -> semver-1.0.9.crate https://crates.io/api/v1/crates/serde/1.0.137/download -> serde-1.0.137.crate https://crates.io/api/v1/crates/serde_derive/1.0.137/download -> serde_derive-1.0.137.crate https://crates.io/api/v1/crates/serde_ignored/0.1.3/download -> serde_ignored-0.1.3.crate https://crates.io/api/v1/crates/serde_json/1.0.81/download -> serde_json-1.0.81.crate https://crates.io/api/v1/crates/serde_test/1.0.137/download -> serde_test-1.0.137.crate https://crates.io/api/v1/crates/serial_test/0.6.0/download -> serial_test-0.6.0.crate https://crates.io/api/v1/crates/serial_test_derive/0.6.0/download -> serial_test_derive-0.6.0.crate https://crates.io/api/v1/crates/sha2/0.9.9/download -> sha2-0.9.9.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/sha3/0.10.1/download -> sha3-0.10.1.crate https://crates.io/api/v1/crates/sharded-slab/0.1.4/download -> sharded-slab-0.1.4.crate https://crates.io/api/v1/crates/sha-1/0.10.0/download -> sha-1-0.10.0.crate https://crates.io/api/v1/crates/shellexpand-fork/2.1.1/download -> shellexpand-fork-2.1.1.crate https://crates.io/api/v1/crates/signal-hook/0.3.14/download -> signal-hook-0.3.14.crate https://crates.io/api/v1/crates/signal-hook-registry/1.4.0/download -> signal-hook-registry-1.4.0.crate https://crates.io/api/v1/crates/signature/1.5.0/download -> signature-1.5.0.crate https://crates.io/api/v1/crates/simple_asn1/0.6.1/download -> simple_asn1-0.6.1.crate https://crates.io/api/v1/crates/siphasher/0.3.10/download -> siphasher-0.3.10.crate https://crates.io/api/v1/crates/slab/0.4.6/download -> slab-0.4.6.crate https://crates.io/api/v1/crates/smallvec/1.8.0/download -> smallvec-1.8.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.5.2/download -> spin-0.5.2.crate https://crates.io/api/v1/crates/spki/0.4.1/download -> spki-0.4.1.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.8.0/download -> strsim-0.8.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.24.0/download -> strum-0.24.0.crate https://crates.io/api/v1/crates/strum_macros/0.24.0/download -> strum_macros-0.24.0.crate https://crates.io/api/v1/crates/subtle/2.4.1/download -> subtle-2.4.1.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/syn/1.0.95/download -> syn-1.0.95.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/termcolor/1.1.3/download -> termcolor-1.1.3.crate https://crates.io/api/v1/crates/test-cert-gen/0.8.0/download -> test-cert-gen-0.8.0.crate https://crates.io/api/v1/crates/textwrap/0.11.0/download -> textwrap-0.11.0.crate https://crates.io/api/v1/crates/thiserror/1.0.31/download -> thiserror-1.0.31.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.31/download -> thiserror-impl-1.0.31.crate https://crates.io/api/v1/crates/thread_local/1.1.4/download -> thread_local-1.1.4.crate https://crates.io/api/v1/crates/time/0.3.9/download -> time-0.3.9.crate https://crates.io/api/v1/crates/time-macros/0.2.4/download -> time-macros-0.2.4.crate https://crates.io/api/v1/crates/tinystr/0.6.0/download -> tinystr-0.6.0.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/tls-api/0.8.0/download -> tls-api-0.8.0.crate https://crates.io/api/v1/crates/tls-api-native-tls/0.8.0/download -> tls-api-native-tls-0.8.0.crate https://crates.io/api/v1/crates/tls-api-test/0.8.0/download -> tls-api-test-0.8.0.crate https://crates.io/api/v1/crates/tokio/1.18.2/download -> tokio-1.18.2.crate https://crates.io/api/v1/crates/tokio-macros/1.7.0/download -> tokio-macros-1.7.0.crate https://crates.io/api/v1/crates/tokio-socks/0.5.1/download -> tokio-socks-0.5.1.crate https://crates.io/api/v1/crates/tokio-util/0.7.2/download -> tokio-util-0.7.2.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tower-service/0.3.1/download -> tower-service-0.3.1.crate https://crates.io/api/v1/crates/tracing/0.1.34/download -> tracing-0.1.34.crate https://crates.io/api/v1/crates/tracing-appender/0.2.2/download -> tracing-appender-0.2.2.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.21/download -> tracing-attributes-0.1.21.crate https://crates.io/api/v1/crates/tracing-core/0.1.26/download -> tracing-core-0.1.26.crate https://crates.io/api/v1/crates/tracing-journald/0.3.0/download -> tracing-journald-0.3.0.crate https://crates.io/api/v1/crates/tracing-log/0.1.3/download -> tracing-log-0.1.3.crate https://crates.io/api/v1/crates/tracing-subscriber/0.3.11/download -> tracing-subscriber-0.3.11.crate https://crates.io/api/v1/crates/tracing-test/0.2.1/download -> tracing-test-0.2.1.crate https://crates.io/api/v1/crates/tracing-test-macro/0.2.1/download -> tracing-test-macro-0.2.1.crate https://crates.io/api/v1/crates/trust-dns-proto/0.21.2/download -> trust-dns-proto-0.21.2.crate https://crates.io/api/v1/crates/try-lock/0.2.3/download -> try-lock-0.2.3.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.0.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.0/download -> unicode-ident-1.0.0.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.19/download -> unicode-normalization-0.1.19.crate https://crates.io/api/v1/crates/unicode-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/untrusted/0.6.2/download -> untrusted-0.6.2.crate https://crates.io/api/v1/crates/untrusted/0.7.1/download -> untrusted-0.7.1.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/users/0.11.0/download -> users-0.11.0.crate https://crates.io/api/v1/crates/valuable/0.1.0/download -> valuable-0.1.0.crate https://crates.io/api/v1/crates/value-bag/1.0.0-alpha.9/download -> value-bag-1.0.0-alpha.9.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/vec_map/0.8.2/download -> vec_map-0.8.2.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/visibility/0.0.1/download -> visibility-0.0.1.crate https://crates.io/api/v1/crates/visible/0.0.1/download -> visible-0.0.1.crate https://crates.io/api/v1/crates/void/1.0.2/download -> void-1.0.2.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/walkdir/2.3.2/download -> walkdir-2.3.2.crate https://crates.io/api/v1/crates/want/0.3.0/download -> want-0.3.0.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wasm-bindgen/0.2.80/download -> wasm-bindgen-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-backend/0.2.80/download -> wasm-bindgen-backend-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-futures/0.4.30/download -> wasm-bindgen-futures-0.4.30.crate https://crates.io/api/v1/crates/wasm-bindgen-macro/0.2.80/download -> wasm-bindgen-macro-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-macro-support/0.2.80/download -> wasm-bindgen-macro-support-0.2.80.crate https://crates.io/api/v1/crates/wasm-bindgen-shared/0.2.80/download -> wasm-bindgen-shared-0.2.80.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/webpki/0.21.4/download -> webpki-0.21.4.crate https://crates.io/api/v1/crates/webpki/0.22.0/download -> webpki-0.22.0.crate https://crates.io/api/v1/crates/web-sys/0.3.57/download -> web-sys-0.3.57.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/winapi/0.2.8/download -> winapi-0.2.8.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-build/0.1.1/download -> winapi-build-0.1.1.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/ws2_32-sys/0.2.1/download -> ws2_32-sys-0.2.1.crate https://crates.io/api/v1/crates/x509-signature/0.5.0/download -> x509-signature-0.5.0.crate https://crates.io/api/v1/crates/x25519-dalek/1.2.0/download -> x25519-dalek-1.2.0.crate https://crates.io/api/v1/crates/xz2/0.1.6/download -> xz2-0.1.6.crate https://crates.io/api/v1/crates/zeroize/1.3.0/download -> zeroize-1.3.0.crate https://crates.io/api/v1/crates/zeroize_derive/1.3.2/download -> zeroize_derive-1.3.2.crate https://crates.io/api/v1/crates/zstd/0.11.2+zstd.1.5.2/download -> zstd-0.11.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-safe/5.0.2+zstd.1.5.2/download -> zstd-safe-5.0.2+zstd.1.5.2.crate https://crates.io/api/v1/crates/zstd-sys/2.0.1+zstd.1.5.2/download -> zstd-sys-2.0.1+zstd.1.5.2.crate
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=00ee6bf537229b8d0344f2bd2f9b3bb4
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.23 b/metadata/md5-cache/net-p2p/ncdc-1.23
new file mode 100644
index 000000000000..2edae4905fcf
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/ncdc-1.23
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/makeheaders virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 >=dev-libs/glib-2.32:2 >=net-libs/gnutls-3:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+DESCRIPTION=ncurses directconnect client
+EAPI=8
+HOMEPAGE=https://dev.yorhel.nl/ncdc
+INHERIT=toolchain-funcs
+IUSE=geoip
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 >=dev-libs/glib-2.32:2 >=net-libs/gnutls-3:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+SLOT=0
+SRC_URI=https://dev.yorhel.nl/download/ncdc-1.23.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b8c781beedbb72b403b1869759956cc2
diff --git a/metadata/md5-cache/net-p2p/ncdc-9999 b/metadata/md5-cache/net-p2p/ncdc-9999
index fad28fd90bc2..fb155fc7d7e0 100644
--- a/metadata/md5-cache/net-p2p/ncdc-9999
+++ b/metadata/md5-cache/net-p2p/ncdc-9999
@@ -1,14 +1,14 @@
 BDEPEND=dev-util/makeheaders virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure prepare unpack
-DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 >=dev-libs/glib-2.32:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
 DESCRIPTION=ncurses directconnect client
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dev.yorhel.nl/ncdc
 INHERIT=toolchain-funcs autotools git-r3
 IUSE=geoip
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-libs/glib:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 >=dev-libs/glib-2.32:2 net-libs/gnutls:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib:= geoip? ( dev-libs/geoip dev-libs/libmaxminddb )
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=614a7e91cb58bfafd4afad2d27364ee1
+_md5_=1dd6bd3ff82ad09992e513ec8f75d02a
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
index 76cc32b6f3ea..84defd992c52 100644
--- a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 ) dev-libs/appstream-glib >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 appindicator? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 ) dev-libs/appstream-glib >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC
 EAPI=6
 HOMEPAGE=https://github.com/transmission-remote-gtk/transmission-remote-gtk
 INHERIT=gnome2
-IUSE=ayatana debug geoip libnotify libproxy rss
+IUSE=appindicator debug geoip libnotify libproxy rss
 KEYWORDS=amd64 ~arm64 ~ppc64 x86
 LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 ayatana? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-0.12.6 net-misc/curl >=x11-libs/gtk+-3.16:3 appindicator? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libnotify? ( >=x11-libs/libnotify-0.7 ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
 SLOT=0
 SRC_URI=https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.4.1/transmission-remote-gtk-1.4.1.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	1a0a60ad07c8b32d2faba2d085dc0f24	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=85dc3a8be8c4ca61af8f772b760cdfd9
+_md5_=0689b3764cb24a3c6922b74cb53d3423
diff --git a/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.5.1 b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.5.1
new file mode 100644
index 000000000000..dea674812708
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/transmission-remote-gtk-1.5.1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst test
+DEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.8 net-misc/curl >=x11-libs/gtk+-3.22:3 appindicator? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
+DESCRIPTION=GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC
+EAPI=8
+HOMEPAGE=https://github.com/transmission-remote-gtk/transmission-remote-gtk
+INHERIT=meson xdg
+IUSE=appindicator debug geoip libproxy rss
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.56:2 >=dev-libs/json-glib-1.2.8 net-misc/curl >=x11-libs/gtk+-3.22:3 appindicator? ( dev-libs/libappindicator:3 ) geoip? ( dev-libs/geoip ) libproxy? ( net-libs/libproxy ) rss? ( >=net-libs/libmrss-0.18 )
+SLOT=0
+SRC_URI=https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/download/1.5.1/transmission-remote-gtk-1.5.1.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=e7222b7f6b46faebcfc55cf9614b71c3
diff --git a/metadata/md5-cache/net-p2p/tremc-0.9.3 b/metadata/md5-cache/net-p2p/tremc-0.9.3
new file mode 100644
index 000000000000..0486fa8f6542
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/tremc-0.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst setup
+DESCRIPTION=Ncurses interface for the Transmission BitTorrent client
+EAPI=8
+HOMEPAGE=https://github.com/tremc/tremc
+INHERIT=bash-completion-r1 optfeature python-single-r1
+IUSE=python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[ncurses] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses] )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/tremc/tremc/archive/refs/tags/0.9.3.tar.gz -> tremc-0.9.3.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	d524f291c80f9d21ad80fe978e3ca760	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=b61135650db8b4d8b5f33d0df4c77f44
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 8c319d84e8e4..6bac6709de7f 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cups-2.4.2-r1 b/metadata/md5-cache/net-print/cups-2.4.2-r1
new file mode 100644
index 000000000000..666ca00b111b
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-2.4.2-r1
@@ -0,0 +1,17 @@
+BDEPEND=acct-group/lp acct-group/lpadmin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,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=The Common Unix Printing System
+EAPI=8
+HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
+INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
+IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+PDEPEND=>=net-print/cups-filters-1.0.43
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.4.2/cups-2.4.2-source.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	d524f291c80f9d21ad80fe978e3ca760	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5484409533b87a5d4b26758bda9e71fa
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index f3d03cd9c33c..11480e9f5809 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -1,16 +1,16 @@
 BDEPEND=acct-group/lp acct-group/lpadmin virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,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=The Common Unix Printing System
 EAPI=8
 HOMEPAGE=https://www.cups.org/ https://github.com/OpenPrinting/cups
 INHERIT=autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs git-r3
-IUSE=acl dbus debug kerberos pam selinux +ssl static-libs systemd usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+IUSE=acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0
 PDEPEND=>=net-print/cups-filters-1.0.43
 PROPERTIES=live
-RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
-RESTRICT=test
+RDEPEND=app-text/libpaper sys-libs/zlib acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pam? ( sys-libs/pam ) !pam? ( virtual/libcrypt:= ) ssl? ( !openssl? ( >=net-libs/gnutls-2.12.23-r6: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(-)?] ) openssl? ( dev-libs/openssl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:1 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-group/lp acct-group/lpadmin selinux? ( sec-policy/selinux-cups )
+RESTRICT=!test? ( test ) test
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	d524f291c80f9d21ad80fe978e3ca760	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0c10224f9a33fa7bea4cc85674c3da77
+_md5_=5484409533b87a5d4b26758bda9e71fa
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.22.4 b/metadata/md5-cache/net-print/hplip-plugin-3.22.4
new file mode 100644
index 000000000000..c536cd24bf5e
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.22.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Proprietary plugins and firmware for HPLIP
+EAPI=8
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
+INHERIT=unpacker
+IUSE=orblite
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=hplip-plugin
+RDEPEND=~net-print/hplip-3.22.4 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.22.4-plugin.run
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
+_md5_=13a5b3897d655663670362eec4843e4e
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 6cd00d4f101e..7c179f2b5789 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/tinyproxy-1.11.1 b/metadata/md5-cache/net-proxy/tinyproxy-1.11.1
new file mode 100644
index 000000000000..5ec10d02ca3b
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/tinyproxy-1.11.1
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare test
+DEPEND=acct-group/tinyproxy acct-user/tinyproxy
+DESCRIPTION=A lightweight HTTP/SSL proxy
+EAPI=7
+HOMEPAGE=https://github.com/tinyproxy/tinyproxy/
+INHERIT=autotools systemd tmpfiles
+IUSE=test debug +filter-proxy reverse-proxy transparent-proxy +upstream-proxy +xtinyproxy-header
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=acct-group/tinyproxy acct-user/tinyproxy virtual/tmpfiles
+REQUIRED_USE=test? ( xtinyproxy-header )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tinyproxy/tinyproxy/releases/download/1.11.1/tinyproxy-1.11.1.tar.xz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e16fed2e210672bb6c26a8b978457396
diff --git a/metadata/md5-cache/net-proxy/torsocks-2.2.0 b/metadata/md5-cache/net-proxy/torsocks-2.2.0
deleted file mode 100644
index 3ced99d09ec6..000000000000
--- a/metadata/md5-cache/net-proxy/torsocks-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Use most socks-friendly applications with Tor
-EAPI=6
-HOMEPAGE=https://github.com/dgoulet/torsocks
-INHERIT=autotools versionator
-IUSE=static-libs
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/dgoulet/torsocks/archive/v2.2.0.tar.gz -> torsocks-2.2.0.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	28f0f3c0226306ec5f49e13bf851f171	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	dab5d8ec471d025b79c9e6906bcf3bff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	4fbbbc98f236f1b43acd99476bc3cd85	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cd16f652c9427ae33a0a5847ba4f9ffa
diff --git a/metadata/md5-cache/net-proxy/torsocks-2.4.0 b/metadata/md5-cache/net-proxy/torsocks-2.4.0
new file mode 100644
index 000000000000..18478568ac81
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/torsocks-2.4.0
@@ -0,0 +1,13 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Use most socks-friendly applications with Tor
+EAPI=8
+HOMEPAGE=https://gitlab.torproject.org/tpo/core/torsocks
+INHERIT=autotools
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v2.4.0/torsocks-v2.4.0.tar.gz -> torsocks-2.4.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=e822f10804d9b0dfbb45e9eec7c39d4f
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 0feac085eedc..3ca413e70bd0 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/frp-0.43.0 b/metadata/md5-cache/net-vpn/frp-0.43.0
new file mode 100644
index 000000000000..3972f467d233
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/frp-0.43.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
+EAPI=7
+HOMEPAGE=https://github.com/fatedier/frp
+INHERIT=go-module systemd
+KEYWORDS=~amd64 ~riscv
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fatedier/frp/archive/v0.43.0.tar.gz -> frp-0.43.0.tar.gz https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ae748b2d608e9a5d79e02e52f13c2eae
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8 b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8
index d68a2a128620..47d6589fe433 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8
+++ b/metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.org/GNOME/NetworkManager-openconnect
 INHERIT=gnome2
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2:= >=dev-libs/glib-2.34:2 >=dev-libs/dbus-glib-0.74 dev-libs/libxml2:2 >=net-vpn/openconnect-3.02:= gtk? ( >=app-crypt/libsecret-0.18 >=app-crypt/gcr-3.4:= >=x11-libs/gtk+-3.12:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 ) acct-group/nm-openconnect acct-user/nm-openconnect
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openconnect/1.2/NetworkManager-openconnect-1.2.8.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9471eeb2d50db71afe43cb68abb4552a
+_md5_=8cd443fe170d5de1393d959bc2029fdc
diff --git a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18 b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
index 6afb9e194659..fd08cf94a02c 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
+++ b/metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.gnome.org/GNOME/NetworkManager-openvpn
 INHERIT=gnome2
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.34:2 dev-libs/libxml2:2 >=net-misc/networkmanager-1.7.0:= >=net-vpn/openvpn-2.1 gtk? ( >=app-crypt/libsecret-0.18 >=net-libs/libnma-1.7.0 >=x11-libs/gtk+-3.4:3 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 ) acct-group/nm-openvpn acct-user/nm-openvpn
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-openvpn/1.8/NetworkManager-openvpn-1.8.18.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1bc3381ea4d95d29d3b7d387fc82832b
+_md5_=281574739bfd5c2c2218d7585ed77618
diff --git a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10 b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10
index cf4217a531d4..7254e19ab403 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10
+++ b/metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/VPN
 INHERIT=gnome2
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.34:2 net-dialup/ppp:= net-dialup/pptpclient gtk? ( >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.18 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-pptp/1.2/NetworkManager-pptp-1.2.10.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cc75588e6b53692fdd9e68b3e4f5384d
+_md5_=3c411a60734d7d942a690483244ea7c9
diff --git a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8 b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8
index 24ae2023af69..50656ccb5aff 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8
+++ b/metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
 INHERIT=gnome2
 IUSE=gtk test
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
 RDEPEND=>=net-misc/networkmanager-1.2.0:= >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.32:2 >=net-vpn/vpnc-0.5.3_p550 gtk? ( >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.18 >=gui-libs/gtk-4.0:4 >=net-libs/libnma-1.8.36 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/NetworkManager-vpnc/1.2/NetworkManager-vpnc-1.2.8.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1f0aec949d6d2138ea0c8359979935e8
+_md5_=404af0e422765adfdf17f8d1484854b7
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 1bbd879a1882..305dda130464 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
index 98ded86033de..ac6c8ac55496 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
 INHERIT=gnome.org meson python-any-r1 xdg
 IUSE=gtk-doc +introspection sendto test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4:4[introspection?] media-libs/gsound >=gui-libs/libadwaita-1.1:1 >=x11-libs/libnotify-0.7.0 virtual/libudev >=sys-power/upower-0.99.14 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) acct-group/plugdev virtual/udev >=net-wireless/bluez-5 sendto? ( !net-wireless/gnome-bluetooth:2 )
 RESTRICT=!test? ( test )
 SLOT=3/13
 SRC_URI=mirror://gnome/sources/gnome-bluetooth/42/gnome-bluetooth-42.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ff46d723a32b03a8834aad4d9a1bf03b
+_md5_=4c384d1e2e47296089addb11c501f624
diff --git a/metadata/md5-cache/net-wireless/unifi-7.1.66 b/metadata/md5-cache/net-wireless/unifi-7.1.66
new file mode 100644
index 000000000000..e830f0c9548e
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-7.1.66
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=8
+HOMEPAGE=https://www.ubnt.com
+INHERIT=java-pkg-2 readme.gentoo-r1 systemd
+IUSE=systemd system-mongodb
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0/7.1
+SRC_URI=https://dl.ui.com/unifi/7.1.66-c70daa41cf/UniFi.unix.zip -> unifi-7.1.66.zip
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	e38ea02d8ed864a74078ecf46aa06f30	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1ef1ada3558370b0f10acbae42a81180
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 2e915ac8a7dd..1ef452ef2af3 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/qalculate-gtk-4.2.0 b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.2.0
new file mode 100644
index 000000000000..a2817bcc531f
--- /dev/null
+++ b/metadata/md5-cache/sci-calculators/qalculate-gtk-4.2.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-4.2.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
+DESCRIPTION=Modern multi-purpose calculator
+EAPI=8
+HOMEPAGE=https://qalculate.github.io/
+INHERIT=xdg
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 >=sci-libs/libqalculate-4.2.0:= x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
+SLOT=0
+SRC_URI=https://github.com/Qalculate/qalculate-gtk/releases/download/v4.2.0/qalculate-gtk-4.2.0.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6d943a68d3dbe95413bd6a8a982ba01a
diff --git a/metadata/md5-cache/sci-calculators/units-2.21 b/metadata/md5-cache/sci-calculators/units-2.21
index dbd92ecc1c41..21d9155f8184 100644
--- a/metadata/md5-cache/sci-calculators/units-2.21
+++ b/metadata/md5-cache/sci-calculators/units-2.21
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) )
+DEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
 DESCRIPTION=Unit conversion program
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.gnu.org/software/units/units.html
 INHERIT=python-r1
-IUSE=+units-cur python_targets_python3_8 python_targets_python3_9
+IUSE=+units-cur python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=FDL-1.3 GPL-3
-RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) )
-REQUIRED_USE=units-cur? ( || ( python_targets_python3_8 python_targets_python3_9 ) )
+RDEPEND=sys-libs/readline:= units-cur? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_8? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) )
+REQUIRED_USE=units-cur? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
 SLOT=0
 SRC_URI=mirror://gnu/units/units-2.21.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=93d07e27d35eb991687bce5a2d0e2902
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=0796eea06ac5abf0d65007e08c71b3ef
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index 9575b1ff8150..d4c89a2b5d22 100644
Binary files a/metadata/md5-cache/sci-electronics/Manifest.gz and b/metadata/md5-cache/sci-electronics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-electronics/NanoVNA-QT-20200507 b/metadata/md5-cache/sci-electronics/NanoVNA-QT-20200507
new file mode 100644
index 000000000000..2eb45f793105
--- /dev/null
+++ b/metadata/md5-cache/sci-electronics/NanoVNA-QT-20200507
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-cpp/eigen:3= dev-qt/qtcharts:5= dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= sci-libs/fftw:3.0=
+DESCRIPTION=Library and GUI software for NanoVNA V2
+EAPI=8
+HOMEPAGE=https://github.com/nanovna-v2/NanoVNA-QT
+INHERIT=autotools qmake-utils
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3= dev-qt/qtcharts:5= dev-qt/qtcore:5= dev-qt/qtgui:5= dev-qt/qtsvg:5= dev-qt/qtwidgets:5= sci-libs/fftw:3.0=
+SLOT=0
+SRC_URI=https://github.com/nanovna-v2/NanoVNA-QT/archive/refs/tags/20200507.tar.gz -> NanoVNA-QT-20200507.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=bfaa5704d316433cad19919c2281050e
diff --git a/metadata/md5-cache/sci-electronics/xnec2c-4.4.11 b/metadata/md5-cache/sci-electronics/xnec2c-4.4.11
index ad6b65018bd4..e0857e8f52ae 100644
--- a/metadata/md5-cache/sci-electronics/xnec2c-4.4.11
+++ b/metadata/md5-cache/sci-electronics/xnec2c-4.4.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.xnec2c.org
 INHERIT=autotools xdg-utils
 IUSE=doc examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
 SLOT=0
 SRC_URI=https://www.xnec2c.org/releases/xnec2c-v4.4.11.tar.gz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ab2e6f79b828f429b7df8376db139624
+_md5_=ad5698c281e6ee25e8b48e7700befaeb
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 4ab091ea0cb8..ec046b59fb0b 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-42.1 b/metadata/md5-cache/sci-geosciences/gnome-maps-42.1
index 3c35b6914988..b3ccf26ebf98 100644
--- a/metadata/md5-cache/sci-geosciences/gnome-maps-42.1
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-42.1
@@ -5,10 +5,10 @@ DESCRIPTION=A map application for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Maps
 INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
 RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-maps/42/gnome-maps-42.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=e0878a85100887dfd60054bd85ea2738
+_md5_=4bd05305056f0daf41254f1eb774dcde
diff --git a/metadata/md5-cache/sci-geosciences/gnome-maps-42.2 b/metadata/md5-cache/sci-geosciences/gnome-maps-42.2
new file mode 100644
index 000000000000..002f618643d6
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gnome-maps-42.2
@@ -0,0 +1,14 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
+DESCRIPTION=A map application for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Maps
+INHERIT=gnome.org gnome2-utils meson python-any-r1 xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.66.0:2 x11-libs/pango[introspection] >=dev-libs/gjs-1.66.0 >=dev-libs/gobject-introspection-0.10.1:= >=x11-libs/gtk+-3.22:3[introspection] >=app-misc/geoclue-0.12.99:2.0[introspection] >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libgee-0.16:0.8[introspection] >=dev-libs/folks-0.10:= >=sci-geosciences/geocode-glib-3.15.2[introspection] >=media-libs/libchamplain-0.12.14:0.12[gtk,introspection] dev-libs/libxml2:2 >=net-libs/rest-0.7.90:0.7[introspection] app-crypt/libsecret[introspection] dev-libs/libgweather:4=[introspection] media-libs/clutter-gtk:1.0[introspection] media-libs/clutter:1.0[introspection] net-libs/gnome-online-accounts[introspection] net-libs/libgfbgraph[introspection] net-libs/libsoup:2.4[introspection] net-libs/webkit-gtk:4[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-maps/42/gnome-maps-42.2.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d783209e87dd57c29adde3a10890a305
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-10.5 b/metadata/md5-cache/sci-geosciences/gpxsee-10.5
deleted file mode 100644
index ab919d63250c..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-10.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
-EAPI=7
-HOMEPAGE=https://www.gpxsee.org/
-INHERIT=desktop plocale qmake-utils xdg
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5
-SLOT=0
-SRC_URI=https://github.com/tumic0/GPXSee/archive/10.5.tar.gz -> gpxsee-10.5.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=13a7ba3f244a239f824f197a18fea75f
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-10.6 b/metadata/md5-cache/sci-geosciences/gpxsee-10.6
deleted file mode 100644
index 4b8afc1b9d4e..000000000000
--- a/metadata/md5-cache/sci-geosciences/gpxsee-10.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files
-EAPI=7
-HOMEPAGE=https://www.gpxsee.org/
-INHERIT=desktop plocale qmake-utils xdg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5
-SLOT=0
-SRC_URI=https://github.com/tumic0/GPXSee/archive/10.6.tar.gz -> gpxsee-10.6.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=d0af26b65d873492fffe03bc504ff266
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-10.7 b/metadata/md5-cache/sci-geosciences/gpxsee-10.7
index e5f8584d25b1..57a710464003 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-10.7
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-10.7
@@ -5,10 +5,10 @@ DESCRIPTION=A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea
 EAPI=7
 HOMEPAGE=https://www.gpxsee.org/
 INHERIT=plocale qmake-utils xdg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtpositioning:5
 SLOT=0
 SRC_URI=https://github.com/tumic0/GPXSee/archive/10.7.tar.gz -> gpxsee-10.7.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=328976bf138f021363d9f7e0047cd6c7
+_md5_=8fc36cf9bd29efb873227d74fb097d35
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 1c51ae3d5fd4..d568f153dbb4 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/cgnslib-4.3.0 b/metadata/md5-cache/sci-libs/cgnslib-4.3.0
new file mode 100644
index 000000000000..4ae80de11a9d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/cgnslib-4.3.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5 fortran? ( virtual/fortran )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+DESCRIPTION=CFD General Notation System standard library
+EAPI=8
+HOMEPAGE=https://cgns.github.io/ https://github.com/CGNS/CGNS
+INHERIT=cmake fortran-2
+IUSE=base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=ZLIB
+RDEPEND=hdf5? ( sci-libs/hdf5:=[mpi=,szip=] ) tools? ( dev-lang/tcl:= dev-lang/tk:= x11-libs/libXmu:= virtual/glu virtual/opengl ) fortran? ( virtual/fortran )
+REQUIRED_USE=mpi? ( hdf5 ) szip? ( hdf5 )
+RESTRICT=fortran? ( test ) !test? ( test )
+SLOT=0/4
+SRC_URI=https://github.com/CGNS/CGNS/archive/v4.3.0.tar.gz -> cgnslib-4.3.0.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=ffa037941558d1689d8b0378ba860990
diff --git a/metadata/md5-cache/sci-libs/libqalculate-4.2.0 b/metadata/md5-cache/sci-libs/libqalculate-4.2.0
new file mode 100644
index 000000000000..b0e6308af147
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libqalculate-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/gmp:= dev-libs/libxml2:2 dev-libs/mpfr:= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:= )
+DESCRIPTION=A modern multi-purpose calculator library
+EAPI=8
+HOMEPAGE=https://qalculate.github.io/
+INHERIT=toolchain-funcs
+IUSE=curl icu gnuplot readline test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/libxml2:2 dev-libs/mpfr:= virtual/libiconv curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) readline? ( sys-libs/readline:= ) gnuplot? ( >=sci-visualization/gnuplot-3.7 )
+RESTRICT=!test? ( test )
+SLOT=0/22
+SRC_URI=https://github.com/Qalculate/libqalculate/releases/download/v4.2.0/libqalculate-4.2.0.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=ee34b341bb8de90da114cf4f638d00f6
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 9ef821132ad7..c7eda7d25675 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/singular-4.3.0 b/metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
similarity index 73%
rename from metadata/md5-cache/sci-mathematics/singular-4.3.0
rename to metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
index 2baf58b19e34..6fc726df25c4 100644
--- a/metadata/md5-cache/sci-mathematics/singular-4.3.0
+++ b/metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
@@ -4,12 +4,12 @@ DEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathemati
 DESCRIPTION=Computer algebra system for polynomial computations
 EAPI=8
 HOMEPAGE=https://www.singular.uni-kl.de/ https://github.com/Singular/Singular
-INHERIT=autotools elisp-common flag-o-matic
+INHERIT=autotools elisp-common
 IUSE=emacs examples polymake +readline static-libs
 KEYWORDS=~amd64 ~ppc ~riscv ~x86 ~x86-linux
 LICENSE=BSD GPL-2 GPL-3
 RDEPEND=dev-lang/perl dev-libs/gmp:0 dev-libs/ntl:= sci-libs/cddlib sci-mathematics/flint emacs? ( >=app-editors/emacs-23.1:* ) polymake? ( sci-mathematics/polymake ) readline? ( sys-libs/readline )
 SLOT=0
-SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-0/singular-4.3.0.tar.gz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=02a8ccdb7e2428e5f8d219c8a4221408
+SRC_URI=ftp://jim.mathematik.uni-kl.de/pub/Math/Singular/SOURCES/4-3-0/singular-4.3.0p1.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	elisp-common	e7aaa047873789f549ea3df2f04b2145	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=05176a68fb782962f58992e9e3f13c8c
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b4af7ad22289..45272ac49f51 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/accountsservice-22.08.8 b/metadata/md5-cache/sys-apps/accountsservice-22.08.8
index cc8385084923..a1688f880b7a 100644
--- a/metadata/md5-cache/sys-apps/accountsservice-22.08.8
+++ b/metadata/md5-cache/sys-apps/accountsservice-22.08.8
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/AccountsService/
 INHERIT=meson python-any-r1 systemd
 IUSE=doc elogind gtk-doc +introspection selinux systemd test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.63.5:2 sys-auth/polkit virtual/libcrypt:= elogind? ( >=sys-auth/elogind-229.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) systemd? ( >=sys-apps/systemd-186:0= ) selinux? ( sec-policy/selinux-accountsd )
 REQUIRED_USE=^^ ( elogind systemd )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.freedesktop.org/software/accountsservice/accountsservice-22.08.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5c4e861f0f76b8cf6f731db72b2b32b8
+_md5_=501b61b44fe376ef55b02acac2598445
diff --git a/metadata/md5-cache/sys-apps/baobab-42.0 b/metadata/md5-cache/sys-apps/baobab-42.0
index af0014fdd3bb..e4fd0da6c515 100644
--- a/metadata/md5-cache/sys-apps/baobab-42.0
+++ b/metadata/md5-cache/sys-apps/baobab-42.0
@@ -5,10 +5,10 @@ DESCRIPTION=Disk usage browser for GNOME
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
 INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2+ FDL-1.1+
 RDEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4.0:4 >=gui-libs/libadwaita-1.0.0:1=
 SLOT=0
 SRC_URI=mirror://gnome/sources/baobab/42/baobab-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a295bd8ca5ca9ed22fb8912ce2bd2978
+_md5_=a57e75f09e564763a9ecdd80a0e9bcf5
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7 b/metadata/md5-cache/sys-apps/baselayout-2.7
deleted file mode 100644
index e7a92995c011..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib versionator prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=bf78df54a5d1169022938116d030add8
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7-r1 b/metadata/md5-cache/sys-apps/baselayout-2.7-r1
deleted file mode 100644
index 4035e009c806..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib versionator prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=197566a3ed24fc18dd7d575fcf5ae8d9
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.7-r2 b/metadata/md5-cache/sys-apps/baselayout-2.7-r2
deleted file mode 100644
index c880e348617d..000000000000
--- a/metadata/md5-cache/sys-apps/baselayout-2.7-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst preinst prepare setup
-DESCRIPTION=Filesystem baselayout and init scripts
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-INHERIT=multilib prefix
-IUSE=build +split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.7.tar.bz2
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ffbc641eae39573407ff9e0ad1d62922
diff --git a/metadata/md5-cache/sys-apps/baselayout-2.8 b/metadata/md5-cache/sys-apps/baselayout-2.8
index 70de95bcfb9d..e76415f20a1f 100644
--- a/metadata/md5-cache/sys-apps/baselayout-2.8
+++ b/metadata/md5-cache/sys-apps/baselayout-2.8
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=multilib prefix
 IUSE=build +split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/baselayout.git/snapshot/baselayout-2.8.tar.bz2
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=25fedfe56d8c0a25e36c0a42a3c6cb5f
+_md5_=40c7fbc5bcf08bafb5f9e96a2e8234a6
diff --git a/metadata/md5-cache/sys-apps/bubblewrap-0.6.1 b/metadata/md5-cache/sys-apps/bubblewrap-0.6.1
index 93f06d042d36..ce578647dd6a 100644
--- a/metadata/md5-cache/sys-apps/bubblewrap-0.6.1
+++ b/metadata/md5-cache/sys-apps/bubblewrap-0.6.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/containers/bubblewrap/
 INHERIT=bash-completion-r1 linux-info meson
 IUSE=selinux +suid
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=LGPL-2+
 RDEPEND=sys-libs/libseccomp sys-libs/libcap selinux? ( >=sys-libs/libselinux-2.1.9 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containers/bubblewrap/releases/download/v0.6.1/bubblewrap-0.6.1.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=1854023811a73b7d780ccda8c928909a
+_md5_=6795912e429c518872d25c1c5e97117d
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.4-r2 b/metadata/md5-cache/sys-apps/dstat-0.7.4-r2
index f7cb461c397d..01a44c6eb7bd 100644
--- a/metadata/md5-cache/sys-apps/dstat-0.7.4-r2
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.4-r2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat
 EAPI=7
 HOMEPAGE=http://dag.wieers.com/home-made/dstat/
 INHERIT=python-r1
-IUSE=doc examples python_targets_python3_8 python_targets_python3_9
+IUSE=doc examples python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~alpha amd64 ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-linux
 LICENSE=GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) dev-python/six[python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=https://github.com/dagwieers/dstat/archive/v0.7.4.tar.gz -> dstat-0.7.4.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7ccf1edc20b360d017cb1329c49d4749
+_md5_=1e090e915ca5cc7d17014fa5f3972f6d
diff --git a/metadata/md5-cache/sys-apps/fakeroot-1.29 b/metadata/md5-cache/sys-apps/fakeroot-1.29
new file mode 100644
index 000000000000..726501ab98c3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fakeroot-1.29
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( app-text/po4a ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/libcap acl? ( sys-apps/acl ) test? ( app-arch/sharutils )
+DESCRIPTION=A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/f/fakeroot.html
+INHERIT=autotools flag-o-matic plocale
+IUSE=acl debug nls test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/f/fakeroot/fakeroot_1.29.orig.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=7cecd34da4af298f2e0d420f51be147d
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.7.7-r2 b/metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
index 63cbb7bf9369..5d93f7746269 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
+++ b/metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://fwupd.org
 INHERIT=bash-completion-r1 linux-info meson python-single-r1 vala xdg
 IUSE=amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1+
 RDEPEND=!<sci-chemistry/chemical-mime-data-0.1.94-r4 python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) dell? ( >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.103 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fwupd/fwupd/archive/1.7.7.tar.gz -> fwupd-1.7.7.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b3b56ff5250d36c5d9ef3b5579ad84d4
+_md5_=8326bfb013feeec6e2ccd85a817bccfc
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.8.1 b/metadata/md5-cache/sys-apps/fwupd-1.8.1
new file mode 100644
index 000000000000..b4de90f71625
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/fwupd-1.8.1
@@ -0,0 +1,17 @@
+BDEPEND=|| ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) >=dev-util/meson-0.60.0 virtual/pkgconfig gtk-doc? ( dev-util/gtk-doc ) bash-completion? ( >=app-shells/bash-completion-2.0 ) introspection? ( dev-libs/gobject-introspection ) man? ( app-text/docbook-sgml-utils sys-apps/help2man ) test? ( thunderbolt? ( dev-util/umockdev ) net-libs/gnutls[tools] ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) x11-libs/pango[introspection]
+DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
+EAPI=8
+HOMEPAGE=https://fwupd.org
+INHERIT=bash-completion-r1 linux-info meson python-single-r1 vala xdg
+IUSE=amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=app-arch/gcab-1.0 app-arch/xz-utils >=dev-libs/glib-2.58:2 dev-libs/json-glib dev-libs/libgudev:= >=dev-libs/libjcat-0.1.4[gpg,pkcs7] >=dev-libs/libxmlb-0.1.13:=[introspection?] python_single_target_python3_8? ( dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[cairo,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[cairo,python_targets_python3_10(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] net-misc/curl archive? ( app-arch/libarchive:= ) cbor? ( dev-libs/libcbor ) dell? ( >=app-crypt/tpm2-tss-2.0 >=sys-libs/libsmbios-2.4.0 ) elogind? ( >=sys-auth/elogind-211 ) flashrom? ( >=sys-apps/flashrom-1.2-r3 ) gnutls? ( net-libs/gnutls ) gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] ) logitech? ( dev-libs/protobuf-c:= ) lzma? ( app-arch/xz-utils ) modemmanager? ( net-misc/modemmanager[qmi] ) policykit? ( >=sys-auth/polkit-0.114 ) sqlite? ( dev-db/sqlite ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss:= ) uefi? ( sys-apps/fwupd-efi sys-boot/efibootmgr sys-fs/udisks sys-libs/efivar ) sys-apps/dbus
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ^^ ( elogind minimal systemd ) dell? ( uefi ) fastboot? ( gusb ) logitech? ( gusb ) minimal? ( !introspection ) spi? ( lzma ) synaptics? ( gnutls ) uefi? ( gnutls )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/fwupd/fwupd/archive/1.8.1.tar.gz -> fwupd-1.8.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1ccd9d0eee5d1c9804b4f63bc35d3770
diff --git a/metadata/md5-cache/sys-apps/gawk-5.1.1-r2 b/metadata/md5-cache/sys-apps/gawk-5.1.1-r2
index 392f43f107a2..7a1cae42998f 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.1.1-r2
+++ b/metadata/md5-cache/sys-apps/gawk-5.1.1-r2
@@ -4,6 +4,7 @@ DEPEND=mpfr? ( dev-libs/gmp:= dev-libs/mpfr:= ) readline? ( sys-libs/readline:=
 DESCRIPTION=GNU awk pattern-matching language
 EAPI=7
 HOMEPAGE=https://www.gnu.org/software/gawk/gawk.html
+INHERIT=verify-sig
 IUSE=mpfr nls readline verify-sig
 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=GPL-2
@@ -11,4 +12,4 @@ RDEPEND=mpfr? ( dev-libs/gmp:= dev-libs/mpfr:= ) readline? ( sys-libs/readline:=
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.1.1.tar.xz verify-sig? ( mirror://gnu/gawk/gawk-5.1.1.tar.xz.sig )
 _eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=def12e9b3eaf4d2d5847ce4a41cc37d6
+_md5_=8d9c3f28fbe785b273a808e529c30ef2
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
index 293e33472051..b73e85d39103 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
@@ -5,10 +5,10 @@ DESCRIPTION=systemd integration files for Gentoo
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Systemd
 INHERIT=systemd udev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~floppym/dist/gentoo-systemd-integration-9.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=0a91f247c1bb91a118a2dc60ea23373f
+_md5_=e8a25eae687d12c89b3d806756e06547
diff --git a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999 b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
index 8a6d33d96e1f..5443d7ecc8d4 100644
--- a/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
+++ b/metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/systemd-207 !sys-fs/eudev !sys-fs/udev
 SLOT=0
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=7cee72a0d03d8b9d5adf61bf671365d1
+_md5_=99519722a7bba2e41f2b175e54de0aab
diff --git a/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0 b/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
index 6cc8fabaea4b..7710c1072162 100644
--- a/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
+++ b/metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Disks
 INHERIT=gnome.org gnome2-utils meson xdg
 IUSE=fat elogind gnome systemd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=>=media-libs/libdvdread-4.2.0:0= >=dev-libs/glib-2.31:2 >=x11-libs/gtk+-3.16.0:3 >=media-libs/libcanberra-0.1[gtk3] >=gui-libs/libhandy-1.5.0:1= >=app-arch/xz-utils-5.0.5 >=x11-libs/libnotify-0.7:= >=app-crypt/libsecret-0.7 >=dev-libs/libpwquality-1.0.0 >=sys-fs/udisks-2.7.6:2 elogind? ( >=sys-auth/elogind-209 ) systemd? ( >=sys-apps/systemd-209:0= ) x11-themes/adwaita-icon-theme fat? ( sys-fs/dosfstools ) gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-disk-utility/42/gnome-disk-utility-42.0.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=74a88a62bba23750e7bceb5deb4fc2a2
+_md5_=11446528cdd0f0bafe0bccf7a4c7145d
diff --git a/metadata/md5-cache/sys-apps/iproute2-5.18.0-r1 b/metadata/md5-cache/sys-apps/iproute2-5.18.0-r1
new file mode 100644
index 000000000000..e9e0cf067667
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iproute2-5.18.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/xz-utils >=sys-devel/bison-2.4 sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
+DESCRIPTION=kernel routing and traffic control utilities
+EAPI=7
+HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
+INHERIT=eapi8-dosym edo toolchain-funcs
+IUSE=atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-5.18.0.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a84571653bcdceba74d99cdf1d3d9ea9
diff --git a/metadata/md5-cache/sys-apps/iproute2-9999 b/metadata/md5-cache/sys-apps/iproute2-9999
index 5c0b608f3aef..b790302c2f0b 100644
--- a/metadata/md5-cache/sys-apps/iproute2-9999
+++ b/metadata/md5-cache/sys-apps/iproute2-9999
@@ -1,14 +1,14 @@
 BDEPEND=app-arch/xz-utils >=sys-devel/bison-2.4 sys-devel/flex virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
+DEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux ) >=sys-kernel/linux-headers-3.16
 DESCRIPTION=kernel routing and traffic control utilities
 EAPI=7
 HOMEPAGE=https://wiki.linuxfoundation.org/networking/iproute2
-INHERIT=toolchain-funcs git-r3
-IUSE=atm berkdb bpf caps elf +iptables libbsd minimal selinux
+INHERIT=eapi8-dosym edo toolchain-funcs git-r3
+IUSE=atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) selinux? ( sys-libs/libselinux )
+RDEPEND=!net-misc/arpd !minimal? ( net-libs/libmnl:= ) atm? ( net-dialup/linux-atm ) berkdb? ( sys-libs/db:= ) bpf? ( dev-libs/libbpf:= ) caps? ( sys-libs/libcap ) elf? ( virtual/libelf:= ) iptables? ( >=net-firewall/iptables-1.4.20:= ) libbsd? ( dev-libs/libbsd ) nfs? ( net-libs/libtirpc:= ) selinux? ( sys-libs/libselinux )
 SLOT=0
-_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=946923486038ae8afa71f4033fac93b9
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a84571653bcdceba74d99cdf1d3d9ea9
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.9.0 b/metadata/md5-cache/sys-apps/irqbalance-1.9.0
new file mode 100644
index 000000000000..857cca3c98a6
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/irqbalance-1.9.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] )
+DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
+EAPI=7
+HOMEPAGE=https://github.com/Irqbalance/irqbalance
+INHERIT=autotools systemd linux-info
+IUSE=caps +numa selinux tui
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
+SLOT=0
+SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.9.0.tar.gz -> irqbalance-1.9.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=289b7131503a28168b45c189e28c3c63
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.9.7 b/metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
index acc22d3ca2f4..50bd5d4a6ee8 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
 INHERIT=python-single-r1 systemd udev multilib-minimal
 IUSE=doc embedded libusb policykit selinux systemd +udev python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD ISC MIT GPL-3+ GPL-2
 RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) selinux? ( sec-policy/selinux-pcscd )
 REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.9.7.tar.bz2
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=0bf21dca3b93c8bb9688b96d4e889f69
+_md5_=8fc9866207c39bbf1f633293cf6298e1
diff --git a/metadata/md5-cache/sys-apps/systemd-250.6 b/metadata/md5-cache/sys-apps/systemd-250.6
new file mode 100644
index 000000000000..0fb5b1292d44
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-250.6
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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-kernel/linux-headers-3.11 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+DESCRIPTION=System and service manager for Linux
+EAPI=7
+HOMEPAGE=http://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 hostnamed-fallback? ( acct-group/systemd-hostname sys-apps/dbus-broker ) selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) policykit? ( !hostnamed-fallback ) pwquality? ( homed )
+RESTRICT=!test? ( test )
+SLOT=0/2
+SRC_URI=https://github.com/systemd/systemd-stable/archive/v250.6/systemd-stable-250.6.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=3467ce56bbc5884449e42c75d8eede9a
diff --git a/metadata/md5-cache/sys-apps/systemd-251 b/metadata/md5-cache/sys-apps/systemd-251
index e2091007e6b4..bf5c118ffa7d 100644
--- a/metadata/md5-cache/sys-apps/systemd-251
+++ b/metadata/md5-cache/sys-apps/systemd-251
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
 INHERIT=bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd/archive/v251/systemd-251.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=64097be6f812e8434f1569925ee8a7e1
+_md5_=1035d4fbfe0807e9413c761603970489
diff --git a/metadata/md5-cache/sys-apps/systemd-251.1 b/metadata/md5-cache/sys-apps/systemd-251.1
index 35ed09f24490..50166dec9ed9 100644
--- a/metadata/md5-cache/sys-apps/systemd-251.1
+++ b/metadata/md5-cache/sys-apps/systemd-251.1
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend
 DEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
 EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+HOMEPAGE=http://systemd.io/
 INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.1/systemd-stable-251.1.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cbed0ff42279207f713431c6e2cf845b
+_md5_=881b64de70d6e1bf56eb33b1c8f5120d
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index e9afdeb53320..578677c718f3 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend
 DEPEND=>=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) nat? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0: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-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
 DESCRIPTION=System and service manager for Linux
 EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+HOMEPAGE=http://systemd.io/
 INHERIT=git-r3 bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 IUSE=acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
@@ -14,4 +14,4 @@ REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam ope
 RESTRICT=!test? ( test )
 SLOT=0/2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2e6b2d87a739d0cf3c1a10cf8dcca0a6
+_md5_=a551ec400f42d3e1bd7dd9cc59e4b461
diff --git a/metadata/md5-cache/sys-apps/systemd-tmpfiles-250 b/metadata/md5-cache/sys-apps/systemd-tmpfiles-250
index 822b362919c8..13ba8da66510 100644
--- a/metadata/md5-cache/sys-apps/systemd-tmpfiles-250
+++ b/metadata/md5-cache/sys-apps/systemd-tmpfiles-250
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual package to depend on sys-apps/systemd-utils
 EAPI=7
 HOMEPAGE=https://systemd.io/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=metapackage
 RDEPEND=sys-apps/systemd-utils[tmpfiles]
 SLOT=0
-_md5_=703983e02658504785a1ab021a547edd
+_md5_=4ac2a7885bd9fddacd2bbbb73bf063f4
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-250.6 b/metadata/md5-cache/sys-apps/systemd-utils-250.6
new file mode 100644
index 000000000000..e9bc591f8fe7
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-utils-250.6
@@ -0,0 +1,18 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( >=sys-boot/gnu-efi-3.0.2 ) >=sys-kernel/linux-headers-3.11
+DESCRIPTION=Utilities split out from systemd for OpenRC users
+EAPI=8
+HOMEPAGE=https://systemd.io/
+INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+IUSE=+acl boot +kmod selinux sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
+RDEPEND=selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30: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-libs/libcap: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(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
+REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v250.6.tar.gz -> systemd-stable-250.6.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-250.4.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
+_md5_=919894c2a2b0109ee1abfc220f0daafc
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.8 b/metadata/md5-cache/sys-apps/texinfo-6.8
index c2637fb8ae65..aa7205f7e51f 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.8
+++ b/metadata/md5-cache/sys-apps/texinfo-6.8
@@ -12,4 +12,4 @@ RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= standalone? ( dev-lang/
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.8.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6417cb21845f91e96006d14b4f8cfe3f
+_md5_=8e5f3686576469011b299ec2c05617f9
diff --git a/metadata/md5-cache/sys-apps/usbutils-014-r1 b/metadata/md5-cache/sys-apps/usbutils-014-r1
index 662d5a8dd600..2b1f4d88217c 100644
--- a/metadata/md5-cache/sys-apps/usbutils-014-r1
+++ b/metadata/md5-cache/sys-apps/usbutils-014-r1
@@ -1,10 +1,10 @@
-BDEPEND=app-arch/xz-utils virtual/pkgconfig python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+BDEPEND=app-arch/xz-utils virtual/pkgconfig python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
 DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/libusb:1= virtual/libudev:=
 DESCRIPTION=USB enumeration utilities
 EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/linux/utils/usb/usbutils/ https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/
-INHERIT=autotools python-single-r1
+INHERIT=python-single-r1
 IUSE=python python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
@@ -12,5 +12,5 @@ RDEPEND=virtual/libusb:1= virtual/libudev:= python? ( python_single_target_pytho
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/usb/usbutils/usbutils-014.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9457c8a7c80d13e3556683527ef2f75f
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=99167b73cc7388fdcaad44ab14a366a0
diff --git a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4 b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
index ca401ee96fdb..055874d98e24 100644
--- a/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
+++ b/metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal
 INHERIT=systemd
 IUSE=geolocation screencast systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.66:2 dev-libs/json-glib >=sys-fs/fuse-3.10.0:3 x11-libs/gdk-pixbuf geolocation? ( >=app-misc/geoclue-2.5.3:2.0 ) screencast? ( >=media-video/pipewire-0.3:= ) systemd? ( sys-apps/systemd ) sys-apps/dbus
 SLOT=0
 SRC_URI=https://github.com/flatpak/xdg-desktop-portal/releases/download/1.14.4/xdg-desktop-portal-1.14.4.tar.xz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6bdade593c55eb7d8ef4e626f3972b5e
+_md5_=984df5864d9928181779b879d0ac4914
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 90030008cb0a..e36beff4a611 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/gparted-1.4.0 b/metadata/md5-cache/sys-block/gparted-1.4.0
index 0fc584437a76..d1b35318e2eb 100644
--- a/metadata/md5-cache/sys-block/gparted-1.4.0
+++ b/metadata/md5-cache/sys-block/gparted-1.4.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gparted.org/ https://gitlab.gnome.org/GNOME/gparted/
 INHERIT=gnome2 optfeature virtualx
 IUSE=kde policykit wayland test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2+ FDL-1.2+
 RDEPEND=!policykit? ( kde? ( >=kde-plasma/kde-cli-tools-5.8.6-r1[kdesu] ) ) policykit? ( >=sys-auth/polkit-0.102 ) >=dev-cpp/glibmm-2.56.1:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.58.3-r1:2 >=sys-block/parted-3.2:= >=dev-libs/libsigc++-2.10.1:2 >=sys-apps/util-linux-2.33.2 wayland? ( x11-apps/xhost )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/gparted/gparted-1.4.0.tar.gz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6592574e5dfe6be46ef36eb8138726ce
+_md5_=cd1b4fc7db05c6b676e6a599293279bd
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 4cf7d62bc983..3375267f90e2 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/gnu-efi-3.0.14 b/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
index e519bd80b718..12fe53716879 100644
--- a/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
+++ b/metadata/md5-cache/sys-boot/gnu-efi-3.0.14
@@ -2,12 +2,13 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Library for build EFI Applications
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/gnu-efi/
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 IUSE=abi_x86_32 abi_x86_64 custom-cflags
 KEYWORDS=-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86
 LICENSE=GPL-2+ BSD BSD-2
+REQUIRED_USE=amd64? ( || ( abi_x86_32 abi_x86_64 ) ) x86? ( || ( abi_x86_32 abi_x86_64 ) )
 RESTRICT=strip
 SLOT=0
 SRC_URI=mirror://sourceforge/gnu-efi/gnu-efi-3.0.14.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=14b045e48f9c3b029d5d180b3678c7ab
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3329ddf719d553ac3ec9dd63905a994a
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.80 b/metadata/md5-cache/sys-boot/os-prober-1.80
new file mode 100644
index 000000000000..e91903a55e80
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/os-prober-1.80
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Utility to detect other OSs on a set of drives
+EAPI=8
+HOMEPAGE=https://salsa.debian.org/installer-team/os-prober
+INHERIT=readme.gentoo-r1 toolchain-funcs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-boot/grub:2[mount]
+SLOT=0
+SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.80.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=c03e9a4add17ba800bcd1d2fbcf11f8a
diff --git a/metadata/md5-cache/sys-boot/os-prober-9999 b/metadata/md5-cache/sys-boot/os-prober-9999
index 5ecd13ce6139..9c7f60577dbb 100644
--- a/metadata/md5-cache/sys-boot/os-prober-9999
+++ b/metadata/md5-cache/sys-boot/os-prober-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
 RDEPEND=sys-boot/grub:2[mount]
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=663dfdbc57e14a308dc7f5e393897b27
+_md5_=c03e9a4add17ba800bcd1d2fbcf11f8a
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3
new file mode 100644
index 000000000000..16813f605e47
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl bios? ( app-arch/upx app-text/asciidoc dev-lang/nasm )
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 virtual/os-headers
+DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
+EAPI=8
+HOMEPAGE=https://www.syslinux.org/
+INHERIT=toolchain-funcs
+IUSE=abi_x86_32 abi_x86_64 +bios +efi
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
+REQUIRED_USE=|| ( bios efi ) efi? ( || ( abi_x86_32 abi_x86_64 ) )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/syslinux-6.04-pre1.tar.xz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4685813e7a8d3cc86ae2fa4fb2100904
diff --git a/metadata/md5-cache/sys-boot/syslinux-6.04_pre3 b/metadata/md5-cache/sys-boot/syslinux-6.04_pre3
new file mode 100644
index 000000000000..aba63d3793ce
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/syslinux-6.04_pre3
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl bios? ( app-arch/upx app-text/asciidoc dev-lang/nasm )
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1 efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] ) virtual/os-headers
+DESCRIPTION=SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders
+EAPI=8
+HOMEPAGE=https://www.syslinux.org/
+INHERIT=toolchain-funcs
+IUSE=abi_x86_32 abi_x86_64 +bios +efi
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux sys-fs/mtools dev-perl/Crypt-PasswdMD5 dev-perl/Digest-SHA1
+REQUIRED_USE=|| ( bios efi ) efi? ( || ( abi_x86_32 abi_x86_64 ) )
+SLOT=0
+SRC_URI=https://git.zytor.com/syslinux/syslinux.git/snapshot/syslinux-6.04-pre3.tar.gz
+_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=26af8815ed3b16237c20c2de69e21373
diff --git a/metadata/md5-cache/sys-boot/systemd-boot-249.6 b/metadata/md5-cache/sys-boot/systemd-boot-249.6
deleted file mode 100644
index e94154d26729..000000000000
--- a/metadata/md5-cache/sys-boot/systemd-boot-249.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 sys-devel/gettext dev-util/gperf virtual/pkgconfig || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=>=sys-apps/util-linux-2.30 >=sys-boot/gnu-efi-3.0.2 sys-libs/libcap
-DESCRIPTION=UEFI boot manager from systemd (formerly gummiboot)
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/
-INHERIT=meson python-any-r1 toolchain-funcs
-KEYWORDS=~amd64 ~arm64
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-RDEPEND=>=sys-apps/util-linux-2.30 !sys-apps/systemd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v249.6.tar.gz -> systemd-stable-249.6.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ee8999f4ae1b39868b36ac017387c4c0
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 0ba2676c49b0..37ff41ae03dd 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.10 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.10
new file mode 100644
index 000000000000..ced0219cc100
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.22.10
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=89fa9836c3db65885a60d2efda5c3d67
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.7 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.7
new file mode 100644
index 000000000000..c6b985ce0fa4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.23.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=96f2f40b22c5538a7288b51733848246
diff --git a/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.1 b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.1
new file mode 100644
index 000000000000..1f6dd663df3d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-apiserver-1.24.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+DESCRIPTION=Kubernetes API server
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-apiserver acct-user/kube-apiserver
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=893bcdb912eb65b8fe820892509f6287
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.10 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.10
new file mode 100644
index 000000000000..dd9e582c70d5
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.10
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=b2de9b053f81cbd49c92269a10084a0e
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.7 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.7
new file mode 100644
index 000000000000..fa07f2f9ad8e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=7c5d50a549ed10a54110d5aae5a0f94b
diff --git a/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.1 b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.1
new file mode 100644
index 000000000000..5e59e85cb91a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+DESCRIPTION=Kubernetes Controller Manager
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-controller-manager acct-user/kube-controller-manager
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=d2956d962cf75e7f87969dacc801597f
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.22.10 b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.10
new file mode 100644
index 000000000000..24b829b34cae
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.22.10
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=e26b6327c24c068cc57a04cc4194325d
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.23.7 b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.7
new file mode 100644
index 000000000000..60c4e9d7e75e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.23.7
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=4ceab05f6dafa180eb2d3d9821f660e8
diff --git a/metadata/md5-cache/sys-cluster/kube-proxy-1.24.1 b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.1
new file mode 100644
index 000000000000..736e3dd8de95
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-proxy-1.24.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Proxy service
+EAPI=7
+HOMEPAGE=https://github.com/kubernetes/kubernetes https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=net-firewall/conntrack-tools
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=d6cc245cbbbaeefb53b1de213061689e
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.10 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.10
new file mode 100644
index 000000000000..e46a7d3f7913
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.22.10
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler !sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=1f4a53ca7f0fee1dda2eedadbb74eb9f
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.7 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.7
new file mode 100644
index 000000000000..4d55d73c2764
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.23.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=e8827078bfa0531fac0ba86c94a8fc02
diff --git a/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.1 b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.1
new file mode 100644
index 000000000000..bc96b143ddd6
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kube-scheduler-1.24.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+DESCRIPTION=Kubernetes Scheduler
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=acct-group/kube-scheduler acct-user/kube-scheduler
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a
+_md5_=82db5e596b7bc69f33565bf7aa29c22d
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.22.10 b/metadata/md5-cache/sys-cluster/kubeadm-1.22.10
new file mode 100644
index 000000000000..9008657c6ee4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.22.10
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=61607ca439c903a945818ba8317c2704
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.23.7 b/metadata/md5-cache/sys-cluster/kubeadm-1.23.7
new file mode 100644
index 000000000000..ff2eb10685e1
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.23.7
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=de36be3af9385a90061f2a1a8c15e201
diff --git a/metadata/md5-cache/sys-cluster/kubeadm-1.24.1 b/metadata/md5-cache/sys-cluster/kubeadm-1.24.1
new file mode 100644
index 000000000000..43a32baca50c
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubeadm-1.24.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to Easily bootstrap a secure Kubernetes cluster
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=7818fe291a2a9583eba583dd06c81d4a
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.22.10 b/metadata/md5-cache/sys-cluster/kubectl-1.22.10
new file mode 100644
index 000000000000..c79c4f07c5e2
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.22.10
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DEPEND=!sys-cluster/kubernetes
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=5f594a399c4ae6a9e86ab239101ab9c9
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.23.7 b/metadata/md5-cache/sys-cluster/kubectl-1.23.7
new file mode 100644
index 000000000000..de58fb950d49
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.23.7
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=88c58e69ec38a9111b1b4fbad171d56c
diff --git a/metadata/md5-cache/sys-cluster/kubectl-1.24.1 b/metadata/md5-cache/sys-cluster/kubectl-1.24.1
new file mode 100644
index 000000000000..f619a5b3fa76
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubectl-1.24.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=CLI to run commands against Kubernetes clusters
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=bash-completion-r1 go-module
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=93c8067665939eba64dcb34235370972
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.22.10 b/metadata/md5-cache/sys-cluster/kubelet-1.22.10
new file mode 100644
index 000000000000..9879fd0810d3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.22.10
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=!sys-cluster/kubernetes
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.22.10.tar.gz -> kubernetes-1.22.10.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3ff3b4106bb9c945d2764d28836e9599
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.23.7 b/metadata/md5-cache/sys-cluster/kubelet-1.23.7
new file mode 100644
index 000000000000..88b89b3b6480
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.23.7
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.17 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.23.7.tar.gz -> kubernetes-1.23.7.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3690c5e2bd5039cdc7ab2505e5cc3495
diff --git a/metadata/md5-cache/sys-cluster/kubelet-1.24.1 b/metadata/md5-cache/sys-cluster/kubelet-1.24.1
new file mode 100644
index 000000000000..776066722632
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/kubelet-1.24.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18.1 >=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Kubernetes Node Agent
+EAPI=7
+HOMEPAGE=https://kubernetes.io
+INHERIT=go-module systemd
+IUSE=hardened
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/kubernetes/kubernetes/archive/v1.24.1.tar.gz -> kubernetes-1.24.1.tar.gz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=aff9f5cfa6fc6bc66372379a4f5f8f66
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 106e75342007..d53abf609c51 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.38-r2 b/metadata/md5-cache/sys-devel/binutils-2.38-r2
index adc90ba6bda0..277de879a154 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.38-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.38-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.38
 SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=eab3540fed50e1ba4c939513f63c691f
+_md5_=f6c218ff6703bf1280b809881ebb5e82
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index e10d0d4cc67a..09bd4d53f290 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=default-gold? ( gold )
 RESTRICT=!test? ( test )
 SLOT=9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=822a5503120b3e872096ba9f20899b4e
+_md5_=d42009470b0c2e98816962eef83c6f0b
diff --git a/metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2 b/metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2
index 7709b985ad59..fde5ac76b09f 100644
--- a/metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2
+++ b/metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.38
 SRC_URI=mirror://gnu/binutils/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.38-patches-4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=81caf5dbd173e88d997f37860a4f8551
+_md5_=718361fdd1a1a13223cbd2f6239628b1
diff --git a/metadata/md5-cache/sys-devel/bmake-20220330 b/metadata/md5-cache/sys-devel/bmake-20220330
deleted file mode 100644
index 51b4964bdcab..000000000000
--- a/metadata/md5-cache/sys-devel/bmake-20220330
+++ /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-20220330.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=4bc21bf856675fd5fa51f2a613f1d733
diff --git a/metadata/md5-cache/sys-devel/bmake-20220418 b/metadata/md5-cache/sys-devel/bmake-20220418
index f8088e162e88..8372e0196650 100644
--- a/metadata/md5-cache/sys-devel/bmake-20220418
+++ b/metadata/md5-cache/sys-devel/bmake-20220418
@@ -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 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://void.crufty.net/ftp/pub/sjg/bmake-20220418.tar.gz http://void.crufty.net/ftp/pub/sjg/mk-20210330.tar.gz
-_md5_=0d951e60ed0101e1e5e69d89d00fc0af
+_md5_=99eb07fb2fd25cc17cdbe0675924da69
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.4 b/metadata/md5-cache/sys-devel/clang-14.0.4
new file mode 100644
index 000000000000..5e5cfcbc6142
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-14.0.4
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_8? ( dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ) xml? ( virtual/pkgconfig ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-14.0.4:14=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.4[llvm_targets_M68k] ) !!sys-devel/llvm:0
+DESCRIPTION=C language family frontend for LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
+IUSE=debug default-compiler-rt default-libcxx default-lld doc llvm-libunwind +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-14.0.4 default-compiler-rt? ( =sys-libs/compiler-rt-14.0.4* llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) default-libcxx? ( >=sys-libs/libcxx-14.0.4 ) default-lld? ( sys-devel/lld )
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ~sys-devel/llvm-14.0.4:14=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-14.0.4[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-14.0.4[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-14.0.4[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-14.0.4[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-14.0.4[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-14.0.4[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-14.0.4[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-14.0.4[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-14.0.4[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-14.0.4[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-14.0.4[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-14.0.4[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-14.0.4[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-14.0.4[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-14.0.4[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-14.0.4[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-14.0.4[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-14.0.4[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-14.0.4[llvm_targets_CSKY] ) llvm_targets_M68k? ( ~sys-devel/llvm-14.0.4[llvm_targets_M68k] )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=14
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.4-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.4.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7d158ccfd4fcd96e0be9eb5f29b0efec
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.4 b/metadata/md5-cache/sys-devel/clang-common-14.0.4
new file mode 100644
index 000000000000..5bfac0362dac
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of clang
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=bash-completion-r1 llvm.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+PDEPEND=sys-devel/clang:*
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=156cbfa79cb956aace89e7e0b27e9dc5
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-14.0.4 b/metadata/md5-cache/sys-devel/clang-runtime-14.0.4
new file mode 100644
index 000000000000..bf637762dbbe
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-14.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=8
+HOMEPAGE=https://clang.llvm.org/
+INHERIT=multilib-build
+IUSE=+compiler-rt libcxx openmp +sanitize 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-14.0.4:14.0.4[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-14.0.4:14.0.4[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-14.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-14.0.4[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=sanitize? ( compiler-rt )
+SLOT=14.0.4
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3353e9fe517fac80acb5afa4d991bc21
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2 b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
index 555c7fc87625..02c8b798a0a7 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.0-r2
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-10.3.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=66513cfcb98cc2b6a5a53f51d0d31637
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126 b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
index 256cfc513ada..b3a6b74d96aa 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20211126/gcc-10-20211126.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-patches-0.tar.bz2 mirror://gentoo/gcc-10.4.0-patches-0.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-10.3.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ff20a1cfea3d35ed5f1f3204f5ecfc98
diff --git a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220519 b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220526
similarity index 76%
rename from metadata/md5-cache/sys-devel/gcc-10.3.1_p20220519
rename to metadata/md5-cache/sys-devel/gcc-10.3.1_p20220526
index 3cd94295e39b..50254094010f 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220519
+++ b/metadata/md5-cache/sys-devel/gcc-10.3.1_p20220526
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220519/gcc-10-20220519.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-musl-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-musl-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c145966b31176fdb77d43a47d665a208
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220526/gcc-10-20220526.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-musl-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=24c57cc82ed9c8e31b6a787db2cd0c51
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.9999 b/metadata/md5-cache/sys-devel/gcc-10.4.9999
index eb038c50a413..b0c3c7e66da5 100644
--- a/metadata/md5-cache/sys-devel/gcc-10.4.9999
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.9999
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-patches-1.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-10.4.0-musl-patches-1.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-10.4.0-musl-patches-1.tar.xz mirror://gentoo/gcc-10.4.0-musl-patches-1.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=24c57cc82ed9c8e31b6a787db2cd0c51
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.0 b/metadata/md5-cache/sys-devel/gcc-11.2.0
index 56aebf43b60e..d04874e04efa 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.2.0/gcc-11.2.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-patches-1.tar.bz2 mirror://gentoo/gcc-11.2.0-patches-1.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.2.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.2.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-11.2.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7d712394b8c8fe4cd985af35d02c7512
diff --git a/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115 b/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
index 17960f18fddf..13a987aeb2ee 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
+++ b/metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220115/gcc-11-20220115.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-4.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-11.3.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4739db515bf96c5eb97e510418368923
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=242beb267ba12db2100c2f3c6b311a2b
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.0 b/metadata/md5-cache/sys-devel/gcc-11.3.0
index e7102512e94d..e054b7d8f759 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.0
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -6,12 +6,12 @@ EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 INHERIT=toolchain
 IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-4.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-11.3.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2b3a79dd3b86b4f495f49ff2ff17a2fe
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=a179e968b5b1cc924bfdd5ed98b3c00d
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220520 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220527
similarity index 69%
rename from metadata/md5-cache/sys-devel/gcc-11.3.1_p20220520
rename to metadata/md5-cache/sys-devel/gcc-11.3.1_p20220527
index 4747ba0ec83a..538b834c67c9 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220520
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220527
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -11,6 +11,6 @@ PDEPEND=>=sys-devel/gcc-config-2.3
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220520/gcc-11-20220520.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-musl-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=187ff6dbeb54ac1d00d4ecd9a2fc79bb
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220527/gcc-11-20220527.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-musl-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ed311ab2c48c519d3e6ad8b8a64c4b8b
diff --git a/metadata/md5-cache/sys-devel/gcc-11.4.9999 b/metadata/md5-cache/sys-devel/gcc-11.4.9999
index 797c5992a3ec..3c7bb312595d 100644
--- a/metadata/md5-cache/sys-devel/gcc-11.4.9999
+++ b/metadata/md5-cache/sys-devel/gcc-11.4.9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-patches-0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-11.4.0-musl-patches-0.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-11.4.0-musl-patches-0.tar.xz mirror://gentoo/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=187ff6dbeb54ac1d00d4ecd9a2fc79bb
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ed311ab2c48c519d3e6ad8b8a64c4b8b
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.0 b/metadata/md5-cache/sys-devel/gcc-12.1.0
index 4ca71d4bc1e4..9555d76adaf9 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.1.0
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.0
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=12
 SRC_URI=mirror://gnu/gcc/gcc-12.1.0/gcc-12.1.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-5.tar.xz mirror://gentoo/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e504c8963faad9ca685aa61f83586f34
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=70f17494069c4d7664694c655e505b76
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220514 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220514
deleted file mode 100644
index aa8f4f656694..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220514
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220514/gcc-12-20220514.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-5.tar.xz mirror://gentoo/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c13e07e7c34405b4957c0acbee98f835
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220521 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220521
deleted file mode 100644
index a509f501668c..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220521
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=8
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
-RESTRICT=!test? ( test )
-SLOT=12
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220521/gcc-12-20220521.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-5.tar.xz mirror://gentoo/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c13e07e7c34405b4957c0acbee98f835
diff --git a/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220528 b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220528
new file mode 100644
index 000000000000..e417595afc8c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-12.1.1_p20220528
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=12
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/12-20220528/gcc-12-20220528.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.1.0-patches-6.tar.xz mirror://gentoo/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.1.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.1.0-musl-patches-4.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=33d8aa01d291b9fa2b1f0011f45a651f
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.9999 b/metadata/md5-cache/sys-devel/gcc-12.2.9999
index 79945da6681e..e4a94cfc701d 100644
--- a/metadata/md5-cache/sys-devel/gcc-12.2.9999
+++ b/metadata/md5-cache/sys-devel/gcc-12.2.9999
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) valgrind? ( dev-util/valgrind )
 DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
 DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
 DESCRIPTION=The GNU Compiler Collection
@@ -12,6 +12,6 @@ PROPERTIES=live
 RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
 RESTRICT=!test? ( test )
 SLOT=12
-SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-5.tar.xz mirror://gentoo/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=29a89f59b60fd31d1adaa2c12af08d39
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.1.0-patches-6.tar.xz mirror://gentoo/gcc-12.1.0-patches-6.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.1.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.1.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.1.0-musl-patches-4.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a7d364098daae4de6576a632ccfe758d
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.9999 b/metadata/md5-cache/sys-devel/gcc-13.0.9999
index f825bf0c7417..3a8dbd16f7e8 100644
--- a/metadata/md5-cache/sys-devel/gcc-13.0.9999
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.9999
@@ -13,5 +13,5 @@ RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv
 RESTRICT=!test? ( test )
 SLOT=13
 SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-patches-5.tar.xz mirror://gentoo/gcc-12.0.0-patches-5.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~tamiko/distfiles/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~zorry/patches/gcc/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-12.0.0-musl-patches-4.tar.xz https://dev.gentoo.org/~blueness/dist/gcc-12.0.0-musl-patches-4.tar.xz mirror://gentoo/gcc-12.0.0-musl-patches-4.tar.xz
-_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=d970e772968b784d83b11b485fdd69ec
diff --git a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
index 453af01cea7e..d520ac95bc0f 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.5.0-r1
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=8.5.0
 SRC_URI=mirror://gnu/gcc/gcc-8.5.0/gcc-8.5.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.5.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.5.0-patches-2.tar.bz2 mirror://gentoo/gcc-8.5.0-patches-2.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5db021f282348ebe91be240970a0c178
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.0 b/metadata/md5-cache/sys-devel/gcc-9.4.0
index 69203d957bc6..30536f01066f 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.4.0
+++ b/metadata/md5-cache/sys-devel/gcc-9.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.4.0
 SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7dfff6db7e3e7f663af3584f0d8d0625
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220317 b/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220317
deleted file mode 100644
index 0203db86c685..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220317
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=9.4.1
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/9-20220317/gcc-9-20220317.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ea3d1195bb51a9202d5e5ebce98d14a4
diff --git a/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220520 b/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220520
deleted file mode 100644
index 156058273a17..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-9.4.1_p20220520
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/binutils-2.20 sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=9.4.1
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/9.5.0-RC-20220520/gcc-9.5.0-RC-20220520.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-musl-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-musl-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-musl-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d2b93e5574b93324bae1839e6b1b9c5e
diff --git a/metadata/md5-cache/sys-devel/gcc-9.5.0 b/metadata/md5-cache/sys-devel/gcc-9.5.0
new file mode 100644
index 000000000000..6df26f752ec4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-9.5.0
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=7
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
+RESTRICT=!test? ( test )
+SLOT=9.5.0
+SRC_URI=mirror://gnu/gcc/gcc-9.5.0/gcc-9.5.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6a616359d200d814f31ca3a820f342b1
diff --git a/metadata/md5-cache/sys-devel/gcc-9.5.9999 b/metadata/md5-cache/sys-devel/gcc-9.5.9999
deleted file mode 100644
index c30276e19e51..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-9.5.9999
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=dev-vcs/git-1.8.2.1[curl] >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap )
-DESCRIPTION=The GNU Compiler Collection
-EAPI=7
-HOMEPAGE=https://gcc.gnu.org/
-INHERIT=toolchain
-IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-PROPERTIES=live
-RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
-RESTRICT=!test? ( test )
-SLOT=9.4.1
-SRC_URI=https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=56ace4b88e474bf6be7371b0b47fa6b6
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
index 7a8022461c3f..c9609f1cf196 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
@@ -13,5 +13,5 @@ RDEPEND=>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext
 RESTRICT=!test? ( test )
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a985071b860d5fe91f55bc2183ff0c0e
diff --git a/metadata/md5-cache/sys-devel/kgcc64-10.3.0 b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
index fe7f6b1545cc..2d9e8cc7e2f8 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-10.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-10.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=mirror://gnu/gcc/gcc-10.3.0/gcc-10.3.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-10.3.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-10.3.0-patches-1.tar.bz2 mirror://gentoo/gcc-10.3.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=499c3e296cb44fae1926c95e7fac1e3b
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115 b/metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
index 531fdd99bc01..4521e30ab7c6 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220115/gcc-11-20220115.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-4.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2070bfd5e78c209cde4bda980bdadd8f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-11.3.0 b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
index b2eb68cc1dad..004a29cfabb0 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-11.3.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-11.3.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=11
 SRC_URI=mirror://gnu/gcc/gcc-11.3.0/gcc-11.3.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-11.3.0-patches-4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-11.3.0-patches-4.tar.bz2 mirror://gentoo/gcc-11.3.0-patches-4.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2070bfd5e78c209cde4bda980bdadd8f
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2 b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
index 73a9cca31833..186858fcdd93 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=3aeb65e537bc37427af84e711e14e1d8
diff --git a/metadata/md5-cache/sys-devel/kgcc64-9.4.0 b/metadata/md5-cache/sys-devel/kgcc64-9.4.0
index e8c41647945a..a4f26e0f8bcb 100644
--- a/metadata/md5-cache/sys-devel/kgcc64-9.4.0
+++ b/metadata/md5-cache/sys-devel/kgcc64-9.4.0
@@ -13,5 +13,5 @@ RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4
 RESTRICT=!test? ( test )
 SLOT=9.4.0
 SRC_URI=mirror://gnu/gcc/gcc-9.4.0/gcc-9.4.0.tar.xz https://dev.gentoo.org/~soap/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.4.0-patches-1.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.4.0-patches-1.tar.bz2 mirror://gentoo/gcc-9.4.0-patches-1.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	dc1c6323a26f97bc1f93c1eb28489c43	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain	0c263def9ec20c6745de27972d744808	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=112dc5113991786e5cf1cad912d95f0a
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.4 b/metadata/md5-cache/sys-devel/lld-14.0.4
new file mode 100644
index 000000000000..f3d034d311b7
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-14.0.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 ~dev-python/lit-14.0.4[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 ~dev-python/lit-14.0.4[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 ~dev-python/lit-14.0.4[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-14.0.4 !!sys-devel/llvm:0
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=debug test test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=~sys-devel/llvm-14.0.4
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5648920ee7a80bb97e22600a9fee308d
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.4 b/metadata/md5-cache/sys-devel/llvm-14.0.4
new file mode 100644
index 000000000000..48899249b54f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.4
@@ -0,0 +1,18 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.4.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup 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(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1: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(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DESCRIPTION=Low Level Virtual Machine
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
+IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
+PDEPEND=sys-devel/llvm-common binutils-plugin? ( >=sys-devel/llvmgold-14 )
+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(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3: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(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1: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/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k )
+RESTRICT=!test? ( test )
+SLOT=14
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.4-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.4.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d95db06bc93b16efe44089bdc93240c1
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.4 b/metadata/md5-cache/sys-devel/llvm-common-14.0.4
new file mode 100644
index 000000000000..1d581ca326a6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=llvm.org
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=ed021fba4e89582498067e8128d00dea
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 83b3fd5c5ccb..b47909ec6c7a 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/bees-0.7 b/metadata/md5-cache/sys-fs/bees-0.7
new file mode 100644
index 000000000000..b80b6076e7a5
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/bees-0.7
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure prepare pretend setup
+DEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+DESCRIPTION=Best-Effort Extent-Same, a btrfs dedup agent
+EAPI=7
+HOMEPAGE=https://github.com/Zygo/bees
+INHERIT=linux-info systemd toolchain-funcs
+IUSE=tools
+KEYWORDS=~amd64 ~arm64
+LICENSE=GPL-3
+RDEPEND=>=sys-apps/util-linux-2.30.2 >=sys-fs/btrfs-progs-4.20.2
+SLOT=0
+SRC_URI=https://github.com/Zygo/bees/archive/v0.7.tar.gz -> bees-0.7.tar.gz
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=4a4545abceff16def775e22f2b62623c
diff --git a/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0 b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0
new file mode 100644
index 000000000000..9eb0730e370c
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/f2fs-tools-1.15.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
+DESCRIPTION=Tools for Flash-Friendly File System (F2FS)
+EAPI=8
+HOMEPAGE=https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/
+INHERIT=autotools
+IUSE=selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=selinux? ( sys-libs/libselinux ) elibc_musl? ( sys-libs/queue-standalone )
+SLOT=0/9
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.15.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3be6b850fe3c4e0183f39da916a00c09
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22-r4 b/metadata/md5-cache/sys-fs/ntfs3g-2022.5.17
similarity index 87%
rename from metadata/md5-cache/sys-fs/ntfs3g-2021.8.22-r4
rename to metadata/md5-cache/sys-fs/ntfs3g-2022.5.17
index 3b0cd126be18..c2176d1c423a 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2021.8.22-r4
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2022.5.17
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=configure install
 DEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) sys-apps/attr
 DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
-EAPI=7
+EAPI=8
 HOMEPAGE=https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 INHERIT=toolchain-funcs
 IUSE=acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr
@@ -10,6 +10,6 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-l
 LICENSE=GPL-2
 RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
 SLOT=0/89
-SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2021.8.22.tgz
+SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2022.5.17.tgz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5d7c4d0924feddb0974ebc514752560a
+_md5_=7c1bc7978bbf603a0b2518a41782be20
diff --git a/metadata/md5-cache/sys-fs/udev-250 b/metadata/md5-cache/sys-fs/udev-250
index 9bf86d0af133..847c7fc4315d 100644
--- a/metadata/md5-cache/sys-fs/udev-250
+++ b/metadata/md5-cache/sys-fs/udev-250
@@ -4,9 +4,9 @@ EAPI=7
 HOMEPAGE=https://systemd.io/
 INHERIT=multilib-build
 IUSE=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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=metapackage
 RDEPEND=sys-apps/systemd-utils[udev,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ff765dc90eceac721652b29f1ab43ed8
+_md5_=18e0307f91a21f31957ec6041066fb93
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 35d9eeddd36f..eda97eba28fe 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/dracut-056 b/metadata/md5-cache/sys-kernel/dracut-056
new file mode 100644
index 000000000000..e80fade2bea5
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-056
@@ -0,0 +1,16 @@
+BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 >=dev-libs/libxslt-1.1.26 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure install postinst setup test
+DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
+DESCRIPTION=Generic initramfs generation tool
+EAPI=8
+HOMEPAGE=https://dracut.wiki.kernel.org
+INHERIT=bash-completion-r1 linux-info optfeature systemd toolchain-funcs
+IUSE=selinux test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys-apps/kmod-23[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/openrc[sysv-utils(-),selinux?] sys-apps/systemd[sysv-utils] ) >=sys-apps/util-linux-2.21 virtual/pkgconfig virtual/udev elibc_musl? ( sys-libs/fts-standalone ) selinux? ( sec-policy/selinux-dracut sys-libs/libselinux sys-libs/libsepol )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-056.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=1c02632dce38eb1753a451ac359855c6
diff --git a/metadata/md5-cache/sys-kernel/dracut-9999 b/metadata/md5-cache/sys-kernel/dracut-9999
index 05bb05ee6fef..b4f2cdbeed5a 100644
--- a/metadata/md5-cache/sys-kernel/dracut-9999
+++ b/metadata/md5-cache/sys-kernel/dracut-9999
@@ -2,7 +2,7 @@ BDEPEND=app-text/asciidoc app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-st
 DEFINED_PHASES=configure install postinst setup test unpack
 DEPEND=>=sys-apps/kmod-23 elibc_musl? ( sys-libs/fts-standalone )
 DESCRIPTION=Generic initramfs generation tool
-EAPI=7
+EAPI=8
 HOMEPAGE=https://dracut.wiki.kernel.org
 INHERIT=bash-completion-r1 linux-info optfeature systemd toolchain-funcs git-r3
 IUSE=selinux test
@@ -12,4 +12,4 @@ RDEPEND=app-arch/cpio >=app-shells/bash-4.0:0 sys-apps/coreutils[xattr(-)] >=sys
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=75d68e3b14f6a228ddd3d439f8861b3f
+_md5_=ac159e263a945745ab35f25e01039d69
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.119 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.119
new file mode 100644
index 000000000000..21f1ee80f6dc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.119
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.119
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.119 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.119
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=13b50ca26023fa518d62c7790f08a18c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.44 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.44
new file mode 100644
index 000000000000..1707deb7c275
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.44
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.44
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.44
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=a8db24d7d192cf605e1a351f56068d34
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.12
new file mode 100644
index 000000000000..3b68269af24a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.12
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.12
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.17.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.17.11-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.17.11-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.17.11-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.17.11-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8cd12080493e96cd551ec7a6f88bf3ab
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.119 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.119
new file mode 100644
index 000000000000..ce2773710f4e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.119
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.119
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.119 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.119
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119-1.xpak -> gentoo-kernel-5.10.119-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119-1.xpak -> gentoo-kernel-5.10.119-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119-1.xpak -> gentoo-kernel-5.10.119-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119-1.xpak -> gentoo-kernel-5.10.119-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=37cf5e192c772ae5a043406dd66c89e2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.44 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.44
new file mode 100644
index 000000000000..eed63cf587c9
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.44
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.44
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.44 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.44
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44-1.xpak -> gentoo-kernel-5.15.44-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44-1.xpak -> gentoo-kernel-5.15.44-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44-1.xpak -> gentoo-kernel-5.15.44-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44-1.xpak -> gentoo-kernel-5.15.44-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.12 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.12
new file mode 100644
index 000000000000..7d2057eefb0a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.12
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-install toolchain-funcs
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.12
+RDEPEND=!sys-kernel/gentoo-kernel:5.17.12 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12-1.xpak -> gentoo-kernel-5.17.12-1.amd64.xpak ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12-1.xpak -> gentoo-kernel-5.17.12-1.arm64.xpak ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12-1.xpak -> gentoo-kernel-5.17.12-1.ppc64le.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12-1.xpak -> gentoo-kernel-5.17.12-1.x86.xpak )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=727580f9402ad362cb324566395d639e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.279 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.279
deleted file mode 100644
index e9875170405d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.279
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.14.279
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-290.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-290.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-290.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-290.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-290.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-290.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-290.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-290.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-290.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=e3fd8b02424f765d742cfd0fcc74a482
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.314 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.314
deleted file mode 100644
index 29625b1f0cdc..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.314
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2 linux-firmware
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=4.9.314
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-317.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-317.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-317.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-317.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-317.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-317.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-317.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-317.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-317.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6d092f45ece5e1d413a939460d3814a0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.110 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.110
deleted file mode 100644
index 3499d626db3b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.110
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.10.110
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-118.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-118.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-118.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-118.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-118.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-118.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-118.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-118.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-118.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=515f232530bd0de45898559e330380db
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.116 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.119
similarity index 62%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.10.116
rename to metadata/md5-cache/sys-kernel/gentoo-sources-5.10.119
index 706ccfab8737..3209c20f1365 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.116
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.119
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.116
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-125.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-125.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-125.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-125.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-125.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-125.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-125.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-125.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-125.experimental.tar.xz )
+SLOT=5.10.119
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-128.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-128.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-128.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-128.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-128.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-128.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-128.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=be0fe568a218c1c042bcb4e1ea1c9961
+_md5_=07253f9da986b9c0de88f3ecb8b5f289
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.40 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.44
similarity index 62%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.15.40
rename to metadata/md5-cache/sys-kernel/gentoo-sources-5.15.44
index f5069b29e17e..2e9eb5c46e2e 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.40
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.44
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.40
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-44.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-44.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-44.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-44.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-44.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-44.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-44.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-44.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-44.experimental.tar.xz )
+SLOT=5.15.44
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-48.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-48.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-48.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-48.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-48.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-48.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-48.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=9c14a5d097336d4ab1eb82d5e3f77ab4
+_md5_=1c4df5d8603cb03b428c2f27a94068af
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.12
similarity index 62%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.17.6
rename to metadata/md5-cache/sys-kernel/gentoo-sources-5.17.12
index 51cec462b76c..e4640613d5c3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.12
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.17.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-10.experimental.tar.xz )
+SLOT=5.17.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-16.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-16.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-16.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-16.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-16.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-16.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=8dd5bcae356236cf3abbf68bcdad7612
+_md5_=392369807f15be0a7245f60ea8ab9575
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1
similarity index 53%
rename from metadata/md5-cache/sys-kernel/gentoo-sources-5.17.7
rename to metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1
index d4361c3cdbaa..17d9045e0f57 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.17.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1
@@ -1,6 +1,6 @@
 BDEPEND=!build? ( sys-apps/sed )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.17 kernel tree
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
 EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.17.7
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-11.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-11.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-11.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-11.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-11.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-11.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.17-11.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.17-11.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.17-11.experimental.tar.xz )
+SLOT=5.18.1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=5e912f55d1d3898cd36cfffd5941465e
+_md5_=8f9d0fbd63536560793d7fe2a830e5c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1-r1
new file mode 100644
index 000000000000..93fc818638ad
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=!build? ( sys-apps/sed )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.18 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.18.1-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.18-2.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.18-2.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.18-2.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=8f9d0fbd63536560793d7fe2a830e5c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.194 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.194
deleted file mode 100644
index a0934b8043ca..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.194
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
-EAPI=8
-HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
-INHERIT=kernel-2
-IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
-RESTRICT=binchecks strip
-SLOT=5.4.194
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-198.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-198.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-198.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-198.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-198.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-198.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-198.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-198.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-198.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3e1557deee78bb2e0c78e107969e408b
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.119 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.119
new file mode 100644
index 000000000000..37f54e531703
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.119
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.119
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.119
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.119.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.119.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=e05a2285b971a7f7bcbc7b9a4c1f9a4d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.44 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.44
new file mode 100644
index 000000000000..81a9775b4958
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.44
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.44
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.44
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.44.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.44.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=362af3de009d4e02a5d5d05608d2a485
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.12
new file mode 100644
index 000000000000..caf4bcb5d39e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.12
@@ -0,0 +1,17 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.17.12
+RDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.17.12
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.12.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.17.12.tar.sign ) amd64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.17.11-gentoo ) arm64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.17.11-gentoo ) ppc64? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.17.11-gentoo ) x86? ( https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/5.17.11-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.17.11-gentoo )
+_eclasses_=dist-kernel-utils	31e337cd76e9e16709e65d794fb58be2	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	kernel-build	bd657f7e4c30bd73e086fec87ecb48b3	kernel-install	149f830e772fdf45b278492c8c00d505	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	d33a77692bb47e8227f27e17fb9c3c05	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	savedconfig	7cb1bf66b4acedc4f06802a012d3b08d	toolchain-funcs	fd9cde67030b26e479eeadaced488253	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=059365723a845ee2cb4b30fd5215fef3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.118 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.119
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.118
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.119
index 6a29f5ba0e2d..8121bd11275e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.118
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.119
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.10.118
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.118.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.119
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.119.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.43 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.44
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.15.43
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.15.44
index 89c26da6ff7f..440274fc374a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.43
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.44
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.15.43
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.43.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.44
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.44.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.11 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.12
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.17.11
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.17.12
index 5a02db3697ca..2277532edbfd 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.11
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.17.12
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.17.11
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.11.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
+SLOT=5.17.12
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.17.12.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.17.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.1
similarity index 83%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.18.0
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.18.1
index 0b5dcafb8c24..4cc4f474df84 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.18.1
@@ -9,7 +9,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.18.0
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
+SLOT=5.18.1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.18.1.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	7243c5ee4d1a26f42930f137a20ed659	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
 _md5_=5e76cbc485785140dfc1cbb402aa4bcc
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 931c3286b107..9c140861d778 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/argp-standalone-1.5.0 b/metadata/md5-cache/sys-libs/argp-standalone-1.5.0
new file mode 100644
index 000000000000..7008f8d4824d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/argp-standalone-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=!sys-libs/glibc
+DESCRIPTION=Standalone argp library for use with musl
+EAPI=8
+HOMEPAGE=https://github.com/argp-standalone/argp-standalone
+INHERIT=autotools flag-o-matic
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86
+LICENSE=public-domain GPL-2 GPL-3 XC
+SLOT=0
+SRC_URI=https://github.com/argp-standalone/argp-standalone/archive/refs/tags/1.5.0.tar.gz -> argp-standalone-1.5.0.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=74d2156bac03f1d95ff0967c49e1322e
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.4
new file mode 100644
index 000000000000..78f1ff957968
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.4
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/lit-9.0.1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/lit-9.0.1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/lit-9.0.1[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.4*:14 ) !test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime library for clang (built-in part)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RESTRICT=!test? ( test ) !clang? ( test )
+SLOT=14.0.4
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.4.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2aab6f1ae294581154b48fc3a04d920d
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.4 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.4
new file mode 100644
index 000000000000..a62631119699
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( !<sys-apps/sandbox-2.13 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-python/lit-5[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 >=dev-python/lit-5[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 >=dev-python/lit-5[python_targets_python3_8(-)] ) ) =sys-devel/clang-14.0.4*:14 sys-libs/compiler-rt:14.0.4 ) !test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=>=sys-devel/llvm-6 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
+DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
+EAPI=8
+HOMEPAGE=https://llvm.org/
+INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
+RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
+SLOT=14.0.4
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.4.tar.xz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cfde77317289bae47903d57290a6add5
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.4 b/metadata/md5-cache/sys-libs/libcxx-14.0.4
new file mode 100644
index 000000000000..7a4a4be18435
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.4
@@ -0,0 +1,17 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=dev-util/cmake-3.16 >=sys-devel/clang-3.9.0 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) >=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=New implementation of the C++ standard library, targeting C++11
+EAPI=8
+HOMEPAGE=https://libcxx.llvm.org/
+INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+libcxxabi +libunwind static-libs test 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=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-14.0.4[libunwind=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+REQUIRED_USE=libunwind? ( libcxxabi )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.4.tar.xz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=3abf6587f33af4029188a8b3c12eea3b
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.4 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.4
new file mode 100644
index 000000000000..a0ec64466130
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.4
@@ -0,0 +1,16 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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-libs/llvm-libunwind-3.9.0-r1[static-libs?,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/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=Low level support for a standard C++ library
+EAPI=8
+HOMEPAGE=https://libcxxabi.llvm.org/
+INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=+libunwind static-libs test test 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=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,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-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=03d30d915d64e6d3c7a10f863108ceca
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.4 b/metadata/md5-cache/sys-libs/libomp-14.0.4
new file mode 100644
index 000000000000..01322cbe0109
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.4
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) sys-devel/clang ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test unpack
+DEPEND=hwloc? ( >=sys-apps/hwloc-2.5: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(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[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/llvm-14.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) ) !!sys-devel/llvm:0
+DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
+EAPI=8
+HOMEPAGE=https://openmp.llvm.org
+INHERIT=cmake-multilib linux-info llvm llvm.org python-any-r1
+IUSE=cuda debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5: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(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[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/llvm-14.0.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
+REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0e28429a759aa5f4d717c9936cca9dfc
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.4 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.4
new file mode 100644
index 000000000000..0268b1845d8d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.4
@@ -0,0 +1,16 @@
+BDEPEND=!test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) test? ( >=sys-devel/clang-3.9.0 || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/lit[python_targets_python3_8(-)] ) ) ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=sys-devel/llvm-6 !!sys-devel/llvm:0
+DESCRIPTION=C++ runtime stack unwinder from LLVM
+EAPI=8
+HOMEPAGE=https://github.com/llvm-mirror/libunwind
+INHERIT=cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+IUSE=debug static-libs test test 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=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
+RDEPEND=!sys-libs/libunwind
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-14.0.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	cmake-multilib	7f8d0fb6ae10906fe334997f977e838b	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	llvm	6f88d422e49b917bf254b2594f3d903c	llvm.org	3e1fba85887e8ff8b3cf3ddbdd5d2aac	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c5630e19e6637170dd234fc809f01db9
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 1bb0aed0fcbc..5ca95c3d8e6c 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
deleted file mode 100644
index 599b0fc8bfe8..000000000000
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
-HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
-INHERIT=linux-mod toolchain-funcs
-IUSE=dist-kernel
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/ddbd243638c7bc2baecf43a78aff46cdc12e9b2e.tar.gz -> bbswitch-0.8_p20200526.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=83172471fbb2d9c15ea63006f98b8c6a
diff --git a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129 b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
index 4cd59d4bbd29..780624fb3680 100644
--- a/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
+++ b/metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
 DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
 INHERIT=linux-mod toolchain-funcs
 IUSE=dist-kernel
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://github.com/Bumblebee-Project/bbswitch/archive/23891174a80ea79c7720bcc7048a5c2bfcde5cd9.tar.gz -> bbswitch-0.8_p20211129.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=25741e78b0fd95f36e18bd75e1252ef2
+_eclasses_=linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=15155a7919a51f01ecc835fbd704af0e
diff --git a/metadata/md5-cache/sys-power/bbswitch-9999 b/metadata/md5-cache/sys-power/bbswitch-9999
deleted file mode 100644
index 8dd87f7cd1ae..000000000000
--- a/metadata/md5-cache/sys-power/bbswitch-9999
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=virtual/linux-sources sys-kernel/linux-headers kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
-DESCRIPTION=Toggle discrete NVIDIA Optimus graphics card
-EAPI=7
-HOMEPAGE=https://github.com/Bumblebee-Project/bbswitch
-INHERIT=linux-mod toolchain-funcs git-r3
-IUSE=dist-kernel
-LICENSE=GPL-3+
-PROPERTIES=live
-RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
-SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8ccdbf62c0054a7eaf09de8b1e3c618b
diff --git a/metadata/md5-cache/sys-power/upower-0.99.18 b/metadata/md5-cache/sys-power/upower-0.99.18
new file mode 100644
index 000000000000..306649088971
--- /dev/null
+++ b/metadata/md5-cache/sys-power/upower-0.99.18
@@ -0,0 +1,16 @@
+BDEPEND=app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=sys-devel/gettext-0.19.8 virtual/pkgconfig doc? ( dev-util/gtk-doc ) test? ( || ( ( >=dev-lang/python-3.11.0_beta1-r1:3.11 dev-python/dbus-python[python_targets_python3_11(-)] dev-python/python-dbusmock[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/dbus-python[python_targets_python3_10(-)] dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/dbus-python[python_targets_python3_9(-)] dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/dbus-python[python_targets_python3_8(-)] dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) dev-util/umockdev ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) )
+DESCRIPTION=D-Bus abstraction for enumerating power devices, querying history and statistics
+EAPI=8
+HOMEPAGE=https://upower.freedesktop.org/
+INHERIT=meson python-any-r1 systemd udev xdg-utils
+IUSE=doc +introspection ios selinux test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.58:2 sys-apps/dbus:= introspection? ( dev-libs/gobject-introspection:= ) kernel_linux? ( >=dev-libs/libgudev-236:= virtual/udev ios? ( >=app-pda/libimobiledevice-1:= >=app-pda/libplist-2:= ) ) selinux? ( sec-policy/selinux-devicekit )
+RESTRICT=!test? ( test )
+SLOT=0/3
+SRC_URI=https://gitlab.freedesktop.org/upower/upower/-/archive/v0.99.18/upower-v0.99.18.tar.bz2
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=393ca580a0f6b94e52ea1accf160c740
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index df10972f114c..b10937f460f7 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/parallel-20220422 b/metadata/md5-cache/sys-process/parallel-20220422
index 827805cf2dfe..5cd4c7c0cd02 100644
--- a/metadata/md5-cache/sys-process/parallel-20220422
+++ b/metadata/md5-cache/sys-process/parallel-20220422
@@ -4,11 +4,12 @@ DEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-D
 DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
 EAPI=8
 HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
+INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-lang/perl:= dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20220422.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220422.tar.bz2.sig )
 _eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=67cab995700ac47f6501538fafbd4dce
+_md5_=b076a6c826961a3850cd6ccaa3b5a946
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.18 b/metadata/md5-cache/sys-process/systemd-cron-1.5.18
index 14c13613c900..0ce716f31cc3 100644
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.18
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.18
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
 INHERIT=python-single-r1 systemd
 IUSE=cron-boot etc-crontab-systemd minutely +runparts setgid test yearly python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !sys-process/cronie[anacron] !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.7-r1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-process/cronbase
 REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/systemd-cron/systemd-cron/archive/v1.15.18.tar.gz -> systemd-cron-1.5.18.tar.gz
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=3ea46c20d1c681a61bea1652b0867a68
+_md5_=66976254f4f9a242a2933a6666e4b0af
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index d25ccf505a03..6b61eec66155 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.119 b/metadata/md5-cache/virtual/dist-kernel-5.10.119
new file mode 100644
index 000000000000..7b3121a72bf7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.119
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.119 ~sys-kernel/gentoo-kernel-bin-5.10.119 ~sys-kernel/vanilla-kernel-5.10.119 )
+SLOT=0/5.10.119
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.44 b/metadata/md5-cache/virtual/dist-kernel-5.15.44
new file mode 100644
index 000000000000..e162dcccb3bf
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.44
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.44 ~sys-kernel/gentoo-kernel-bin-5.15.44 ~sys-kernel/vanilla-kernel-5.15.44 )
+SLOT=0/5.15.44
+_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.17.12 b/metadata/md5-cache/virtual/dist-kernel-5.17.12
new file mode 100644
index 000000000000..db9fa0112414
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.17.12
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.17.12 ~sys-kernel/gentoo-kernel-bin-5.17.12 ~sys-kernel/vanilla-kernel-5.17.12 )
+SLOT=0/5.17.12
+_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/libudev-232-r7 b/metadata/md5-cache/virtual/libudev-232-r7
index aa55e15350b3..6549c7abe922 100644
--- a/metadata/md5-cache/virtual/libudev-232-r7
+++ b/metadata/md5-cache/virtual/libudev-232-r7
@@ -3,8 +3,8 @@ DESCRIPTION=Virtual for libudev providers
 EAPI=7
 INHERIT=multilib-build
 IUSE=systemd 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
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 RDEPEND=!systemd? ( || ( sys-apps/systemd-utils[udev,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-fs/udev[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-fs/eudev-3.2.9:0/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(-)?] ) ) systemd? ( >=sys-apps/systemd-232:0/2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/1
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0162777f6b7019246dc99ec5b8425acc
+_md5_=71aad3b7e48a19206710301cf708c143
diff --git a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200 b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200-r1
similarity index 56%
rename from metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200
rename to metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200-r1
index 58456480b4f1..98601142d637 100644
--- a/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200
+++ b/metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200-r1
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for Module-CoreList
 EAPI=8
 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
-RDEPEND=|| ( =dev-lang/perl-5.36.0_rc3* ~perl-core/Module-CoreList-5.202.205.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.205.200 !>perl-core/Module-CoreList-5.202.205.200-r999
+RDEPEND=|| ( =dev-lang/perl-5.36.0* ~perl-core/Module-CoreList-5.202.205.200 ) dev-lang/perl:= !<perl-core/Module-CoreList-5.202.205.200 !>perl-core/Module-CoreList-5.202.205.200-r999
 SLOT=0
-_md5_=8dcc572a8178511615ad45c03162b8ba
+_md5_=44f100a1728815284f49535ea3006e66
diff --git a/metadata/md5-cache/virtual/tmpfiles-0-r3 b/metadata/md5-cache/virtual/tmpfiles-0-r3
index 4e84b6f36e7e..92a433a555cf 100644
--- a/metadata/md5-cache/virtual/tmpfiles-0-r3
+++ b/metadata/md5-cache/virtual/tmpfiles-0-r3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different tmpfiles.d handlers
 EAPI=7
-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
 RDEPEND=!prefix-guest? ( || ( sys-apps/systemd-utils[tmpfiles] sys-apps/systemd-tmpfiles sys-apps/systemd ) )
 SLOT=0
-_md5_=a3e94df9c62d93046f137438aca5fd59
+_md5_=e178eba2168854e2d7846b2f47d94085
diff --git a/metadata/md5-cache/virtual/udev-217-r5 b/metadata/md5-cache/virtual/udev-217-r5
index 21911829d41e..e52d47384fbd 100644
--- a/metadata/md5-cache/virtual/udev-217-r5
+++ b/metadata/md5-cache/virtual/udev-217-r5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different udev daemon providers
 EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 RDEPEND=|| ( sys-apps/systemd-utils[udev] sys-fs/udev >=sys-fs/eudev-2.1.1 >=sys-apps/systemd-217 )
 SLOT=0
-_md5_=b6d370f711a9ee67e268739437d2d70f
+_md5_=185f14333354bd52ba065e0a75d6ac97
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 5aa1f4056688..ef1e35a44f34 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/gitea-1.16.7 b/metadata/md5-cache/www-apps/gitea-1.16.7
index 480a52e1b40c..f4d28aa05f8e 100644
--- a/metadata/md5-cache/www-apps/gitea-1.16.7
+++ b/metadata/md5-cache/www-apps/gitea-1.16.7
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
 INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
 IUSE=+acct pam sqlite pie +filecaps
-KEYWORDS=amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
 RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.16.7/gitea-src-1.16.7.tar.gz -> gitea-1.16.7.tar.gz
 _eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ddeecd2d3159cba6b5a86f61afb311da
+_md5_=c6865becdbb454c32464734d6f1fa9c0
diff --git a/metadata/md5-cache/www-apps/miniflux-2.0.37 b/metadata/md5-cache/www-apps/miniflux-2.0.37
new file mode 100644
index 000000000000..afda7daced75
--- /dev/null
+++ b/metadata/md5-cache/www-apps/miniflux-2.0.37
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.16 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile config install postinst unpack
+DEPEND=acct-user/miniflux
+DESCRIPTION=Minimalist and opinionated feed reader
+EAPI=8
+HOMEPAGE=https://miniflux.app https://github.com/miniflux/v2
+INHERIT=go-module systemd
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT
+RDEPEND=acct-user/miniflux >=dev-db/postgresql-9.5
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/miniflux/v2/archive/2.0.37.tar.gz -> miniflux-2.0.37.tar.gz https://dev.gentoo.org/~concord/distfiles/miniflux-2.0.37-deps.tar.xz
+_eclasses_=go-module	a13d34fe4e2996720e1ca6c53b9ea95a	multilib	4fbbbc98f236f1b43acd99476bc3cd85	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d4cd6c74ac7d23fb281694e9451afc1b
diff --git a/metadata/md5-cache/www-apps/nanoc-4.12.6 b/metadata/md5-cache/www-apps/nanoc-4.12.6
new file mode 100644
index 000000000000..1847d904d612
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.12.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby26(-)] dev-ruby/rack:*[ruby_targets_ruby26(-)] www-servers/adsf[ruby_targets_ruby26(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby26(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby26(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby26(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby26(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby26(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby26(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/asciidoctor[ruby_targets_ruby26(-)] dev-ruby/fuubar[ruby_targets_ruby26(-)] dev-ruby/haml[ruby_targets_ruby26(-)] dev-ruby/maruku[ruby_targets_ruby26(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/mustache[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rdoc[ruby_targets_ruby26(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby26(-)] dev-ruby/rubypants[ruby_targets_ruby26(-)] dev-ruby/systemu[ruby_targets_ruby26(-)] dev-ruby/timecop[ruby_targets_ruby26(-)] dev-ruby/vcr[ruby_targets_ruby26(-)] dev-ruby/webmock[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby26(-)] dev-ruby/rdiscount[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/asciidoctor[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/haml[ruby_targets_ruby27(-)] dev-ruby/maruku[ruby_targets_ruby27(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/mustache[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rdoc[ruby_targets_ruby27(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby27(-)] dev-ruby/rubypants[ruby_targets_ruby27(-)] dev-ruby/systemu[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/vcr[ruby_targets_ruby27(-)] dev-ruby/webmock[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby27(-)] dev-ruby/rdiscount[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/asciidoctor[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/haml[ruby_targets_ruby30(-)] dev-ruby/maruku[ruby_targets_ruby30(-)] >=dev-ruby/mocha-0.13[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/mustache[ruby_targets_ruby30(-)] dev-ruby/pry[ruby_targets_ruby30(-)] dev-ruby/rdoc[ruby_targets_ruby30(-)] >=dev-ruby/rouge-3.5.1:2[ruby_targets_ruby30(-)] dev-ruby/rubypants[ruby_targets_ruby30(-)] dev-ruby/systemu[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/vcr[ruby_targets_ruby30(-)] dev-ruby/webmock[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby30(-)] dev-ruby/rdiscount[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby26(-)] dev-ruby/rack:*[ruby_targets_ruby26(-)] www-servers/adsf[ruby_targets_ruby26(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby26(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby26(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby26(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby26(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby26(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby26(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby26(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby27(-)] dev-ruby/rack:*[ruby_targets_ruby27(-)] www-servers/adsf[ruby_targets_ruby27(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby27(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby27(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby27(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby27(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby27(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby30(-)] dev-ruby/rack:*[ruby_targets_ruby30(-)] www-servers/adsf[ruby_targets_ruby30(-)] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby30(-)] >=dev-ruby/colored-1.2:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-checking-1.0.2:1[ruby_targets_ruby30(-)] ~www-apps/nanoc-cli-4.12.6[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby30(-)] www-apps/nanoc-deploying:1[ruby_targets_ruby30(-)] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-command-0.8:0[ruby_targets_ruby30(-)] >=dev-ruby/tty-which-0.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=182f7e48779d4ef64f2f31ce5575b2ec
diff --git a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2 b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
index 369b234989c5..6f4822800a04 100644
--- a/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-checking-1.0.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Provides checking functionality for Nanoc
 EAPI=8
 HOMEPAGE=https://nanoc.ws/
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=www-apps/nanoc-cli-4.12.4:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-core-4.12.4:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/nanoc-checking-1.0.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=35d9e8dbe08ece71037169cb6a3cc281
+_md5_=d16cb38469bad08fe6cd2e5d7b8d4f10
diff --git a/metadata/md5-cache/www-apps/nanoc-cli-4.12.6 b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
new file mode 100644
index 000000000000..6d98df6b7255
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-cli-4.12.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] dev-ruby/fuubar[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/timecop[ruby_targets_ruby26(-)] dev-ruby/tty-command[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] www-apps/nanoc-spec[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby26(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby26(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby27(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby27(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/cri-2.15:0[ruby_targets_ruby30(-)] >=dev-ruby/diff-lcs-1.3:0[ruby_targets_ruby30(-)] ~www-apps/nanoc-core-4.12.6[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-4.12.6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=d10b223a477d124a09ae76339a9ea65d
diff --git a/metadata/md5-cache/www-apps/nanoc-core-4.12.6 b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
new file mode 100644
index 000000000000..136f060bcf18
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-core-4.12.6
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby26(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby26(-)] dev-ruby/ddplugin:1[ruby_targets_ruby26(-)] =dev-ruby/hamster-3*[ruby_targets_ruby26(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby26(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby26(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby26(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/bundler[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/rspec-its[ruby_targets_ruby26(-)] dev-ruby/fuubar[ruby_targets_ruby26(-)] dev-ruby/minitest[ruby_targets_ruby26(-)] dev-ruby/timecop[ruby_targets_ruby26(-)] dev-ruby/tty-command[ruby_targets_ruby26(-)] dev-ruby/yard[ruby_targets_ruby26(-)] www-apps/nanoc-spec[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] dev-ruby/fuubar[ruby_targets_ruby27(-)] dev-ruby/minitest[ruby_targets_ruby27(-)] dev-ruby/timecop[ruby_targets_ruby27(-)] dev-ruby/tty-command[ruby_targets_ruby27(-)] dev-ruby/yard[ruby_targets_ruby27(-)] www-apps/nanoc-spec[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] dev-ruby/rspec:3[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] dev-ruby/fuubar[ruby_targets_ruby30(-)] dev-ruby/minitest[ruby_targets_ruby30(-)] dev-ruby/timecop[ruby_targets_ruby30(-)] dev-ruby/tty-command[ruby_targets_ruby30(-)] dev-ruby/yard[ruby_targets_ruby30(-)] www-apps/nanoc-spec[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=8
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=minimal test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby26(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby26(-)] dev-ruby/ddplugin:1[ruby_targets_ruby26(-)] =dev-ruby/hamster-3*[ruby_targets_ruby26(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby26(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby26(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby26(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby26(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby27(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby27(-)] dev-ruby/ddplugin:1[ruby_targets_ruby27(-)] =dev-ruby/hamster-3*[ruby_targets_ruby27(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby27(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby27(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby27(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby27(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/concurrent-ruby-1.1:1[ruby_targets_ruby30(-)] dev-ruby/ddmetrics:1[ruby_targets_ruby30(-)] dev-ruby/ddplugin:1[ruby_targets_ruby30(-)] =dev-ruby/hamster-3*[ruby_targets_ruby30(-)] >=dev-ruby/json_schema-0.19:0[ruby_targets_ruby30(-)] >=dev-ruby/memo_wise-1.5:1[ruby_targets_ruby30(-)] dev-ruby/slow_enumerator_tools:1[ruby_targets_ruby30(-)] >=dev-ruby/tty-platform-0.2:0[ruby_targets_ruby30(-)] >=dev-ruby/zeitwerk-2.1:2[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.12.6.tar.gz -> nanoc-core-4.12.6.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=35edfea82478093d086b9e2024d7c7c2
diff --git a/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2 b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
new file mode 100644
index 000000000000..3fa05ad2ecaf
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( www-apps/nanoc-checking:1[ruby_targets_ruby26(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( www-apps/nanoc-checking:1[ruby_targets_ruby27(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( www-apps/nanoc-checking:1[ruby_targets_ruby30(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+DESCRIPTION=Provides deploying functionality for Nanoc
+EAPI=7
+HOMEPAGE=https://nanoc.ws/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby26? ( www-apps/nanoc-checking:1[ruby_targets_ruby26(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby26(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( www-apps/nanoc-checking:1[ruby_targets_ruby27(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby27(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( www-apps/nanoc-checking:1[ruby_targets_ruby30(-)] >=www-apps/nanoc-cli-4.11.15:0[ruby_targets_ruby30(-)] >=www-apps/nanoc-core-4.11.15:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=1
+SRC_URI=https://rubygems.org/gems/nanoc-deploying-1.0.2.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=49b9a301354f22ccf9ea0e891946a67b
diff --git a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2 b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
index 601eaf8c468a..422dc8d1935a 100644
--- a/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
+++ b/metadata/md5-cache/www-apps/nanoc-spec-0.0.2
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby26? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby26? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=Provides Nanoc::Spec, containing functionality for writing tests for Nanoc
 EAPI=7
 HOMEPAGE=https://nanoc.ws/
 INHERIT=ruby-fakegem
-IUSE=minimal test ruby_targets_ruby26 ruby_targets_ruby27 doc test
+IUSE=minimal test ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test
 KEYWORDS=~amd64 ~riscv
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby26? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby26? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=www-apps/nanoc-core-4.11.13:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/nanoc-spec-0.0.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	4fbbbc98f236f1b43acd99476bc3cd85	ruby-fakegem	5219a86777b162618ed386ae08bf8ce4	ruby-ng	6b9d651000093b5c0463204b7aa07fef	ruby-utils	707c7b16c28e3483e51d7ec7f7b0d5ed	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6e059093b4b0ea3f9f9b1e3ebe785bf6
+_md5_=66a301fdbb20f7b82396777a3d46361f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index d183f8477320..52732e667236 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-103.0.5060.24 b/metadata/md5-cache/www-client/chromium-103.0.5060.24
index 646a7bf9257a..651e1abb3d2c 100644
--- a/metadata/md5-cache/www-client/chromium-103.0.5060.24
+++ b/metadata/md5-cache/www-client/chromium-103.0.5060.24
@@ -10,7 +10,7 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless ( || ( X wayland ) )
-SLOT=0/dev
+SLOT=0/beta
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5060.24.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-4/chromium-103-patchset-4.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7c8f1c2ece01cc85a7bc1675d1a8620b
+_md5_=271eead0011ebed717940f90124217c9
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5083.0 b/metadata/md5-cache/www-client/chromium-104.0.5083.0
new file mode 100644
index 000000000000..c8d2d36562a7
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-104.0.5083.0
@@ -0,0 +1,16 @@
+BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] >=dev-lang/python-3.9.9-r1:3.9[xml] >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9[xml] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:12 sys-devel/llvm:12 =sys-devel/lld-12* ) ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
+DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=8
+HOMEPAGE=https://chromium.org/
+INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
+KEYWORDS=~amd64 ~arm64
+LICENSE=BSD
+RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
+REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
+SLOT=0/dev
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5083.0.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-1/chromium-104-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=28ba8b6b82bafc6ab5bea8da9821f0b5
diff --git a/metadata/md5-cache/www-client/epiphany-42.2 b/metadata/md5-cache/www-client/epiphany-42.2
index f85bd5b4a415..28d27e10fc55 100644
--- a/metadata/md5-cache/www-client/epiphany-42.2
+++ b/metadata/md5-cache/www-client/epiphany-42.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Web
 INHERIT=gnome.org gnome2-utils meson xdg virtualx
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.67.4:2 >=x11-libs/gtk+-3.24.0:3 >=dev-libs/nettle-3.4:= >=net-libs/webkit-gtk-2.33.2:4= >=x11-libs/cairo-1.2 >=app-crypt/gcr-3.5.5:=[gtk] >=x11-libs/gdk-pixbuf-2.36.5:2 gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.35 >=dev-libs/json-glib-1.6 app-arch/libarchive:= >=dev-libs/libdazzle-3.37.1 >=gui-libs/libhandy-1.5.0:1= >=app-crypt/libsecret-0.19 >=net-libs/libsoup-2.48.0:2.4 >=dev-libs/libxml2-2.6.12:2 >=dev-db/sqlite-3.22:3 dev-libs/gmp:0= x11-themes/adwaita-icon-theme
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/epiphany/42/epiphany-42.2.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=915f8bdb5d3b77af7499986a3ba7500a
+_md5_=5728b4700386cd32f6db30875c253511
diff --git a/metadata/md5-cache/www-client/firefox-100.0 b/metadata/md5-cache/www-client/firefox-100.0
deleted file mode 100644
index e1f0951a009e..000000000000
--- a/metadata/md5-cache/www-client/firefox-100.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.57.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.76 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat media-libs/alsa-lib >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.9 virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.42:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= >=x11-libs/pango-1.22.0 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-70.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.76 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat media-libs/alsa-lib >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.9 virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.42:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= >=x11-libs/pango-1.22.0 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-70.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/100.0/source/firefox-100.0.source.tar.xz -> firefox-100.0.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-100-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/af.xpi -> firefox-100.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ar.xpi -> firefox-100.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ast.xpi -> firefox-100.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/be.xpi -> firefox-100.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/bg.xpi -> firefox-100.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/br.xpi -> firefox-100.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ca.xpi -> firefox-100.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/cak.xpi -> firefox-100.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/cs.xpi -> firefox-100.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/cy.xpi -> firefox-100.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/da.xpi -> firefox-100.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/de.xpi -> firefox-100.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/dsb.xpi -> firefox-100.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/el.xpi -> firefox-100.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/en-CA.xpi -> firefox-100.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/en-GB.xpi -> firefox-100.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/es-AR.xpi -> firefox-100.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/es-ES.xpi -> firefox-100.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/et.xpi -> firefox-100.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/eu.xpi -> firefox-100.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/fi.xpi -> firefox-100.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/fr.xpi -> firefox-100.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/fy-NL.xpi -> firefox-100.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ga-IE.xpi -> firefox-100.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/gd.xpi -> firefox-100.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/gl.xpi -> firefox-100.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/he.xpi -> firefox-100.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/hr.xpi -> firefox-100.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/hsb.xpi -> firefox-100.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/hu.xpi -> firefox-100.0-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/id.xpi -> firefox-100.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/is.xpi -> firefox-100.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/it.xpi -> firefox-100.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ja.xpi -> firefox-100.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ka.xpi -> firefox-100.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/kab.xpi -> firefox-100.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/kk.xpi -> firefox-100.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ko.xpi -> firefox-100.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/lt.xpi -> firefox-100.0-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/lv.xpi -> firefox-100.0-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ms.xpi -> firefox-100.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/nb-NO.xpi -> firefox-100.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/nl.xpi -> firefox-100.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/nn-NO.xpi -> firefox-100.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/pa-IN.xpi -> firefox-100.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/pl.xpi -> firefox-100.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/pt-BR.xpi -> firefox-100.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/pt-PT.xpi -> firefox-100.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/rm.xpi -> firefox-100.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ro.xpi -> firefox-100.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ru.xpi -> firefox-100.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sk.xpi -> firefox-100.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sl.xpi -> firefox-100.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sq.xpi -> firefox-100.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sr.xpi -> firefox-100.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sv-SE.xpi -> firefox-100.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/th.xpi -> firefox-100.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/tr.xpi -> firefox-100.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/uk.xpi -> firefox-100.0-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/uz.xpi -> firefox-100.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/vi.xpi -> firefox-100.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/zh-CN.xpi -> firefox-100.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/zh-TW.xpi -> firefox-100.0-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ach.xpi -> firefox-100.0-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/an.xpi -> firefox-100.0-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/az.xpi -> firefox-100.0-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/bn.xpi -> firefox-100.0-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/bs.xpi -> firefox-100.0-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ca-valencia.xpi -> firefox-100.0-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/eo.xpi -> firefox-100.0-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/es-CL.xpi -> firefox-100.0-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/es-MX.xpi -> firefox-100.0-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/fa.xpi -> firefox-100.0-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ff.xpi -> firefox-100.0-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/gn.xpi -> firefox-100.0-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/gu-IN.xpi -> firefox-100.0-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/hi-IN.xpi -> firefox-100.0-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/hy-AM.xpi -> firefox-100.0-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ia.xpi -> firefox-100.0-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/km.xpi -> firefox-100.0-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/kn.xpi -> firefox-100.0-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/lij.xpi -> firefox-100.0-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/mk.xpi -> firefox-100.0-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/mr.xpi -> firefox-100.0-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/my.xpi -> firefox-100.0-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ne-NP.xpi -> firefox-100.0-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/oc.xpi -> firefox-100.0-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/sco.xpi -> firefox-100.0-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/si.xpi -> firefox-100.0-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/son.xpi -> firefox-100.0-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/szl.xpi -> firefox-100.0-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ta.xpi -> firefox-100.0-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/te.xpi -> firefox-100.0-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/tl.xpi -> firefox-100.0-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/trs.xpi -> firefox-100.0-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/ur.xpi -> firefox-100.0-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/100.0/linux-x86_64/xpi/xh.xpi -> firefox-100.0-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=903a337c3f499eb30d28731ec7df1d98
diff --git a/metadata/md5-cache/www-client/firefox-100.0.1 b/metadata/md5-cache/www-client/firefox-100.0.1
deleted file mode 100644
index e17aada4298d..000000000000
--- a/metadata/md5-cache/www-client/firefox-100.0.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.9-r1:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.12_p1-r1:3.8[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.19.0 >=net-libs/nodejs-10.23.1 virtual/pkgconfig >=virtual/rust-1.57.0 || ( ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( =sys-devel/lld-14* pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ( sys-devel/clang:13 sys-devel/llvm:13 clang? ( =sys-devel/lld-13* pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] ) ) ) ( sys-devel/clang:12 sys-devel/llvm:12 clang? ( =sys-devel/lld-12* pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] ) ) ) ) amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.76 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat media-libs/alsa-lib >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.9 virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.42:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= >=x11-libs/pango-1.22.0 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-70.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Firefox Web Browser
-EAPI=7
-HOMEPAGE=https://www.mozilla.com/firefox
-INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.76 >=dev-libs/nspr-4.32 dev-libs/atk dev-libs/expat media-libs/alsa-lib >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.9 virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.42:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb:= >=x11-libs/pango-1.22.0 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) libproxy? ( net-libs/libproxy ) screencast? ( media-video/pipewire:= ) system-av1? ( >=media-libs/dav1d-0.9.3:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.8.1:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-70.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) sndio? ( media-sound/sndio ) !www-client/firefox:0 !www-client/firefox:esr jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla )
-REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
-SLOT=rapid
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/100.0.1/source/firefox-100.0.1.source.tar.xz -> firefox-100.0.1.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-100-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-100-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/af.xpi -> firefox-100.0.1-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ar.xpi -> firefox-100.0.1-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ast.xpi -> firefox-100.0.1-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/be.xpi -> firefox-100.0.1-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/bg.xpi -> firefox-100.0.1-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/br.xpi -> firefox-100.0.1-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ca.xpi -> firefox-100.0.1-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/cak.xpi -> firefox-100.0.1-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/cs.xpi -> firefox-100.0.1-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/cy.xpi -> firefox-100.0.1-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/da.xpi -> firefox-100.0.1-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/de.xpi -> firefox-100.0.1-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/dsb.xpi -> firefox-100.0.1-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/el.xpi -> firefox-100.0.1-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/en-CA.xpi -> firefox-100.0.1-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/en-GB.xpi -> firefox-100.0.1-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/es-AR.xpi -> firefox-100.0.1-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/es-ES.xpi -> firefox-100.0.1-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/et.xpi -> firefox-100.0.1-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/eu.xpi -> firefox-100.0.1-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/fi.xpi -> firefox-100.0.1-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/fr.xpi -> firefox-100.0.1-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/fy-NL.xpi -> firefox-100.0.1-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ga-IE.xpi -> firefox-100.0.1-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/gd.xpi -> firefox-100.0.1-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/gl.xpi -> firefox-100.0.1-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/he.xpi -> firefox-100.0.1-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/hr.xpi -> firefox-100.0.1-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/hsb.xpi -> firefox-100.0.1-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/hu.xpi -> firefox-100.0.1-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/id.xpi -> firefox-100.0.1-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/is.xpi -> firefox-100.0.1-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/it.xpi -> firefox-100.0.1-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ja.xpi -> firefox-100.0.1-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ka.xpi -> firefox-100.0.1-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/kab.xpi -> firefox-100.0.1-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/kk.xpi -> firefox-100.0.1-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ko.xpi -> firefox-100.0.1-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/lt.xpi -> firefox-100.0.1-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/lv.xpi -> firefox-100.0.1-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ms.xpi -> firefox-100.0.1-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/nb-NO.xpi -> firefox-100.0.1-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/nl.xpi -> firefox-100.0.1-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/nn-NO.xpi -> firefox-100.0.1-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/pa-IN.xpi -> firefox-100.0.1-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/pl.xpi -> firefox-100.0.1-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/pt-BR.xpi -> firefox-100.0.1-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/pt-PT.xpi -> firefox-100.0.1-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/rm.xpi -> firefox-100.0.1-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ro.xpi -> firefox-100.0.1-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ru.xpi -> firefox-100.0.1-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sk.xpi -> firefox-100.0.1-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sl.xpi -> firefox-100.0.1-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sq.xpi -> firefox-100.0.1-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sr.xpi -> firefox-100.0.1-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sv-SE.xpi -> firefox-100.0.1-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/th.xpi -> firefox-100.0.1-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/tr.xpi -> firefox-100.0.1-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/uk.xpi -> firefox-100.0.1-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/uz.xpi -> firefox-100.0.1-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/vi.xpi -> firefox-100.0.1-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/zh-CN.xpi -> firefox-100.0.1-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/zh-TW.xpi -> firefox-100.0.1-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ach.xpi -> firefox-100.0.1-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/an.xpi -> firefox-100.0.1-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/az.xpi -> firefox-100.0.1-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/bn.xpi -> firefox-100.0.1-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/bs.xpi -> firefox-100.0.1-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ca-valencia.xpi -> firefox-100.0.1-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/eo.xpi -> firefox-100.0.1-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/es-CL.xpi -> firefox-100.0.1-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/es-MX.xpi -> firefox-100.0.1-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/fa.xpi -> firefox-100.0.1-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ff.xpi -> firefox-100.0.1-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/gn.xpi -> firefox-100.0.1-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/gu-IN.xpi -> firefox-100.0.1-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/hi-IN.xpi -> firefox-100.0.1-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/hy-AM.xpi -> firefox-100.0.1-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ia.xpi -> firefox-100.0.1-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/km.xpi -> firefox-100.0.1-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/kn.xpi -> firefox-100.0.1-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/lij.xpi -> firefox-100.0.1-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/mk.xpi -> firefox-100.0.1-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/mr.xpi -> firefox-100.0.1-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/my.xpi -> firefox-100.0.1-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ne-NP.xpi -> firefox-100.0.1-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/oc.xpi -> firefox-100.0.1-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/sco.xpi -> firefox-100.0.1-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/si.xpi -> firefox-100.0.1-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/son.xpi -> firefox-100.0.1-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/szl.xpi -> firefox-100.0.1-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ta.xpi -> firefox-100.0.1-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/te.xpi -> firefox-100.0.1-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/tl.xpi -> firefox-100.0.1-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/trs.xpi -> firefox-100.0.1-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/ur.xpi -> firefox-100.0.1-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/100.0.1/linux-x86_64/xpi/xh.xpi -> firefox-100.0.1-xh.xpi )
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	llvm	6f88d422e49b917bf254b2594f3d903c	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=120881ff383cec403f67248bc8018268
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-102.0.5005.61 b/metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.24
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-102.0.5005.61
rename to metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.24
index 1b3cdf7910b6..e0a52ebdfd6a 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-102.0.5005.61
+++ b/metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.24
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_102.0.5005.61-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_103.0.5060.24-1_amd64.deb
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-103.0.5060.24 b/metadata/md5-cache/www-client/google-chrome-unstable-104.0.5083.0
similarity index 96%
rename from metadata/md5-cache/www-client/google-chrome-unstable-103.0.5060.24
rename to metadata/md5-cache/www-client/google-chrome-unstable-104.0.5083.0
index f8e360701046..adea9cc086dd 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-103.0.5060.24
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-104.0.5083.0
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_103.0.5060.24-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_104.0.5083.0-1_amd64.deb
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=d48be4d1b0cae1d9bf1bbfa4dc2a45c7
diff --git a/metadata/md5-cache/www-client/links-2.27 b/metadata/md5-cache/www-client/links-2.27
new file mode 100644
index 000000000000..e6ae011f9a53
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.27
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/libbsd brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( media-libs/libjpeg-turbo:= ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm media-libs/libjpeg-turbo:= ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:= ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers )
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=8
+HOMEPAGE=http://links.twibright.com/
+IDEPEND=X? ( dev-util/desktop-file-utils )
+INHERIT=autotools desktop toolchain-funcs xdg-utils
+IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/libbsd brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( media-libs/libjpeg-turbo:= ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm media-libs/libjpeg-turbo:= ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0= ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) webp? ( media-libs/libwebp:= ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.27.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=696ff8179bd485538718c4458fd8cf18
diff --git a/metadata/md5-cache/www-client/opera-87.0.4390.25 b/metadata/md5-cache/www-client/opera-87.0.4390.36
similarity index 82%
rename from metadata/md5-cache/www-client/opera-87.0.4390.25
rename to metadata/md5-cache/www-client/opera-87.0.4390.36
index 820705f2ab77..5563c4e07486 100644
--- a/metadata/md5-cache/www-client/opera-87.0.4390.25
+++ b/metadata/md5-cache/www-client/opera-87.0.4390.36
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera/desktop/87.0.4390.25/linux/opera-stable_87.0.4390.25_amd64.deb https://download2.operacdn.com/pub/opera/desktop/87.0.4390.25/linux/opera-stable_87.0.4390.25_amd64.deb https://download3.operacdn.com/pub/opera/desktop/87.0.4390.25/linux/opera-stable_87.0.4390.25_amd64.deb https://download4.operacdn.com/pub/opera/desktop/87.0.4390.25/linux/opera-stable_87.0.4390.25_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera/desktop/87.0.4390.36/linux/opera-stable_87.0.4390.36_amd64.deb https://download2.operacdn.com/pub/opera/desktop/87.0.4390.36/linux/opera-stable_87.0.4390.36_amd64.deb https://download3.operacdn.com/pub/opera/desktop/87.0.4390.36/linux/opera-stable_87.0.4390.36_amd64.deb https://download4.operacdn.com/pub/opera/desktop/87.0.4390.36/linux/opera-stable_87.0.4390.36_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=1dfcbff094fe7fa2e888024eb452cdfb
diff --git a/metadata/md5-cache/www-client/opera-beta-87.0.4390.17 b/metadata/md5-cache/www-client/opera-beta-88.0.4412.18
similarity index 79%
rename from metadata/md5-cache/www-client/opera-beta-87.0.4390.17
rename to metadata/md5-cache/www-client/opera-beta-88.0.4412.18
index 5c94193c4b31..0faa9e3f0aa8 100644
--- a/metadata/md5-cache/www-client/opera-beta-87.0.4390.17
+++ b/metadata/md5-cache/www-client/opera-beta-88.0.4412.18
@@ -9,6 +9,6 @@ LICENSE=OPERA-2018
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gsettings-desktop-schemas media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://download1.operacdn.com/pub/opera-beta/87.0.4390.17/linux/opera-beta_87.0.4390.17_amd64.deb https://download2.operacdn.com/pub/opera-beta/87.0.4390.17/linux/opera-beta_87.0.4390.17_amd64.deb https://download3.operacdn.com/pub/opera-beta/87.0.4390.17/linux/opera-beta_87.0.4390.17_amd64.deb https://download4.operacdn.com/pub/opera-beta/87.0.4390.17/linux/opera-beta_87.0.4390.17_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
+SRC_URI=https://download1.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download2.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download3.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb https://download4.operacdn.com/pub/opera-beta/88.0.4412.18/linux/opera-beta_88.0.4412.18_amd64.deb proprietary-codecs? ( mirror+https://dev.gentoo.org/~sultan/distfiles/www-client/opera/opera-ffmpeg-codecs-100.0.4896.20.tar.xz )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=38ad1556b6fb9daf5f944e36d3369844
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16-r1
similarity index 95%
rename from metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16
rename to metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16-r1
index 7e2344013227..ef1845b642e0 100644
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16
+++ b/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16-r1
@@ -6,9 +6,9 @@ INHERIT=chromium-2 desktop unpacker xdg
 IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_io +l10n_it +l10n_ja +l10n_jbo +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
 KEYWORDS=-* ~amd64 ~arm ~arm64
 LICENSE=Vivaldi
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:100 ) widevine? ( www-plugins/chrome-binary-plugins )
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:102 ) widevine? ( www-plugins/chrome-binary-plugins )
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.16-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.16-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.16-1_arm64.deb )
 _eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=040a80be0f2e02fdce73a60fc6abc514
+_md5_=3e8e820e1edba26b042c2365959e3910
diff --git a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.3 b/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.3
deleted file mode 100644
index fae8b2d60d40..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
-DESCRIPTION=A browser for our friends
-EAPI=8
-HOMEPAGE=https://vivaldi.com/
-INHERIT=chromium-2 desktop unpacker xdg
-IUSE=proprietary-codecs widevine +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_de-CH +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gd +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_io +l10n_it +l10n_ja +l10n_jbo +l10n_kab +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Vivaldi
-RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrandr x11-libs/pango[X] || ( gui-libs/gtk:4 x11-libs/gtk+:3 ) proprietary-codecs? ( media-video/ffmpeg-chromium:100 ) widevine? ( www-plugins/chrome-binary-plugins )
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.3-1_amd64.deb ) arm? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.3-1_armhf.deb ) arm64? ( https://downloads.vivaldi.com/snapshot/vivaldi-snapshot_5.3.2679.3-1_arm64.deb )
-_eclasses_=chromium-2	fe5bb568da464344d16c90acb1c6e91e	desktop	c0d27bf73aa08ca05b663dbd31fbef28	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=040a80be0f2e02fdce73a60fc6abc514
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index bc513ae99a0f..4c50b2bfb4c2 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-102.0.5005.61_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_beta
similarity index 92%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-102.0.5005.61_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_beta
index 152e4d45972a..7d85a05658f7 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-102.0.5005.61_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_102.0.5005.61-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_103.0.5060.24-1_amd64.deb
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5083.0_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5083.0_alpha
index 84f8ddb6f4be..a78c86d7d6ff 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5083.0_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_103.0.5060.24-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_104.0.5083.0-1_amd64.deb
 _eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 4568eae01de9..55d5bf329e34 100644
Binary files a/metadata/md5-cache/www-servers/Manifest.gz and b/metadata/md5-cache/www-servers/Manifest.gz differ
diff --git a/metadata/md5-cache/www-servers/varnish-6.5.2 b/metadata/md5-cache/www-servers/varnish-6.5.2
index 56d50c1acec3..67755c4320e2 100644
--- a/metadata/md5-cache/www-servers/varnish-6.5.2
+++ b/metadata/md5-cache/www-servers/varnish-6.5.2
@@ -5,13 +5,13 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=7
 HOMEPAGE=https://varnish-cache.org/
 INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.5.2.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=afb8e22e8497881022abfbdfe771c4be
+_md5_=8d6e9c71576cb4c4664571d282d76a63
diff --git a/metadata/md5-cache/www-servers/varnish-6.6.1 b/metadata/md5-cache/www-servers/varnish-6.6.1
index 29efbb930a9c..875d5a7f4dcb 100644
--- a/metadata/md5-cache/www-servers/varnish-6.6.1
+++ b/metadata/md5-cache/www-servers/varnish-6.6.1
@@ -5,13 +5,13 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=7
 HOMEPAGE=https://varnish-cache.org/
 INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
 KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-6.6.1.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=057abfb05de46b2af164ca6a210c1917
+_md5_=636d74cb8aca143dca0cc73d67f7bd7b
diff --git a/metadata/md5-cache/www-servers/varnish-7.0.1 b/metadata/md5-cache/www-servers/varnish-7.0.1
index 85eb75af23be..9f874af78fba 100644
--- a/metadata/md5-cache/www-servers/varnish-7.0.1
+++ b/metadata/md5-cache/www-servers/varnish-7.0.1
@@ -5,13 +5,13 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=8
 HOMEPAGE=https://varnish-cache.org/
 INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-7.0.1.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=02ec86d668f528aa80e4befcbbe28335
+_md5_=cf5a4b948d49c4d9d3f6c59292bd69fd
diff --git a/metadata/md5-cache/www-servers/varnish-7.1.0 b/metadata/md5-cache/www-servers/varnish-7.1.0
index 9f8ebb7c3e1a..5ef79b636f69 100644
--- a/metadata/md5-cache/www-servers/varnish-7.1.0
+++ b/metadata/md5-cache/www-servers/varnish-7.1.0
@@ -5,13 +5,13 @@ DESCRIPTION=Varnish is a state-of-the-art, high-performance HTTP accelerator
 EAPI=8
 HOMEPAGE=https://varnish-cache.org/
 INHERIT=autotools systemd python-r1
-IUSE=jemalloc jit static-libs python_targets_python3_8 python_targets_python3_9
+IUSE=jemalloc jit static-libs python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
 LICENSE=BSD-2 GPL-2
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) sys-libs/readline:0= dev-libs/libpcre[jit?] jemalloc? ( dev-libs/jemalloc ) sys-libs/ncurses:0= acct-user/varnish acct-group/varnish sys-devel/gcc
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://varnish-cache.org/_downloads/varnish-7.1.0.tgz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=02ec86d668f528aa80e4befcbbe28335
+_md5_=cf5a4b948d49c4d9d3f6c59292bd69fd
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 083346c90007..62e9b5ed7966 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.5-r1 b/metadata/md5-cache/x11-apps/appres-1.0.5-r1
deleted file mode 100644
index 2a8875d3799b..000000000000
--- a/metadata/md5-cache/x11-apps/appres-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=list X application resource database
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/appres
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.5.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3b81f5cb1c80729befcfaefd457a9e33
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.6 b/metadata/md5-cache/x11-apps/appres-1.0.6
index 806fb8997353..0f767afe7fce 100644
--- a/metadata/md5-cache/x11-apps/appres-1.0.6
+++ b/metadata/md5-cache/x11-apps/appres-1.0.6
@@ -5,10 +5,10 @@ DESCRIPTION=list X application resource database
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/appres
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.6.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=db1306bfc9b480171c57a98736920192
+_md5_=4515313f308604b7d986bb602ad2c90e
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1 b/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1
deleted file mode 100644
index 60ade62ad113..000000000000
--- a/metadata/md5-cache/x11-apps/bitmap-1.0.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps x11-base/xorg-proto
-DESCRIPTION=X.Org bitmap application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bitmap
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/bitmap-1.0.9.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=f0843996604ef7a7651072bef7857d51
diff --git a/metadata/md5-cache/x11-apps/bitmap-1.1.0 b/metadata/md5-cache/x11-apps/bitmap-1.1.0
index 9d9f5cc71900..e7b83e912f56 100644
--- a/metadata/md5-cache/x11-apps/bitmap-1.1.0
+++ b/metadata/md5-cache/x11-apps/bitmap-1.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org bitmap application
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/bitmap
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/bitmap-1.1.0.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=fad4d53bda6f2f0ae58b037e03c5e0e4
+_md5_=7e13d1aa6bd242dea4e2e60cc5300c2b
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.7 b/metadata/md5-cache/x11-apps/editres-1.0.7
deleted file mode 100644
index 06a8b86f00a9..000000000000
--- a/metadata/md5-cache/x11-apps/editres-1.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-DESCRIPTION=a dynamic resource editor for X Toolkit applications
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/editres
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.7.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=5eb4e4513beb3180742932a01dce2e09
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.8 b/metadata/md5-cache/x11-apps/editres-1.0.8
index 69ce663527ec..762ef8412733 100644
--- a/metadata/md5-cache/x11-apps/editres-1.0.8
+++ b/metadata/md5-cache/x11-apps/editres-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=a dynamic resource editor for X Toolkit applications
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/editres
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.8.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=c33e70745a3eda9504e6e2a1a7710566
+_md5_=90823992610c6951c859cca21bf376b8
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.8-r1 b/metadata/md5-cache/x11-apps/iceauth-1.0.8-r1
deleted file mode 100644
index 176e3a37cea9..000000000000
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libICE x11-base/xorg-proto
-DESCRIPTION=ICE authority file utility
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/iceauth
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libICE
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/iceauth-1.0.8.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=08c4ee5dd9154e8a5575c1989a5979ef
diff --git a/metadata/md5-cache/x11-apps/iceauth-1.0.9 b/metadata/md5-cache/x11-apps/iceauth-1.0.9
index f349194b3865..57e598700866 100644
--- a/metadata/md5-cache/x11-apps/iceauth-1.0.9
+++ b/metadata/md5-cache/x11-apps/iceauth-1.0.9
@@ -5,10 +5,10 @@ DESCRIPTION=ICE authority file utility
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/iceauth
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libICE
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/iceauth-1.0.9.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=59679214f4554d4265e48ab392771f1c
+_md5_=35e73b8ca47f378b757e659c3a986e65
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.4 b/metadata/md5-cache/x11-apps/listres-1.0.4
deleted file mode 100644
index c093ac583b73..000000000000
--- a/metadata/md5-cache/x11-apps/listres-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-DESCRIPTION=list resources in widgets
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/listres
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/listres-1.0.4.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=5aaf3361590ce1874cb8fd2a44cff4c1
diff --git a/metadata/md5-cache/x11-apps/listres-1.0.5 b/metadata/md5-cache/x11-apps/listres-1.0.5
index a3920be3f7dc..84e25ee7be57 100644
--- a/metadata/md5-cache/x11-apps/listres-1.0.5
+++ b/metadata/md5-cache/x11-apps/listres-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=list resources in widgets
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/listres
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/listres-1.0.5.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=5175deeae8963ebfc76a716af548f75f
+_md5_=283faf48dffc6d9c1ae40a77c0b2d249
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-8.5.0 b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
new file mode 100644
index 000000000000..27f4377207ba
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/mesa-progs-8.5.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install setup test
+DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-protocols-1.12 ) X? ( x11-base/xorg-proto )
+DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
+EAPI=8
+HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos
+INHERIT=meson-multilib
+IUSE=gles2 wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://mesa.freedesktop.org/archive/demos/mesa-demos-8.5.0.tar.bz2 https://mesa.freedesktop.org/archive/demos/8.5.0/mesa-demos-8.5.0.tar.bz2
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50a4c8ee454f17974dcb5da19417c64a
diff --git a/metadata/md5-cache/x11-apps/mesa-progs-9999 b/metadata/md5-cache/x11-apps/mesa-progs-9999
index b4c0df7718b3..ea7f6f357078 100644
--- a/metadata/md5-cache/x11-apps/mesa-progs-9999
+++ b/metadata/md5-cache/x11-apps/mesa-progs-9999
@@ -1,14 +1,14 @@
-BDEPEND=sys-apps/grep sys-apps/file sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=media-libs/mesa[egl(+)?,gles2?] virtual/opengl x11-libs/libX11 virtual/glu x11-base/xorg-proto
+BDEPEND=virtual/pkgconfig wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install setup test unpack
+DEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-protocols-1.12 ) X? ( x11-base/xorg-proto )
 DESCRIPTION=Mesa's OpenGL utility and demo programs (glxgears and glxinfo)
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos
-INHERIT=autotools git-r3
-IUSE=egl gles2
+INHERIT=meson-multilib git-r3
+IUSE=gles2 wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=LGPL-2
 PROPERTIES=live
-RDEPEND=media-libs/mesa[egl(+)?,gles2?] virtual/opengl x11-libs/libX11
+RDEPEND=media-libs/mesa[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl(+),gles2?,wayland?,X?] wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=a9386b3607cbb344632c84cd4d59d942
+_eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=50a4c8ee454f17974dcb5da19417c64a
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.2.1 b/metadata/md5-cache/x11-apps/mkfontscale-1.2.1
deleted file mode 100644
index 03ae5f3bc85d..000000000000
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libfontenc media-libs/freetype:2 sys-libs/zlib app-arch/bzip2 x11-base/xorg-proto
-DESCRIPTION=create an index of scalable font files for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfontscale
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libfontenc media-libs/freetype:2 sys-libs/zlib app-arch/bzip2 !<x11-apps/mkfontdir-1.2.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/mkfontscale-1.2.1.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3663118c3287b42862275d3443266c83
diff --git a/metadata/md5-cache/x11-apps/mkfontscale-1.2.2 b/metadata/md5-cache/x11-apps/mkfontscale-1.2.2
index 17d7c337914a..e5ec8d590080 100644
--- a/metadata/md5-cache/x11-apps/mkfontscale-1.2.2
+++ b/metadata/md5-cache/x11-apps/mkfontscale-1.2.2
@@ -5,10 +5,10 @@ DESCRIPTION=create an index of scalable font files for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/mkfontscale
 INHERIT=xorg-3
-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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libfontenc media-libs/freetype:2 sys-libs/zlib app-arch/bzip2
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/mkfontscale-1.2.2.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=a65b1594d98348773232575c0a102a6a
+_md5_=7ec8e66e447944a92c70da581909be2d
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1 b/metadata/md5-cache/x11-apps/rstart-1.0.5-r1
deleted file mode 100644
index 5f1e335343a3..000000000000
--- a/metadata/md5-cache/x11-apps/rstart-1.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-base/xorg-proto
-DESCRIPTION=X.Org rstart application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rstart
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/rstart-1.0.5.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=8d27f6d826138f00378c0000b7cc1a19
diff --git a/metadata/md5-cache/x11-apps/rstart-1.0.6 b/metadata/md5-cache/x11-apps/rstart-1.0.6
index da42a8fa53bc..ea19c7343ca3 100644
--- a/metadata/md5-cache/x11-apps/rstart-1.0.6
+++ b/metadata/md5-cache/x11-apps/rstart-1.0.6
@@ -5,9 +5,9 @@ DESCRIPTION=X.Org rstart application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rstart
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~mips ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/rstart-1.0.6.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=f8b0243d5327677e5f0792e7186ba4a8
+_md5_=aadc77f7ff3c6fe8719cf81c47e1300e
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
deleted file mode 100644
index 8962edcf88db..000000000000
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=Controls the keyboard layout of a running X server
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/setxkbmap
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=b032340771b825fdde982708bda9f0fb
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.3 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.3
index 237d67eb0500..1f11f4ee96fb 100644
--- a/metadata/md5-cache/x11-apps/setxkbmap-1.3.3
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.3
@@ -5,10 +5,10 @@ DESCRIPTION=Controls the keyboard layout of a running X server
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/setxkbmap
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-libs/libXrandr x11-misc/xkeyboard-config
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=ad5e65e5fd3f0171e4b4d8fc4f1efdc6
+_md5_=74c9c7edff05efe10abce0531f9d8888
diff --git a/metadata/md5-cache/x11-apps/xauth-1.1.1 b/metadata/md5-cache/x11-apps/xauth-1.1.1
deleted file mode 100644
index 6de974a202b2..000000000000
--- a/metadata/md5-cache/x11-apps/xauth-1.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu x11-base/xorg-proto
-DESCRIPTION=X authority file utility
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xauth
-INHERIT=xorg-3
-IUSE=ipv6
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xauth-1.1.1.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=03c9cf50320e4be82975f75a6f5e4ff2
diff --git a/metadata/md5-cache/x11-apps/xauth-1.1.2 b/metadata/md5-cache/x11-apps/xauth-1.1.2
index a8c9bfb5bede..5554b7750dc7 100644
--- a/metadata/md5-cache/x11-apps/xauth-1.1.2
+++ b/metadata/md5-cache/x11-apps/xauth-1.1.2
@@ -5,10 +5,10 @@ DESCRIPTION=X authority file utility
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xauth
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXmu
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xauth-1.1.2.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=47f66312f08fe2ce541d68ad59c815f1
+_md5_=c831f309ef478ba3ede68fef0faccb59
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.1.0 b/metadata/md5-cache/x11-apps/xcalc-1.1.0
deleted file mode 100644
index 6f0e9a618dfd..000000000000
--- a/metadata/md5-cache/x11-apps/xcalc-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11 x11-base/xorg-proto
-DESCRIPTION=scientific calculator for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcalc
-INHERIT=xorg-3
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xcalc-1.1.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3d085b1f0a8f7c31e004e9110a625419
diff --git a/metadata/md5-cache/x11-apps/xcalc-1.1.1 b/metadata/md5-cache/x11-apps/xcalc-1.1.1
index 874918b8e769..0ab5b1a7c42a 100644
--- a/metadata/md5-cache/x11-apps/xcalc-1.1.1
+++ b/metadata/md5-cache/x11-apps/xcalc-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=scientific calculator for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xcalc
 INHERIT=xorg-3
-KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xcalc-1.1.1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=45395a33a7371e87f71beb39bc78f2f8
+_md5_=eb686eff2c82f8e3e3ddc5bf885f2ab0
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.9 b/metadata/md5-cache/x11-apps/xclock-1.0.9
deleted file mode 100644
index d2a080f21a28..000000000000
--- a/metadata/md5-cache/x11-apps/xclock-1.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw x11-base/xorg-proto
-DESCRIPTION=analog / digital clock for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclock
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xclock-1.0.9.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=caeb4809e3e8cd997fe452c0f6274063
diff --git a/metadata/md5-cache/x11-apps/xclock-1.1.0 b/metadata/md5-cache/x11-apps/xclock-1.1.0
deleted file mode 100644
index f8a8ddb42b0c..000000000000
--- a/metadata/md5-cache/x11-apps/xclock-1.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw x11-base/xorg-proto
-DESCRIPTION=analog / digital clock for X
-EAPI=8
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclock
-INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xclock-1.1.0.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=0eadf86abd6e74b7501535532292bfff
diff --git a/metadata/md5-cache/x11-apps/xclock-1.1.1 b/metadata/md5-cache/x11-apps/xclock-1.1.1
index 086cc1408765..be968be15dcf 100644
--- a/metadata/md5-cache/x11-apps/xclock-1.1.1
+++ b/metadata/md5-cache/x11-apps/xclock-1.1.1
@@ -5,10 +5,10 @@ DESCRIPTION=analog / digital clock for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclock
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xclock-1.1.1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=7b7b7190d79db2413c92f4cff45a8cc2
+_md5_=38eea51e87fb1d4bbb7e47451d4b6eb5
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.12-r1 b/metadata/md5-cache/x11-apps/xdm-1.1.12-r1
deleted file mode 100644
index 08dc5ec4e32f..000000000000
--- a/metadata/md5-cache/x11-apps/xdm-1.1.12-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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps/xsm x11-libs/libX11 x11-libs/libXaw x11-libs/libXdmcp x11-libs/libXmu x11-libs/libXt virtual/libcrypt:= pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-209 ) truetype? ( x11-libs/libXrender x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) elibc_glibc? ( dev-libs/libbsd ) x11-base/xorg-proto
-DESCRIPTION=X.Org xdm application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdm
-INHERIT=xorg-3 pam systemd
-IUSE=ipv6 pam systemd truetype xinerama xpm
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps/xsm x11-libs/libX11 x11-libs/libXaw x11-libs/libXdmcp x11-libs/libXmu x11-libs/libXt virtual/libcrypt:= pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-209 ) truetype? ( x11-libs/libXrender x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) elibc_glibc? ( dev-libs/libbsd )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdm-1.1.12.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=a8afb7d2654608ffda12fc130783aa08
diff --git a/metadata/md5-cache/x11-apps/xdm-1.1.13 b/metadata/md5-cache/x11-apps/xdm-1.1.13
index 1a7ea31f8801..f7d644c438d0 100644
--- a/metadata/md5-cache/x11-apps/xdm-1.1.13
+++ b/metadata/md5-cache/x11-apps/xdm-1.1.13
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdm
 INHERIT=xorg-3 pam systemd
 IUSE=ipv6 pam systemd truetype xinerama xpm
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-apps/sessreg x11-apps/xconsole x11-apps/xinit x11-apps/xrdb x11-apps/xsm x11-libs/libX11 x11-libs/libXaw x11-libs/libXdmcp x11-libs/libXmu x11-libs/libXt virtual/libcrypt:= pam? ( sys-libs/pam ) systemd? ( >=sys-apps/systemd-209 ) truetype? ( x11-libs/libXrender x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) xpm? ( x11-libs/libXpm ) elibc_glibc? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdm-1.1.13.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=9bc9d0dd020790b0f11c0946d70218a3
+_md5_=82d714175959d38513385cbdc5472375
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1
deleted file mode 100644
index 066037a53ddb..000000000000
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
-DESCRIPTION=Display information utility for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
-INHERIT=xorg-3
-IUSE=dga dmx xinerama
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.2.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3dd9ad813158f818ce9c1f0b9d04cd13
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.3 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.3
index 0f435e1e9cb9..5c3b1aa4e68c 100644
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.3
+++ b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
 INHERIT=xorg-3
 IUSE=dga dmx xinerama
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
 LICENSE=MIT
 RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=6500127cb62e0d8371d00b83c0416725
+_md5_=480ccce5668bd777ae2c3b5923e72dbf
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.2 b/metadata/md5-cache/x11-apps/xedit-1.2.2
deleted file mode 100644
index ed35a1432cab..000000000000
--- a/metadata/md5-cache/x11-apps/xedit-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
-DESCRIPTION=simple text editor for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xedit
-INHERIT=xorg-3
-KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.2.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=90d6d92036fdcdc3b784fbe2ea9e1c5c
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.3 b/metadata/md5-cache/x11-apps/xedit-1.2.3
index 20d90f84c9b8..56c10247acba 100644
--- a/metadata/md5-cache/x11-apps/xedit-1.2.3
+++ b/metadata/md5-cache/x11-apps/xedit-1.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=simple text editor for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xedit
 INHERIT=xorg-3
-KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc ~ppc64 sparc x86
+KEYWORDS=amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3630bf44cd517c037c923ff2921d3a23
+_md5_=aca875d35ea486f5ef1d842d094a10be
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.3 b/metadata/md5-cache/x11-apps/xload-1.1.3
deleted file mode 100644
index 12eb38b0e9c5..000000000000
--- a/metadata/md5-cache/x11-apps/xload-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-DESCRIPTION=system load average display for X
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xload
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.3.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=9d3303417c611eae2499a968c907284c
diff --git a/metadata/md5-cache/x11-apps/xload-1.1.4 b/metadata/md5-cache/x11-apps/xload-1.1.4
index 27e4b20a1f76..c8304082ad52 100644
--- a/metadata/md5-cache/x11-apps/xload-1.1.4
+++ b/metadata/md5-cache/x11-apps/xload-1.1.4
@@ -5,10 +5,10 @@ DESCRIPTION=system load average display for X
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xload
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xload-1.1.4.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=b6e12b006e8f5d5dc8f58ab3ca3ffec6
+_md5_=17223017fa0f8daf250ace3a15a1922a
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.6
deleted file mode 100644
index ce3ea2557c4f..000000000000
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libX11
-DESCRIPTION=X.Org xlsfonts application
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xlsfonts
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.6.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=037a4a3365358d698e15b135f746eb06
diff --git a/metadata/md5-cache/x11-apps/xlsfonts-1.0.7 b/metadata/md5-cache/x11-apps/xlsfonts-1.0.7
index 4455e4221b7e..63d905f7358b 100644
--- a/metadata/md5-cache/x11-apps/xlsfonts-1.0.7
+++ b/metadata/md5-cache/x11-apps/xlsfonts-1.0.7
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org xlsfonts application
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xlsfonts
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=x11-libs/libX11
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xlsfonts-1.0.7.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=6f2915c253b14d4e83de2cfaf4611a4a
+_md5_=6fffbe752cb9b704e26176ec83540076
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.4 b/metadata/md5-cache/x11-apps/xsm-1.0.4
deleted file mode 100644
index 7c56128f23c4..000000000000
--- a/metadata/md5-cache/x11-apps/xsm-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM
-DESCRIPTION=X Session Manager
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsm
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.4.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=6bb321fe8d66679a19debb8a352f27c8
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.5 b/metadata/md5-cache/x11-apps/xsm-1.0.5
index 6a7fc22bfae9..71001a8fe8c8 100644
--- a/metadata/md5-cache/x11-apps/xsm-1.0.5
+++ b/metadata/md5-cache/x11-apps/xsm-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=X Session Manager
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsm
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.5.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=1840fad5bc18f8af646d89de7c379b12
+_md5_=fc463a39e371a5f40312678eac006b70
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index c094ec16215d..fc429feb77e6 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2021.5 b/metadata/md5-cache/x11-base/xorg-proto-2021.5
deleted file mode 100644
index fe6a86d14063..000000000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2021.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=test? ( || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/python-libevdev[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/python-libevdev[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/python-libevdev[python_targets_python3_8(-)] ) ) )
-DESCRIPTION=X.Org combined protocol headers
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-INHERIT=meson python-any-r1
-IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2021.5.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0f28da2dc798a2e12f57839d75fd23f5
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2022.1 b/metadata/md5-cache/x11-base/xorg-proto-2022.1
index d91008fc2508..3ead38277e06 100644
--- a/metadata/md5-cache/x11-base/xorg-proto-2022.1
+++ b/metadata/md5-cache/x11-base/xorg-proto-2022.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
 INHERIT=meson python-any-r1
 IUSE=test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2022.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=08eadf1206d0d7c4d00f3c1506a6a108
+_md5_=111d47324449f4af757ec0e8b47e562b
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r1 b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r1
deleted file mode 100644
index bc3f74a9c1d2..000000000000
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=sys-devel/flex sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 media-fonts/font-util
-DESCRIPTION=X.Org X servers
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-INHERIT=xorg-3 meson
-IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
-RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-REQUIRED_USE=!minimal? ( || ( xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd )
-RESTRICT=!test? ( test )
-SLOT=0/21.1.3
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.3.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=004b44f0c2b86175a0daf38d22d23b10
diff --git a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r2 b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
index 7f90378ba182..e6eed1a2797a 100644
--- a/metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
+++ b/metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
 INHERIT=xorg-3 meson
 IUSE=xephyr xnest xorg xvfb debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 PDEPEND=xorg? ( >=x11-base/xorg-drivers-21.1 )
 RDEPEND=media-libs/libglvnd[X] dev-libs/libbsd dev-libs/openssl:0= >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxcvt-0.1.0 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 >=x11-libs/libXext-1.0.5 x11-libs/libXv xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl(+),gbm(+)] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind:= ) selinux? ( sys-process/audit sys-libs/libselinux:= ) systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind[pam] sys-auth/pambase[elogind] ) !!x11-drivers/nvidia-drivers[-libglvnd(+)] !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) xorg? ( >=x11-apps/xinit-1.3.3-r1 )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/21.1.3
 SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-21.1.3.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=58ac82e105172639c847f2f724c6e4bf
+_md5_=106e72291c2560edc2e3de25f0ae97f7
diff --git a/metadata/md5-cache/x11-base/xorg-sgml-doctools-1.11 b/metadata/md5-cache/x11-base/xorg-sgml-doctools-1.11
deleted file mode 100644
index 72ac44f5d679..000000000000
--- a/metadata/md5-cache/x11-base/xorg-sgml-doctools-1.11
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-misc/util-macros
-DESCRIPTION=SGML entities and XML/CSS stylesheets used in X.Org docs
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/doc/xorg-sgml-doctools
-INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/doc/xorg-sgml-doctools-1.11.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=71aeb1eb3de3f6984bc6847120e7f438
diff --git a/metadata/md5-cache/x11-base/xwayland-21.1.4 b/metadata/md5-cache/x11-base/xwayland-21.1.4
deleted file mode 100644
index 4e3351d8d253..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-21.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= >=dev-libs/wayland-1.20 video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=>=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 dev-libs/openssl:= >=dev-libs/wayland-1.20 video_cards_nvidia? ( gui-libs/egl-wayland ) >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libdrm-2.4.89 >=media-libs/libepoxy-1.5.4[X,egl(+)] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libxshmfence-1.1 >=x11-libs/libXau-1.0.4 media-libs/libglvnd[X] unwind? ( sys-libs/libunwind ) >=dev-libs/wayland-protocols-1.18 media-fonts/font-util x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto >=x11-misc/xkeyboard-config-2.4.1-r3 x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-21.1.4.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=082c4b56d8bf96de1dff9cab3d5f5c29
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.0 b/metadata/md5-cache/x11-base/xwayland-22.1.0
deleted file mode 100644
index 4b8c77fe204c..000000000000
--- a/metadata/md5-cache/x11-base/xwayland-22.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex dev-util/wayland-scanner >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-base/xorg-proto >=x11-libs/xtrans-1.3.5
-DESCRIPTION=Standalone X server running under Wayland
-EAPI=7
-HOMEPAGE=https://wayland.freedesktop.org/xserver.html
-INHERIT=meson
-IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.0.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=18f61bf621b4c4cc366b9699d7e67914
diff --git a/metadata/md5-cache/x11-base/xwayland-22.1.1 b/metadata/md5-cache/x11-base/xwayland-22.1.1
index 4f2b6af10706..dc6b794fc8e3 100644
--- a/metadata/md5-cache/x11-base/xwayland-22.1.1
+++ b/metadata/md5-cache/x11-base/xwayland-22.1.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://wayland.freedesktop.org/xserver.html
 INHERIT=meson
 IUSE=selinux video_cards_nvidia unwind xcsecurity
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-libs/libbsd dev-libs/openssl:= >=dev-libs/wayland-1.20 >=dev-libs/wayland-protocols-1.22 media-fonts/font-util >=media-libs/libepoxy-1.5.4[X,egl(+)] media-libs/libglvnd[X] >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] >=x11-libs/libdrm-2.4.89 >=x11-libs/libXau-1.0.4 x11-libs/libxcvt >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 x11-libs/libxkbfile >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-misc/xkeyboard-config-2.4.1-r3 unwind? ( sys-libs/libunwind ) video_cards_nvidia? ( gui-libs/egl-wayland ) x11-apps/xkbcomp !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver )
 SLOT=0
 SRC_URI=https://xorg.freedesktop.org/archive/individual/xserver/xwayland-22.1.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=f140dac58a2432041888b7392ec57e26
+_md5_=519aa5e1976cf181b4f624caadf46611
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 739c86faf2d5..210207840012 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.151 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
index 8659228beae8..71c7dcbd0674 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.151/NVIDIA-Linux-x86_64-390.151.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.151/NVIDIA-Linux-x86-390.151.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.151.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.151.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.151.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.151.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.151.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=7501ea92242a05a9fc430f6a031e4447
+_md5_=643294862f3d65668b9bf0df088dfa26
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
index 6bff9e0b3907..01295bc893ef 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/470
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.129.06/NVIDIA-Linux-x86_64-470.129.06.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.129.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.129.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.129.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.129.06.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.129.06.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=1cf93982f2600661c9e204abc672c6cd
+_md5_=6eaefca8003975492dba06f0da1cc1c4
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
index 7159f33fffd8..55b3d6e0e7e2 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/vulkan
 SRC_URI=https://developer.nvidia.com/vulkan-beta-4706230-linux -> NVIDIA-Linux-x86_64-470.62.30.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.103.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.103.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.103.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-470.103.01.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.103.01.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=c31d5ce68b2ee640b5e2e9c68a49b05b
+_md5_=f42ed92ecd0a37b65810ef6ddb5c8ea5
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05 b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05
index 7ae0960af44d..cde7e04e391a 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc X? ( x11-libs/libpciaccess ) persistence
 SLOT=0/510
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/510.73.05/NVIDIA-Linux-x86_64-510.73.05.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/510.73.05/NVIDIA-Linux-aarch64-510.73.05.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-510.73.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-510.73.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-510.73.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-510.73.05.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-510.73.05.tar.bz2
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=60e1b67e740d07a994a8505d9ee7d9a0
+_md5_=e294484cb6d175b3569307dd1de20232
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04 b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04
index df4c9c8a8046..a4eb66913b60 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04
@@ -12,4 +12,4 @@ REQUIRED_USE=kernel-open? ( driver )
 SLOT=0/515
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/515.43.04/NVIDIA-Linux-x86_64-515.43.04.run ) arm64? ( https://download.nvidia.com/XFree86/Linux-aarch64/515.43.04/NVIDIA-Linux-aarch64-515.43.04.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-515.43.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-515.43.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-515.43.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-515.43.04.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-515.43.04.tar.bz2 https://download.nvidia.com/XFree86/NVIDIA-kernel-module-source/NVIDIA-kernel-module-source-515.43.04.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	linux-mod	6664f4f4bab4499208eeb02eb4dddf1d	multilib	4fbbbc98f236f1b43acd99476bc3cd85	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=b6d927500c26d97a2aa2faca38d10611
+_md5_=473714bc3ddd02d431d11d8691b61094
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-wacom-1.0.0 b/metadata/md5-cache/x11-drivers/xf86-input-wacom-1.0.0
new file mode 100644
index 000000000000..7490a06b5fd1
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/xf86-input-wacom-1.0.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=dev-libs/libwacom-2:= >=x11-base/xorg-server-1.13:= x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama virtual/libudev:= x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
+DESCRIPTION=Driver for Wacom tablets and drawing devices
+EAPI=8
+HOMEPAGE=https://linuxwacom.github.io/
+INHERIT=linux-info systemd udev xorg-3 meson
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libwacom-2:= >=x11-base/xorg-server-1.13:= x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXinerama virtual/libudev:= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-1.0.0/xf86-input-wacom-1.0.0.tar.bz2
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	dcbf4f67bc38bee48e9d69a4344e8059	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xorg-3	17094cfaab5d74475cc6d251157087b8
+_md5_=c3de6d2e2c30d6443cd1dd1e6b2db4c6
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0
deleted file mode 100644
index ac1fd887fe3b..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0
+++ /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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-proto x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-DESCRIPTION=Accelerated Open Source driver for AMDGPU cards
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
-INHERIT=xorg-3
-IUSE=udev
-KEYWORDS=amd64 ppc64 ~riscv x86
-LICENSE=MIT
-RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-21.0.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=de4dd71f9e71404c2e4cd45f86cab45f
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0 b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0
index 5a127a54e93e..02a61c3b09da 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu
 INHERIT=xorg-3
 IUSE=udev
-KEYWORDS=amd64 ~loong ~ppc64 ~riscv x86
+KEYWORDS=amd64 ~loong ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=x11-libs/libdrm-2.4.89[video_cards_amdgpu] x11-base/xorg-server[-minimal] udev? ( virtual/libudev:= ) x11-base/xorg-server:= x11-base/xorg-server[-minimal] x11-libs/libdrm >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-amdgpu-22.0.0.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=d4748f586772f87f8aa259b57be4e669
+_md5_=5430bca30965aacd5953b8c6569c088b
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
deleted file mode 100644
index 06fe097b1774..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
+++ /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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-base/xorg-server dga? ( x11-base/xorg-proto ) x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-DESCRIPTION=X.Org driver for dummy cards
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
-INHERIT=xorg-3
-IUSE=dga
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-base/xorg-server x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=34f6fbeb046a9fc226cc664e1cc8dbca
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0 b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0
index 74c2b2c05a1f..e99f5bacdee6 100644
--- a/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0
+++ b/metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org driver for dummy cards
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/driver/xf86-video-dummy-0.4.0.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=ea0e1f06a2c16fd9bc17b4430a270384
+_md5_=89927ca89afb2a092e14cb4e58846c7e
diff --git a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205 b/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
deleted file mode 100644
index d457b09197f9..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=xspice? ( app-emulation/spice python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 >=app-emulation/spice-protocol-0.12.0 x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-DESCRIPTION=QEMU QXL paravirt video driver
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-video-qxl
-INHERIT=autotools python-single-r1 xorg-3
-IUSE=xspice python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=xspice? ( app-emulation/spice python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) ) x11-base/xorg-server[-minimal] >=x11-libs/libdrm-2.4.46 x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg] >=x11-libs/libpciaccess-0.14
-REQUIRED_USE=xspice? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slashbeast/distfiles/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=16abdcfd742ce24630845cd2fc9ea196
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index c408906c5317..e654779ebf58 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
index 18adb10f732f..0ca5b180b219 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gdk-pixbuf
 INHERIT=gnome.org gnome2-utils meson-multilib multilib xdg
 IUSE=gtk-doc +introspection jpeg tiff 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 ~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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.56.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info >=media-libs/libpng-1.4: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(-)?] jpeg? ( virtual/jpeg: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) gtk-doc? ( >=dev-util/gi-docgen-2021.1 ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.42/gdk-pixbuf-2.42.8.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f3b7c754863de222a39281777b38b0e
+_md5_=28534dc3f28429c7adf145b5bc74eb4b
diff --git a/metadata/md5-cache/x11-libs/goffice-0.10.52 b/metadata/md5-cache/x11-libs/goffice-0.10.52
index 98754f10fd2a..54e2416fcabd 100644
--- a/metadata/md5-cache/x11-libs/goffice-0.10.52
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.52
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
 INHERIT=gnome.org libtool
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
 SLOT=0.10
 SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.52.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=436900c1a3ba74fa81ff663df38bbdcc
+_md5_=def04848b497fe93b020da0455657f51
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.24.34 b/metadata/md5-cache/x11-libs/gtk+-3.24.34
index 9a37c8c12f27..4da64aa21bfa 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.24.34
+++ b/metadata/md5-cache/x11-libs/gtk+-3.24.34
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gtk.org/
 INHERIT=gnome2 multilib multilib-minimal virtualx
 IUSE=aqua broadway colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama 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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 PDEPEND=gnome-base/librsvg[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-themes/adwaita-icon-theme-3.14 vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=>=dev-libs/atk-2.32.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-0.19.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.57.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/fontconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.2.0:= >=media-libs/libepoxy-1.4[X(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.44.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/shared-mime-info colord? ( >=x11-misc/colord-0.1.9: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(-)?] ) cups? ( >=net-print/cups-2.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.39:= ) sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.14.91[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.17 media-libs/mesa[wayland,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxkbcommon-0.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=app-accessibility/at-spi2-atk-2.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/mesa[X(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXdamage[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=dev-util/gtk-update-icon-cache-3 !<x11-libs/vte-0.31.0:2.90
@@ -15,4 +15,4 @@ RESTRICT=test
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.24/gtk+-3.24.34.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4759ddc591696b88747aa67ac3d21ac1
+_md5_=5df279d5a64ca5c42c41e1ca92afa823
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.3 b/metadata/md5-cache/x11-libs/libX11-1.7.3
deleted file mode 100644
index 06c7d9a1df07..000000000000
--- a/metadata/md5-cache/x11-libs/libX11-1.7.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org X11 library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
-INHERIT=toolchain-funcs xorg-3
-IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-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
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.3.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=f8f82c76f4929d1ba77a8b4fac44697d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.4 b/metadata/md5-cache/x11-libs/libX11-1.7.4
deleted file mode 100644
index ec57396d0d19..000000000000
--- a/metadata/md5-cache/x11-libs/libX11-1.7.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-lang/perl ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables x11-base/xorg-proto x11-libs/xtrans
-DESCRIPTION=X.Org X11 library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
-INHERIT=toolchain-funcs xorg-3
-IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-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
-LICENSE=MIT
-RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.4.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=d9fde6c758b174631234ae5bd4cba3ec
diff --git a/metadata/md5-cache/x11-libs/libX11-1.7.5 b/metadata/md5-cache/x11-libs/libX11-1.7.5
index ad65ddc1d05f..08405e037ad5 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.7.5
+++ b/metadata/md5-cache/x11-libs/libX11-1.7.5
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
 INHERIT=toolchain-funcs xorg-3
 IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-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
+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
 LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.5.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=3db14ce6ccae717308eff3075409a575
+_md5_=a658b0f090c9f636bc1ec04f0c5fef5e
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.2.0 b/metadata/md5-cache/x11-libs/libXcursor-1.2.0
deleted file mode 100644
index 04a4ea69e1f7..000000000000
--- a/metadata/md5-cache/x11-libs/libXcursor-1.2.0
+++ /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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[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=X.Org Xcursor library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXcursor
-INHERIT=xorg-3
-IUSE=doc 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXcursor-1.2.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=ab8fa0a39f4af6dd8804e813ae885f59
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.2.1 b/metadata/md5-cache/x11-libs/libXcursor-1.2.1
index c42c57b57412..fd7688bffc22 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.2.1
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.2.1
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXcursor
 INHERIT=xorg-3
 IUSE=doc 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXcursor-1.2.1.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=cff2c1652ca89310228f7d76b73839ee
+_md5_=2227f1142c6c708ac2297054ee5c0527
diff --git a/metadata/md5-cache/x11-libs/libXt-1.2.0 b/metadata/md5-cache/x11-libs/libXt-1.2.0
deleted file mode 100644
index f15a92b849f5..000000000000
--- a/metadata/md5-cache/x11-libs/libXt-1.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto test? ( dev-libs/glib[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=X.Org X Toolkit Intrinsics library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXt
-INHERIT=xorg-3
-IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 doc
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt
-LICENSE=MIT
-RDEPEND=>=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXt-1.2.0.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=c87909239a089ca5ea31980e7299ceb9
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.12-r1 b/metadata/md5-cache/x11-libs/libXvMC-1.0.12-r1
deleted file mode 100644
index c6a9613ade1d..000000000000
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.12-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 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2 x11-base/xorg-proto
-DESCRIPTION=X.Org XvMC library
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXvMC
-INHERIT=xorg-3
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<x11-base/xorg-proto-2019.2
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libXvMC-1.0.12.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=8ea4822f92c469146e34e40afd6d2562
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.13 b/metadata/md5-cache/x11-libs/libXvMC-1.0.13
index 9b1223c66abb..0c5b3b68336d 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.13
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.13
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libXvMC
 INHERIT=xorg-3 meson-multilib
 IUSE=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 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libXvMC-1.0.13.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=62b5fe58d40ffc9b4e1ebb9734bdf5d8
+_md5_=166e4b3a505c1bf701ca5d74f0583759
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.109 b/metadata/md5-cache/x11-libs/libdrm-2.4.109
deleted file mode 100644
index fc71c6db5620..000000000000
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.109
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind )
-DESCRIPTION=X.Org libdrm library
-EAPI=7
-HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
-INHERIT=python-any-r1 meson-multilib
-IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.109.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=7f3ab9b6108a73396091c921387c1d4a
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.110 b/metadata/md5-cache/x11-libs/libdrm-2.4.110
index 3e8f20214a93..91dc9343d47e 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.110
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.110
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm
 INHERIT=python-any-r1 meson-multilib
 IUSE=video_cards_amdgpu video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_tegra video_cards_vc4 video_cards_vivante video_cards_vmware libkms valgrind 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://dri.freedesktop.org/libdrm/libdrm-2.4.110.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=ad39667d7786a487f0756b74b9a57139
+_md5_=078a1c4e3f6c8cfd15fe96295bbdae8d
diff --git a/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.2 b/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.2
new file mode 100644
index 000000000000..db2069d6d7a8
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=media-libs/gmmlib-22.0.0:= >=x11-libs/libva-2.14.0[X?]
+DESCRIPTION=Intel Media Driver for VAAPI (iHD)
+EAPI=8
+HOMEPAGE=https://github.com/intel/media-driver
+INHERIT=cmake
+IUSE=+redistributable test X
+KEYWORDS=~amd64
+LICENSE=MIT BSD redistributable? ( no-source-code )
+RDEPEND=>=media-libs/gmmlib-22.0.0:= >=x11-libs/libva-2.14.0[X?]
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/intel/media-driver/archive/intel-media-22.4.2.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=100b7bea6e934880fbf531dcb3928803
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.3.1 b/metadata/md5-cache/x11-libs/libxkbcommon-1.3.1
deleted file mode 100644
index 824f3fe1a0e1..000000000000
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison doc? ( app-doc/doxygen ) test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) ) wayland? ( dev-util/wayland-scanner ) >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables X? ( x11-base/xorg-proto ) wayland? ( >=dev-libs/wayland-protocols-1.12 )
-DESCRIPTION=keymap handling library for toolkits and window systems
-EAPI=7
-HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
-INHERIT=meson-multilib python-any-r1 virtualx
-IUSE=doc static-libs test wayland X 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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.3.1.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=60b93075503dbb969e901e80ef7a3c42
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0 b/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
index 62ccfe2b7eee..3fd711a3fbcd 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/
 INHERIT=meson-multilib python-any-r1 virtualx
 IUSE=doc static-libs test tools wayland X 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
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libxcb-1.10:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,xkb] ) wayland? ( >=dev-libs/wayland-1.2.0 ) dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-misc/compose-tables
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://xkbcommon.org/download/libxkbcommon-1.4.0.tar.xz
 _eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	virtualx	975d49ff3b3f451efe7a95f230532135
-_md5_=51cac25dc7ac9679aa235167b6da825c
+_md5_=17e3cb3db5caf922ddd34829e100903a
diff --git a/metadata/md5-cache/x11-libs/pango-1.50.7 b/metadata/md5-cache/x11-libs/pango-1.50.7
index e8c9ea2eaa24..cd81d47ba5a0 100644
--- a/metadata/md5-cache/x11-libs/pango-1.50.7
+++ b/metadata/md5-cache/x11-libs/pango-1.50.7
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.pango.org/ https://gitlab.gnome.org/GNOME/pango
 INHERIT=flag-o-matic gnome2-utils meson-multilib xdg
 IUSE=debug +introspection sysprof X 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.62.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/fribidi-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-2.6.0:=[glib(+),introspection?,truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.13.0:1.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(-)?] >=x11-libs/cairo-1.12.10:=[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 SRC_URI=http://ftp.gnome.org/pub/GNOME/sources/pango/1.50/pango-1.50.7.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multilib-build	05f207909a804c9174bc39a00547d598	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba27155c833ea04dda1e1b268e6fe88a
+_md5_=eafcf2ec9f2aafac4eb1648b3de50e8c
diff --git a/metadata/md5-cache/x11-libs/vte-0.68.0 b/metadata/md5-cache/x11-libs/vte-0.68.0
index c5a164b4df7c..2e7d4c9e9fb1 100644
--- a/metadata/md5-cache/x11-libs/vte-0.68.0
+++ b/metadata/md5-cache/x11-libs/vte-0.68.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOME/vte
 INHERIT=gnome.org meson python-any-r1 vala xdg
 IUSE=+crypt debug gtk-doc +icu +introspection systemd +vala vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3+ GPL-3+
 RDEPEND=>=x11-libs/gtk+-3.24.22:3[introspection?] >=dev-libs/fribidi-1.0.0 >=dev-libs/glib-2.52:2 crypt? ( >=net-libs/gnutls-3.2.7:0= ) icu? ( dev-libs/icu:= ) >=x11-libs/pango-1.22.0 >=dev-libs/libpcre2-10.21 systemd? ( >=sys-apps/systemd-220:= ) sys-libs/zlib introspection? ( >=dev-libs/gobject-introspection-1.56:= ) x11-libs/pango[introspection?]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=https://gitlab.gnome.org/GNOME/vte/-/archive/0.68.0/vte-0.68.0.tar.bz2 !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/vte-0.68.0-command-notify.patch.xz )
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	vala	9badd41d5aab740ae5ac301c4416c5f8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f33688f89e871458f1bfba2faaaaf3e
+_md5_=42b3551123b5f93130053197baf1361e
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index ae16dd7e4ce1..756884381e05 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/alacarte-3.44.1 b/metadata/md5-cache/x11-misc/alacarte-3.44.1
index 659a4b747fd4..c2e5cd8d1714 100644
--- a/metadata/md5-cache/x11-misc/alacarte-3.44.1
+++ b/metadata/md5-cache/x11-misc/alacarte-3.44.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.gnome.org/GNOME/alacarte
 INHERIT=gnome2 python-single-r1
 IUSE=python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[xml] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) >=gnome-base/gnome-menus-3.5.3:3[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection]
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/alacarte/3.44/alacarte-3.44.1.tar.xz
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f9fce66dfda3c5c785594c79b4f77b31
+_md5_=f6c77ea3919fd580bcdbdf3e55278245
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.3 b/metadata/md5-cache/x11-misc/compose-tables-1.7.3
deleted file mode 100644
index 05909dd7972c..000000000000
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
-DESCRIPTION=X.Org Compose Key tables from libX11
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=!<x11-libs/libX11-1.7.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.3.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=f0e1fae0250bebc667bd7d6e46f1a38a
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.4 b/metadata/md5-cache/x11-misc/compose-tables-1.7.4
deleted file mode 100644
index 4079ea5d4f9f..000000000000
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1 x11-libs/xtrans
-DESCRIPTION=X.Org Compose Key tables from libX11
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
-INHERIT=xorg-3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=MIT
-RDEPEND=!<x11-libs/libX11-1.7.0
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.4.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=890d5106b5eb2a27c3e2f8679adf9c54
diff --git a/metadata/md5-cache/x11-misc/compose-tables-1.7.5 b/metadata/md5-cache/x11-misc/compose-tables-1.7.5
index 8075bd689fbf..2d9fe4474df0 100644
--- a/metadata/md5-cache/x11-misc/compose-tables-1.7.5
+++ b/metadata/md5-cache/x11-misc/compose-tables-1.7.5
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Compose Key tables from libX11
 EAPI=7
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/compose-tables
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=MIT
 RDEPEND=!<x11-libs/libX11-1.7.0
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.7.5.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=94588d2f7c3b1ea24659e9089f85ec01
+_md5_=f0e1fae0250bebc667bd7d6e46f1a38a
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.14 b/metadata/md5-cache/x11-misc/i3lock-2.14
new file mode 100644
index 000000000000..bb4811b7fada
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/i3lock-2.14
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-xrm
+DESCRIPTION=Simple screen locker
+EAPI=8
+HOMEPAGE=https://i3wm.org/i3lock/
+INHERIT=meson
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libev sys-libs/pam x11-libs/cairo[X,xcb(+)] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/xcb-util x11-libs/xcb-util-xrm
+SLOT=0
+SRC_URI=https://i3wm.org/i3lock/i3lock-2.14.tar.xz
+_eclasses_=meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3e21d3c256e7e14d06a6da5b58fc4117
diff --git a/metadata/md5-cache/x11-misc/i855crt-0.4-r1 b/metadata/md5-cache/x11-misc/i855crt-0.4-r1
deleted file mode 100644
index 1119d3d15ac3..000000000000
--- a/metadata/md5-cache/x11-misc/i855crt-0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXv
-DESCRIPTION=Intel Montara 855GM CRT out auxiliary driver
-EAPI=7
-HOMEPAGE=http://i855crt.sourceforge.net/
-INHERIT=toolchain-funcs
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXv
-SLOT=0
-SRC_URI=mirror://sourceforge/i855crt/i855crt-0.4.tar.gz
-_eclasses_=multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=884d2257a0c0f6fe2c2f824d714979e7
diff --git a/metadata/md5-cache/x11-misc/imake-1.0.8 b/metadata/md5-cache/x11-misc/imake-1.0.8
deleted file mode 100644
index 012b44f26627..000000000000
--- a/metadata/md5-cache/x11-misc/imake-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-misc/xorg-cf-files x11-base/xorg-proto
-DESCRIPTION=C preprocessor interface to the make utility
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/imake
-INHERIT=toolchain-funcs xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-misc/xorg-cf-files
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/imake-1.0.8.tar.bz2
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=1c0b85588ac440f78cba365bed91dce7
diff --git a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2 b/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
deleted file mode 100644
index 22e9cb23ce1a..000000000000
--- a/metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile
-DESCRIPTION=X.Org autotools utility macros
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~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=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/util/util-macros-1.19.2.tar.bz2
-_md5_=74c340fbc7fb8a460f5ca055395ce731
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.34 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.34
deleted file mode 100644
index bc532c2ba266..000000000000
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.34
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-lang/perl dev-libs/libxslt sys-devel/gettext >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install setup test
-DESCRIPTION=X keyboard configuration database
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
-INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.34.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=0d6450eee5aa0f888cd3746be6ef84a8
diff --git a/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1 b/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
index 8f30ba224a1c..2029237a9450 100644
--- a/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
+++ b/metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
@@ -4,9 +4,9 @@ DESCRIPTION=X keyboard configuration database
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config
 INHERIT=meson python-any-r1
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-2.35.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=6b3122d490dd3309b94a51ea205ddf25
+_md5_=4a892ae8e20bf93d390dbc7095317eb7
diff --git a/metadata/md5-cache/x11-misc/xscreensaver-6.04 b/metadata/md5-cache/x11-misc/xscreensaver-6.04
new file mode 100644
index 000000000000..e620a9a855aa
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/xscreensaver-6.04
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/intltool sys-devel/bc sys-devel/gettext virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=dev-libs/libxml2 x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) locking? ( virtual/libcrypt:= ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:= ) systemd? ( >=sys-apps/systemd-221 ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto
+DESCRIPTION=Modular screen saver and locker for the X Window System
+EAPI=8
+HOMEPAGE=https://www.jwz.org/xscreensaver/
+INHERIT=autotools flag-o-matic font optfeature pam strip-linguas
+IUSE=elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama X
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD fonts? ( MIT Apache-2.0 )
+RDEPEND=dev-libs/libxml2 x11-apps/appres x11-apps/xwininfo x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86vm elogind? ( sys-auth/elogind ) gdk-pixbuf? ( x11-libs/gdk-pixbuf-xlib >=x11-libs/gdk-pixbuf-2.42.0:2 ) gtk? ( x11-libs/gtk+:2 ) jpeg? ( media-libs/libjpeg-turbo:= ) locking? ( virtual/libcrypt:= ) new-login? ( gdm? ( gnome-base/gdm ) !gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) ) ) opengl? ( virtual/glu virtual/opengl ) pam? ( sys-libs/pam ) png? ( media-libs/libpng:= ) systemd? ( >=sys-apps/systemd-221 ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) media-gfx/fbida perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 ) selinux? ( sec-policy/selinux-xscreensaver )
+REQUIRED_USE=gdk-pixbuf? ( gtk ) gles? ( !glx opengl ) glx? ( opengl ) gtk? ( png ) opengl? ( png ) ?? ( elogind systemd )
+SLOT=0
+SRC_URI=https://www.jwz.org/xscreensaver/xscreensaver-6.04.tar.gz
+_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	font	d31f12a0f6e13d56dc3062e76ae58a61	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	optfeature	d524f291c80f9d21ad80fe978e3ca760	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253
+_md5_=3a82cc287d1227bd16300fce428c2700
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 5532be16b12c..5f0f768d74b2 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.44.0 b/metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
index c180c9f147ef..38a3c23c0b4b 100644
--- a/metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
 INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
 IUSE=debug +gnome-shell +nautilus vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3+
 RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.68.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-terminal/3.44/gnome-terminal-3.44.0.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz )
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=aecca761825fe9ba4e69dae8f72f823f
+_md5_=09413f8753b209f08fb6ea6b4fe4f7cd
diff --git a/metadata/md5-cache/x11-terms/gnome-terminal-3.44.1 b/metadata/md5-cache/x11-terms/gnome-terminal-3.44.1
new file mode 100644
index 000000000000..8f87aeea892e
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/gnome-terminal-3.44.1
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta1-r1:3.11 >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) dev-libs/libxml2:2 dev-libs/libxslt dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.68.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+DESCRIPTION=A terminal emulator for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal
+INHERIT=gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+IUSE=debug +gnome-shell +nautilus vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.52:2 >=x11-libs/gtk+-3.22.27:3 >=x11-libs/vte-0.68.0:2.91[!vanilla?] >=dev-libs/libpcre2-10 >=gnome-base/dconf-0.14 >=gnome-base/gsettings-desktop-schemas-0.1.0 sys-apps/util-linux gnome-shell? ( gnome-base/gnome-shell ) nautilus? ( >=gnome-base/nautilus-3.28.0 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-terminal/3.44/gnome-terminal-3.44.1.tar.xz !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz )
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cadca57f2ad702a211bc826ce2dc2fee
diff --git a/metadata/md5-cache/x11-terms/xterm-367 b/metadata/md5-cache/x11-terms/xterm-367
deleted file mode 100644
index cb7a48fb1274..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-367
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=7
-HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-367.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=50f9732b205cd810f2ca6c2364232853
diff --git a/metadata/md5-cache/x11-terms/xterm-370 b/metadata/md5-cache/x11-terms/xterm-370
deleted file mode 100644
index 7a8c9c3847ed..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-370
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto
-DEFINED_PHASES=configure install setup
-DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=7
-HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-370.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=62d07af2e6a4ae5109c5621b0a768cc0
diff --git a/metadata/md5-cache/x11-terms/xterm-371 b/metadata/md5-cache/x11-terms/xterm-371
deleted file mode 100644
index 69240eae5ab9..000000000000
--- a/metadata/md5-cache/x11-terms/xterm-371
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig x11-base/xorg-proto
-DEFINED_PHASES=configure install
-DEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama )
-DESCRIPTION=Terminal Emulator for X Windows
-EAPI=8
-HOMEPAGE=https://invisible-island.net/xterm/
-INHERIT=desktop flag-o-matic toolchain-funcs
-IUSE=+openpty sixel toolbar truetype unicode Xaw3d xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:0= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
-SLOT=0
-SRC_URI=ftp://ftp.invisible-island.net/xterm/xterm-371.tgz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c219f17340b41571826fe6b17ca98314
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 994dc138f2b7..d737ed953ea7 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0
index 34f1d096d5da..13d6a015540a 100644
--- a/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/adwaita-icon-theme
 INHERIT=gnome2
 IUSE=branding
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
 RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gnome/sources/adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
 _eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=175c301d7e6acdaebc8efe9085c31308
+_md5_=8e0be73e3818c19184db37cddbe94c91
diff --git a/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
new file mode 100644
index 000000000000..de41d9360e2d
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) >=gnome-base/librsvg-2.48:2 sys-devel/gettext virtual/pkgconfig x11-libs/gtk+:3 >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10
+DESCRIPTION=GNOME default icon theme
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/adwaita-icon-theme
+INHERIT=gnome2 python-any-r1
+IUSE=branding
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( LGPL-3 CC-BY-SA-3.0 ) branding? ( CC-BY-SA-4.0 )
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=gnome-base/librsvg-2.48:2
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/adwaita-icon-theme/42/adwaita-icon-theme-42.0.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz ) mirror://debian/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_42.0.orig-41.tar.xz mirror://debian/pool/main/a/adwaita-icon-theme/adwaita-icon-theme_42.0-2.debian.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=438cb066c990e73bdaa40335d0f7f3fa
diff --git a/metadata/md5-cache/x11-themes/fluent-icon-theme-2022.02.28 b/metadata/md5-cache/x11-themes/fluent-icon-theme-2022.02.28
new file mode 100644
index 000000000000..d56b2c68089c
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/fluent-icon-theme-2022.02.28
@@ -0,0 +1,14 @@
+BDEPEND=sys-apps/util-linux[hardlink(-)?]
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Fluent icon theme for Linux desktops
+EAPI=8
+HOMEPAGE=https://github.com/vinceliuice/Fluent-icon-theme
+INHERIT=xdg
+IUSE=+black +hardlink round
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RESTRICT=binchecks strip test
+SLOT=0
+SRC_URI=https://github.com/vinceliuice/Fluent-icon-theme/archive/2022-02-28.tar.gz -> fluent-icon-theme-2022.02.28.tar.gz
+_eclasses_=xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=14e02657a01f6790cba9989e83e981dc
diff --git a/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0 b/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
index 96cab17ff5f8..5fb70d6ae525 100644
--- a/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
@@ -4,9 +4,9 @@ DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
 EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-backgrounds
 INHERIT=gnome.org meson
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-backgrounds/42/gnome-backgrounds-42.0.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253
-_md5_=c99f0faebad70d6f980b00bf209f2ccb
+_md5_=a4d9726b00fc2dc0751cfc6cbdd47bb1
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 603b6f58ded0..d426dccc24fa 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4 b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
new file mode 100644
index 000000000000..15111f9070ab
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) virtual/pkgconfig test? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
+DESCRIPTION=A manual tiling window manager for X
+EAPI=8
+HOMEPAGE=https://herbstluftwm.org/
+INHERIT=cmake distutils-r1
+IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://herbstluftwm.org/tarballs/herbstluftwm-0.9.4.tar.gz
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2334e6bb53de13b3fa89fa2ca6aaf63f
diff --git a/metadata/md5-cache/x11-wm/herbstluftwm-9999 b/metadata/md5-cache/x11-wm/herbstluftwm-9999
index 1d230184f41f..b415851c4718 100644
--- a/metadata/md5-cache/x11-wm/herbstluftwm-9999
+++ b/metadata/md5-cache/x11-wm/herbstluftwm-9999
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) virtual/pkgconfig doc? ( app-text/asciidoc ) test? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) ) >=dev-python/pytest-7.0.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-util/ninja >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender test? ( dev-python/ewmh dev-python/python-xlib x11-apps/xsetroot x11-base/xorg-server[xephyr,xvfb] x11-misc/xdotool x11-terms/xterm )
 DESCRIPTION=A manual tiling window manager for X
-EAPI=7
+EAPI=8
 HOMEPAGE=https://herbstluftwm.org/
-INHERIT=cmake distutils-r1 toolchain-funcs git-r3
-IUSE=+doc python test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+INHERIT=cmake distutils-r1 git-r3
+IUSE=+doc python test test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=BSD-2
 PROPERTIES=live
-RDEPEND=media-libs/freetype x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr app-shells/bash python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) test? ( doc )
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender app-shells/bash python? ( python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta1-r1:3.11 ) )
+REQUIRED_USE=python? ( || ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) test? ( doc )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f3b99d058178439d293ae3508bad7e0
+_eclasses_=cmake	90e2b29417d53718328f3a95227137a0	distutils-r1	3b871cf4724e3abc9b4ff059289f0d45	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	8638751691200e941f26fe0ac3aef1d1	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5dcd90446ef8888e017f5c3d171d6c29
diff --git a/metadata/md5-cache/x11-wm/mutter-42.1 b/metadata/md5-cache/x11-wm/mutter-42.1
index 45ab377dcfa7..339fc3639b0f 100644
--- a/metadata/md5-cache/x11-wm/mutter-42.1
+++ b/metadata/md5-cache/x11-wm/mutter-42.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
 INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
 IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~ppc64 ~riscv x86
 LICENSE=GPL-2+
 RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
 REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/10
 SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.1.tar.xz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=1d0b80336d2fb622abe1f572d99ff515
+_md5_=4a9bf844c30520ccecf8074fb3fef68c
diff --git a/metadata/md5-cache/x11-wm/mutter-42.2 b/metadata/md5-cache/x11-wm/mutter-42.2
new file mode 100644
index 000000000000..474ad8e2d14b
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-42.2
@@ -0,0 +1,17 @@
+BDEPEND=dev-libs/wayland dev-util/gdbus-codegen dev-util/glib-utils >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( >=dev-lang/python-3.10.0_p1-r1:3.10 >=dev-lang/python-3.9.9-r1:3.9 >=dev-lang/python-3.8.12_p1-r1:3.8 ) || ( ( >=dev-lang/python-3.10.0_p1-r1:3.10 dev-python/python-dbusmock[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.9-r1:3.9 dev-python/python-dbusmock[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.12_p1-r1:3.8 dev-python/python-dbusmock[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.5 x11-misc/xvfb-run ) wayland? ( >=sys-kernel/linux-headers-4.4 x11-libs/libxcvt ) app-arch/xz-utils >=dev-util/meson-0.59.4 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) x11-base/xorg-proto sysprof? ( >=dev-util/sysprof-common-3.38.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME compositing window manager based on Clutter
+EAPI=7
+HOMEPAGE=https://gitlab.gnome.org/GNOME/mutter/
+INHERIT=gnome.org gnome2-utils meson python-any-r1 udev xdg
+IUSE=doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/libX11-1.7.0 >=media-libs/graphene-1.10.2[introspection?] >=x11-libs/gtk+-3.19.8:3[X,introspection?] x11-libs/gdk-pixbuf:2 >=x11-libs/pango-1.46[introspection?] >=dev-libs/fribidi-1.0.0 >=x11-libs/cairo-1.14[X] >=gnome-base/gsettings-desktop-schemas-42.0[introspection?] >=dev-libs/glib-2.69.0:2 gnome-base/gnome-settings-daemon >=dev-libs/json-glib-0.12.0[introspection?] >=x11-libs/libXcomposite-0.4 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext >=x11-libs/libXfixes-3 >=x11-libs/libXi-1.7.4 x11-libs/libXtst x11-libs/libxkbfile x11-misc/xkeyboard-config >=x11-libs/libxkbcommon-0.4.3[X] x11-libs/libXrender >=x11-libs/libXrandr-1.5.0 x11-libs/libxcb x11-libs/libXinerama x11-libs/libXau x11-libs/libICE >=dev-libs/atk-2.5.3[introspection?] >=media-libs/libcanberra-0.26 sys-apps/dbus gnome? ( gnome-base/gnome-desktop:3= ) media-libs/mesa[X(+),egl(+)] sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 ) systemd? ( sys-apps/systemd ) wayland? ( >=dev-libs/wayland-protocols-1.21 >=dev-libs/wayland-1.18.0 x11-libs/libdrm:= >=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2] >=dev-libs/libinput-1.18.0 elogind? ( sys-auth/elogind ) x11-base/xwayland video_cards_nvidia? ( gui-libs/egl-wayland ) ) udev? ( >=dev-libs/libgudev-232:= >=virtual/libudev-232-r1:= ) x11-libs/libSM input_devices_wacom? ( >=dev-libs/libwacom-0.13 ) >=x11-libs/startup-notification-0.7 screencast? ( >=media-video/pipewire-0.3.21:= ) introspection? ( >=dev-libs/gobject-introspection-1.54:= ) doc? ( >=dev-util/gi-docgen-2021.1 ) gnome-extra/zenity !<gui-libs/gtk-4.6.4:4 !<x11-libs/gtk+-3.24.34:3
+REQUIRED_USE=wayland? ( ^^ ( elogind systemd ) udev ) test? ( wayland )
+RESTRICT=!test? ( test )
+SLOT=0/10
+SRC_URI=mirror://gnome/sources/mutter/42/mutter-42.2.tar.xz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	8f48ffde53174aba67239f0da61ac9d3	multilib	4fbbbc98f236f1b43acd99476bc3cd85	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	9006edf4b9c90f9ba1dc9ea9fee1b0bd	python-utils-r1	5dc84801daa87406aafaf535cb947a64	toolchain-funcs	fd9cde67030b26e479eeadaced488253	udev	2d229ad4bfa09058e0184b1ca900db32	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1d0b80336d2fb622abe1f572d99ff515
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.11 b/metadata/md5-cache/x11-wm/twm-1.0.11
deleted file mode 100644
index 06b99f962d0f..000000000000
--- a/metadata/md5-cache/x11-wm/twm-1.0.11
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-base/xorg-proto
-DESCRIPTION=X.Org Tab Window Manager
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/twm
-INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt media-fonts/font-adobe-75dpi
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.11.tar.xz
-_eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	fd9cde67030b26e479eeadaced488253	wrapper	4a1902f969e5718126434fc35f3a0d9c	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=a32abbe9ebec6f44e48d3af551991960
diff --git a/metadata/md5-cache/x11-wm/twm-1.0.12 b/metadata/md5-cache/x11-wm/twm-1.0.12
index 33d2686c8677..9ed4b7dc76ae 100644
--- a/metadata/md5-cache/x11-wm/twm-1.0.12
+++ b/metadata/md5-cache/x11-wm/twm-1.0.12
@@ -5,10 +5,10 @@ DESCRIPTION=X.Org Tab Window Manager
 EAPI=8
 HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/twm
 INHERIT=xorg-3
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt media-fonts/font-adobe-75dpi
 SLOT=0
 SRC_URI=https://www.x.org/releases/individual/app/twm-1.0.12.tar.xz
 _eclasses_=autotools	136117fb43a9bf5598530e9cc642f710	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	4fbbbc98f236f1b43acd99476bc3cd85	toolchain-funcs	fd9cde67030b26e479eeadaced488253	xorg-3	17094cfaab5d74475cc6d251157087b8
-_md5_=fdb8fc7e79dd6d68d83b005aebad0b06
+_md5_=77a5cfd069af562e6503103896d07630
diff --git a/metadata/news/2022-04-19-systemd-utils/2022-04-19-systemd-utils.en.txt b/metadata/news/2022-04-19-systemd-utils/2022-04-19-systemd-utils.en.txt
index ed1188072085..522456433554 100644
--- a/metadata/news/2022-04-19-systemd-utils/2022-04-19-systemd-utils.en.txt
+++ b/metadata/news/2022-04-19-systemd-utils/2022-04-19-systemd-utils.en.txt
@@ -10,10 +10,13 @@ Display-If-Installed: sys-fs/udev
 
 The sys-apps/systemd-utils package was recently added to the gentoo
 repository. This replaces sys-apps/systemd-tmpfiles,
-sys-boot/systemd-boot, and sys-fs/udev with a single package. USE flags
-are provided to allow each component to be enabled or disabled. This
-change was made to significantly ease maintenance of tools split out
-from systemd.
+sys-boot/systemd-boot, and sys-fs/udev with a single package, and is
+for OpenRC users. It does not depend on sys-apps/systemd and contains
+the same exact components as the split packages.
+
+USE flags are provided to allow each component to be enabled
+or disabled. This change was made to significantly ease maintenance of tools
+split out from systemd.
 
 When upgrading to sys-apps/systemd-tmpfiles-250,
 sys-apps/systemd-utils[tmpfiles] will be pulled in as a dependency.
@@ -40,3 +43,8 @@ Possible problems when upgrading:
 2. The 'boot' USE flag on sys-apps/systemd-utils is disabled by default.
    Users migrating from sys-boot/systemd-boot will need to enable the
    'boot' USE flag (in package.use) to continue receiving updates.
+
+3. If you have package.use entries for any of sys-apps/systemd-tmpfiles,
+   sys-boot/systemd-boot, or sys-fs/udev, please update the relevant lines
+   to refer to sys-apps/systemd-utils instead. This might include
+   ABI_X86_32 for some users!
diff --git a/metadata/news/2022-05-26-apache-nginx-glep-81/2022-05-26-apache-nginx-glep-81.en.txt b/metadata/news/2022-05-26-apache-nginx-glep-81/2022-05-26-apache-nginx-glep-81.en.txt
index d0afab2240b7..195c8673680c 100644
--- a/metadata/news/2022-05-26-apache-nginx-glep-81/2022-05-26-apache-nginx-glep-81.en.txt
+++ b/metadata/news/2022-05-26-apache-nginx-glep-81/2022-05-26-apache-nginx-glep-81.en.txt
@@ -36,7 +36,7 @@ in make.conf or per package in package.env:
    for overriding default assigned shell.
 
 If being set per package in package.env, it needs to
-be set for acct-user/apache or aact-user/nginx,
+be set for acct-user/apache or acct-user/nginx,
 depending on which user should be modified.
 
 See [1] for more details on those variables.
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index ce3a6947b56d..33c6f633e519 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 17017 BLAKE2B 54326bb97c1b352d17f157a10214284945138572857249072c9f4ef0c2cccafc4eb781a29cbd1f8bc201af6b047b4e240b5923a1c7d33e1509a46193471f34e5 SHA512 d0464697142310b58d4b798a6fed4607dcef18675580ade84301d8f8e3758608c1c1fa5e07f256bd4abccc085f5aaedbb250386178b6aa78e2e3b3f6d21ad558
-TIMESTAMP 2022-05-27T09:39:54Z
+MANIFEST Manifest.files.gz 17017 BLAKE2B 7be328a8a4c41ce39baa109aefc40f06150b6f7bb6578e1d66ff355b0fc716f31c165a176e4806ef97c970291938c37b387df71f41483a4ff730585da37e21ae SHA512 67fd89195b667066cb0549fb5194864dacb49dc3391fad1dad88636326045b6a646299536c435245bd571486c513934c3dcdc45dfc0797e3bd631881b91eb0fe
+TIMESTAMP 2022-05-31T06:09:34Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKQnGpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKVsR5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAn3A/7BPghVVynO46e5LSNlbDgHrnzbgZCMiO6e0n+Y3JQ6DxZbw3LiWAQgkuH
-7dUY8ah1JZQmJ+NnZdkaA6FmgSPNyrQjMbEIJe7U416hUaPId5StV7Z0kY9eZvWB
-tTuA9c1oEqNXYEbq+vkJjw1aNlMxd9Nf9g8VBl0GlCRKBNvYmPtItz1rYNPEEMhE
-7zOx+AVO0FtJ/G8o+zYxMcxSRpp2WbPEzwuIQJMpX6nRotbjufpCFspEIu1AfDso
-vsP3gQB9OD+v4ZoBu95++Lak4u5bqgRmDkUs+UidkJ7q34Ro5s7HjMwQIyvi+9gB
-mV/X4B8cd4U8iz/c/NESEzhO9CXkwKOLsHrOQMIGHwU5MEaqgr9gx0r3DBtrCgva
-4iQ0H7NGz60P+2LcEsxdfQyf8WL9u6LT+EqDzZP1ujf6AMbqF9Rk4Y9tMr8AQYQl
-xtAM3ivuYn7ha6z+NFrDqvbb4HEIcovFB/22T6/LqPp62n29iKqz7JIPTGq89vQj
-KopJ6cXAThaRCF8TYFMq6i+Lo1oAizrovUZ5ScTMY5TODON36xN4OONdu117wUuH
-6izh4yvqPchXEAPsWeoGT74z9cCeSsfSOQ2pnxFwt/Pe708gk0d45V+eohvhcoVn
-7VbTX94SndHQqETD9oxKrKUGcdUXONWXRpX9hTpXsVAKITVWmfk=
-=2XDu
+klB8BhAAnF+NUqW5SwpoFzx3cN4jYb4IM7llYIvpfFZL5k39OgrStJhB1OjuGi1a
+BfVc4pnPX3ZStyhC6Y+8qBFi+P6HT4IbIbVhPuaxG/wbdx/5SB2iKAcbZzYtxBLJ
+yPVxFYxxktAyXHbxowX6UYBE4dggfs0X4g017/zQevd9U18s7TdsAWGcrjBxjGvu
+1PEnnfri8gFwN5fdFY7hILVPAzR+kUVRLJkFSRJHIPA7vg55ZoA+X0Z7bpqKiahH
+z0Tz0PcMXmqmvD0bcOPx4pFzAV9d1o/xdljCYHqeSSUFpaYsX8DfqWbPHdEuxUEZ
+q9nqpuWre+CDuSyaK8+zBCOjPMnYQtLh51aQGiflDJA+KcmfZaw4ThYIWCq0xPvH
+DyxlZd/TIyEU5M36z5ZpaE6zfM6WOHcSt6SLt5lfEzvQb6ndHr10HdGUpUqjbQ8Z
+ogfXietJXL0g5jpXFdX4KV9TLjeSYWj4924BLPlNN2h9ID5YMXZXCGGox71fuqxU
+H+RZUQ2r2MRI2BUTIZBc7XsepfUp5XK2qk/Uw2gDgPu8B1n4kd5d2q432ECo2eJT
+JT/iRrjdrKkGb4Bk0RW+naTWlfDW7qM0fVNE0zurm1eOstDQDgvpj823EHl9ucec
+6lkOTCPNQJu1pyPqyXvEZ/3vsztI7YTqmtV+yx7hdWU/iPYnOeM=
+=tDPb
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index b08fc6ff336b..566bf4dccb2c 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 851d9aa7aaf8..10a943f35b78 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 27 May 2022 09:39:50 +0000
+Tue, 31 May 2022 06:09:31 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index ad7a5b98f8bd..aedec05a0863 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-1ed1d66b4ccebfbceaa6309ed8ef64747352af3a 1653576995 2022-05-26T14:56:35+00:00
+6e976b2854be2c5492025489dacba2158872a768 1653953798 2022-05-30T23:36:38+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index b06128dd0444..736f13de389e 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -299,7 +299,7 @@
       <name>Patrick McLean</name>
       <role>Misc stuff that needs to get done</role>
     </member>
-    <member is-lead="1">
+    <member>
       <email>dilfridge@gentoo.org</email>
       <name>Andreas K. Hüttel</name>
       <role>Misc stuff, toolchain</role>
@@ -322,7 +322,7 @@
       <name>Robin Johnson</name>
       <role>Specialized block devices and lots of other miscellaneous stuff</role>
     </member>
-    <member>
+    <member is-lead="1">
       <email>sam@gentoo.org</email>
       <name>Sam James</name>
     </member>
diff --git a/metadata/timestamp b/metadata/timestamp
index ad9e7ea1808a..d2f2bff2b354 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri May 27 09:39:49 AM UTC 2022
+Tue May 31 06:09:30 AM UTC 2022
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index d8ac213ccc03..720b1fc3294f 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -888,13 +888,13 @@
 2205171110 ./app-accessibility/at-spi2-atk/at-spi2-atk-2.38.0.ebuild
 2203181810 ./app-accessibility/at-spi2-core/at-spi2-core-2.42.0.ebuild
 2203212139 ./app-accessibility/at-spi2-core/at-spi2-core-2.44.0.ebuild
-2205171110 ./app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
+2205280910 ./app-accessibility/at-spi2-core/at-spi2-core-2.44.1.ebuild
 2107310239 ./app-accessibility/brltty/brltty-6.1.ebuild
 2201281240 ./app-accessibility/brltty/brltty-6.1-r1.ebuild
 2201310609 ./app-accessibility/brltty/brltty-6.4.ebuild
 2205260840 ./app-accessibility/brltty/brltty-6.4-r1.ebuild
 2112242309 ./app-accessibility/caribou/caribou-0.4.21-r4.ebuild
-2205070840 ./app-accessibility/edbrowse/edbrowse-3.8.2.1-r1.ebuild
+2205310240 ./app-accessibility/edbrowse/edbrowse-3.8.2.1-r2.ebuild
 1803280308 ./app-accessibility/emacspeak-ss/emacspeak-ss-1.9.1.ebuild
 1803280308 ./app-accessibility/emacspeak/emacspeak-39.0-r2.ebuild
 1803280308 ./app-accessibility/emacspeak/emacspeak-9999.ebuild
@@ -917,7 +917,7 @@
 2112192339 ./app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
 2203081540 ./app-accessibility/orca/orca-41.2.ebuild
 2203230939 ./app-accessibility/orca/orca-42.0.ebuild
-2205172240 ./app-accessibility/orca/orca-42.1.ebuild
+2205280910 ./app-accessibility/orca/orca-42.1.ebuild
 2203200240 ./app-accessibility/powiedz/powiedz-1.0-r2.ebuild
 2002230040 ./app-accessibility/sound-icons/sound-icons-0.1.ebuild
 2108101209 ./app-accessibility/speech-dispatcher/speech-dispatcher-0.9.1.ebuild
@@ -936,21 +936,21 @@
 2112072109 ./app-admin/ansible-base/ansible-base-9999.ebuild
 2201081009 ./app-admin/ansible-base/ansible-base-2.11.7.ebuild
 2204030709 ./app-admin/ansible-base/ansible-base-2.12.3.ebuild
-2205010310 ./app-admin/ansible-base/ansible-base-2.12.5.ebuild
 2205021840 ./app-admin/ansible-base/ansible-base-2.12.4.ebuild
 2205172040 ./app-admin/ansible-base/ansible-base-2.13.0.ebuild
 2205260840 ./app-admin/ansible-base/ansible-base-2.12.6.ebuild
+2205310510 ./app-admin/ansible-base/ansible-base-2.12.5.ebuild
 2111192139 ./app-admin/ansible-cmdb/ansible-cmdb-1.30-r1.ebuild
 2202171639 ./app-admin/ansible-lint/ansible-lint-5.4.0.ebuild
 2204011210 ./app-admin/ansible-lint/ansible-lint-6.0.2.ebuild
-2205190240 ./app-admin/ansible-lint/ansible-lint-6.1.0.ebuild
+2205310240 ./app-admin/ansible-lint/ansible-lint-6.2.2.ebuild
 2112192339 ./app-admin/ansible-modules-hashivault/ansible-modules-hashivault-4.6.2.ebuild
 2202032109 ./app-admin/ansible-molecule/ansible-molecule-3.5.2-r1.ebuild
 2111120109 ./app-admin/ansible/ansible-4.6.0.ebuild
 2204030709 ./app-admin/ansible/ansible-5.4.0.ebuild
-2205010310 ./app-admin/ansible/ansible-5.7.0.ebuild
 2205021840 ./app-admin/ansible/ansible-5.5.0.ebuild
 2205172040 ./app-admin/ansible/ansible-5.7.1.ebuild
+2205310510 ./app-admin/ansible/ansible-5.7.0.ebuild
 2205161540 ./app-admin/apache-tools/apache-tools-2.4.53-r1.ebuild
 2012311940 ./app-admin/apachetop/apachetop-0.19.7.ebuild
 2106302209 ./app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
@@ -970,6 +970,7 @@
 2205251040 ./app-admin/awscli/awscli-1.24.7.ebuild
 2205261210 ./app-admin/awscli/awscli-1.24.8.ebuild
 2205271040 ./app-admin/awscli/awscli-1.24.9.ebuild
+2205280810 ./app-admin/awscli/awscli-1.24.10.ebuild
 1912012209 ./app-admin/bastille/bastille-3.0.9-r2.ebuild
 2202200440 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild
 2204121639 ./app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.32.1.ebuild
@@ -980,6 +981,7 @@
 2008051739 ./app-admin/checksec/checksec-2.2.3.ebuild
 2109240209 ./app-admin/checksec/checksec-2.4.0.ebuild
 2110131839 ./app-admin/checksec/checksec-2.5.0.ebuild
+2205281740 ./app-admin/checksec/checksec-2.6.0.ebuild
 1902091839 ./app-admin/chroot_safe/chroot_safe-1.4-r1.ebuild
 2111141139 ./app-admin/chrootuid/chrootuid-1.3-r2.ebuild
 1912111539 ./app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -1070,8 +1072,8 @@
 2201281810 ./app-admin/keepassxc/keepassxc-2.6.6.ebuild
 2201281810 ./app-admin/keepassxc/keepassxc-2.6.9999.ebuild
 2204110210 ./app-admin/keepassxc/keepassxc-2.7.0-r2.ebuild
-2204110210 ./app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
 2204110210 ./app-admin/keepassxc/keepassxc-9999.ebuild
+2205281010 ./app-admin/keepassxc/keepassxc-2.7.1-r1.ebuild
 2204031409 ./app-admin/killproc/killproc-2.13-r1.ebuild
 2011141009 ./app-admin/kpcli/kpcli-3.6.ebuild
 2205271010 ./app-admin/kpcli/kpcli-3.7.ebuild
@@ -1160,7 +1162,7 @@
 2205191040 ./app-admin/pwgen/pwgen-2.08.ebuild
 2101310343 ./app-admin/pwman3/pwman3-0.10.0-r1.ebuild
 2105231239 ./app-admin/pwman3/pwman3-0.11.1.ebuild
-2106070939 ./app-admin/pydf/pydf-12-r2.ebuild
+2205310510 ./app-admin/pydf/pydf-12-r2.ebuild
 2002112050 ./app-admin/qpage/qpage-3.3.ebuild
 2104050539 ./app-admin/qtpass/qtpass-1.3.2-r2.ebuild
 2104060140 ./app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -1233,11 +1235,12 @@
 2112310239 ./app-admin/supervisor/supervisor-4.2.4.ebuild
 1908101909 ./app-admin/sxid/sxid-4.2-r2.ebuild
 2203100610 ./app-admin/sysklogd/sysklogd-2.3.0.ebuild
-2203100610 ./app-admin/sysklogd/sysklogd-9999.ebuild
+2205310640 ./app-admin/sysklogd/sysklogd-2.4.0.ebuild
+2205310640 ./app-admin/sysklogd/sysklogd-9999.ebuild
 2112101110 ./app-admin/syslog-ng/syslog-ng-3.34.1.ebuild
 2203101240 ./app-admin/syslog-ng/syslog-ng-3.35.1.ebuild
 2203162040 ./app-admin/syslog-ng/syslog-ng-3.36.1.ebuild
-2009231339 ./app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
+2205310610 ./app-admin/syslog-summary/syslog-summary-1.14-r5.ebuild
 2106302209 ./app-admin/sysrqd/sysrqd-17-r2.ebuild
 2107140639 ./app-admin/sysstat/sysstat-12.5.4.ebuild
 2112210609 ./app-admin/sysstat/sysstat-12.5.5.ebuild
@@ -1300,8 +1303,8 @@
 2103200939 ./app-arch/atool/atool-0.39.0-r1.ebuild
 2109161309 ./app-arch/bloscpack/bloscpack-0.16.0.ebuild
 2205010511 ./app-arch/brotli/brotli-1.0.9-r3.ebuild
-2205182010 ./app-arch/brotli/brotli-1.0.9-r4.ebuild
-2205182010 ./app-arch/brotli/brotli-9999.ebuild
+2205280910 ./app-arch/brotli/brotli-1.0.9-r4.ebuild
+2205280910 ./app-arch/brotli/brotli-9999.ebuild
 2203200240 ./app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild
 2106040440 ./app-arch/bzip2/bzip2-9999.ebuild
 2205171010 ./app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -1320,7 +1323,7 @@
 2109132339 ./app-arch/dump/dump-0.4.47-r1.ebuild
 2112102340 ./app-arch/engrampa/engrampa-1.24.2.ebuild
 2202080810 ./app-arch/file-roller/file-roller-3.40.0.ebuild
-2203230939 ./app-arch/file-roller/file-roller-3.42.0.ebuild
+2205280910 ./app-arch/file-roller/file-roller-3.42.0.ebuild
 1712291639 ./app-arch/funzix/funzix-1.0.ebuild
 2108050539 ./app-arch/gcab/gcab-1.4.ebuild
 2203081540 ./app-arch/gnome-autoar/gnome-autoar-0.4.3.ebuild
@@ -1401,6 +1404,7 @@
 2110031439 ./app-arch/unrar/unrar-6.0.7.ebuild
 2111162109 ./app-arch/unrar/unrar-6.1.2.ebuild
 2205251240 ./app-arch/unrar/unrar-6.1.4.ebuild
+2205310640 ./app-arch/unrar/unrar-6.1.7.ebuild
 2105231939 ./app-arch/unrpa/unrpa-2.3.0.ebuild
 2109240209 ./app-arch/unshield/unshield-1.4.3.ebuild
 2204291110 ./app-arch/unzip/unzip-6.0_p26.ebuild
@@ -1662,6 +1666,7 @@
 2110060709 ./app-crypt/efitools/efitools-1.9.2.ebuild
 2109092339 ./app-crypt/eid-mw/eid-mw-5.0.28.ebuild
 2109092339 ./app-crypt/eid-mw/eid-mw-9999.ebuild
+2205281310 ./app-crypt/eid-mw/eid-mw-5.1.4.ebuild
 2201041339 ./app-crypt/ekeyd/ekeyd-1.1.5-r101.ebuild
 1911100709 ./app-crypt/elettra/elettra-1.0.ebuild
 1702282250 ./app-crypt/envchain/envchain-1.0.0.ebuild
@@ -1682,6 +1687,7 @@
 2012311940 ./app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
 2203260340 ./app-crypt/gpgme/gpgme-1.16.0.ebuild
 2205170840 ./app-crypt/gpgme/gpgme-1.17.1.ebuild
+2205282140 ./app-crypt/gpgme/gpgme-1.17.1-r1.ebuild
 2202170139 ./app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
 2104060140 ./app-crypt/hashalot/hashalot-0.3-r2.ebuild
 1809182339 ./app-crypt/hashcat-utils/hashcat-utils-1.9.ebuild
@@ -1732,7 +1738,7 @@
 2203200240 ./app-crypt/libscrypt/libscrypt-1.21.ebuild
 2205141540 ./app-crypt/libscrypt/libscrypt-1.22.ebuild
 2203160010 ./app-crypt/libsecret/libsecret-0.20.5.ebuild
-2205091810 ./app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
+2205280910 ./app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
 2201041339 ./app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
 2111192109 ./app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
 2012231444 ./app-crypt/loop-aes-losetup/loop-aes-losetup-2.28.2.ebuild
@@ -1748,6 +1754,7 @@
 2203040040 ./app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
 2204171840 ./app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
 2205100440 ./app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
+2205281310 ./app-crypt/mit-krb5/mit-krb5-1.20.ebuild
 2103170539 ./app-crypt/monkeysphere/monkeysphere-0.44.ebuild
 2006101909 ./app-crypt/moolticute/moolticute-0.43.19.ebuild
 1910290939 ./app-crypt/moolticute/moolticute-9999.ebuild
@@ -1772,7 +1779,7 @@
 2008040739 ./app-crypt/pgpdump/pgpdump-0.33.ebuild
 2205170910 ./app-crypt/pinentry/pinentry-1.1.1-r1.ebuild
 2205170910 ./app-crypt/pinentry/pinentry-1.2.0.ebuild
-2101270709 ./app-crypt/pius/pius-3.0.0-r1.ebuild
+2205310540 ./app-crypt/pius/pius-3.0.0-r1.ebuild
 2104290509 ./app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
 1809280333 ./app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild
 2105022009 ./app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
@@ -1818,6 +1825,7 @@
 2103311639 ./app-crypt/ubuntu-keyring/ubuntu-keyring-2021.03.26.ebuild
 2108020009 ./app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
 2202140739 ./app-crypt/veracrypt/veracrypt-1.25.7.ebuild
+2205290640 ./app-crypt/veracrypt/veracrypt-1.25.9.ebuild
 2112160339 ./app-crypt/xca/xca-2.4.0-r2.ebuild
 1802221208 ./app-crypt/xor-analyze/xor-analyze-0.5-r1.ebuild
 2112310439 ./app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
@@ -2457,6 +2465,7 @@
 2203301740 ./app-doc/gnucash-docs/gnucash-docs-4.8.ebuild
 2205070810 ./app-doc/gnucash-docs/gnucash-docs-4.10.1.ebuild
 2112121739 ./app-doc/halibut/halibut-1.2.ebuild
+2205302040 ./app-doc/halibut/halibut-1.3.ebuild
 2112121739 ./app-doc/jargon/jargon-4.4.7-r1.ebuild
 2112041439 ./app-doc/kicad-doc/kicad-doc-5.1.12.ebuild
 2203251409 ./app-doc/kicad-doc/kicad-doc-6.0.4.ebuild
@@ -2556,6 +2565,7 @@
 2205141040 ./app-doc/zsh-lovers/zsh-lovers-0.9.1.ebuild
 2110291639 ./app-editors/aee/aee-2.2.21.ebuild
 2205160610 ./app-editors/bluefish/bluefish-2.2.12.ebuild
+2205290210 ./app-editors/bluefish/bluefish-2.2.12-r1.ebuild
 2110220439 ./app-editors/bvi/bvi-1.4.1.ebuild
 2110220439 ./app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild
 2110220439 ./app-editors/dav/dav-0.8.5-r2.ebuild
@@ -2583,14 +2593,16 @@
 2110291639 ./app-editors/focuswriter/focuswriter-1.7.6.ebuild
 2110291639 ./app-editors/fte/fte-20110708-r1.ebuild
 2203081240 ./app-editors/gedit-plugins/gedit-plugins-41.0.ebuild
-2204050539 ./app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
+2205280440 ./app-editors/gedit-plugins/gedit-plugins-42.0.ebuild
+2205271340 ./app-editors/gedit-plugins/gedit-plugins-42.1.ebuild
 2203131809 ./app-editors/gedit/gedit-41.0.ebuild
-2204030339 ./app-editors/gedit/gedit-42.0.ebuild
+2205280910 ./app-editors/gedit/gedit-42.0.ebuild
+2205271340 ./app-editors/gedit/gedit-42.1.ebuild
 2203091910 ./app-editors/ghex/ghex-3.41.1.ebuild
 2204072009 ./app-editors/ghex/ghex-42.0-r1.ebuild
 2204072009 ./app-editors/ghex/ghex-9999.ebuild
 2204180040 ./app-editors/ghex/ghex-42.1.ebuild
-2205072140 ./app-editors/ghex/ghex-42.2.ebuild
+2205280810 ./app-editors/ghex/ghex-42.2.ebuild
 2006182039 ./app-editors/ghostwriter/ghostwriter-1.8.1.ebuild
 2204230909 ./app-editors/ghostwriter/ghostwriter-2.1.2.ebuild
 2204251610 ./app-editors/ghostwriter/ghostwriter-2.0.2.ebuild
@@ -2661,8 +2673,8 @@
 2110291639 ./app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild
 2204211009 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild
 2205021540 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525.ebuild
-2205132310 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r1.ebuild
-2205132310 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r1.ebuild
+2205310610 ./app-editors/qhexedit2/qhexedit2-0.8.6_p20190316-r2.ebuild
+2205310610 ./app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild
 2110291639 ./app-editors/qxmledit/qxmledit-0.9.12.ebuild
 2110311139 ./app-editors/remarkable/remarkable-1.9.0_pre20210320.ebuild
 2201020639 ./app-editors/retext/retext-9999.ebuild
@@ -2731,7 +2743,7 @@
 2204141140 ./app-editors/zile/zile-2.6.2-r2.ebuild
 2203141939 ./app-editors/ecrire/ecrire-0.2.0-r1.ebuild
 2203220939 ./app-editors/gnome-text-editor/gnome-text-editor-42.0.ebuild
-2204231039 ./app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
+2205280440 ./app-editors/gnome-text-editor/gnome-text-editor-42.1.ebuild
 1908231509 ./app-emacs/actionscript-mode/actionscript-mode-7.2.2_p20180527.ebuild
 1910171639 ./app-emacs/adaptive-wrap/adaptive-wrap-0.7.ebuild
 2202152209 ./app-emacs/adaptive-wrap/adaptive-wrap-0.8.ebuild
@@ -2813,7 +2825,7 @@
 1806012008 ./app-emacs/edit-server/edit-server-1.15.ebuild
 2202151809 ./app-emacs/edit-server/edit-server-1.16.ebuild
 2204080339 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.7.8-r3.ebuild
-2204080339 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
+2205310240 ./app-emacs/editorconfig-emacs/editorconfig-emacs-0.8.2-r2.ebuild
 2110200439 ./app-emacs/eglot/eglot-1.6.ebuild
 2204130139 ./app-emacs/eglot/eglot-1.8.ebuild
 2004051339 ./app-emacs/elscreen/elscreen-20180321.ebuild
@@ -2834,8 +2846,8 @@
 2204062009 ./app-emacs/evil/evil-1.14.0.ebuild
 2205211140 ./app-emacs/evil/evil-1.14.2.ebuild
 1910171639 ./app-emacs/expand-region/expand-region-0.11.0-r1.ebuild
-1807310339 ./app-emacs/f/f-0.19.0.ebuild
-2110161809 ./app-emacs/f/f-0.20.0.ebuild
+2205280140 ./app-emacs/f/f-0.19.0-r1.ebuild
+2205280140 ./app-emacs/f/f-0.20.0-r1.ebuild
 2104122109 ./app-emacs/fff/fff-20050517.ebuild
 2104131939 ./app-emacs/filladapt/filladapt-2.12-r2.ebuild
 2104122109 ./app-emacs/flashcard/flashcard-2.3.3.ebuild
@@ -2877,7 +2889,6 @@
 1911181439 ./app-emacs/initsplit/initsplit-1.8_pre20160919.ebuild
 2104122109 ./app-emacs/jam-mode/jam-mode-0.3.ebuild
 2204210039 ./app-emacs/jasmin/jasmin-1.2-r2.ebuild
-2202251109 ./app-emacs/jde/jde-2.4.1-r2.ebuild
 2104122109 ./app-emacs/keywiz/keywiz-1.4.ebuild
 2204062009 ./app-emacs/ledger-mode/ledger-mode-4.0.0.ebuild
 2110101909 ./app-emacs/libegit2/libegit2-0.0.20200515-r1.ebuild
@@ -2972,7 +2983,7 @@
 1902181039 ./app-emacs/rust-mode/rust-mode-0.3.0_p20190125.ebuild
 1912170009 ./app-emacs/rust-mode/rust-mode-0.4.0.ebuild
 2203082010 ./app-emacs/rust-mode/rust-mode-1.0.4.ebuild
-2110161809 ./app-emacs/s/s-1.12.0.ebuild
+2205280210 ./app-emacs/s/s-1.12.0-r1.ebuild
 2104122109 ./app-emacs/scala-mode/scala-mode-2.10.3.ebuild
 2101061639 ./app-emacs/scheme-complete/scheme-complete-0.9.8.ebuild
 2203182140 ./app-emacs/scheme-complete/scheme-complete-0.9.9.ebuild
@@ -3050,20 +3061,21 @@
 2204280140 ./app-emacs/projectile/projectile-2.5.0-r1.ebuild
 2203020139 ./app-emacs/lean-mode/lean-mode-20211220.ebuild
 2203020139 ./app-emacs/lean-mode/lean-mode-20220124.ebuild
-2204160110 ./app-emacs/racket-mode/racket-mode-20220411.ebuild
 2204181240 ./app-emacs/racket-mode/racket-mode-20220219.ebuild
 2205091610 ./app-emacs/racket-mode/racket-mode-20220505.ebuild
+2205310610 ./app-emacs/racket-mode/racket-mode-20220411.ebuild
 2203191140 ./app-emacs/queue/queue-0.2.ebuild
 2202171040 ./app-emacs/avy/avy-0.5.0.ebuild
 2202172309 ./app-emacs/consult-flycheck/consult-flycheck-0.8.ebuild
 2202172309 ./app-emacs/consult/consult-0.15.ebuild
+2205291110 ./app-emacs/consult/consult-0.18.ebuild
 2203271239 ./app-emacs/hl-todo/hl-todo-3.4.1.ebuild
 2204201939 ./app-emacs/hl-todo/hl-todo-3.4.2.ebuild
 2202172339 ./app-emacs/marginalia/marginalia-0.12.ebuild
 2203271239 ./app-emacs/marginalia/marginalia-0.13.ebuild
 2202271339 ./app-emacs/orderless/orderless-0.7.ebuild
-2204201939 ./app-emacs/vertico/vertico-0.22.ebuild
 2205211140 ./app-emacs/vertico/vertico-0.23.ebuild
+2205291110 ./app-emacs/vertico/vertico-0.24.ebuild
 2202201240 ./app-emacs/flycheck-inline/flycheck-inline-0_pre20200808.ebuild
 2202181609 ./app-emacs/setup/setup-1.2.0.ebuild
 2202271339 ./app-emacs/cmake-font-lock/cmake-font-lock-0.1.12.ebuild
@@ -3184,6 +3196,11 @@
 2205241540 ./app-emacs/ebib/ebib-2.35.1_p20220501.ebuild
 2205241540 ./app-emacs/parsebib/parsebib-3.1.ebuild
 2205241540 ./app-emacs/with-simulated-input/with-simulated-input-3.0.ebuild
+2205310340 ./app-emacs/assess/assess-0.6.ebuild
+2205310340 ./app-emacs/cask-mode/cask-mode-0.1.ebuild
+2205291810 ./app-emacs/compat/compat-28.1.1.1-r1.ebuild
+2205310340 ./app-emacs/load-relative/load-relative-1.3.1.ebuild
+2205310340 ./app-emacs/m-buffer/m-buffer-0.15.ebuild
 2201021453 ./app-emulation/aqemu/aqemu-0.9.2-r2.ebuild
 2204170010 ./app-emulation/aranym/aranym-1.1.0.ebuild
 1912171039 ./app-emulation/bochs/bochs-2.6.10.ebuild
@@ -3255,6 +3272,7 @@
 1901232109 ./app-emulation/phpvirtualbox/phpvirtualbox-5.2.1.ebuild
 2202241709 ./app-emulation/protontricks/protontricks-1.7.0.ebuild
 2204070239 ./app-emulation/protontricks/protontricks-1.8.1.ebuild
+2205301410 ./app-emulation/protontricks/protontricks-1.8.2.ebuild
 2102021639 ./app-emulation/punes/punes-0.107.ebuild
 2005112009 ./app-emulation/q4wine/q4wine-1.3.12.ebuild
 2104161439 ./app-emulation/qemu-guest-agent/qemu-guest-agent-4.2.0-r1.ebuild
@@ -3296,8 +3314,8 @@
 2204221039 ./app-emulation/virtualbox-additions/virtualbox-additions-6.1.34.ebuild
 2204042139 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.32.ebuild
 2204221039 ./app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.1.34.ebuild
-2205151610 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32.ebuild
-2205151610 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34.ebuild
+2205281740 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.32-r1.ebuild
+2205281740 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.1.34-r1.ebuild
 2204042139 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.32.ebuild
 2204221039 ./app-emulation/virtualbox-modules/virtualbox-modules-6.1.34.ebuild
 2204042139 ./app-emulation/virtualbox/virtualbox-6.1.32-r1.ebuild
@@ -3337,9 +3355,9 @@
 2205040610 ./app-emulation/xen/xen-4.15.2-r2.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2205131810 ./app-emulation/ruffle/ruffle-0_p20220429.ebuild
-2205131810 ./app-emulation/ruffle/ruffle-9999.ebuild
-2205161010 ./app-emulation/ruffle/ruffle-0_p20220516.ebuild
-2205130040 ./app-emulation/86Box/86Box-3.4.1-r1.ebuild
+2205282240 ./app-emulation/ruffle/ruffle-0_p20220516.ebuild
+2205282240 ./app-emulation/ruffle/ruffle-9999.ebuild
+2205280210 ./app-emulation/86Box/86Box-3.5.ebuild
 2205170740 ./app-emulation/dxvk/dxvk-1.10.1.ebuild
 2205170740 ./app-emulation/dxvk/dxvk-9999.ebuild
 2205140540 ./app-emulation/vkd3d-proton/vkd3d-proton-2.6.ebuild
@@ -3498,7 +3516,7 @@
 2204160540 ./app-i18n/ibus-typing-booster/ibus-typing-booster-2.15.25.ebuild
 2111181639 ./app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild
 2112132239 ./app-i18n/ibus/ibus-1.5.25-r1.ebuild
-2205190840 ./app-i18n/ibus/ibus-1.5.26-r1.ebuild
+2205280910 ./app-i18n/ibus/ibus-1.5.26-r1.ebuild
 2111021739 ./app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
 2111021739 ./app-i18n/im-chooser/im-chooser-1.7.3.ebuild
 2105311239 ./app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild
@@ -3615,9 +3633,9 @@
 1908201609 ./app-laptop/msi-keyboard/msi-keyboard-1.0.ebuild
 2102202239 ./app-laptop/pbbuttonsd/pbbuttonsd-0.8.1a.ebuild
 2105142109 ./app-laptop/pommed/pommed-1.39-r2.ebuild
-2108141239 ./app-laptop/rogauracore/rogauracore-1.4.ebuild
-2109070839 ./app-laptop/rogauracore/rogauracore-1.5.ebuild
-2108141239 ./app-laptop/rogauracore/rogauracore-9999.ebuild
+2205291040 ./app-laptop/rogauracore/rogauracore-1.5.ebuild
+2205290940 ./app-laptop/rogauracore/rogauracore-1.6.ebuild
+2205290940 ./app-laptop/rogauracore/rogauracore-9999.ebuild
 2204031409 ./app-laptop/spicctrl/spicctrl-1.9-r1.ebuild
 2104131039 ./app-laptop/thinkfan/thinkfan-1.0.2.ebuild
 2104131039 ./app-laptop/thinkfan/thinkfan-1.2.1.ebuild
@@ -3715,6 +3733,7 @@
 2203301040 ./app-misc/broot/broot-1.10.0.ebuild
 2204051639 ./app-misc/broot/broot-1.11.1.ebuild
 2205111510 ./app-misc/broot/broot-1.12.0.ebuild
+2205301210 ./app-misc/broot/broot-1.13.0.ebuild
 1908281739 ./app-misc/btail/btail-0.3-r1.ebuild
 2107172139 ./app-misc/byobu/byobu-5.130-r1.ebuild
 2112210709 ./app-misc/byobu/byobu-5.133.ebuild
@@ -3834,7 +3853,7 @@
 2202110009 ./app-misc/glcdprocdriver/glcdprocdriver-0.1.2-r1.ebuild
 2101061639 ./app-misc/glimpse/glimpse-4.18.6-r1.ebuild
 2112210709 ./app-misc/gnote/gnote-40.2.ebuild
-2204032209 ./app-misc/gnote/gnote-42.0.ebuild
+2205280440 ./app-misc/gnote/gnote-42.0.ebuild
 2104190809 ./app-misc/gnuit/gnuit-4.9.5-r2.ebuild
 2205202210 ./app-misc/go-jira/go-jira-1.0.28.ebuild
 2203200240 ./app-misc/golly/golly-4.0.ebuild
@@ -3864,7 +3883,7 @@
 2006202339 ./app-misc/imgurbash2/imgurbash2-3.2.ebuild
 1808230009 ./app-misc/imgurbash2/imgurbash2-9999.ebuild
 2108220339 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
-2204230939 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
+2205271910 ./app-misc/inputlircd/inputlircd-0.0.1_pre15-r3.ebuild
 1803180108 ./app-misc/interceptty/interceptty-0.6-r1.ebuild
 1907151839 ./app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
 2104180939 ./app-misc/irtrans-irserver/irtrans-irserver-6.09.04-r1.ebuild
@@ -4086,11 +4105,11 @@
 2111040010 ./app-misc/tprint/tprint-1.1.0-r1.ebuild
 2203080340 ./app-misc/tracker-miners/tracker-miners-3.2.2.ebuild
 2203081540 ./app-misc/tracker-miners/tracker-miners-3.2.1.ebuild
-2203220339 ./app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
 2205202110 ./app-misc/tracker-miners/tracker-miners-2.3.5-r1.ebuild
+2205280910 ./app-misc/tracker-miners/tracker-miners-3.3.0.ebuild
 2203081540 ./app-misc/tracker/tracker-3.2.1.ebuild
-2203220339 ./app-misc/tracker/tracker-3.3.0.ebuild
 2205202110 ./app-misc/tracker/tracker-2.3.6-r1.ebuild
+2205280910 ./app-misc/tracker/tracker-3.3.0.ebuild
 2202100210 ./app-misc/transfolio/transfolio-1.0.1-r2.ebuild
 2201200039 ./app-misc/trash-cli/trash-cli-0.21.10.24.ebuild
 2204230939 ./app-misc/trash-cli/trash-cli-0.22.4.16.ebuild
@@ -4169,7 +4188,7 @@
 2205170840 ./app-office/gnucash/gnucash-4.5.ebuild
 2205170840 ./app-office/gnucash/gnucash-4.8.ebuild
 2204161540 ./app-office/gnumeric/gnumeric-1.12.51.ebuild
-2205132340 ./app-office/gnumeric/gnumeric-1.12.52.ebuild
+2205280440 ./app-office/gnumeric/gnumeric-1.12.52.ebuild
 2203192040 ./app-office/grisbi/grisbi-2.0.5.ebuild
 2106220139 ./app-office/gtg/gtg-0.4.0.ebuild
 2111190039 ./app-office/gtg/gtg-0.5.ebuild
@@ -4287,6 +4306,8 @@
 2112121739 ./app-portage/golop/golop-0.2.1.ebuild
 2108020539 ./app-portage/gpyutils/gpyutils-0.6.1.ebuild
 2205171010 ./app-portage/gpyutils/gpyutils-0.7.1.ebuild
+2205271810 ./app-portage/gpyutils/gpyutils-0.8.1.ebuild
+2205280910 ./app-portage/gpyutils/gpyutils-0.8.2.ebuild
 2109241439 ./app-portage/grs/grs-0.7.ebuild
 2109241439 ./app-portage/grs/grs-9999.ebuild
 2202041539 ./app-portage/gs-elpa/gs-elpa-0.1.3-r1.ebuild
@@ -4405,6 +4426,7 @@
 2204130709 ./app-shells/nushell/nushell-0.61.0.ebuild
 2205040640 ./app-shells/nushell/nushell-0.62.0.ebuild
 2205221840 ./app-shells/nushell/nushell-0.62.0-r1.ebuild
+2205310610 ./app-shells/nushell/nushell-0.63.1.ebuild
 2203200240 ./app-shells/pdmenu/pdmenu-1.3.6.ebuild
 1912110241 ./app-shells/pdsh/pdsh-2.26-r1.ebuild
 2109250609 ./app-shells/pdsh/pdsh-2.34-r1.ebuild
@@ -4483,6 +4505,7 @@
 2007020309 ./app-text/c2ps/c2ps-4.0.ebuild
 2205190610 ./app-text/calibre/calibre-5.42.0-r1.ebuild
 2205202110 ./app-text/calibre/calibre-5.16.1-r1.ebuild
+2205282010 ./app-text/calibre/calibre-5.43.0.ebuild
 2105260839 ./app-text/capyt/capyt-1.1.1.ebuild
 2108250539 ./app-text/catdoc/catdoc-0.95-r1.ebuild
 2010240239 ./app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -4515,7 +4538,7 @@
 2005201838 ./app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
 2104031909 ./app-text/ding/ding-1.8.1.ebuild
 2012271739 ./app-text/ding/ding-1.9.ebuild
-2112031109 ./app-text/discount/discount-2.2.7-r2.ebuild
+2205271740 ./app-text/discount/discount-2.2.7b.ebuild
 2006261338 ./app-text/djview/djview-4.10.6-r2.ebuild
 2205171110 ./app-text/djvu/djvu-3.5.28-r1.ebuild
 2104060140 ./app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -4551,16 +4574,16 @@
 2109032109 ./app-text/editorconfig-core-c/editorconfig-core-c-0.12.4.ebuild
 2108291209 ./app-text/enchant/enchant-1.6.1-r1.ebuild
 2201241809 ./app-text/enchant/enchant-2.3.2.ebuild
-2204190440 ./app-text/enchant/enchant-1.6.1-r2.ebuild
-2205190840 ./app-text/enchant/enchant-2.3.3-r1.ebuild
+2205290210 ./app-text/enchant/enchant-1.6.1-r2.ebuild
+2205280910 ./app-text/enchant/enchant-2.3.3-r1.ebuild
 2104062209 ./app-text/enscript/enscript-1.6.6.ebuild
 2104060140 ./app-text/epspdf/epspdf-0.6.3-r1.ebuild
 2112290709 ./app-text/epspdf/epspdf-0.6.5.ebuild
 2110120139 ./app-text/epstool/epstool-3.09.ebuild
 2203132039 ./app-text/evince/evince-41.3.ebuild
 2203230939 ./app-text/evince/evince-42.1.ebuild
-2204180040 ./app-text/evince/evince-42.2.ebuild
 2205232310 ./app-text/evince/evince-42.3.ebuild
+2205280910 ./app-text/evince/evince-42.2.ebuild
 2203200240 ./app-text/expander/expander-2.0.5-r2.ebuild
 1911181009 ./app-text/extract_url/extract_url-1.6.2.ebuild
 2003010039 ./app-text/fblog/fblog-1.4.1.ebuild
@@ -4578,7 +4601,7 @@
 2104112239 ./app-text/groonga/groonga-8.0.2-r1.ebuild
 2112142339 ./app-text/grutatxt/grutatxt-2.200.0.ebuild
 2112140209 ./app-text/gspell/gspell-1.9.1.ebuild
-2204192109 ./app-text/gspell/gspell-1.10.0.ebuild
+2205280910 ./app-text/gspell/gspell-1.10.0.ebuild
 2109091040 ./app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
 2108120640 ./app-text/gtkspell/gtkspell-3.0.10.ebuild
 2201250539 ./app-text/gtranslator/gtranslator-40.0.ebuild
@@ -4613,7 +4636,6 @@
 2009190839 ./app-text/jabref-bin/jabref-bin-4.1.ebuild
 2009190839 ./app-text/jabref-bin/jabref-bin-4.3.1.ebuild
 2102252039 ./app-text/jabref-bin/jabref-bin-4.9999.ebuild
-2204022039 ./app-text/jabref/jabref-2.10-r7.ebuild
 2007191339 ./app-text/jo/jo-1.4.ebuild
 2007191339 ./app-text/jo/jo-99999.ebuild
 2105161409 ./app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -4717,7 +4739,7 @@
 2201231639 ./app-text/pdftk/pdftk-3.3.2.ebuild
 2101310343 ./app-text/pelican/pelican-4.5.3.ebuild
 2204102040 ./app-text/pelican/pelican-9999.ebuild
-2204241440 ./app-text/pelican/pelican-4.7.2-r1.ebuild
+2205310610 ./app-text/pelican/pelican-4.7.2-r1.ebuild
 2111060909 ./app-text/pep/pep-2.8-r2.ebuild
 2008191709 ./app-text/pinfo/pinfo-99999.ebuild
 2112101440 ./app-text/pinfo/pinfo-0.6.13.ebuild
@@ -4849,6 +4871,7 @@
 2205160540 ./app-text/xhtml1/xhtml1-20020801-r6.ebuild
 2002112051 ./app-text/xhtml11/xhtml11-20101123.ebuild
 2204130011 ./app-text/xiphos/xiphos-4.2.1.ebuild
+2205300140 ./app-text/xiphos/xiphos-4.2.1-r1.ebuild
 2104192239 ./app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
 2108151013 ./app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
 2001220109 ./app-text/xml2/xml2-0.5.ebuild
@@ -4866,7 +4889,7 @@
 2102091309 ./app-text/xpdf/xpdf-4.03.ebuild
 2205151710 ./app-text/xpdf/xpdf-4.04.ebuild
 2203160010 ./app-text/yelp-tools/yelp-tools-41.0.ebuild
-2203220909 ./app-text/yelp-tools/yelp-tools-42.0.ebuild
+2205280910 ./app-text/yelp-tools/yelp-tools-42.0.ebuild
 2205170840 ./app-text/yodl/yodl-4.03.00.ebuild
 2109141109 ./app-text/zathura-cb/zathura-cb-0.1.8.ebuild
 2109141109 ./app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -5357,8 +5380,8 @@
 2201241809 ./dev-cpp/glibmm/glibmm-2.66.2.ebuild
 2203081240 ./dev-cpp/glibmm/glibmm-2.70.0.ebuild
 2204190010 ./dev-cpp/glibmm/glibmm-2.72.0.ebuild
-2205060810 ./dev-cpp/glibmm/glibmm-2.72.1.ebuild
-2205190840 ./dev-cpp/glibmm/glibmm-2.66.4.ebuild
+2205280910 ./dev-cpp/glibmm/glibmm-2.66.4.ebuild
+2205280910 ./dev-cpp/glibmm/glibmm-2.72.1.ebuild
 2204260610 ./dev-cpp/glog/glog-0.4.0.ebuild
 2205161610 ./dev-cpp/glog/glog-0.5.0.ebuild
 2111121509 ./dev-cpp/gstreamermm/gstreamermm-1.10.0-r1.ebuild
@@ -5367,8 +5390,8 @@
 2102160539 ./dev-cpp/gtkmm/gtkmm-2.24.5-r1.ebuild
 2202080810 ./dev-cpp/gtkmm/gtkmm-3.24.5.ebuild
 2203081240 ./dev-cpp/gtkmm/gtkmm-4.6.0.ebuild
-2205100512 ./dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
 2205150640 ./dev-cpp/gtkmm/gtkmm-4.6.1.ebuild
+2205280910 ./dev-cpp/gtkmm/gtkmm-3.24.6.ebuild
 2203091810 ./dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0-r2.ebuild
 2204211039 ./dev-cpp/gulrak-filesystem/gulrak-filesystem-1.5.12.ebuild
 2106020109 ./dev-cpp/htmlcxx/htmlcxx-0.87.ebuild
@@ -5403,13 +5426,12 @@
 2009160509 ./dev-cpp/popl/popl-9999.ebuild
 2204270740 ./dev-cpp/popl/popl-1.2.0.ebuild
 2111281539 ./dev-cpp/prometheus-cpp/prometheus-cpp-1.0.0.ebuild
+2205301410 ./dev-cpp/prometheus-cpp/prometheus-cpp-1.0.1.ebuild
 2104192239 ./dev-cpp/pstreams/pstreams-1.0.1.ebuild
 2203010309 ./dev-cpp/pystring/pystring-1.1.3-r1.ebuild
 2110011039 ./dev-cpp/random123/random123-1.14.0.ebuild
 2004211209 ./dev-cpp/range-v3/range-v3-0.10.0-r1.ebuild
 2202070939 ./dev-cpp/range-v3/range-v3-0.11.0.ebuild
-2108060709 ./dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.2.ebuild
-2204290652 ./dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5.ebuild
 2205130940 ./dev-cpp/robin-hood-hashing/robin-hood-hashing-3.11.5-r1.ebuild
 2010090039 ./dev-cpp/robin-map/robin-map-9999.ebuild
 2202281039 ./dev-cpp/robin-map/robin-map-0.6.3.ebuild
@@ -5440,8 +5462,8 @@
 2203091810 ./dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
 2204160640 ./dev-cpp/folly/folly-2022.04.11.00.ebuild
 2205161610 ./dev-cpp/folly/folly-2022.03.28.00.ebuild
-2205020010 ./dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r2.ebuild
-2205020010 ./dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r2.ebuild
+2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r3.ebuild
+2205291610 ./dev-cpp/sdbus-c++/sdbus-c++-1.1.0-r3.ebuild
 2203280310 ./dev-cpp/highway/highway-9999.ebuild
 2204290652 ./dev-cpp/highway/highway-0.16.0-r1.ebuild
 2205051910 ./dev-cpp/opentelemetry-cpp/opentelemetry-cpp-1.3.0-r2.ebuild
@@ -5751,8 +5773,7 @@
 2109301609 ./dev-embedded/stm32flash/stm32flash-0.6.ebuild
 2201150410 ./dev-embedded/sunxi-tools/sunxi-tools-1.3-r1.ebuild
 2201232209 ./dev-embedded/sunxi-tools/sunxi-tools-1.4.1-r1.ebuild
-2203070310 ./dev-embedded/u-boot-tools/u-boot-tools-2022.01.ebuild
-2204272310 ./dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
+2205281940 ./dev-embedded/u-boot-tools/u-boot-tools-2022.04.ebuild
 2009162139 ./dev-embedded/uisp/uisp-20050207-r1.ebuild
 1910191339 ./dev-embedded/upslug2/upslug2-11.ebuild
 2102181209 ./dev-embedded/urjtag/urjtag-2019.12.ebuild
@@ -5760,6 +5781,7 @@
 2109280510 ./dev-embedded/usbprog/usbprog-0.3.0_p20140828-r1.ebuild
 2205162240 ./dev-embedded/xa/xa-2.3.13.ebuild
 2006280009 ./dev-embedded/zmac/zmac-1.3-r1.ebuild
+2205292110 ./dev-embedded/mavlink_c/mavlink_c-20220518.ebuild
 2008061509 ./dev-erlang/base64url/base64url-1.0.1.ebuild
 2201202339 ./dev-erlang/cache_tab/cache_tab-1.0.29.ebuild
 2205172310 ./dev-erlang/cache_tab/cache_tab-1.0.30.ebuild
@@ -6748,6 +6770,7 @@
 2112251640 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.5.1.ebuild
 2205111040 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.15-r1.ebuild
 2205111040 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22.ebuild
+2205301210 ./dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.22-r1.ebuild
 2205052110 ./dev-java/ant-ivy/ant-ivy-2.5.0-r1.ebuild
 2010142239 ./dev-java/ant-jai/ant-jai-1.10.9.ebuild
 2203031039 ./dev-java/ant-javamail/ant-javamail-1.10.9-r1.ebuild
@@ -6811,6 +6834,7 @@
 2112222209 ./dev-java/commons-compress/commons-compress-1.21.ebuild
 2203081640 ./dev-java/commons-csv/commons-csv-1.9.0.ebuild
 2203121839 ./dev-java/commons-daemon/commons-daemon-1.2.4.ebuild
+2205301210 ./dev-java/commons-daemon/commons-daemon-1.3.1.ebuild
 2202171040 ./dev-java/commons-digester/commons-digester-2.1-r2.ebuild
 2202171040 ./dev-java/commons-digester/commons-digester-3.2-r3.ebuild
 2202202339 ./dev-java/commons-httpclient/commons-httpclient-3.1-r2.ebuild
@@ -6835,6 +6859,7 @@
 2205101640 ./dev-java/eclipse-ecj/eclipse-ecj-4.15.ebuild
 2205101640 ./dev-java/eclipse-ecj/eclipse-ecj-4.5.1.ebuild
 2205111040 ./dev-java/eclipse-ecj/eclipse-ecj-4.22.ebuild
+2205301210 ./dev-java/eclipse-ecj/eclipse-ecj-4.22-r1.ebuild
 2202151439 ./dev-java/emma/emma-2.0.5312-r4.ebuild
 2202202239 ./dev-java/error-prone-annotations/error-prone-annotations-2.7.1.ebuild
 2203281010 ./dev-java/fec/fec-1.0.4-r4.ebuild
@@ -6845,7 +6870,6 @@
 2103301109 ./dev-java/glassfish-jms-api/glassfish-jms-api-1.1.2.2.04-r2.ebuild
 2202090440 ./dev-java/glassfish-persistence/glassfish-persistence-1.0-r2.ebuild
 2202191640 ./dev-java/glassfish-xmlrpc-api/glassfish-xmlrpc-api-1.1.1-r1.ebuild
-2203152309 ./dev-java/glazedlists/glazedlists-1.8.0-r2.ebuild
 2201181539 ./dev-java/gnu-jaf/gnu-jaf-1.1.2.ebuild
 2205092240 ./dev-java/gnu-jaf/gnu-jaf-1.1.2-r1.ebuild
 2203170440 ./dev-java/gnu-regexp/gnu-regexp-1.1.4-r4.ebuild
@@ -6934,14 +6958,12 @@
 2104191439 ./dev-java/jdom/jdom-1.1.3-r1.ebuild
 2105161809 ./dev-java/jdom/jdom-2.0.6-r5.ebuild
 2205222040 ./dev-java/jdom/jdom-2.0.6.1.ebuild
-1912031339 ./dev-java/jempbox/jempbox-1.7.1-r1.ebuild
 2111232009 ./dev-java/jffi/jffi-1.3.6.ebuild
 2112271940 ./dev-java/jffi/jffi-1.2.9-r1.ebuild
 2111111409 ./dev-java/jflex/jflex-1.6.1-r1.ebuild
 2103121539 ./dev-java/jformatstring/jformatstring-2.0.3-r1.ebuild
 2203152309 ./dev-java/jgoodies-common/jgoodies-common-1.8.0-r1.ebuild
 2105241039 ./dev-java/jgoodies-looks/jgoodies-looks-2.6.0-r1.ebuild
-1910051539 ./dev-java/jgraph/jgraph-5.12.0.4-r1.ebuild
 2111101209 ./dev-java/jide-oss/jide-oss-3.7.12.ebuild
 2112222209 ./dev-java/jline/jline-2.14.6.ebuild
 2201201609 ./dev-java/jmh-core/jmh-core-1.21.ebuild
@@ -6963,6 +6985,7 @@
 1808051709 ./dev-java/jopt-simple/jopt-simple-5.0.ebuild
 2202172240 ./dev-java/jopt-simple/jopt-simple-4.6-r1.ebuild
 2205052040 ./dev-java/jopt-simple/jopt-simple-5.0-r1.ebuild
+2205301210 ./dev-java/jopt-simple/jopt-simple-5.0.4.ebuild
 2204241440 ./dev-java/jrobin/jrobin-1.6.0-r2.ebuild
 2111261239 ./dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild
 2202170109 ./dev-java/jsch/jsch-0.1.55.ebuild
@@ -6991,7 +7014,6 @@
 2204010840 ./dev-java/mchange-commons/mchange-commons-0.2.20.ebuild
 2111241239 ./dev-java/mersennetwister/mersennetwister-0_pre23765-r2.ebuild
 2203101340 ./dev-java/metainf-services/metainf-services-1.7-r1.ebuild
-2204191209 ./dev-java/microba/microba-0.4.4.3-r2.ebuild
 2105041239 ./dev-java/miglayout/miglayout-4.0-r1.ebuild
 2205122010 ./dev-java/mill-bin/mill-bin-0.10.2.ebuild
 2205122010 ./dev-java/mill-bin/mill-bin-0.10.4.ebuild
@@ -7063,7 +7085,6 @@
 2103271109 ./dev-java/spec-alpha/spec-alpha-0.2.194.ebuild
 2112260340 ./dev-java/spec-alpha/spec-alpha-0.1.143.ebuild
 2112260340 ./dev-java/spec-alpha/spec-alpha-0.2.176.ebuild
-2203101340 ./dev-java/spin/spin-1.5-r2.ebuild
 2111240109 ./dev-java/stringtemplate/stringtemplate-3.2.1-r2.ebuild
 2205052110 ./dev-java/stringtemplate/stringtemplate-4.3.2.ebuild
 2203081640 ./dev-java/sun-jai-bin/sun-jai-bin-1.1.3-r2.ebuild
@@ -7233,7 +7254,7 @@
 2109260309 ./dev-lang/icon/icon-9.5.20i.ebuild
 2111021139 ./dev-lang/inform/inform-6.33.1_p2.ebuild
 2111021139 ./dev-lang/inform/inform-6.35_p4.ebuild
-2105022009 ./dev-lang/interprolog/interprolog-2.1.2.ebuild
+2205272110 ./dev-lang/interprolog/interprolog-2.1.2.ebuild
 2111071509 ./dev-lang/ispc/ispc-1.16.1.ebuild
 2205201640 ./dev-lang/ispc/ispc-1.17.0-r2.ebuild
 2205201440 ./dev-lang/ispc/ispc-9999.ebuild
@@ -7324,7 +7345,7 @@
 2204222109 ./dev-lang/perl/perl-5.34.0-r9.ebuild
 2204222109 ./dev-lang/perl/perl-5.34.1-r2.ebuild
 2204290540 ./dev-lang/perl/perl-5.34.1-r3.ebuild
-2205260210 ./dev-lang/perl/perl-5.36.0_rc3.ebuild
+2205280410 ./dev-lang/perl/perl-5.36.0.ebuild
 2203230410 ./dev-lang/php/php-7.4.28-r1.ebuild
 2203230410 ./dev-lang/php/php-8.0.16-r1.ebuild
 2204181740 ./dev-lang/php/php-8.0.18.ebuild
@@ -7403,14 +7424,14 @@
 2112230040 ./dev-lang/typescript/typescript-4.5.4.ebuild
 2201241809 ./dev-lang/vala/vala-0.50.10.ebuild
 2201241809 ./dev-lang/vala/vala-0.52.10.ebuild
-2202152139 ./dev-lang/vala/vala-0.54.7.ebuild
 2203220339 ./dev-lang/vala/vala-0.56.0.ebuild
-2205060610 ./dev-lang/vala/vala-0.56.1.ebuild
+2205280910 ./dev-lang/vala/vala-0.54.7.ebuild
+2205280910 ./dev-lang/vala/vala-0.56.1.ebuild
 2012271409 ./dev-lang/whitespace/whitespace-0.4.ebuild
 2105081809 ./dev-lang/xsb/xsb-3.8.0.ebuild
 2108061609 ./dev-lang/xsb/xsb-4.0.0.ebuild
 2205210940 ./dev-lang/yap/yap-7.0.1.ebuild
-2205210940 ./dev-lang/yap/yap-7.1.0.ebuild
+2205271940 ./dev-lang/yap/yap-7.1.0.ebuild
 2101062239 ./dev-lang/yasm/yasm-1.3.0-r1.ebuild
 2205271110 ./dev-lang/zig/zig-0.9.1.ebuild
 2205271110 ./dev-lang/zig/zig-9999.ebuild
@@ -7448,7 +7469,7 @@
 1912252009 ./dev-libs/atcore/atcore-1.0.0.ebuild
 2205171110 ./dev-libs/atf/atf-0.21-r2.ebuild
 2111180910 ./dev-libs/atk/atk-2.36.0.ebuild
-2205171110 ./dev-libs/atk/atk-2.38.0.ebuild
+2205280910 ./dev-libs/atk/atk-2.38.0.ebuild
 2109252239 ./dev-libs/avro-c/avro-c-1.9.1-r1.ebuild
 2103270909 ./dev-libs/aws-c-cal/aws-c-cal-0.4.5.ebuild
 2012131409 ./dev-libs/aws-c-common/aws-c-common-0.4.62.ebuild
@@ -7546,7 +7567,7 @@
 2106051409 ./dev-libs/editline/editline-1.17.1.ebuild
 2105232239 ./dev-libs/eekboard/eekboard-1.0.8_p20121001-r1.ebuild
 2111080239 ./dev-libs/efl/efl-1.25.1-r13.ebuild
-2203141939 ./dev-libs/efl/efl-1.26.2.ebuild
+2205291010 ./dev-libs/efl/efl-1.26.2.ebuild
 2204090610 ./dev-libs/elfutils/elfutils-0.185.ebuild
 2204090610 ./dev-libs/elfutils/elfutils-0.186.ebuild
 2205010512 ./dev-libs/elfutils/elfutils-0.187.ebuild
@@ -7556,7 +7577,7 @@
 2104190739 ./dev-libs/eventlog/eventlog-0.2.12.ebuild
 2202221139 ./dev-libs/expat/expat-2.4.6.ebuild
 2203122339 ./dev-libs/expat/expat-2.4.7.ebuild
-2205271010 ./dev-libs/expat/expat-2.4.8.ebuild
+2205272110 ./dev-libs/expat/expat-2.4.8.ebuild
 2202140039 ./dev-libs/faxpp/faxpp-0.4-r2.ebuild
 2109282339 ./dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
 2103191609 ./dev-libs/fddl/fddl-20111124-r1.ebuild
@@ -7566,12 +7587,12 @@
 2112170039 ./dev-libs/flatbuffers/flatbuffers-2.0.0-r1.ebuild
 2205020410 ./dev-libs/flatbuffers/flatbuffers-2.0.6.ebuild
 2203081240 ./dev-libs/folks/folks-0.15.4.ebuild
-2203262110 ./dev-libs/folks/folks-0.15.5.ebuild
+2205280910 ./dev-libs/folks/folks-0.15.5.ebuild
 2106190039 ./dev-libs/foma/foma-0.9.18-r1.ebuild
 2101130309 ./dev-libs/freexl/freexl-1.0.5.ebuild
 2108150239 ./dev-libs/freexl/freexl-1.0.6.ebuild
 2203181810 ./dev-libs/fribidi/fribidi-1.0.11.ebuild
-2205090840 ./dev-libs/fribidi/fribidi-1.0.12.ebuild
+2205280910 ./dev-libs/fribidi/fribidi-1.0.12.ebuild
 2108082309 ./dev-libs/fstrm/fstrm-0.6.1.ebuild
 2111060742 ./dev-libs/gdl/gdl-3.40.0.ebuild
 2107250209 ./dev-libs/geoip/geoip-1.6.12.ebuild
@@ -7584,15 +7605,16 @@
 2205050710 ./dev-libs/girara/girara-0.3.7.ebuild
 2011061839 ./dev-libs/gjs/gjs-1.64.4.ebuild
 2203091910 ./dev-libs/gjs/gjs-1.70.1.ebuild
-2203150739 ./dev-libs/gjs/gjs-1.64.5.ebuild
-2203202309 ./dev-libs/gjs/gjs-1.72.0.ebuild
+2205280610 ./dev-libs/gjs/gjs-1.64.5.ebuild
+2205280910 ./dev-libs/gjs/gjs-1.72.0.ebuild
 2204230409 ./dev-libs/glib/glib-2.70.4.ebuild
 2204230409 ./dev-libs/glib/glib-2.72.0.ebuild
-2205010512 ./dev-libs/glib/glib-2.72.1.ebuild
+2205280910 ./dev-libs/glib/glib-2.72.1.ebuild
+2205302140 ./dev-libs/glib/glib-2.72.2.ebuild
 2204140710 ./dev-libs/gmime/gmime-2.6.23-r1.ebuild
-2204140710 ./dev-libs/gmime/gmime-3.2.11.ebuild
 2204140710 ./dev-libs/gmime/gmime-3.2.7.ebuild
 2204140710 ./dev-libs/gmime/gmime-3.2.9.ebuild
+2205280910 ./dev-libs/gmime/gmime-3.2.11.ebuild
 2201021239 ./dev-libs/gmp/gmp-6.2.1-r1.ebuild
 2204290540 ./dev-libs/gmp/gmp-6.2.1-r2.ebuild
 1712231939 ./dev-libs/gnulib/gnulib-9999-r1.ebuild
@@ -7600,9 +7622,9 @@
 2204130011 ./dev-libs/gnulib/gnulib-2022.02.12.16.27.05.ebuild
 2205262110 ./dev-libs/gnulib/gnulib-2022.05.26.07.24.56.ebuild
 2201242239 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.70.0.ebuild
-2205010512 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
+2205280910 ./dev-libs/gobject-introspection-common/gobject-introspection-common-1.72.0.ebuild
 2201270440 ./dev-libs/gobject-introspection/gobject-introspection-1.70.0.ebuild
-2205010512 ./dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
+2205280910 ./dev-libs/gobject-introspection/gobject-introspection-1.72.0.ebuild
 2204162340 ./dev-libs/gom/gom-0.4.ebuild
 2103070009 ./dev-libs/gost-engine/gost-engine-1.1.0.3_p20181031-r2.ebuild
 2109201609 ./dev-libs/gost-engine/gost-engine-3.0.0.ebuild
@@ -7646,20 +7668,20 @@
 2205140310 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.19.23136-r1.ebuild
 2205211710 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.17.23034-r1.ebuild
 2205211710 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.20.23198.ebuild
+2205280140 ./dev-libs/intel-compute-runtime/intel-compute-runtime-22.21.23269.ebuild
 2205041140 ./dev-libs/isl/isl-0.24-r2.ebuild
 2004032241 ./dev-libs/ivykis/ivykis-0.42.4.ebuild
 2104060140 ./dev-libs/jansson/jansson-2.13.1-r1.ebuild
 2205010512 ./dev-libs/jansson/jansson-2.14.ebuild
 2201201509 ./dev-libs/jemalloc/jemalloc-5.2.1-r1.ebuild
-2205140840 ./dev-libs/jemalloc/jemalloc-5.3.0.ebuild
+2205290010 ./dev-libs/jemalloc/jemalloc-5.3.0.ebuild
 2105012139 ./dev-libs/jerasure/jerasure-2.0.0-r2.ebuild
-2104060140 ./dev-libs/json-c/json-c-0.15.ebuild
 2204281010 ./dev-libs/json-c/json-c-9999.ebuild
-2205070740 ./dev-libs/json-c/json-c-0.16-r1.ebuild
+2205301010 ./dev-libs/json-c/json-c-0.16-r1.ebuild
 2205251440 ./dev-libs/json-glib/json-glib-1.6.6-r1.ebuild
-2204291110 ./dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+2205301640 ./dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
 2201240710 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.40.0.ebuild
-2203220609 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
+2205280440 ./dev-libs/jsonrpc-glib/jsonrpc-glib-3.42.0.ebuild
 2102171139 ./dev-libs/jthread/jthread-1.3.3.ebuild
 2105042239 ./dev-libs/judy/judy-1.0.5-r2.ebuild
 2107120109 ./dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -7729,13 +7751,14 @@
 2204212009 ./dev-libs/libclc/libclc-13.0.1.ebuild
 2204271540 ./dev-libs/libclc/libclc-15.0.0.9999.ebuild
 2204301040 ./dev-libs/libclc/libclc-14.0.3.ebuild
+2205292310 ./dev-libs/libclc/libclc-14.0.4.ebuild
 2104161439 ./dev-libs/libclthreads/libclthreads-2.4.2.ebuild
 2205190840 ./dev-libs/libconfig/libconfig-1.7.3.ebuild
 2205171110 ./dev-libs/libcroco/libcroco-0.6.13-r1.ebuild
 2203222209 ./dev-libs/libcss/libcss-0.9.1-r1.ebuild
 2205190840 ./dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
 2203081540 ./dev-libs/libdazzle/libdazzle-3.42.0.ebuild
-2203220609 ./dev-libs/libdazzle/libdazzle-3.44.0.ebuild
+2205280910 ./dev-libs/libdazzle/libdazzle-3.44.0.ebuild
 2103310109 ./dev-libs/libdbh/libdbh-5.0.22.ebuild
 2205251440 ./dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
 2105251739 ./dev-libs/libdbusmenu/libdbusmenu-16.04.0-r1.ebuild
@@ -7760,8 +7783,7 @@
 2012311940 ./dev-libs/libestr/libestr-0.1.11.ebuild
 2205051310 ./dev-libs/libev/libev-4.33.ebuild
 2110132209 ./dev-libs/libevdev/libevdev-9999.ebuild
-2202061609 ./dev-libs/libevdev/libevdev-1.12.0.ebuild
-2205252110 ./dev-libs/libevdev/libevdev-1.12.1.ebuild
+2205280440 ./dev-libs/libevdev/libevdev-1.12.1.ebuild
 2105021909 ./dev-libs/libevent/libevent-2.1.11.ebuild
 2105021909 ./dev-libs/libevent/libevent-2.1.9999.ebuild
 2105021909 ./dev-libs/libevent/libevent-9999.ebuild
@@ -7812,9 +7834,9 @@
 2204111109 ./dev-libs/libgit2/libgit2-1.4.2-r1.ebuild
 2204121139 ./dev-libs/libgit2/libgit2-1.4.2.ebuild
 2204130840 ./dev-libs/libgit2/libgit2-1.3.1.ebuild
-2204130840 ./dev-libs/libgit2/libgit2-1.4.3.ebuild
+2205280910 ./dev-libs/libgit2/libgit2-1.4.3.ebuild
 2202080810 ./dev-libs/libgnome-games-support/libgnome-games-support-1.8.2.ebuild
-2203220609 ./dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
+2205280910 ./dev-libs/libgnome-games-support/libgnome-games-support-2.0.0.ebuild
 2110070239 ./dev-libs/libgnt/libgnt-2.14.2.ebuild
 2201190139 ./dev-libs/libgnt/libgnt-2.14.3.ebuild
 2106131409 ./dev-libs/libgpg-error/libgpg-error-1.42.ebuild
@@ -7826,7 +7848,7 @@
 2205241440 ./dev-libs/libgudev/libgudev-237-r1.ebuild
 2205171640 ./dev-libs/libgusb/libgusb-0.3.10.ebuild
 2110272109 ./dev-libs/libgweather/libgweather-40.0.ebuild
-2203221339 ./dev-libs/libgweather/libgweather-4.0.0.ebuild
+2205280910 ./dev-libs/libgweather/libgweather-4.0.0.ebuild
 2202100210 ./dev-libs/libhid/libhid-0.2.17-r1.ebuild
 2201201609 ./dev-libs/libical/libical-3.0.12.ebuild
 2205181810 ./dev-libs/libical/libical-3.0.14-r1.ebuild
@@ -7837,7 +7859,7 @@
 2103191409 ./dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
 2108180309 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
 2205131010 ./dev-libs/libinput/libinput-1.20.1.ebuild
-2204090539 ./dev-libs/libintl/libintl-0.21.ebuild
+2205300610 ./dev-libs/libintl/libintl-0.21.ebuild
 2202021039 ./dev-libs/libisoburn/libisoburn-1.5.4.ebuild
 2202021039 ./dev-libs/libisofs/libisofs-1.5.4.ebuild
 2104281039 ./dev-libs/libite/libite-2.4.0.ebuild
@@ -7909,7 +7931,7 @@
 2204121039 ./dev-libs/libpcre2/libpcre2-10.39-r1.ebuild
 2205192340 ./dev-libs/libpcre2/libpcre2-10.40.ebuild
 2203220609 ./dev-libs/libpeas/libpeas-1.30.0.ebuild
-2203220609 ./dev-libs/libpeas/libpeas-1.32.0.ebuild
+2205291410 ./dev-libs/libpeas/libpeas-1.32.0.ebuild
 2203200410 ./dev-libs/libpfm/libpfm-4.11.0.ebuild
 2201211609 ./dev-libs/libphonenumber/libphonenumber-8.12.39.ebuild
 2202231639 ./dev-libs/libpipeline/libpipeline-1.5.5.ebuild
@@ -7925,7 +7947,7 @@
 2109301539 ./dev-libs/libpreludedb/libpreludedb-5.2.0.ebuild
 2106290913 ./dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
 2204162340 ./dev-libs/libpwquality/libpwquality-1.4.4.ebuild
-2205132340 ./dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
+2205292340 ./dev-libs/libpwquality/libpwquality-1.4.4-r1.ebuild
 2110211709 ./dev-libs/libpy/libpy-0.2.5-r1.ebuild
 2107261109 ./dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
 2204151640 ./dev-libs/libqtxdg/libqtxdg-3.8.0.ebuild
@@ -8018,8 +8040,8 @@
 2109260239 ./dev-libs/libutf8proc/libutf8proc-2.5.0.ebuild
 2109260239 ./dev-libs/libutf8proc/libutf8proc-2.6.1.ebuild
 2201301239 ./dev-libs/libutf8proc/libutf8proc-2.7.0.ebuild
-2205051310 ./dev-libs/libuv/libuv-9999.ebuild
-2205070910 ./dev-libs/libuv/libuv-1.44.1.ebuild
+2205301640 ./dev-libs/libuv/libuv-1.44.1.ebuild
+2205301640 ./dev-libs/libuv/libuv-9999.ebuild
 2111122239 ./dev-libs/libvarlink/libvarlink-22.ebuild
 2205050910 ./dev-libs/libvarlink/libvarlink-23.ebuild
 2104060140 ./dev-libs/libverto/libverto-0.3.1-r1.ebuild
@@ -8035,6 +8057,7 @@
 2203312210 ./dev-libs/libvterm/libvterm-0.1.4.ebuild
 2108240140 ./dev-libs/libwacom/libwacom-1.11.ebuild
 2205202140 ./dev-libs/libwacom/libwacom-1.12.ebuild
+2205301840 ./dev-libs/libwacom/libwacom-2.2.0.ebuild
 2203222209 ./dev-libs/libwapcaplet/libwapcaplet-0.4.3-r1.ebuild
 2102271939 ./dev-libs/libwbxml/libwbxml-0.11.7.ebuild
 2202262239 ./dev-libs/libwbxml/libwbxml-0.11.7-r1.ebuild
@@ -8075,9 +8098,9 @@
 2201291839 ./dev-libs/marisa/marisa-9999.ebuild
 2205190840 ./dev-libs/marisa/marisa-0.2.6.ebuild
 2202280239 ./dev-libs/mathjax/mathjax-2.7.7.ebuild
-2205250010 ./dev-libs/metee/metee-3.1.3.ebuild
+2205281710 ./dev-libs/metee/metee-3.1.3.ebuild
 2204131310 ./dev-libs/mimalloc/mimalloc-2.0.5-r2.ebuild
-2205241940 ./dev-libs/mimalloc/mimalloc-2.0.6.ebuild
+2205281310 ./dev-libs/mimalloc/mimalloc-2.0.6.ebuild
 2203220309 ./dev-libs/mimetic/mimetic-0.9.8.ebuild
 2203122239 ./dev-libs/miniz/miniz-2.2.0.ebuild
 2203161139 ./dev-libs/miniz/miniz-2.1.0-r3.ebuild
@@ -8128,8 +8151,8 @@
 2107211609 ./dev-libs/openssl/openssl-1.0.2u-r1.ebuild
 2204110410 ./dev-libs/openssl/openssl-3.0.2.ebuild
 2204290540 ./dev-libs/openssl/openssl-1.1.1n.ebuild
-2205192340 ./dev-libs/openssl/openssl-1.1.1o.ebuild
 2205190840 ./dev-libs/openssl/openssl-3.0.3.ebuild
+2205280710 ./dev-libs/openssl/openssl-1.1.1o.ebuild
 2203171639 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
 2203212039 ./dev-libs/ossp-uuid/ossp-uuid-1.6.2-r7.ebuild
 2108271839 ./dev-libs/pakchois/pakchois-0.4-r2.ebuild
@@ -8247,6 +8270,7 @@
 2112212139 ./dev-libs/satyr/satyr-0.39.ebuild
 2202271339 ./dev-libs/sdformat/sdformat-9.7.0.ebuild
 2112211239 ./dev-libs/serd/serd-0.30.10.ebuild
+2205291010 ./dev-libs/serd/serd-0.30.12.ebuild
 2202111809 ./dev-libs/serdisplib/serdisplib-2.02-r2.ebuild
 2203200410 ./dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
 2201061409 ./dev-libs/simdjson/simdjson-1.0.0-r1.ebuild
@@ -8260,7 +8284,8 @@
 2205251240 ./dev-libs/snowball-stemmer/snowball-stemmer-2.2.0.ebuild
 2205191340 ./dev-libs/softhsm/softhsm-2.6.1-r2.ebuild
 2112181509 ./dev-libs/sord/sord-0.16.8-r1.ebuild
-2112181509 ./dev-libs/sord/sord-9999.ebuild
+2205291010 ./dev-libs/sord/sord-0.16.10.ebuild
+2205291010 ./dev-libs/sord/sord-9999.ebuild
 2108280513 ./dev-libs/spdlog/spdlog-9999.ebuild
 2205110410 ./dev-libs/spdlog/spdlog-1.9.2-r1.ebuild
 2205110440 ./dev-libs/spdlog/spdlog-1.9.2.ebuild
@@ -8273,7 +8298,7 @@
 2203110039 ./dev-libs/stb/stb-20200713.ebuild
 2107180039 ./dev-libs/stfl/stfl-0.24-r4.ebuild
 2008302139 ./dev-libs/template-glib/template-glib-3.34.0.ebuild
-2203220609 ./dev-libs/template-glib/template-glib-3.34.1.ebuild
+2205280440 ./dev-libs/template-glib/template-glib-3.34.1.ebuild
 2109291739 ./dev-libs/tinyxml/tinyxml-2.6.2-r4.ebuild
 2109140839 ./dev-libs/tinyxml2/tinyxml2-9.0.0.ebuild
 2105101009 ./dev-libs/tntnet/tntnet-3.0.ebuild
@@ -8327,19 +8352,18 @@
 2201242239 ./dev-libs/vala-common/vala-common-0.52.10.ebuild
 2202152139 ./dev-libs/vala-common/vala-common-0.54.7.ebuild
 2203210510 ./dev-libs/vala-common/vala-common-0.56.0.ebuild
-2205060610 ./dev-libs/vala-common/vala-common-0.56.1.ebuild
+2205280910 ./dev-libs/vala-common/vala-common-0.56.1.ebuild
 2105251739 ./dev-libs/vc/vc-1.4.1-r1.ebuild
 2202162309 ./dev-libs/vc/vc-1.4.2.ebuild
 2205231840 ./dev-libs/vc/vc-1.4.3.ebuild
 2203031009 ./dev-libs/voikko-fi/voikko-fi-2.5.ebuild
 2204121410 ./dev-libs/volume_key/volume_key-0.3.12-r4.ebuild
-2202020039 ./dev-libs/wayland-protocols/wayland-protocols-1.24.ebuild
 2205100440 ./dev-libs/wayland-protocols/wayland-protocols-9999.ebuild
 2205132210 ./dev-libs/wayland-protocols/wayland-protocols-1.25.ebuild
 2205090610 ./dev-libs/wayland/wayland-1.20.0.ebuild
 2205090610 ./dev-libs/wayland/wayland-9999.ebuild
 2202060209 ./dev-libs/weston/weston-9999.ebuild
-2205150640 ./dev-libs/weston/weston-10.0.0.ebuild
+2205280810 ./dev-libs/weston/weston-10.0.0.ebuild
 2002182239 ./dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
 2107072239 ./dev-libs/xapian-bindings/xapian-bindings-1.4.18-r1.ebuild
 2201170510 ./dev-libs/xapian-bindings/xapian-bindings-1.4.19.ebuild
@@ -8398,7 +8422,7 @@
 2205130040 ./dev-libs/intel-vc-intrinsics/intel-vc-intrinsics-0.4.2.ebuild
 2204220139 ./dev-libs/nwjs/nwjs-0.63.1.ebuild
 2203310210 ./dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild
-2205150640 ./dev-libs/libportal/libportal-0.6.ebuild
+2205280910 ./dev-libs/libportal/libportal-0.6.ebuild
 2205051910 ./dev-libs/thrift/thrift-0.16.0-r1.ebuild
 2205171010 ./dev-libs/FP16/FP16-2021.03.20-r2.ebuild
 2205101240 ./dev-libs/FXdiv/FXdiv-2020.12.09.ebuild
@@ -8409,6 +8433,7 @@
 2205171010 ./dev-libs/sleef/sleef-3.5.1.ebuild
 2205202310 ./dev-libs/asmjit/asmjit-2021.11.13.ebuild
 2205260840 ./dev-libs/FBGEMM/FBGEMM-2022.01.13.ebuild
+2205272040 ./dev-libs/libnop/libnop-2021.11.03.ebuild
 2112260340 ./dev-lisp/abcl/abcl-1.8.0.ebuild
 2205132310 ./dev-lisp/alexandria/alexandria-1.4.ebuild
 2205150110 ./dev-lisp/asdf/asdf-3.3.5.ebuild
@@ -8621,6 +8646,7 @@
 2204150310 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.1.ebuild
 2204271540 ./dev-ml/llvm-ocaml/llvm-ocaml-15.0.0.9999.ebuild
 2204301040 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.3.ebuild
+2205292310 ./dev-ml/llvm-ocaml/llvm-ocaml-14.0.4.ebuild
 2204190039 ./dev-ml/logs/logs-0.7.0-r1.ebuild
 2201100109 ./dev-ml/luv/luv-0.5.10-r3.ebuild
 2204190039 ./dev-ml/luv/luv-0.5.11.ebuild
@@ -8945,10 +8971,9 @@
 2104111639 ./dev-perl/Algorithm-Diff/Algorithm-Diff-1.201.0.ebuild
 2008242239 ./dev-perl/Algorithm-Munkres/Algorithm-Munkres-0.80.0-r2.ebuild
 2105061339 ./dev-perl/Alien-Base-ModuleBuild/Alien-Base-ModuleBuild-1.150.0.ebuild
-2105061339 ./dev-perl/Alien-Build/Alien-Build-2.380.0.ebuild
 2112122139 ./dev-perl/Alien-Build/Alien-Build-2.420.0.ebuild
+2205310040 ./dev-perl/Alien-Build/Alien-Build-2.480.0.ebuild
 2107242339 ./dev-perl/Alien-GMP/Alien-GMP-1.160.0.ebuild
-2104110109 ./dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.33.0-r1.ebuild
 2112130939 ./dev-perl/Alien-Gnuplot/Alien-Gnuplot-1.34.0.ebuild
 2112080839 ./dev-perl/Alien-HDF4/Alien-HDF4-0.50.0.ebuild
 2007030339 ./dev-perl/Alien-LibGumbo/Alien-LibGumbo-0.50.0-r2.ebuild
@@ -9024,6 +9049,7 @@
 2111210809 ./dev-perl/B-Hooks-OP-Check/B-Hooks-OP-Check-0.220.0-r1.ebuild
 2007031839 ./dev-perl/B-Hooks-Parser/B-Hooks-Parser-0.210.0-r1.ebuild
 2108080309 ./dev-perl/B-Keywords/B-Keywords-1.220.0.ebuild
+2205281540 ./dev-perl/B-Keywords/B-Keywords-1.240.0.ebuild
 2007031839 ./dev-perl/B-OPCheck/B-OPCheck-0.320.0-r1.ebuild
 2012311940 ./dev-perl/B-Utils/B-Utils-0.270.0-r2.ebuild
 2007031839 ./dev-perl/BDB/BDB-1.920.0-r1.ebuild
@@ -9269,7 +9295,7 @@
 2205141010 ./dev-perl/DBD-SQLite/DBD-SQLite-1.700.0.ebuild
 2205191040 ./dev-perl/DBD-mysql/DBD-mysql-4.50.0-r1.ebuild
 2106070939 ./dev-perl/DBI-Shell/DBI-Shell-11.970.0.ebuild
-2205141010 ./dev-perl/DBI/DBI-1.643.0.ebuild
+2205290010 ./dev-perl/DBI/DBI-1.643.0.ebuild
 2007090909 ./dev-perl/DBICx-TestDatabase/DBICx-TestDatabase-0.50.0-r1.ebuild
 2007132309 ./dev-perl/DBIx-Class-DynamicDefault/DBIx-Class-DynamicDefault-0.40.0-r1.ebuild
 2110212209 ./dev-perl/DBIx-Class-InflateColumn-Boolean/DBIx-Class-InflateColumn-Boolean-0.3.0-r1.ebuild
@@ -9776,7 +9802,7 @@
 2109211710 ./dev-perl/Inline-C/Inline-C-0.810.0.ebuild
 2108031609 ./dev-perl/Inline-Files/Inline-Files-0.710.0.ebuild
 2106070309 ./dev-perl/Inline-Python/Inline-Python-0.560.0-r1.ebuild
-2109211710 ./dev-perl/Inline/Inline-0.860.0.ebuild
+2205281740 ./dev-perl/Inline/Inline-0.860.0.ebuild
 2106221609 ./dev-perl/JSON-Any/JSON-Any-1.390.0-r1.ebuild
 2205141010 ./dev-perl/JSON-MaybeXS/JSON-MaybeXS-1.4.3.ebuild
 2203091610 ./dev-perl/JSON-Parse/JSON-Parse-0.610.0.ebuild
@@ -10084,7 +10110,8 @@
 2107171939 ./dev-perl/Net-SSH-AuthorizedKeysFile/Net-SSH-AuthorizedKeysFile-0.180.0-r1.ebuild
 2107171939 ./dev-perl/Net-SSH-Perl/Net-SSH-Perl-2.140.0-r1.ebuild
 2107162109 ./dev-perl/Net-SSH2/Net-SSH2-0.720.0.ebuild
-2204290540 ./dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
+2205291440 ./dev-perl/Net-SSLeay/Net-SSLeay-1.900.0.ebuild
+2205291440 ./dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
 2107160109 ./dev-perl/Net-Server-Coro/Net-Server-Coro-1.300.0-r2.ebuild
 2107160109 ./dev-perl/Net-Server-Mail/Net-Server-Mail-0.280.0-r1.ebuild
 2203091610 ./dev-perl/Net-Server/Net-Server-2.10.0.ebuild
@@ -11149,8 +11176,7 @@
 2105101009 ./dev-php/semver/semver-3.2.4.ebuild
 2204251110 ./dev-php/semver/semver-3.2.6.ebuild
 1707101834 ./dev-php/simpletest/simpletest-1.1.7.ebuild
-2202081040 ./dev-php/smarty/smarty-4.0.4.ebuild
-2205180240 ./dev-php/smarty/smarty-4.1.1.ebuild
+2205271610 ./dev-php/smarty/smarty-4.1.1.ebuild
 2105101009 ./dev-php/spdx-licenses/spdx-licenses-1.5.4.ebuild
 1702282250 ./dev-php/stringparser_bbcode/stringparser_bbcode-0.3.3-r1.ebuild
 2203171740 ./dev-php/swoole-async/swoole-async-4.4.16-r1.ebuild
@@ -11204,7 +11230,7 @@
 2205181410 ./dev-python/CppHeaderParser/CppHeaderParser-2.7.4.ebuild
 2205141040 ./dev-python/Faker/Faker-13.11.1.ebuild
 2205261210 ./dev-python/Faker/Faker-13.12.0.ebuild
-2205241610 ./dev-python/GitPython/GitPython-3.1.27.ebuild
+2205290010 ./dev-python/GitPython/GitPython-3.1.27.ebuild
 2110111109 ./dev-python/GridDataFormats/GridDataFormats-0.6.0.ebuild
 2202211239 ./dev-python/GridDataFormats/GridDataFormats-0.7.0.ebuild
 2205220910 ./dev-python/GridDataFormats/GridDataFormats-1.0.0.ebuild
@@ -11215,6 +11241,8 @@
 2205212040 ./dev-python/PyPDF2/PyPDF2-1.27.12.ebuild
 2205230940 ./dev-python/PyPDF2/PyPDF2-1.28.1.ebuild
 2205240940 ./dev-python/PyPDF2/PyPDF2-1.28.2.ebuild
+2205291040 ./dev-python/PyPDF2/PyPDF2-1.28.3.ebuild
+2205301040 ./dev-python/PyPDF2/PyPDF2-1.28.4.ebuild
 2110310309 ./dev-python/PyQt-builder/PyQt-builder-1.12.2.ebuild
 2202042209 ./dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
 2110310409 ./dev-python/PyQt5/PyQt5-5.15.6.ebuild
@@ -11235,10 +11263,6 @@
 2203151309 ./dev-python/absl-py/absl-py-1.0.0.ebuild
 2204241440 ./dev-python/abydos/abydos-0.5.0-r1.ebuild
 2205162210 ./dev-python/adblock/adblock-0.5.2-r1.ebuild
-2204232239 ./dev-python/aesara/aesara-2.6.3.ebuild
-2204251140 ./dev-python/aesara/aesara-2.5.3.ebuild
-2204251541 ./dev-python/aesara/aesara-2.6.4.ebuild
-2205081210 ./dev-python/aesara/aesara-2.6.5.ebuild
 2205271240 ./dev-python/aesara/aesara-2.6.6.ebuild
 2112260340 ./dev-python/agate-dbf/agate-dbf-0.2.2-r1.ebuild
 2112260340 ./dev-python/agate-excel/agate-excel-0.2.5-r1.ebuild
@@ -11281,7 +11305,6 @@
 2205122240 ./dev-python/apipkg/apipkg-2.1.1.ebuild
 2205130940 ./dev-python/apispec/apispec-5.2.2.ebuild
 2205100010 ./dev-python/appdirs/appdirs-1.4.4-r2.ebuild
-2107030940 ./dev-python/apsw/apsw-3.35.4_p1.ebuild
 2205271240 ./dev-python/apsw/apsw-3.38.1_p1.ebuild
 2205010512 ./dev-python/argcomplete/argcomplete-2.0.0.ebuild
 2205102110 ./dev-python/argcomplete/argcomplete-2.0.0-r1.ebuild
@@ -11296,7 +11319,6 @@
 2205181410 ./dev-python/asn1crypto/asn1crypto-1.5.1.ebuild
 2205181410 ./dev-python/asteval/asteval-0.9.26.ebuild
 2205251040 ./dev-python/asteval/asteval-0.9.27.ebuild
-2204062309 ./dev-python/astor/astor-0.8.1.ebuild
 2205271240 ./dev-python/astor/astor-0.8.1-r1.ebuild
 2205141040 ./dev-python/astroid/astroid-2.11.5.ebuild
 2205212040 ./dev-python/astroid/astroid-2.11.4.ebuild
@@ -11322,6 +11344,7 @@
 2205261240 ./dev-python/automat/automat-20.2.0-r1.ebuild
 2205261240 ./dev-python/automat/automat-20.2.0.ebuild
 2205211610 ./dev-python/autopage/autopage-0.5.0.ebuild
+2205281740 ./dev-python/autopage/autopage-0.5.1.ebuild
 2111270009 ./dev-python/autopep8/autopep8-1.6.0.ebuild
 2205181440 ./dev-python/autopep8/autopep8-9999.ebuild
 2201291509 ./dev-python/autoprop/autoprop-4.0.2-r1.ebuild
@@ -11332,9 +11355,6 @@
 2205191040 ./dev-python/babelfish/babelfish-0.6.0-r2.ebuild
 2205191040 ./dev-python/babelfish/babelfish-9999.ebuild
 2205122240 ./dev-python/backcall/backcall-0.2.0-r1.ebuild
-2108181109 ./dev-python/backoff/backoff-1.11.0.ebuild
-2204211739 ./dev-python/backoff/backoff-1.11.1.ebuild
-2204270010 ./dev-python/backoff/backoff-2.0.0.ebuild
 2205271240 ./dev-python/backoff/backoff-2.0.1.ebuild
 2111091709 ./dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0-r1.ebuild
 2205010512 ./dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.1.ebuild
@@ -11343,7 +11363,7 @@
 2205010512 ./dev-python/backports-zoneinfo/backports-zoneinfo-0.2.1-r2.ebuild
 2205171540 ./dev-python/backrefs/backrefs-5.2.ebuild
 2205221940 ./dev-python/backrefs/backrefs-5.3.ebuild
-2204252040 ./dev-python/bandit/bandit-1.7.4.ebuild
+2205290040 ./dev-python/bandit/bandit-1.7.4.ebuild
 2205161610 ./dev-python/bareos/bareos-21.0.0.ebuild
 2110160209 ./dev-python/bashate/bashate-2.1.0.ebuild
 2105231409 ./dev-python/basho-erlastic/basho-erlastic-2.1.1.ebuild
@@ -11353,6 +11373,7 @@
 2112260340 ./dev-python/beagle/beagle-0.3.0.ebuild
 2205151140 ./dev-python/beautifulsoup4/beautifulsoup4-4.11.1.ebuild
 2203181340 ./dev-python/beniget/beniget-0.4.1.ebuild
+2205281310 ./dev-python/beniget/beniget-0.4.1-r1.ebuild
 2205010810 ./dev-python/berkeleydb/berkeleydb-18.1.5.ebuild
 2201291539 ./dev-python/bert/bert-2.2.0-r1.ebuild
 2110161709 ./dev-python/betamax-matchers/betamax-matchers-0.4.0.ebuild
@@ -11374,8 +11395,7 @@
 2205111610 ./dev-python/blinker/blinker-1.4-r2.ebuild
 2205122340 ./dev-python/blinker/blinker-1.4-r3.ebuild
 2204260640 ./dev-python/blockdiag/blockdiag-3.0.0.ebuild
-2204021510 ./dev-python/blosc/blosc-1.10.5-r1.ebuild
-2205271240 ./dev-python/blosc/blosc-1.10.6.ebuild
+2205272310 ./dev-python/blosc/blosc-1.10.6.ebuild
 2205122240 ./dev-python/bluelet/bluelet-0.2.0-r1.ebuild
 2205122240 ./dev-python/blurb/blurb-1.1.0.ebuild
 2205141040 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
@@ -11392,6 +11412,7 @@
 2205261140 ./dev-python/boto3/boto3-1.23.8.ebuild
 2205271040 ./dev-python/boto3/boto3-1.23.9.ebuild
 2205271040 ./dev-python/boto3/boto3-9999.ebuild
+2205280810 ./dev-python/boto3/boto3-1.23.10.ebuild
 2205142310 ./dev-python/botocore/botocore-1.26.0.ebuild
 2205171010 ./dev-python/botocore/botocore-1.25.9.ebuild
 2205171010 ./dev-python/botocore/botocore-1.26.1.ebuild
@@ -11404,6 +11425,7 @@
 2205251040 ./dev-python/botocore/botocore-1.26.7.ebuild
 2205261140 ./dev-python/botocore/botocore-1.26.8.ebuild
 2205271040 ./dev-python/botocore/botocore-1.26.9.ebuild
+2205280810 ./dev-python/botocore/botocore-1.26.10.ebuild
 2107021539 ./dev-python/bottle/bottle-0.12.19.ebuild
 2205141340 ./dev-python/bottle/bottle-0.12.19-r1.ebuild
 2205262210 ./dev-python/bottle/bottle-0.12.20.ebuild
@@ -11426,6 +11448,7 @@
 2110312109 ./dev-python/cachetools/cachetools-4.2.4.ebuild
 2203250209 ./dev-python/cachetools/cachetools-5.0.0.ebuild
 2205161110 ./dev-python/cachetools/cachetools-5.1.0.ebuild
+2205301040 ./dev-python/cachetools/cachetools-5.2.0.ebuild
 2205241710 ./dev-python/cairocffi/cairocffi-1.3.0.ebuild
 2109131109 ./dev-python/cangjie/cangjie-1.3-r1.ebuild
 2108081639 ./dev-python/capturer/capturer-3.0.ebuild
@@ -11448,13 +11471,14 @@
 2205100010 ./dev-python/certifi/certifi-3021.3.16-r2.ebuild
 2205010512 ./dev-python/cffi/cffi-1.15.0.ebuild
 2205110940 ./dev-python/cffi/cffi-1.15.0-r1.ebuild
-2110220239 ./dev-python/cfgv/cfgv-3.3.1.ebuild
+2205301410 ./dev-python/cfgv/cfgv-3.3.1.ebuild
 2204270240 ./dev-python/cfn-lint/cfn-lint-0.59.0.ebuild
 2205022240 ./dev-python/cfn-lint/cfn-lint-0.59.1.ebuild
 2205141040 ./dev-python/cfn-lint/cfn-lint-0.60.0.ebuild
 2205201140 ./dev-python/cfn-lint/cfn-lint-0.60.1.ebuild
 2203092340 ./dev-python/cftime/cftime-1.6.0.ebuild
 2106011409 ./dev-python/cgroup-utils/cgroup-utils-0.8.ebuild
+2205310540 ./dev-python/cgroup-utils/cgroup-utils-0.8-r1.ebuild
 2105181609 ./dev-python/chai/chai-1.1.2.ebuild
 2205151410 ./dev-python/chameleon/chameleon-3.10.0.ebuild
 2205180910 ./dev-python/chameleon/chameleon-3.10.1.ebuild
@@ -11480,6 +11504,7 @@
 2204150310 ./dev-python/clang-python/clang-python-14.0.1.ebuild
 2204271540 ./dev-python/clang-python/clang-python-15.0.0.9999.ebuild
 2204301040 ./dev-python/clang-python/clang-python-14.0.3.ebuild
+2205292310 ./dev-python/clang-python/clang-python-14.0.4.ebuild
 2203252323 ./dev-python/cleo/cleo-0.8.1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-2.2.1.ebuild
 2205252110 ./dev-python/cli_helpers/cli_helpers-9999.ebuild
@@ -11492,15 +11517,14 @@
 2205231010 ./dev-python/click-threading/click-threading-0.5.0-r1.ebuild
 2205011540 ./dev-python/click/click-8.1.2.ebuild
 2205112110 ./dev-python/click/click-8.1.3.ebuild
-2205211740 ./dev-python/cliff/cliff-3.10.1.ebuild
+2205290040 ./dev-python/cliff/cliff-3.10.1.ebuild
 2203252323 ./dev-python/clikit/clikit-0.6.2.ebuild
 2105231239 ./dev-python/clint/clint-0.5.1-r3.ebuild
 2205010512 ./dev-python/cloudpickle/cloudpickle-2.0.0.ebuild
 2205131540 ./dev-python/cloudpickle/cloudpickle-2.0.0-r1.ebuild
 2205211010 ./dev-python/cloudpickle/cloudpickle-2.1.0.ebuild
 2203181710 ./dev-python/cloudscraper/cloudscraper-1.2.60.ebuild
-2203262039 ./dev-python/cmd2/cmd2-2.4.0.ebuild
-2205271240 ./dev-python/cmd2/cmd2-2.4.1.ebuild
+2205290040 ./dev-python/cmd2/cmd2-2.4.1.ebuild
 2112260340 ./dev-python/collective-checkdocs/collective-checkdocs-0.2-r1.ebuild
 2205010512 ./dev-python/colorama/colorama-0.4.4.ebuild
 2205112110 ./dev-python/colorama/colorama-0.4.4-r1.ebuild
@@ -11564,7 +11588,7 @@
 2201151040 ./dev-python/dbutils/dbutils-3.0.2.ebuild
 2205161740 ./dev-python/ddt/ddt-1.4.4.ebuild
 2205240940 ./dev-python/ddt/ddt-1.5.0.ebuild
-2205211740 ./dev-python/debtcollector/debtcollector-2.5.0.ebuild
+2205281910 ./dev-python/debtcollector/debtcollector-2.5.0.ebuild
 2205251240 ./dev-python/debugpy/debugpy-1.5.1.ebuild
 2205010512 ./dev-python/decorator/decorator-5.1.1.ebuild
 2205131410 ./dev-python/decorator/decorator-5.1.1-r1.ebuild
@@ -11582,8 +11606,8 @@
 2101310343 ./dev-python/diff-match-patch/diff-match-patch-20181111.ebuild
 2205171540 ./dev-python/diff-match-patch/diff-match-patch-20200713.ebuild
 2205041810 ./dev-python/dill/dill-0.3.4-r1.ebuild
-2205211010 ./dev-python/dill/dill-0.3.5.1.ebuild
 2205201140 ./dev-python/dill/dill-0.3.5.ebuild
+2205290010 ./dev-python/dill/dill-0.3.5.1.ebuild
 2202052009 ./dev-python/discogs-client/discogs-client-9999.ebuild
 2203211209 ./dev-python/discogs-client/discogs-client-2.3.14.ebuild
 2204010840 ./dev-python/diskcache/diskcache-5.4.0-r1.ebuild
@@ -11599,6 +11623,7 @@
 2205111110 ./dev-python/django-auth-ldap/django-auth-ldap-4.1.0.ebuild
 2204151840 ./dev-python/django-cache-url/django-cache-url-3.4.0.ebuild
 2111011339 ./dev-python/django-cacheops/django-cacheops-6.0.ebuild
+2205280810 ./dev-python/django-cacheops/django-cacheops-6.1.ebuild
 2112260340 ./dev-python/django-compressor/django-compressor-2.4.1.ebuild
 2202271539 ./dev-python/django-configurations/django-configurations-2.3.2.ebuild
 2205111110 ./dev-python/django-cors-headers/django-cors-headers-3.12.0.ebuild
@@ -11643,7 +11668,7 @@
 2205010512 ./dev-python/docutils/docutils-0.18.1.ebuild
 2205141140 ./dev-python/docutils/docutils-0.17.1-r1.ebuild
 2205141140 ./dev-python/docutils/docutils-0.18.1-r1.ebuild
-2202271539 ./dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
+2205290040 ./dev-python/dogpile-cache/dogpile-cache-1.1.5.ebuild
 2203281240 ./dev-python/doit-py/doit-py-0.5.0.ebuild
 2205151140 ./dev-python/doit/doit-0.36.0.ebuild
 2105091439 ./dev-python/dominate/dominate-2.6.0.ebuild
@@ -11691,10 +11716,10 @@
 2205081210 ./dev-python/fakeredis/fakeredis-1.7.4.ebuild
 2205151010 ./dev-python/fakeredis/fakeredis-1.7.5.ebuild
 2205261140 ./dev-python/fakeredis/fakeredis-1.7.6.1.ebuild
+2205280810 ./dev-python/fakeredis/fakeredis-1.8.ebuild
 2203291510 ./dev-python/falcon/falcon-3.1.0.ebuild
 2205141440 ./dev-python/fasteners/fasteners-0.17.3.ebuild
-2203301740 ./dev-python/fastimport/fastimport-0.9.11.ebuild
-2205271240 ./dev-python/fastimport/fastimport-0.9.14.ebuild
+2205271310 ./dev-python/fastimport/fastimport-0.9.14.ebuild
 2205251240 ./dev-python/fastjsonschema/fastjsonschema-2.15.3-r1.ebuild
 2205122240 ./dev-python/feedgenerator/feedgenerator-2.0.0.ebuild
 2111080609 ./dev-python/feedparser/feedparser-6.0.8.ebuild
@@ -11748,6 +11773,7 @@
 2205122340 ./dev-python/flask/flask-2.1.2.ebuild
 2205122240 ./dev-python/flatbuffers/flatbuffers-2.0.ebuild
 2205191840 ./dev-python/flatbuffers/flatbuffers-2.0-r1.ebuild
+2205310010 ./dev-python/flatbuffers/flatbuffers-2.0.6.ebuild
 2205122240 ./dev-python/fleep/fleep-1.0.1-r1.ebuild
 2205122240 ./dev-python/fleep/fleep-9999.ebuild
 2205122240 ./dev-python/flexmock/flexmock-0.11.3.ebuild
@@ -11767,10 +11793,7 @@
 2203151439 ./dev-python/fs/fs-2.4.15.ebuild
 2205261410 ./dev-python/fs/fs-2.4.16.ebuild
 2205061610 ./dev-python/fsspec/fsspec-2022.3.0.ebuild
-2205201440 ./dev-python/fsspec/fsspec-2022.5.0.ebuild
-2202271539 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha0-r1.ebuild
-2204260640 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha1.ebuild
-2204301040 ./dev-python/funcparserlib/funcparserlib-1.0.0_alpha2.ebuild
+2205301040 ./dev-python/fsspec/fsspec-2022.5.0.ebuild
 2205271240 ./dev-python/funcparserlib/funcparserlib-1.0.0.ebuild
 2201201239 ./dev-python/funcy/funcy-1.17.ebuild
 2202272009 ./dev-python/furo/furo-2021.10.9.ebuild
@@ -11779,10 +11802,10 @@
 2111080609 ./dev-python/future/future-0.18.2-r1.ebuild
 2205171540 ./dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
 2203181340 ./dev-python/gast/gast-0.5.3.ebuild
+2205281310 ./dev-python/gast/gast-0.5.3-r1.ebuild
 2112252040 ./dev-python/gatt-python/gatt-python-0.2.6.ebuild
 2103030039 ./dev-python/gcs-oauth2-boto-plugin/gcs-oauth2-boto-plugin-2.7.ebuild
-2203240309 ./dev-python/genshi/genshi-0.7.6.ebuild
-2205271240 ./dev-python/genshi/genshi-0.7.7.ebuild
+2205272310 ./dev-python/genshi/genshi-0.7.7.ebuild
 2106051709 ./dev-python/genson/genson-1.1.0.ebuild
 2205010512 ./dev-python/genty/genty-1.3.2-r1.ebuild
 2205101340 ./dev-python/genty/genty-1.3.2-r2.ebuild
@@ -11795,18 +11818,13 @@
 2205241610 ./dev-python/ghp-import/ghp-import-2.1.0-r1.ebuild
 2204191209 ./dev-python/git-review/git-review-9999.ebuild
 2205212040 ./dev-python/git-review/git-review-2.3.0.ebuild
-2201081709 ./dev-python/gitdb/gitdb-4.0.8.ebuild
-2204221409 ./dev-python/gitdb/gitdb-4.0.9.ebuild
-2205271240 ./dev-python/gitdb/gitdb-4.0.9-r1.ebuild
+2205290010 ./dev-python/gitdb/gitdb-4.0.9-r1.ebuild
 2203092340 ./dev-python/github3/github3-3.2.0.ebuild
 2110221739 ./dev-python/glob2/glob2-0.7.ebuild
 2205131810 ./dev-python/glob2/glob2-0.7-r1.ebuild
 2202111409 ./dev-python/glooey/glooey-0.3.6.ebuild
 2205010512 ./dev-python/gmpy/gmpy-2.1.2.ebuild
 2205121940 ./dev-python/gmpy/gmpy-2.1.2-r1.ebuild
-2204221509 ./dev-python/google-api-core/google-api-core-2.7.1-r2.ebuild
-2204221509 ./dev-python/google-api-core/google-api-core-2.7.2-r1.ebuild
-2205191040 ./dev-python/google-api-core/google-api-core-2.8.0.ebuild
 2205271240 ./dev-python/google-api-core/google-api-core-2.7.3.ebuild
 2205270940 ./dev-python/google-api-core/google-api-core-2.8.1.ebuild
 2205180910 ./dev-python/google-api-python-client/google-api-python-client-2.48.0.ebuild
@@ -11815,7 +11833,6 @@
 2105061039 ./dev-python/google-apitools/google-apitools-0.5.32.ebuild
 2203270940 ./dev-python/google-auth-httplib2/google-auth-httplib2-0.1.0-r1.ebuild
 2203152140 ./dev-python/google-auth-oauthlib/google-auth-oauthlib-0.5.1.ebuild
-2204221509 ./dev-python/google-auth/google-auth-2.6.3-r2.ebuild
 2205271240 ./dev-python/google-auth/google-auth-2.6.6-r1.ebuild
 2111252209 ./dev-python/google-pasta/google-pasta-0.2.0-r1.ebuild
 2205221910 ./dev-python/google-reauth-python/google-reauth-python-0.1.1.ebuild
@@ -11837,7 +11854,7 @@
 2201290010 ./dev-python/gst-python/gst-python-1.18.4.ebuild
 2203170340 ./dev-python/gst-python/gst-python-1.20.1.ebuild
 2204021510 ./dev-python/gst-python/gst-python-1.18.6.ebuild
-2205251910 ./dev-python/gst-python/gst-python-1.20.2.ebuild
+2205280440 ./dev-python/gst-python/gst-python-1.20.2.ebuild
 2112101940 ./dev-python/guessit/guessit-3.4.2.ebuild
 2205191040 ./dev-python/guessit/guessit-3.4.3.ebuild
 2112130639 ./dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -11845,9 +11862,8 @@
 2205010512 ./dev-python/h2/h2-3.2.0.ebuild
 2205121940 ./dev-python/h2/h2-3.2.0-r1.ebuild
 2205121940 ./dev-python/h2/h2-4.1.0-r1.ebuild
-2111111139 ./dev-python/h5py/h5py-3.3.0.ebuild
 2205251040 ./dev-python/h5py/h5py-3.7.0.ebuild
-2205271240 ./dev-python/h5py/h5py-3.6.0.ebuild
+2205302310 ./dev-python/h5py/h5py-3.6.0.ebuild
 2107012209 ./dev-python/happybase/happybase-0.9_p20210701.ebuild
 2109182039 ./dev-python/hcloud-python/hcloud-python-1.16.0.ebuild
 2205171540 ./dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -11892,6 +11908,7 @@
 2205162310 ./dev-python/ifaddr/ifaddr-0.1.7.ebuild
 2105222139 ./dev-python/ijson/ijson-3.1.4.ebuild
 2205161110 ./dev-python/imageio/imageio-2.19.2.ebuild
+2205301040 ./dev-python/imageio/imageio-2.19.3.ebuild
 2205010512 ./dev-python/imagesize/imagesize-1.3.0.ebuild
 2205141510 ./dev-python/imagesize/imagesize-1.3.0-r1.ebuild
 2106032239 ./dev-python/imapclient/imapclient-2.2.0.ebuild
@@ -11927,9 +11944,9 @@
 2203181940 ./dev-python/ipyparallel/ipyparallel-8.2.0.ebuild
 2204262210 ./dev-python/ipyparallel/ipyparallel-8.2.1.ebuild
 2205101340 ./dev-python/ipyparallel/ipyparallel-8.3.0.ebuild
-2201201209 ./dev-python/ipython/ipython-7.31.1.ebuild
 2205072110 ./dev-python/ipython/ipython-8.2.0.ebuild
 2205080740 ./dev-python/ipython/ipython-8.3.0-r1.ebuild
+2205291040 ./dev-python/ipython/ipython-8.4.0.ebuild
 2203151509 ./dev-python/ipython_genutils/ipython_genutils-0.2.0-r3.ebuild
 2204161140 ./dev-python/ipywidgets/ipywidgets-7.7.0.ebuild
 2205191110 ./dev-python/irc/irc-20.0.0-r1.ebuild
@@ -11950,8 +11967,7 @@
 2205121410 ./dev-python/jaraco-envs/jaraco-envs-2.4.0.ebuild
 2205100010 ./dev-python/jaraco-functools/jaraco-functools-3.5.0-r2.ebuild
 2205131940 ./dev-python/jaraco-itertools/jaraco-itertools-6.2.1.ebuild
-2105081209 ./dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
-2205131940 ./dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
+2205281010 ./dev-python/jaraco-logging/jaraco-logging-3.1.0-r1.ebuild
 2205131940 ./dev-python/jaraco-packaging/jaraco-packaging-8.2.1-r1.ebuild
 2202041509 ./dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
 2205102140 ./dev-python/jaraco-path/jaraco-path-3.4.0.ebuild
@@ -11961,7 +11977,6 @@
 2205140110 ./dev-python/jc/jc-1.19.0.ebuild
 2105181609 ./dev-python/jdcal/jdcal-1.4.1.ebuild
 2205132210 ./dev-python/jdcal/jdcal-1.4.1-r1.ebuild
-2204251541 ./dev-python/jedi/jedi-0.18.0.ebuild
 2205271240 ./dev-python/jedi/jedi-0.18.1.ebuild
 2205202110 ./dev-python/jeepney/jeepney-0.8.0.ebuild
 2205191540 ./dev-python/jellyfish/jellyfish-0.9.0-r1.ebuild
@@ -12005,8 +12020,6 @@
 2205181740 ./dev-python/junit-xml/junit-xml-1.9.ebuild
 2112291609 ./dev-python/jupyter-lsp/jupyter-lsp-1.5.1.ebuild
 2204150940 ./dev-python/jupyter/jupyter-1.0.0-r4.ebuild
-2203262039 ./dev-python/jupyter_client/jupyter_client-7.1.2.ebuild
-2204261310 ./dev-python/jupyter_client/jupyter_client-7.3.0.ebuild
 2205271240 ./dev-python/jupyter_client/jupyter_client-7.3.1.ebuild
 2204162210 ./dev-python/jupyter_console/jupyter_console-6.4.3.ebuild
 2205212110 ./dev-python/jupyter_core/jupyter_core-4.10.0.ebuild
@@ -12018,9 +12031,6 @@
 2205021410 ./dev-python/jupyterlab/jupyterlab-3.3.4.ebuild
 2205151210 ./dev-python/jupyterlab_pygments/jupyterlab_pygments-0.2.2.ebuild
 2205021410 ./dev-python/jupyterlab_server/jupyterlab_server-2.13.0.ebuild
-2204161440 ./dev-python/jwcrypto/jwcrypto-1.0.0.ebuild
-2204251910 ./dev-python/jwcrypto/jwcrypto-1.1.0.ebuild
-2205130940 ./dev-python/jwcrypto/jwcrypto-1.3.0.ebuild
 2205220911 ./dev-python/jwcrypto/jwcrypto-1.3.1.ebuild
 2205271240 ./dev-python/jwcrypto/jwcrypto-1.2.0.ebuild
 2112101110 ./dev-python/k5test/k5test-0.10.1.ebuild
@@ -12037,7 +12047,7 @@
 2205022310 ./dev-python/keyring/keyring-23.5.0.ebuild
 2205240940 ./dev-python/keyring/keyring-23.5.1.ebuild
 2204012040 ./dev-python/keystoneauth/keystoneauth-4.5.0.ebuild
-2205211010 ./dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
+2205290040 ./dev-python/keystoneauth/keystoneauth-4.6.0.ebuild
 2205261410 ./dev-python/kiwisolver/kiwisolver-1.4.2.ebuild
 2203141339 ./dev-python/klein/klein-21.8.0.ebuild
 2203160139 ./dev-python/kombu/kombu-5.2.4.ebuild
@@ -12050,9 +12060,9 @@
 2204161110 ./dev-python/ldap3/ldap3-2.9.1.ebuild
 2203290210 ./dev-python/leather/leather-0.3.4.ebuild
 2107152109 ./dev-python/lesscpy/lesscpy-0.15.0.ebuild
-2202271539 ./dev-python/libarchive-c/libarchive-c-4.0.ebuild
+2205280910 ./dev-python/libarchive-c/libarchive-c-4.0.ebuild
 2205011540 ./dev-python/libcloud/libcloud-3.5.1.ebuild
-2205270940 ./dev-python/libcloud/libcloud-3.6.0.ebuild
+2205282010 ./dev-python/libcloud/libcloud-3.6.0.ebuild
 2201310339 ./dev-python/liblarch/liblarch-3.1.0-r1.ebuild
 2203240239 ./dev-python/libnacl/libnacl-1.7.2-r1.ebuild
 2205201510 ./dev-python/libnacl/libnacl-1.8.0.ebuild
@@ -12073,6 +12083,7 @@
 2204260710 ./dev-python/lit/lit-14.0.1.ebuild
 2204271540 ./dev-python/lit/lit-15.0.0.9999.ebuild
 2204301040 ./dev-python/lit/lit-14.0.3.ebuild
+2205292310 ./dev-python/lit/lit-14.0.4.ebuild
 2205171540 ./dev-python/livereload/livereload-2.6.3.ebuild
 2107132209 ./dev-python/llfuse/llfuse-1.4.1.ebuild
 2202041209 ./dev-python/lmdb/lmdb-1.3.0.ebuild
@@ -12100,11 +12111,12 @@
 2204252210 ./dev-python/markdown/markdown-3.3.6.ebuild
 2205162340 ./dev-python/markdown/markdown-3.3.7.ebuild
 2112022309 ./dev-python/markdown2/markdown2-2.4.2.ebuild
-2204281140 ./dev-python/markdown2/markdown2-2.4.3.ebuild
+2205292240 ./dev-python/markdown2/markdown2-2.4.3.ebuild
 2112222239 ./dev-python/markups/markups-3.1.3.ebuild
 2105052239 ./dev-python/markupsafe/markupsafe-1.1.1-r1.ebuild
 2205111540 ./dev-python/markupsafe/markupsafe-2.1.1.ebuild
 2203142009 ./dev-python/marshmallow/marshmallow-3.15.0.ebuild
+2205301040 ./dev-python/marshmallow/marshmallow-3.16.0.ebuild
 2203262039 ./dev-python/matplotlib-inline/matplotlib-inline-0.1.3-r1.ebuild
 2205031510 ./dev-python/matplotlib/matplotlib-3.5.2.ebuild
 2205031740 ./dev-python/matplotlib/matplotlib-3.5.2-r1.ebuild
@@ -12121,9 +12133,11 @@
 2201201239 ./dev-python/memory_profiler/memory_profiler-0.60.ebuild
 2205162340 ./dev-python/mergedeep/mergedeep-1.3.4.ebuild
 2203281240 ./dev-python/mergedict/mergedict-1.0.0.ebuild
+2205292240 ./dev-python/mergedict/mergedict-1.0.0-r1.ebuild
 2202240139 ./dev-python/metakernel/metakernel-0.28.2-r1.ebuild
 2203281240 ./dev-python/micawber/micawber-0.5.4.ebuild
 2106051739 ./dev-python/mimerender/mimerender-0.6.0.ebuild
+2205292240 ./dev-python/mimerender/mimerender-0.6.0-r1.ebuild
 2203151509 ./dev-python/minidb/minidb-2.0.6.ebuild
 2108060109 ./dev-python/minimock/minimock-1.3.0.ebuild
 2112190139 ./dev-python/miniupnpc/miniupnpc-2.2.3.ebuild
@@ -12162,12 +12176,9 @@
 2203250209 ./dev-python/mongomock/mongomock-4.0.0.ebuild
 2204290540 ./dev-python/more-itertools/more-itertools-8.12.0-r1.ebuild
 2205100010 ./dev-python/more-itertools/more-itertools-8.13.0.ebuild
-2204290910 ./dev-python/moto/moto-3.1.5.ebuild
-2204242110 ./dev-python/moto/moto-3.1.6.ebuild
-2204302140 ./dev-python/moto/moto-3.1.7.ebuild
-2205071240 ./dev-python/moto/moto-3.1.8.ebuild
 2205242210 ./dev-python/moto/moto-3.1.10.ebuild
 2205271240 ./dev-python/moto/moto-3.1.9.ebuild
+2205301040 ./dev-python/moto/moto-3.1.11.ebuild
 2202100210 ./dev-python/mpdlcd/mpdlcd-0.5.2-r1.ebuild
 2202151809 ./dev-python/mpi4py/mpi4py-3.1.3.ebuild
 2111220639 ./dev-python/mpmath/mpmath-1.2.1.ebuild
@@ -12179,6 +12190,7 @@
 2205010512 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2205240940 ./dev-python/munch/munch-2.5.0-r2.ebuild
 2109121909 ./dev-python/munkres/munkres-1.1.4.ebuild
+2205292240 ./dev-python/munkres/munkres-1.1.4-r1.ebuild
 2201281510 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
 2205010512 ./dev-python/mypy/mypy-0.950.ebuild
 2205071240 ./dev-python/mypy/mypy-0.942.ebuild
@@ -12208,7 +12220,7 @@
 2111221009 ./dev-python/netaddr/netaddr-0.8.0.ebuild
 2205211740 ./dev-python/netaddr/netaddr-0.8.0-r1.ebuild
 2111011139 ./dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
-2107121009 ./dev-python/netifaces/netifaces-0.11.0.ebuild
+2205281910 ./dev-python/netifaces/netifaces-0.11.0.ebuild
 2205151140 ./dev-python/networkx/networkx-2.8.ebuild
 2205191040 ./dev-python/networkx/networkx-2.8.1.ebuild
 2205220911 ./dev-python/networkx/networkx-2.8.2.ebuild
@@ -12216,7 +12228,7 @@
 2204241440 ./dev-python/nltk/nltk-3.7.ebuild
 2108270909 ./dev-python/nnpy/nnpy-1.4.2.ebuild
 2204290940 ./dev-python/node-semver/node-semver-0.8.1.ebuild
-2110220239 ./dev-python/nodeenv/nodeenv-1.6.0.ebuild
+2205301540 ./dev-python/nodeenv/nodeenv-1.6.0.ebuild
 2104060140 ./dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
 2201282210 ./dev-python/nose-random/nose-random-1.0.0.ebuild
 2205010512 ./dev-python/nose/nose-1.3.7_p20211111_p1.ebuild
@@ -12233,6 +12245,7 @@
 2205211010 ./dev-python/nuitka/nuitka-0.8.ebuild
 2205240940 ./dev-python/nuitka/nuitka-0.8.1.ebuild
 2205270940 ./dev-python/nuitka/nuitka-0.8.2.ebuild
+2205301040 ./dev-python/nuitka/nuitka-0.8.3.ebuild
 2202141139 ./dev-python/numexpr/numexpr-2.8.1.ebuild
 2205241640 ./dev-python/numexpr/numexpr-2.8.1-r1.ebuild
 2201061939 ./dev-python/numpy/numpy-1.22.0-r1.ebuild
@@ -12241,9 +12254,6 @@
 2202140239 ./dev-python/numpy/numpy-1.22.2.ebuild
 2205220940 ./dev-python/numpy/numpy-1.22.3.ebuild
 2205231140 ./dev-python/numpy/numpy-1.22.4.ebuild
-2203151539 ./dev-python/numpydoc/numpydoc-1.2.ebuild
-2204261410 ./dev-python/numpydoc/numpydoc-1.2.1-r1.ebuild
-2204301040 ./dev-python/numpydoc/numpydoc-1.3.0.ebuild
 2205271240 ./dev-python/numpydoc/numpydoc-1.3.1.ebuild
 2203312110 ./dev-python/oauth2client/oauth2client-4.1.3-r2.ebuild
 2205221810 ./dev-python/oauthlib/oauthlib-3.2.0.ebuild
@@ -12257,30 +12267,29 @@
 2205110940 ./dev-python/olefile/olefile-0.46-r2.ebuild
 2203312110 ./dev-python/openpyxl/openpyxl-3.0.9-r1.ebuild
 2205211240 ./dev-python/openpyxl/openpyxl-3.0.10.ebuild
-2204260610 ./dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
+2205281910 ./dev-python/openstackdocstheme/openstackdocstheme-2.4.0.ebuild
 2204012110 ./dev-python/openstacksdk/openstacksdk-0.61.0-r1.ebuild
-2205211010 ./dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
+2205290040 ./dev-python/openstacksdk/openstacksdk-0.99.0.ebuild
 2111021009 ./dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
 2205100010 ./dev-python/ordered-set/ordered-set-4.1.0.ebuild
-2204012110 ./dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
-2204012040 ./dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
+2205290040 ./dev-python/os-client-config/os-client-config-2.1.0-r2.ebuild
+2205290040 ./dev-python/os-service-types/os-service-types-1.7.0-r2.ebuild
 2204012110 ./dev-python/osc-lib/osc-lib-2.5.0.ebuild
-2205211010 ./dev-python/osc-lib/osc-lib-2.6.0.ebuild
+2205290040 ./dev-python/osc-lib/osc-lib-2.6.0.ebuild
 2204012040 ./dev-python/oslo-concurrency/oslo-concurrency-4.5.0-r1.ebuild
-2205052040 ./dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
-2204011845 ./dev-python/oslo-config/oslo-config-8.8.0.ebuild
-2203151539 ./dev-python/oslo-context/oslo-context-4.1.0.ebuild
+2205281910 ./dev-python/oslo-concurrency/oslo-concurrency-4.5.1.ebuild
+2205281910 ./dev-python/oslo-config/oslo-config-8.8.0.ebuild
+2205281910 ./dev-python/oslo-context/oslo-context-4.1.0.ebuild
 2110101839 ./dev-python/oslo-i18n/oslo-i18n-5.1.0.ebuild
-2205212040 ./dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
+2205281910 ./dev-python/oslo-i18n/oslo-i18n-5.1.0-r1.ebuild
 2204011845 ./dev-python/oslo-log/oslo-log-4.7.0.ebuild
 2205052040 ./dev-python/oslo-log/oslo-log-4.8.0.ebuild
-2205201140 ./dev-python/oslo-log/oslo-log-5.0.0.ebuild
-2203211109 ./dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
+2205281910 ./dev-python/oslo-log/oslo-log-5.0.0.ebuild
+2205281910 ./dev-python/oslo-serialization/oslo-serialization-4.3.0.ebuild
 2202271539 ./dev-python/oslo-utils/oslo-utils-4.12.2.ebuild
-2205111440 ./dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
-2205211740 ./dev-python/oslotest/oslotest-4.5.0-r1.ebuild
+2205281910 ./dev-python/oslo-utils/oslo-utils-4.13.0-r1.ebuild
+2205290910 ./dev-python/oslotest/oslotest-4.5.0-r2.ebuild
 2204091009 ./dev-python/osrf_pycommon/osrf_pycommon-2.0.2.ebuild
-2204062309 ./dev-python/outcome/outcome-1.1.0.ebuild
 2205271240 ./dev-python/outcome/outcome-1.1.0-r1.ebuild
 2112260340 ./dev-python/ovs/ovs-2.13.0.ebuild
 2112260340 ./dev-python/ovs/ovs-2.13.3.ebuild
@@ -12338,6 +12347,7 @@
 2110041739 ./dev-python/pgzero/pgzero-1.2.1-r1.ebuild
 2205061610 ./dev-python/phonenumbers/phonenumbers-8.12.47.ebuild
 2205071240 ./dev-python/phonenumbers/phonenumbers-8.12.48.ebuild
+2205291040 ./dev-python/phonenumbers/phonenumbers-8.12.49.ebuild
 2108230939 ./dev-python/phply/phply-1.2.5.ebuild
 2110152039 ./dev-python/picklemagic/picklemagic-0.0_pre20160415.ebuild
 2205161810 ./dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -12381,7 +12391,6 @@
 2203170309 ./dev-python/polygon/polygon-3.0.9.ebuild
 2203250209 ./dev-python/pony/pony-0.7.16.ebuild
 2205150710 ./dev-python/pooch/pooch-1.6.0.ebuild
-2202041509 ./dev-python/portend/portend-3.0.0.ebuild
 2205271240 ./dev-python/portend/portend-3.1.0.ebuild
 2201262340 ./dev-python/poyo/poyo-0.5.0.ebuild
 2202191640 ./dev-python/precis-i18n/precis-i18n-1.0.4.ebuild
@@ -12433,6 +12442,7 @@
 2202021839 ./dev-python/pyGPG/pyGPG-9999.ebuild
 2203181210 ./dev-python/pyGPG/pyGPG-0.2-r1.ebuild
 2105141439 ./dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
+2205310510 ./dev-python/pyacoustid/pyacoustid-1.2.2.ebuild
 2203161139 ./dev-python/pyaes/pyaes-1.6.1-r3.ebuild
 2201082109 ./dev-python/pyalsa/pyalsa-1.2.6.ebuild
 2204161910 ./dev-python/pyamg/pyamg-4.2.3.ebuild
@@ -12509,7 +12519,7 @@
 2205010512 ./dev-python/pygments/pygments-2.12.0.ebuild
 2205112110 ./dev-python/pygments/pygments-2.12.0-r1.ebuild
 2110292139 ./dev-python/pygobject/pygobject-3.42.0.ebuild
-2205201710 ./dev-python/pygobject/pygobject-3.42.1.ebuild
+2205280910 ./dev-python/pygobject/pygobject-3.42.1.ebuild
 2205150710 ./dev-python/pygpgme/pygpgme-0.3-r5.ebuild
 2202272009 ./dev-python/pygraphviz/pygraphviz-1.9.ebuild
 2204211139 ./dev-python/pygresql/pygresql-5.2.4.ebuild
@@ -12525,9 +12535,10 @@
 2205131040 ./dev-python/pyjwt/pyjwt-2.4.0.ebuild
 2107121909 ./dev-python/pykerberos/pykerberos-1.3.1.ebuild
 2110082309 ./dev-python/pykka/pykka-3.0.2.ebuild
+2205280810 ./dev-python/pykka/pykka-3.1.1.ebuild
 2108300739 ./dev-python/pykwalify/pykwalify-1.8.0-r1.ebuild
 2204151840 ./dev-python/pylama/pylama-8.3.8.ebuild
-2205151140 ./dev-python/pylast/pylast-5.0.0.ebuild
+2205282140 ./dev-python/pylast/pylast-5.0.0.ebuild
 2204251010 ./dev-python/pylatex/pylatex-1.4.1.ebuild
 2203252323 ./dev-python/pylev/pylev-1.4.0.ebuild
 2105181909 ./dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -12535,7 +12546,7 @@
 2204290652 ./dev-python/pylint/pylint-2.13.7.ebuild
 2205031210 ./dev-python/pylint/pylint-2.13.8.ebuild
 2205070910 ./dev-python/pylint/pylint-2.13.5.ebuild
-2205141040 ./dev-python/pylint/pylint-2.13.9.ebuild
+2205290010 ./dev-python/pylint/pylint-2.13.9.ebuild
 2203092240 ./dev-python/pylru/pylru-1.2.1.ebuild
 2111252209 ./dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
 2203211309 ./dev-python/pymad/pymad-0.10-r1.ebuild
@@ -12560,12 +12571,12 @@
 2111221439 ./dev-python/pynvim/pynvim-0.4.3-r1.ebuild
 2204161910 ./dev-python/pyocr/pyocr-0.8.2.ebuild
 2203281010 ./dev-python/pyopencl/pyopencl-2022.1.ebuild
+2205301540 ./dev-python/pyopencl/pyopencl-2022.1.5.ebuild
 2110041739 ./dev-python/pyopengl/pyopengl-3.1.5.ebuild
 2204141140 ./dev-python/pyopengl/pyopengl-3.1.6.ebuild
 2203281010 ./dev-python/pyopengl_accelerate/pyopengl_accelerate-3.1.6.ebuild
-2205010512 ./dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
 2205121940 ./dev-python/pyopenssl/pyopenssl-22.0.0.ebuild
-2205271240 ./dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
+2205271410 ./dev-python/pyopenssl/pyopenssl-20.0.1-r1.ebuild
 2112310439 ./dev-python/pyotherside/pyotherside-1.5.9.ebuild
 2112260340 ./dev-python/pyotp/pyotp-2.6.0.ebuild
 2111230440 ./dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -12587,7 +12598,7 @@
 2205241840 ./dev-python/pypiserver/pypiserver-1.5.0-r2.ebuild
 2205212140 ./dev-python/pypng/pypng-0.0.21-r1.ebuild
 2105071439 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5.ebuild
-2112200039 ./dev-python/pyproj/pyproj-3.3.0.ebuild
+2205282140 ./dev-python/pyprof2calltree/pyprof2calltree-1.4.5-r1.ebuild
 2205271240 ./dev-python/pyproj/pyproj-3.3.1.ebuild
 2205161910 ./dev-python/pyproject2setuppy/pyproject2setuppy-22-r1.ebuild
 2204011540 ./dev-python/pypugjs/pypugjs-5.9.11.ebuild
@@ -12616,6 +12627,7 @@
 2112141639 ./dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
 2202252209 ./dev-python/pyside2/pyside2-5.15.2-r1.ebuild
 2205242140 ./dev-python/pysimdjson/pysimdjson-4.0.3-r1.ebuild
+2205301040 ./dev-python/pysimdjson/pysimdjson-5.0.1.ebuild
 2108071539 ./dev-python/pysmi/pysmi-0.3.4.ebuild
 2205170512 ./dev-python/pysnmp-mibs/pysnmp-mibs-0.1.6.ebuild
 2205040810 ./dev-python/pysnmp/pysnmp-4.4.12-r2.ebuild
@@ -12657,9 +12669,7 @@
 2201250144 ./dev-python/pytest-flakes/pytest-flakes-4.0.4.ebuild
 2205010512 ./dev-python/pytest-forked/pytest-forked-1.4.0.ebuild
 2205100010 ./dev-python/pytest-forked/pytest-forked-1.4.0-r1.ebuild
-2109250109 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
 2205271240 ./dev-python/pytest-freezegun/pytest-freezegun-0.4.2-r1.ebuild
-2203250339 ./dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.3.24.ebuild
 2205271240 ./dev-python/pytest-helpers-namespace/pytest-helpers-namespace-2021.12.29.ebuild
 2106111409 ./dev-python/pytest-html/pytest-html-3.1.1.ebuild
 2205131440 ./dev-python/pytest-httpbin/pytest-httpbin-1.0.2.ebuild
@@ -12696,7 +12706,6 @@
 2205200110 ./dev-python/pytest-toolbox/pytest-toolbox-0.4-r1.ebuild
 2111200709 ./dev-python/pytest-tornado/pytest-tornado-0.8.1.ebuild
 2203122339 ./dev-python/pytest-tornasync/pytest-tornasync-0.6.0_p2.ebuild
-2204071239 ./dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
 2205271240 ./dev-python/pytest-trio/pytest-trio-0.7.0-r1.ebuild
 2106111809 ./dev-python/pytest-verbose-parametrize/pytest-verbose-parametrize-1.7.0.ebuild
 2205010512 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -12714,10 +12723,12 @@
 2203100610 ./dev-python/python-bugzilla/python-bugzilla-3.2.0.ebuild
 2205141140 ./dev-python/python-bugzilla/python-bugzilla-3.2.0-r1.ebuild
 2108020510 ./dev-python/python-caja/python-caja-1.24.0-r2.ebuild
-2204012110 ./dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
+2205290040 ./dev-python/python-cinderclient/python-cinderclient-8.3.0.ebuild
 2110101009 ./dev-python/python-cstruct/python-cstruct-2.1.ebuild
+2205272240 ./dev-python/python-cstruct/python-cstruct-2.1-r1.ebuild
 2108052239 ./dev-python/python-ctags/python-ctags-1.5.0.ebuild
 2111062309 ./dev-python/python-daemon/python-daemon-2.3.0-r1.ebuild
+2205272240 ./dev-python/python-daemon/python-daemon-2.3.0-r2.ebuild
 2205010512 ./dev-python/python-dateutil/python-dateutil-2.8.2.ebuild
 2205111710 ./dev-python/python-dateutil/python-dateutil-2.8.2-r1.ebuild
 2204262010 ./dev-python/python-dbusmock/python-dbusmock-0.27.5.ebuild
@@ -12744,14 +12755,14 @@
 2205181840 ./dev-python/python-gammu/python-gammu-3.2.4.ebuild
 2203152111 ./dev-python/python-gflags/python-gflags-3.1.2-r2.ebuild
 2204012110 ./dev-python/python-glanceclient/python-glanceclient-3.6.0.ebuild
-2205211010 ./dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
+2205290040 ./dev-python/python-glanceclient/python-glanceclient-4.0.0.ebuild
 2112252240 ./dev-python/python-gnupg/python-gnupg-0.4.8.ebuild
-2205210240 ./dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
+2205272240 ./dev-python/python-gnupg/python-gnupg-0.4.9.ebuild
 2101310343 ./dev-python/python-iptables/python-iptables-1.0.0-r1.ebuild
 2204012140 ./dev-python/python-ironicclient/python-ironicclient-4.11.0.ebuild
 2205181740 ./dev-python/python-jose/python-jose-3.3.0.ebuild
 2204012110 ./dev-python/python-keystoneclient/python-keystoneclient-4.4.0-r1.ebuild
-2205211010 ./dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
+2205290040 ./dev-python/python-keystoneclient/python-keystoneclient-4.5.0.ebuild
 2201031309 ./dev-python/python-keyutils/python-keyutils-0.6.ebuild
 2203270110 ./dev-python/python-ldap/python-ldap-3.4.0.ebuild
 2205140610 ./dev-python/python-ldap/python-ldap-3.4.0-r1.ebuild
@@ -12760,11 +12771,13 @@
 2205171540 ./dev-python/python-levenshtein/python-levenshtein-0.12.2.ebuild
 2111192339 ./dev-python/python-lhafile/python-lhafile-0.3.0.ebuild
 2205080640 ./dev-python/python-libevdev/python-libevdev-0.10.ebuild
+2205301040 ./dev-python/python-libevdev/python-libevdev-0.11.ebuild
 2110041109 ./dev-python/python-linux-procfs/python-linux-procfs-0.6.3.ebuild
 2205151140 ./dev-python/python-lsp-black/python-lsp-black-1.2.1.ebuild
 2205161610 ./dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
 2204110939 ./dev-python/python-lsp-server/python-lsp-server-1.4.1.ebuild
 2105231339 ./dev-python/python-ly/python-ly-0.9.6.ebuild
+2205310510 ./dev-python/python-ly/python-ly-0.9.7.ebuild
 2203152140 ./dev-python/python-lzo/python-lzo-1.14-r1.ebuild
 2205161710 ./dev-python/python-magic/python-magic-0.4.25.ebuild
 2205230940 ./dev-python/python-magic/python-magic-0.4.26.ebuild
@@ -12777,11 +12790,12 @@
 2204270240 ./dev-python/python-nbxmpp/python-nbxmpp-2.0.6.ebuild
 2205101340 ./dev-python/python-nbxmpp/python-nbxmpp-3.0.1.ebuild
 2205201140 ./dev-python/python-nbxmpp/python-nbxmpp-3.0.2.ebuild
+2205291040 ./dev-python/python-nbxmpp/python-nbxmpp-3.1.0.ebuild
 2108211009 ./dev-python/python-netlink/python-netlink-0.1.ebuild
-2204012110 ./dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
+2205290040 ./dev-python/python-neutronclient/python-neutronclient-7.8.0.ebuild
 2204012110 ./dev-python/python-novaclient/python-novaclient-17.7.0.ebuild
-2205211010 ./dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
-2204012110 ./dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
+2205290040 ./dev-python/python-novaclient/python-novaclient-18.0.0.ebuild
+2205290040 ./dev-python/python-openstackclient/python-openstackclient-5.8.0.ebuild
 2110310939 ./dev-python/python-poppler-qt5/python-poppler-qt5-0.75.0.ebuild
 2205112015 ./dev-python/python-poppler-qt5/python-poppler-qt5-21.3.0.ebuild
 2105221409 ./dev-python/python-redmine/python-redmine-2.3.0.ebuild
@@ -12797,6 +12811,8 @@
 2202131109 ./dev-python/python-utils/python-utils-3.1.0.ebuild
 2205130940 ./dev-python/python-utils/python-utils-3.2.2.ebuild
 2205201140 ./dev-python/python-utils/python-utils-3.2.3.ebuild
+2205291040 ./dev-python/python-utils/python-utils-3.3.0.ebuild
+2205301040 ./dev-python/python-utils/python-utils-3.3.1.ebuild
 2108201109 ./dev-python/python-varlink/python-varlink-30.3.1.ebuild
 2205162310 ./dev-python/python-vlc/python-vlc-3.0.16120.ebuild
 2110190339 ./dev-python/python-xlib/python-xlib-0.31.ebuild
@@ -12812,8 +12828,9 @@
 2203181340 ./dev-python/pythran/pythran-0.11.0.ebuild
 2205162340 ./dev-python/pytidylib/pytidylib-0.3.2-r2.ebuild
 2203290210 ./dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+2205272240 ./dev-python/pytimeparse/pytimeparse-1.1.8-r1.ebuild
 2205212040 ./dev-python/pytools/pytools-2022.1.7.ebuild
-2205211010 ./dev-python/pytools/pytools-2022.1.9.ebuild
+2205301410 ./dev-python/pytools/pytools-2022.1.9.ebuild
 2203141339 ./dev-python/pytrie/pytrie-0.4.0.ebuild
 2205191840 ./dev-python/pytrie/pytrie-0.4.0-r1.ebuild
 2205102340 ./dev-python/pytz/pytz-2022.1.ebuild
@@ -12826,7 +12843,7 @@
 2203142009 ./dev-python/pywavelets/pywavelets-1.3.0.ebuild
 2204151040 ./dev-python/pywinrm/pywinrm-0.4.3.ebuild
 2103041309 ./dev-python/pyx/pyx-0.15.ebuild
-2205251910 ./dev-python/pyx/pyx-0.15_p1.ebuild
+2205291840 ./dev-python/pyx/pyx-0.15_p1.ebuild
 2204241440 ./dev-python/pyxDamerauLevenshtein/pyxDamerauLevenshtein-1.7.0.ebuild
 2202231139 ./dev-python/pyxattr/pyxattr-0.7.2.ebuild
 2106052139 ./dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -12851,17 +12868,16 @@
 2112131909 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2203152140 ./dev-python/quantities/quantities-0.13.0-r1.ebuild
 2202042239 ./dev-python/quex/quex-0.71.2.ebuild
-2204261410 ./dev-python/radon/radon-5.1.0-r1.ebuild
 2205271240 ./dev-python/radon/radon-5.1.0-r2.ebuild
 2205062310 ./dev-python/raet/raet-0.6.8-r4.ebuild
-2204021510 ./dev-python/random2/random2-1.0.1-r2.ebuild
+2205292210 ./dev-python/random2/random2-1.0.1-r2.ebuild
 2111052039 ./dev-python/rarfile/rarfile-4.0.ebuild
 2203100310 ./dev-python/ratelimit/ratelimit-2.2.1.ebuild
+2205292210 ./dev-python/ratelimit/ratelimit-2.2.1-r1.ebuild
 2201301639 ./dev-python/rcssmin/rcssmin-1.1.0-r1.ebuild
 2205012040 ./dev-python/rdflib/rdflib-6.1.1.ebuild
 2205010512 ./dev-python/re-assert/re-assert-1.1.0.ebuild
 2205150940 ./dev-python/re-assert/re-assert-1.1.0-r1.ebuild
-2204092009 ./dev-python/readme_renderer/readme_renderer-34.0.ebuild
 2205271240 ./dev-python/readme_renderer/readme_renderer-35.0.ebuild
 2204151840 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.5.ebuild
 2205121040 ./dev-python/readthedocs-sphinx-ext/readthedocs-sphinx-ext-2.1.6.ebuild
@@ -12869,27 +12885,31 @@
 2205191040 ./dev-python/rebulk/rebulk-3.1.0-r1.ebuild
 2205191040 ./dev-python/rebulk/rebulk-3.1.0.ebuild
 2204252240 ./dev-python/recommonmark/recommonmark-0.7.1.ebuild
+2205292210 ./dev-python/recommonmark/recommonmark-0.7.1-r1.ebuild
 2203162240 ./dev-python/redis-py/redis-py-4.1.4.ebuild
 2205061510 ./dev-python/redis-py/redis-py-4.2.2.ebuild
 2205091240 ./dev-python/redis-py/redis-py-4.3.0.ebuild
 2205100540 ./dev-python/redis-py/redis-py-4.3.1.ebuild
 2204070009 ./dev-python/reedsolomon/reedsolomon-1.5.4-r1.ebuild
+2205292210 ./dev-python/reedsolomon/reedsolomon-1.5.4-r2.ebuild
 2202140209 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
-2204100110 ./dev-python/regex/regex-2022.3.15.ebuild
-2205271240 ./dev-python/regex/regex-2022.4.24.ebuild
+2205292210 ./dev-python/reflink/reflink-0.2.1-r2.ebuild
+2205271410 ./dev-python/regex/regex-2022.4.24.ebuild
 2109171739 ./dev-python/rencode/rencode-1.0.6-r2.ebuild
-2204260610 ./dev-python/reno/reno-3.5.0.ebuild
+2205292140 ./dev-python/rencode/rencode-1.0.6-r3.ebuild
+2205281910 ./dev-python/reno/reno-3.5.0.ebuild
 2203121309 ./dev-python/reportlab/reportlab-3.6.6.ebuild
 2203161339 ./dev-python/reportlab/reportlab-3.6.8.ebuild
 2203281010 ./dev-python/reportlab/reportlab-3.6.7.ebuild
 2205191040 ./dev-python/reportlab/reportlab-3.6.9.ebuild
 2205221210 ./dev-python/repoze-lru/repoze-lru-0.7-r3.ebuild
-2204261410 ./dev-python/requests-cache/requests-cache-0.9.3-r1.ebuild
-2205271240 ./dev-python/requests-cache/requests-cache-0.9.4.ebuild
+2205272310 ./dev-python/requests-cache/requests-cache-0.9.4.ebuild
 2202211239 ./dev-python/requests-credssp/requests-credssp-2.0.0.ebuild
 2110190339 ./dev-python/requests-file/requests-file-1.5.1-r1.ebuild
+2205292140 ./dev-python/requests-file/requests-file-1.5.1-r2.ebuild
 2204012340 ./dev-python/requests-futures/requests-futures-1.0.0.ebuild
-2203311710 ./dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
+2205292140 ./dev-python/requests-futures/requests-futures-1.0.0-r1.ebuild
+2205290040 ./dev-python/requests-kerberos/requests-kerberos-0.14.0-r1.ebuild
 2109022012 ./dev-python/requests-mock/requests-mock-1.9.3.ebuild
 2205221810 ./dev-python/requests-mock/requests-mock-1.9.3-r1.ebuild
 2203251909 ./dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
@@ -12901,30 +12921,30 @@
 2204290540 ./dev-python/requests/requests-2.27.1.ebuild
 2205131440 ./dev-python/requests/requests-2.27.1-r1.ebuild
 2201170839 ./dev-python/requests_download/requests_download-0.1.2.ebuild
+2205292210 ./dev-python/requests_download/requests_download-0.1.2-r1.ebuild
 2204151140 ./dev-python/requests_pkcs12/requests_pkcs12-1.14.ebuild
-2112260340 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+2205290040 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
 2109090339 ./dev-python/resolvelib/resolvelib-0.5.4.ebuild
 2203151309 ./dev-python/resolvelib/resolvelib-0.8.1.ebuild
 2205140640 ./dev-python/responses/responses-0.20.0.ebuild
 2205261140 ./dev-python/responses/responses-0.21.0.ebuild
-2203262239 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
+2205292140 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.4.0.ebuild
 2106290913 ./dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+2205292210 ./dev-python/retry-decorator/retry-decorator-1.1.1-r1.ebuild
 2105110109 ./dev-python/retrying/retrying-1.3.3.ebuild
+2205292140 ./dev-python/retrying/retrying-1.3.3-r1.ebuild
 2205010512 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
 2205112015 ./dev-python/rfc3339-validator/rfc3339-validator-0.1.4-r1.ebuild
 2205111740 ./dev-python/rfc3986-validator/rfc3986-validator-0.1.1-r1.ebuild
 2205010512 ./dev-python/rfc3986/rfc3986-2.0.0.ebuild
 2205151110 ./dev-python/rfc3986/rfc3986-2.0.0-r1.ebuild
 2205111740 ./dev-python/rfc3987/rfc3987-1.3.8-r2.ebuild
-2204262010 ./dev-python/rich/rich-12.2.0.ebuild
-2205010512 ./dev-python/rich/rich-12.3.0.ebuild
-2205072110 ./dev-python/rich/rich-12.4.0.ebuild
-2205240940 ./dev-python/rich/rich-12.4.3.ebuild
 2205251040 ./dev-python/rich/rich-12.4.4.ebuild
 2205271240 ./dev-python/rich/rich-12.4.1.ebuild
 2202261139 ./dev-python/rjsmin/rjsmin-1.2.0-r1.ebuild
 2112260340 ./dev-python/robot-detection/robot-detection-0.4.0-r1.ebuild
 2105062209 ./dev-python/roman/roman-3.3.ebuild
+2205292210 ./dev-python/roman/roman-3.3-r1.ebuild
 2205151410 ./dev-python/rope/rope-1.0.0.ebuild
 2205261140 ./dev-python/rope/rope-1.1.1.ebuild
 2109101009 ./dev-python/ropemode/ropemode-0.5.ebuild
@@ -12942,7 +12962,7 @@
 2112252110 ./dev-python/rsa/rsa-4.8.ebuild
 2205142310 ./dev-python/rsa/rsa-4.8-r1.ebuild
 2205191610 ./dev-python/rst-linker/rst-linker-2.3.0.ebuild
-2203070310 ./dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
+2205292210 ./dev-python/rtimulib/rtimulib-7.2.1-r2.ebuild
 2205200540 ./dev-python/rtslib-fb/rtslib-fb-2.1.74.ebuild
 2205240210 ./dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.9.2-r2.ebuild
 2204252340 ./dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6-r1.ebuild
@@ -12953,14 +12973,13 @@
 2201282210 ./dev-python/sarif_om/sarif_om-1.0.4.ebuild
 2106052139 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
 2202141139 ./dev-python/scikit-build/scikit-build-0.12.0.ebuild
-2205161910 ./dev-python/scikit-build/scikit-build-0.14.1.ebuild
+2205281410 ./dev-python/scikit-build/scikit-build-0.14.1.ebuild
 2205171440 ./dev-python/scipy/scipy-1.8.0.ebuild
 2205190610 ./dev-python/scipy/scipy-1.8.1.ebuild
 2205010512 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
 2205112110 ./dev-python/scripttest/scripttest-1.3.0-r2.ebuild
 2205181810 ./dev-python/scrypt/scrypt-0.8.20.ebuild
 2110202239 ./dev-python/seaborn/seaborn-0.11.2.ebuild
-2204260640 ./dev-python/secretstorage/secretstorage-3.3.1.ebuild
 2205271240 ./dev-python/secretstorage/secretstorage-3.3.2.ebuild
 2205181740 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2205111310 ./dev-python/semantic_version/semantic_version-2.9.0.ebuild
@@ -12976,16 +12995,14 @@
 2106150139 ./dev-python/serpent/serpent-1.40.ebuild
 2106052139 ./dev-python/serverfiles/serverfiles-0.3.1.ebuild
 2205010512 ./dev-python/service_identity/service_identity-21.1.0.ebuild
-2205121940 ./dev-python/service_identity/service_identity-21.1.0-r1.ebuild
-2107280239 ./dev-python/setproctitle/setproctitle-1.2.2.ebuild
-2205271240 ./dev-python/setproctitle/setproctitle-1.2.3.ebuild
+2205281410 ./dev-python/service_identity/service_identity-21.1.0-r1.ebuild
+2205271410 ./dev-python/setproctitle/setproctitle-1.2.3.ebuild
 2205010512 ./dev-python/setuptools-git/setuptools-git-1.2-r2.ebuild
 2205102340 ./dev-python/setuptools-git/setuptools-git-1.2-r3.ebuild
 2205121640 ./dev-python/setuptools/setuptools-62.2.0.ebuild
 2205171440 ./dev-python/setuptools/setuptools-62.3.1.ebuild
 2205220810 ./dev-python/setuptools/setuptools-62.1.0-r1.ebuild
 2205220810 ./dev-python/setuptools/setuptools-62.3.2-r1.ebuild
-2202271539 ./dev-python/setuptools_scm/setuptools_scm-6.4.1.ebuild
 2205271240 ./dev-python/setuptools_scm/setuptools_scm-6.4.2.ebuild
 2202141139 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r4.ebuild
 2205161910 ./dev-python/setuptools_scm_git_archive/setuptools_scm_git_archive-1.1-r5.ebuild
@@ -13016,7 +13033,7 @@
 2204071109 ./dev-python/slixmpp/slixmpp-9999.ebuild
 2205151140 ./dev-python/slixmpp/slixmpp-1.8.2.ebuild
 2205191840 ./dev-python/smartypants/smartypants-2.0.1-r1.ebuild
-2205161740 ./dev-python/smmap/smmap-5.0.0.ebuild
+2205290010 ./dev-python/smmap/smmap-5.0.0.ebuild
 2109271339 ./dev-python/snakeoil/snakeoil-0.9.7.ebuild
 2111250210 ./dev-python/snakeoil/snakeoil-0.9.5.ebuild
 2112142109 ./dev-python/snakeoil/snakeoil-0.9.9.ebuild
@@ -13049,14 +13066,16 @@
 2205171540 ./dev-python/sphinx-panels/sphinx-panels-0.6.0.ebuild
 2204260511 ./dev-python/sphinx-prompt/sphinx-prompt-1.5.0.ebuild
 2109270139 ./dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
-2205072310 ./dev-python/sphinx-tabs/sphinx-tabs-3.3.1.ebuild
+2205281340 ./dev-python/sphinx-tabs/sphinx-tabs-3.3.1-r1.ebuild
 2204151910 ./dev-python/sphinx-testing/sphinx-testing-1.0.1-r2.ebuild
 2205220511 ./dev-python/sphinx/sphinx-4.5.0-r1.ebuild
+2205301210 ./dev-python/sphinx/sphinx-5.0.0.ebuild
 2201271210 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.9.1.ebuild
 2203270340 ./dev-python/sphinx_ansible_theme/sphinx_ansible_theme-0.8.0.ebuild
 2205221910 ./dev-python/sphinx_celery/sphinx_celery-2.0.0-r1.ebuild
 2112210239 ./dev-python/sphinx_lv2_theme/sphinx_lv2_theme-1.0.0-r1.ebuild
 2112220839 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0.ebuild
+2205310010 ./dev-python/sphinx_rtd_theme/sphinx_rtd_theme-1.0.0-r1.ebuild
 2108281140 ./dev-python/sphinx_selective_exclude/sphinx_selective_exclude-1.0.3.ebuild
 2205221810 ./dev-python/sphinxcontrib-apidoc/sphinxcontrib-apidoc-0.3.0-r1.ebuild
 2205141610 ./dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.2-r1.ebuild
@@ -13071,7 +13090,7 @@
 2205161910 ./dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.2-r1.ebuild
 2205141610 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-2.0.0-r1.ebuild
 2205141610 ./dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r2.ebuild
-2205010512 ./dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
+2205281340 ./dev-python/sphinxcontrib-log_cabinet/sphinxcontrib-log_cabinet-1.0.1-r1.ebuild
 2204262240 ./dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4-r1.ebuild
 2205111610 ./dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17-r1.ebuild
 2205141610 ./dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.3-r1.ebuild
@@ -13079,6 +13098,7 @@
 2204271010 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.2-r1.ebuild
 2205011010 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.3.3.ebuild
 2205261140 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.0.ebuild
+2205291040 ./dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-7.4.1.ebuild
 2205171540 ./dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
 2205141610 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.4-r1.ebuild
 2205111610 ./dev-python/sphobjinv/sphobjinv-2.2.2.ebuild
@@ -13100,12 +13120,12 @@
 2205191040 ./dev-python/ssl-fetch/ssl-fetch-0.4-r1.ebuild
 2109092039 ./dev-python/stapler/stapler-1.0.0_p20200531-r2.ebuild
 2205261940 ./dev-python/stapler/stapler-1.0.0_p20220330.ebuild
-2107070539 ./dev-python/statsd/statsd-3.3.0.ebuild
+2205290040 ./dev-python/statsd/statsd-3.3.0.ebuild
 2205072110 ./dev-python/statsmodels/statsmodels-0.13.2.ebuild
 2205171540 ./dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
-2202242139 ./dev-python/stestr/stestr-3.2.1.ebuild
-2205211740 ./dev-python/stevedore/stevedore-3.4.0-r1.ebuild
+2205290040 ./dev-python/stestr/stestr-3.2.1.ebuild
 2205211740 ./dev-python/stevedore/stevedore-3.4.0.ebuild
+2205281910 ./dev-python/stevedore/stevedore-3.4.0-r1.ebuild
 2203151640 ./dev-python/stomp-py/stomp-py-8.0.0.ebuild
 2205022240 ./dev-python/stomp-py/stomp-py-8.0.1.ebuild
 2205111740 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r2.ebuild
@@ -13134,12 +13154,13 @@
 2105231239 ./dev-python/tabulate/tabulate-0.8.9.ebuild
 2205231240 ./dev-python/tabulate/tabulate-0.8.9-r1.ebuild
 2106182240 ./dev-python/tagpy/tagpy-2018.1-r2.ebuild
+2205310510 ./dev-python/tagpy/tagpy-2018.1-r3.ebuild
 2201291010 ./dev-python/tappy/tappy-3.1.ebuild
 2205162210 ./dev-python/tappy/tappy-3.1-r1.ebuild
 2106222009 ./dev-python/tblib/tblib-1.7.0.ebuild
 2203141639 ./dev-python/tekore/tekore-4.3.0.ebuild
 2205251040 ./dev-python/tekore/tekore-4.4.0.ebuild
-2205151140 ./dev-python/tempest/tempest-30.1.0.ebuild
+2205290040 ./dev-python/tempest/tempest-30.1.0.ebuild
 2109100139 ./dev-python/tempita/tempita-0.5.3-r3.ebuild
 2205010512 ./dev-python/tempora/tempora-5.0.0.ebuild
 2205131940 ./dev-python/tempora/tempora-5.0.1.ebuild
@@ -13154,9 +13175,9 @@
 2203311710 ./dev-python/testfixtures/testfixtures-6.18.5.ebuild
 2205100010 ./dev-python/testpath/testpath-0.6.0.ebuild
 2202021039 ./dev-python/testresources/testresources-2.0.1.ebuild
-2205211540 ./dev-python/testresources/testresources-2.0.1-r1.ebuild
+2205281340 ./dev-python/testresources/testresources-2.0.1-r2.ebuild
 2202021039 ./dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
-2205211440 ./dev-python/testscenarios/testscenarios-0.5.0-r2.ebuild
+2205281340 ./dev-python/testscenarios/testscenarios-0.5.0-r3.ebuild
 2202021039 ./dev-python/testtools/testtools-2.5.0.ebuild
 2205211440 ./dev-python/testtools/testtools-2.5.0-r1.ebuild
 2205171540 ./dev-python/text-unidecode/text-unidecode-1.3-r1.ebuild
@@ -13212,10 +13233,9 @@
 2110150939 ./dev-python/txAMQP/txAMQP-0.8.2.ebuild
 2205191840 ./dev-python/txaio/txaio-22.2.1.ebuild
 2203141339 ./dev-python/txrequests/txrequests-0.9.6.ebuild
-2203121439 ./dev-python/typed-ast/typed-ast-1.5.2.ebuild
 2205010512 ./dev-python/typed-ast/typed-ast-1.4.3.ebuild
 2205220911 ./dev-python/typed-ast/typed-ast-1.5.4.ebuild
-2205271240 ./dev-python/typed-ast/typed-ast-1.5.3.ebuild
+2205271410 ./dev-python/typed-ast/typed-ast-1.5.3.ebuild
 2205111610 ./dev-python/typeguard/typeguard-2.13.3.ebuild
 2205232010 ./dev-python/typeguard/typeguard-2.13.3-r1.ebuild
 2202271539 ./dev-python/typing-extensions/typing-extensions-4.1.1.ebuild
@@ -13282,11 +13302,11 @@
 2203121339 ./dev-python/vncdotool/vncdotool-1.0.0.ebuild
 2109140439 ./dev-python/vobject/vobject-0.9.6.1-r2.ebuild
 2205162010 ./dev-python/vobject/vobject-0.9.6.1-r3.ebuild
-2205162010 ./dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
+2205290040 ./dev-python/voluptuous/voluptuous-0.13.1-r1.ebuild
 2203101110 ./dev-python/vpython/vpython-7.6.3.ebuild
 2205171040 ./dev-python/waitress/waitress-2.1.1.ebuild
 2108171009 ./dev-python/wand/wand-0.6.7.ebuild
-2203281010 ./dev-python/warlock/warlock-1.3.3-r3.ebuild
+2205282010 ./dev-python/warlock/warlock-1.3.3-r3.ebuild
 2205120010 ./dev-python/watchdog/watchdog-2.1.7.ebuild
 2205161110 ./dev-python/watchdog/watchdog-2.1.8.ebuild
 2204252240 ./dev-python/watchgod/watchgod-0.8.1.ebuild
@@ -13330,7 +13350,7 @@
 2205171040 ./dev-python/wsgiproxy2/wsgiproxy2-0.5.1-r1.ebuild
 2205151210 ./dev-python/wsproto/wsproto-1.1.0.ebuild
 2108192309 ./dev-python/wstools/wstools-0.4.8.ebuild
-2205211010 ./dev-python/wstools/wstools-0.4.10.ebuild
+2205281340 ./dev-python/wstools/wstools-0.4.10-r1.ebuild
 2203250209 ./dev-python/wtforms/wtforms-3.0.1.ebuild
 2205191110 ./dev-python/wtforms/wtforms-3.0.1-r1.ebuild
 2205161910 ./dev-python/wurlitzer/wurlitzer-3.0.2.ebuild
@@ -13369,7 +13389,7 @@
 2205162310 ./dev-python/zeroconf/zeroconf-0.38.6.ebuild
 2205131940 ./dev-python/zipp/zipp-3.8.0.ebuild
 2204221839 ./dev-python/zope-component/zope-component-4.4.1-r2.ebuild
-2205271240 ./dev-python/zope-component/zope-component-5.0.1.ebuild
+2205281010 ./dev-python/zope-component/zope-component-5.0.1.ebuild
 2204221839 ./dev-python/zope-configuration/zope-configuration-4.4.1-r2.ebuild
 2205181410 ./dev-python/zope-deprecation/zope-deprecation-4.4.0-r2.ebuild
 2205100010 ./dev-python/zope-event/zope-event-4.5.0-r3.ebuild
@@ -13408,8 +13428,10 @@
 2202271539 ./dev-python/logical-unification/logical-unification-0.4.5.ebuild
 2202271539 ./dev-python/minikanren/minikanren-1.0.3.ebuild
 2112302239 ./dev-python/multipledispatch/multipledispatch-0.6.0.ebuild
+2205292240 ./dev-python/multipledispatch/multipledispatch-0.6.0-r1.ebuild
 2201232239 ./dev-python/starlette/starlette-0.18.0.ebuild
 2205031140 ./dev-python/starlette/starlette-0.20.0.ebuild
+2205291040 ./dev-python/starlette/starlette-0.20.1.ebuild
 2205041140 ./dev-python/tifffile/tifffile-2022.5.4.ebuild
 2205171540 ./dev-python/pytest-codeblocks/pytest-codeblocks-0.15.0.ebuild
 2205102110 ./dev-python/wcag-contrast-ratio/wcag-contrast-ratio-0.9-r1.ebuild
@@ -13419,19 +13441,18 @@
 2205161810 ./dev-python/littleutils/littleutils-0.2.2.ebuild
 2205161810 ./dev-python/pure_eval/pure_eval-0.2.2.ebuild
 2205080740 ./dev-python/stack_data/stack_data-0.2.0.ebuild
-2203202140 ./dev-python/installer/installer-0.5.0.ebuild
 2205271240 ./dev-python/installer/installer-0.5.1.ebuild
 2205022240 ./dev-python/pdm-pep517/pdm-pep517-0.12.4.ebuild
 2205171010 ./dev-python/pdm-pep517/pdm-pep517-0.12.5.ebuild
 2205121710 ./dev-python/poetry-core/poetry-core-1.0.8.ebuild
 2205150940 ./dev-python/socksio/socksio-1.0.0.ebuild
 2202271539 ./dev-python/python3-xapp/python3-xapp-2.2.1-r1.ebuild
-2205212040 ./dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
-2203121809 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
+2205292240 ./dev-python/markdown-it-py/markdown-it-py-2.1.0.ebuild
+2205292240 ./dev-python/mdit-py-plugins/mdit-py-plugins-0.3.0.ebuild
 2205151140 ./dev-python/mdurl/mdurl-0.1.1.ebuild
-2205212040 ./dev-python/myst_parser/myst_parser-0.17.2.ebuild
+2205292240 ./dev-python/myst_parser/myst_parser-0.17.2.ebuild
 2203121409 ./dev-python/picobox/picobox-2.2.0.ebuild
-2203121409 ./dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
+2205292240 ./dev-python/pytest-param-files/pytest-param-files-0.3.4.ebuild
 2204270740 ./dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.8.0-r1.ebuild
 2204270740 ./dev-python/sphinxcontrib-openapi/sphinxcontrib-openapi-0.7.0-r1.ebuild
 2203121409 ./dev-python/sphinxemoji/sphinxemoji-0.2.0.ebuild
@@ -13454,7 +13475,7 @@
 2205011710 ./dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.10.1.ebuild
 2202180139 ./dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
 2203120440 ./dev-python/meshio/meshio-5.3.4.ebuild
-2204110939 ./dev-python/makefun/makefun-1.13.1.ebuild
+2205292240 ./dev-python/makefun/makefun-1.13.1.ebuild
 2205241610 ./dev-python/mkdocs-i18n/mkdocs-i18n-0.4.4.ebuild
 2202211239 ./dev-python/mrcfile/mrcfile-1.3.0.ebuild
 2203070239 ./dev-python/pyfuse3/pyfuse3-3.2.1.ebuild
@@ -13473,11 +13494,11 @@
 2205211010 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.0.ebuild
 2205240940 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.2.1.ebuild
 2205262210 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.3.0.ebuild
-2205270940 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
+2205301710 ./dev-python/pytest-shell-utilities/pytest-shell-utilities-1.4.0.ebuild
 2205062310 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.2.0.ebuild
 2205100110 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0.ebuild
-2205250740 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
-2205062310 ./dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
+2205301710 ./dev-python/pytest-skip-markers/pytest-skip-markers-1.3.0-r1.ebuild
+2205301710 ./dev-python/pytest-system-statistics/pytest-system-statistics-1.0.2.ebuild
 2205062310 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r1.ebuild
 2205240940 ./dev-python/setuptools-declarative-requirements/setuptools-declarative-requirements-1.2.0-r2.ebuild
 2205191240 ./dev-python/ini2toml/ini2toml-0.10.ebuild
@@ -13489,6 +13510,7 @@
 2204102009 ./dev-python/leechcorepyc/leechcorepyc-2.10.2.ebuild
 2204050639 ./dev-python/pefile/pefile-2021.9.3.ebuild
 2204050639 ./dev-python/pefile/pefile-9999.ebuild
+2205310610 ./dev-python/pefile/pefile-2022.5.30.ebuild
 2204050639 ./dev-python/python-ptrace/python-ptrace-0.9.8.ebuild
 2204050639 ./dev-python/python-ptrace/python-ptrace-9999.ebuild
 2204051639 ./dev-python/ffmpeg-python/ffmpeg-python-0.2.0.ebuild
@@ -13508,15 +13530,15 @@
 2205192010 ./dev-python/pyeclib/pyeclib-1.6.1.ebuild
 2205211010 ./dev-python/exceptiongroup/exceptiongroup-1.0.0_rc7.ebuild
 2205122240 ./dev-python/flit_scm/flit_scm-1.5.0.ebuild
-2205120010 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
+2205301040 ./dev-python/flit_scm/flit_scm-1.6.2.ebuild
+2205281410 ./dev-python/setuptools-rust/setuptools-rust-1.3.0.ebuild
 2205151210 ./dev-python/dirty-equals/dirty-equals-0.4.ebuild
 2204230939 ./dev-python/tpm2-pytss/tpm2-pytss-1.1.0.ebuild
 2205151210 ./dev-python/watchfiles/watchfiles-0.13.ebuild
 2205180910 ./dev-python/watchfiles/watchfiles-0.14.1.ebuild
 2205171010 ./dev-python/watchfiles/watchfiles-0.14.ebuild
-2205271240 ./dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
-2204251910 ./dev-python/lark/lark-0.11.3-r1.ebuild
-2205271240 ./dev-python/lark/lark-1.1.2.ebuild
+2205281010 ./dev-python/zope-hookable/zope-hookable-5.1.0.ebuild
+2205271410 ./dev-python/lark/lark-1.1.2.ebuild
 2205132340 ./dev-python/python-pam/python-pam-2.0.2-r1.ebuild
 2205021410 ./dev-python/notebook_shim/notebook_shim-0.1.0.ebuild
 2205031140 ./dev-python/suds-community/suds-community-1.1.0.ebuild
@@ -13528,11 +13550,12 @@
 2205200440 ./dev-python/allpairspy/allpairspy-2.5.0.ebuild
 2205190440 ./dev-python/dbus-next/dbus-next-0.2.3.ebuild
 2205200440 ./dev-python/pathvalidate/pathvalidate-2.5.0.ebuild
-2205190710 ./dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
+2205282010 ./dev-python/tcolorpy/tcolorpy-0.1.2.ebuild
 2205211010 ./dev-python/kgb/kgb-7.0-r1.ebuild
 2205211010 ./dev-python/pydiffx/pydiffx-1.0.1-r1.ebuild
 2205242210 ./dev-python/openapi-schema-validator/openapi-schema-validator-0.2.3.ebuild
 2205242210 ./dev-python/openapi-spec-validator/openapi-spec-validator-0.4.0.ebuild
+2205310210 ./dev-python/versioningit/versioningit-1.1.1.ebuild
 2204172140 ./dev-qt/assistant/assistant-5.15.3.ebuild
 2205202310 ./dev-qt/assistant/assistant-5.15.4.ebuild
 2204172140 ./dev-qt/designer/designer-5.15.3.ebuild
@@ -13562,8 +13585,7 @@
 2204172140 ./dev-qt/qtconcurrent/qtconcurrent-5.15.3.ebuild
 2205251440 ./dev-qt/qtconcurrent/qtconcurrent-5.15.4.ebuild
 2205190840 ./dev-qt/qtcore/qtcore-5.15.3.ebuild
-2205202310 ./dev-qt/qtcore/qtcore-5.15.4.ebuild
-2205260240 ./dev-qt/qtcore/qtcore-5.15.4-r1.ebuild
+2205301940 ./dev-qt/qtcore/qtcore-5.15.4-r2.ebuild
 2204140340 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.3.ebuild
 2205202310 ./dev-qt/qtdatavis3d/qtdatavis3d-5.15.4.ebuild
 2204172140 ./dev-qt/qtdbus/qtdbus-5.15.3.ebuild
@@ -13637,13 +13659,13 @@
 2205202310 ./dev-qt/qtwebchannel/qtwebchannel-5.15.4.ebuild
 2205150040 ./dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
 2205202310 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
-2205262240 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+2205301940 ./dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
 2204172140 ./dev-qt/qtwebsockets/qtwebsockets-5.15.3.ebuild
 2205202310 ./dev-qt/qtwebsockets/qtwebsockets-5.15.4.ebuild
 2203211409 ./dev-qt/qtwebview/qtwebview-5.15.3.ebuild
 2205202310 ./dev-qt/qtwebview/qtwebview-5.15.4.ebuild
 2204172140 ./dev-qt/qtwidgets/qtwidgets-5.15.3.ebuild
-2205251440 ./dev-qt/qtwidgets/qtwidgets-5.15.4.ebuild
+2205301940 ./dev-qt/qtwidgets/qtwidgets-5.15.4-r1.ebuild
 2204172140 ./dev-qt/qtx11extras/qtx11extras-5.15.3.ebuild
 2205251440 ./dev-qt/qtx11extras/qtx11extras-5.15.4.ebuild
 2205190840 ./dev-qt/qtxml/qtxml-5.15.3.ebuild
@@ -14853,11 +14875,6 @@
 2112260340 ./dev-ruby/acme-client/acme-client-2.0.9.ebuild
 2105070839 ./dev-ruby/actioncable/actioncable-5.2.6.ebuild
 2108200909 ./dev-ruby/actioncable/actioncable-6.0.4.1.ebuild
-2112160839 ./dev-ruby/actioncable/actioncable-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actioncable/actioncable-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actioncable/actioncable-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actioncable/actioncable-6.1.5.ebuild
-2203261740 ./dev-ruby/actioncable/actioncable-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actioncable/actioncable-5.2.7.1.ebuild
 2204270940 ./dev-ruby/actioncable/actioncable-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actioncable/actioncable-6.1.5.1.ebuild
@@ -14867,11 +14884,6 @@
 2205140940 ./dev-ruby/actioncable/actioncable-6.1.6.ebuild
 2205141140 ./dev-ruby/actioncable/actioncable-7.0.3.ebuild
 2109060809 ./dev-ruby/actionmailbox/actionmailbox-6.0.4.1.ebuild
-2112160839 ./dev-ruby/actionmailbox/actionmailbox-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actionmailbox/actionmailbox-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actionmailbox/actionmailbox-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actionmailbox/actionmailbox-6.1.5.ebuild
-2204091339 ./dev-ruby/actionmailbox/actionmailbox-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actionmailbox/actionmailbox-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actionmailbox/actionmailbox-6.1.5.1.ebuild
 2204271410 ./dev-ruby/actionmailbox/actionmailbox-7.0.2.4.ebuild
@@ -14880,11 +14892,6 @@
 2205141140 ./dev-ruby/actionmailbox/actionmailbox-7.0.3.ebuild
 2105070839 ./dev-ruby/actionmailer/actionmailer-5.2.6.ebuild
 2108200909 ./dev-ruby/actionmailer/actionmailer-6.0.4.1.ebuild
-2112160839 ./dev-ruby/actionmailer/actionmailer-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actionmailer/actionmailer-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actionmailer/actionmailer-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actionmailer/actionmailer-6.1.5.ebuild
-2203261740 ./dev-ruby/actionmailer/actionmailer-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actionmailer/actionmailer-5.2.7.1.ebuild
 2204270940 ./dev-ruby/actionmailer/actionmailer-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actionmailer/actionmailer-6.1.5.1.ebuild
@@ -14898,11 +14905,6 @@
 2205080910 ./dev-ruby/actionpack-xml_parser/actionpack-xml_parser-2.0.1-r2.ebuild
 2106041139 ./dev-ruby/actionpack/actionpack-5.2.6.ebuild
 2111080609 ./dev-ruby/actionpack/actionpack-6.0.4.1.ebuild
-2202201140 ./dev-ruby/actionpack/actionpack-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actionpack/actionpack-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actionpack/actionpack-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actionpack/actionpack-6.1.5.ebuild
-2203251339 ./dev-ruby/actionpack/actionpack-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actionpack/actionpack-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actionpack/actionpack-6.1.5.1.ebuild
 2204271410 ./dev-ruby/actionpack/actionpack-7.0.2.4.ebuild
@@ -14912,11 +14914,6 @@
 2205140940 ./dev-ruby/actionpack/actionpack-6.1.6.ebuild
 2205141140 ./dev-ruby/actionpack/actionpack-7.0.3.ebuild
 2109060809 ./dev-ruby/actiontext/actiontext-6.0.4.1.ebuild
-2112160839 ./dev-ruby/actiontext/actiontext-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actiontext/actiontext-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actiontext/actiontext-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actiontext/actiontext-6.1.5.ebuild
-2204091339 ./dev-ruby/actiontext/actiontext-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actiontext/actiontext-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actiontext/actiontext-6.1.5.1.ebuild
 2204271410 ./dev-ruby/actiontext/actiontext-7.0.2.4.ebuild
@@ -14925,11 +14922,6 @@
 2205141140 ./dev-ruby/actiontext/actiontext-7.0.3.ebuild
 2106041139 ./dev-ruby/actionview/actionview-5.2.6.ebuild
 2111080609 ./dev-ruby/actionview/actionview-6.0.4.1.ebuild
-2202201140 ./dev-ruby/actionview/actionview-6.0.4.4.ebuild
-2202201140 ./dev-ruby/actionview/actionview-7.0.2.2.ebuild
-2203121309 ./dev-ruby/actionview/actionview-6.0.4.7.ebuild
-2203131010 ./dev-ruby/actionview/actionview-6.1.5.ebuild
-2203251339 ./dev-ruby/actionview/actionview-7.0.2.3.ebuild
 2204270940 ./dev-ruby/actionview/actionview-6.0.4.8.ebuild
 2204271140 ./dev-ruby/actionview/actionview-6.1.5.1.ebuild
 2204271410 ./dev-ruby/actionview/actionview-7.0.2.4.ebuild
@@ -14940,12 +14932,6 @@
 2205141140 ./dev-ruby/actionview/actionview-7.0.3.ebuild
 2105070839 ./dev-ruby/activejob/activejob-5.2.6.ebuild
 2108200909 ./dev-ruby/activejob/activejob-6.0.4.1.ebuild
-2112160839 ./dev-ruby/activejob/activejob-6.0.4.4.ebuild
-2202201140 ./dev-ruby/activejob/activejob-7.0.2.2.ebuild
-2203121309 ./dev-ruby/activejob/activejob-6.0.4.7.ebuild
-2203131010 ./dev-ruby/activejob/activejob-6.1.5.ebuild
-2203131010 ./dev-ruby/activejob/activejob-7.0.2.3.ebuild
-2203251339 ./dev-ruby/activejob/activejob-7.0.2.3-r1.ebuild
 2204270940 ./dev-ruby/activejob/activejob-5.2.7.1.ebuild
 2204270940 ./dev-ruby/activejob/activejob-6.0.4.8.ebuild
 2204271140 ./dev-ruby/activejob/activejob-6.1.5.1.ebuild
@@ -14961,11 +14947,6 @@
 2203261110 ./dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r2.ebuild
 2106041139 ./dev-ruby/activemodel/activemodel-5.2.6.ebuild
 2111080609 ./dev-ruby/activemodel/activemodel-6.0.4.1.ebuild
-2202201140 ./dev-ruby/activemodel/activemodel-6.0.4.4.ebuild
-2202201140 ./dev-ruby/activemodel/activemodel-7.0.2.2.ebuild
-2203121309 ./dev-ruby/activemodel/activemodel-6.0.4.7.ebuild
-2203131010 ./dev-ruby/activemodel/activemodel-6.1.5.ebuild
-2203251339 ./dev-ruby/activemodel/activemodel-7.0.2.3.ebuild
 2204270940 ./dev-ruby/activemodel/activemodel-6.0.4.8.ebuild
 2204271140 ./dev-ruby/activemodel/activemodel-6.1.5.1.ebuild
 2204271410 ./dev-ruby/activemodel/activemodel-7.0.2.4.ebuild
@@ -14976,11 +14957,6 @@
 2205141140 ./dev-ruby/activemodel/activemodel-7.0.3.ebuild
 2105070839 ./dev-ruby/activerecord/activerecord-5.2.6.ebuild
 2111080609 ./dev-ruby/activerecord/activerecord-6.0.4.1.ebuild
-2202201140 ./dev-ruby/activerecord/activerecord-6.0.4.4.ebuild
-2202201140 ./dev-ruby/activerecord/activerecord-7.0.2.2.ebuild
-2203121309 ./dev-ruby/activerecord/activerecord-6.0.4.7.ebuild
-2203131010 ./dev-ruby/activerecord/activerecord-6.1.5.ebuild
-2203251339 ./dev-ruby/activerecord/activerecord-7.0.2.3.ebuild
 2204270940 ./dev-ruby/activerecord/activerecord-5.2.7.1.ebuild
 2204270940 ./dev-ruby/activerecord/activerecord-6.0.4.8.ebuild
 2204271140 ./dev-ruby/activerecord/activerecord-6.1.5.1.ebuild
@@ -14991,11 +14967,6 @@
 2205141140 ./dev-ruby/activerecord/activerecord-7.0.3.ebuild
 2105070839 ./dev-ruby/activestorage/activestorage-5.2.6.ebuild
 2108200909 ./dev-ruby/activestorage/activestorage-6.0.4.1.ebuild
-2112160839 ./dev-ruby/activestorage/activestorage-6.0.4.4.ebuild
-2202201140 ./dev-ruby/activestorage/activestorage-7.0.2.2.ebuild
-2203121309 ./dev-ruby/activestorage/activestorage-6.0.4.7.ebuild
-2203131010 ./dev-ruby/activestorage/activestorage-6.1.5.ebuild
-2204091109 ./dev-ruby/activestorage/activestorage-7.0.2.3.ebuild
 2204270940 ./dev-ruby/activestorage/activestorage-5.2.7.1.ebuild
 2204270940 ./dev-ruby/activestorage/activestorage-6.0.4.8.ebuild
 2204271140 ./dev-ruby/activestorage/activestorage-6.1.5.1.ebuild
@@ -15006,19 +14977,14 @@
 2205141140 ./dev-ruby/activestorage/activestorage-7.0.3.ebuild
 2110030009 ./dev-ruby/activesupport/activesupport-5.2.6.ebuild
 2110040409 ./dev-ruby/activesupport/activesupport-6.0.4.1.ebuild
-2202131239 ./dev-ruby/activesupport/activesupport-7.0.2.2.ebuild
-2202201140 ./dev-ruby/activesupport/activesupport-6.0.4.4.ebuild
-2203121309 ./dev-ruby/activesupport/activesupport-6.0.4.7.ebuild
-2204261810 ./dev-ruby/activesupport/activesupport-6.1.5.ebuild
-2204261710 ./dev-ruby/activesupport/activesupport-7.0.2.3.ebuild
 2205081810 ./dev-ruby/activesupport/activesupport-6.1.5.1.ebuild
 2205081810 ./dev-ruby/activesupport/activesupport-7.0.2.4.ebuild
 2205120840 ./dev-ruby/activesupport/activesupport-5.2.7.1.ebuild
 2205120840 ./dev-ruby/activesupport/activesupport-6.0.4.8.ebuild
-2205140910 ./dev-ruby/activesupport/activesupport-5.2.8.ebuild
-2205140940 ./dev-ruby/activesupport/activesupport-6.0.5.ebuild
 2205140940 ./dev-ruby/activesupport/activesupport-6.1.6.ebuild
 2205141140 ./dev-ruby/activesupport/activesupport-7.0.3.ebuild
+2205301010 ./dev-ruby/activesupport/activesupport-5.2.8.ebuild
+2205301010 ./dev-ruby/activesupport/activesupport-6.0.5.ebuild
 2203261110 ./dev-ruby/acts_as_list/acts_as_list-1.0.4.ebuild
 2205081810 ./dev-ruby/addressable/addressable-2.8.0.ebuild
 2110231009 ./dev-ruby/ae/ae-1.8.2-r1.ebuild
@@ -15463,10 +15429,10 @@
 2205011210 ./dev-ruby/middleware/middleware-0.1.0.ebuild
 2111160939 ./dev-ruby/mime-types-data/mime-types-data-3.2021.1115.ebuild
 2205191710 ./dev-ruby/mime-types-data/mime-types-data-3.2022.0105.ebuild
-2205271010 ./dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
+2205281010 ./dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
 2204261710 ./dev-ruby/mime-types/mime-types-2.99.3.ebuild
 2205191710 ./dev-ruby/mime-types/mime-types-3.4.1.ebuild
-2205271010 ./dev-ruby/mime-types/mime-types-3.3.1.ebuild
+2205281010 ./dev-ruby/mime-types/mime-types-3.3.1.ebuild
 2103270939 ./dev-ruby/mimemagic/mimemagic-0.3.10.ebuild
 2107091010 ./dev-ruby/mimemagic/mimemagic-0.4.3.ebuild
 2111251540 ./dev-ruby/mimemagic/mimemagic-0.3.10-r1.ebuild
@@ -15503,10 +15469,9 @@
 2203222209 ./dev-ruby/moneta/moneta-1.4.1.ebuild
 2205011240 ./dev-ruby/moneta/moneta-1.5.1.ebuild
 2008081009 ./dev-ruby/mqtt/mqtt-0.5.0.ebuild
-2201201009 ./dev-ruby/msgpack/msgpack-1.4.3.ebuild
-2201301139 ./dev-ruby/msgpack/msgpack-1.4.4.ebuild
 2203171009 ./dev-ruby/msgpack/msgpack-1.4.5.ebuild
 2204091109 ./dev-ruby/msgpack/msgpack-1.5.1.ebuild
+2205280910 ./dev-ruby/msgpack/msgpack-1.5.2.ebuild
 2104060140 ./dev-ruby/multi_json/multi_json-1.14.1.ebuild
 2203222209 ./dev-ruby/multi_json/multi_json-1.15.0.ebuild
 2205081810 ./dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
@@ -15549,15 +15514,14 @@
 2102041109 ./dev-ruby/nio4r/nio4r-2.5.4.ebuild
 2204021110 ./dev-ruby/nio4r/nio4r-2.5.8.ebuild
 2204261810 ./dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r3.ebuild
-2204151040 ./dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
-2205081810 ./dev-ruby/nokogiri/nokogiri-1.13.5.ebuild
-2205271010 ./dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
+2205271640 ./dev-ruby/nokogiri/nokogiri-1.13.6.ebuild
 2201151010 ./dev-ruby/ntlm-http/ntlm-http-0.1.1-r3.ebuild
 2205010940 ./dev-ruby/oauth/oauth-0.5.8.ebuild
 2205050910 ./dev-ruby/oauth/oauth-0.5.10.ebuild
 2104161439 ./dev-ruby/oauth2/oauth2-1.4.4.ebuild
 2205081040 ./dev-ruby/oauth2/oauth2-1.4.7.ebuild
 2205081040 ./dev-ruby/octokit/octokit-4.22.0.ebuild
+2205280910 ./dev-ruby/octokit/octokit-4.23.0.ebuild
 2107071109 ./dev-ruby/omniauth/omniauth-2.0.4.ebuild
 2204140810 ./dev-ruby/omniauth/omniauth-2.1.0.ebuild
 2205081940 ./dev-ruby/open4/open4-1.3.4-r1.ebuild
@@ -15646,11 +15610,6 @@
 2203251339 ./dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
 2105070839 ./dev-ruby/rails/rails-5.2.6.ebuild
 2108200909 ./dev-ruby/rails/rails-6.0.4.1.ebuild
-2112160839 ./dev-ruby/rails/rails-6.0.4.4.ebuild
-2202201140 ./dev-ruby/rails/rails-7.0.2.2.ebuild
-2203121309 ./dev-ruby/rails/rails-6.0.4.7.ebuild
-2203131010 ./dev-ruby/rails/rails-6.1.5.ebuild
-2204091339 ./dev-ruby/rails/rails-7.0.2.3.ebuild
 2204270940 ./dev-ruby/rails/rails-5.2.7.1.ebuild
 2204270940 ./dev-ruby/rails/rails-6.0.4.8.ebuild
 2204271140 ./dev-ruby/rails/rails-6.1.5.1.ebuild
@@ -15661,11 +15620,6 @@
 2205141140 ./dev-ruby/rails/rails-7.0.3.ebuild
 2111080909 ./dev-ruby/railties/railties-5.2.6.ebuild
 2111080909 ./dev-ruby/railties/railties-6.0.4.1.ebuild
-2202201140 ./dev-ruby/railties/railties-6.0.4.4.ebuild
-2202201140 ./dev-ruby/railties/railties-7.0.2.2.ebuild
-2203121309 ./dev-ruby/railties/railties-6.0.4.7.ebuild
-2203131010 ./dev-ruby/railties/railties-6.1.5.ebuild
-2203251339 ./dev-ruby/railties/railties-7.0.2.3.ebuild
 2204270940 ./dev-ruby/railties/railties-6.0.4.8.ebuild
 2204271140 ./dev-ruby/railties/railties-6.1.5.1.ebuild
 2204271410 ./dev-ruby/railties/railties-7.0.2.4.ebuild
@@ -15725,9 +15679,9 @@
 2204231109 ./dev-ruby/ref/ref-2.0.0-r1.ebuild
 2003061039 ./dev-ruby/regexp_parser/regexp_parser-0.5.0.ebuild
 2012202239 ./dev-ruby/regexp_parser/regexp_parser-1.8.2.ebuild
-2204231109 ./dev-ruby/regexp_parser/regexp_parser-2.2.1.ebuild
-2204250840 ./dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
 2205100810 ./dev-ruby/regexp_parser/regexp_parser-2.4.0.ebuild
+2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.3.1.ebuild
+2205290940 ./dev-ruby/regexp_parser/regexp_parser-2.5.0.ebuild
 2204021210 ./dev-ruby/regexp_property_values/regexp_property_values-1.2.0.ebuild
 2204081239 ./dev-ruby/regexp_property_values/regexp_property_values-1.3.0.ebuild
 2104080909 ./dev-ruby/request_store/request_store-1.5.0.ebuild
@@ -15767,8 +15721,7 @@
 2204231309 ./dev-ruby/rqrcode_core/rqrcode_core-1.2.0.ebuild
 2101062139 ./dev-ruby/rr/rr-1.2.1.ebuild
 2204171140 ./dev-ruby/rr/rr-3.0.9.ebuild
-2108030139 ./dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
-2205061440 ./dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
+2205281910 ./dev-ruby/rrdtool-bindings/rrdtool-bindings-1.8.0.ebuild
 2203291910 ./dev-ruby/rspec-collection_matchers/rspec-collection_matchers-1.2.0.ebuild
 2109102140 ./dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
 2104122109 ./dev-ruby/rspec-core/rspec-core-3.9.3.ebuild
@@ -16032,6 +15985,7 @@
 2006061109 ./dev-ruby/tomlrb/tomlrb-1.2.8.ebuild
 2204171140 ./dev-ruby/tomlrb/tomlrb-2.0.1.ebuild
 2205260910 ./dev-ruby/tomlrb/tomlrb-2.0.2.ebuild
+2205290910 ./dev-ruby/tomlrb/tomlrb-2.0.3.ebuild
 2204171140 ./dev-ruby/totoridipjp/totoridipjp-0.1.0-r1.ebuild
 2204171140 ./dev-ruby/transaction-simple/transaction-simple-1.4.0.2-r3.ebuild
 2111261140 ./dev-ruby/travis/travis-1.10.0-r1.ebuild
@@ -16095,7 +16049,7 @@
 2107021039 ./dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild
 2106140739 ./dev-ruby/websocket-driver/websocket-driver-0.7.5.ebuild
 2103140939 ./dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r1.ebuild
-2111241610 ./dev-ruby/websocket/websocket-1.2.9-r1.ebuild
+2205282340 ./dev-ruby/websocket/websocket-1.2.9-r1.ebuild
 2204161040 ./dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
 2204161040 ./dev-ruby/will_paginate/will_paginate-3.3.1.ebuild
 2201161040 ./dev-ruby/windows_error/windows_error-0.1.3.ebuild
@@ -16121,6 +16075,7 @@
 2202262209 ./dev-ruby/benchmark-ips/benchmark-ips-2.9.2.ebuild
 2203140939 ./dev-ruby/benchmark-ips/benchmark-ips-2.10.0.ebuild
 2204091339 ./dev-ruby/digest/digest-3.1.0.ebuild
+2205291210 ./dev-ruby/digest/digest-3.1.0-r1.ebuild
 2203271040 ./dev-ruby/io-wait/io-wait-0.2.1.ebuild
 2205100810 ./dev-ruby/io-wait/io-wait-0.2.3.ebuild
 2204091339 ./dev-ruby/net-imap/net-imap-0.2.3.ebuild
@@ -16201,7 +16156,7 @@
 2104011539 ./dev-scheme/xdgdirs/xdgdirs-2.2.ebuild
 2110281709 ./dev-scheme/ypsilon/ypsilon-0.9.6_p3-r2.ebuild
 2203262039 ./dev-scheme/chez/chez-9.5.6-r2.ebuild
-2204260040 ./dev-scheme/chez/chez-9.5.8.ebuild
+2205291040 ./dev-scheme/chez/chez-9.5.8.ebuild
 2111252209 ./dev-scheme/chibi/chibi-0.10.ebuild
 2111252209 ./dev-scheme/chibi/chibi-9999.ebuild
 2111252109 ./dev-scheme/cyclone/cyclone-0.33.0.ebuild
@@ -16419,9 +16374,8 @@
 2008031109 ./dev-util/bnfc/bnfc-2.8.3.ebuild
 2202052039 ./dev-util/boost-build/boost-build-1.78.0-r1.ebuild
 2205010512 ./dev-util/boost-build/boost-build-1.79.0.ebuild
-2204280140 ./dev-util/bpftool/bpftool-5.16.15.ebuild
-2204272310 ./dev-util/bpftool/bpftool-5.17.4.ebuild
 2205202210 ./dev-util/bpftool/bpftool-5.17.7.ebuild
+2205281910 ./dev-util/bpftool/bpftool-5.17.4.ebuild
 2201312309 ./dev-util/bpftrace/bpftrace-0.14.1.ebuild
 2205050210 ./dev-util/bpftrace/bpftrace-0.14.1-r1.ebuild
 2205242110 ./dev-util/bpftrace/bpftrace-0.15.0.ebuild
@@ -16429,17 +16383,26 @@
 2203200410 ./dev-util/btyacc/btyacc-3.0-r4.ebuild
 2203270340 ./dev-util/build2/build2-0.13.0.ebuild
 2203270410 ./dev-util/build2/build2-0.14.0.ebuild
-2203141339 ./dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
-2201281440 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
-2203141339 ./dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
-2203141339 ./dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
-2201302209 ./dev-util/buildbot/buildbot-9999.ebuild
-2203141339 ./dev-util/buildbot/buildbot-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-badges/buildbot-badges-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-badges/buildbot-badges-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-console-view/buildbot-console-view-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-console-view/buildbot-console-view-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-grid-view/buildbot-grid-view-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-grid-view/buildbot-grid-view-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-pkg/buildbot-pkg-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-pkg/buildbot-pkg-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
+2205310440 ./dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
+2205302240 ./dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+2205302240 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.5.0.ebuild
+2205302240 ./dev-util/buildbot-www/buildbot-www-3.4.0.ebuild
+2205302240 ./dev-util/buildbot-www/buildbot-www-3.5.0.ebuild
+2205302240 ./dev-util/buildbot/buildbot-3.4.0.ebuild
+2205302240 ./dev-util/buildbot/buildbot-3.5.0.ebuild
+2205302240 ./dev-util/buildbot/buildbot-9999.ebuild
 2101011509 ./dev-util/bustle/bustle-0.8.0.ebuild
 2202191210 ./dev-util/byacc/byacc-20220114.ebuild
 2205032210 ./dev-util/byacc/byacc-20220128.ebuild
@@ -16479,7 +16442,6 @@
 2104060140 ./dev-util/cgvg/cgvg-1.6.3.ebuild
 2112052139 ./dev-util/checkbashisms/checkbashisms-2.21.4.ebuild
 2204220239 ./dev-util/checkbashisms/checkbashisms-2.22.1.ebuild
-2202251109 ./dev-util/checkstyle/checkstyle-7.2-r1.ebuild
 2101222209 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.4.ebuild
 2205112210 ./dev-util/chroot-wrapper/chroot-wrapper-0.9.9.ebuild
 2112210039 ./dev-util/clair/clair-2.1.3.ebuild
@@ -16491,9 +16453,8 @@
 2102220109 ./dev-util/clinfo/clinfo-3.0.21.02.21.ebuild
 2004090109 ./dev-util/clinfo/clinfo-9999.ebuild
 2201281210 ./dev-util/clion/clion-2021.3.2.ebuild
-2202241309 ./dev-util/clippy/clippy-8.1-r1.ebuild
-2204280140 ./dev-util/clippy/clippy-8.2.2.ebuild
 2205170440 ./dev-util/clippy/clippy-8.2.2-r1.ebuild
+2205301010 ./dev-util/clippy/clippy-8.2.2.ebuild
 2106272139 ./dev-util/cloc/cloc-1.88.ebuild
 2112310709 ./dev-util/cloc/cloc-1.90.ebuild
 2204231840 ./dev-util/cmake-fedora/cmake-fedora-2.9.3.ebuild
@@ -16601,6 +16562,7 @@
 2203081240 ./dev-util/devhelp/devhelp-41.2.ebuild
 2204140240 ./dev-util/dialog/dialog-1.3.20211214.ebuild
 2205191040 ./dev-util/dialog/dialog-1.3.20220414.ebuild
+2205310810 ./dev-util/dialog/dialog-1.3.20220526.ebuild
 2105042209 ./dev-util/diff-cover/diff-cover-5.0.1.ebuild
 2011141839 ./dev-util/diffball/diffball-1.0.1-r2.ebuild
 2011272109 ./dev-util/difffilter/difffilter-0.3.3-r1.ebuild
@@ -16608,6 +16570,7 @@
 2204220339 ./dev-util/diffoscope/diffoscope-210.ebuild
 2205030540 ./dev-util/diffoscope/diffoscope-211.ebuild
 2205140511 ./dev-util/diffoscope/diffoscope-212.ebuild
+2205280910 ./dev-util/diffoscope/diffoscope-214.ebuild
 2104060140 ./dev-util/diffstat/diffstat-1.63.ebuild
 2202111709 ./dev-util/diffstat/diffstat-1.64.ebuild
 2107172140 ./dev-util/diffuse/diffuse-0.6.0.ebuild
@@ -16653,7 +16616,8 @@
 2105242309 ./dev-util/gcovr/gcovr-4.2.ebuild
 2203181810 ./dev-util/gdbus-codegen/gdbus-codegen-2.70.4.ebuild
 2203200440 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.0.ebuild
-2205171110 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
+2205280910 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.1.ebuild
+2205302140 ./dev-util/gdbus-codegen/gdbus-codegen-2.72.2.ebuild
 2202170139 ./dev-util/geany-plugins/geany-plugins-1.37-r101.ebuild
 2202200340 ./dev-util/geany-plugins/geany-plugins-1.38-r1.ebuild
 2106301339 ./dev-util/geany/geany-1.37.1.ebuild
@@ -16672,7 +16636,8 @@
 2202090410 ./dev-util/glade/glade-3.38.2-r1.ebuild
 2203181810 ./dev-util/glib-utils/glib-utils-2.70.4.ebuild
 2203200440 ./dev-util/glib-utils/glib-utils-2.72.0.ebuild
-2205090840 ./dev-util/glib-utils/glib-utils-2.72.1.ebuild
+2205280910 ./dev-util/glib-utils/glib-utils-2.72.1.ebuild
+2205302140 ./dev-util/glib-utils/glib-utils-2.72.2.ebuild
 2008111809 ./dev-util/global/global-6.6.4.ebuild
 2112251340 ./dev-util/glslang/glslang-1.2.198.ebuild
 2204242110 ./dev-util/glslang/glslang-1.3.204.ebuild
@@ -16729,6 +16694,7 @@
 2205081440 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11104.ebuild
 2205190010 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11222_p20220518.ebuild
 2205211710 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11061-r1.ebuild
+2205280140 ./dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11279_p20220528.ebuild
 2205250010 ./dev-util/intel-graphics-system-controller/intel-graphics-system-controller-0.6.0.ebuild
 2104231439 ./dev-util/intel-ocl-sdk/intel-ocl-sdk-4.4.0.117-r3.ebuild
 2205171110 ./dev-util/intltool/intltool-0.51.0-r2.ebuild
@@ -16775,6 +16741,7 @@
 2204212009 ./dev-util/lldb/lldb-13.0.1.ebuild
 2204271540 ./dev-util/lldb/lldb-15.0.0.9999.ebuild
 2204301040 ./dev-util/lldb/lldb-14.0.3.ebuild
+2205292310 ./dev-util/lldb/lldb-14.0.4.ebuild
 2203200410 ./dev-util/lockrun/lockrun-20120508-r1.ebuild
 1911050009 ./dev-util/lsuio/lsuio-0.2.0-r1.ebuild
 2111252139 ./dev-util/ltrace/ltrace-0.7.3.6.1.ebuild
@@ -16802,6 +16769,7 @@
 2105161410 ./dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
 2205161010 ./dev-util/maturin/maturin-0.12.15.ebuild
 2205190110 ./dev-util/maturin/maturin-0.12.17.ebuild
+2205291540 ./dev-util/maturin/maturin-0.12.18.ebuild
 2205150040 ./dev-util/mdds/mdds-1.7.0.ebuild
 2205151410 ./dev-util/mdds/mdds-2.0.3.ebuild
 2205150040 ./dev-util/mdds/mdds-9999.ebuild
@@ -16985,15 +16953,12 @@
 2203222209 ./dev-util/shunit2/shunit2-2.1.8.ebuild
 2202100210 ./dev-util/smem/smem-1.5-r2.ebuild
 2205100410 ./dev-util/source-highlight/source-highlight-3.1.9-r1.ebuild
-2112251340 ./dev-util/spirv-headers/spirv-headers-1.2.198.ebuild
 2204242110 ./dev-util/spirv-headers/spirv-headers-1.3.204.ebuild
 2205130940 ./dev-util/spirv-headers/spirv-headers-1.3.211.ebuild
 2205130940 ./dev-util/spirv-headers/spirv-headers-99999999.ebuild
 2204300040 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-12.0.0.ebuild
 2204300040 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0-r2.ebuild
 2204300040 ./dev-util/spirv-llvm-translator/spirv-llvm-translator-14.0.0-r1.ebuild
-2201190239 ./dev-util/spirv-tools/spirv-tools-1.2.198.ebuild
-2204200139 ./dev-util/spirv-tools/spirv-tools-1.3.211.ebuild
 2204242110 ./dev-util/spirv-tools/spirv-tools-1.3.204.ebuild
 2205130940 ./dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild
 2205130940 ./dev-util/spirv-tools/spirv-tools-99999999.ebuild
@@ -17021,11 +16986,11 @@
 2203091840 ./dev-util/sysdig/sysdig-0.27.1-r100.ebuild
 2106040440 ./dev-util/sysprof-capture/sysprof-capture-3.36.0-r1.ebuild
 2203081240 ./dev-util/sysprof-capture/sysprof-capture-3.42.1.ebuild
-2203252139 ./dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
+2205280440 ./dev-util/sysprof-capture/sysprof-capture-3.44.0.ebuild
 2203081240 ./dev-util/sysprof-common/sysprof-common-3.42.1.ebuild
-2203252139 ./dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
+2205280440 ./dev-util/sysprof-common/sysprof-common-3.44.0.ebuild
 2203081240 ./dev-util/sysprof/sysprof-3.42.1.ebuild
-2203252139 ./dev-util/sysprof/sysprof-3.44.0.ebuild
+2205280440 ./dev-util/sysprof/sysprof-3.44.0.ebuild
 2205011048 ./dev-util/systemtap/systemtap-4.4.ebuild
 2205011048 ./dev-util/systemtap/systemtap-4.5.ebuild
 2205242210 ./dev-util/systemtap/systemtap-4.5-r1.ebuild
@@ -17046,10 +17011,11 @@
 2203020009 ./dev-util/umockdev/umockdev-0.17.7.ebuild
 2203160010 ./dev-util/umockdev/umockdev-0.17.6.ebuild
 2203240409 ./dev-util/umockdev/umockdev-0.17.8.ebuild
-2204112109 ./dev-util/umockdev/umockdev-0.17.9.ebuild
 2205102310 ./dev-util/umockdev/umockdev-0.17.10.ebuild
 2205191740 ./dev-util/umockdev/umockdev-9999.ebuild
 2205232310 ./dev-util/umockdev/umockdev-0.17.12.ebuild
+2205302140 ./dev-util/umockdev/umockdev-0.17.13.ebuild
+2205280910 ./dev-util/umockdev/umockdev-0.17.9.ebuild
 2109271539 ./dev-util/uncrustify/uncrustify-0.72.0.ebuild
 2109271539 ./dev-util/uncrustify/uncrustify-9999.ebuild
 2201131940 ./dev-util/uncrustify/uncrustify-0.71.0.ebuild
@@ -17069,11 +17035,9 @@
 1903120409 ./dev-util/vmtouch/vmtouch-1.3.0.ebuild
 1903120409 ./dev-util/vmtouch/vmtouch-1.3.1.ebuild
 2203222209 ./dev-util/vtable-dumper/vtable-dumper-1.2.ebuild
-2112251340 ./dev-util/vulkan-headers/vulkan-headers-1.2.198.ebuild
 2204242110 ./dev-util/vulkan-headers/vulkan-headers-1.3.204.ebuild
 2205130940 ./dev-util/vulkan-headers/vulkan-headers-1.3.211.ebuild
 2205130940 ./dev-util/vulkan-headers/vulkan-headers-9999.ebuild
-2112251340 ./dev-util/vulkan-tools/vulkan-tools-1.2.198.ebuild
 2204242110 ./dev-util/vulkan-tools/vulkan-tools-1.3.204.ebuild
 2205140610 ./dev-util/vulkan-tools/vulkan-tools-1.3.211.ebuild
 2205140610 ./dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -17139,8 +17103,9 @@
 2205011210 ./dev-util/rocm_bandwidth_test/rocm_bandwidth_test-4.3.0.ebuild
 2205011210 ./dev-util/rocm_bandwidth_test/rocm_bandwidth_test-5.0.2.ebuild
 2205072340 ./dev-util/gpp/gpp-2.27.ebuild
-2205171010 ./dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild
+2205282240 ./dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0.ebuild
 2205140110 ./dev-util/snakeviz/snakeviz-2.1.1.ebuild
+2205292140 ./dev-util/web_page_replay_go/web_page_replay_go-20220314.ebuild
 2105162309 ./dev-vcs/bfg/bfg-1.13.0.ebuild
 2109252009 ./dev-vcs/breezy/breezy-3.2.1-r1.ebuild
 2012231444 ./dev-vcs/colorcvs/colorcvs-1.4-r2.ebuild
@@ -17224,6 +17189,7 @@
 2204081839 ./dev-vcs/notify-webhook/notify-webhook-0.1.0-r1.ebuild
 2202241709 ./dev-vcs/pre-commit/pre-commit-2.17.0.ebuild
 2204100239 ./dev-vcs/pre-commit/pre-commit-2.18.1.ebuild
+2205301410 ./dev-vcs/pre-commit/pre-commit-2.19.0.ebuild
 2110192109 ./dev-vcs/python-gitlab/python-gitlab-2.10.1.ebuild
 2101310343 ./dev-vcs/python-gitlab/python-gitlab-2.5.0.ebuild
 2106050339 ./dev-vcs/python-gitlab/python-gitlab-2.6.0.ebuild
@@ -17351,6 +17317,7 @@
 2108271240 ./games-action/xpilot/xpilot-4.5.5-r1.ebuild
 2205231340 ./games-action/polymc/polymc-1.3.0.ebuild
 2205231340 ./games-action/polymc/polymc-9999.ebuild
+2205292210 ./games-action/polymc/polymc-1.3.1.ebuild
 2204250010 ./games-action/transistor/transistor-1.50440.8123.23365.ebuild
 2106300009 ./games-arcade/abe/abe-1.1-r1.ebuild
 2105071940 ./games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild
@@ -17499,7 +17466,7 @@
 2103072209 ./games-board/gambit/gambit-1.0.4-r1.ebuild
 2102131639 ./games-board/gmchess/gmchess-0.29.6-r3.ebuild
 2203081540 ./games-board/gnome-chess/gnome-chess-41.1.ebuild
-2203260109 ./games-board/gnome-chess/gnome-chess-42.0.ebuild
+2205280910 ./games-board/gnome-chess/gnome-chess-42.0.ebuild
 2202080810 ./games-board/gnome-mahjongg/gnome-mahjongg-3.38.3.ebuild
 2203081540 ./games-board/gnome-mines/gnome-mines-40.1.ebuild
 2204090539 ./games-board/gnubg/gnubg-1.06.002-r3.ebuild
@@ -17540,7 +17507,7 @@
 1801290438 ./games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
 2203081540 ./games-board/tali/tali-40.5.ebuild
 2203260109 ./games-board/tali/tali-40.6.ebuild
-2204250010 ./games-board/tali/tali-40.7.ebuild
+2205280910 ./games-board/tali/tali-40.7.ebuild
 2002230040 ./games-board/tetzle/tetzle-2.1.3.ebuild
 2001220239 ./games-board/xboard/xboard-4.9.1.ebuild
 2104041039 ./games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
@@ -17552,6 +17519,7 @@
 2105101539 ./games-emulation/advancemame/advancemame-3.9.ebuild
 2105072009 ./games-emulation/advancescan/advancescan-1.16-r1.ebuild
 2108191039 ./games-emulation/atari800/atari800-4.2.0-r1.ebuild
+2205291040 ./games-emulation/atari800/atari800-5.0.0.ebuild
 2201131140 ./games-emulation/desmume/desmume-0.9.11_p20211119.ebuild
 2007051509 ./games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
 2204280140 ./games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
@@ -17750,7 +17718,7 @@
 2104041239 ./games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
 2104041239 ./games-misc/ballerburg/ballerburg-1.2.0-r1.ebuild
 2106190039 ./games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild
-2204301540 ./games-misc/bsd-games/bsd-games-3.1-r2.ebuild
+2205281840 ./games-misc/bsd-games/bsd-games-3.1-r2.ebuild
 2104041239 ./games-misc/bsod/bsod-0.1-r1.ebuild
 1910051539 ./games-misc/c++robots/c++robots-0-r1.ebuild
 2204271010 ./games-misc/cowsay/cowsay-3.7.0.ebuild
@@ -17840,7 +17808,7 @@
 2109282309 ./games-puzzle/fbg/fbg-0.9-r3.ebuild
 2104101209 ./games-puzzle/fish-fillets/fish-fillets-1.0.1-r100.ebuild
 2203270809 ./games-puzzle/five-or-more/five-or-more-3.32.2-r1.ebuild
-2203312010 ./games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
+2205280910 ./games-puzzle/five-or-more/five-or-more-3.32.3.ebuild
 2109290209 ./games-puzzle/flobopuyo/flobopuyo-0.20-r3.ebuild
 2112091339 ./games-puzzle/freesweep/freesweep-1.0.2.ebuild
 1907181609 ./games-puzzle/galaxis/galaxis-1.8-r1.ebuild
@@ -17849,7 +17817,7 @@
 2104190439 ./games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
 2202080810 ./games-puzzle/gnome-klotski/gnome-klotski-3.38.2.ebuild
 2202080810 ./games-puzzle/gnome-sudoku/gnome-sudoku-40.2.ebuild
-2203260109 ./games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
+2205280910 ./games-puzzle/gnome-sudoku/gnome-sudoku-42.0.ebuild
 2202080810 ./games-puzzle/gnome-taquin/gnome-taquin-3.38.1.ebuild
 2202080810 ./games-puzzle/gnome-tetravex/gnome-tetravex-3.38.2.ebuild
 2201250539 ./games-puzzle/gnome2048/gnome2048-3.38.2.ebuild
@@ -17897,7 +17865,7 @@
 2105310039 ./games-puzzle/sgt-puzzles/sgt-puzzles-20190415.ebuild
 2108230739 ./games-puzzle/splice/splice-20121120-r2.ebuild
 2203081540 ./games-puzzle/swell-foop/swell-foop-41.0.1.ebuild
-2204130410 ./games-puzzle/swell-foop/swell-foop-41.1.ebuild
+2205280910 ./games-puzzle/swell-foop/swell-foop-41.1.ebuild
 2107290109 ./games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
 2009210109 ./games-puzzle/tetrinet/tetrinet-0.11-r2.ebuild
 2005172009 ./games-puzzle/textmaze/textmaze-1.2-r1.ebuild
@@ -18033,9 +18001,8 @@
 2108040539 ./games-simulation/lincity-ng/lincity-ng-2.9_beta.ebuild
 2108021239 ./games-simulation/lincity/lincity-1.13.1-r2.ebuild
 2104250109 ./games-simulation/micropolis/micropolis-1.0_p20180313.ebuild
-2204110140 ./games-simulation/openrct2/openrct2-0.3.5.1-r1.ebuild
-2204272340 ./games-simulation/openrct2/openrct2-0.4.0.ebuild
 2204272340 ./games-simulation/openrct2/openrct2-9999.ebuild
+2205280140 ./games-simulation/openrct2/openrct2-0.4.0.ebuild
 2204130011 ./games-simulation/openttd/openttd-12.2-r1.ebuild
 2106190039 ./games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
 2108190409 ./games-simulation/searchandrescue/searchandrescue-1.7.0-r1.ebuild
@@ -18185,6 +18152,7 @@
 2109030809 ./games-util/xpadneo/xpadneo-0.9.1.ebuild
 2205260940 ./games-util/xpadneo/xpadneo-0.9.2.ebuild
 2205260940 ./games-util/xpadneo/xpadneo-9999.ebuild
+2205300640 ./games-util/xpadneo/xpadneo-0.9.3.ebuild
 2011220009 ./games-util/xqf/xqf-1.0.6.2.ebuild
 2203210210 ./games-util/joycond/joycond-0.1.0_p20210730-r1.ebuild
 2205131840 ./games-util/libstrangle/libstrangle-0.1.1_p20220222.ebuild
@@ -18192,20 +18160,21 @@
 2205190840 ./gnome-base/dconf/dconf-0.40.0.ebuild
 2108231509 ./gnome-base/gconf/gconf-3.2.6-r5.ebuild
 2203081540 ./gnome-base/gdm/gdm-41.3.ebuild
-2203262110 ./gnome-base/gdm/gdm-42.0.ebuild
+2205280910 ./gnome-base/gdm/gdm-42.0.ebuild
 2201180239 ./gnome-base/gnome-applets/gnome-applets-3.42.0.ebuild
 2203272210 ./gnome-base/gnome-applets/gnome-applets-3.44.0.ebuild
 2105261839 ./gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
 2203212109 ./gnome-base/gnome-control-center/gnome-control-center-41.4-r1.ebuild
 2204190010 ./gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
-2205100740 ./gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
+2205280910 ./gnome-base/gnome-control-center/gnome-control-center-42.1.ebuild
+2205280010 ./gnome-base/gnome-control-center/gnome-control-center-42.2.ebuild
 2203131809 ./gnome-base/gnome-core-apps/gnome-core-apps-41.3.ebuild
 2203130309 ./gnome-base/gnome-core-libs/gnome-core-libs-41.3.ebuild
 2203081540 ./gnome-base/gnome-desktop/gnome-desktop-41.3.ebuild
 2203260009 ./gnome-base/gnome-desktop/gnome-desktop-42.0-r300.ebuild
 2204190010 ./gnome-base/gnome-desktop/gnome-desktop-42.0-r400.ebuild
-2204281840 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
-2205260710 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
+2205280910 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r300.ebuild
+2205280910 ./gnome-base/gnome-desktop/gnome-desktop-42.1-r400.ebuild
 2204110909 ./gnome-base/gnome-extra-apps/gnome-extra-apps-41.0.ebuild
 2201180239 ./gnome-base/gnome-flashback/gnome-flashback-3.42.1.ebuild
 2204101939 ./gnome-base/gnome-flashback/gnome-flashback-3.44.0-r1.ebuild
@@ -18217,22 +18186,23 @@
 2201180239 ./gnome-base/gnome-panel/gnome-panel-3.42.0.ebuild
 2203272210 ./gnome-base/gnome-panel/gnome-panel-3.44.0.ebuild
 2203081540 ./gnome-base/gnome-session/gnome-session-41.3.ebuild
-2203230939 ./gnome-base/gnome-session/gnome-session-42.0.ebuild
+2205280910 ./gnome-base/gnome-session/gnome-session-42.0.ebuild
 2203081540 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-41.0.ebuild
-2203230939 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
+2205280910 ./gnome-base/gnome-settings-daemon/gnome-settings-daemon-42.1.ebuild
 2203210210 ./gnome-base/gnome-shell/gnome-shell-41.4-r1.ebuild
 2203281840 ./gnome-base/gnome-shell/gnome-shell-41.5.ebuild
 2204152240 ./gnome-base/gnome-shell/gnome-shell-42.0-r1.ebuild
-2205070610 ./gnome-base/gnome-shell/gnome-shell-42.1.ebuild
 2205180610 ./gnome-base/gnome-shell/gnome-shell-42.1-r2.ebuild
 2205180610 ./gnome-base/gnome-shell/gnome-shell-42.1-r3.ebuild
-2112310709 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+2205280910 ./gnome-base/gnome-shell/gnome-shell-42.1.ebuild
+2205291810 ./gnome-base/gnome-shell/gnome-shell-42.2.ebuild
 2202080810 ./gnome-base/gnome/gnome-40.0.ebuild
 2205062310 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-41.0.ebuild
-2205171110 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
+2205280910 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-42.0.ebuild
 2201222209 ./gnome-base/gvfs/gvfs-1.48.1-r1.ebuild
 2203260009 ./gnome-base/gvfs/gvfs-1.50.0.ebuild
-2205260840 ./gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
+2205280910 ./gnome-base/gvfs/gvfs-1.50.1-r1.ebuild
+2205271340 ./gnome-base/gvfs/gvfs-1.50.2.ebuild
 2205150110 ./gnome-base/libglade/libglade-2.6.4-r3.ebuild
 2104041709 ./gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
 2108271839 ./gnome-base/libgnomekbd/libgnomekbd-3.26.1.ebuild
@@ -18242,11 +18212,12 @@
 2203212139 ./gnome-base/librsvg/librsvg-2.54.0.ebuild
 2204270640 ./gnome-base/librsvg/librsvg-2.54.1.ebuild
 2205131540 ./gnome-base/librsvg/librsvg-2.54.2.ebuild
-2205141610 ./gnome-base/librsvg/librsvg-2.54.3.ebuild
 2205171110 ./gnome-base/librsvg/librsvg-2.40.21.ebuild
+2205280910 ./gnome-base/librsvg/librsvg-2.54.3.ebuild
 2203132109 ./gnome-base/nautilus/nautilus-41.2.ebuild
 2203272210 ./gnome-base/nautilus/nautilus-42.0.ebuild
-2204230810 ./gnome-base/nautilus/nautilus-42.1.1.ebuild
+2205280910 ./gnome-base/nautilus/nautilus-42.1.1.ebuild
+2205280010 ./gnome-base/nautilus/nautilus-42.2.ebuild
 2203132039 ./gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10-r5.ebuild
 2205050610 ./gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r1.ebuild
 2205050610 ./gnome-extra/cinnamon-desktop/cinnamon-desktop-5.2.1.ebuild
@@ -18260,84 +18231,90 @@
 2201240710 ./gnome-extra/eiciel/eiciel-0.9.13.1.ebuild
 2203081540 ./gnome-extra/evolution-data-server/evolution-data-server-3.42.4.ebuild
 2203231139 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.0.ebuild
-2204230810 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
+2205280910 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.1.ebuild
+2205271340 ./gnome-extra/evolution-data-server/evolution-data-server-3.44.2.ebuild
 2203081240 ./gnome-extra/evolution-ews/evolution-ews-3.42.4.ebuild
 2203270310 ./gnome-extra/evolution-ews/evolution-ews-3.44.0.ebuild
-2205070610 ./gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+2205280440 ./gnome-extra/evolution-ews/evolution-ews-3.44.1.ebuild
+2205271340 ./gnome-extra/evolution-ews/evolution-ews-3.44.2.ebuild
 2105090839 ./gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
 2203081240 ./gnome-extra/gnome-boxes/gnome-boxes-41.3.ebuild
-2203270710 ./gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
+2205280440 ./gnome-extra/gnome-boxes/gnome-boxes-42.0.1.ebuild
+2205302310 ./gnome-extra/gnome-boxes/gnome-boxes-42.1.ebuild
 2203081540 ./gnome-extra/gnome-calculator/gnome-calculator-41.1.ebuild
-2205150640 ./gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
+2205280910 ./gnome-extra/gnome-calculator/gnome-calculator-42.0.ebuild
+2205310340 ./gnome-extra/gnome-calculator/gnome-calculator-42.1.ebuild
 2203081540 ./gnome-extra/gnome-calendar/gnome-calendar-41.2.ebuild
 2203240409 ./gnome-extra/gnome-calendar/gnome-calendar-42.0.ebuild
-2204281840 ./gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
+2205280910 ./gnome-extra/gnome-calendar/gnome-calendar-42.1.ebuild
 2203081540 ./gnome-extra/gnome-characters/gnome-characters-41.0.ebuild
-2203220939 ./gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
+2205280910 ./gnome-extra/gnome-characters/gnome-characters-42.0.ebuild
 2203081240 ./gnome-extra/gnome-clocks/gnome-clocks-41.0.ebuild
-2204190010 ./gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
+2205280440 ./gnome-extra/gnome-clocks/gnome-clocks-42.0.ebuild
 2108271839 ./gnome-extra/gnome-color-manager/gnome-color-manager-3.36.0.ebuild
 2204240940 ./gnome-extra/gnome-commander/gnome-commander-1.14.2.ebuild
 2203081540 ./gnome-extra/gnome-contacts/gnome-contacts-41.0.ebuild
-2205150640 ./gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
+2205290410 ./gnome-extra/gnome-contacts/gnome-contacts-42.0.ebuild
 1912081509 ./gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.11.ebuild
 2202220239 ./gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild
 2105291209 ./gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.38.1.ebuild
 2205200540 ./gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild
 2201130510 ./gnome-extra/gnome-logs/gnome-logs-3.36.0.ebuild
-2203300910 ./gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
+2205280440 ./gnome-extra/gnome-logs/gnome-logs-42.0.ebuild
 2004292309 ./gnome-extra/gnome-power-manager/gnome-power-manager-3.32.0.ebuild
 2201130510 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-41.ebuild
-2203251139 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
+2205291340 ./gnome-extra/gnome-shell-extension-appindicator/gnome-shell-extension-appindicator-42.ebuild
 2112181609 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-14.ebuild
-2204101110 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
+2205291340 ./gnome-extra/gnome-shell-extension-applications-overview-tooltip/gnome-shell-extension-applications-overview-tooltip-15.ebuild
 2201071509 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-37.ebuild
 2203262309 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-39.ebuild
-2205041910 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
+2205291340 ./gnome-extra/gnome-shell-extension-bing-wallpaper/gnome-shell-extension-bing-wallpaper-40.ebuild
 2112181609 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-26.ebuild
 2204101110 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-27.ebuild
-2204181940 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
+2205291340 ./gnome-extra/gnome-shell-extension-bluetooth-quick-connect/gnome-shell-extension-bluetooth-quick-connect-29.ebuild
 2112181609 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111.ebuild
 2203100110 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209.ebuild
-2203271310 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
+2205291340 ./gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323.ebuild
 2203081240 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-45.ebuild
-2204101110 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
 2204202039 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-47.ebuild
-2205041910 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
+2205280440 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-46.ebuild
+2205291410 ./gnome-extra/gnome-shell-extension-dash-to-panel/gnome-shell-extension-dash-to-panel-50.ebuild
 2112181609 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-0.24.0.ebuild
 2203100110 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-38.0.ebuild
 2203271310 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-43.0.ebuild
-2205041910 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
+2205291410 ./gnome-extra/gnome-shell-extension-desktop-icons-ng/gnome-shell-extension-desktop-icons-ng-45.0.ebuild
 2203081240 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-48.ebuild
 2203271240 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-49.ebuild
-2203271240 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
+2205280440 ./gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-50.ebuild
 2107281939 ./gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210603.ebuild
 2107281939 ./gnome-extra/gnome-shell-extension-pop-shell/gnome-shell-extension-pop-shell-1.2.0_p20210727.ebuild
 2203081540 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-41.2.ebuild
 2203202309 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.0.ebuild
-2205070610 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
+2205280910 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.1.ebuild
+2205291810 ./gnome-extra/gnome-shell-extensions/gnome-shell-extensions-42.2.ebuild
 2203081240 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.1.ebuild
 2203252139 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-41.2.ebuild
-2204012110 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
+2205280440 ./gnome-extra/gnome-shell-frippery/gnome-shell-frippery-42.0.ebuild
 2202200310 ./gnome-extra/gnome-software/gnome-software-41.4.ebuild
 2204250210 ./gnome-extra/gnome-software/gnome-software-42.0.ebuild
 2204281840 ./gnome-extra/gnome-software/gnome-software-42.1.ebuild
+2205302140 ./gnome-extra/gnome-software/gnome-software-42.2.ebuild
 2203081540 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-41.0.ebuild
-2203240539 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
+2205280910 ./gnome-extra/gnome-system-monitor/gnome-system-monitor-42.0.ebuild
 2202080810 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.0.ebuild
-2203052239 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
+2205280910 ./gnome-extra/gnome-tweaks/gnome-tweaks-40.10.ebuild
 2203081540 ./gnome-extra/gnome-user-docs/gnome-user-docs-41.2.ebuild
-2203240539 ./gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
+2205280910 ./gnome-extra/gnome-user-docs/gnome-user-docs-42.0.ebuild
 2202210039 ./gnome-extra/gnome-user-share/gnome-user-share-3.34.0.ebuild
 2203081540 ./gnome-extra/gnome-weather/gnome-weather-41.0.ebuild
-2203231009 ./gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
+2205280910 ./gnome-extra/gnome-weather/gnome-weather-42.0.ebuild
 2004131939 ./gnome-extra/gtkhtml/gtkhtml-4.10.0-r2.ebuild
 2004032241 ./gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
 2203160010 ./gnome-extra/gucharmap/gucharmap-14.0.2.ebuild
-2203290340 ./gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
+2205280910 ./gnome-extra/gucharmap/gucharmap-14.0.3.ebuild
 2204161540 ./gnome-extra/libgda/libgda-5.2.9.ebuild
 2203160010 ./gnome-extra/libgsf/libgsf-1.14.48.ebuild
-2205170540 ./gnome-extra/libgsf/libgsf-1.14.49.ebuild
+2205280910 ./gnome-extra/libgsf/libgsf-1.14.49.ebuild
 2108271839 ./gnome-extra/mousetweaks/mousetweaks-3.32.0.ebuild
 2107172140 ./gnome-extra/nautilus-dropbox/nautilus-dropbox-2019.02.14.ebuild
 2107172140 ./gnome-extra/nautilus-dropbox/nautilus-dropbox-2020.03.04.ebuild
@@ -18346,31 +18323,30 @@
 2205050610 ./gnome-extra/nemo/nemo-5.2.4.ebuild
 2205210940 ./gnome-extra/nemo/nemo-5.2.4-r1.ebuild
 2203091910 ./gnome-extra/nm-applet/nm-applet-1.24.0.ebuild
-2203230939 ./gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
+2205280910 ./gnome-extra/nm-applet/nm-applet-1.26.0.ebuild
 2107101909 ./gnome-extra/office-runner/office-runner-1.0.3.ebuild
 2106292239 ./gnome-extra/pch-session/pch-session-40.2.ebuild
 2203100110 ./gnome-extra/pch-session/pch-session-41.2.ebuild
-2205042010 ./gnome-extra/pch-session/pch-session-42.0.ebuild
+2205291340 ./gnome-extra/pch-session/pch-session-42.0.ebuild
 2205181110 ./gnome-extra/polkit-gnome/polkit-gnome-0.105-r2.ebuild
 1912291809 ./gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
 2203081540 ./gnome-extra/sushi/sushi-41.0.ebuild
 2204030339 ./gnome-extra/sushi/sushi-41.1.ebuild
-2204060939 ./gnome-extra/sushi/sushi-41.2.ebuild
+2205280910 ./gnome-extra/sushi/sushi-41.2.ebuild
 2108110511 ./gnome-extra/synapse/synapse-0.2.99.4.ebuild
 2203160010 ./gnome-extra/yelp-xsl/yelp-xsl-41.1.ebuild
-2203220909 ./gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
+2205280910 ./gnome-extra/yelp-xsl/yelp-xsl-42.0.ebuild
 2203081540 ./gnome-extra/yelp/yelp-41.2.ebuild
 2203220909 ./gnome-extra/yelp/yelp-42.0.ebuild
-2203270810 ./gnome-extra/yelp/yelp-42.1.ebuild
+2205280910 ./gnome-extra/yelp/yelp-42.1.ebuild
 2203081540 ./gnome-extra/zenity/zenity-3.41.0.ebuild
 2204030339 ./gnome-extra/zenity/zenity-3.42.0.ebuild
-2204281840 ./gnome-extra/zenity/zenity-3.42.1.ebuild
-2203100110 ./gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-19.0.ebuild
-2204101110 ./gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-22.0.ebuild
+2205280910 ./gnome-extra/zenity/zenity-3.42.1.ebuild
 2204182010 ./gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-23.0.ebuild
+2205280010 ./gnome-extra/gnome-shell-extension-alphabetical-grid/gnome-shell-extension-alphabetical-grid-24.0.ebuild
 2203100110 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20211108.ebuild
 2204101110 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20211108-r1.ebuild
-2205041910 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
+2205291410 ./gnome-extra/gnome-shell-extension-weather-in-the-clock/gnome-shell-extension-weather-in-the-clock-20220504.ebuild
 2009181809 ./gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
 2009181809 ./gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
 1708310022 ./gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
@@ -18496,32 +18472,31 @@
 2205170910 ./gui-apps/foot/foot-1.12.1.ebuild
 2202080810 ./gui-libs/amtk/amtk-5.2.0.ebuild
 2205031710 ./gui-libs/amtk/amtk-5.4.0.ebuild
+2205280511 ./gui-libs/amtk/amtk-5.4.1.ebuild
 2205100440 ./gui-libs/display-manager-init/display-manager-init-1.0-r3.ebuild
 2205221210 ./gui-libs/display-manager-init/display-manager-init-1.0-r4.ebuild
 2202140409 ./gui-libs/egl-wayland/egl-wayland-1.1.7-r1.ebuild
 2202140409 ./gui-libs/egl-wayland/egl-wayland-1.1.9_p20211123.ebuild
 2202140409 ./gui-libs/eglexternalplatform/eglexternalplatform-1.1.ebuild
 2111060742 ./gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.3.ebuild
-2205041910 ./gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
+2205280910 ./gui-libs/gdk-pixbuf-loader-webp/gdk-pixbuf-loader-webp-0.0.4.ebuild
 2009071209 ./gui-libs/greetd/greetd-0.6.1.ebuild
 2101181209 ./gui-libs/greetd/greetd-0.7.0.ebuild
 2109181309 ./gui-libs/greetd/greetd-0.8.0.ebuild
 2109181809 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
 2111120439 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.6.0.ebuild
-2203091910 ./gui-libs/gtk/gtk-4.6.1.ebuild
-2203270810 ./gui-libs/gtk/gtk-4.6.2.ebuild
-2205100740 ./gui-libs/gtk/gtk-4.6.3.ebuild
-2205260710 ./gui-libs/gtk/gtk-4.6.4.ebuild
-2205261310 ./gui-libs/gtk/gtk-4.6.4-r1.ebuild
+2205280910 ./gui-libs/gtk/gtk-4.6.4-r1.ebuild
+2205310710 ./gui-libs/gtk/gtk-4.6.5.ebuild
 2201241810 ./gui-libs/libhandy/libhandy-1.4.0.ebuild
 2203202309 ./gui-libs/libhandy/libhandy-1.6.1.ebuild
-2204230810 ./gui-libs/libhandy/libhandy-1.6.2.ebuild
+2205280910 ./gui-libs/libhandy/libhandy-1.6.2.ebuild
 2201181539 ./gui-libs/libwpe/libwpe-1.12.0.ebuild
 2107210539 ./gui-libs/neatvnc/neatvnc-0.4.0.ebuild
 2101251809 ./gui-libs/neatvnc/neatvnc-9999.ebuild
 2110260439 ./gui-libs/tepl/tepl-5.0.1-r1.ebuild
 2202080810 ./gui-libs/tepl/tepl-6.00.0-r1.ebuild
 2205031710 ./gui-libs/tepl/tepl-6.0.1.ebuild
+2205280010 ./gui-libs/tepl/tepl-6.0.2.ebuild
 2109070309 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-0.7.0-r1.ebuild
 2106031609 ./gui-libs/wayfire-plugins-extra/wayfire-plugins-extra-9999.ebuild
 2109181809 ./gui-libs/wf-config/wf-config-0.7.1-r1.ebuild
@@ -18540,9 +18515,9 @@
 2203170110 ./gui-libs/libadwaita/libadwaita-1.0.1.ebuild
 2203170110 ./gui-libs/libadwaita/libadwaita-1.0.2.ebuild
 2203202309 ./gui-libs/libadwaita/libadwaita-1.1.0.ebuild
-2205260710 ./gui-libs/libadwaita/libadwaita-1.1.1.ebuild
+2205280910 ./gui-libs/libadwaita/libadwaita-1.1.1.ebuild
 2204212239 ./gui-libs/gtksourceview/gtksourceview-5.4.0.ebuild
-2205150640 ./gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
+2205280910 ./gui-libs/gtksourceview/gtksourceview-5.4.1.ebuild
 2205251440 ./gui-libs/xdg-desktop-portal-lxqt/xdg-desktop-portal-lxqt-0.2.0.ebuild
 2201140910 ./gui-wm/hikari/hikari-2.3.3.ebuild
 2205260910 ./gui-wm/sway/sway-1.7.ebuild
@@ -19102,7 +19077,7 @@
 2204290652 ./kde-frameworks/kjs/kjs-5.92.0.ebuild
 2205141440 ./kde-frameworks/kjs/kjs-5.94.0.ebuild
 2204290652 ./kde-frameworks/knewstuff/knewstuff-5.92.0-r2.ebuild
-2205141440 ./kde-frameworks/knewstuff/knewstuff-5.94.0.ebuild
+2205301940 ./kde-frameworks/knewstuff/knewstuff-5.94.0-r1.ebuild
 2204290652 ./kde-frameworks/knotifications/knotifications-5.92.0.ebuild
 2205141440 ./kde-frameworks/knotifications/knotifications-5.94.0.ebuild
 2204290652 ./kde-frameworks/knotifyconfig/knotifyconfig-5.92.0.ebuild
@@ -19200,112 +19175,62 @@
 2203020709 ./kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
 2204222140 ./kde-misc/zanshin/zanshin-21.12.3.ebuild
 2205132310 ./kde-misc/zanshin/zanshin-22.04.1.ebuild
-2204291639 ./kde-plasma/bluedevil/bluedevil-5.24.4.ebuild
-2205040210 ./kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
-2204291639 ./kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild
-2205161140 ./kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
-2204291639 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild
-2205040210 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
-2204291639 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild
-2205040210 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
-2204291639 ./kde-plasma/breeze/breeze-5.24.4.ebuild
-2205040210 ./kde-plasma/breeze/breeze-5.24.5.ebuild
-2204291639 ./kde-plasma/discover/discover-5.24.4.ebuild
-2205040210 ./kde-plasma/discover/discover-5.24.5.ebuild
-2204291639 ./kde-plasma/drkonqi/drkonqi-5.24.4.ebuild
-2205040210 ./kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
-2204291639 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild
-2205040210 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
-2204291639 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild
-2205040210 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
-2204291639 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild
-2205040210 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
-2204291639 ./kde-plasma/kdecoration/kdecoration-5.24.4.ebuild
-2205040210 ./kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
-2204291639 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild
-2205172210 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/kgamma/kgamma-5.24.4.ebuild
-2205040210 ./kde-plasma/kgamma/kgamma-5.24.5.ebuild
-2204291639 ./kde-plasma/khotkeys/khotkeys-5.24.4.ebuild
-2205040210 ./kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
-2204291639 ./kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild
-2205040210 ./kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
-2204291639 ./kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild
-2205040210 ./kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
-2204291639 ./kde-plasma/kscreen/kscreen-5.24.4.ebuild
-2205172210 ./kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild
-2205040210 ./kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
-2204291639 ./kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild
-2205040210 ./kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
+2205282340 ./kde-plasma/bluedevil/bluedevil-5.24.5.ebuild
+2205282340 ./kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild
+2205282340 ./kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild
+2205282340 ./kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild
+2205282340 ./kde-plasma/breeze/breeze-5.24.5.ebuild
+2205282340 ./kde-plasma/discover/discover-5.24.5.ebuild
+2205282340 ./kde-plasma/drkonqi/drkonqi-5.24.5.ebuild
+2205282340 ./kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild
+2205282340 ./kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild
+2205282340 ./kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild
+2205282340 ./kde-plasma/kdecoration/kdecoration-5.24.5.ebuild
+2205282340 ./kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild
+2205282340 ./kde-plasma/kgamma/kgamma-5.24.5.ebuild
+2205282340 ./kde-plasma/khotkeys/khotkeys-5.24.5.ebuild
+2205282340 ./kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild
+2205282340 ./kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild
+2205282340 ./kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild
+2205301940 ./kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild
+2205282340 ./kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild
+2205282340 ./kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild
 2201250210 ./kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild
-2204291639 ./kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild
-2205040210 ./kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
-2204291639 ./kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild
-2205040210 ./kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
-2204291639 ./kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild
-2205040210 ./kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
-2204291639 ./kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild
-2205172210 ./kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/kwin/kwin-5.24.4-r1.ebuild
+2205282340 ./kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild
+2205282340 ./kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild
+2205282340 ./kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild
+2205282340 ./kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild
 2205172210 ./kde-plasma/kwin/kwin-5.24.5-r1.ebuild
-2205260040 ./kde-plasma/kwin/kwin-5.24.5-r2.ebuild
-2204291639 ./kde-plasma/kwrited/kwrited-5.24.4.ebuild
-2205040210 ./kde-plasma/kwrited/kwrited-5.24.5.ebuild
-2204291639 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild
-2205040210 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
-2204291639 ./kde-plasma/libkscreen/libkscreen-5.24.4.ebuild
-2205251440 ./kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
-2204291639 ./kde-plasma/libksysguard/libksysguard-5.24.4.ebuild
-2205260040 ./kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild
-2205040210 ./kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
-2204291639 ./kde-plasma/milou/milou-5.24.4.ebuild
-2205040210 ./kde-plasma/milou/milou-5.24.5.ebuild
-2204291639 ./kde-plasma/oxygen/oxygen-5.24.4.ebuild
-2205040210 ./kde-plasma/oxygen/oxygen-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild
-2205040210 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild
-2205040210 ./kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild
-2205040210 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
-2204291639 ./kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild
-2205172210 ./kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild
-2205040210 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
-2204291639 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild
-2205040210 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
-2204291639 ./kde-plasma/powerdevil/powerdevil-5.24.4.ebuild
-2205040210 ./kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
-2204291639 ./kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild
-2205040210 ./kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
-2204291639 ./kde-plasma/systemsettings/systemsettings-5.24.4.ebuild
-2205172210 ./kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild
-2205172210 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
-2204291639 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild
-2205040210 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
+2205282340 ./kde-plasma/kwin/kwin-5.24.5-r2.ebuild
+2205282340 ./kde-plasma/kwrited/kwrited-5.24.5.ebuild
+2205282340 ./kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild
+2205282340 ./kde-plasma/libkscreen/libkscreen-5.24.5.ebuild
+2205282340 ./kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild
+2205282340 ./kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild
+2205282340 ./kde-plasma/milou/milou-5.24.5.ebuild
+2205282340 ./kde-plasma/oxygen/oxygen-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild
+2205281010 ./kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild
+2205282340 ./kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild
+2205282340 ./kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild
+2205282340 ./kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild
+2205282340 ./kde-plasma/powerdevil/powerdevil-5.24.5.ebuild
+2205282340 ./kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild
+2205282340 ./kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild
+2205282340 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
+2205301940 ./kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild
+2205282340 ./kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild
 2107230909 ./lxde-base/lxappearance-obconf/lxappearance-obconf-0.2.3-r1.ebuild
 2201162040 ./lxde-base/lxappearance/lxappearance-0.6.3-r2.ebuild
 2107211809 ./lxde-base/lxde-common/lxde-common-0.99.2-r1.ebuild
@@ -19388,7 +19313,8 @@
 2205140210 ./mail-client/clawsker/clawsker-1.3.5.ebuild
 2203081540 ./mail-client/evolution/evolution-3.42.4.ebuild
 2203251409 ./mail-client/evolution/evolution-3.44.0.ebuild
-2205140010 ./mail-client/evolution/evolution-3.44.1.ebuild
+2205280910 ./mail-client/evolution/evolution-3.44.1.ebuild
+2205271340 ./mail-client/evolution/evolution-3.44.2.ebuild
 2204190909 ./mail-client/geary/geary-40.0-r1.ebuild
 2203040410 ./mail-client/hap/hap-3.7-r1.ebuild
 2010101909 ./mail-client/kube/kube-0.7.0-r1.ebuild
@@ -19416,7 +19342,6 @@
 2205140940 ./mail-client/s-nail/s-nail-14.9.24.ebuild
 2203230410 ./mail-client/sylpheed/sylpheed-3.7.0-r4.ebuild
 2205210940 ./mail-client/thunderbird-bin/thunderbird-bin-91.9.1.ebuild
-2205140410 ./mail-client/thunderbird/thunderbird-91.9.0.ebuild
 2205221610 ./mail-client/thunderbird/thunderbird-91.9.1.ebuild
 2205132310 ./mail-filter/MailScanner/MailScanner-4.84.5.2.ebuild
 2102280009 ./mail-filter/afew/afew-3.0.1.ebuild
@@ -19508,8 +19433,9 @@
 2204191509 ./mail-mta/postfix/postfix-3.6.6.ebuild
 2204191509 ./mail-mta/postfix/postfix-3.7.1.ebuild
 2204280940 ./mail-mta/postfix/postfix-3.7.2.ebuild
-2205101740 ./mail-mta/postfix/postfix-3.8_pre20220509.ebuild
+2205281140 ./mail-mta/postfix/postfix-3.8_pre20220527.ebuild
 2203012009 ./mail-mta/protonmail-bridge/protonmail-bridge-2.1.1-r1.ebuild
+2205301410 ./mail-mta/protonmail-bridge/protonmail-bridge-2.2.0.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-0.95-r1.ebuild
 2104120016 ./mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
 2203230410 ./mail-mta/sendmail/sendmail-8.16.1-r2.ebuild
@@ -19568,7 +19494,7 @@
 2205171610 ./media-fonts/baekmuk-fonts/baekmuk-fonts-2.2-r2.ebuild
 2205251140 ./media-fonts/bitstream-cyberbit/bitstream-cyberbit-2.0-r2.ebuild
 2104131809 ./media-fonts/cantarell/cantarell-0.301.ebuild
-2205090840 ./media-fonts/cantarell/cantarell-0.303.1.ebuild
+2205280910 ./media-fonts/cantarell/cantarell-0.303.1.ebuild
 2205251140 ./media-fonts/cardo/cardo-1.04.ebuild
 2202101739 ./media-fonts/cascadia-code/cascadia-code-2110.31.ebuild
 2205100440 ./media-fonts/cascadia-code/cascadia-code-2111.01.ebuild
@@ -19784,7 +19710,7 @@
 2205251140 ./media-fonts/unfonts-extra/unfonts-extra-1.0.2_pre080608-r1.ebuild
 2205251140 ./media-fonts/unfonts/unfonts-1.0.2_pre080608-r1.ebuild
 2203222209 ./media-fonts/unifont/unifont-13.0.01-r1.ebuild
-2205251140 ./media-fonts/unifont/unifont-14.0.03.ebuild
+2205310810 ./media-fonts/unifont/unifont-14.0.03.ebuild
 2205141340 ./media-fonts/urw-fonts/urw-fonts-2.4.9.ebuild
 2205251140 ./media-fonts/urwvn-fonts/urwvn-fonts-3.05.ebuild
 2205251140 ./media-fonts/vdrsymbols-ttf/vdrsymbols-ttf-20100612.ebuild
@@ -19800,7 +19726,7 @@
 2205251140 ./media-fonts/wqy-zenhei/wqy-zenhei-0.9.46.ebuild
 2205251140 ./media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
 2205251140 ./media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
-2205161710 ./media-fonts/lxgw-wenkai/lxgw-wenkai-1.234.56.ebuild
+2205310640 ./media-fonts/lxgw-wenkai/lxgw-wenkai-1.235.ebuild
 2205251140 ./media-fonts/gofont-mono/gofont-mono-0_pre20220306.ebuild
 2205150040 ./media-gfx/aaphoto/aaphoto-0.45-r1.ebuild
 1907251639 ./media-gfx/aewan/aewan-1.0.01-r1.ebuild
@@ -19866,10 +19792,11 @@
 2201201814 ./media-gfx/entangle/entangle-3.0.ebuild
 2203081240 ./media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
 2203240539 ./media-gfx/eog-plugins/eog-plugins-42.0.ebuild
-2204250010 ./media-gfx/eog-plugins/eog-plugins-42.1.ebuild
+2205280440 ./media-gfx/eog-plugins/eog-plugins-42.1.ebuild
 2203081540 ./media-gfx/eog/eog-41.1.ebuild
 2203240539 ./media-gfx/eog/eog-42.0.ebuild
-2204250010 ./media-gfx/eog/eog-42.1.ebuild
+2205280910 ./media-gfx/eog/eog-42.1.ebuild
+2205290440 ./media-gfx/eog/eog-42.2.ebuild
 2112102340 ./media-gfx/eom/eom-1.24.2.ebuild
 2009031339 ./media-gfx/ephoto/ephoto-1.5.ebuild
 2203141939 ./media-gfx/ephoto/ephoto-1.6.0.ebuild
@@ -19929,9 +19856,9 @@
 2102270009 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2111120512 ./media-gfx/gnofract4d/gnofract4d-4.3_p20211108.ebuild
 2203081540 ./media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
-2205150640 ./media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
+2205280910 ./media-gfx/gnome-font-viewer/gnome-font-viewer-42.0.ebuild
 2202080810 ./media-gfx/gnome-photos/gnome-photos-40.0.ebuild
-2203240609 ./media-gfx/gnome-photos/gnome-photos-42.0.ebuild
+2205280910 ./media-gfx/gnome-photos/gnome-photos-42.0.ebuild
 2004032241 ./media-gfx/gnome-raw-thumbnailer/gnome-raw-thumbnailer-3.0.0-r1.ebuild
 2203081540 ./media-gfx/gnome-screenshot/gnome-screenshot-41.0.ebuild
 1912221939 ./media-gfx/gnuclad/gnuclad-0.2.4.ebuild
@@ -19951,7 +19878,7 @@
 2202070940 ./media-gfx/gscan2pdf/gscan2pdf-2.12.4.ebuild
 2203010309 ./media-gfx/gscan2pdf/gscan2pdf-2.12.5.ebuild
 2112180209 ./media-gfx/gthumb/gthumb-3.10.4.ebuild
-2205170540 ./media-gfx/gthumb/gthumb-3.12.2-r2.ebuild
+2205280440 ./media-gfx/gthumb/gthumb-3.12.2-r2.ebuild
 2104020209 ./media-gfx/gtkimageview/gtkimageview-1.6.4.ebuild
 1912131839 ./media-gfx/hp2xx/hp2xx-3.4.4-r1.ebuild
 2202182140 ./media-gfx/hugin/hugin-9999.ebuild
@@ -19977,10 +19904,11 @@
 2112230409 ./media-gfx/imv/imv-9999.ebuild
 2205150040 ./media-gfx/inkscape/inkscape-1.1-r1.ebuild
 2205150040 ./media-gfx/inkscape/inkscape-1.1.1.ebuild
-2205150610 ./media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
 2205150040 ./media-gfx/inkscape/inkscape-1.1.2.ebuild
 2205260610 ./media-gfx/inkscape/inkscape-1.1.2-r2.ebuild
-2205260440 ./media-gfx/inkscape/inkscape-9999.ebuild
+2205310610 ./media-gfx/inkscape/inkscape-1.1.2-r1.ebuild
+2205310610 ./media-gfx/inkscape/inkscape-1.2.ebuild
+2205310610 ./media-gfx/inkscape/inkscape-9999.ebuild
 1906051109 ./media-gfx/iscan-data/iscan-data-1.39.0.1.ebuild
 2105050139 ./media-gfx/iscan-plugin-esdip/iscan-plugin-esdip-1.0.0.5-r1.ebuild
 2010252239 ./media-gfx/iscan-plugin-gt-f500/iscan-plugin-gt-f500-1.0.0.1-r1.ebuild
@@ -20088,10 +20016,10 @@
 2205050110 ./media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
 2205091210 ./media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
 1812252339 ./media-gfx/psftools/psftools-1.0.10.ebuild
-2110120139 ./media-gfx/pstoedit/pstoedit-3.75.ebuild
+2205301040 ./media-gfx/pstoedit/pstoedit-3.75.ebuild
 2110021639 ./media-gfx/qimgv/qimgv-1.0.2.ebuild
 2205202240 ./media-gfx/qiv/qiv-2.3.2-r1.ebuild
-2205210110 ./media-gfx/qrencode/qrencode-4.1.1.ebuild
+2205292340 ./media-gfx/qrencode/qrencode-4.1.1.ebuild
 2101091409 ./media-gfx/quat/quat-1.20-r2.ebuild
 2005211239 ./media-gfx/qvv/qvv-4.04.2.ebuild
 2004032241 ./media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -20110,11 +20038,11 @@
 2202200440 ./media-gfx/scrot/scrot-9999.ebuild
 2201271240 ./media-gfx/sfftobmp/sfftobmp-3.1.2-r1.ebuild
 2204032239 ./media-gfx/shotwell/shotwell-0.30.14.ebuild
-2204050739 ./media-gfx/shotwell/shotwell-0.30.15.ebuild
 2205181940 ./media-gfx/shotwell/shotwell-0.30.16.ebuild
+2205280910 ./media-gfx/shotwell/shotwell-0.30.15.ebuild
 2201250410 ./media-gfx/simple-scan/simple-scan-40.7.ebuild
 2203260109 ./media-gfx/simple-scan/simple-scan-42.0.ebuild
-2204192109 ./media-gfx/simple-scan/simple-scan-42.1.ebuild
+2205280810 ./media-gfx/simple-scan/simple-scan-42.1.ebuild
 2205150040 ./media-gfx/solvespace/solvespace-3.0-r2.ebuild
 1911091539 ./media-gfx/springgraph/springgraph-88.ebuild
 2112081340 ./media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -20207,6 +20135,7 @@
 2205052340 ./media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
 2012270139 ./media-libs/cimg/cimg-2.9.3.ebuild
 2202140039 ./media-libs/clutter-gst/clutter-gst-3.0.27-r1.ebuild
+2205290440 ./media-libs/clutter-gst/clutter-gst-3.0.27-r2.ebuild
 2202140039 ./media-libs/clutter-gtk/clutter-gtk-1.8.4.ebuild
 2111230440 ./media-libs/clutter/clutter-1.26.4.ebuild
 2202070739 ./media-libs/codec2/codec2-1.0.3.ebuild
@@ -20244,10 +20173,10 @@
 2204222110 ./media-libs/fontconfig/fontconfig-2.13.93.ebuild
 2205070740 ./media-libs/fontconfig/fontconfig-2.14.0-r1.ebuild
 2009071209 ./media-libs/freealut/freealut-1.1.0-r4.ebuild
-2110310339 ./media-libs/freeglut/freeglut-3.2.1-r2.ebuild
-2205252110 ./media-libs/freeglut/freeglut-3.2.2.ebuild
+2205280440 ./media-libs/freeglut/freeglut-3.2.2.ebuild
 2112020609 ./media-libs/freeimage/freeimage-3.18.0-r3.ebuild
-2203010309 ./media-libs/freeimage/freeimage-3.18.0-r6.ebuild
+2205302340 ./media-libs/freeimage/freeimage-3.18.0-r7.ebuild
+2205302340 ./media-libs/freeimage/freeimage-3.18.0-r8.ebuild
 2201080039 ./media-libs/freetype/freetype-9999.ebuild
 2204261710 ./media-libs/freetype/freetype-2.12.0-r1.ebuild
 2205070740 ./media-libs/freetype/freetype-2.12.1.ebuild
@@ -20263,7 +20192,7 @@
 2202261539 ./media-libs/gegl/gegl-9999.ebuild
 2203010309 ./media-libs/gegl/gegl-0.4.34.ebuild
 2203260109 ./media-libs/gexiv2/gexiv2-0.12.2.ebuild
-2203272210 ./media-libs/gexiv2/gexiv2-0.14.0.ebuild
+2205280910 ./media-libs/gexiv2/gexiv2-0.14.0.ebuild
 2109021209 ./media-libs/giblib/giblib-1.2.4-r1.ebuild
 2205140710 ./media-libs/giflib/giflib-5.2.1-r1.ebuild
 2101061739 ./media-libs/glew/glew-1.10.0-r100.ebuild
@@ -20282,40 +20211,42 @@
 2205140210 ./media-libs/gmmlib/gmmlib-22.1.3.ebuild
 2105311239 ./media-libs/gnonlin/gnonlin-1.4.0-r1.ebuild
 2203091910 ./media-libs/graphene/graphene-1.10.6-r1.ebuild
-2205171210 ./media-libs/graphene/graphene-1.10.8.ebuild
+2205280910 ./media-libs/graphene/graphene-1.10.8.ebuild
 2201241810 ./media-libs/grilo/grilo-0.3.14.ebuild
 2111060742 ./media-libs/gsound/gsound-1.0.3.ebuild
 2102181209 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.16.3.ebuild
 2112281039 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.18.4-r2.ebuild
 2203170340 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.20.1.ebuild
 2204021510 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.18.6.ebuild
-2205260710 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
+2205280440 ./media-libs/gst-plugins-bad/gst-plugins-bad-1.20.2.ebuild
 2110310339 ./media-libs/gst-plugins-base/gst-plugins-base-1.16.3-r1.ebuild
 2110310339 ./media-libs/gst-plugins-base/gst-plugins-base-1.18.4-r1.ebuild
 2203170340 ./media-libs/gst-plugins-base/gst-plugins-base-1.20.1.ebuild
 2204021510 ./media-libs/gst-plugins-base/gst-plugins-base-1.18.6.ebuild
-2205251910 ./media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
+2205280440 ./media-libs/gst-plugins-base/gst-plugins-base-1.20.2.ebuild
 2102181209 ./media-libs/gst-plugins-good/gst-plugins-good-1.16.3.ebuild
 2109162209 ./media-libs/gst-plugins-good/gst-plugins-good-1.18.4.ebuild
 2203170340 ./media-libs/gst-plugins-good/gst-plugins-good-1.20.1.ebuild
 2204021510 ./media-libs/gst-plugins-good/gst-plugins-good-1.18.6.ebuild
-2205251910 ./media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
+2205280440 ./media-libs/gst-plugins-good/gst-plugins-good-1.20.2.ebuild
 2102181209 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.16.3.ebuild
 2112281039 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.4.ebuild
 2203170340 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.1.ebuild
 2204021510 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.18.6.ebuild
-2205251910 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
+2205280440 ./media-libs/gst-plugins-ugly/gst-plugins-ugly-1.20.2.ebuild
 2105300411 ./media-libs/gst-rtsp-server/gst-rtsp-server-1.16.3.ebuild
 2105300411 ./media-libs/gst-rtsp-server/gst-rtsp-server-1.18.4.ebuild
 2203170340 ./media-libs/gst-rtsp-server/gst-rtsp-server-1.20.1.ebuild
 2203180340 ./media-libs/gst-rtsp-server/gst-rtsp-server-1.18.6.ebuild
 2205130210 ./media-libs/gst-rtsp-server/gst-rtsp-server-1.20.2.ebuild
 2202021909 ./media-libs/gstreamer-editing-services/gstreamer-editing-services-1.16.3.ebuild
+2205310840 ./media-libs/gstreamer-editing-services/gstreamer-editing-services-1.18.4.ebuild
+2205310840 ./media-libs/gstreamer-editing-services/gstreamer-editing-services-1.20.2.ebuild
 2105251139 ./media-libs/gstreamer/gstreamer-1.16.3.ebuild
 2109162209 ./media-libs/gstreamer/gstreamer-1.18.4.ebuild
 2203170340 ./media-libs/gstreamer/gstreamer-1.20.1.ebuild
 2204021510 ./media-libs/gstreamer/gstreamer-1.18.6.ebuild
-2205251910 ./media-libs/gstreamer/gstreamer-1.20.2.ebuild
+2205280440 ./media-libs/gstreamer/gstreamer-1.20.2.ebuild
 1911130409 ./media-libs/guilib/guilib-1.2.1-r1.ebuild
 2201240710 ./media-libs/gupnp-dlna/gupnp-dlna-0.12.0.ebuild
 2205081440 ./media-libs/hamlib/hamlib-4.3.1.ebuild
@@ -20421,9 +20352,8 @@
 2110120139 ./media-libs/libemf/libemf-1.0.13.ebuild
 2105311239 ./media-libs/libeot/libeot-9999.ebuild
 2203251709 ./media-libs/libeot/libeot-0.01.ebuild
-2205081040 ./media-libs/libepoxy/libepoxy-1.5.9-r1.ebuild
 2205081040 ./media-libs/libepoxy/libepoxy-9999.ebuild
-2205252110 ./media-libs/libepoxy/libepoxy-1.5.10.ebuild
+2205280440 ./media-libs/libepoxy/libepoxy-1.5.10.ebuild
 2205251440 ./media-libs/libexif/libexif-0.6.24.ebuild
 2111101609 ./media-libs/libextractor/libextractor-1.9-r2.ebuild
 2102250309 ./media-libs/libfame/libfame-0.9.1-r3.ebuild
@@ -20444,7 +20374,7 @@
 2205080640 ./media-libs/libglvnd/libglvnd-1.4.0.ebuild
 2205080640 ./media-libs/libglvnd/libglvnd-9999.ebuild
 2203160010 ./media-libs/libgphoto2/libgphoto2-2.5.28.ebuild
-2205261310 ./media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
+2205280910 ./media-libs/libgphoto2/libgphoto2-2.5.29.ebuild
 2109240512 ./media-libs/libgpod/libgpod-0.8.3-r5.ebuild
 2102281609 ./media-libs/libgroove/libgroove-4.3.0-r1.ebuild
 2102222209 ./media-libs/libharu/libharu-2.3.0-r2.ebuild
@@ -20480,7 +20410,7 @@
 2203081640 ./media-libs/libmatemixer/libmatemixer-1.24.1-r1.ebuild
 2108250239 ./media-libs/libmatroska/libmatroska-1.6.3.ebuild
 2108271839 ./media-libs/libmediaart/libmediaart-1.9.4.ebuild
-2203270310 ./media-libs/libmediaart/libmediaart-1.9.5.ebuild
+2205280910 ./media-libs/libmediaart/libmediaart-1.9.5.ebuild
 2101240510 ./media-libs/libmediainfo/libmediainfo-20.09-r1.ebuild
 2204220411 ./media-libs/libmediainfo/libmediainfo-22.03.ebuild
 2204240940 ./media-libs/libmediainfo/libmediainfo-21.09.ebuild
@@ -20541,7 +20471,7 @@
 2106030210 ./media-libs/libpqstego/libpqstego-0.0.1-r1.ebuild
 2108211209 ./media-libs/libprojectm/libprojectm-3.1.12.ebuild
 2102162039 ./media-libs/libprojectm/libprojectm-9999.ebuild
-2205190840 ./media-libs/libpulse/libpulse-15.99.1-r1.ebuild
+2205291010 ./media-libs/libpulse/libpulse-16.0.ebuild
 2109161539 ./media-libs/libqaccessibilityclient/libqaccessibilityclient-0.4.1.ebuild
 2108250339 ./media-libs/libquicktime/libquicktime-1.2.4-r3.ebuild
 2101240709 ./media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild
@@ -20596,17 +20526,19 @@
 2108031739 ./media-libs/libzmf/libzmf-9999.ebuild
 2203251709 ./media-libs/libzmf/libzmf-0.0.2.ebuild
 2112181509 ./media-libs/lilv/lilv-0.24.12.ebuild
+2205291010 ./media-libs/lilv/lilv-0.24.14.ebuild
 2101060939 ./media-libs/lsp-plugins/lsp-plugins-1.1.22.ebuild
 2102042339 ./media-libs/lsp-plugins/lsp-plugins-1.1.24.ebuild
 2102061339 ./media-libs/lsp-plugins/lsp-plugins-9999.ebuild
 2112061809 ./media-libs/lsp-plugins/lsp-plugins-1.1.29.ebuild
 2205012040 ./media-libs/lv2/lv2-1.18.2.ebuild
+2205290940 ./media-libs/lv2/lv2-1.18.4.ebuild
 2009231339 ./media-libs/lvtk/lvtk-1.2.0-r1.ebuild
 2205031840 ./media-libs/mesa/mesa-9999.ebuild
 2205062010 ./media-libs/mesa/mesa-21.3.8.ebuild
 2205192340 ./media-libs/mesa/mesa-22.0.4.ebuild
 2205190110 ./media-libs/mesa/mesa-22.1.0.ebuild
-2205252110 ./media-libs/mesa/mesa-22.0.3.ebuild
+2205280440 ./media-libs/mesa/mesa-22.0.3.ebuild
 2204101640 ./media-libs/mlt/mlt-7.4.0.ebuild
 2204290740 ./media-libs/mlt/mlt-7.6.0.ebuild
 2204280110 ./media-libs/munt-mt32emu/munt-mt32emu-2.6.3.ebuild
@@ -20620,7 +20552,7 @@
 2007240409 ./media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild
 2102252009 ./media-libs/noise-suppression-for-voice/noise-suppression-for-voice-9999.ebuild
 2202191640 ./media-libs/nv-codec-headers/nv-codec-headers-11.1.5.0.ebuild
-2203260340 ./media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
+2205301740 ./media-libs/nv-codec-headers/nv-codec-headers-11.1.5.1-r1.ebuild
 2110300139 ./media-libs/oidn/oidn-1.3.0-r1.ebuild
 2110310910 ./media-libs/oidn/oidn-1.4.1-r1.ebuild
 2201020639 ./media-libs/oidn/oidn-1.4.2.ebuild
@@ -20701,7 +20633,6 @@
 2201170309 ./media-libs/sdl2-ttf/sdl2-ttf-2.0.18-r1.ebuild
 2002091409 ./media-libs/sg/sg-1.5.ebuild
 2202140039 ./media-libs/sge/sge-030809.ebuild
-2112250440 ./media-libs/shaderc/shaderc-2021.3.ebuild
 2204200209 ./media-libs/shaderc/shaderc-2022.1-r1.ebuild
 2204240940 ./media-libs/shaderc/shaderc-2022.1.ebuild
 2012251309 ./media-libs/simage/simage-1.8.0-r1.ebuild
@@ -20714,10 +20645,12 @@
 2205260840 ./media-libs/speex/speex-1.2.0-r2.ebuild
 2205190840 ./media-libs/speexdsp/speexdsp-1.2.0.ebuild
 2112181509 ./media-libs/sratom/sratom-0.6.8.ebuild
+2205291010 ./media-libs/sratom/sratom-0.6.10.ebuild
 2002112051 ./media-libs/stimg/stimg-0.1.0.ebuild
 2202031509 ./media-libs/stk/stk-4.6.2.ebuild
 2110221739 ./media-libs/stops/stops-0.3.0-r1.ebuild
 2112181509 ./media-libs/suil/suil-0.10.10.ebuild
+2205290940 ./media-libs/suil/suil-0.10.12.ebuild
 2204280710 ./media-libs/svgalib/svgalib-1.9.25-r8.ebuild
 2110041539 ./media-libs/svt-av1/svt-av1-0.8.6.ebuild
 2201151340 ./media-libs/svt-av1/svt-av1-0.8.7.ebuild
@@ -20729,7 +20662,7 @@
 2203210009 ./media-libs/tg_owt/tg_owt-0_pre20220209.ebuild
 1906090109 ./media-libs/theoraplay/theoraplay-0_pre20180524.ebuild
 2205090840 ./media-libs/tiff/tiff-4.3.0.ebuild
-2205210340 ./media-libs/tiff/tiff-4.4.0_rc1.ebuild
+2205280840 ./media-libs/tiff/tiff-4.4.0.ebuild
 2110161709 ./media-libs/tremor/tremor-0_pre20130223-r2.ebuild
 1805292338 ./media-libs/tse3/tse3-0.3.1-r1.ebuild
 2205190840 ./media-libs/urt/urt-3.1b-r3.ebuild
@@ -20750,12 +20683,9 @@
 2108241740 ./media-libs/vo-amrwbenc/vo-amrwbenc-0.1.3.ebuild
 1910111911 ./media-libs/vo-amrwbenc/vo-amrwbenc-9999.ebuild
 2202140039 ./media-libs/volpack/volpack-1.0_p7-r1.ebuild
-2112251340 ./media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
 2204270740 ./media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
 2205130940 ./media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
 2205130940 ./media-libs/vulkan-layers/vulkan-layers-9999.ebuild
-2112251340 ./media-libs/vulkan-loader/vulkan-loader-1.2.198.ebuild
-2201180239 ./media-libs/vulkan-loader/vulkan-loader-1.2.198-r1.ebuild
 2204242110 ./media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
 2205130940 ./media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild
 2205130940 ./media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -20850,7 +20780,7 @@
 2109162209 ./media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-amr/gst-plugins-amr-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-amr/gst-plugins-amr-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-amr/gst-plugins-amr-1.20.1.ebuild
@@ -20864,7 +20794,7 @@
 2109162209 ./media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.20.1.ebuild
@@ -20884,17 +20814,17 @@
 2109162209 ./media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.20.2.ebuild
 2105161609 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.16.3.ebuild
 2108240209 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.1.ebuild
 2203180340 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.18.6.ebuild
-2205130210 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild
+2205301710 ./media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.20.2.ebuild
 2102132309 ./media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.16.3.ebuild
 2106291940 ./media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-colormanagement/gst-plugins-colormanagement-1.20.1.ebuild
@@ -20919,42 +20849,42 @@
 2109162209 ./media-plugins/gst-plugins-dv/gst-plugins-dv-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-dv/gst-plugins-dv-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-dv/gst-plugins-dv-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-faac/gst-plugins-faac-1.20.2.ebuild
 2112260340 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.16.3.ebuild
 2112260340 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-faad/gst-plugins-faad-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-flac/gst-plugins-flac-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.16.3.ebuild
 2202080810 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.16.3.ebuild
 2111230440 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-gtk/gst-plugins-gtk-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-hls/gst-plugins-hls-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-hls/gst-plugins-hls-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-hls/gst-plugins-hls-1.20.1.ebuild
@@ -20964,12 +20894,12 @@
 2110110009 ./media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-jack/gst-plugins-jack-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-jack/gst-plugins-jack-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.20.2.ebuild
 2102132309 ./media-plugins/gst-plugins-kate/gst-plugins-kate-1.16.3.ebuild
 2105300411 ./media-plugins/gst-plugins-kate/gst-plugins-kate-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-kate/gst-plugins-kate-1.20.1.ebuild
@@ -20984,14 +20914,14 @@
 2109162209 ./media-plugins/gst-plugins-lame/gst-plugins-lame-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-lame/gst-plugins-lame-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-lame/gst-plugins-lame-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4.ebuild
 2203152310 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.1.ebuild
 2203180340 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6.ebuild
 2204021510 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.18.6-r1.ebuild
-2205251910 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-libav/gst-plugins-libav-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.20.1.ebuild
@@ -21001,18 +20931,18 @@
 2109162209 ./media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.18.4.ebuild
 2204011845 ./media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.18.6.ebuild
 2109091040 ./media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.15-r100.ebuild
-2203210139 ./media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
 2205082210 ./media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.19.ebuild
+2205280910 ./media-plugins/gst-plugins-libnice/gst-plugins-libnice-0.1.18.ebuild
 2102171709 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.16.3.ebuild
 2109271739 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.20.2.ebuild
 2103110609 ./media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-lv2/gst-plugins-lv2-1.20.1.ebuild
@@ -21022,17 +20952,17 @@
 2110240539 ./media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-meta/gst-plugins-meta-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-meta/gst-plugins-meta-1.20.2.ebuild
 2102171709 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.20.2.ebuild
 2201251210 ./media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.16.3-r1.ebuild
 2201251210 ./media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.20.1.ebuild
@@ -21042,7 +20972,7 @@
 2109162209 ./media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-mpg123/gst-plugins-mpg123-1.20.2.ebuild
 2108140239 ./media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.16.3-r1.ebuild
 2109162209 ./media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.20.1.ebuild
@@ -21052,7 +20982,7 @@
 2109162209 ./media-plugins/gst-plugins-neon/gst-plugins-neon-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-neon/gst-plugins-neon-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-neon/gst-plugins-neon-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.18.4.ebuild
 2204011845 ./media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.18.6.ebuild
@@ -21070,27 +21000,27 @@
 2109162209 ./media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.4-r2.ebuild
 2203170340 ./media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-opus/gst-plugins-opus-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-opus/gst-plugins-opus-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-oss/gst-plugins-oss-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-raw1394/gst-plugins-raw1394-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-rtmp/gst-plugins-rtmp-1.20.1.ebuild
@@ -21099,17 +21029,17 @@
 2109160939 ./media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.1.ebuild
 2203180340 ./media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.18.6.ebuild
-2205130210 ./media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild
+2205301010 ./media-plugins/gst-plugins-sctp/gst-plugins-sctp-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-shout2/gst-plugins-shout2-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-sidplay/gst-plugins-sidplay-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-smoothstreaming/gst-plugins-smoothstreaming-1.20.1.ebuild
@@ -21125,12 +21055,12 @@
 2109162209 ./media-plugins/gst-plugins-soup/gst-plugins-soup-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-soup/gst-plugins-soup-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-soup/gst-plugins-soup-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-speex/gst-plugins-speex-1.20.2.ebuild
 2107102039 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.16.3-r1.ebuild
 2107102039 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-srt/gst-plugins-srt-1.20.1.ebuild
@@ -21140,17 +21070,17 @@
 2109162209 ./media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-srtp/gst-plugins-srtp-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.16.3.ebuild
 2202080810 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-twolame/gst-plugins-twolame-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-uvch264/gst-plugins-uvch264-1.20.1.ebuild
@@ -21160,12 +21090,12 @@
 2109162209 ./media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.20.2.ebuild
 2203291010 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.16.3-r2.ebuild
 2203291010 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.4-r3.ebuild
 2203291010 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.1-r1.ebuild
 2204021510 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.18.6-r1.ebuild
-2205161540 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-voaacenc/gst-plugins-voaacenc-1.20.1.ebuild
@@ -21180,22 +21110,22 @@
 2109162209 ./media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.20.2.ebuild
 2102150709 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.20.2.ebuild
 2109231739 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.3.ebuild
 2109231739 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.4-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.1.ebuild
 2203180340 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.18.6.ebuild
-2205130210 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild
+2205301010 ./media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.20.2.ebuild
 2102181209 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.1.ebuild
 2204021510 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.18.6.ebuild
-2205251910 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-x264/gst-plugins-x264-1.20.2.ebuild
 2102141809 ./media-plugins/gst-plugins-x265/gst-plugins-x265-1.16.3.ebuild
 2109162209 ./media-plugins/gst-plugins-x265/gst-plugins-x265-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-x265/gst-plugins-x265-1.20.1.ebuild
@@ -21205,7 +21135,7 @@
 2109162209 ./media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.1.ebuild
 2204011845 ./media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.18.6.ebuild
-2205161540 ./media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-ximagesrc/gst-plugins-ximagesrc-1.20.2.ebuild
 2102132309 ./media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.16.3.ebuild
 2105300411 ./media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.18.4.ebuild
 2203170340 ./media-plugins/gst-plugins-zbar/gst-plugins-zbar-1.20.1.ebuild
@@ -21418,6 +21348,7 @@
 2009170109 ./media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-4.4.0.ebuild
 2008140009 ./media-plugins/kodi-visualization-waveform/kodi-visualization-waveform-9999.ebuild
 1911121409 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
+2205281910 ./media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r2.ebuild
 2108101739 ./media-plugins/libvisual-plugins/libvisual-plugins-0.4.0-r4.ebuild
 2204211139 ./media-plugins/libvisual-projectm/libvisual-projectm-2.1.0-r2.ebuild
 2108250739 ./media-plugins/live/live-2021.05.22.ebuild
@@ -21560,9 +21491,9 @@
 2010091139 ./media-plugins/xsynth-dssi/xsynth-dssi-0.9.4.ebuild
 2108220709 ./media-plugins/zam-plugins/zam-plugins-3.14-r1.ebuild
 2203170340 ./media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.1.ebuild
-2205251910 ./media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-ldac/gst-plugins-ldac-1.20.2.ebuild
 2203170340 ./media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.1.ebuild
-2205251910 ./media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild
+2205280440 ./media-plugins/gst-plugins-openaptx/gst-plugins-openaptx-1.20.2.ebuild
 2203170340 ./media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.20.1.ebuild
 2205130210 ./media-plugins/gst-plugins-sbc/gst-plugins-sbc-1.20.2.ebuild
 2105202109 ./media-radio/adifmerg/adifmerg-31-r1.ebuild
@@ -21582,11 +21513,11 @@
 2110142009 ./media-radio/flrig/flrig-1.4.2.ebuild
 2112231339 ./media-radio/flrig/flrig-1.4.3.ebuild
 2202072210 ./media-radio/flrig/flrig-1.4.4.ebuild
-2203271540 ./media-radio/flrig/flrig-1.4.5.ebuild
+2205291740 ./media-radio/flrig/flrig-1.4.5.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-1.0.ebuild
 2106190039 ./media-radio/fsync-mdc1200-decode/fsync-mdc1200-decode-9999.ebuild
 2104282139 ./media-radio/gpredict/gpredict-2.3.ebuild
-2203130940 ./media-radio/gpredict/gpredict-2.3-r1.ebuild
+2205291740 ./media-radio/gpredict/gpredict-2.3-r1.ebuild
 2106240909 ./media-radio/grig/grig-0.8.1-r1.ebuild
 2106190039 ./media-radio/ibp/ibp-0.21-r2.ebuild
 2105240139 ./media-radio/js8call/js8call-2.2.0-r1.ebuild
@@ -21597,6 +21528,7 @@
 2202051109 ./media-radio/tlf/tlf-1.4.1-r1.ebuild
 2205130040 ./media-radio/tqsl/tqsl-2.6.1-r1.ebuild
 2205212110 ./media-radio/tqsl/tqsl-2.6.2.ebuild
+2205300010 ./media-radio/tqsl/tqsl-2.6.3.ebuild
 2201300109 ./media-radio/tucnak/tucnak-4.34.ebuild
 2205050910 ./media-radio/tucnak/tucnak-4.36.ebuild
 2204151140 ./media-radio/unixcw/unixcw-3.5.1-r1.ebuild
@@ -21613,10 +21545,9 @@
 2107010809 ./media-sound/a2jmidid/a2jmidid-9999.ebuild
 2203081210 ./media-sound/abcde/abcde-2.9.3-r2.ebuild
 2203021209 ./media-sound/abcm2ps/abcm2ps-8.14.13.ebuild
-2204290940 ./media-sound/abcmidi/abcmidi-2022.04.28.ebuild
 2205071040 ./media-sound/abcmidi/abcmidi-2022.05.05.ebuild
-2205071410 ./media-sound/abcmidi/abcmidi-2022.04.06.ebuild
 2205220911 ./media-sound/abcmidi/abcmidi-2022.05.20.ebuild
+2205301010 ./media-sound/abcmidi/abcmidi-2022.04.28.ebuild
 2203100240 ./media-sound/aeolus/aeolus-0.9.9.ebuild
 2205110940 ./media-sound/aeolus/aeolus-0.10.4.ebuild
 2203202209 ./media-sound/alac_decoder/alac_decoder-0.2.0-r2.ebuild
@@ -21706,6 +21637,7 @@
 2012292009 ./media-sound/dvda-author/dvda-author-10.06-r1.ebuild
 2204240209 ./media-sound/easyeffects/easyeffects-6.2.3.ebuild
 2204240209 ./media-sound/easyeffects/easyeffects-6.2.4.ebuild
+2205291140 ./media-sound/easyeffects/easyeffects-6.2.5.ebuild
 2109280109 ./media-sound/easytag/easytag-2.4.3-r2.ebuild
 2109190909 ./media-sound/ecasound/ecasound-2.9.3.ebuild
 2204222140 ./media-sound/elisa/elisa-21.12.3.ebuild
@@ -21722,8 +21654,7 @@
 2201201739 ./media-sound/flacon/flacon-8.2.0.ebuild
 2006211639 ./media-sound/flake/flake-0.11.ebuild
 2204270740 ./media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
-2205052340 ./media-sound/fluidsynth/fluidsynth-2.2.6.ebuild
-2205271240 ./media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
+2205271310 ./media-sound/fluidsynth/fluidsynth-2.2.7.ebuild
 2006211639 ./media-sound/fmdrv/fmdrv-1.0.7.ebuild
 2004032340 ./media-sound/fmit/fmit-1.0.15-r3.ebuild
 2011141839 ./media-sound/fmtools/fmtools-2.0.7.ebuild
@@ -21742,9 +21673,9 @@
 2108170039 ./media-sound/gnomad/gnomad-2.9.6-r1.ebuild
 2203081540 ./media-sound/gnome-music/gnome-music-41.0.ebuild
 2203260340 ./media-sound/gnome-music/gnome-music-42.0.ebuild
-2204270110 ./media-sound/gnome-music/gnome-music-42.1.ebuild
+2205280910 ./media-sound/gnome-music/gnome-music-42.1.ebuild
 2201250410 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
-2203260340 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
+2205280440 ./media-sound/gnome-sound-recorder/gnome-sound-recorder-42.0.ebuild
 2201170309 ./media-sound/gnump3d/gnump3d-3.0-r4.ebuild
 2107050139 ./media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
 2008082009 ./media-sound/gom/gom-0.29.103-r1.ebuild
@@ -21791,8 +21722,7 @@
 2201221309 ./media-sound/kid3/kid3-3.9.1.ebuild
 2105231339 ./media-sound/klick/klick-0.12.2-r2.ebuild
 2201190109 ./media-sound/kmetronome/kmetronome-1.3.0.ebuild
-2201190109 ./media-sound/kmidimon/kmidimon-1.2.0.ebuild
-2204250940 ./media-sound/kmidimon/kmidimon-1.3.0.ebuild
+2205301010 ./media-sound/kmidimon/kmidimon-1.3.0.ebuild
 2205190840 ./media-sound/lame/lame-3.100-r3.ebuild
 2108211209 ./media-sound/lash/lash-0.5.4-r4.ebuild
 2202240439 ./media-sound/lilypond/lilypond-2.22.0-r1.ebuild
@@ -21891,6 +21821,7 @@
 2202210410 ./media-sound/paprefs/paprefs-1.2-r1.ebuild
 2203081640 ./media-sound/pasystray/pasystray-0.8.0-r1.ebuild
 2105010009 ./media-sound/patchage/patchage-1.0.4.ebuild
+2205310510 ./media-sound/patchage/patchage-1.0.6.ebuild
 2108210239 ./media-sound/pavucontrol-qt/pavucontrol-qt-0.17.0.ebuild
 2204151640 ./media-sound/pavucontrol-qt/pavucontrol-qt-1.0.0.ebuild
 2102251039 ./media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -21921,15 +21852,15 @@
 2010071039 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.68.ebuild
 2102201939 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.69.ebuild
 2202210410 ./media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70-r1.ebuild
-2205190840 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-15.99.1-r2.ebuild
+2205291010 ./media-sound/pulseaudio-daemon/pulseaudio-daemon-16.0.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r4.ebuild
 2203081640 ./media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4.ebuild
 2112290139 ./media-sound/pulseaudio/pulseaudio-15.0-r2.ebuild
 2201012339 ./media-sound/pulseaudio/pulseaudio-13.0-r1.ebuild
-2205190840 ./media-sound/pulseaudio/pulseaudio-15.99.1-r1.ebuild
-2205251910 ./media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+2205280440 ./media-sound/pulseaudio/pulseaudio-15.0-r3.ebuild
+2205282240 ./media-sound/pulseaudio/pulseaudio-16.0.ebuild
 2109191309 ./media-sound/pulseeffects/pulseeffects-4.8.5-r1.ebuild
-2205160010 ./media-sound/pulseeffects/pulseeffects-4.8.6.ebuild
+2205291140 ./media-sound/pulseeffects/pulseeffects-4.8.7.ebuild
 2201300509 ./media-sound/pulsemixer/pulsemixer-1.5.1.ebuild
 2201300509 ./media-sound/pulsemixer/pulsemixer-9999.ebuild
 2008082009 ./media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -21957,7 +21888,7 @@
 1912110309 ./media-sound/retrovol/retrovol-0.13.ebuild
 2002230040 ./media-sound/rexima/rexima-1.4-r1.ebuild
 2201130510 ./media-sound/rhythmbox/rhythmbox-3.4.4.ebuild
-2205161940 ./media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
+2205310340 ./media-sound/rhythmbox/rhythmbox-3.4.5.ebuild
 2105261539 ./media-sound/rip/rip-1.07-r3.ebuild
 2011141839 ./media-sound/ripperx/ripperx-2.7.3.ebuild
 2201101440 ./media-sound/rosegarden/rosegarden-21.12.ebuild
@@ -21986,10 +21917,12 @@
 2203200310 ./media-sound/sndpeek/sndpeek-1.41-r1.ebuild
 2112271140 ./media-sound/solfege/solfege-3.23.4.ebuild
 2108190439 ./media-sound/sonata/sonata-1.7.0.ebuild
+2205310510 ./media-sound/sonata/sonata-1.7.0-r1.ebuild
 2205051310 ./media-sound/sonic-visualiser/sonic-visualiser-4.5.ebuild
 2009181139 ./media-sound/sooperlooper/sooperlooper-1.7.4.ebuild
 2202080810 ./media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
 2107172140 ./media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+2205310740 ./media-sound/soundconverter/soundconverter-4.0.3.ebuild
 2007191439 ./media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
 2205260840 ./media-sound/sox/sox-14.4.2_p20210509.ebuild
 2011161309 ./media-sound/spek/spek-0.8.3-r1.ebuild
@@ -22059,7 +21992,7 @@
 1910102139 ./media-sound/xfmpc/xfmpc-0.3.0.ebuild
 2203202209 ./media-sound/xineadump/xineadump-0.1-r2.ebuild
 2204150940 ./media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
-2205030910 ./media-sound/xmms2/xmms2-0.9.1.ebuild
+2205301010 ./media-sound/xmms2/xmms2-0.9.1.ebuild
 2110200709 ./media-sound/xwax/xwax-1.8.ebuild
 2111291639 ./media-sound/yarock/yarock-1.4.0-r2.ebuild
 2201041209 ./media-sound/yoshimi/yoshimi-2.1.2.2.ebuild
@@ -22103,7 +22036,7 @@
 2205270140 ./media-tv/tvheadend/tvheadend-9999.ebuild
 2105261009 ./media-tv/tvnamer/tvnamer-3.0.2.ebuild
 2205241010 ./media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r5.ebuild
-2204021510 ./media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
+2205291340 ./media-tv/v4l-utils/v4l-utils-1.22.1.ebuild
 2012172009 ./media-tv/w_scan/w_scan-20170107.ebuild
 2110190309 ./media-tv/xmltv/xmltv-1.0.0.ebuild
 2110221139 ./media-video/acidrip/acidrip-0.14-r4.ebuild
@@ -22163,12 +22096,13 @@
 2205190540 ./media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild
 2204140110 ./media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild
 2204140210 ./media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild
+2205291040 ./media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild
 2205030640 ./media-video/ffmpeg/ffmpeg-4.2.4-r1.ebuild
 2205030640 ./media-video/ffmpeg/ffmpeg-4.3.2-r1.ebuild
 2205030640 ./media-video/ffmpeg/ffmpeg-4.4.1-r5.ebuild
-2205030640 ./media-video/ffmpeg/ffmpeg-4.4.2.ebuild
-2205030640 ./media-video/ffmpeg/ffmpeg-5.0.1.ebuild
 2205030640 ./media-video/ffmpeg/ffmpeg-9999.ebuild
+2205301640 ./media-video/ffmpeg/ffmpeg-4.4.2.ebuild
+2205301640 ./media-video/ffmpeg/ffmpeg-5.0.1.ebuild
 2205220740 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
 2104130239 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 2202281309 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild
@@ -22215,8 +22149,8 @@
 2108031709 ./media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
 2201021409 ./media-video/mkvtoolnix/mkvtoolnix-61.0.0.ebuild
 2201020909 ./media-video/mkvtoolnix/mkvtoolnix-64.0.0.ebuild
-2205180540 ./media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
 2205180540 ./media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+2205310240 ./media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild
 2109080439 ./media-video/motion/motion-4.3.2-r1.ebuild
 2205110210 ./media-video/motiontrack/motiontrack-0.1.3-r2.ebuild
 2204212209 ./media-video/movit/movit-1.6.3-r1.ebuild
@@ -22254,6 +22188,7 @@
 2205132310 ./media-video/pipewire/pipewire-9999.ebuild
 2205190840 ./media-video/pipewire/pipewire-0.3.51-r1.ebuild
 2201061809 ./media-video/pitivi/pitivi-0.999-r5.ebuild
+2205310810 ./media-video/pitivi/pitivi-2021.05-r1.ebuild
 2203200340 ./media-video/projectx/projectx-0.91.0.10-r3.ebuild
 2201291239 ./media-video/qmplay2/qmplay2-21.12.24.ebuild
 2204190909 ./media-video/qmplay2/qmplay2-22.03.19.ebuild
@@ -22299,7 +22234,7 @@
 1706250100 ./media-video/tcmplex-panteltje/tcmplex-panteltje-0.4.7-r1.ebuild
 1911092239 ./media-video/tivodecode/tivodecode-0.2_pre4.ebuild
 2202080810 ./media-video/totem/totem-3.38.2.ebuild
-2203302240 ./media-video/totem/totem-42.0-r1.ebuild
+2205280910 ./media-video/totem/totem-42.0-r1.ebuild
 2203110039 ./media-video/transcode/transcode-1.1.7-r6.ebuild
 2012231444 ./media-video/tsmuxer/tsmuxer-2.6.11-r1.ebuild
 2005181609 ./media-video/ttcut/ttcut-0.19.6_p1-r1.ebuild
@@ -22333,10 +22268,9 @@
 2203081810 ./media-video/webcamoid/webcamoid-8.8.0.ebuild
 2204220109 ./media-video/wireplumber/wireplumber-0.4.9-r1.ebuild
 2204290910 ./media-video/wireplumber/wireplumber-0.4.9.ebuild
-2205102010 ./media-video/wireplumber/wireplumber-0.4.10.ebuild
 2205190840 ./media-video/wireplumber/wireplumber-0.4.10-r1.ebuild
-2205260210 ./media-video/wireplumber/wireplumber-0.4.10-r2.ebuild
-2205260210 ./media-video/wireplumber/wireplumber-9999.ebuild
+2205300810 ./media-video/wireplumber/wireplumber-0.4.10-r3.ebuild
+2205300810 ./media-video/wireplumber/wireplumber-9999.ebuild
 2201051309 ./media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-0.0.20220222.ebuild
 2203101609 ./media-video/x264-encoder/x264-encoder-9999.ebuild
@@ -22501,7 +22435,7 @@
 2109291739 ./net-analyzer/linkchecker/linkchecker-10.0.1.ebuild
 2112241010 ./net-analyzer/linkchecker/linkchecker-9999.ebuild
 2201291309 ./net-analyzer/linkchecker/linkchecker-10.1.0.ebuild
-2012131109 ./net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
+2205281340 ./net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
 2102142339 ./net-analyzer/masscan/masscan-1.3.2.ebuild
 2102271109 ./net-analyzer/mbrowse/mbrowse-0.4.3-r1.ebuild
 1910021809 ./net-analyzer/mdns-scan/mdns-scan-0.5.ebuild
@@ -22641,8 +22575,7 @@
 1911091539 ./net-analyzer/raddump/raddump-0.3.1.ebuild
 2011270309 ./net-analyzer/rain/rain-1.2.9_beta1-r1.ebuild
 2009252039 ./net-analyzer/rrdcollect/rrdcollect-0.2.10.ebuild
-2204050139 ./net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
-2205061440 ./net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
+2205281910 ./net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
 2110212239 ./net-analyzer/rtpbreak/rtpbreak-1.3a-r2.ebuild
 2202061239 ./net-analyzer/sancp/sancp-1.6.1-r7.ebuild
 2203230410 ./net-analyzer/sarg/sarg-2.4.0-r1.ebuild
@@ -22679,6 +22612,7 @@
 1911282309 ./net-analyzer/squidview/squidview-0.86.ebuild
 2110242309 ./net-analyzer/sshping/sshping-0.1.4.ebuild
 2108110340 ./net-analyzer/ssldump/ssldump-1.4.ebuild
+2205280610 ./net-analyzer/ssldump/ssldump-1.5.ebuild
 2202251339 ./net-analyzer/sslscan/sslscan-2.0.11.ebuild
 2202251139 ./net-analyzer/sslscan/sslscan-2.0.12.ebuild
 2203161009 ./net-analyzer/sslscan/sslscan-2.0.12-r1.ebuild
@@ -22808,10 +22742,13 @@
 2112200139 ./net-dns/bind-tools/bind-tools-9.16.22.ebuild
 2201260210 ./net-dns/bind-tools/bind-tools-9.16.25.ebuild
 2203271540 ./net-dns/bind-tools/bind-tools-9.16.27.ebuild
+2205310640 ./net-dns/bind-tools/bind-tools-9.16.29.ebuild
 2203230410 ./net-dns/bind/bind-9.16.27-r1.ebuild
+2205310640 ./net-dns/bind/bind-9.16.29.ebuild
 2203110039 ./net-dns/c-ares/c-ares-1.17.2.ebuild
 2205060310 ./net-dns/c-ares/c-ares-1.18.1.ebuild
 2205160710 ./net-dns/coredns/coredns-1.8.3.ebuild
+2205282110 ./net-dns/coredns/coredns-1.9.3.ebuild
 2202100210 ./net-dns/ddclient/ddclient-3.9.1-r2.ebuild
 2107182140 ./net-dns/djbdns/djbdns-1.05-r35.ebuild
 2104120016 ./net-dns/dnrd/dnrd-2.20.3-r3.ebuild
@@ -22901,7 +22838,7 @@
 2203281040 ./net-firewall/ipt_netflow/ipt_netflow-9999.ebuild
 2204291110 ./net-firewall/iptables/iptables-1.8.7-r2.ebuild
 2205190010 ./net-firewall/iptables/iptables-1.8.8-r1.ebuild
-2205200640 ./net-firewall/iptables/iptables-1.8.8-r2.ebuild
+2205280610 ./net-firewall/iptables/iptables-1.8.8-r2.ebuild
 2011291139 ./net-firewall/itval/itval-1.2_p20121104-r1.ebuild
 2001260341 ./net-firewall/lutelwall/lutelwall-0.99-r1.ebuild
 2112030339 ./net-firewall/nfacct/nfacct-1.0.2-r1.ebuild
@@ -22977,10 +22914,8 @@
 2205110210 ./net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
 2205110210 ./net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
 2205110210 ./net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
-2204171510 ./net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
-2204171510 ./net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
-2204290210 ./net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
 2204290210 ./net-ftp/pure-ftpd/pure-ftpd-9999.ebuild
+2205272040 ./net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
 2106302209 ./net-ftp/pureadmin/pureadmin-0.4-r3.ebuild
 2204030609 ./net-ftp/tftp-hpa/tftp-hpa-5.2-r3.ebuild
 2204102210 ./net-ftp/tnftp/tnftp-20210827.ebuild
@@ -23017,9 +22952,9 @@
 2205201040 ./net-im/gajim/gajim-1.4.0-r1.ebuild
 2205171440 ./net-im/gajim/gajim-1.4.0.ebuild
 2205222210 ./net-im/gajim/gajim-1.4.1.ebuild
+2205291840 ./net-im/gajim/gajim-1.4.2.ebuild
 2101151209 ./net-im/gitter-bin/gitter-bin-4.1.0-r1.ebuild
 2101291709 ./net-im/gitter-bin/gitter-bin-5.0.1.ebuild
-2202100210 ./net-im/jabber-base/jabber-base-0.01-r3.ebuild
 2203121509 ./net-im/libcommuni/libcommuni-3.7.0.ebuild
 2011142339 ./net-im/librvp/librvp-0.9.7.ebuild
 2205190540 ./net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.1.0.ebuild
@@ -23091,7 +23026,7 @@
 2205141340 ./net-im/cawbird/cawbird-1.5-r2.ebuild
 2205191410 ./net-im/wazzapp-bin/wazzapp-bin-0.4.2.ebuild
 2203230410 ./net-irc/anope/anope-2.0.10-r1.ebuild
-2204230512 ./net-irc/anope/anope-2.0.11.ebuild
+2205281940 ./net-irc/anope/anope-2.0.11.ebuild
 2203281240 ./net-irc/atheme-services/atheme-services-7.2.12-r3.ebuild
 2106302209 ./net-irc/bnc/bnc-2.9.4-r2.ebuild
 2111080609 ./net-irc/dccserver/dccserver-0.5-r1.ebuild
@@ -23142,6 +23077,7 @@
 2104161439 ./net-irc/onis/onis-0.8.2-r1.ebuild
 2104040139 ./net-irc/pisg/pisg-0.73-r1.ebuild
 2201250410 ./net-irc/polari/polari-40.0.ebuild
+2205310240 ./net-irc/polari/polari-42.0.ebuild
 2201170309 ./net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
 2204050009 ./net-irc/quassel/quassel-9999.ebuild
 2204120010 ./net-irc/quassel/quassel-0.14.0-r1.ebuild
@@ -23194,14 +23130,15 @@
 1903300009 ./net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-1.0.8_p20190329.ebuild
 1903300009 ./net-libs/freaklabs-chibiarduino/freaklabs-chibiarduino-9999.ebuild
 2201242240 ./net-libs/glib-networking/glib-networking-2.70.1.ebuild
-2205260840 ./net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
+2205280910 ./net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
 2110260909 ./net-libs/gloox/gloox-1.0.24.ebuild
 2204101840 ./net-libs/gnet/gnet-2.0.8-r4.ebuild
 2201241810 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.40.1.ebuild
-2203302240 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
+2205280910 ./net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
 2112030839 ./net-libs/gnutls/gnutls-3.7.2.ebuild
 2205150040 ./net-libs/gnutls/gnutls-3.7.5.ebuild
 2205191240 ./net-libs/gnutls/gnutls-3.7.3-r1.ebuild
+2205280610 ./net-libs/gnutls/gnutls-3.7.6.ebuild
 2202280409 ./net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
 2203060340 ./net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
 2107021539 ./net-libs/grpc/grpc-1.38.1.ebuild
@@ -23282,7 +23219,7 @@
 2205132310 ./net-libs/libktorrent/libktorrent-22.04.1.ebuild
 2201070139 ./net-libs/liblockfile/liblockfile-1.17.ebuild
 2201241810 ./net-libs/libmbim/libmbim-1.26.2.ebuild
-2205241440 ./net-libs/libmbim/libmbim-1.26.4.ebuild
+2205280910 ./net-libs/libmbim/libmbim-1.26.4.ebuild
 2109141739 ./net-libs/libmediawiki/libmediawiki-5.37.0-r1.ebuild
 2108211209 ./net-libs/libmicrodns/libmicrodns-0.1.2.ebuild
 2004112339 ./net-libs/libmicrodns/libmicrodns-9999.ebuild
@@ -23290,7 +23227,7 @@
 2201062039 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.72.ebuild
 2201062039 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.73.ebuild
 2201062039 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.74.ebuild
-2205210110 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+2205292340 ./net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
 2203270610 ./net-libs/libmnl/libmnl-1.0.4.ebuild
 2204291110 ./net-libs/libmnl/libmnl-1.0.5.ebuild
 2201140110 ./net-libs/libmrss/libmrss-0.19.2-r1.ebuild
@@ -23318,14 +23255,14 @@
 2203270610 ./net-libs/libnftnl/libnftnl-9999.ebuild
 2204251840 ./net-libs/libnftnl/libnftnl-1.2.1.ebuild
 2109091040 ./net-libs/libnice/libnice-0.1.15.ebuild
-2203081710 ./net-libs/libnice/libnice-0.1.18.ebuild
 2205082210 ./net-libs/libnice/libnice-0.1.19.ebuild
+2205280910 ./net-libs/libnice/libnice-0.1.18.ebuild
 2110170339 ./net-libs/libnids/libnids-1.24-r8.ebuild
 2112140439 ./net-libs/libnids/libnids-1.26-r1.ebuild
 2108110109 ./net-libs/libnipper/libnipper-0.12.6-r1.ebuild
 2203091910 ./net-libs/libnma/libnma-1.8.34.ebuild
 2203260009 ./net-libs/libnma/libnma-1.8.36.ebuild
-2205150640 ./net-libs/libnma/libnma-1.8.38.ebuild
+2205280910 ./net-libs/libnma/libnma-1.8.38.ebuild
 2205220010 ./net-libs/libnpupnp/libnpupnp-4.2.1.ebuild
 2205220010 ./net-libs/libnpupnp/libnpupnp-4.2.2.ebuild
 2104060140 ./net-libs/libnsl/libnsl-0-r1.ebuild
@@ -23351,8 +23288,8 @@
 2203250139 ./net-libs/libpsl/libpsl-0.21.0.ebuild
 2205171610 ./net-libs/libpsl/libpsl-0.21.1.ebuild
 2203091910 ./net-libs/libqmi/libqmi-1.30.4.ebuild
-2205241440 ./net-libs/libqmi/libqmi-1.30.6.ebuild
 2205241440 ./net-libs/libqmi/libqmi-9999.ebuild
+2205280910 ./net-libs/libqmi/libqmi-1.30.6.ebuild
 2205131410 ./net-libs/libquotient/libquotient-0.6.11-r1.ebuild
 2002092209 ./net-libs/librouteros/librouteros-1.1.2.ebuild
 2112011639 ./net-libs/librsync/librsync-2.3.2.ebuild
@@ -23499,6 +23436,7 @@
 2102270739 ./net-libs/wandio/wandio-4.2.3_p1-r1.ebuild
 2205131640 ./net-libs/webkit-gtk/webkit-gtk-2.36.1.ebuild
 2205181940 ./net-libs/webkit-gtk/webkit-gtk-2.36.2.ebuild
+2205290440 ./net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
 2106222139 ./net-libs/wvstreams/wvstreams-4.6.1_p14-r2.ebuild
 2204071939 ./net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
 2103041409 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.3.ebuild
@@ -23550,7 +23488,7 @@
 2205211140 ./net-mail/fetchmail/fetchmail-6.4.27.ebuild
 2205201540 ./net-mail/fetchmail/fetchmail-6.4.30.ebuild
 2111100239 ./net-mail/getmail/getmail-6.14.ebuild
-2205200640 ./net-mail/getmail/getmail-6.18.9.ebuild
+2205310610 ./net-mail/getmail/getmail-6.18.9.ebuild
 1905291309 ./net-mail/gnubiff/gnubiff-2.2.17-r2.ebuild
 1912110241 ./net-mail/grepmail/grepmail-5.30.33-r2.ebuild
 2201281110 ./net-mail/grepmail/grepmail-5.3111.ebuild
@@ -23562,6 +23500,7 @@
 2104040109 ./net-mail/libdbx/libdbx-1.0.3.ebuild
 2107251209 ./net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
 2205071440 ./net-mail/mailbase/mailbase-1.8.ebuild
+2205281140 ./net-mail/mailbase/mailbase-1.8.1.ebuild
 2012251539 ./net-mail/mailbox-count/mailbox-count-0.0.5.ebuild
 1905210709 ./net-mail/mailfront/mailfront-2.22.ebuild
 2110040409 ./net-mail/mailgraph/mailgraph-1.14-r3.ebuild
@@ -23757,9 +23696,11 @@
 2205111740 ./net-misc/dropbox/dropbox-148.4.4519.ebuild
 2203141940 ./net-misc/econnman/econnman-1.1_p20160305.ebuild
 2203260309 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
-2205200440 ./net-misc/electron-cash/electron-cash-4.2.9.ebuild
+2205282210 ./net-misc/electron-cash/electron-cash-4.2.10.ebuild
+2205282210 ./net-misc/electron-cash/electron-cash-4.2.9.ebuild
 2204051009 ./net-misc/electrum-ltc/electrum-ltc-4.0.9.1.ebuild
 2205211240 ./net-misc/electrum/electrum-4.2.1-r2.ebuild
+2205280810 ./net-misc/electrum/electrum-4.2.2.ebuild
 2104180939 ./net-misc/ena-driver/ena-driver-2.2.3-r1.ebuild
 2203050240 ./net-misc/ena-driver/ena-driver-2.6.1.ebuild
 2112241840 ./net-misc/endlessh/endlessh-1.1-r2.ebuild
@@ -23779,12 +23720,11 @@
 2205101940 ./net-misc/freerdp/freerdp-2.7.0-r1.ebuild
 2205101940 ./net-misc/freerdp/freerdp-2.9999.ebuild
 2205101940 ./net-misc/freerdp/freerdp-9999.ebuild
-2202021239 ./net-misc/frr/frr-8.1-r1.ebuild
-2204280140 ./net-misc/frr/frr-8.2.2.ebuild
+2205301010 ./net-misc/frr/frr-8.2.2.ebuild
 2202222339 ./net-misc/gallery-dl/gallery-dl-9999.ebuild
-2204082339 ./net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
-2204280010 ./net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
 2205252240 ./net-misc/gallery-dl/gallery-dl-1.22.0.ebuild
+2205272240 ./net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
+2205310610 ./net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
 2012311940 ./net-misc/geoipupdate/geoipupdate-2.3.1.ebuild
 2004140139 ./net-misc/geoipupdate/geoipupdate-3.1.1.ebuild
 2203202339 ./net-misc/geoipupdate/geoipupdate-4.8.0.ebuild
@@ -23799,6 +23739,7 @@
 2203260340 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-42.0.ebuild
 2204281840 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.1.ebuild
 2204250010 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-42.1.ebuild
+2205301740 ./net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild
 2201121210 ./net-misc/gns3-gui/gns3-gui-2.2.29.ebuild
 2203291410 ./net-misc/gns3-gui/gns3-gui-2.2.31.ebuild
 2205081210 ./net-misc/gns3-gui/gns3-gui-2.2.31-r1.ebuild
@@ -23906,10 +23847,10 @@
 2112190139 ./net-misc/minissdpd/minissdpd-1.5.20211105.ebuild
 2202180610 ./net-misc/miniupnpd/miniupnpd-2.3.0-r1.ebuild
 2111060742 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20210805.ebuild
-2203230939 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
 2205190840 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220511.ebuild
+2205280910 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
 2203091910 ./net-misc/modemmanager/modemmanager-1.18.6.ebuild
-2205261310 ./net-misc/modemmanager/modemmanager-1.18.8.ebuild
+2205280910 ./net-misc/modemmanager/modemmanager-1.18.8.ebuild
 2002230040 ./net-misc/monmotha/monmotha-2.3.8-r1.ebuild
 2205051340 ./net-misc/mosh/mosh-1.3.2-r2.ebuild
 2102161539 ./net-misc/mrouted/mrouted-4.2.ebuild
@@ -23920,7 +23861,7 @@
 2005051539 ./net-misc/ncman/ncman-0.0.1_p20190327-r2.ebuild
 2003201609 ./net-misc/ncman/ncman-9999.ebuild
 2009172339 ./net-misc/ncp/ncp-1.2.4-r2.ebuild
-2205260840 ./net-misc/ndisc6/ndisc6-1.0.5.ebuild
+2205272240 ./net-misc/ndisc6/ndisc6-1.0.5.ebuild
 2104212209 ./net-misc/ndppd/ndppd-0.2.5.ebuild
 2101081039 ./net-misc/nemesis/nemesis-1.7-r1.ebuild
 2104060140 ./net-misc/netdate/netdate-1.2-r1.ebuild
@@ -23948,16 +23889,16 @@
 2104040109 ./net-misc/netstat-nat/netstat-nat-1.4.10.ebuild
 2201041339 ./net-misc/networkmanager/networkmanager-1.32.12-r1.ebuild
 2203090511 ./net-misc/networkmanager/networkmanager-1.36.2.ebuild
-2203230939 ./net-misc/networkmanager/networkmanager-1.36.4.ebuild
 2205241440 ./net-misc/networkmanager/networkmanager-1.38.0.ebuild
+2205280910 ./net-misc/networkmanager/networkmanager-1.36.4.ebuild
 2203312110 ./net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
 2205121740 ./net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
 2205171240 ./net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
 1702282250 ./net-misc/nicstat/nicstat-1.95.ebuild
 2203180040 ./net-misc/ntp/ntp-4.2.8_p15.ebuild
 2204070539 ./net-misc/ntpsec/ntpsec-1.2.1-r2.ebuild
-2204200439 ./net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
 2204200439 ./net-misc/ntpsec/ntpsec-9999.ebuild
+2205310610 ./net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
 2201040239 ./net-misc/nx/nx-3.5.99.25.ebuild
 2201040239 ./net-misc/nx/nx-3.5.99.26.ebuild
 2111192109 ./net-misc/nxplayer/nxplayer-5.1.24.1-r1.ebuild
@@ -24009,7 +23950,8 @@
 1705171647 ./net-misc/puf/puf-1.0.0-r1.ebuild
 2202210411 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
 2203260309 ./net-misc/putty/putty-0.76.ebuild
-2203260309 ./net-misc/putty/putty-9999.ebuild
+2205271340 ./net-misc/putty/putty-0.77.ebuild
+2205271340 ./net-misc/putty/putty-9999.ebuild
 2110240439 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
 2102261739 ./net-misc/pyhoca-gui/pyhoca-gui-0.6.1.1.ebuild
 2205201540 ./net-misc/python-x2go/python-x2go-0.6.1.3.ebuild
@@ -24025,10 +23967,10 @@
 2205030010 ./net-misc/rclone/rclone-1.58.1.ebuild
 2109230439 ./net-misc/rdate/rdate-1.10.ebuild
 2202170109 ./net-misc/rdate/rdate-1.10.2.ebuild
-2205191040 ./net-misc/rdate/rdate-1.11.ebuild
+2205272240 ./net-misc/rdate/rdate-1.11.ebuild
 2104161439 ./net-misc/rdesktop/rdesktop-1.9.0-r1.ebuild
-2106141409 ./net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
 2104161439 ./net-misc/rdesktop/rdesktop-1.9.0.ebuild
+2205272240 ./net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
 1910111911 ./net-misc/redir/redir-3.2.ebuild
 1910111911 ./net-misc/redir/redir-3.3.ebuild
 2204150940 ./net-misc/remmina/remmina-1.4.25.ebuild
@@ -24102,7 +24044,8 @@
 2205102310 ./net-misc/sstp-client/sstp-client-1.0.17.ebuild
 2107172140 ./net-misc/streamlink/streamlink-1.3.1-r1.ebuild
 2107172140 ./net-misc/streamlink/streamlink-2.0.0.ebuild
-2107172140 ./net-misc/streamlink/streamlink-9999.ebuild
+2205310310 ./net-misc/streamlink/streamlink-4.1.0.ebuild
+2205310210 ./net-misc/streamlink/streamlink-9999.ebuild
 2002191709 ./net-misc/streamtuner/streamtuner-0.99.99-r5.ebuild
 2109302139 ./net-misc/stunnel/stunnel-5.59.ebuild
 2205141510 ./net-misc/stunnel/stunnel-5.64.ebuild
@@ -24120,7 +24063,7 @@
 2111291039 ./net-misc/teamviewer/teamviewer-15.23.9.ebuild
 2203261710 ./net-misc/teamviewer/teamviewer-15.28.6.ebuild
 2201040640 ./net-misc/telnet-bsd/telnet-bsd-1.2-r2.ebuild
-2203271210 ./net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
+2205272240 ./net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
 2101061839 ./net-misc/throttle/throttle-1.2-r1.ebuild
 1911091639 ./net-misc/tiers/tiers-1.1.ebuild
 2205091310 ./net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -24142,7 +24085,7 @@
 2203202040 ./net-misc/usbip/usbip-5.15.ebuild
 2003072009 ./net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild
 1912110241 ./net-misc/valve/valve-1.0-r1.ebuild
-2205260840 ./net-misc/vconfig/vconfig-1.9.ebuild
+2205272240 ./net-misc/vconfig/vconfig-1.9.ebuild
 2104302009 ./net-misc/vde/vde-2.3.2-r6.ebuild
 2109211139 ./net-misc/vde/vde-2.3.2_p20191011.ebuild
 2109211139 ./net-misc/vde/vde-9999.ebuild
@@ -24160,6 +24103,7 @@
 2205220940 ./net-misc/wget/wget-1.21.3.ebuild
 2202170040 ./net-misc/wget2/wget2-2.0.0-r1.ebuild
 2204101840 ./net-misc/wget2/wget2-9999.ebuild
+2205271740 ./net-misc/wget2/wget2-2.0.1.ebuild
 2012311940 ./net-misc/whatmask/whatmask-1.2-r1.ebuild
 2202191240 ./net-misc/whois/whois-5.5.11.ebuild
 2204050709 ./net-misc/whois/whois-9999.ebuild
@@ -24309,7 +24253,8 @@
 2110221109 ./net-p2p/mktorrent/mktorrent-1.1_p20210130.ebuild
 2202281039 ./net-p2p/mldonkey/mldonkey-3.1.7-r3.ebuild
 2107180040 ./net-p2p/ncdc/ncdc-1.22.1-r1.ebuild
-2107180040 ./net-p2p/ncdc/ncdc-9999.ebuild
+2205310740 ./net-p2p/ncdc/ncdc-1.23.ebuild
+2205310740 ./net-p2p/ncdc/ncdc-9999.ebuild
 2103121839 ./net-p2p/nicotine+/nicotine+-2.2.2.ebuild
 2201020309 ./net-p2p/nicotine+/nicotine+-3.1.1.ebuild
 2201212340 ./net-p2p/nicotine+/nicotine+-3.2.0.ebuild
@@ -24332,17 +24277,18 @@
 2205090010 ./net-p2p/syncthing/syncthing-1.20.1.ebuild
 2205152210 ./net-p2p/syncthing/syncthing-1.19.2.ebuild
 2105112239 ./net-p2p/torrentinfo/torrentinfo-1.8.6-r2.ebuild
-2201140110 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+2205310810 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+2205310810 ./net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
 2204041439 ./net-p2p/transmission/transmission-3.00-r1.ebuild
 2205172340 ./net-p2p/transmission/transmission-3.00-r4.ebuild
 2205172340 ./net-p2p/transmission/transmission-9999.ebuild
 2106112309 ./net-p2p/tremc/tremc-0.9.2_p20201101.ebuild
+2205310140 ./net-p2p/tremc/tremc-0.9.3.ebuild
 1806011708 ./net-p2p/tvrss/tvrss-1.8_beta.ebuild
 1911232009 ./net-p2p/vuze-coreplugins/vuze-coreplugins-5.7.6.0.ebuild
 2204022039 ./net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
-2203141940 ./net-p2p/arti/arti-0.1.0.ebuild
-2204121810 ./net-p2p/arti/arti-0.2.0.ebuild
 2205110710 ./net-p2p/arti/arti-0.3.0.ebuild
+2205310140 ./net-p2p/arti/arti-0.4.0.ebuild
 2010020309 ./net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
 2006300939 ./net-print/brlaser/brlaser-6.ebuild
 2011290239 ./net-print/c2esp/c2esp-27.ebuild
@@ -24359,7 +24305,8 @@
 2104060140 ./net-print/cups-windows/cups-windows-6.0-r1.ebuild
 2205181110 ./net-print/cups/cups-2.3.3_p2-r3.ebuild
 2205221540 ./net-print/cups/cups-2.4.1.ebuild
-2205221540 ./net-print/cups/cups-9999.ebuild
+2205280810 ./net-print/cups/cups-2.4.2-r1.ebuild
+2205280810 ./net-print/cups/cups-9999.ebuild
 2104161439 ./net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
 2101150309 ./net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.8.ebuild
 2111020109 ./net-print/fax4cups/fax4cups-1.29-r1.ebuild
@@ -24371,6 +24318,7 @@
 2102171309 ./net-print/gtklp/gtklp-1.3.1.ebuild
 2203110409 ./net-print/gutenprint/gutenprint-5.3.4-r2.ebuild
 2204060139 ./net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild
+2205291610 ./net-print/hplip-plugin/hplip-plugin-3.22.4.ebuild
 2204051009 ./net-print/hplip/hplip-3.22.2.ebuild
 2205201010 ./net-print/hplip/hplip-3.22.4.ebuild
 2201290610 ./net-print/ink/ink-0.5.3.ebuild
@@ -24432,8 +24380,9 @@
 1902031239 ./net-proxy/tayga/tayga-0.9.2-r2.ebuild
 2203030939 ./net-proxy/tayga/tayga-0.9.2-r3.ebuild
 2202190010 ./net-proxy/tinyproxy/tinyproxy-1.11.0-r1.ebuild
-1702282250 ./net-proxy/torsocks/torsocks-2.2.0.ebuild
+2205302240 ./net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild
 2005291109 ./net-proxy/torsocks/torsocks-2.3.0.ebuild
+2205301910 ./net-proxy/torsocks/torsocks-2.4.0.ebuild
 2112030439 ./net-proxy/trojan/trojan-1.16.0-r2.ebuild
 2205260840 ./net-proxy/tsocks/tsocks-1.8_beta5-r9.ebuild
 2104172239 ./net-proxy/wwwoffle/wwwoffle-2.9i-r2.ebuild
@@ -24449,6 +24398,7 @@
 2104161439 ./net-vpn/corkscrew/corkscrew-2.0-r1.ebuild
 2205160240 ./net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
 2205160210 ./net-vpn/frp/frp-0.42.0.ebuild
+2205282140 ./net-vpn/frp/frp-0.43.0.ebuild
 2101101639 ./net-vpn/httptunnel/httptunnel-3.3_p20180119.ebuild
 2203121509 ./net-vpn/i2p/i2p-1.6.1.ebuild
 2205241810 ./net-vpn/i2p/i2p-1.7.0.ebuild
@@ -24474,18 +24424,18 @@
 2204090041 ./net-vpn/networkmanager-libreswan/networkmanager-libreswan-1.2.16.ebuild
 2108252339 ./net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r1.ebuild
 2204090041 ./net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.6-r2.ebuild
-2204190010 ./net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild
+2205280910 ./net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild
 2201240710 ./net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.16.ebuild
-2204090041 ./net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
+2205280440 ./net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
 2004261739 ./net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.8-r2.ebuild
-2204090041 ./net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild
+2205280440 ./net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild
 2004261409 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.0-r1.ebuild
 2204090041 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.2.6.ebuild
 2205102310 ./net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild
 2202100210 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.5.2-r1.ebuild
 2205230240 ./net-vpn/networkmanager-strongswan/networkmanager-strongswan-1.6.0.ebuild
 2004261739 ./net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.6-r2.ebuild
-2204090041 ./net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
+2205280440 ./net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
 1911091712 ./net-vpn/nstx/nstx-1.1_beta6-r3.ebuild
 2106280109 ./net-vpn/ocserv/ocserv-1.0.1-r1.ebuild
 2108022309 ./net-vpn/ocserv/ocserv-1.1.3.ebuild
@@ -24549,8 +24499,8 @@
 2110150909 ./net-wireless/dump1090/dump1090-5.0.ebuild
 2110141309 ./net-wireless/dump1090/dump1090-6.1.ebuild
 2109262309 ./net-wireless/dump1090/dump1090-9999.ebuild
-2205072140 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
 2205202240 ./net-wireless/gnome-bluetooth/gnome-bluetooth-3.34.5.ebuild
+2205280910 ./net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
 2110011839 ./net-wireless/gnuradio/gnuradio-3.8.4.0.ebuild
 2204301910 ./net-wireless/gnuradio/gnuradio-3.8.5.0.ebuild
 2204301910 ./net-wireless/gnuradio/gnuradio-9999.ebuild
@@ -24670,6 +24620,7 @@
 2204301910 ./net-wireless/uhd/uhd-4.2.0.0.ebuild
 2204131710 ./net-wireless/unifi/unifi-6.5.55-r2.ebuild
 2205250010 ./net-wireless/unifi/unifi-7.1.65.ebuild
+2205281410 ./net-wireless/unifi/unifi-7.1.66.ebuild
 2203181740 ./net-wireless/urh/urh-2.9.3.ebuild
 2203181740 ./net-wireless/urh/urh-9999.ebuild
 2106031009 ./net-wireless/wavemon/wavemon-0.9.3-r1.ebuild
@@ -25060,11 +25011,12 @@
 2202230809 ./sci-calculators/pcalc/pcalc-5.ebuild
 2201090440 ./sci-calculators/qalculate-gtk/qalculate-gtk-3.22.0.ebuild
 2204050539 ./sci-calculators/qalculate-gtk/qalculate-gtk-4.1.1-r1.ebuild
+2205280940 ./sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild
 2102281539 ./sci-calculators/speedcrunch/speedcrunch-0.12.0-r1.ebuild
 2002112051 ./sci-calculators/tiemu/tiemu-3.03-r1.ebuild
 2108200539 ./sci-calculators/tilp2/tilp2-1.18.ebuild
 2101022239 ./sci-calculators/transcalc/transcalc-0.14-r2.ebuild
-2102121709 ./sci-calculators/units/units-2.21.ebuild
+2205310210 ./sci-calculators/units/units-2.21.ebuild
 2109090810 ./sci-calculators/wcalc/wcalc-2.5.ebuild
 2112260340 ./sci-calculators/xsv/xsv-0.13.0.ebuild
 2201131940 ./sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0-r1.ebuild
@@ -25237,8 +25189,9 @@
 2010071039 ./sci-electronics/xnec2c/xnec2c-4.1.1.ebuild
 2202250909 ./sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
 2203192140 ./sci-electronics/xnec2c/xnec2c-4.4.7.ebuild
-2203242009 ./sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
+2205291740 ./sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
 2101070439 ./sci-electronics/xoscope/xoscope-2.2.ebuild
+2205301540 ./sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild
 2110271109 ./sci-geosciences/GeographicLib/GeographicLib-1.52.ebuild
 2104212209 ./sci-geosciences/bt747/bt747-2.1.7-r2.ebuild
 2105311239 ./sci-geosciences/congen/congen-1.6.2-r1.ebuild
@@ -25255,7 +25208,8 @@
 2204130011 ./sci-geosciences/gmt/gmt-6.3.0.ebuild
 2203210009 ./sci-geosciences/gnome-maps/gnome-maps-41.4-r1.ebuild
 2203210009 ./sci-geosciences/gnome-maps/gnome-maps-42.0.ebuild
-2204250010 ./sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild
+2205280440 ./sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild
+2205281640 ./sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
 2005210239 ./sci-geosciences/gpsbabel/gpsbabel-1.5.4-r1.ebuild
 2110250239 ./sci-geosciences/gpsbabel/gpsbabel-9999.ebuild
 2202141339 ./sci-geosciences/gpsbabel/gpsbabel-1.7.0-r1.ebuild
@@ -25267,9 +25221,7 @@
 2203260340 ./sci-geosciences/gpsprune-bin/gpsprune-bin-20.4.ebuild
 2103201539 ./sci-geosciences/gpx-viewer/gpx-viewer-0.4.0-r1.ebuild
 2204061609 ./sci-geosciences/gpxlab/gpxlab-0.7.0.ebuild
-2204111010 ./sci-geosciences/gpxsee/gpxsee-10.5.ebuild
-2204180941 ./sci-geosciences/gpxsee/gpxsee-10.6.ebuild
-2204280840 ./sci-geosciences/gpxsee/gpxsee-10.7.ebuild
+2205291740 ./sci-geosciences/gpxsee/gpxsee-10.7.ebuild
 2201021009 ./sci-geosciences/grass/grass-7.8.6-r1.ebuild
 2202260539 ./sci-geosciences/grass/grass-7.8.7.ebuild
 2205121810 ./sci-geosciences/grass/grass-8.0.2.ebuild
@@ -25396,6 +25348,7 @@
 2205212210 ./sci-libs/cfitsio/cfitsio-4.0.0.ebuild
 2110211309 ./sci-libs/cgcode/cgcode-1.0-r2.ebuild
 2012272239 ./sci-libs/cgnslib/cgnslib-3.4.0.ebuild
+2205281310 ./sci-libs/cgnslib/cgnslib-4.3.0.ebuild
 2107161509 ./sci-libs/cholmod/cholmod-3.0.13.ebuild
 2107161509 ./sci-libs/cholmod/cholmod-3.0.14.ebuild
 2111190309 ./sci-libs/cifparse-obj/cifparse-obj-7.105.ebuild
@@ -25557,6 +25510,7 @@
 2112161109 ./sci-libs/libqalculate/libqalculate-3.21.0.ebuild
 2204050609 ./sci-libs/libqalculate/libqalculate-3.22.0.ebuild
 2204050539 ./sci-libs/libqalculate/libqalculate-4.1.1.ebuild
+2205280940 ./sci-libs/libqalculate/libqalculate-4.2.0.ebuild
 2108042109 ./sci-libs/libsc/libsc-2.3.1-r1.ebuild
 2111120739 ./sci-libs/libsc/libsc-2.3.3.ebuild
 2202140410 ./sci-libs/libsc/libsc-2.8.3.ebuild
@@ -25864,7 +25818,7 @@
 2111190309 ./sci-mathematics/singular/singular-4.2.0_p1.ebuild
 2111220639 ./sci-mathematics/singular/singular-4.2.1.ebuild
 2202071339 ./sci-mathematics/singular/singular-4.2.1_p3-r1.ebuild
-2204220411 ./sci-mathematics/singular/singular-4.3.0.ebuild
+2205271540 ./sci-mathematics/singular/singular-4.3.0_p1.ebuild
 2112031039 ./sci-mathematics/slepc/slepc-3.16.0.ebuild
 2205260440 ./sci-mathematics/slepc/slepc-3.17.1.ebuild
 2201161210 ./sci-mathematics/spin/spin-6.5.2-r1.ebuild
@@ -27019,8 +26973,8 @@
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-2.20220106-r2.ebuild
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-2.20220106-r3.ebuild
 2204120512 ./sec-policy/selinux-secadm/selinux-secadm-9999.ebuild
-2203020009 ./sys-apps/accountsservice/accountsservice-22.08.8.ebuild
 2203091910 ./sys-apps/accountsservice/accountsservice-22.07.5.ebuild
+2205280910 ./sys-apps/accountsservice/accountsservice-22.08.8.ebuild
 2101061839 ./sys-apps/ack/ack-3.4.0.ebuild
 2110161809 ./sys-apps/ack/ack-3.5.0.ebuild
 2204290540 ./sys-apps/acl/acl-2.3.1.ebuild
@@ -27039,16 +26993,13 @@
 2205080540 ./sys-apps/attr/attr-9999.ebuild
 2003241639 ./sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
 2203081540 ./sys-apps/baobab/baobab-41.0.ebuild
-2205150640 ./sys-apps/baobab/baobab-42.0.ebuild
+2205280910 ./sys-apps/baobab/baobab-42.0.ebuild
 1712021939 ./sys-apps/bar/bar-1.11.1.ebuild
 2205020010 ./sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
 2204071839 ./sys-apps/baselayout-prefix/baselayout-prefix-2.6-r3.ebuild
-2201041339 ./sys-apps/baselayout/baselayout-2.7-r1.ebuild
-2201041339 ./sys-apps/baselayout/baselayout-2.7-r2.ebuild
 2201041339 ./sys-apps/baselayout/baselayout-2.7-r3.ebuild
-2201041339 ./sys-apps/baselayout/baselayout-2.7.ebuild
 2201041339 ./sys-apps/baselayout/baselayout-9999.ebuild
-2204290540 ./sys-apps/baselayout/baselayout-2.8.ebuild
+2205290010 ./sys-apps/baselayout/baselayout-2.8.ebuild
 2204241310 ./sys-apps/bat/bat-0.20.0.ebuild
 2205261610 ./sys-apps/bat/bat-0.21.0.ebuild
 2101111109 ./sys-apps/biosdevname/biosdevname-0.7.3.ebuild
@@ -27056,8 +27007,8 @@
 2205231510 ./sys-apps/bleachbit/bleachbit-4.4.2.ebuild
 2108180339 ./sys-apps/bolt/bolt-0.9.1.ebuild
 2111060743 ./sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
-2204220239 ./sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
 2205260710 ./sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
+2205280910 ./sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
 2201012339 ./sys-apps/busybox/busybox-1.32.1-r1.ebuild
 2201012339 ./sys-apps/busybox/busybox-1.33.1-r2.ebuild
 2201012339 ./sys-apps/busybox/busybox-1.33.1.ebuild
@@ -27109,7 +27060,7 @@
 2205051310 ./sys-apps/dmidecode/dmidecode-3.3.ebuild
 1805272138 ./sys-apps/dnotify/dnotify-0.18.0.ebuild
 2204150910 ./sys-apps/dog/dog-1.7-r6.ebuild
-2101310343 ./sys-apps/dstat/dstat-0.7.4-r2.ebuild
+2205310610 ./sys-apps/dstat/dstat-0.7.4-r2.ebuild
 2104161439 ./sys-apps/dtc/dtc-1.5.0-r2.ebuild
 2104161439 ./sys-apps/dtc/dtc-1.5.0.ebuild
 2104161439 ./sys-apps/dtc/dtc-9999.ebuild
@@ -27146,6 +27097,7 @@
 2204130212 ./sys-apps/fakeroot/fakeroot-1.26-r1.ebuild
 2204130212 ./sys-apps/fakeroot/fakeroot-1.27.ebuild
 2205060310 ./sys-apps/fakeroot/fakeroot-1.28.ebuild
+2205310810 ./sys-apps/fakeroot/fakeroot-1.29.ebuild
 2105212209 ./sys-apps/fbset/fbset-2.1.ebuild
 2111100239 ./sys-apps/fd/fd-8.2.1.ebuild
 2201071109 ./sys-apps/fd/fd-8.3.1.ebuild
@@ -27170,18 +27122,19 @@
 2201260540 ./sys-apps/fwupd-efi/fwupd-efi-1.2.ebuild
 2204151310 ./sys-apps/fwupd-efi/fwupd-efi-1.3.ebuild
 2202281340 ./sys-apps/fwupd/fwupd-1.7.5.ebuild
-2204240040 ./sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
 2205020512 ./sys-apps/fwupd/fwupd-1.8.0-r1.ebuild
+2205271640 ./sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
+2205271710 ./sys-apps/fwupd/fwupd-1.8.1.ebuild
 2205191440 ./sys-apps/fxload/fxload-20081013-r1.ebuild
-2204290540 ./sys-apps/gawk/gawk-5.1.1-r2.ebuild
+2205300610 ./sys-apps/gawk/gawk-5.1.1-r2.ebuild
 2201221539 ./sys-apps/gcp/gcp-0.2.1.ebuild
 2105152239 ./sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
 2101061839 ./sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
 2204290540 ./sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
-2205210110 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
-2205210110 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+2205292340 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+2205292340 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
 2203081540 ./sys-apps/gnome-disk-utility/gnome-disk-utility-41.0.ebuild
-2203240609 ./sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
+2205280910 ./sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
 2110011439 ./sys-apps/gpet/gpet-0.4-r1.ebuild
 2204162210 ./sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
 2205191140 ./sys-apps/gptfdisk/gptfdisk-1.0.9-r1.ebuild
@@ -27251,9 +27204,11 @@
 2201101240 ./sys-apps/ipmiutil/ipmiutil-3.1.7.ebuild
 2205061110 ./sys-apps/ipmiutil/ipmiutil-3.1.8.ebuild
 2112260040 ./sys-apps/iproute2/iproute2-5.15.0.ebuild
-2202180610 ./sys-apps/iproute2/iproute2-9999.ebuild
 2204291110 ./sys-apps/iproute2/iproute2-5.17.0.ebuild
+2205280640 ./sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
+2205280640 ./sys-apps/iproute2/iproute2-9999.ebuild
 2205051110 ./sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
+2205280940 ./sys-apps/irqbalance/irqbalance-1.9.0.ebuild
 2010300209 ./sys-apps/isapnptools/isapnptools-1.27.ebuild
 2006291439 ./sys-apps/iucode_tool/iucode_tool-2.3.1-r1.ebuild
 2109030510 ./sys-apps/kbd/kbd-9999.ebuild
@@ -27348,7 +27303,7 @@
 2107250209 ./sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
 2112310439 ./sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
 2205060310 ./sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
-2205171210 ./sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
+2205310610 ./sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
 2104192239 ./sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
 2203260310 ./sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
 2203260310 ./sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
@@ -27452,19 +27407,20 @@
 2201151240 ./sys-apps/systemd-readahead/systemd-readahead-216.ebuild
 2201131040 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.7.ebuild
 2201190139 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.9.ebuild
-2204170240 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
+2205301040 ./sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
 2204300340 ./sys-apps/systemd/systemd-250.4-r2.ebuild
 2205210110 ./sys-apps/systemd/systemd-250.5-r1.ebuild
-2205232140 ./sys-apps/systemd/systemd-251.ebuild
-2205250210 ./sys-apps/systemd/systemd-251.1.ebuild
-2205250210 ./sys-apps/systemd/systemd-9999.ebuild
+2205301040 ./sys-apps/systemd/systemd-250.6.ebuild
+2205302310 ./sys-apps/systemd/systemd-251.1.ebuild
+2205301640 ./sys-apps/systemd/systemd-251.ebuild
+2205301640 ./sys-apps/systemd/systemd-9999.ebuild
 2201040640 ./sys-apps/sysvinit/sysvinit-2.99-r1.ebuild
 2204291110 ./sys-apps/sysvinit/sysvinit-3.03.ebuild
 2204270710 ./sys-apps/sysvinit/sysvinit-3.04.ebuild
 2205040710 ./sys-apps/sysvinit/sysvinit-3.01.ebuild
 2202100210 ./sys-apps/tas/tas-1.6.0.200601-r1.ebuild
 2205131540 ./sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
-2204291110 ./sys-apps/texinfo/texinfo-6.8.ebuild
+2205300610 ./sys-apps/texinfo/texinfo-6.8.ebuild
 2104111709 ./sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
 2107040609 ./sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
 1912312209 ./sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
@@ -27488,7 +27444,7 @@
 2203230339 ./sys-apps/usbguard/usbguard-1.1.1-r1.ebuild
 2002112051 ./sys-apps/usbmon/usbmon-6.1.ebuild
 2202260109 ./sys-apps/usbredir/usbredir-0.12.0.ebuild
-2205260840 ./sys-apps/usbutils/usbutils-014-r1.ebuild
+2205300610 ./sys-apps/usbutils/usbutils-014-r1.ebuild
 2101131239 ./sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
 2205061210 ./sys-apps/utempter/utempter-0.5.5.6-r1.ebuild
 2203170540 ./sys-apps/util-linux/util-linux-2.37.4.ebuild
@@ -27503,7 +27459,7 @@
 2108241539 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
 2205260710 ./sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.14.0.ebuild
 2201260040 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.12.1.ebuild
-2205251440 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
+2205282340 ./sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
 2205141040 ./sys-apps/xinetd/xinetd-2.3.15.4.ebuild
 2012231444 ./sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
 2112052239 ./sys-apps/yarn/yarn-1.22.17.ebuild
@@ -27519,6 +27475,7 @@
 2204041539 ./sys-apps/uutils/uutils-0.0.13.ebuild
 2204291110 ./sys-apps/systemd-utils/systemd-utils-250.4-r3.ebuild
 2204302210 ./sys-apps/systemd-utils/systemd-utils-250.5.ebuild
+2205310240 ./sys-apps/systemd-utils/systemd-utils-250.6.ebuild
 2205260710 ./sys-apps/xdg-desktop-portal-gnome/xdg-desktop-portal-gnome-42.1.ebuild
 2202121739 ./sys-auth/AusweisApp2/AusweisApp2-9999.ebuild
 2205150340 ./sys-auth/AusweisApp2/AusweisApp2-1.22.5.ebuild
@@ -27623,8 +27580,8 @@
 2009162339 ./sys-block/fwdl/fwdl-1.2.3.ebuild
 2012311940 ./sys-block/gpart/gpart-0.3.ebuild
 2204220239 ./sys-block/gparted/gparted-1.3.1.ebuild
-2204220239 ./sys-block/gparted/gparted-1.4.0.ebuild
 2205190010 ./sys-block/gparted/gparted-1.4.0-r1.ebuild
+2205280810 ./sys-block/gparted/gparted-1.4.0.ebuild
 1702282250 ./sys-block/hdrecover/hdrecover-0.5.ebuild
 1712020139 ./sys-block/hpacucli/hpacucli-9.40.12.0.ebuild
 1702282250 ./sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
@@ -27725,7 +27682,7 @@
 2205191140 ./sys-boot/efibootmgr/efibootmgr-17.ebuild
 2205140410 ./sys-boot/elilo/elilo-3.16-r5.ebuild
 2006240339 ./sys-boot/gnu-efi/gnu-efi-3.0.12.ebuild
-2202090910 ./sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
+2205310010 ./sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
 2112150809 ./sys-boot/grub/grub-2.06-r1.ebuild
 2112150809 ./sys-boot/grub/grub-9999.ebuild
 2204222110 ./sys-boot/lilo/lilo-24.2-r1.ebuild
@@ -27738,9 +27695,10 @@
 2202100210 ./sys-boot/netboot/netboot-0.10.2-r3.ebuild
 1910191339 ./sys-boot/nettrom/nettrom-2.3.3.ebuild
 2110081440 ./sys-boot/os-prober/os-prober-1.78-r1.ebuild
-2110081440 ./sys-boot/os-prober/os-prober-9999.ebuild
 2112221540 ./sys-boot/os-prober/os-prober-1.79-r1.ebuild
 2204150940 ./sys-boot/os-prober/os-prober-1.79-r2.ebuild
+2205271940 ./sys-boot/os-prober/os-prober-1.80.ebuild
+2205271940 ./sys-boot/os-prober/os-prober-9999.ebuild
 2201220640 ./sys-boot/palo/palo-9999.ebuild
 2203200310 ./sys-boot/palo/palo-2.14.ebuild
 2204240140 ./sys-boot/palo/palo-2.16.ebuild
@@ -27759,7 +27717,8 @@
 1808152009 ./sys-boot/shim/shim-15.5-r1.ebuild
 2012261239 ./sys-boot/silo/silo-1.4.14_p20200602.ebuild
 2107160709 ./sys-boot/syslinux/syslinux-6.04_pre1-r2.ebuild
-2111190009 ./sys-boot/systemd-boot/systemd-boot-249.6.ebuild
+2205310510 ./sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
+2205310510 ./sys-boot/syslinux/syslinux-6.04_pre3.ebuild
 2201151940 ./sys-boot/systemd-boot/systemd-boot-249.9.ebuild
 2204171140 ./sys-boot/systemd-boot/systemd-boot-250-r1.ebuild
 2203220309 ./sys-boot/tboot/tboot-1.10.5.ebuild
@@ -27828,16 +27787,25 @@
 2204010810 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.5.ebuild
 2205131940 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.0.ebuild
 2205252010 ./sys-cluster/kube-apiserver/kube-apiserver-1.21.13.ebuild
+2205300040 ./sys-cluster/kube-apiserver/kube-apiserver-1.22.10.ebuild
+2205292210 ./sys-cluster/kube-apiserver/kube-apiserver-1.23.7.ebuild
+2205292110 ./sys-cluster/kube-apiserver/kube-apiserver-1.24.1.ebuild
 2204010810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.21.11.ebuild
 2204010810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.8.ebuild
 2204010810 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.5.ebuild
 2205131940 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.0.ebuild
 2205252010 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.21.13.ebuild
+2205300040 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.22.10.ebuild
+2205292210 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.23.7.ebuild
+2205292110 ./sys-cluster/kube-controller-manager/kube-controller-manager-1.24.1.ebuild
 2204010810 ./sys-cluster/kube-proxy/kube-proxy-1.21.11.ebuild
 2204010810 ./sys-cluster/kube-proxy/kube-proxy-1.22.8.ebuild
 2204010810 ./sys-cluster/kube-proxy/kube-proxy-1.23.5.ebuild
 2205131940 ./sys-cluster/kube-proxy/kube-proxy-1.24.0.ebuild
 2205252010 ./sys-cluster/kube-proxy/kube-proxy-1.21.13.ebuild
+2205300040 ./sys-cluster/kube-proxy/kube-proxy-1.22.10.ebuild
+2205292210 ./sys-cluster/kube-proxy/kube-proxy-1.23.7.ebuild
+2205292110 ./sys-cluster/kube-proxy/kube-proxy-1.24.1.ebuild
 2101091409 ./sys-cluster/kube-router/kube-router-1.1.1.ebuild
 2104302109 ./sys-cluster/kube-router/kube-router-1.2.2.ebuild
 2204010810 ./sys-cluster/kube-scheduler/kube-scheduler-1.21.11.ebuild
@@ -27845,21 +27813,33 @@
 2204010810 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.5.ebuild
 2205131940 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.0.ebuild
 2205252010 ./sys-cluster/kube-scheduler/kube-scheduler-1.21.13.ebuild
+2205300040 ./sys-cluster/kube-scheduler/kube-scheduler-1.22.10.ebuild
+2205292210 ./sys-cluster/kube-scheduler/kube-scheduler-1.23.7.ebuild
+2205292110 ./sys-cluster/kube-scheduler/kube-scheduler-1.24.1.ebuild
 2204010810 ./sys-cluster/kubeadm/kubeadm-1.21.11.ebuild
 2204010810 ./sys-cluster/kubeadm/kubeadm-1.22.8.ebuild
 2204010810 ./sys-cluster/kubeadm/kubeadm-1.23.5.ebuild
 2205131940 ./sys-cluster/kubeadm/kubeadm-1.24.0.ebuild
 2205252010 ./sys-cluster/kubeadm/kubeadm-1.21.13.ebuild
+2205300040 ./sys-cluster/kubeadm/kubeadm-1.22.10.ebuild
+2205292210 ./sys-cluster/kubeadm/kubeadm-1.23.7.ebuild
+2205292110 ./sys-cluster/kubeadm/kubeadm-1.24.1.ebuild
 2204010810 ./sys-cluster/kubectl/kubectl-1.21.11.ebuild
 2204010810 ./sys-cluster/kubectl/kubectl-1.22.8.ebuild
 2204010810 ./sys-cluster/kubectl/kubectl-1.23.5.ebuild
 2205131940 ./sys-cluster/kubectl/kubectl-1.24.0.ebuild
 2205252010 ./sys-cluster/kubectl/kubectl-1.21.13.ebuild
+2205300040 ./sys-cluster/kubectl/kubectl-1.22.10.ebuild
+2205292210 ./sys-cluster/kubectl/kubectl-1.23.7.ebuild
+2205292110 ./sys-cluster/kubectl/kubectl-1.24.1.ebuild
 2204010810 ./sys-cluster/kubelet/kubelet-1.21.11.ebuild
 2204010810 ./sys-cluster/kubelet/kubelet-1.22.8.ebuild
 2204010810 ./sys-cluster/kubelet/kubelet-1.23.5.ebuild
 2205131940 ./sys-cluster/kubelet/kubelet-1.24.0.ebuild
 2205252010 ./sys-cluster/kubelet/kubelet-1.21.13.ebuild
+2205300040 ./sys-cluster/kubelet/kubelet-1.22.10.ebuild
+2205292210 ./sys-cluster/kubelet/kubelet-1.23.7.ebuild
+2205292110 ./sys-cluster/kubelet/kubelet-1.24.1.ebuild
 2205160640 ./sys-cluster/kubeletctl/kubeletctl-1.6.ebuild
 2112260710 ./sys-cluster/legion/legion-21.09.0-r1.ebuild
 2112260710 ./sys-cluster/legion/legion-9999.ebuild
@@ -27943,7 +27923,7 @@
 2201012339 ./sys-devel/binutils-hppa64/binutils-hppa64-2.36.1-r2.ebuild
 2203181010 ./sys-devel/binutils-hppa64/binutils-hppa64-2.37_p1-r2.ebuild
 2203191310 ./sys-devel/binutils-hppa64/binutils-hppa64-2.38-r1.ebuild
-2205260910 ./sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
+2205300940 ./sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
 2201062240 ./sys-devel/binutils/binutils-2.32-r2.ebuild
 2201062240 ./sys-devel/binutils/binutils-2.33.1-r1.ebuild
 2201062240 ./sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -27951,28 +27931,30 @@
 2201062240 ./sys-devel/binutils/binutils-2.36.1-r2.ebuild
 2203181010 ./sys-devel/binutils/binutils-2.37_p1-r2.ebuild
 2203191310 ./sys-devel/binutils/binutils-2.38-r1.ebuild
-2204290540 ./sys-devel/binutils/binutils-2.38-r2.ebuild
-2205260910 ./sys-devel/binutils/binutils-9999.ebuild
+2205300940 ./sys-devel/binutils/binutils-2.38-r2.ebuild
+2205300940 ./sys-devel/binutils/binutils-9999.ebuild
 2105221839 ./sys-devel/bison/bison-3.7.6.ebuild
 2204290540 ./sys-devel/bison/bison-3.8.2.ebuild
-2204280040 ./sys-devel/bmake/bmake-20220418.ebuild
-2205202210 ./sys-devel/bmake/bmake-20220330.ebuild
+2205281910 ./sys-devel/bmake/bmake-20220418.ebuild
 2104060140 ./sys-devel/boost-m4/boost-m4-0.4_p20160328.ebuild
 2109110940 ./sys-devel/clang-common/clang-common-12.0.1.ebuild
 2204150310 ./sys-devel/clang-common/clang-common-14.0.1.ebuild
 2204212010 ./sys-devel/clang-common/clang-common-13.0.1.ebuild
 2204301640 ./sys-devel/clang-common/clang-common-14.0.3.ebuild
 2204301640 ./sys-devel/clang-common/clang-common-15.0.0.9999.ebuild
+2205292310 ./sys-devel/clang-common/clang-common-14.0.4.ebuild
 2109110940 ./sys-devel/clang-runtime/clang-runtime-12.0.1.ebuild
 2204150310 ./sys-devel/clang-runtime/clang-runtime-14.0.1.ebuild
 2204212010 ./sys-devel/clang-runtime/clang-runtime-13.0.1.ebuild
 2204271540 ./sys-devel/clang-runtime/clang-runtime-15.0.0.9999.ebuild
 2204301040 ./sys-devel/clang-runtime/clang-runtime-14.0.3.ebuild
+2205292310 ./sys-devel/clang-runtime/clang-runtime-14.0.4.ebuild
 2201040640 ./sys-devel/clang/clang-12.0.1.ebuild
 2204171910 ./sys-devel/clang/clang-14.0.1-r1.ebuild
 2204212010 ./sys-devel/clang/clang-13.0.1.ebuild
 2204271540 ./sys-devel/clang/clang-15.0.0.9999.ebuild
 2204301240 ./sys-devel/clang/clang-14.0.3.ebuild
+2205292310 ./sys-devel/clang/clang-14.0.4.ebuild
 2204141010 ./sys-devel/cons/cons-2.3.0-r1.ebuild
 2202010909 ./sys-devel/crossdev/crossdev-20211121.ebuild
 2203262340 ./sys-devel/crossdev/crossdev-20220205.ebuild
@@ -27994,21 +27976,18 @@
 2111210240 ./sys-devel/gcc/gcc-10.3.0-r2.ebuild
 2111211739 ./sys-devel/gcc/gcc-9.4.0.ebuild
 2112020409 ./sys-devel/gcc/gcc-11.2.0.ebuild
-2203181010 ./sys-devel/gcc/gcc-11.2.1_p20220115.ebuild
 2204011010 ./sys-devel/gcc/gcc-10.3.1_p20211126.ebuild
-2204212339 ./sys-devel/gcc/gcc-11.3.0.ebuild
-2205230210 ./sys-devel/gcc/gcc-10.3.1_p20220519.ebuild
 2205230210 ./sys-devel/gcc/gcc-10.4.9999.ebuild
-2205222210 ./sys-devel/gcc/gcc-11.4.9999.ebuild
-2205222210 ./sys-devel/gcc/gcc-12.1.0.ebuild
-2205222210 ./sys-devel/gcc/gcc-12.1.1_p20220514.ebuild
-2205222210 ./sys-devel/gcc/gcc-12.1.1_p20220521.ebuild
-2205222210 ./sys-devel/gcc/gcc-12.2.9999.ebuild
-2205222210 ./sys-devel/gcc/gcc-9.4.1_p20220317.ebuild
-2205230210 ./sys-devel/gcc/gcc-9.4.1_p20220520.ebuild
-2205222210 ./sys-devel/gcc/gcc-9.5.9999.ebuild
 2205250340 ./sys-devel/gcc/gcc-13.0.9999.ebuild
-2205270640 ./sys-devel/gcc/gcc-11.3.1_p20220520.ebuild
+2205280710 ./sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
+2205301040 ./sys-devel/gcc/gcc-11.2.1_p20220115.ebuild
+2205301040 ./sys-devel/gcc/gcc-11.3.0.ebuild
+2205301040 ./sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
+2205301040 ./sys-devel/gcc/gcc-11.4.9999.ebuild
+2205301040 ./sys-devel/gcc/gcc-12.1.0.ebuild
+2205301040 ./sys-devel/gcc/gcc-12.1.1_p20220528.ebuild
+2205301040 ./sys-devel/gcc/gcc-12.2.9999.ebuild
+2205280710 ./sys-devel/gcc/gcc-9.5.0.ebuild
 2104161439 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2205260910 ./sys-devel/gdb/gdb-11.2.ebuild
 2205260910 ./sys-devel/gdb/gdb-12.1.ebuild
@@ -28032,11 +28011,13 @@
 2204212010 ./sys-devel/lld/lld-13.0.1.ebuild
 2204271540 ./sys-devel/lld/lld-15.0.0.9999.ebuild
 2204301040 ./sys-devel/lld/lld-14.0.3.ebuild
+2205292310 ./sys-devel/lld/lld-14.0.4.ebuild
 2109110940 ./sys-devel/llvm-common/llvm-common-12.0.1.ebuild
 2204150310 ./sys-devel/llvm-common/llvm-common-14.0.1.ebuild
 2204212010 ./sys-devel/llvm-common/llvm-common-13.0.1.ebuild
 2204271540 ./sys-devel/llvm-common/llvm-common-15.0.0.9999.ebuild
 2204301040 ./sys-devel/llvm-common/llvm-common-14.0.3.ebuild
+2205292310 ./sys-devel/llvm-common/llvm-common-14.0.4.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.10.0.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.7.0-r1.ebuild
 2109202139 ./sys-devel/llvm-roc/llvm-roc-3.8.0.ebuild
@@ -28055,6 +28036,7 @@
 2204271540 ./sys-devel/llvm/llvm-15.0.0.9999.ebuild
 2205251740 ./sys-devel/llvm/llvm-13.0.1.ebuild
 2205251740 ./sys-devel/llvm/llvm-14.0.3.ebuild
+2205292310 ./sys-devel/llvm/llvm-14.0.4.ebuild
 2109110910 ./sys-devel/llvmgold/llvmgold-12.ebuild
 2202030039 ./sys-devel/llvmgold/llvmgold-13-r1.ebuild
 2204271540 ./sys-devel/llvmgold/llvmgold-14.ebuild
@@ -28160,6 +28142,7 @@
 2204072009 ./sys-fs/bcache-tools/bcache-tools-1.1-r1.ebuild
 2107090340 ./sys-fs/bees/bees-0.6.5-r1.ebuild
 2107090340 ./sys-fs/bees/bees-9999.ebuild
+2205301111 ./sys-fs/bees/bees-0.7.ebuild
 2102032339 ./sys-fs/bindfs/bindfs-1.14.9.ebuild
 2102162039 ./sys-fs/bindfs/bindfs-1.15.0.ebuild
 2102180539 ./sys-fs/bindfs/bindfs-1.15.1.ebuild
@@ -28215,6 +28198,7 @@
 2204050709 ./sys-fs/extundelete/extundelete-0.2.4-r1.ebuild
 2204072009 ./sys-fs/extundelete/extundelete-0.2.4-r2.ebuild
 2205191140 ./sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
+2205301840 ./sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
 2202012339 ./sys-fs/fatcat/fatcat-1.1.1.ebuild
 2009041109 ./sys-fs/fatresize/fatresize-1.1.0.ebuild
 2203200310 ./sys-fs/fatsort/fatsort-1.6.3.622.ebuild
@@ -28286,7 +28270,7 @@
 2205252010 ./sys-fs/ncdu/ncdu-1.16-r1.ebuild
 2110281709 ./sys-fs/nilfs-utils/nilfs-utils-2.2.2-r1.ebuild
 2202130410 ./sys-fs/nilfs-utils/nilfs-utils-2.2.8.ebuild
-2205260840 ./sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild
+2205272240 ./sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild
 2204110140 ./sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8.ebuild
 2204290210 ./sys-fs/quota/quota-4.06-r1.ebuild
 2107272339 ./sys-fs/quotatool/quotatool-1.6.2.ebuild
@@ -28318,7 +28302,7 @@
 2112081940 ./sys-fs/udev/udev-249.6-r2.ebuild
 2112081940 ./sys-fs/udev/udev-9999.ebuild
 2201151940 ./sys-fs/udev/udev-249.9.ebuild
-2204170240 ./sys-fs/udev/udev-250.ebuild
+2205301040 ./sys-fs/udev/udev-250.ebuild
 2109280109 ./sys-fs/udftools/udftools-2.3.ebuild
 2201031309 ./sys-fs/udiskie/udiskie-2.4.0.ebuild
 2202042339 ./sys-fs/udiskie/udiskie-2.4.1.ebuild
@@ -28361,7 +28345,8 @@
 2104281639 ./sys-kernel/dracut-crypt-ssh/dracut-crypt-ssh-1.0.7.ebuild
 2106171809 ./sys-kernel/dracut/dracut-053-r1.ebuild
 2205051310 ./sys-kernel/dracut/dracut-055-r4.ebuild
-2205051310 ./sys-kernel/dracut/dracut-9999.ebuild
+2205290511 ./sys-kernel/dracut/dracut-056.ebuild
+2205280110 ./sys-kernel/dracut/dracut-9999.ebuild
 2112100340 ./sys-kernel/genkernel/genkernel-4.0.10.ebuild
 2204200239 ./sys-kernel/genkernel/genkernel-4.2.5.ebuild
 2204200239 ./sys-kernel/genkernel/genkernel-4.2.6-r2.ebuild
@@ -28375,6 +28360,9 @@
 2205252240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.43.ebuild
 2205252240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.11.ebuild
 2205252240 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.196.ebuild
+2205310010 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.119.ebuild
+2205310010 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.44.ebuild
+2205310010 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.12.ebuild
 2205181810 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.9.ebuild
 2205220940 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.117.ebuild
 2205220340 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.41.ebuild
@@ -28383,17 +28371,12 @@
 2205252240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.43.ebuild
 2205252240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.11.ebuild
 2205252240 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.196.ebuild
-2204081709 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.110.ebuild
+2205310010 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild
+2205310010 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44.ebuild
+2205310010 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12.ebuild
 2204261740 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.32-r1.ebuild
-2205091510 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.6.ebuild
-2205121540 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.7.ebuild
-2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.279.ebuild
 2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.243.ebuild
-2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.314.ebuild
-2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.116.ebuild
-2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.40.ebuild
 2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.8.ebuild
-2205160210 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.194.ebuild
 2205181340 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.9.ebuild
 2205212110 ./sys-kernel/gentoo-sources/gentoo-sources-4.14.280.ebuild
 2205212110 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.244.ebuild
@@ -28409,6 +28392,11 @@
 2205251640 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.43.ebuild
 2205251640 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.11.ebuild
 2205251610 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.196.ebuild
+2205301810 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.119.ebuild
+2205301810 ./sys-kernel/gentoo-sources/gentoo-sources-5.15.44.ebuild
+2205301810 ./sys-kernel/gentoo-sources/gentoo-sources-5.17.12.ebuild
+2205310110 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.1-r1.ebuild
+2205301810 ./sys-kernel/gentoo-sources/gentoo-sources-5.18.1.ebuild
 2204040209 ./sys-kernel/git-sources/git-sources-5.18_rc1.ebuild
 2204111010 ./sys-kernel/git-sources/git-sources-5.18_rc2.ebuild
 2204180110 ./sys-kernel/git-sources/git-sources-5.18_rc3.ebuild
@@ -28479,18 +28467,22 @@
 2205252240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.43.ebuild
 2205252240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.17.11.ebuild
 2205252240 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.196.ebuild
-2205231010 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.0.ebuild
+2205310010 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild
+2205310010 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.15.44.ebuild
+2205310010 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.17.12.ebuild
 2205251440 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.281.ebuild
 2205251440 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.245.ebuild
 2205251440 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.316.ebuild
-2205251440 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.118.ebuild
-2205251610 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.43.ebuild
-2205251640 ./sys-kernel/vanilla-sources/vanilla-sources-5.17.11.ebuild
 2205251440 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.196.ebuild
+2205301310 ./sys-kernel/vanilla-sources/vanilla-sources-5.10.119.ebuild
+2205301310 ./sys-kernel/vanilla-sources/vanilla-sources-5.15.44.ebuild
+2205301310 ./sys-kernel/vanilla-sources/vanilla-sources-5.17.12.ebuild
+2205301310 ./sys-kernel/vanilla-sources/vanilla-sources-5.18.1.ebuild
 2201310039 ./sys-kernel/zen-sources/zen-sources-5.15.10.ebuild
 2203301840 ./sys-kernel/zen-sources/zen-sources-5.17.1.ebuild
 2101091409 ./sys-libs/argp-standalone/argp-standalone-1.3-r2.ebuild
 2111232039 ./sys-libs/argp-standalone/argp-standalone-1.4.1-r1.ebuild
+2205302010 ./sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
 2201062240 ./sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
 2201062240 ./sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
 2201062240 ./sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
@@ -28503,11 +28495,13 @@
 2204212309 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.1.ebuild
 2204301040 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.3.ebuild
 2205060010 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild
+2205292310 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
 2109110940 ./sys-libs/compiler-rt/compiler-rt-12.0.1.ebuild
 2204212010 ./sys-libs/compiler-rt/compiler-rt-13.0.1.ebuild
 2204212309 ./sys-libs/compiler-rt/compiler-rt-14.0.1.ebuild
 2204301040 ./sys-libs/compiler-rt/compiler-rt-14.0.3.ebuild
 2205060010 ./sys-libs/compiler-rt/compiler-rt-15.0.0.9999.ebuild
+2205292310 ./sys-libs/compiler-rt/compiler-rt-14.0.4.ebuild
 2205050610 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 2112131739 ./sys-libs/csu/csu-85-r1.ebuild
 2111271610 ./sys-libs/cygwin-crypt/cygwin-crypt-1.4-r1.ebuild
@@ -28565,11 +28559,13 @@
 2204212309 ./sys-libs/libcxx/libcxx-14.0.1.ebuild
 2204271540 ./sys-libs/libcxx/libcxx-15.0.0.9999.ebuild
 2204301040 ./sys-libs/libcxx/libcxx-14.0.3.ebuild
+2205292310 ./sys-libs/libcxx/libcxx-14.0.4.ebuild
 2201040239 ./sys-libs/libcxxabi/libcxxabi-12.0.1.ebuild
 2204150310 ./sys-libs/libcxxabi/libcxxabi-14.0.1.ebuild
 2204212010 ./sys-libs/libcxxabi/libcxxabi-13.0.1.ebuild
 2204271540 ./sys-libs/libcxxabi/libcxxabi-15.0.0.9999.ebuild
 2204301040 ./sys-libs/libcxxabi/libcxxabi-14.0.3.ebuild
+2205292310 ./sys-libs/libcxxabi/libcxxabi-14.0.4.ebuild
 2111210639 ./sys-libs/libfaketime/libfaketime-0.9.6-r4.ebuild
 2205191240 ./sys-libs/libfaketime/libfaketime-0.9.9.ebuild
 2205071040 ./sys-libs/libhugetlbfs/libhugetlbfs-2.23.ebuild
@@ -28582,6 +28578,7 @@
 2204212010 ./sys-libs/libomp/libomp-13.0.1.ebuild
 2204271540 ./sys-libs/libomp/libomp-15.0.0.9999.ebuild
 2204301040 ./sys-libs/libomp/libomp-14.0.3.ebuild
+2205292310 ./sys-libs/libomp/libomp-14.0.4.ebuild
 2203081540 ./sys-libs/libosinfo/libosinfo-1.10.0.ebuild
 2205190840 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 2111150410 ./sys-libs/librtas/librtas-2.0.2-r2.ebuild
@@ -28622,6 +28619,7 @@
 2204260710 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.1.ebuild
 2204271540 ./sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild
 2204301040 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.3.ebuild
+2205292310 ./sys-libs/llvm-libunwind/llvm-libunwind-14.0.4.ebuild
 2107081310 ./sys-libs/lwp/lwp-2.8.ebuild
 2205081040 ./sys-libs/mtdev/mtdev-1.1.6.ebuild
 2201012339 ./sys-libs/musl-nscd/musl-nscd-1.0.3-r1.ebuild
@@ -28698,9 +28696,7 @@
 2104252209 ./sys-power/acpitool/acpitool-0.5.1-r2.ebuild
 2201041339 ./sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
 2012281809 ./sys-power/athcool/athcool-0.3.12.ebuild
-2109050040 ./sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
-2107081610 ./sys-power/bbswitch/bbswitch-9999.ebuild
-2205222340 ./sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
+2205280040 ./sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
 2107021539 ./sys-power/cpupower/cpupower-5.4.ebuild
 2201110210 ./sys-power/cpupower/cpupower-5.12.ebuild
 2203132209 ./sys-power/dptfxtract/dptfxtract-1.4.3-r1.ebuild
@@ -28731,6 +28727,7 @@
 2104272339 ./sys-power/uhubctl/uhubctl-2.4.0.ebuild
 2201041339 ./sys-power/upower/upower-0.99.12-r1.ebuild
 2205061140 ./sys-power/upower/upower-0.99.17.ebuild
+2205302110 ./sys-power/upower/upower-0.99.18.ebuild
 2204090610 ./sys-process/acct/acct-6.6.4-r3.ebuild
 2107210539 ./sys-process/anacron/anacron-2.3-r4.ebuild
 2109030510 ./sys-process/at/at-3.2.2-r2.ebuild
@@ -28795,8 +28792,8 @@
 2205051310 ./sys-process/numactl/numactl-9999.ebuild
 2109050109 ./sys-process/numad/numad-0.5-r3.ebuild
 2104060140 ./sys-process/numad/numad-9999.ebuild
-2204250610 ./sys-process/parallel/parallel-20220422.ebuild
 2205032140 ./sys-process/parallel/parallel-20220322.ebuild
+2205281940 ./sys-process/parallel/parallel-20220422.ebuild
 2204011010 ./sys-process/pkill-darwin/pkill-darwin-1.0.ebuild
 2003221439 ./sys-process/prll/prll-0.6.4.ebuild
 1908150239 ./sys-process/procenv/procenv-0.51.ebuild
@@ -28809,7 +28806,7 @@
 2205051110 ./sys-process/schedtool/schedtool-1.3.0-r1.ebuild
 2002112051 ./sys-process/supervise-scripts/supervise-scripts-4.0-r1.ebuild
 2201081710 ./sys-process/systemd-cron/systemd-cron-1.5.17.ebuild
-2205172240 ./sys-process/systemd-cron/systemd-cron-1.5.18.ebuild
+2205291810 ./sys-process/systemd-cron/systemd-cron-1.5.18.ebuild
 2205191340 ./sys-process/time/time-1.9.ebuild
 2202020510 ./sys-process/tini/tini-0.19.0-r1.ebuild
 2110231109 ./sys-process/tiptop/tiptop-2.3.1_p4.ebuild
@@ -28838,6 +28835,9 @@
 2205252240 ./virtual/dist-kernel/dist-kernel-5.15.43.ebuild
 2205252240 ./virtual/dist-kernel/dist-kernel-5.17.11.ebuild
 2205252240 ./virtual/dist-kernel/dist-kernel-5.4.196.ebuild
+2205310010 ./virtual/dist-kernel/dist-kernel-5.10.119.ebuild
+2205310010 ./virtual/dist-kernel/dist-kernel-5.15.44.ebuild
+2205310010 ./virtual/dist-kernel/dist-kernel-5.17.12.ebuild
 2106280039 ./virtual/dotnet-sdk/dotnet-sdk-5.0.ebuild
 2111220609 ./virtual/dotnet-sdk/dotnet-sdk-6.0.ebuild
 2202122309 ./virtual/dotnet-sdk/dotnet-sdk-3.1.ebuild
@@ -28880,7 +28880,7 @@
 2204290540 ./virtual/libiconv/libiconv-0-r2.ebuild
 2204290540 ./virtual/libintl/libintl-0-r2.ebuild
 2109072109 ./virtual/libudev/libudev-232-r5.ebuild
-2204291110 ./virtual/libudev/libudev-232-r7.ebuild
+2205301040 ./virtual/libudev/libudev-232-r7.ebuild
 2108102139 ./virtual/libusb/libusb-0-r2.ebuild
 2205041040 ./virtual/libusb/libusb-1-r2.ebuild
 2201100140 ./virtual/linux-sources/linux-sources-3-r6.ebuild
@@ -28975,7 +28975,7 @@
 2205250440 ./virtual/perl-Memoize/perl-Memoize-1.30.100_rc-r12.ebuild
 2204150910 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.105.200.ebuild
 2204290540 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.203.130.ebuild
-2205252240 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200.ebuild
+2205280440 ./virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200-r1.ebuild
 2205252240 ./virtual/perl-Module-Load-Conditional/perl-Module-Load-Conditional-0.740.0-r1.ebuild
 2205252240 ./virtual/perl-Module-Load/perl-Module-Load-0.360.0-r2.ebuild
 2205252240 ./virtual/perl-Module-Loaded/perl-Module-Loaded-0.80.0-r15.ebuild
@@ -29060,10 +29060,10 @@
 2205141340 ./virtual/tex-base/tex-base-0.ebuild
 2205141340 ./virtual/texi2dvi/texi2dvi-0-r2.ebuild
 2108241439 ./virtual/tmpfiles/tmpfiles-0-r1.ebuild
-2204291110 ./virtual/tmpfiles/tmpfiles-0-r3.ebuild
+2205301040 ./virtual/tmpfiles/tmpfiles-0-r3.ebuild
 2205010512 ./virtual/ttf-fonts/ttf-fonts-1-r1.ebuild
 2108150539 ./virtual/udev/udev-217-r3.ebuild
-2204291110 ./virtual/udev/udev-217-r5.ebuild
+2205301040 ./virtual/udev/udev-217-r5.ebuild
 2205090840 ./virtual/w3m/w3m-1.ebuild
 1912222309 ./virtual/wine/wine-0-r7.ebuild
 2204291110 ./virtual/yacc/yacc-0.ebuild
@@ -29146,7 +29146,7 @@
 2205031110 ./www-apps/drupal/drupal-9.2.18.ebuild
 2204212041 ./www-apps/element/element-1.10.10.ebuild
 2205062340 ./www-apps/element/element-1.10.11.ebuild
-2205061110 ./www-apps/gitea/gitea-1.16.7.ebuild
+2205300910 ./www-apps/gitea/gitea-1.16.7.ebuild
 2104191209 ./www-apps/gitit/gitit-0.13.0.0-r1.ebuild
 2205192140 ./www-apps/grafana-bin/grafana-bin-7.5.16.ebuild
 2205192140 ./www-apps/grafana-bin/grafana-bin-8.5.3.ebuild
@@ -29187,20 +29187,24 @@
 2106180139 ./www-apps/mythweb/mythweb-0.28.1-r1.ebuild
 2004032241 ./www-apps/nanoblogger/nanoblogger-3.5_rc1-r1.ebuild
 2203181010 ./www-apps/nanoc-checking/nanoc-checking-1.0.1.ebuild
-2204100840 ./www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
+2205290910 ./www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
 2107121009 ./www-apps/nanoc-cli/nanoc-cli-4.12.2.ebuild
 2203181010 ./www-apps/nanoc-cli/nanoc-cli-4.12.3.ebuild
 2204100840 ./www-apps/nanoc-cli/nanoc-cli-4.12.5.ebuild
+2205290910 ./www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
 1909291239 ./www-apps/nanoc-core/nanoc-core-4.11.12.ebuild
 2107121009 ./www-apps/nanoc-core/nanoc-core-4.12.2.ebuild
 2203181010 ./www-apps/nanoc-core/nanoc-core-4.12.3.ebuild
 2204100840 ./www-apps/nanoc-core/nanoc-core-4.12.5.ebuild
+2205290910 ./www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
 2203181010 ./www-apps/nanoc-deploying/nanoc-deploying-1.0.1.ebuild
-2203181010 ./www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
+2205290910 ./www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
+2205290910 ./www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
 1909291239 ./www-apps/nanoc/nanoc-4.11.12.ebuild
 2107111039 ./www-apps/nanoc/nanoc-4.12.2.ebuild
 2111141139 ./www-apps/nanoc/nanoc-4.12.3.ebuild
 2204100840 ./www-apps/nanoc/nanoc-4.12.5.ebuild
+2205290910 ./www-apps/nanoc/nanoc-4.12.6.ebuild
 2104131839 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.1.7.ebuild
 2106181339 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.0.ebuild
 2106251439 ./www-apps/nextcloud-notify_push/nextcloud-notify_push-0.2.1.ebuild
@@ -29250,9 +29254,11 @@
 2112290039 ./www-apps/icingaweb2-module-incubator/icingaweb2-module-incubator-0.11.0.ebuild
 2203191610 ./www-apps/sfpg/sfpg-4.9.0.ebuild
 2205071710 ./www-apps/miniflux/miniflux-2.0.36.ebuild
+2205282310 ./www-apps/miniflux/miniflux-2.0.37.ebuild
 2205151510 ./www-client/chromium/chromium-101.0.4951.64.ebuild
 2205271010 ./www-client/chromium/chromium-102.0.5005.61.ebuild
-2205261840 ./www-client/chromium/chromium-103.0.5060.24.ebuild
+2205292110 ./www-client/chromium/chromium-103.0.5060.24.ebuild
+2205301010 ./www-client/chromium/chromium-104.0.5083.0.ebuild
 2203260310 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2203260310 ./www-client/dillo/dillo-3.1_pre20181005.ebuild
 2203260310 ./www-client/dillo/dillo-9999.ebuild
@@ -29261,24 +29267,23 @@
 2203081540 ./www-client/epiphany/epiphany-41.3.ebuild
 2203260539 ./www-client/epiphany/epiphany-42.0.ebuild
 2204130410 ./www-client/epiphany/epiphany-42.1.ebuild
-2204230810 ./www-client/epiphany/epiphany-42.2.ebuild
+2205280910 ./www-client/epiphany/epiphany-42.2.ebuild
 2205132310 ./www-client/falkon/falkon-22.04.1.ebuild
 2205202210 ./www-client/falkon/falkon-3.2.0-r1.ebuild
 1703072117 ./www-client/fetch/fetch-1.0-r3.ebuild
 2104121139 ./www-client/fetch/fetch-1.0-r4.ebuild
 2205210940 ./www-client/firefox-bin/firefox-bin-100.0.2.ebuild
 2205210940 ./www-client/firefox-bin/firefox-bin-91.9.1.ebuild
-2205140410 ./www-client/firefox/firefox-100.0.ebuild
 2205140410 ./www-client/firefox/firefox-91.9.0.ebuild
-2205161610 ./www-client/firefox/firefox-100.0.1.ebuild
 2205211540 ./www-client/firefox/firefox-100.0.2.ebuild
 2205221240 ./www-client/firefox/firefox-91.9.1.ebuild
-2205191940 ./www-client/google-chrome-beta/google-chrome-beta-102.0.5005.61.ebuild
-2205261040 ./www-client/google-chrome-unstable/google-chrome-unstable-103.0.5060.24.ebuild
+2205281610 ./www-client/google-chrome-beta/google-chrome-beta-103.0.5060.24.ebuild
+2205281610 ./www-client/google-chrome-unstable/google-chrome-unstable-104.0.5083.0.ebuild
 2205242240 ./www-client/google-chrome/google-chrome-102.0.5005.61.ebuild
 2104302139 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 2110241209 ./www-client/jd/jd-2.8.9_p150226-r2.ebuild
 2205261010 ./www-client/links/links-2.26-r1.ebuild
+2205302240 ./www-client/links/links-2.27.ebuild
 2101180039 ./www-client/luakit/luakit-2.2.1-r100.ebuild
 2107200640 ./www-client/luakit/luakit-9999.ebuild
 2112272110 ./www-client/luakit/luakit-2.3.ebuild
@@ -29293,13 +29298,13 @@
 2205202140 ./www-client/microsoft-edge/microsoft-edge-101.0.1210.53.ebuild
 2107180040 ./www-client/netrik/netrik-1.16.1-r3.ebuild
 2203222209 ./www-client/netsurf/netsurf-3.10-r6.ebuild
-2205061310 ./www-client/opera-beta/opera-beta-87.0.4390.17.ebuild
 2205122041 ./www-client/opera-beta/opera-beta-87.0.4390.21.ebuild
 2205191940 ./www-client/opera-beta/opera-beta-88.0.4412.13.ebuild
+2205271640 ./www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
 2205111310 ./www-client/opera-developer/opera-developer-89.0.4415.0.ebuild
 2205181110 ./www-client/opera-developer/opera-developer-89.0.4422.0.ebuild
 2205242210 ./www-client/opera-developer/opera-developer-89.0.4428.0.ebuild
-2205181110 ./www-client/opera/opera-87.0.4390.25.ebuild
+2205271640 ./www-client/opera/opera-87.0.4390.36.ebuild
 2101102339 ./www-client/otter/otter-9999.ebuild
 2204082210 ./www-client/otter/otter-1.0.03.ebuild
 2109280109 ./www-client/pybugz/pybugz-0.13-r1.ebuild
@@ -29319,8 +29324,7 @@
 2009241739 ./www-client/surfraw/surfraw-99999.ebuild
 2106222139 ./www-client/uget/uget-2.2.1-r1.ebuild
 2105292209 ./www-client/uget/uget-9999.ebuild
-2205211440 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.3.ebuild
-2205270140 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16.ebuild
+2205291040 ./www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16-r1.ebuild
 2205270140 ./www-client/vivaldi/vivaldi-5.2.2623.48.ebuild
 2107170109 ./www-client/w3m/w3m-0.5.3_p20210102.ebuild
 2205090840 ./www-client/w3m/w3m-0.5.3_p20220216.ebuild
@@ -29350,9 +29354,9 @@
 2203200310 ./www-misc/visitors/visitors-0.7-r2.ebuild
 2107020739 ./www-misc/wsmake/wsmake-0.6.4-r1.ebuild
 2203080340 ./www-plugins/browserpass/browserpass-3.0.9.ebuild
-2205191940 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-102.0.5005.61_beta.ebuild
 2205242240 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-102.0.5005.61.ebuild
-2205261040 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_alpha.ebuild
+2205281610 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_beta.ebuild
+2205281610 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5083.0_alpha.ebuild
 2106202109 ./www-plugins/gosuslugi-plugin/gosuslugi-plugin-3.1.1.0.ebuild
 2006081209 ./www-plugins/lightspark/lightspark-0.8.2-r1.ebuild
 2012261209 ./www-plugins/lightspark/lightspark-0.8.3.ebuild
@@ -29421,36 +29425,31 @@
 2205010512 ./www-servers/tornado/tornado-6.1.ebuild
 2205131240 ./www-servers/tornado/tornado-6.1-r1.ebuild
 2203230410 ./www-servers/uwsgi/uwsgi-2.0.19.1-r109.ebuild
-2205110210 ./www-servers/varnish/varnish-6.5.2.ebuild
-2205110210 ./www-servers/varnish/varnish-6.6.1.ebuild
-2205110210 ./www-servers/varnish/varnish-7.0.1.ebuild
-2205141640 ./www-servers/varnish/varnish-7.1.0.ebuild
+2205301840 ./www-servers/varnish/varnish-6.5.2.ebuild
+2205301840 ./www-servers/varnish/varnish-6.6.1.ebuild
+2205301840 ./www-servers/varnish/varnish-7.0.1.ebuild
+2205301840 ./www-servers/varnish/varnish-7.1.0.ebuild
 2107072309 ./www-servers/xsp/xsp-3.8_p2014120900-r1.ebuild
 2107072309 ./www-servers/xsp/xsp-4.7.1-r1.ebuild
 2203011610 ./www-servers/webfs/webfs-1.21.ebuild
-2110220439 ./x11-apps/appres/appres-1.0.5-r1.ebuild
-2205252110 ./x11-apps/appres/appres-1.0.6.ebuild
+2205280440 ./x11-apps/appres/appres-1.0.6.ebuild
 2205081810 ./x11-apps/bdftopcf/bdftopcf-1.1-r1.ebuild
 2103200209 ./x11-apps/beforelight/beforelight-1.0.5.ebuild
-2110220439 ./x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
-2205252110 ./x11-apps/bitmap/bitmap-1.1.0.ebuild
-2103200209 ./x11-apps/editres/editres-1.0.7.ebuild
-2205252110 ./x11-apps/editres/editres-1.0.8.ebuild
+2205280440 ./x11-apps/bitmap/bitmap-1.1.0.ebuild
+2205280440 ./x11-apps/editres/editres-1.0.8.ebuild
 2205141540 ./x11-apps/fonttosfnt/fonttosfnt-1.2.2.ebuild
 2103200209 ./x11-apps/fslsfonts/fslsfonts-1.0.5-r1.ebuild
 2103200209 ./x11-apps/fstobdf/fstobdf-1.0.6.ebuild
-2201021809 ./x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
-2205252110 ./x11-apps/iceauth/iceauth-1.0.9.ebuild
+2205280440 ./x11-apps/iceauth/iceauth-1.0.9.ebuild
 2103200209 ./x11-apps/ico/ico-1.0.5.ebuild
 2205150710 ./x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r2.ebuild
 2205150710 ./x11-apps/igt-gpu-tools/igt-gpu-tools-9999.ebuild
-2104060140 ./x11-apps/listres/listres-1.0.4.ebuild
-2205252110 ./x11-apps/listres/listres-1.0.5.ebuild
+2205280440 ./x11-apps/listres/listres-1.0.5.ebuild
 2205100440 ./x11-apps/luit/luit-20220111.ebuild
 2112190440 ./x11-apps/mesa-progs/mesa-progs-8.4.0-r1.ebuild
-2112190440 ./x11-apps/mesa-progs/mesa-progs-9999.ebuild
-2201021809 ./x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
-2205252110 ./x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+2205302040 ./x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
+2205302040 ./x11-apps/mesa-progs/mesa-progs-9999.ebuild
+2205280440 ./x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
 2104060140 ./x11-apps/oclock/oclock-1.0.4.ebuild
 2007081839 ./x11-apps/radeon-profile-daemon/radeon-profile-daemon-20190603-r1.ebuild
 2007081839 ./x11-apps/radeon-profile-daemon/radeon-profile-daemon-99999999.ebuild
@@ -29458,40 +29457,31 @@
 2008261839 ./x11-apps/radeon-profile/radeon-profile-20200824.ebuild
 2007081839 ./x11-apps/radeon-profile/radeon-profile-99999999.ebuild
 2205081040 ./x11-apps/rgb/rgb-1.0.6-r1.ebuild
-2103200209 ./x11-apps/rstart/rstart-1.0.5-r1.ebuild
-2205252110 ./x11-apps/rstart/rstart-1.0.6.ebuild
+2205280440 ./x11-apps/rstart/rstart-1.0.6.ebuild
 2104060140 ./x11-apps/scripts/scripts-1.0.1-r1.ebuild
 2201091310 ./x11-apps/sessreg/sessreg-1.1.2.ebuild
-2107261109 ./x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
-2205252110 ./x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
+2205280440 ./x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
 2103200209 ./x11-apps/showfont/showfont-1.0.5.ebuild
 2110220439 ./x11-apps/smproxy/smproxy-1.0.6-r1.ebuild
 2103200209 ./x11-apps/transset/transset-1.0.2.ebuild
 2012311940 ./x11-apps/viewres/viewres-1.0.6.ebuild
 2110220439 ./x11-apps/x11perf/x11perf-1.6.1.ebuild
-2202020039 ./x11-apps/xauth/xauth-1.1.1.ebuild
 2205081040 ./x11-apps/xauth/xauth-9999.ebuild
-2205252110 ./x11-apps/xauth/xauth-1.1.2.ebuild
+2205280440 ./x11-apps/xauth/xauth-1.1.2.ebuild
 2110220439 ./x11-apps/xbacklight/xbacklight-1.2.3.ebuild
 2104060140 ./x11-apps/xbiff/xbiff-1.0.4.ebuild
-2109271809 ./x11-apps/xcalc/xcalc-1.1.0.ebuild
-2205252110 ./x11-apps/xcalc/xcalc-1.1.1.ebuild
+2205280440 ./x11-apps/xcalc/xcalc-1.1.1.ebuild
 2103200209 ./x11-apps/xclipboard/xclipboard-1.1.3.ebuild
-2201021639 ./x11-apps/xclock/xclock-1.0.9.ebuild
-2204040539 ./x11-apps/xclock/xclock-1.1.0.ebuild
-2205252110 ./x11-apps/xclock/xclock-1.1.1.ebuild
+2205280440 ./x11-apps/xclock/xclock-1.1.1.ebuild
 2110220439 ./x11-apps/xcmsdb/xcmsdb-1.0.5-r1.ebuild
 2201201539 ./x11-apps/xconsole/xconsole-1.0.7.ebuild
 2110220439 ./x11-apps/xcursorgen/xcursorgen-1.0.7-r1.ebuild
 2104060140 ./x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
 2012311940 ./x11-apps/xditview/xditview-1.0.5.ebuild
-2201211610 ./x11-apps/xdm/xdm-1.1.12-r1.ebuild
-2205252110 ./x11-apps/xdm/xdm-1.1.13.ebuild
-2110220439 ./x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
-2205252110 ./x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
+2205280440 ./x11-apps/xdm/xdm-1.1.13.ebuild
+2205280440 ./x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
 2110220439 ./x11-apps/xdriinfo/xdriinfo-1.0.6-r1.ebuild
-2103200209 ./x11-apps/xedit/xedit-1.2.2.ebuild
-2205252110 ./x11-apps/xedit/xedit-1.2.3.ebuild
+2205280440 ./x11-apps/xedit/xedit-1.2.3.ebuild
 2109271809 ./x11-apps/xev/xev-1.2.4.ebuild
 2201310009 ./x11-apps/xeyes/xeyes-1.2.0.ebuild
 2110220439 ./x11-apps/xf86dga/xf86dga-1.0.3-r1.ebuild
@@ -29510,13 +29500,11 @@
 2012311940 ./x11-apps/xkbprint/xkbprint-1.0.5.ebuild
 2110220439 ./x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
 2110220439 ./x11-apps/xkill/xkill-1.0.5-r1.ebuild
-2109271809 ./x11-apps/xload/xload-1.1.3.ebuild
-2205252110 ./x11-apps/xload/xload-1.1.4.ebuild
+2205280440 ./x11-apps/xload/xload-1.1.4.ebuild
 2105021839 ./x11-apps/xlogo/xlogo-1.0.5.ebuild
 2110220439 ./x11-apps/xlsatoms/xlsatoms-1.1.3.ebuild
 2110220439 ./x11-apps/xlsclients/xlsclients-1.1.4-r1.ebuild
-2110220439 ./x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
-2205252110 ./x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
+2205280440 ./x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
 2103200209 ./x11-apps/xmag/xmag-1.0.6.ebuild
 2109271809 ./x11-apps/xman/xman-1.1.5.ebuild
 2205100440 ./x11-apps/xmessage/xmessage-1.0.5-r1.ebuild
@@ -29531,8 +29519,7 @@
 2111172009 ./x11-apps/xrestop/xrestop-0.5.ebuild
 2205090840 ./x11-apps/xset/xset-1.2.4-r1.ebuild
 2201091310 ./x11-apps/xsetroot/xsetroot-1.1.2-r1.ebuild
-2201021809 ./x11-apps/xsm/xsm-1.0.4.ebuild
-2205252110 ./x11-apps/xsm/xsm-1.0.5.ebuild
+2205280440 ./x11-apps/xsm/xsm-1.0.5.ebuild
 2012311940 ./x11-apps/xstdcmap/xstdcmap-1.0.4.ebuild
 2103200209 ./x11-apps/xvidtune/xvidtune-1.0.3.ebuild
 2110220439 ./x11-apps/xvinfo/xvinfo-1.1.4.ebuild
@@ -29544,26 +29531,21 @@
 2104060140 ./x11-base/xorg-drivers/xorg-drivers-1.20-r2.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-21.1.ebuild
 2205081040 ./x11-base/xorg-drivers/xorg-drivers-9999.ebuild
-2111180209 ./x11-base/xorg-proto/xorg-proto-2021.5.ebuild
 2204250010 ./x11-base/xorg-proto/xorg-proto-9999.ebuild
-2205252110 ./x11-base/xorg-proto/xorg-proto-2022.1.ebuild
+2205280440 ./x11-base/xorg-proto/xorg-proto-2022.1.ebuild
 2203061240 ./x11-base/xorg-server/xorg-server-1.20.14-r1.ebuild
-2203061240 ./x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
 2205081040 ./x11-base/xorg-server/xorg-server-9999.ebuild
-2205252110 ./x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
+2205280440 ./x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
 2110220439 ./x11-base/xorg-x11/xorg-x11-7.4-r3.ebuild
-2203290240 ./x11-base/xwayland/xwayland-21.1.4.ebuild
-2203290240 ./x11-base/xwayland/xwayland-22.1.0.ebuild
 2205171210 ./x11-base/xwayland/xwayland-9999.ebuild
-2205252110 ./x11-base/xwayland/xwayland-22.1.1.ebuild
 2205251310 ./x11-base/xwayland/xwayland-22.1.2.ebuild
-2112020309 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
+2205280440 ./x11-base/xwayland/xwayland-22.1.1.ebuild
 2204040610 ./x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.ebuild
-2205231540 ./x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
-2205231540 ./x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
-2205250840 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
-2205260940 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
-2205260940 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
+2205301940 ./x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
+2205301940 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
+2205301940 ./x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
+2205301940 ./x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
+2205301940 ./x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
 2205260840 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2205251910 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2205251910 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -29575,14 +29557,13 @@
 2105021839 ./x11-drivers/xf86-input-vmmouse/xf86-input-vmmouse-9999.ebuild
 2205251910 ./x11-drivers/xf86-input-void/xf86-input-void-1.4.1.ebuild
 2105272239 ./x11-drivers/xf86-input-wacom/xf86-input-wacom-0.40.0.ebuild
-2111180209 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
-2205251910 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
+2205301840 ./x11-drivers/xf86-input-wacom/xf86-input-wacom-1.0.0.ebuild
 2205251910 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-9999.ebuild
+2205280440 ./x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
 2105162139 ./x11-drivers/xf86-video-ast/xf86-video-ast-1.1.5.ebuild
 2205251910 ./x11-drivers/xf86-video-ati/xf86-video-ati-19.1.0-r1.ebuild
 2205251910 ./x11-drivers/xf86-video-ati/xf86-video-ati-9999.ebuild
-2201040009 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
-2205252110 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
+2205280440 ./x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
 2205081040 ./x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.5.0-r1.ebuild
 2105021839 ./x11-drivers/xf86-video-geode/xf86-video-geode-2.11.20.ebuild
 2103200209 ./x11-drivers/xf86-video-glint/xf86-video-glint-1.2.9.ebuild
@@ -29593,7 +29574,6 @@
 2205251910 ./x11-drivers/xf86-video-nv/xf86-video-nv-2.1.21.ebuild
 2103200209 ./x11-drivers/xf86-video-omap/xf86-video-omap-0.4.5.ebuild
 2103200209 ./x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.6.0.ebuild
-2105021839 ./x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
 2201190139 ./x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205-r1.ebuild
 2205251910 ./x11-drivers/xf86-video-r128/xf86-video-r128-6.12.0.ebuild
 2103200209 ./x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.9.ebuild
@@ -29616,11 +29596,11 @@
 2112080640 ./x11-libs/fox/fox-1.7.67.ebuild
 2205131710 ./x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
 2201242240 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6-r1.ebuild
-2205090840 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
+2205280910 ./x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
 2110120139 ./x11-libs/gl2ps/gl2ps-1.4.2.ebuild
 2204101910 ./x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2-r1.ebuild
 2203191140 ./x11-libs/goffice/goffice-0.10.51.ebuild
-2205030110 ./x11-libs/goffice/goffice-0.10.52.ebuild
+2205280440 ./x11-libs/goffice/goffice-0.10.52.ebuild
 2203091710 ./x11-libs/goocanvas/goocanvas-3.0.0.ebuild
 2203160010 ./x11-libs/goocanvas/goocanvas-2.0.4-r2.ebuild
 2203042340 ./x11-libs/gtk+/gtk+-3.24.32.ebuild
@@ -29628,7 +29608,7 @@
 2203270810 ./x11-libs/gtk+/gtk+-3.24.33.ebuild
 2205171210 ./x11-libs/gtk+/gtk+-2.24.33.ebuild
 2205171110 ./x11-libs/gtk+/gtk+-3.24.33-r1.ebuild
-2205190210 ./x11-libs/gtk+/gtk+-3.24.34.ebuild
+2205280910 ./x11-libs/gtk+/gtk+-3.24.34.ebuild
 2111230440 ./x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
 2112101410 ./x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5-r1.ebuild
 2104031909 ./x11-libs/gtkdatabox/gtkdatabox-0.9.3.0.ebuild
@@ -29644,18 +29624,15 @@
 1907011039 ./x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
 2007152009 ./x11-libs/libQGLViewer/libQGLViewer-2.7.2.ebuild
 2205080640 ./x11-libs/libSM/libSM-1.2.3-r1.ebuild
-2202020039 ./x11-libs/libX11/libX11-1.7.3.ebuild
-2203310010 ./x11-libs/libX11/libX11-1.7.4.ebuild
 2204300340 ./x11-libs/libX11/libX11-1.8.ebuild
-2205252110 ./x11-libs/libX11/libX11-1.7.5.ebuild
+2205280440 ./x11-libs/libX11/libX11-1.7.5.ebuild
 2205181110 ./x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild
 2205080640 ./x11-libs/libXau/libXau-1.0.9-r1.ebuild
 2205081210 ./x11-libs/libXaw/libXaw-1.0.14.ebuild
 2205100440 ./x11-libs/libXaw3d/libXaw3d-1.6.3.ebuild
 2105240209 ./x11-libs/libXaw3dXft/libXaw3dXft-1.6.2h.ebuild
 2205100440 ./x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
-2201091310 ./x11-libs/libXcursor/libXcursor-1.2.0.ebuild
-2205252110 ./x11-libs/libXcursor/libXcursor-1.2.1.ebuild
+2205280440 ./x11-libs/libXcursor/libXcursor-1.2.1.ebuild
 2205171110 ./x11-libs/libXdamage/libXdamage-1.1.5.ebuild
 2205080640 ./x11-libs/libXdmcp/libXdmcp-1.1.3-r1.ebuild
 2205080640 ./x11-libs/libXext/libXext-1.3.4.ebuild
@@ -29671,12 +29648,10 @@
 2205081040 ./x11-libs/libXrandr/libXrandr-1.5.2.ebuild
 2205080640 ./x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
 2105272239 ./x11-libs/libXres/libXres-1.2.1.ebuild
-2105021839 ./x11-libs/libXt/libXt-1.2.0.ebuild
 2205080640 ./x11-libs/libXt/libXt-1.2.1.ebuild
 2205100440 ./x11-libs/libXtst/libXtst-1.2.3-r2.ebuild
 2205081040 ./x11-libs/libXv/libXv-1.0.11-r2.ebuild
-2107042209 ./x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
-2205252110 ./x11-libs/libXvMC/libXvMC-1.0.13.ebuild
+2205280440 ./x11-libs/libXvMC/libXvMC-1.0.13.ebuild
 2205100440 ./x11-libs/libXxf86dga/libXxf86dga-1.1.5.ebuild
 2205081040 ./x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
 2101061509 ./x11-libs/libast/libast-0.7-r2.ebuild
@@ -29685,9 +29660,8 @@
 2202100210 ./x11-libs/libdlo/libdlo-0.1.2-r2.ebuild
 2205100440 ./x11-libs/libdmx/libdmx-1.1.4.ebuild
 2203110039 ./x11-libs/libdockapp/libdockapp-0.7.3.ebuild
-2202020039 ./x11-libs/libdrm/libdrm-2.4.109.ebuild
 2205081040 ./x11-libs/libdrm/libdrm-9999.ebuild
-2205252110 ./x11-libs/libdrm/libdrm-2.4.110.ebuild
+2205280440 ./x11-libs/libdrm/libdrm-2.4.110.ebuild
 2109010039 ./x11-libs/libfakeXinerama/libfakeXinerama-0.1.0.ebuild
 2111230440 ./x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
 2205251440 ./x11-libs/libfm-extra/libfm-extra-1.3.2.ebuild
@@ -29720,6 +29694,7 @@
 2204012110 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild
 2205091310 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.3.1.ebuild
 2205140210 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.1.ebuild
+2205292210 ./x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
 2103261839 ./x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r5.ebuild
 2202020039 ./x11-libs/libva/libva-2.13.0-r2.ebuild
 2205130940 ./x11-libs/libva/libva-2.14.0.ebuild
@@ -29731,9 +29706,8 @@
 2205080640 ./x11-libs/libxcb/libxcb-1.15.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-0.1.1.ebuild
 2205081040 ./x11-libs/libxcvt/libxcvt-9999.ebuild
-2111180209 ./x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
-2205252110 ./x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
 2205242140 ./x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
+2205280440 ./x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
 2205081040 ./x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
 2105290309 ./x11-libs/libxklavier/libxklavier-5.4.ebuild
 2205081040 ./x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -29744,7 +29718,7 @@
 2203181810 ./x11-libs/pango/pango-1.50.4.ebuild
 2203200440 ./x11-libs/pango/pango-1.50.6.ebuild
 2205090840 ./x11-libs/pango/pango-1.42.4-r2.ebuild
-2205131710 ./x11-libs/pango/pango-1.50.7.ebuild
+2205280910 ./x11-libs/pango/pango-1.50.7.ebuild
 2205150440 ./x11-libs/pixman/pixman-0.40.0.ebuild
 2205150440 ./x11-libs/pixman/pixman-9999.ebuild
 2108031409 ./x11-libs/qscintilla/qscintilla-2.11.6.ebuild
@@ -29769,7 +29743,7 @@
 2105251739 ./x11-libs/tslib/tslib-1.22.ebuild
 2103060139 ./x11-libs/vte/vte-0.28.2-r209.ebuild
 2204220411 ./x11-libs/vte/vte-0.66.2.ebuild
-2205190840 ./x11-libs/vte/vte-0.68.0.ebuild
+2205280910 ./x11-libs/vte/vte-0.68.0.ebuild
 2110291639 ./x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
 2101182239 ./x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild
 2105131709 ./x11-libs/wxGTK/wxGTK-3.0.4-r303.ebuild
@@ -29792,7 +29766,7 @@
 1703221027 ./x11-misc/3dfm/3dfm-1.0-r1.ebuild
 2104130239 ./x11-misc/accessx/accessx-0951-r2.ebuild
 2203081240 ./x11-misc/alacarte/alacarte-3.42.0.ebuild
-2203240609 ./x11-misc/alacarte/alacarte-3.44.1.ebuild
+2205280440 ./x11-misc/alacarte/alacarte-3.44.1.ebuild
 2204141210 ./x11-misc/albert/albert-0.17.2-r1.ebuild
 2205170254 ./x11-misc/alock/alock-1.0.0-r1.ebuild
 2108180339 ./x11-misc/appmenu-gtk-module/appmenu-gtk-module-0.7.3-r2.ebuild
@@ -29827,10 +29801,8 @@
 2112031609 ./x11-misc/clipmenu/clipmenu-6.2.0-r1.ebuild
 2112031609 ./x11-misc/clipnotify/clipnotify-1.0.2.ebuild
 2205261310 ./x11-misc/colord/colord-1.4.6.ebuild
-2202020039 ./x11-misc/compose-tables/compose-tables-1.7.3.ebuild
-2203310010 ./x11-misc/compose-tables/compose-tables-1.7.4.ebuild
 2205080640 ./x11-misc/compose-tables/compose-tables-1.8.ebuild
-2205252110 ./x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+2205280440 ./x11-misc/compose-tables/compose-tables-1.7.5.ebuild
 2010231439 ./x11-misc/copyq/copyq-3.13.0.ebuild
 2108161139 ./x11-misc/copyq/copyq-4.1.0.ebuild
 2110200610 ./x11-misc/copyq/copyq-5.0.0.ebuild
@@ -29884,14 +29856,13 @@
 2107140939 ./x11-misc/i3blocks-contrib/i3blocks-contrib-2.0.0.ebuild
 2102050139 ./x11-misc/i3blocks/i3blocks-1.5-r1.ebuild
 2109280209 ./x11-misc/i3lock/i3lock-2.13.ebuild
+2205290310 ./x11-misc/i3lock/i3lock-2.14.ebuild
 2109211710 ./x11-misc/i3status/i3status-2.13-r1.ebuild
 2203110039 ./x11-misc/i3status/i3status-2.14.ebuild
-1912242109 ./x11-misc/i855crt/i855crt-0.4-r1.ebuild
 2109291739 ./x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
 2204150910 ./x11-misc/iconbox/iconbox-0.2.ebuild
 1703211729 ./x11-misc/idesk-extras/idesk-extras-1.37-r2.ebuild
 2107020939 ./x11-misc/idesk/idesk-1.ebuild
-2104060140 ./x11-misc/imake/imake-1.0.8.ebuild
 2205251240 ./x11-misc/imake/imake-1.0.8-r1.ebuild
 2007041709 ./x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
 2202100210 ./x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.18-r1.ebuild
@@ -30063,7 +30034,6 @@
 2004261039 ./x11-misc/urxvt-perls/urxvt-perls-2.3-r1.ebuild
 2201041109 ./x11-misc/urxvt-tabbedex/urxvt-tabbedex-21.47.ebuild
 2012251939 ./x11-misc/urxvtconfig/urxvtconfig-1.0-r1.ebuild
-2104060140 ./x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
 2205081040 ./x11-misc/util-macros/util-macros-1.19.3.ebuild
 2203251139 ./x11-misc/vdpauinfo/vdpauinfo-1.4_p20220208.ebuild
 2102270409 ./x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
@@ -30129,9 +30099,8 @@
 1803171138 ./x11-misc/xkblayout-state/xkblayout-state-0_p20180118.ebuild
 1803171138 ./x11-misc/xkblayout-state/xkblayout-state-9999.ebuild
 2203200340 ./x11-misc/xkbset/xkbset-0.5_p7_p1.ebuild
-2202120709 ./x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
 2205081040 ./x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
-2205252110 ./x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+2205280440 ./x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
 2104151009 ./x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild
 2104261409 ./x11-misc/xlockmore/xlockmore-5.66.ebuild
 2203231209 ./x11-misc/xlockmore/xlockmore-5.69.ebuild
@@ -30155,6 +30124,7 @@
 2109110010 ./x11-misc/xscreensaver/xscreensaver-6.01-r4.ebuild
 2201240739 ./x11-misc/xscreensaver/xscreensaver-6.02-r1.ebuild
 2203120339 ./x11-misc/xscreensaver/xscreensaver-6.03.ebuild
+2205310640 ./x11-misc/xscreensaver/xscreensaver-6.04.ebuild
 2008170839 ./x11-misc/xsel/xsel-9999.ebuild
 2202141140 ./x11-misc/xsel/xsel-1.2.0-r1.ebuild
 2102072339 ./x11-misc/xsensors/xsensors-0.80.ebuild
@@ -30399,7 +30369,8 @@
 2204271010 ./x11-terms/aterm/aterm-1.0.1-r5.ebuild
 2002101039 ./x11-terms/cool-retro-term/cool-retro-term-1.1.1-r2.ebuild
 2203081540 ./x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild
-2203280740 ./x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
+2205280910 ./x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
+2205290440 ./x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
 2205162240 ./x11-terms/guake/guake-3.8.5.ebuild
 2111031010 ./x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
 2205260940 ./x11-terms/kitty-terminfo/kitty-terminfo-0.25.0.ebuild
@@ -30435,9 +30406,6 @@
 2205051040 ./x11-terms/xfce4-terminal/xfce4-terminal-1.0.2.ebuild
 2205130740 ./x11-terms/xfce4-terminal/xfce4-terminal-1.0.3.ebuild
 2205222010 ./x11-terms/xfce4-terminal/xfce4-terminal-1.0.4.ebuild
-2201040640 ./x11-terms/xterm/xterm-367.ebuild
-2201130540 ./x11-terms/xterm/xterm-370.ebuild
-2202260709 ./x11-terms/xterm/xterm-371.ebuild
 2205100440 ./x11-terms/xterm/xterm-372.ebuild
 2012311940 ./x11-terms/yeahconsole/yeahconsole-0.3.4-r1.ebuild
 2202262209 ./x11-terms/zutty/zutty-0.11.ebuild
@@ -30452,8 +30420,9 @@
 2205050140 ./x11-themes/QGnomePlatform/QGnomePlatform-0.8.4-r1.ebuild
 2002230040 ./x11-themes/adapta-gtk-theme/adapta-gtk-theme-3.95.0.11.ebuild
 2203091910 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-41.0.ebuild
-2203220339 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
 2205171110 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.32.0.ebuild
+2205280910 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
+2205291410 ./x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild
 2107120009 ./x11-themes/adwaita-qt/adwaita-qt-1.3.1.ebuild
 2108251539 ./x11-themes/adwaita-qt/adwaita-qt-1.4.0.ebuild
 2201130510 ./x11-themes/adwaita-qt/adwaita-qt-1.4.1.ebuild
@@ -30507,7 +30476,7 @@
 2002112051 ./x11-themes/geramik/geramik-0.27-r1.ebuild
 1912221309 ./x11-themes/gkrellm-themes/gkrellm-themes-0.1-r1.ebuild
 2203081540 ./x11-themes/gnome-backgrounds/gnome-backgrounds-41.0.ebuild
-2203220339 ./x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
+2205280910 ./x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
 2109130039 ./x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild
 2109130039 ./x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild
 2105090839 ./x11-themes/gnome-icon-theme-extras/gnome-icon-theme-extras-3.12.0.ebuild
@@ -30610,6 +30579,7 @@
 2201040009 ./x11-themes/tela-icon-theme/tela-icon-theme-99999999.ebuild
 2201040039 ./x11-themes/fluent-icon-theme/fluent-icon-theme-2021.12.20.ebuild
 2202222339 ./x11-themes/fluent-icon-theme/fluent-icon-theme-2022.02.04.ebuild
+2205280040 ./x11-themes/fluent-icon-theme/fluent-icon-theme-2022.02.28.ebuild
 2002191639 ./x11-wm/2bwm/2bwm-0.3.ebuild
 2002191639 ./x11-wm/2bwm/2bwm-9999.ebuild
 2012231444 ./x11-wm/aewm++/aewm++-1.1.5-r2.ebuild
@@ -30638,7 +30608,8 @@
 2203200340 ./x11-wm/goomwwm/goomwwm-1.0.0-r1.ebuild
 2203200340 ./x11-wm/goomwwm/goomwwm-9999.ebuild
 2107121039 ./x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
-2107281209 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+2205301040 ./x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
+2205301040 ./x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
 2109211710 ./x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
 2110210309 ./x11-wm/i3-gaps/i3-gaps-4.20.ebuild
 2202131339 ./x11-wm/i3-gaps/i3-gaps-4.20.1.ebuild
@@ -30663,7 +30634,8 @@
 2104192239 ./x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
 2203142039 ./x11-wm/mutter/mutter-41.4.ebuild
 2203281740 ./x11-wm/mutter/mutter-42.0-r1.ebuild
-2205192210 ./x11-wm/mutter/mutter-42.1.ebuild
+2205280910 ./x11-wm/mutter/mutter-42.1.ebuild
+2205291810 ./x11-wm/mutter/mutter-42.2.ebuild
 2012152209 ./x11-wm/notion/notion-3_p2015061300-r100.ebuild
 2012152209 ./x11-wm/notion/notion-9999.ebuild
 2205251440 ./x11-wm/openbox/openbox-3.6.1-r3.ebuild
@@ -30687,8 +30659,7 @@
 2112260340 ./x11-wm/stumpwm/stumpwm-18.05.ebuild
 2107180809 ./x11-wm/subtle/subtle-0.11.3244-r1.ebuild
 2203200340 ./x11-wm/treewm/treewm-0.4.5-r2.ebuild
-2201021809 ./x11-wm/twm/twm-1.0.11.ebuild
-2205252110 ./x11-wm/twm/twm-1.0.12.ebuild
+2205280440 ./x11-wm/twm/twm-1.0.12.ebuild
 2104151009 ./x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
 2104130339 ./x11-wm/windowlab/windowlab-1.40-r1.ebuild
 2101231239 ./x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -30796,6 +30767,7 @@
 2202191640 ./app-containers/cri-tools/cri-tools-1.23.0.ebuild
 2205072010 ./app-containers/cri-tools/cri-tools-1.24.0.ebuild
 2205140010 ./app-containers/cri-tools/cri-tools-1.24.1.ebuild
+2205282040 ./app-containers/cri-tools/cri-tools-1.24.2.ebuild
 2204130011 ./app-containers/crun/crun-1.4.4.ebuild
 2205132340 ./app-containers/crun/crun-1.4.5.ebuild
 2112201210 ./app-containers/distrobuilder/distrobuilder-1.1.ebuild
@@ -30857,7 +30829,7 @@
 2203200140 ./app-containers/cosign/cosign-1.6.0.ebuild
 2205102110 ./app-containers/cosign/cosign-1.8.0.ebuild
 2204141309 ./app-containers/apptainer/apptainer-1.0.1.ebuild
-2205161240 ./app-containers/apptainer/apptainer-1.0.2.ebuild
+2205300140 ./app-containers/apptainer/apptainer-1.0.2.ebuild
 2204092309 ./app-containers/catatonit/catatonit-0.1.7.ebuild
 2205120040 ./app-containers/grype/grype-0.36.1.ebuild
 2205120040 ./app-containers/syft/syft-0.45.1.ebuild
@@ -31844,12 +31816,10 @@
 2204172340 metadata/md5-cache/app-accessibility/emacspeak-39.0-r2
 2204172340 metadata/md5-cache/app-accessibility/emacspeak-9999
 2204172340 metadata/md5-cache/app-accessibility/speechd-el-2.8
-2205070840 metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r1
 2205170654 metadata/md5-cache/app-accessibility/accerciser-3.38.0
 2205171110 metadata/md5-cache/app-accessibility/at-spi2-atk-2.38.0
 2205170654 metadata/md5-cache/app-accessibility/at-spi2-core-2.42.0
 2205170654 metadata/md5-cache/app-accessibility/at-spi2-core-2.44.0
-2205171110 metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
 2205170654 metadata/md5-cache/app-accessibility/brltty-6.1
 2205170654 metadata/md5-cache/app-accessibility/brltty-6.1-r1
 2205170654 metadata/md5-cache/app-accessibility/brltty-6.4
@@ -31869,18 +31839,20 @@
 2205170654 metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
 2205170654 metadata/md5-cache/app-accessibility/orca-41.2
 2205170654 metadata/md5-cache/app-accessibility/orca-42.0
-2205172240 metadata/md5-cache/app-accessibility/orca-42.1
 2205170654 metadata/md5-cache/app-accessibility/powiedz-1.0-r2
 2205170654 metadata/md5-cache/app-accessibility/speech-dispatcher-0.9.1
 2205170654 metadata/md5-cache/app-accessibility/speech-tools-2.5.0
 2205170654 metadata/md5-cache/app-accessibility/sphinx2-0.6
 2205170654 metadata/md5-cache/app-accessibility/yasr-0.6.9-r1
-2205260840 metadata/md5-cache/app-accessibility/Manifest.gz
 2205260840 metadata/md5-cache/app-accessibility/brltty-6.4-r1
 2205260840 metadata/md5-cache/app-accessibility/espeak-ng-1.51
 2205260840 metadata/md5-cache/app-accessibility/espeakup-0.90
 2205260840 metadata/md5-cache/app-accessibility/flite-2.2
 2205260840 metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.1
+2205310240 metadata/md5-cache/app-accessibility/Manifest.gz
+2205280910 metadata/md5-cache/app-accessibility/at-spi2-core-2.44.1
+2205310240 metadata/md5-cache/app-accessibility/edbrowse-3.8.2.1-r2
+2205280910 metadata/md5-cache/app-accessibility/orca-42.1
 2107101839 metadata/md5-cache/app-admin/aerospike-amc-community-4.0.19-r2
 2107101809 metadata/md5-cache/app-admin/aerospike-amc-community-5.0.0
 2104031909 metadata/md5-cache/app-admin/amazon-ec2-init-20101127-r1
@@ -31997,18 +31969,15 @@
 2205170654 metadata/md5-cache/app-admin/ansible-4.6.0
 2205170654 metadata/md5-cache/app-admin/ansible-5.4.0
 2205170654 metadata/md5-cache/app-admin/ansible-5.5.0
-2205170654 metadata/md5-cache/app-admin/ansible-5.7.0
 2205172040 metadata/md5-cache/app-admin/ansible-5.7.1
 2205170654 metadata/md5-cache/app-admin/ansible-base-2.11.7
 2205170654 metadata/md5-cache/app-admin/ansible-base-2.12.3
 2205170654 metadata/md5-cache/app-admin/ansible-base-2.12.4
-2205170654 metadata/md5-cache/app-admin/ansible-base-2.12.5
 2205172040 metadata/md5-cache/app-admin/ansible-base-2.13.0
 2205170654 metadata/md5-cache/app-admin/ansible-base-9999
 2205170654 metadata/md5-cache/app-admin/ansible-cmdb-1.30-r1
 2205170654 metadata/md5-cache/app-admin/ansible-lint-5.4.0
 2205170654 metadata/md5-cache/app-admin/ansible-lint-6.0.2
-2205190240 metadata/md5-cache/app-admin/ansible-lint-6.1.0
 2205170654 metadata/md5-cache/app-admin/ansible-modules-hashivault-4.6.2
 2205170654 metadata/md5-cache/app-admin/ansible-molecule-3.5.2-r1
 2205170654 metadata/md5-cache/app-admin/apache-tools-2.4.53-r1
@@ -32081,7 +32050,6 @@
 2205170654 metadata/md5-cache/app-admin/keepassxc-2.6.6
 2205170654 metadata/md5-cache/app-admin/keepassxc-2.6.9999
 2205170654 metadata/md5-cache/app-admin/keepassxc-2.7.0-r2
-2205170654 metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
 2205170654 metadata/md5-cache/app-admin/keepassxc-9999
 2205170654 metadata/md5-cache/app-admin/killproc-2.13-r1
 2205170654 metadata/md5-cache/app-admin/kubectx-0.9.4
@@ -32133,7 +32101,6 @@
 2205191040 metadata/md5-cache/app-admin/pwgen-2.08
 2205170654 metadata/md5-cache/app-admin/pwman3-0.10.0-r1
 2205170654 metadata/md5-cache/app-admin/pwman3-0.11.1
-2205170654 metadata/md5-cache/app-admin/pydf-12-r2
 2205170654 metadata/md5-cache/app-admin/qpage-3.3
 2205170654 metadata/md5-cache/app-admin/qtpass-1.3.2-r2
 2205170654 metadata/md5-cache/app-admin/radmind-1.15.4-r1
@@ -32183,11 +32150,9 @@
 2205170654 metadata/md5-cache/app-admin/supervisor-4.2.4
 2205170654 metadata/md5-cache/app-admin/sxid-4.2-r2
 2205170654 metadata/md5-cache/app-admin/sysklogd-2.3.0
-2205170654 metadata/md5-cache/app-admin/sysklogd-9999
 2205170654 metadata/md5-cache/app-admin/syslog-ng-3.34.1
 2205170654 metadata/md5-cache/app-admin/syslog-ng-3.35.1
 2205170654 metadata/md5-cache/app-admin/syslog-ng-3.36.1
-2205170654 metadata/md5-cache/app-admin/syslog-summary-1.14-r5
 2205170654 metadata/md5-cache/app-admin/sysrqd-17-r2
 2205170654 metadata/md5-cache/app-admin/sysstat-12.5.4
 2205170654 metadata/md5-cache/app-admin/sysstat-12.5.5
@@ -32236,10 +32201,20 @@
 2205241640 metadata/md5-cache/app-admin/mcelog-182
 2205261210 metadata/md5-cache/app-admin/awscli-1.24.8
 2205261310 metadata/md5-cache/app-admin/gnome-abrt-1.4.2
-2205271040 metadata/md5-cache/app-admin/Manifest.gz
 2205271040 metadata/md5-cache/app-admin/awscli-1.24.9
 2205270410 metadata/md5-cache/app-admin/consul-1.12.1
 2205271010 metadata/md5-cache/app-admin/kpcli-3.7
+2205310640 metadata/md5-cache/app-admin/Manifest.gz
+2205310510 metadata/md5-cache/app-admin/ansible-5.7.0
+2205310510 metadata/md5-cache/app-admin/ansible-base-2.12.5
+2205310240 metadata/md5-cache/app-admin/ansible-lint-6.2.2
+2205280810 metadata/md5-cache/app-admin/awscli-1.24.10
+2205281740 metadata/md5-cache/app-admin/checksec-2.6.0
+2205281010 metadata/md5-cache/app-admin/keepassxc-2.7.1-r1
+2205310510 metadata/md5-cache/app-admin/pydf-12-r2
+2205310640 metadata/md5-cache/app-admin/sysklogd-2.4.0
+2205310640 metadata/md5-cache/app-admin/sysklogd-9999
+2205310610 metadata/md5-cache/app-admin/syslog-summary-1.14-r5
 2205181440 metadata/md5-cache/app-antivirus/Manifest.gz
 2205170654 metadata/md5-cache/app-antivirus/clamav-0.103.6
 2205170654 metadata/md5-cache/app-antivirus/clamav-0.104.2
@@ -32275,8 +32250,6 @@
 2205170654 metadata/md5-cache/app-arch/atool-0.39.0-r1
 2205170654 metadata/md5-cache/app-arch/bloscpack-0.16.0
 2205170654 metadata/md5-cache/app-arch/brotli-1.0.9-r3
-2205182010 metadata/md5-cache/app-arch/brotli-1.0.9-r4
-2205182010 metadata/md5-cache/app-arch/brotli-9999
 2205170654 metadata/md5-cache/app-arch/bsdsfv-1.18-r2
 2205171010 metadata/md5-cache/app-arch/bzip2-1.0.8-r1
 2205170654 metadata/md5-cache/app-arch/bzip2-9999
@@ -32294,7 +32267,6 @@
 2205170654 metadata/md5-cache/app-arch/dpkg-1.21.1
 2205170654 metadata/md5-cache/app-arch/engrampa-1.24.2
 2205170654 metadata/md5-cache/app-arch/file-roller-3.40.0
-2205170654 metadata/md5-cache/app-arch/file-roller-3.42.0
 2205170654 metadata/md5-cache/app-arch/funzix-1.0
 2205170654 metadata/md5-cache/app-arch/gcab-1.4
 2205170654 metadata/md5-cache/app-arch/gnome-autoar-0.4.3
@@ -32387,8 +32359,12 @@
 2205170654 metadata/md5-cache/app-arch/zstd-1.5.0
 2205170654 metadata/md5-cache/app-arch/zstd-1.5.1-r2
 2205170654 metadata/md5-cache/app-arch/zstd-1.5.2
-2205251240 metadata/md5-cache/app-arch/Manifest.gz
 2205251240 metadata/md5-cache/app-arch/unrar-6.1.4
+2205310640 metadata/md5-cache/app-arch/Manifest.gz
+2205280910 metadata/md5-cache/app-arch/brotli-1.0.9-r4
+2205280910 metadata/md5-cache/app-arch/brotli-9999
+2205280910 metadata/md5-cache/app-arch/file-roller-3.42.0
+2205310640 metadata/md5-cache/app-arch/unrar-6.1.7
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14
 2104161439 metadata/md5-cache/app-backup/backup-manager-0.7.14-r1
 2012311940 metadata/md5-cache/app-backup/ccollect-0.8
@@ -32707,7 +32683,6 @@
 2205170654 metadata/md5-cache/app-crypt/libscrypt-1.21
 2205170654 metadata/md5-cache/app-crypt/libscrypt-1.22
 2205170654 metadata/md5-cache/app-crypt/libsecret-0.20.5
-2205170654 metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
 2205170654 metadata/md5-cache/app-crypt/libu2f-host-1.1.10
 2205170654 metadata/md5-cache/app-crypt/libu2f-server-1.1.0-r2
 2205170654 metadata/md5-cache/app-crypt/loop-aes-losetup-2.28.2
@@ -32741,7 +32716,6 @@
 2205170654 metadata/md5-cache/app-crypt/pesign-114
 2205170910 metadata/md5-cache/app-crypt/pinentry-1.1.1-r1
 2205170910 metadata/md5-cache/app-crypt/pinentry-1.2.0
-2205170654 metadata/md5-cache/app-crypt/pius-3.0.0-r1
 2205170654 metadata/md5-cache/app-crypt/pkcrack-1.2.2-r1
 2205170654 metadata/md5-cache/app-crypt/qca-2.3.4
 2205170654 metadata/md5-cache/app-crypt/rhash-1.4.2
@@ -32779,7 +32753,6 @@
 2205170654 metadata/md5-cache/app-crypt/yubikey-manager-qt-1.2.2
 2205170654 metadata/md5-cache/app-crypt/yubioath-desktop-5.1.0-r2
 2205170654 metadata/md5-cache/app-crypt/zulucrypt-5.5.0_pre20180223
-2205220540 metadata/md5-cache/app-crypt/Manifest.gz
 2205220540 metadata/md5-cache/app-crypt/acme-sh-3.0.4
 2205220540 metadata/md5-cache/app-crypt/acme-sh-9999
 2205220540 metadata/md5-cache/app-crypt/certbot-1.26.0
@@ -32789,6 +32762,13 @@
 2205201240 metadata/md5-cache/app-crypt/swtpm-0.7.3
 2205201240 metadata/md5-cache/app-crypt/tpm2-abrmd-2.4.1-r1
 2205201240 metadata/md5-cache/app-crypt/tpm2-tss-3.2.0-r3
+2205310540 metadata/md5-cache/app-crypt/Manifest.gz
+2205281310 metadata/md5-cache/app-crypt/eid-mw-5.1.4
+2205282140 metadata/md5-cache/app-crypt/gpgme-1.17.1-r1
+2205280910 metadata/md5-cache/app-crypt/libsecret-0.20.5-r3
+2205281310 metadata/md5-cache/app-crypt/mit-krb5-1.20
+2205310540 metadata/md5-cache/app-crypt/pius-3.0.0-r1
+2205290640 metadata/md5-cache/app-crypt/veracrypt-1.25.9
 2109291739 metadata/md5-cache/app-dicts/bookview-3.2.1
 2109291739 metadata/md5-cache/app-dicts/dictd-vera-1.24-r1
 2109291739 metadata/md5-cache/app-dicts/eblook-1.6.1
@@ -33495,7 +33475,6 @@
 2205011048 metadata/md5-cache/app-doc/NaturalDocs-1.52-r2
 2205071410 metadata/md5-cache/app-doc/elisp-manual-27.2
 2205141040 metadata/md5-cache/app-doc/zsh-lovers-0.9.1
-2205190840 metadata/md5-cache/app-doc/Manifest.gz
 2205170654 metadata/md5-cache/app-doc/cppman-0.5.3
 2205170654 metadata/md5-cache/app-doc/devmanual-0_pre20210118
 2205170654 metadata/md5-cache/app-doc/devmanual-0_pre20220326
@@ -33518,6 +33497,8 @@
 2205170654 metadata/md5-cache/app-doc/psmark-2.1
 2205190840 metadata/md5-cache/app-doc/xmltoman-0.4-r1
 2205170654 metadata/md5-cache/app-doc/zeal-0.6.1_p20200815
+2205302040 metadata/md5-cache/app-doc/Manifest.gz
+2205302040 metadata/md5-cache/app-doc/halibut-1.3
 2110220439 metadata/md5-cache/app-editors/bvi-1.4.1
 2110291639 metadata/md5-cache/app-editors/hteditor-2.1.1_pre20161206
 1811251609 metadata/md5-cache/app-editors/jupp-3.1_p38
@@ -33544,7 +33525,6 @@
 2204150840 metadata/md5-cache/app-editors/vscodium-1.66.2
 2205011048 metadata/md5-cache/app-editors/padre-1.0.0-r2
 2205140610 metadata/md5-cache/app-editors/gummi-0.8.3
-2205192010 metadata/md5-cache/app-editors/Manifest.gz
 2205170654 metadata/md5-cache/app-editors/aee-2.2.21
 2205170654 metadata/md5-cache/app-editors/bluefish-2.2.12
 2205170654 metadata/md5-cache/app-editors/curses-hexedit-0.9.7-r1
@@ -33574,13 +33554,10 @@
 2205170654 metadata/md5-cache/app-editors/focuswriter-1.7.6
 2205170654 metadata/md5-cache/app-editors/fte-20110708-r1
 2205170654 metadata/md5-cache/app-editors/gedit-41.0
-2205170654 metadata/md5-cache/app-editors/gedit-42.0
 2205170654 metadata/md5-cache/app-editors/gedit-plugins-41.0
-2205170654 metadata/md5-cache/app-editors/gedit-plugins-42.0
 2205170654 metadata/md5-cache/app-editors/ghex-3.41.1
 2205170654 metadata/md5-cache/app-editors/ghex-42.0-r1
 2205170654 metadata/md5-cache/app-editors/ghex-42.1
-2205170654 metadata/md5-cache/app-editors/ghex-42.2
 2205170654 metadata/md5-cache/app-editors/ghex-9999
 2205170654 metadata/md5-cache/app-editors/ghostwriter-1.8.1
 2205170654 metadata/md5-cache/app-editors/ghostwriter-2.0.2
@@ -33588,18 +33565,6 @@
 2205170654 metadata/md5-cache/app-editors/gnome-latex-3.38.0
 2205170654 metadata/md5-cache/app-editors/gnome-latex-3.40.0
 2205170654 metadata/md5-cache/app-editors/gnome-text-editor-42.0
-2205170654 metadata/md5-cache/app-editors/gnome-text-editor-42.1
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.0814-r100
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3428-r1
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3567
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3582
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3669
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3741
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.3950
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.4285
-2205191710 metadata/md5-cache/app-editors/gvim-8.2.4328
-2205170654 metadata/md5-cache/app-editors/gvim-8.2.4586
-2205170654 metadata/md5-cache/app-editors/gvim-9999
 2205170654 metadata/md5-cache/app-editors/hexcurse-1.60.0
 2205170654 metadata/md5-cache/app-editors/hexedit-1.5
 2205191010 metadata/md5-cache/app-editors/hexedit-1.6
@@ -33642,9 +33607,7 @@
 2205170654 metadata/md5-cache/app-editors/pyvim-3.0.2
 2205170654 metadata/md5-cache/app-editors/qemacs-0.4.1_pre20170225
 2205170654 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316
-2205170654 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r1
 2205170654 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525
-2205170654 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r1
 2205170654 metadata/md5-cache/app-editors/qxmledit-0.9.12
 2205170654 metadata/md5-cache/app-editors/remarkable-1.9.0_pre20210320
 2205170654 metadata/md5-cache/app-editors/retext-7.2.2
@@ -33660,28 +33623,6 @@
 2205170654 metadata/md5-cache/app-editors/texworks-0.6.5-r100
 2205170654 metadata/md5-cache/app-editors/texworks-0.6.6
 2205170654 metadata/md5-cache/app-editors/uemacs-pk-4.0.15_p20180719
-2205170654 metadata/md5-cache/app-editors/vim-8.2.0814-r100
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3428-r1
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3567
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3582
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3669
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3741
-2205170654 metadata/md5-cache/app-editors/vim-8.2.3950
-2205170654 metadata/md5-cache/app-editors/vim-8.2.4285
-2205191710 metadata/md5-cache/app-editors/vim-8.2.4328-r1
-2205170654 metadata/md5-cache/app-editors/vim-8.2.4586
-2205170654 metadata/md5-cache/app-editors/vim-9999
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.0814
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3428
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3567
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3582
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3669
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3741
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.3950
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.4285
-2205191710 metadata/md5-cache/app-editors/vim-core-8.2.4328-r1
-2205170654 metadata/md5-cache/app-editors/vim-core-8.2.4586
-2205170654 metadata/md5-cache/app-editors/vim-core-9999
 2205170654 metadata/md5-cache/app-editors/vis-0.7
 2205170654 metadata/md5-cache/app-editors/vis-9999
 2205192010 metadata/md5-cache/app-editors/vscode-1.67.2
@@ -33697,6 +33638,49 @@
 2205170654 metadata/md5-cache/app-editors/xmlcopyeditor-1.3.0.0
 2205170654 metadata/md5-cache/app-editors/zile-2.4.15
 2205170654 metadata/md5-cache/app-editors/zile-2.6.2-r2
+2205310610 metadata/md5-cache/app-editors/Manifest.gz
+2205290210 metadata/md5-cache/app-editors/bluefish-2.2.12-r1
+2205280910 metadata/md5-cache/app-editors/gedit-42.0
+2205271340 metadata/md5-cache/app-editors/gedit-42.1
+2205280440 metadata/md5-cache/app-editors/gedit-plugins-42.0
+2205271340 metadata/md5-cache/app-editors/gedit-plugins-42.1
+2205280810 metadata/md5-cache/app-editors/ghex-42.2
+2205280440 metadata/md5-cache/app-editors/gnome-text-editor-42.1
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.0814-r100
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3428-r1
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3567
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3582
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3669
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3741
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.3950
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.4285
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.4328
+2205301610 metadata/md5-cache/app-editors/gvim-8.2.4586
+2205301610 metadata/md5-cache/app-editors/gvim-9999
+2205310610 metadata/md5-cache/app-editors/qhexedit2-0.8.6_p20190316-r2
+2205310610 metadata/md5-cache/app-editors/qhexedit2-0.8.9_p20210525-r2
+2205301610 metadata/md5-cache/app-editors/vim-8.2.0814-r100
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3428-r1
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3567
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3582
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3669
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3741
+2205301610 metadata/md5-cache/app-editors/vim-8.2.3950
+2205301610 metadata/md5-cache/app-editors/vim-8.2.4285
+2205301610 metadata/md5-cache/app-editors/vim-8.2.4328-r1
+2205301610 metadata/md5-cache/app-editors/vim-8.2.4586
+2205301610 metadata/md5-cache/app-editors/vim-9999
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.0814
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3428
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3567
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3582
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3669
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3741
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.3950
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.4285
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.4328-r1
+2205301610 metadata/md5-cache/app-editors/vim-core-8.2.4586
+2205301610 metadata/md5-cache/app-editors/vim-core-9999
 2204172340 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2204172340 metadata/md5-cache/app-emacs/adaptive-wrap-0.8
@@ -33786,7 +33770,6 @@
 2204172340 metadata/md5-cache/app-emacs/edit-server-1.15
 2204172340 metadata/md5-cache/app-emacs/edit-server-1.16
 2204172340 metadata/md5-cache/app-emacs/editorconfig-emacs-0.7.8-r3
-2204172340 metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
 2204172340 metadata/md5-cache/app-emacs/eglot-1.6
 2204172340 metadata/md5-cache/app-emacs/eglot-1.8
 2204190609 metadata/md5-cache/app-emacs/el-mock-1.25.1
@@ -33799,8 +33782,6 @@
 2204172340 metadata/md5-cache/app-emacs/ess-18.10.2-r1
 2204172340 metadata/md5-cache/app-emacs/evil-1.14.0
 2204172340 metadata/md5-cache/app-emacs/expand-region-0.11.0-r1
-2204172340 metadata/md5-cache/app-emacs/f-0.19.0
-2204172340 metadata/md5-cache/app-emacs/f-0.20.0
 2204172340 metadata/md5-cache/app-emacs/fennel-mode-0.4.1
 2204172340 metadata/md5-cache/app-emacs/fff-20050517
 2204172340 metadata/md5-cache/app-emacs/filladapt-2.12-r2
@@ -33926,7 +33907,6 @@
 2204172340 metadata/md5-cache/app-emacs/quilt-el-0.66
 2204172340 metadata/md5-cache/app-emacs/qwerty-1.1
 2204181240 metadata/md5-cache/app-emacs/racket-mode-20220219
-2204172340 metadata/md5-cache/app-emacs/racket-mode-20220411
 2204172340 metadata/md5-cache/app-emacs/rainbow-delimiters-2.1.5
 2204172340 metadata/md5-cache/app-emacs/redo+-1.19
 2204190139 metadata/md5-cache/app-emacs/reformatter-0.6
@@ -33942,7 +33922,6 @@
 2204172340 metadata/md5-cache/app-emacs/rust-mode-0.3.0_p20190125
 2204172340 metadata/md5-cache/app-emacs/rust-mode-0.4.0
 2204172340 metadata/md5-cache/app-emacs/rust-mode-1.0.4
-2204172340 metadata/md5-cache/app-emacs/s-1.12.0
 2204172340 metadata/md5-cache/app-emacs/scala-mode-2.10.3
 2204172340 metadata/md5-cache/app-emacs/scheme-complete-0.9.8
 2204172340 metadata/md5-cache/app-emacs/scheme-complete-0.9.9
@@ -34057,7 +34036,6 @@
 2204210039 metadata/md5-cache/app-emacs/ruby-mode-2.7.0
 2204210039 metadata/md5-cache/app-emacs/ruby-mode-3.0.0
 2204210510 metadata/md5-cache/app-emacs/system-packages-1.1.0
-2204201939 metadata/md5-cache/app-emacs/vertico-0.22
 2204211845 metadata/md5-cache/app-emacs/use-package-2.4.1
 2204230239 metadata/md5-cache/app-emacs/exwm-0.26
 2204222209 metadata/md5-cache/app-emacs/mocker-0.5.0
@@ -34127,7 +34105,6 @@
 2205170654 metadata/md5-cache/app-emacs/emacs-w3m-1.4.632_pre20181112
 2205170654 metadata/md5-cache/app-emacs/emms-10
 2205170654 metadata/md5-cache/app-emacs/emms-5.4
-2205170654 metadata/md5-cache/app-emacs/jde-2.4.1-r2
 2205170654 metadata/md5-cache/app-emacs/libegit2-0.0.20200515-r1
 2205170654 metadata/md5-cache/app-emacs/lookup-1.99.96_pre20180209
 2205170654 metadata/md5-cache/app-emacs/mpg123-el-1.60
@@ -34148,8 +34125,20 @@
 2205240240 metadata/md5-cache/app-emacs/ivy-0.13.4
 2205241540 metadata/md5-cache/app-emacs/parsebib-3.1
 2205241540 metadata/md5-cache/app-emacs/with-simulated-input-3.0
-2205260940 metadata/md5-cache/app-emacs/Manifest.gz
 2205260940 metadata/md5-cache/app-emacs/nxml-gentoo-schemas-20220525
+2205310610 metadata/md5-cache/app-emacs/Manifest.gz
+2205310340 metadata/md5-cache/app-emacs/assess-0.6
+2205310340 metadata/md5-cache/app-emacs/cask-mode-0.1
+2205291810 metadata/md5-cache/app-emacs/compat-28.1.1.1-r1
+2205291110 metadata/md5-cache/app-emacs/consult-0.18
+2205310240 metadata/md5-cache/app-emacs/editorconfig-emacs-0.8.2-r2
+2205280140 metadata/md5-cache/app-emacs/f-0.19.0-r1
+2205280140 metadata/md5-cache/app-emacs/f-0.20.0-r1
+2205310340 metadata/md5-cache/app-emacs/load-relative-1.3.1
+2205310340 metadata/md5-cache/app-emacs/m-buffer-0.15
+2205310610 metadata/md5-cache/app-emacs/racket-mode-20220411
+2205280210 metadata/md5-cache/app-emacs/s-1.12.0-r1
+2205291110 metadata/md5-cache/app-emacs/vertico-0.24
 1912171039 metadata/md5-cache/app-emulation/bochs-2.6.10
 2110200512 metadata/md5-cache/app-emulation/bochs-2.7
 1910051539 metadata/md5-cache/app-emulation/dlx-1.0.0
@@ -34182,7 +34171,6 @@
 2204221039 metadata/md5-cache/app-emulation/virtualbox-additions-6.1.34
 2204221039 metadata/md5-cache/app-emulation/virtualbox-extpack-oracle-6.1.34
 2205122041 metadata/md5-cache/app-emulation/libguestfs-appliance-1.46.0
-2205170654 metadata/md5-cache/app-emulation/86Box-3.4.1-r1
 2205170654 metadata/md5-cache/app-emulation/aqemu-0.9.2-r2
 2205170654 metadata/md5-cache/app-emulation/aranym-1.1.0
 2205170654 metadata/md5-cache/app-emulation/cloud-init-20.4
@@ -34250,8 +34238,6 @@
 2205170654 metadata/md5-cache/app-emulation/qemu-guest-agent-5.0.0
 2205170654 metadata/md5-cache/app-emulation/qemu-guest-agent-6.0.0
 2205170654 metadata/md5-cache/app-emulation/ruffle-0_p20220429
-2205170654 metadata/md5-cache/app-emulation/ruffle-0_p20220516
-2205170654 metadata/md5-cache/app-emulation/ruffle-9999
 2205170654 metadata/md5-cache/app-emulation/runv-0.7.0
 2205170654 metadata/md5-cache/app-emulation/simh-3.11.1
 2205170654 metadata/md5-cache/app-emulation/ski-1.3.2-r4
@@ -34277,8 +34263,6 @@
 2205170654 metadata/md5-cache/app-emulation/virt-viewer-11.0
 2205170654 metadata/md5-cache/app-emulation/virtualbox-6.1.32-r1
 2205170654 metadata/md5-cache/app-emulation/virtualbox-6.1.34
-2205181440 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32
-2205181440 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34
 2205181440 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.32
 2205181440 metadata/md5-cache/app-emulation/virtualbox-modules-6.1.34
 2205170654 metadata/md5-cache/app-emulation/vkd3d-1.0
@@ -34295,7 +34279,6 @@
 2205170654 metadata/md5-cache/app-emulation/xen-tools-4.15.2-r2
 2205170654 metadata/md5-cache/app-emulation/xen-tools-4.16.0-r4
 2205170654 metadata/md5-cache/app-emulation/xtrs-4.9d-r5
-2205231010 metadata/md5-cache/app-emulation/Manifest.gz
 2205202310 metadata/md5-cache/app-emulation/crossover-bin-21.2.0
 2205222310 metadata/md5-cache/app-emulation/plus42-1.0.4
 2205220911 metadata/md5-cache/app-emulation/vagrant-2.2.18-r1
@@ -34312,6 +34295,13 @@
 2205212210 metadata/md5-cache/app-emulation/wine-vanilla-7.9
 2205210740 metadata/md5-cache/app-emulation/wine-vanilla-9999
 2205231010 metadata/md5-cache/app-emulation/winetricks-20220411
+2205280210 metadata/md5-cache/app-emulation/86Box-3.5
+2205301410 metadata/md5-cache/app-emulation/Manifest.gz
+2205301410 metadata/md5-cache/app-emulation/protontricks-1.8.2
+2205282240 metadata/md5-cache/app-emulation/ruffle-0_p20220516
+2205282240 metadata/md5-cache/app-emulation/ruffle-9999
+2205281740 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.32-r1
+2205281740 metadata/md5-cache/app-emulation/virtualbox-guest-additions-6.1.34-r1
 2104060140 metadata/md5-cache/app-eselect/eselect-awk-0.3
 2107211409 metadata/md5-cache/app-eselect/eselect-blas-0.1
 2104060140 metadata/md5-cache/app-eselect/eselect-cblas-0.1
@@ -34443,7 +34433,6 @@
 2205071010 metadata/md5-cache/app-i18n/ibus-table-others-1.3.12
 2205071010 metadata/md5-cache/app-i18n/ibus-table-others-1.3.13
 2205071440 metadata/md5-cache/app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
-2205190840 metadata/md5-cache/app-i18n/Manifest.gz
 2205170654 metadata/md5-cache/app-i18n/bidiv-1.5_p4
 2205170654 metadata/md5-cache/app-i18n/dbskkd-cdb-2.00-r1
 2205170654 metadata/md5-cache/app-i18n/dbskkd-cdb-3.00-r1
@@ -34479,7 +34468,6 @@
 2205170654 metadata/md5-cache/app-i18n/fcitx-unikey-4.9999
 2205170654 metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23-r1
 2205170654 metadata/md5-cache/app-i18n/ibus-1.5.25-r1
-2205190840 metadata/md5-cache/app-i18n/ibus-1.5.26-r1
 2205170654 metadata/md5-cache/app-i18n/ibus-anthy-1.5.13
 2205170654 metadata/md5-cache/app-i18n/ibus-anthy-1.5.14
 2205170654 metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r2
@@ -34572,8 +34560,9 @@
 2205170654 metadata/md5-cache/app-i18n/yaskkserv2-0.1.1-r1
 2205170654 metadata/md5-cache/app-i18n/zinnia-0.06-r3
 2205170654 metadata/md5-cache/app-i18n/zinnia-tomoe-0.6.0_p20080911
+2205280910 metadata/md5-cache/app-i18n/Manifest.gz
+2205280910 metadata/md5-cache/app-i18n/ibus-1.5.26-r1
 2002112051 metadata/md5-cache/app-laptop/hdaps-gl-0.0.7
-2205181440 metadata/md5-cache/app-laptop/Manifest.gz
 2205170654 metadata/md5-cache/app-laptop/dispad-0.3.1-r1
 2205170654 metadata/md5-cache/app-laptop/hdapsd-20141203-r2
 2205170654 metadata/md5-cache/app-laptop/i8kutils-1.43
@@ -34586,9 +34575,6 @@
 2205170654 metadata/md5-cache/app-laptop/msi-keyboard-1.0
 2205170654 metadata/md5-cache/app-laptop/pbbuttonsd-0.8.1a
 2205170654 metadata/md5-cache/app-laptop/pommed-1.39-r2
-2205170654 metadata/md5-cache/app-laptop/rogauracore-1.4
-2205170654 metadata/md5-cache/app-laptop/rogauracore-1.5
-2205170654 metadata/md5-cache/app-laptop/rogauracore-9999
 2205170654 metadata/md5-cache/app-laptop/spicctrl-1.9-r1
 2205170654 metadata/md5-cache/app-laptop/thinkfan-1.0.2
 2205170654 metadata/md5-cache/app-laptop/thinkfan-1.2.1
@@ -34602,6 +34588,10 @@
 2205170654 metadata/md5-cache/app-laptop/tuxedo-control-center-bin-1.1.0-r2
 2205181440 metadata/md5-cache/app-laptop/tuxedo-keyboard-2.0.5-r1
 2205181440 metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.8
+2205291040 metadata/md5-cache/app-laptop/Manifest.gz
+2205291040 metadata/md5-cache/app-laptop/rogauracore-1.5
+2205290940 metadata/md5-cache/app-laptop/rogauracore-1.6
+2205290940 metadata/md5-cache/app-laptop/rogauracore-9999
 2203240726 metadata/md5-cache/app-metrics/burrow_exporter-0.0.6-r2
 2203240726 metadata/md5-cache/app-metrics/postfix_exporter-0.1.2-r1
 2203240726 metadata/md5-cache/app-metrics/prom2json-0.1.0_p20170523
@@ -34864,7 +34854,6 @@
 2205170654 metadata/md5-cache/app-misc/glcdprocdriver-0.1.2-r1
 2205170654 metadata/md5-cache/app-misc/glimpse-4.18.6-r1
 2205170654 metadata/md5-cache/app-misc/gnote-40.2
-2205170654 metadata/md5-cache/app-misc/gnote-42.0
 2205170654 metadata/md5-cache/app-misc/gnuit-4.9.5-r2
 2205170654 metadata/md5-cache/app-misc/golly-4.0
 2205170654 metadata/md5-cache/app-misc/golly-4.1-r1
@@ -34884,7 +34873,6 @@
 2205170654 metadata/md5-cache/app-misc/i2bits-0.1.0-r1
 2205170654 metadata/md5-cache/app-misc/icdiff-1.9.5
 2205170654 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r2
-2205170654 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3
 2205170654 metadata/md5-cache/app-misc/irtrans-irclient-6.01.05-r1
 2205170654 metadata/md5-cache/app-misc/irtrans-irserver-6.09.04-r1
 2205170654 metadata/md5-cache/app-misc/jail-2.0-r4
@@ -35050,10 +35038,8 @@
 2205170654 metadata/md5-cache/app-misc/tpipe-1.6-r1
 2205170654 metadata/md5-cache/app-misc/tprint-1.1.0-r1
 2205170654 metadata/md5-cache/app-misc/tracker-3.2.1
-2205170654 metadata/md5-cache/app-misc/tracker-3.3.0
 2205170654 metadata/md5-cache/app-misc/tracker-miners-3.2.1
 2205170654 metadata/md5-cache/app-misc/tracker-miners-3.2.2
-2205170654 metadata/md5-cache/app-misc/tracker-miners-3.3.0
 2205170654 metadata/md5-cache/app-misc/transfolio-1.0.1-r2
 2205170654 metadata/md5-cache/app-misc/trash-cli-0.21.10.24
 2205170654 metadata/md5-cache/app-misc/trash-cli-0.22.4.16
@@ -35066,9 +35052,6 @@
 2205170654 metadata/md5-cache/app-misc/uptimed-0.4.6
 2205170654 metadata/md5-cache/app-misc/vcontrold-0.98.10
 2205170654 metadata/md5-cache/app-misc/vcp-2.2-r2
-2205170654 metadata/md5-cache/app-misc/vifm-0.11
-2205170654 metadata/md5-cache/app-misc/vifm-0.12
-2205170654 metadata/md5-cache/app-misc/vifm-9999
 2205170654 metadata/md5-cache/app-misc/vittk-1.3-r1
 2205170654 metadata/md5-cache/app-misc/vlock-2.2.3-r2
 2205170654 metadata/md5-cache/app-misc/votrify-5
@@ -35106,8 +35089,16 @@
 2205251610 metadata/md5-cache/app-misc/spacenavd-1.0-r1
 2205242310 metadata/md5-cache/app-misc/tmuxp-1.11.1
 2205242210 metadata/md5-cache/app-misc/tmuxp-1.9.4
-2205261610 metadata/md5-cache/app-misc/Manifest.gz
 2205261610 metadata/md5-cache/app-misc/elasticsearch-8.2.0
+2205301610 metadata/md5-cache/app-misc/Manifest.gz
+2205301210 metadata/md5-cache/app-misc/broot-1.13.0
+2205280440 metadata/md5-cache/app-misc/gnote-42.0
+2205271910 metadata/md5-cache/app-misc/inputlircd-0.0.1_pre15-r3
+2205280910 metadata/md5-cache/app-misc/tracker-3.3.0
+2205280910 metadata/md5-cache/app-misc/tracker-miners-3.3.0
+2205301610 metadata/md5-cache/app-misc/vifm-0.11
+2205301610 metadata/md5-cache/app-misc/vifm-0.12
+2205301610 metadata/md5-cache/app-misc/vifm-9999
 2110242009 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1805222109 metadata/md5-cache/app-mobilephone/scmxx-0.9.0
 2203031839 metadata/md5-cache/app-mobilephone/dfu-util-0.11
@@ -35137,7 +35128,6 @@
 2205020310 metadata/md5-cache/app-office/libreoffice-l10n-7.2.6.2
 2205022240 metadata/md5-cache/app-office/moneydance-2022.4060
 2205100110 metadata/md5-cache/app-office/libreoffice-l10n-7.3.3.2
-2205181540 metadata/md5-cache/app-office/Manifest.gz
 2205170654 metadata/md5-cache/app-office/abiword-3.0.5
 2205170654 metadata/md5-cache/app-office/abiword-docs-3.0.2
 2205170654 metadata/md5-cache/app-office/auto-multiple-choice-1.3.0-r1
@@ -35154,7 +35144,6 @@
 2205170840 metadata/md5-cache/app-office/gnucash-4.5
 2205170840 metadata/md5-cache/app-office/gnucash-4.8
 2205170654 metadata/md5-cache/app-office/gnumeric-1.12.51
-2205170654 metadata/md5-cache/app-office/gnumeric-1.12.52
 2205170654 metadata/md5-cache/app-office/grisbi-2.0.5
 2205170654 metadata/md5-cache/app-office/gtg-0.4.0
 2205170654 metadata/md5-cache/app-office/gtg-0.5
@@ -35194,6 +35183,8 @@
 2205170654 metadata/md5-cache/app-office/unoconv-0.9.0-r1
 2205170654 metadata/md5-cache/app-office/worklog-assistant-bin-2.1.3580
 2205170654 metadata/md5-cache/app-office/wps-office-11.1.0.10976
+2205280440 metadata/md5-cache/app-office/Manifest.gz
+2205280440 metadata/md5-cache/app-office/gnumeric-1.12.52
 2204011845 metadata/md5-cache/app-officeext/Manifest.gz
 2204011845 metadata/md5-cache/app-officeext/barcode-1.3.5.0-r1
 2204011845 metadata/md5-cache/app-officeext/ct2n-1.5.0
@@ -35325,10 +35316,12 @@
 2205202040 metadata/md5-cache/app-portage/hackport-0.6.6
 2205202040 metadata/md5-cache/app-portage/hackport-0.7
 2205202040 metadata/md5-cache/app-portage/hackport-9999
-2205252310 metadata/md5-cache/app-portage/Manifest.gz
 2205252310 metadata/md5-cache/app-portage/metagen-0.7.3-r1
 2205252310 metadata/md5-cache/app-portage/metagen-9999
 2205251640 metadata/md5-cache/app-portage/overlint-0.5.3-r3
+2205280910 metadata/md5-cache/app-portage/Manifest.gz
+2205271810 metadata/md5-cache/app-portage/gpyutils-0.8.1
+2205280910 metadata/md5-cache/app-portage/gpyutils-0.8.2
 2005131639 metadata/md5-cache/app-shells/bashdb-5.0.1.1.2
 2104212309 metadata/md5-cache/app-shells/bashish-2.2.4
 2012271709 metadata/md5-cache/app-shells/dsh-0.25.10-r1
@@ -35426,8 +35419,9 @@
 2205170654 metadata/md5-cache/app-shells/zsh-5.8.1-r2
 2205170654 metadata/md5-cache/app-shells/zsh-5.9
 2205170654 metadata/md5-cache/app-shells/zsh-9999
-2205221840 metadata/md5-cache/app-shells/Manifest.gz
 2205221840 metadata/md5-cache/app-shells/nushell-0.62.0-r1
+2205310610 metadata/md5-cache/app-shells/Manifest.gz
+2205310610 metadata/md5-cache/app-shells/nushell-0.63.1
 2101061709 metadata/md5-cache/app-text/antixls-0.3b
 2111090809 metadata/md5-cache/app-text/bibclean-3.06
 2110070609 metadata/md5-cache/app-text/build-docbook-catalog-1.21
@@ -35531,7 +35525,6 @@
 2204150511 metadata/md5-cache/app-text/vgrep-2.5.2
 2204150511 metadata/md5-cache/app-text/vgrep-2.5.5
 2204150511 metadata/md5-cache/app-text/vgrep-2.6.0
-2204190440 metadata/md5-cache/app-text/enchant-1.6.1-r2
 2204230009 metadata/md5-cache/app-text/tkman-2.2-r3
 2204291140 metadata/md5-cache/app-text/build-docbook-catalog-2.2
 2204291140 metadata/md5-cache/app-text/build-docbook-catalog-2.3
@@ -35604,7 +35597,6 @@
 2205170654 metadata/md5-cache/app-text/dictd-1.13.0-r3
 2205170654 metadata/md5-cache/app-text/diff-pdf-0.4.1-r2
 2205170654 metadata/md5-cache/app-text/diffpdf-2.1.3-r2
-2205170654 metadata/md5-cache/app-text/discount-2.2.7-r2
 2205170654 metadata/md5-cache/app-text/djview-4.10.6-r2
 2205171110 metadata/md5-cache/app-text/djvu-3.5.28-r1
 2205170654 metadata/md5-cache/app-text/docbook-sgml-utils-0.6.14-r4
@@ -35616,12 +35608,10 @@
 2205170654 metadata/md5-cache/app-text/ebook-tools-0.2.2-r2
 2205170654 metadata/md5-cache/app-text/editorconfig-core-c-0.12.3-r2
 2205170654 metadata/md5-cache/app-text/editorconfig-core-c-0.12.4
-2205190840 metadata/md5-cache/app-text/enchant-2.3.3-r1
 2205170654 metadata/md5-cache/app-text/enscript-1.6.6
 2205170654 metadata/md5-cache/app-text/epstool-3.09
 2205170654 metadata/md5-cache/app-text/evince-41.3
 2205170654 metadata/md5-cache/app-text/evince-42.1
-2205170654 metadata/md5-cache/app-text/evince-42.2
 2205170654 metadata/md5-cache/app-text/expander-2.0.5-r2
 2205170654 metadata/md5-cache/app-text/fblog-1.4.1
 2205170654 metadata/md5-cache/app-text/fbpdf-0_p20200614
@@ -35635,7 +35625,6 @@
 2205170654 metadata/md5-cache/app-text/gnome-doc-utils-0.20.10-r2
 2205170654 metadata/md5-cache/app-text/groonga-8.0.2-r1
 2205170654 metadata/md5-cache/app-text/groonga-normalizer-mysql-1.1.1-r1
-2205170654 metadata/md5-cache/app-text/gspell-1.10.0
 2205170654 metadata/md5-cache/app-text/gspell-1.9.1
 2205170654 metadata/md5-cache/app-text/gtkspell-3.0.10
 2205170654 metadata/md5-cache/app-text/gtranslator-40.0
@@ -35657,7 +35646,6 @@
 2205170654 metadata/md5-cache/app-text/hyperestraier-1.4.13-r1
 2205190840 metadata/md5-cache/app-text/iso-codes-4.9.0
 2205170654 metadata/md5-cache/app-text/itex2mml-1.5.6
-2205170654 metadata/md5-cache/app-text/jabref-2.10-r7
 2205170654 metadata/md5-cache/app-text/jabref-bin-3.7
 2205170654 metadata/md5-cache/app-text/jabref-bin-3.8
 2205170654 metadata/md5-cache/app-text/jabref-bin-3.8.1
@@ -35741,7 +35729,6 @@
 2205170654 metadata/md5-cache/app-text/pdftk-3.3.2
 2205170654 metadata/md5-cache/app-text/pdftk-9999
 2205170654 metadata/md5-cache/app-text/pelican-4.5.3
-2205170654 metadata/md5-cache/app-text/pelican-4.7.2-r1
 2205170654 metadata/md5-cache/app-text/pelican-9999
 2205170654 metadata/md5-cache/app-text/pep-2.8-r2
 2205170654 metadata/md5-cache/app-text/pinfo-0.6.13
@@ -35837,7 +35824,6 @@
 2205170654 metadata/md5-cache/app-text/xpdf-4.03
 2205170654 metadata/md5-cache/app-text/xpdf-4.04
 2205170654 metadata/md5-cache/app-text/yelp-tools-41.0
-2205170654 metadata/md5-cache/app-text/yelp-tools-42.0
 2205170840 metadata/md5-cache/app-text/yodl-4.03.00
 2205170654 metadata/md5-cache/app-text/zathura-0.4.7
 2205170654 metadata/md5-cache/app-text/zathura-0.4.8
@@ -35878,7 +35864,16 @@
 2205252240 metadata/md5-cache/app-text/pandoc-bin-2.18
 2205241210 metadata/md5-cache/app-text/sword-modules-2.6
 2205252310 metadata/md5-cache/app-text/wiki2beamer-0.10.0-r1
-2205261940 metadata/md5-cache/app-text/Manifest.gz
+2205310610 metadata/md5-cache/app-text/Manifest.gz
+2205282010 metadata/md5-cache/app-text/calibre-5.43.0
+2205271740 metadata/md5-cache/app-text/discount-2.2.7b
+2205290210 metadata/md5-cache/app-text/enchant-1.6.1-r2
+2205280910 metadata/md5-cache/app-text/enchant-2.3.3-r1
+2205280910 metadata/md5-cache/app-text/evince-42.2
+2205280910 metadata/md5-cache/app-text/gspell-1.10.0
+2205310610 metadata/md5-cache/app-text/pelican-4.7.2-r1
+2205300140 metadata/md5-cache/app-text/xiphos-4.2.1-r1
+2205280910 metadata/md5-cache/app-text/yelp-tools-42.0
 2203240726 metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-da-20060116-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -35893,236 +35888,236 @@
 2203240726 metadata/md5-cache/app-vim/vim-spell-pl-20060218-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-pt-20100312-r1
 2203240726 metadata/md5-cache/app-vim/vim-spell-ru-20070506-r1
-2204061339 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
-2204061339 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
-2204061339 metadata/md5-cache/app-vim/airline-0.11
-2204061339 metadata/md5-cache/app-vim/airline-9999
-2204061339 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
-2204061339 metadata/md5-cache/app-vim/airline-themes-9999
-2204061339 metadata/md5-cache/app-vim/align-43
-2204061339 metadata/md5-cache/app-vim/alternate-2.18-r2
-2204061339 metadata/md5-cache/app-vim/ansiesc-12
-2204061339 metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
-2204061339 metadata/md5-cache/app-vim/autoalign-14
-2204061339 metadata/md5-cache/app-vim/bash-support-4.2.1
-2204061339 metadata/md5-cache/app-vim/bash-support-4.3
-2204061339 metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
-2204061339 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
-2204061339 metadata/md5-cache/app-vim/breakpts-4.0-r1
-2204061339 metadata/md5-cache/app-vim/breakpts-4.0-r2
-2204061339 metadata/md5-cache/app-vim/bufexplorer-7.4.18
-2204061339 metadata/md5-cache/app-vim/bufexplorer-7.4.19
-2204061339 metadata/md5-cache/app-vim/bufexplorer-9999
-2204061339 metadata/md5-cache/app-vim/c-support-6.1.1
-2204061339 metadata/md5-cache/app-vim/calendar-2.9-r1
-2204061339 metadata/md5-cache/app-vim/cctree-1.61-r1
-2204061339 metadata/md5-cache/app-vim/cecutil-17
-2204061339 metadata/md5-cache/app-vim/cfengine-syntax-20141019
-2204061339 metadata/md5-cache/app-vim/checkattach-0.17
-2204061339 metadata/md5-cache/app-vim/closetag-0.9.1-r1
-2204061339 metadata/md5-cache/app-vim/cmdalias-3.0-r1
-2204061339 metadata/md5-cache/app-vim/colorschemes-20140623-r1
-2204061339 metadata/md5-cache/app-vim/colorsel-20100406
-2204061339 metadata/md5-cache/app-vim/csound-syntax-0.8.1
-2204061339 metadata/md5-cache/app-vim/csound-syntax-20160804
-2204061339 metadata/md5-cache/app-vim/csscomplete-1.0
-2204061339 metadata/md5-cache/app-vim/csv-0.31-r1
-2204061339 metadata/md5-cache/app-vim/ctrlp-1.80
-2204061339 metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
-2204061339 metadata/md5-cache/app-vim/ctx-1.17-r1
-2204061339 metadata/md5-cache/app-vim/curcmdmode-1.0-r1
-2204061339 metadata/md5-cache/app-vim/cvsmenu-1.147-r1
-2204061339 metadata/md5-cache/app-vim/dbext-26.00
-2204061339 metadata/md5-cache/app-vim/detectindent-1.0_p20150908
-2204061339 metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
-2204061339 metadata/md5-cache/app-vim/diffchar-8.2
-2204061339 metadata/md5-cache/app-vim/diffchar-8.6
-2204061339 metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
-2204061339 metadata/md5-cache/app-vim/easy-align-2.10.0-r1
-2204061339 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
-2204061339 metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
-2204061339 metadata/md5-cache/app-vim/emmet-0.85-r1
-2204061339 metadata/md5-cache/app-vim/emmet-9999
-2204061339 metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
-2204061339 metadata/md5-cache/app-vim/errsign-0.1-r1
-2204061339 metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
-2204061339 metadata/md5-cache/app-vim/exheres-syntax-20090310
-2204061339 metadata/md5-cache/app-vim/exheres-syntax-99999999
-2204061339 metadata/md5-cache/app-vim/extra-syntax-4-r2
-2204061339 metadata/md5-cache/app-vim/ferret-4.0
-2204061339 metadata/md5-cache/app-vim/ferret-5.0
-2204061339 metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
-2204061339 metadata/md5-cache/app-vim/foldutil-3.0-r1
-2204061339 metadata/md5-cache/app-vim/frawor-0.2.3
-2204061339 metadata/md5-cache/app-vim/frawor-0.2.3-r1
-2204061339 metadata/md5-cache/app-vim/fugitive-2.4
-2204061339 metadata/md5-cache/app-vim/fugitive-2.5
-2204061339 metadata/md5-cache/app-vim/fugitive-3.1
-2204061339 metadata/md5-cache/app-vim/fugitive-3.2
-2204061339 metadata/md5-cache/app-vim/fugitive-3.4
-2204061339 metadata/md5-cache/app-vim/fugitive-9999
-2204061339 metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
-2204061339 metadata/md5-cache/app-vim/genindent-1.1-r1
-2204061339 metadata/md5-cache/app-vim/gentoo-syntax-9999
-2204061339 metadata/md5-cache/app-vim/genutils-2.5-r1
-2204061339 metadata/md5-cache/app-vim/gist-7.3
-2204061339 metadata/md5-cache/app-vim/git-patch-tags-0.2
-2204061339 metadata/md5-cache/app-vim/gitgutter-20180316
-2204061339 metadata/md5-cache/app-vim/gitgutter-20180815
-2204061339 metadata/md5-cache/app-vim/gitgutter-99999999
-2204061339 metadata/md5-cache/app-vim/gitlog-5.1.0
-2204061339 metadata/md5-cache/app-vim/gitlog-6.0.0
-2204061339 metadata/md5-cache/app-vim/gitlog-9999
-2204061339 metadata/md5-cache/app-vim/gitolite-syntax-20111225
-2204061339 metadata/md5-cache/app-vim/gitolite-syntax-20130306
-2204061339 metadata/md5-cache/app-vim/gitv-1.3.1
-2204061339 metadata/md5-cache/app-vim/gitv-9999
-2204061339 metadata/md5-cache/app-vim/gnupg-2.6
-2204061339 metadata/md5-cache/app-vim/gnupg-2.7.1
-2204061339 metadata/md5-cache/app-vim/greputils-2.8-r1
-2204061339 metadata/md5-cache/app-vim/haskellmode-20101118-r1
-2204061339 metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
-2204061339 metadata/md5-cache/app-vim/increment-1.1-r1
-2204061339 metadata/md5-cache/app-vim/indentpython-0.3
-2204061339 metadata/md5-cache/app-vim/info-1.7-r2
-2204061339 metadata/md5-cache/app-vim/json-20150511
-2204061339 metadata/md5-cache/app-vim/l9-1.1
-2204061339 metadata/md5-cache/app-vim/languagetool-1.30
-2204061339 metadata/md5-cache/app-vim/lightline-9999
-2204061339 metadata/md5-cache/app-vim/locateopen-1.3-r1
-2204061339 metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
-2204061339 metadata/md5-cache/app-vim/lustyexplorer-5.0
-2204061339 metadata/md5-cache/app-vim/matrix-1.10-r1
-2204061339 metadata/md5-cache/app-vim/mediawiki-20151115
-2204061339 metadata/md5-cache/app-vim/merginal-2.1.0
-2204061339 metadata/md5-cache/app-vim/merginal-2.1.2
-2204061339 metadata/md5-cache/app-vim/merginal-9999
-2204061339 metadata/md5-cache/app-vim/minibufexpl-6.5.2
-2204061339 metadata/md5-cache/app-vim/molokai-0.1_p20151115
-2204061339 metadata/md5-cache/app-vim/multiplesearch-1.3
-2204061339 metadata/md5-cache/app-vim/multvals-3.10-r1
-2204061339 metadata/md5-cache/app-vim/nagios-syntax-1.8
-2204061339 metadata/md5-cache/app-vim/neocomplcache-7.1-r1
-2204061339 metadata/md5-cache/app-vim/nerdcommenter-2.5.2
-2204061339 metadata/md5-cache/app-vim/nerdcommenter-9999
-2204061339 metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
-2204061339 metadata/md5-cache/app-vim/nerdtree-6.4.1
-2204061339 metadata/md5-cache/app-vim/nerdtree-6.4.3
-2204061339 metadata/md5-cache/app-vim/nerdtree-9999
-2204061339 metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
-2204061339 metadata/md5-cache/app-vim/nginx-syntax-0.3.3
-2204061339 metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
-2204061339 metadata/md5-cache/app-vim/omnicppcomplete-0.41
-2204061339 metadata/md5-cache/app-vim/pathogen-2.4-r1
-2204061339 metadata/md5-cache/app-vim/pdv-1.0.1-r1
-2204061339 metadata/md5-cache/app-vim/perl-support-5.3.2
-2204061339 metadata/md5-cache/app-vim/perl-support-5.4
-2204061339 metadata/md5-cache/app-vim/perlomni-2.5
-2204061339 metadata/md5-cache/app-vim/pfsyntax-1.3
-2204061339 metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
-2204061339 metadata/md5-cache/app-vim/phpdocs-0.26-r1
-2204061339 metadata/md5-cache/app-vim/project-1.4.1
-2204061339 metadata/md5-cache/app-vim/puppet-syntax-3.0.1
-2204061339 metadata/md5-cache/app-vim/pushpop-4.0-r1
-2204061339 metadata/md5-cache/app-vim/pytest-1.1.4
-2204061339 metadata/md5-cache/app-vim/rails-5.2
-2204061339 metadata/md5-cache/app-vim/rainbow_parentheses-1.0
-2204061339 metadata/md5-cache/app-vim/recover-0.18
-2204061339 metadata/md5-cache/app-vim/reload-0.6.17-r1
-2204061339 metadata/md5-cache/app-vim/repeat-1.1
-2204061339 metadata/md5-cache/app-vim/ri-browser-1.2-r1
-2204061339 metadata/md5-cache/app-vim/rust-vim-1_pre20210215
-2204061339 metadata/md5-cache/app-vim/salt-vim-20151119
-2204061339 metadata/md5-cache/app-vim/scala-syntax-1.0-r1
-2204061339 metadata/md5-cache/app-vim/screen-1.5
-2204061339 metadata/md5-cache/app-vim/searchcomplete-1.1-r1
-2204061339 metadata/md5-cache/app-vim/securemodelines-20140926
-2204061339 metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
-2204061339 metadata/md5-cache/app-vim/session-2.13.1
-2204061339 metadata/md5-cache/app-vim/showmarks-2.2-r1
-2204061339 metadata/md5-cache/app-vim/sleuth-1.1
-2204061339 metadata/md5-cache/app-vim/snipmate-0.87-r1
-2204061339 metadata/md5-cache/app-vim/sudoedit-0.21
-2204061339 metadata/md5-cache/app-vim/supertab-2.1
-2204061339 metadata/md5-cache/app-vim/surround-2.1-r1
-2204061339 metadata/md5-cache/app-vim/syntastic-3.9.0
-2204061339 metadata/md5-cache/app-vim/syntastic-9999
-2204061339 metadata/md5-cache/app-vim/tagbar-2.7
-2204061339 metadata/md5-cache/app-vim/taglist-4.6
-2204061339 metadata/md5-cache/app-vim/tasklist-1.0.1
-2204061339 metadata/md5-cache/app-vim/tcomment-3.08.1
-2204061339 metadata/md5-cache/app-vim/tcomment-9999
-2204061339 metadata/md5-cache/app-vim/thlnk-1.2.1-r1
-2204061339 metadata/md5-cache/app-vim/tlib-1.22
-2204061339 metadata/md5-cache/app-vim/tlib-1.23
-2204061339 metadata/md5-cache/app-vim/tlib-1.27
-2204061339 metadata/md5-cache/app-vim/tmpl-0.1-r1
-2204061339 metadata/md5-cache/app-vim/toggle-0.5-r1
-2204061339 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
-2204061339 metadata/md5-cache/app-vim/txtfmt-2.4-r1
-2204061339 metadata/md5-cache/app-vim/txtfmt-3.1
-2204061339 metadata/md5-cache/app-vim/udev-syntax-20051016-r2
-2204061339 metadata/md5-cache/app-vim/undotree-6.0
-2204061339 metadata/md5-cache/app-vim/undotree-9999
-2204061339 metadata/md5-cache/app-vim/unite-4.0-r1
-2204061339 metadata/md5-cache/app-vim/unite-4.1
-2204061339 metadata/md5-cache/app-vim/uptime-1.3-r1
-2204061339 metadata/md5-cache/app-vim/vcscommand-1.99.47
-2204061339 metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
-2204061339 metadata/md5-cache/app-vim/vim-autoclose-2.0
-2204061339 metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
-2204061339 metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
-2204061339 metadata/md5-cache/app-vim/vim-flake8-1.6
-2204061339 metadata/md5-cache/app-vim/vim-go-1.13
-2204061339 metadata/md5-cache/app-vim/vim-go-1.19
-2204061339 metadata/md5-cache/app-vim/vim-go-1.20
-2204061339 metadata/md5-cache/app-vim/vim-hoogle-1.3
-2204061339 metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
-2204061339 metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
-2204061339 metadata/md5-cache/app-vim/vim-misc-1.17.6
-2204061339 metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
-2204061339 metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
-2204061339 metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
-2204061339 metadata/md5-cache/app-vim/vim-r-1.2.6
-2204061339 metadata/md5-cache/app-vim/vim-rest-console-2.6.0
-2204061339 metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
-2204061339 metadata/md5-cache/app-vim/vimagit-1.7.3
-2204061339 metadata/md5-cache/app-vim/vimagit-9999
-2204061339 metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
-2204061339 metadata/md5-cache/app-vim/vimcdoc-1.9.0
-2204061339 metadata/md5-cache/app-vim/vimcdoc-2.1.0
-2204061339 metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
-2204061339 metadata/md5-cache/app-vim/vimcommander-0.81
-2204061339 metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
-2204061339 metadata/md5-cache/app-vim/vimtex-1.5
-2204061339 metadata/md5-cache/app-vim/vimtex-99999999
-2204061339 metadata/md5-cache/app-vim/webapi-0.3
-2204061339 metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
-2204061339 metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
-2204061339 metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
-2204061339 metadata/md5-cache/app-vim/yankring-19.0
-2204061339 metadata/md5-cache/app-vim/yankring-19.0-r1
-2204061339 metadata/md5-cache/app-vim/zenburn-2.25
-2204061339 metadata/md5-cache/app-vim/zoomwin-24-r1
-2204271440 metadata/md5-cache/app-vim/gentoo-syntax-1
-2205041140 metadata/md5-cache/app-vim/eselect-syntax-20070506-r2
-2205071440 metadata/md5-cache/app-vim/gentoo-syntax-2
-2205141040 metadata/md5-cache/app-vim/vim-tmux-3.0.0
-2205171510 metadata/md5-cache/app-vim/Manifest.gz
-2205170654 metadata/md5-cache/app-vim/command-t-5.0.3-r1
-2205171510 metadata/md5-cache/app-vim/gtk-syntax-20130716
-2205170654 metadata/md5-cache/app-vim/gundo-2.6.2-r3
-2205170654 metadata/md5-cache/app-vim/iris-1.0.0
-2205170654 metadata/md5-cache/app-vim/jedi-0.10.0
-2205170654 metadata/md5-cache/app-vim/pyclewn-2.1-r2
-2205170654 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
-2205170654 metadata/md5-cache/app-vim/pydoc-2.0-r1
-2205170654 metadata/md5-cache/app-vim/splice-1.1.0-r3
-2205170654 metadata/md5-cache/app-vim/splice-1.1.0-r4
-2205170654 metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
-2205170654 metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
-2205170654 metadata/md5-cache/app-vim/vimpython-1.13-r3
-2205170654 metadata/md5-cache/app-vim/voom-5.3-r1
+2205301610 metadata/md5-cache/app-vim/Manifest.gz
+2205301610 metadata/md5-cache/app-vim/Vim-Jinja2-Syntax-0.0_pre20210604
+2205301610 metadata/md5-cache/app-vim/ackvim-1.0.9-r1
+2205301610 metadata/md5-cache/app-vim/airline-0.11
+2205301610 metadata/md5-cache/app-vim/airline-9999
+2205301610 metadata/md5-cache/app-vim/airline-themes-0_pre20181021
+2205301610 metadata/md5-cache/app-vim/airline-themes-9999
+2205301610 metadata/md5-cache/app-vim/align-43
+2205301610 metadata/md5-cache/app-vim/alternate-2.18-r2
+2205301610 metadata/md5-cache/app-vim/ansiesc-12
+2205301610 metadata/md5-cache/app-vim/ant_menu-0.5.7.1-r1
+2205301610 metadata/md5-cache/app-vim/autoalign-14
+2205301610 metadata/md5-cache/app-vim/bash-support-4.2.1
+2205301610 metadata/md5-cache/app-vim/bash-support-4.3
+2205301610 metadata/md5-cache/app-vim/bnf-syntax-1.2-r2
+2205301610 metadata/md5-cache/app-vim/brainfuck-syntax-1.0.3-r1
+2205301610 metadata/md5-cache/app-vim/breakpts-4.0-r1
+2205301610 metadata/md5-cache/app-vim/breakpts-4.0-r2
+2205301610 metadata/md5-cache/app-vim/bufexplorer-7.4.18
+2205301610 metadata/md5-cache/app-vim/bufexplorer-7.4.19
+2205301610 metadata/md5-cache/app-vim/bufexplorer-9999
+2205301610 metadata/md5-cache/app-vim/c-support-6.1.1
+2205301610 metadata/md5-cache/app-vim/calendar-2.9-r1
+2205301610 metadata/md5-cache/app-vim/cctree-1.61-r1
+2205301610 metadata/md5-cache/app-vim/cecutil-17
+2205301610 metadata/md5-cache/app-vim/cfengine-syntax-20141019
+2205301610 metadata/md5-cache/app-vim/checkattach-0.17
+2205301610 metadata/md5-cache/app-vim/closetag-0.9.1-r1
+2205301610 metadata/md5-cache/app-vim/cmdalias-3.0-r1
+2205301610 metadata/md5-cache/app-vim/colorschemes-20140623-r1
+2205301610 metadata/md5-cache/app-vim/colorsel-20100406
+2205301610 metadata/md5-cache/app-vim/command-t-5.0.3-r1
+2205301610 metadata/md5-cache/app-vim/csound-syntax-0.8.1
+2205301610 metadata/md5-cache/app-vim/csound-syntax-20160804
+2205301610 metadata/md5-cache/app-vim/csscomplete-1.0
+2205301610 metadata/md5-cache/app-vim/csv-0.31-r1
+2205301610 metadata/md5-cache/app-vim/ctrlp-1.80
+2205301610 metadata/md5-cache/app-vim/ctrlp-1.80_p20180418
+2205301610 metadata/md5-cache/app-vim/ctx-1.17-r1
+2205301610 metadata/md5-cache/app-vim/curcmdmode-1.0-r1
+2205301610 metadata/md5-cache/app-vim/cvsmenu-1.147-r1
+2205301610 metadata/md5-cache/app-vim/dbext-26.00
+2205301610 metadata/md5-cache/app-vim/detectindent-1.0_p20150908
+2205301610 metadata/md5-cache/app-vim/dhcpd-syntax-20030825-r1
+2205301610 metadata/md5-cache/app-vim/diffchar-8.2
+2205301610 metadata/md5-cache/app-vim/diffchar-8.6
+2205301610 metadata/md5-cache/app-vim/dirdiff-1.1.5-r1
+2205301610 metadata/md5-cache/app-vim/easy-align-2.10.0-r1
+2205301610 metadata/md5-cache/app-vim/ebnf-syntax-1.1-r2
+2205301610 metadata/md5-cache/app-vim/editorconfig-vim-1.1.1
+2205301610 metadata/md5-cache/app-vim/emmet-0.85-r1
+2205301610 metadata/md5-cache/app-vim/emmet-9999
+2205301610 metadata/md5-cache/app-vim/enhancedcommentify-2.3-r1
+2205301610 metadata/md5-cache/app-vim/errsign-0.1-r1
+2205301610 metadata/md5-cache/app-vim/eruby-syntax-2.0-r2
+2205301610 metadata/md5-cache/app-vim/eselect-syntax-20070506-r2
+2205301610 metadata/md5-cache/app-vim/exheres-syntax-20090310
+2205301610 metadata/md5-cache/app-vim/exheres-syntax-99999999
+2205301610 metadata/md5-cache/app-vim/extra-syntax-4-r2
+2205301610 metadata/md5-cache/app-vim/ferret-4.0
+2205301610 metadata/md5-cache/app-vim/ferret-5.0
+2205301610 metadata/md5-cache/app-vim/fluxbox-syntax-1.5-r1
+2205301610 metadata/md5-cache/app-vim/foldutil-3.0-r1
+2205301610 metadata/md5-cache/app-vim/frawor-0.2.3
+2205301610 metadata/md5-cache/app-vim/frawor-0.2.3-r1
+2205301610 metadata/md5-cache/app-vim/fugitive-2.4
+2205301610 metadata/md5-cache/app-vim/fugitive-2.5
+2205301610 metadata/md5-cache/app-vim/fugitive-3.1
+2205301610 metadata/md5-cache/app-vim/fugitive-3.2
+2205301610 metadata/md5-cache/app-vim/fugitive-3.4
+2205301610 metadata/md5-cache/app-vim/fugitive-9999
+2205301610 metadata/md5-cache/app-vim/fuzzyfinder-4.2.2
+2205301610 metadata/md5-cache/app-vim/genindent-1.1-r1
+2205301610 metadata/md5-cache/app-vim/gentoo-syntax-1
+2205301610 metadata/md5-cache/app-vim/gentoo-syntax-2
+2205301610 metadata/md5-cache/app-vim/gentoo-syntax-9999
+2205301610 metadata/md5-cache/app-vim/genutils-2.5-r1
+2205301610 metadata/md5-cache/app-vim/gist-7.3
+2205301610 metadata/md5-cache/app-vim/git-patch-tags-0.2
+2205301610 metadata/md5-cache/app-vim/gitgutter-20180316
+2205301610 metadata/md5-cache/app-vim/gitgutter-20180815
+2205301610 metadata/md5-cache/app-vim/gitgutter-99999999
+2205301610 metadata/md5-cache/app-vim/gitlog-5.1.0
+2205301610 metadata/md5-cache/app-vim/gitlog-6.0.0
+2205301610 metadata/md5-cache/app-vim/gitlog-9999
+2205301610 metadata/md5-cache/app-vim/gitolite-syntax-20111225
+2205301610 metadata/md5-cache/app-vim/gitolite-syntax-20130306
+2205301610 metadata/md5-cache/app-vim/gitv-1.3.1
+2205301610 metadata/md5-cache/app-vim/gitv-9999
+2205301610 metadata/md5-cache/app-vim/gnupg-2.6
+2205301610 metadata/md5-cache/app-vim/gnupg-2.7.1
+2205301610 metadata/md5-cache/app-vim/greputils-2.8-r1
+2205301610 metadata/md5-cache/app-vim/gtk-syntax-20130716
+2205301610 metadata/md5-cache/app-vim/gundo-2.6.2-r3
+2205301610 metadata/md5-cache/app-vim/haskellmode-20101118-r1
+2205301610 metadata/md5-cache/app-vim/help-extra-syntax-20050106-r2
+2205301610 metadata/md5-cache/app-vim/increment-1.1-r1
+2205301610 metadata/md5-cache/app-vim/indentpython-0.3
+2205301610 metadata/md5-cache/app-vim/info-1.7-r2
+2205301610 metadata/md5-cache/app-vim/iris-1.0.0
+2205301610 metadata/md5-cache/app-vim/jedi-0.10.0
+2205301610 metadata/md5-cache/app-vim/json-20150511
+2205301610 metadata/md5-cache/app-vim/l9-1.1
+2205301610 metadata/md5-cache/app-vim/languagetool-1.30
+2205301610 metadata/md5-cache/app-vim/lightline-9999
+2205301610 metadata/md5-cache/app-vim/locateopen-1.3-r1
+2205301610 metadata/md5-cache/app-vim/lustyexplorer-4.3-r1
+2205301610 metadata/md5-cache/app-vim/lustyexplorer-5.0
+2205301610 metadata/md5-cache/app-vim/matrix-1.10-r1
+2205301610 metadata/md5-cache/app-vim/mediawiki-20151115
+2205301610 metadata/md5-cache/app-vim/merginal-2.1.0
+2205301610 metadata/md5-cache/app-vim/merginal-2.1.2
+2205301610 metadata/md5-cache/app-vim/merginal-9999
+2205301610 metadata/md5-cache/app-vim/minibufexpl-6.5.2
+2205301610 metadata/md5-cache/app-vim/molokai-0.1_p20151115
+2205301610 metadata/md5-cache/app-vim/multiplesearch-1.3
+2205301610 metadata/md5-cache/app-vim/multvals-3.10-r1
+2205301610 metadata/md5-cache/app-vim/nagios-syntax-1.8
+2205301610 metadata/md5-cache/app-vim/neocomplcache-7.1-r1
+2205301610 metadata/md5-cache/app-vim/nerdcommenter-2.5.2
+2205301610 metadata/md5-cache/app-vim/nerdcommenter-9999
+2205301610 metadata/md5-cache/app-vim/nerdtree-5.0.0-r1
+2205301610 metadata/md5-cache/app-vim/nerdtree-6.4.1
+2205301610 metadata/md5-cache/app-vim/nerdtree-6.4.3
+2205301610 metadata/md5-cache/app-vim/nerdtree-9999
+2205301610 metadata/md5-cache/app-vim/nerdtree-tabs-1.4.7
+2205301610 metadata/md5-cache/app-vim/nginx-syntax-0.3.3
+2205301610 metadata/md5-cache/app-vim/ntp-syntax-20031001-r1
+2205301610 metadata/md5-cache/app-vim/omnicppcomplete-0.41
+2205301610 metadata/md5-cache/app-vim/pathogen-2.4-r1
+2205301610 metadata/md5-cache/app-vim/pdv-1.0.1-r1
+2205301610 metadata/md5-cache/app-vim/perl-support-5.3.2
+2205301610 metadata/md5-cache/app-vim/perl-support-5.4
+2205301610 metadata/md5-cache/app-vim/perlomni-2.5
+2205301610 metadata/md5-cache/app-vim/pfsyntax-1.3
+2205301610 metadata/md5-cache/app-vim/pgn-syntax-1.0-r1
+2205301610 metadata/md5-cache/app-vim/phpdocs-0.26-r1
+2205301610 metadata/md5-cache/app-vim/project-1.4.1
+2205301610 metadata/md5-cache/app-vim/puppet-syntax-3.0.1
+2205301610 metadata/md5-cache/app-vim/pushpop-4.0-r1
+2205301610 metadata/md5-cache/app-vim/pyclewn-2.1-r2
+2205301610 metadata/md5-cache/app-vim/pydiction-1.2.3-r2
+2205301610 metadata/md5-cache/app-vim/pydoc-2.0-r1
+2205301610 metadata/md5-cache/app-vim/pytest-1.1.4
+2205301610 metadata/md5-cache/app-vim/rails-5.2
+2205301610 metadata/md5-cache/app-vim/rainbow_parentheses-1.0
+2205301610 metadata/md5-cache/app-vim/recover-0.18
+2205301610 metadata/md5-cache/app-vim/reload-0.6.17-r1
+2205301610 metadata/md5-cache/app-vim/repeat-1.1
+2205301610 metadata/md5-cache/app-vim/ri-browser-1.2-r1
+2205301610 metadata/md5-cache/app-vim/rust-vim-1_pre20210215
+2205301610 metadata/md5-cache/app-vim/salt-vim-20151119
+2205301610 metadata/md5-cache/app-vim/scala-syntax-1.0-r1
+2205301610 metadata/md5-cache/app-vim/screen-1.5
+2205301610 metadata/md5-cache/app-vim/searchcomplete-1.1-r1
+2205301610 metadata/md5-cache/app-vim/securemodelines-20140926
+2205301610 metadata/md5-cache/app-vim/selinux-syntax-20041225-r1
+2205301610 metadata/md5-cache/app-vim/session-2.13.1
+2205301610 metadata/md5-cache/app-vim/showmarks-2.2-r1
+2205301610 metadata/md5-cache/app-vim/sleuth-1.1
+2205301610 metadata/md5-cache/app-vim/snipmate-0.87-r1
+2205301610 metadata/md5-cache/app-vim/splice-1.1.0-r3
+2205301610 metadata/md5-cache/app-vim/splice-1.1.0-r4
+2205301610 metadata/md5-cache/app-vim/sudoedit-0.21
+2205301610 metadata/md5-cache/app-vim/supertab-2.1
+2205301610 metadata/md5-cache/app-vim/surround-2.1-r1
+2205301610 metadata/md5-cache/app-vim/syntastic-3.9.0
+2205301610 metadata/md5-cache/app-vim/syntastic-9999
+2205301610 metadata/md5-cache/app-vim/tagbar-2.7
+2205301610 metadata/md5-cache/app-vim/taglist-4.6
+2205301610 metadata/md5-cache/app-vim/tasklist-1.0.1
+2205301610 metadata/md5-cache/app-vim/tcomment-3.08.1
+2205301610 metadata/md5-cache/app-vim/tcomment-9999
+2205301610 metadata/md5-cache/app-vim/thlnk-1.2.1-r1
+2205301610 metadata/md5-cache/app-vim/tlib-1.22
+2205301610 metadata/md5-cache/app-vim/tlib-1.23
+2205301610 metadata/md5-cache/app-vim/tlib-1.27
+2205301610 metadata/md5-cache/app-vim/tmpl-0.1-r1
+2205301610 metadata/md5-cache/app-vim/toggle-0.5-r1
+2205301610 metadata/md5-cache/app-vim/tt2-syntax-1.13-r1
+2205301610 metadata/md5-cache/app-vim/txtfmt-2.4-r1
+2205301610 metadata/md5-cache/app-vim/txtfmt-3.1
+2205301610 metadata/md5-cache/app-vim/udev-syntax-20051016-r2
+2205301610 metadata/md5-cache/app-vim/undotree-6.0
+2205301610 metadata/md5-cache/app-vim/undotree-9999
+2205301610 metadata/md5-cache/app-vim/unite-4.0-r1
+2205301610 metadata/md5-cache/app-vim/unite-4.1
+2205301610 metadata/md5-cache/app-vim/uptime-1.3-r1
+2205301610 metadata/md5-cache/app-vim/vcscommand-1.99.47
+2205301610 metadata/md5-cache/app-vim/vim-addon-mw-utils-20121105
+2205301610 metadata/md5-cache/app-vim/vim-autoclose-2.0
+2205301610 metadata/md5-cache/app-vim/vim-clang-format-0_pre20200506
+2205301610 metadata/md5-cache/app-vim/vim-commentary-1.3_p20180530
+2205301610 metadata/md5-cache/app-vim/vim-flake8-1.6
+2205301610 metadata/md5-cache/app-vim/vim-go-1.13
+2205301610 metadata/md5-cache/app-vim/vim-go-1.19
+2205301610 metadata/md5-cache/app-vim/vim-go-1.20
+2205301610 metadata/md5-cache/app-vim/vim-hoogle-1.3
+2205301610 metadata/md5-cache/app-vim/vim-jq-0.0_pre20210226
+2205301610 metadata/md5-cache/app-vim/vim-jsonnet-0_pre20190502
+2205301610 metadata/md5-cache/app-vim/vim-latex-1.10.0-r2
+2205301610 metadata/md5-cache/app-vim/vim-misc-1.17.6
+2205301610 metadata/md5-cache/app-vim/vim-multiple-cursors-2.2-r1
+2205301610 metadata/md5-cache/app-vim/vim-nftables-0_pre20200224
+2205301610 metadata/md5-cache/app-vim/vim-nftables-0_pre20200629-r1
+2205301610 metadata/md5-cache/app-vim/vim-r-1.2.6
+2205301610 metadata/md5-cache/app-vim/vim-rest-console-2.6.0
+2205301610 metadata/md5-cache/app-vim/vim-tmux-3.0.0
+2205301610 metadata/md5-cache/app-vim/vim2hs-0.1_p20171106
+2205301610 metadata/md5-cache/app-vim/vimagit-1.7.3
+2205301610 metadata/md5-cache/app-vim/vimagit-9999
+2205301610 metadata/md5-cache/app-vim/vimbuddy-0.9.2-r1
+2205301610 metadata/md5-cache/app-vim/vimcdoc-1.9.0
+2205301610 metadata/md5-cache/app-vim/vimcdoc-2.1.0
+2205301610 metadata/md5-cache/app-vim/vimclojure-2.3.6-r3
+2205301610 metadata/md5-cache/app-vim/vimcommander-0.81
+2205301610 metadata/md5-cache/app-vim/vimoutliner-0.3.6-r1
+2205301610 metadata/md5-cache/app-vim/vimoutliner-0.4.0_p20180301-r2
+2205301610 metadata/md5-cache/app-vim/vimpython-1.13-r3
+2205301610 metadata/md5-cache/app-vim/vimtex-1.5
+2205301610 metadata/md5-cache/app-vim/vimtex-99999999
+2205301610 metadata/md5-cache/app-vim/voom-5.3-r1
+2205301610 metadata/md5-cache/app-vim/webapi-0.3
+2205301610 metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
+2205301610 metadata/md5-cache/app-vim/xquery-syntax-0.1-r2
+2205301610 metadata/md5-cache/app-vim/xsl-syntax-0.3.11-r2
+2205301610 metadata/md5-cache/app-vim/yankring-19.0
+2205301610 metadata/md5-cache/app-vim/yankring-19.0-r1
+2205301610 metadata/md5-cache/app-vim/zenburn-2.25
+2205301610 metadata/md5-cache/app-vim/zoomwin-24-r1
 2203240726 metadata/md5-cache/app-xemacs/apel-1.36
 2203240726 metadata/md5-cache/app-xemacs/bbdb-1.34
 2203240726 metadata/md5-cache/app-xemacs/debug-1.20
@@ -36304,7 +36299,6 @@
 2004032241 metadata/md5-cache/dev-cpp/asio-1.10.8
 2104192239 metadata/md5-cache/dev-cpp/metslib-0.5.3
 1702282310 metadata/md5-cache/dev-cpp/pngpp-0.2.9
-2108060709 metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.2
 2112262240 metadata/md5-cache/dev-cpp/asio-1.21.0
 2203240726 metadata/md5-cache/dev-cpp/sourcetrail-2019.3.46-r2
 2205170654 metadata/md5-cache/dev-cpp/ETL-1.4.1
@@ -36345,10 +36339,8 @@
 2205170654 metadata/md5-cache/dev-cpp/gflags-2.2.2
 2205170654 metadata/md5-cache/dev-cpp/gflags-9999
 2205170654 metadata/md5-cache/dev-cpp/glibmm-2.66.2
-2205190840 metadata/md5-cache/dev-cpp/glibmm-2.66.4
 2205170654 metadata/md5-cache/dev-cpp/glibmm-2.70.0
 2205170654 metadata/md5-cache/dev-cpp/glibmm-2.72.0
-2205170654 metadata/md5-cache/dev-cpp/glibmm-2.72.1
 2205170654 metadata/md5-cache/dev-cpp/glog-0.4.0
 2205170654 metadata/md5-cache/dev-cpp/glog-0.5.0
 2205170654 metadata/md5-cache/dev-cpp/gstreamermm-1.10.0-r1
@@ -36356,7 +36348,6 @@
 2205170654 metadata/md5-cache/dev-cpp/gtest-9999
 2205170654 metadata/md5-cache/dev-cpp/gtkmm-2.24.5-r1
 2205170654 metadata/md5-cache/dev-cpp/gtkmm-3.24.5
-2205170654 metadata/md5-cache/dev-cpp/gtkmm-3.24.6
 2205170654 metadata/md5-cache/dev-cpp/gtkmm-4.6.0
 2205170654 metadata/md5-cache/dev-cpp/gtkmm-4.6.1
 2205170654 metadata/md5-cache/dev-cpp/gtksourceviewmm-3.18.0-r2
@@ -36400,12 +36391,9 @@
 2205170654 metadata/md5-cache/dev-cpp/range-v3-0.10.0-r1
 2205170654 metadata/md5-cache/dev-cpp/range-v3-0.11.0
 2205170654 metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
-2205170654 metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5
 2205170654 metadata/md5-cache/dev-cpp/robin-hood-hashing-3.11.5-r1
 2205170654 metadata/md5-cache/dev-cpp/robin-map-0.6.3
 2205170654 metadata/md5-cache/dev-cpp/robin-map-9999
-2205170654 metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r2
-2205170654 metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r2
 2205170654 metadata/md5-cache/dev-cpp/sol2-3.2.2
 2205170654 metadata/md5-cache/dev-cpp/sparsehash-2.0.4
 2205170654 metadata/md5-cache/dev-cpp/string-theory-3.3
@@ -36430,8 +36418,14 @@
 2205170654 metadata/md5-cache/dev-cpp/yaml-cpp-0.6.3-r4
 2205170654 metadata/md5-cache/dev-cpp/yaml-cpp-0.7.0-r1
 2205231010 metadata/md5-cache/dev-cpp/asio-1.22.1
-2205251440 metadata/md5-cache/dev-cpp/Manifest.gz
 2205251440 metadata/md5-cache/dev-cpp/muParser-2.3.3
+2205301410 metadata/md5-cache/dev-cpp/Manifest.gz
+2205280910 metadata/md5-cache/dev-cpp/glibmm-2.66.4
+2205280910 metadata/md5-cache/dev-cpp/glibmm-2.72.1
+2205280910 metadata/md5-cache/dev-cpp/gtkmm-3.24.6
+2205301410 metadata/md5-cache/dev-cpp/prometheus-cpp-1.0.1
+2205291610 metadata/md5-cache/dev-cpp/sdbus-c++-0.9.0-r3
+2205291610 metadata/md5-cache/dev-cpp/sdbus-c++-1.1.0-r3
 2107250309 metadata/md5-cache/dev-db/freetds-1.2.18
 1702282310 metadata/md5-cache/dev-db/gigabase-3.83-r2
 2102252239 metadata/md5-cache/dev-db/lmdb++-0.9.14.0
@@ -36739,14 +36733,14 @@
 2205170654 metadata/md5-cache/dev-embedded/stm32flash-0.6
 2205170654 metadata/md5-cache/dev-embedded/sunxi-tools-1.3-r1
 2205170654 metadata/md5-cache/dev-embedded/sunxi-tools-1.4.1-r1
-2205170654 metadata/md5-cache/dev-embedded/u-boot-tools-2022.01
-2205170654 metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
 2205170654 metadata/md5-cache/dev-embedded/uisp-20050207-r1
 2205170654 metadata/md5-cache/dev-embedded/urjtag-9999
 2205170654 metadata/md5-cache/dev-embedded/usbprog-0.3.0_p20140828-r1
 2205170654 metadata/md5-cache/dev-embedded/xa-2.3.13
 2205170654 metadata/md5-cache/dev-embedded/zmac-1.3-r1
-2205260940 metadata/md5-cache/dev-embedded/Manifest.gz
+2205292110 metadata/md5-cache/dev-embedded/Manifest.gz
+2205292110 metadata/md5-cache/dev-embedded/mavlink_c-20220518
+2205281940 metadata/md5-cache/dev-embedded/u-boot-tools-2022.04
 2204121040 metadata/md5-cache/dev-erlang/base64url-1.0.1
 2204121040 metadata/md5-cache/dev-erlang/cache_tab-1.0.29
 2204121040 metadata/md5-cache/dev-erlang/eimp-1.0.21
@@ -37796,7 +37790,6 @@
 2205051240 metadata/md5-cache/dev-java/failureaccess-30.1.1
 2205051240 metadata/md5-cache/dev-java/findbugs-annotations-3.0.1
 2205051240 metadata/md5-cache/dev-java/fontbox-2.0.24
-2205051240 metadata/md5-cache/dev-java/glazedlists-1.8.0-r2
 2205051240 metadata/md5-cache/dev-java/gnu-regexp-1.1.4-r4
 2205051240 metadata/md5-cache/dev-java/guava-20.0-r1
 2205051240 metadata/md5-cache/dev-java/guava-30.1.1
@@ -37893,7 +37886,6 @@
 2205051240 metadata/md5-cache/dev-java/lzmajio-0.95-r3
 2205051240 metadata/md5-cache/dev-java/mchange-commons-0.2.20
 2205051240 metadata/md5-cache/dev-java/mersennetwister-0_pre23765-r2
-2205051240 metadata/md5-cache/dev-java/microba-0.4.4.3-r2
 2205051240 metadata/md5-cache/dev-java/mockito-1.9.5-r2
 2205051240 metadata/md5-cache/dev-java/mockito-4.4.0
 2205051240 metadata/md5-cache/dev-java/msv-20130601
@@ -37927,7 +37919,6 @@
 2205051240 metadata/md5-cache/dev-java/slf4j-simple-1.7.36
 2205051240 metadata/md5-cache/dev-java/snakeyaml-1.30
 2205051240 metadata/md5-cache/dev-java/sparsebitset-1.2
-2205051240 metadata/md5-cache/dev-java/spin-1.5-r2
 2205051240 metadata/md5-cache/dev-java/stringtemplate-3.2.1-r2
 2205052110 metadata/md5-cache/dev-java/stringtemplate-4.3.2
 2205051240 metadata/md5-cache/dev-java/swing-layout-1.0.4-r2
@@ -38081,9 +38072,7 @@
 2205170654 metadata/md5-cache/dev-java/jdepend-2.10
 2205170654 metadata/md5-cache/dev-java/jdom-1.1.3-r1
 2205170654 metadata/md5-cache/dev-java/jdom-2.0.6-r5
-2205170654 metadata/md5-cache/dev-java/jempbox-1.7.1-r1
 2205170654 metadata/md5-cache/dev-java/jffi-1.2.9-r1
-2205170654 metadata/md5-cache/dev-java/jgraph-5.12.0.4-r1
 2205170654 metadata/md5-cache/dev-java/jmh-core-1.21
 2205170654 metadata/md5-cache/dev-java/jna-4.2.2-r3
 2205170654 metadata/md5-cache/dev-java/jna-5.10.0
@@ -38157,7 +38146,6 @@
 2205231510 metadata/md5-cache/dev-java/openjdk-bin-11.0.15_p10
 2205231510 metadata/md5-cache/dev-java/openjdk-bin-17.0.3_p7
 2205231510 metadata/md5-cache/dev-java/openjdk-bin-8.332_p09
-2205242010 metadata/md5-cache/dev-java/Manifest.gz
 2205241840 metadata/md5-cache/dev-java/jackson-annotations-2.13.3
 2205241840 metadata/md5-cache/dev-java/jackson-core-2.13.3
 2205241840 metadata/md5-cache/dev-java/jackson-databind-2.13.3
@@ -38166,6 +38154,11 @@
 2205241840 metadata/md5-cache/dev-java/jackson-module-jakarta-xmlbind-2.13.3
 2205242010 metadata/md5-cache/dev-java/openjdk-17.0.3_p7
 2205241040 metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.79
+2205301210 metadata/md5-cache/dev-java/Manifest.gz
+2205301210 metadata/md5-cache/dev-java/ant-eclipse-ecj-4.22-r1
+2205301210 metadata/md5-cache/dev-java/commons-daemon-1.3.1
+2205301210 metadata/md5-cache/dev-java/eclipse-ecj-4.22-r1
+2205301210 metadata/md5-cache/dev-java/jopt-simple-5.0.4
 2101062239 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 2101070439 metadata/md5-cache/dev-lang/coffee-script-2.5.1
 1702282312 metadata/md5-cache/dev-lang/esco-0.512
@@ -38253,7 +38246,6 @@
 2205170654 metadata/md5-cache/dev-lang/idris2-0.5.1_p20220131-r1
 2205170654 metadata/md5-cache/dev-lang/idris2-0.5.1_p20220224-r1
 2205170654 metadata/md5-cache/dev-lang/inform-6.35_p4
-2205170654 metadata/md5-cache/dev-lang/interprolog-2.1.2
 2205170654 metadata/md5-cache/dev-lang/ispc-1.16.1
 2205170654 metadata/md5-cache/dev-lang/janet-1.17.2
 2205170654 metadata/md5-cache/dev-lang/janet-1.19.2
@@ -38379,9 +38371,7 @@
 2205170654 metadata/md5-cache/dev-lang/tuprolog-3.2.0
 2205170654 metadata/md5-cache/dev-lang/vala-0.50.10
 2205170654 metadata/md5-cache/dev-lang/vala-0.52.10
-2205170654 metadata/md5-cache/dev-lang/vala-0.54.7
 2205170654 metadata/md5-cache/dev-lang/vala-0.56.0
-2205170654 metadata/md5-cache/dev-lang/vala-0.56.1
 2205170654 metadata/md5-cache/dev-lang/xsb-3.8.0
 2205170654 metadata/md5-cache/dev-lang/xsb-4.0.0
 2205170654 metadata/md5-cache/dev-lang/yasm-1.3.0-r1
@@ -38400,25 +38390,28 @@
 2205210910 metadata/md5-cache/dev-lang/qu-prolog-10.6
 2205202040 metadata/md5-cache/dev-lang/whitespace-0.4
 2205210940 metadata/md5-cache/dev-lang/yap-7.0.1
-2205210940 metadata/md5-cache/dev-lang/yap-7.1.0
 2205231640 metadata/md5-cache/dev-lang/spidermonkey-91.9.1
 2205241040 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.3
 2205241040 metadata/md5-cache/dev-lang/ammonite-repl-bin-2.5.4
 2205251240 metadata/md5-cache/dev-lang/elixir-1.13.3
-2205260210 metadata/md5-cache/dev-lang/perl-5.36.0_rc3
 2205251910 metadata/md5-cache/dev-lang/python-2.7.18_p15
 2205242040 metadata/md5-cache/dev-lang/rust-1.59.0
 2205242140 metadata/md5-cache/dev-lang/rust-1.60.0
 2205242310 metadata/md5-cache/dev-lang/rust-bin-1.61.0
 2205260410 metadata/md5-cache/dev-lang/spidermonkey-68.12.0-r1
-2205271110 metadata/md5-cache/dev-lang/Manifest.gz
 2205271010 metadata/md5-cache/dev-lang/elixir-1.13.4
-2205270640 metadata/md5-cache/dev-lang/gnat-gpl-2020
-2205270640 metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
-2205270640 metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
 2205270110 metadata/md5-cache/dev-lang/rust-1.61.0-r1
 2205271110 metadata/md5-cache/dev-lang/zig-0.9.1
 2205271110 metadata/md5-cache/dev-lang/zig-9999
+2205302310 metadata/md5-cache/dev-lang/Manifest.gz
+2205302310 metadata/md5-cache/dev-lang/gnat-gpl-2020
+2205302310 metadata/md5-cache/dev-lang/gnat-gpl-2021-r1
+2205302310 metadata/md5-cache/dev-lang/gnat-gpl-2021-r3
+2205272110 metadata/md5-cache/dev-lang/interprolog-2.1.2
+2205280410 metadata/md5-cache/dev-lang/perl-5.36.0
+2205280910 metadata/md5-cache/dev-lang/vala-0.54.7
+2205280910 metadata/md5-cache/dev-lang/vala-0.56.1
+2205271940 metadata/md5-cache/dev-lang/yap-7.1.0
 2108220339 metadata/md5-cache/dev-libs/argtable-2.13-r1
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 2007042139 metadata/md5-cache/dev-libs/bemenu-0.5.0
@@ -38506,11 +38499,9 @@
 2204241040 metadata/md5-cache/dev-libs/libstrophe-0.10.0
 2204290540 metadata/md5-cache/dev-libs/libksba-1.6.0
 2204291110 metadata/md5-cache/dev-libs/libpipeline-1.5.6
-2205010512 metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
 2205011048 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r6
 2205011048 metadata/md5-cache/dev-libs/ossp-uuid-1.6.2-r7
 2205061110 metadata/md5-cache/dev-libs/pkcs11-helper-1.29.0
-2205060610 metadata/md5-cache/dev-libs/vala-common-0.56.1
 2205060310 metadata/md5-cache/dev-libs/xmlsec-1.2.34
 2205100410 metadata/md5-cache/dev-libs/icinga-php-library-0.8.1
 2205100410 metadata/md5-cache/dev-libs/icinga-php-thirdparty-0.10.0-r1
@@ -38539,7 +38530,6 @@
 2205170654 metadata/md5-cache/dev-libs/atcore-1.0.0
 2205171110 metadata/md5-cache/dev-libs/atf-0.21-r2
 2205170654 metadata/md5-cache/dev-libs/atk-2.36.0
-2205171110 metadata/md5-cache/dev-libs/atk-2.38.0
 2205170654 metadata/md5-cache/dev-libs/avro-c-1.9.1-r1
 2205170654 metadata/md5-cache/dev-libs/aws-c-cal-0.4.5
 2205170654 metadata/md5-cache/dev-libs/aws-c-common-0.4.62
@@ -38623,7 +38613,6 @@
 2205170654 metadata/md5-cache/dev-libs/eb-4.4.1-r1
 2205170654 metadata/md5-cache/dev-libs/eekboard-1.0.8_p20121001-r1
 2205170654 metadata/md5-cache/dev-libs/efl-1.25.1-r13
-2205170654 metadata/md5-cache/dev-libs/efl-1.26.2
 2205170654 metadata/md5-cache/dev-libs/elfutils-0.185
 2205170654 metadata/md5-cache/dev-libs/elfutils-0.186
 2205170654 metadata/md5-cache/dev-libs/elfutils-0.187
@@ -38640,10 +38629,8 @@
 2205170654 metadata/md5-cache/dev-libs/flatbuffers-2.0.0-r1
 2205170654 metadata/md5-cache/dev-libs/flatbuffers-2.0.6
 2205170654 metadata/md5-cache/dev-libs/folks-0.15.4
-2205170654 metadata/md5-cache/dev-libs/folks-0.15.5
 2205170654 metadata/md5-cache/dev-libs/foma-0.9.18-r1
 2205170654 metadata/md5-cache/dev-libs/fribidi-1.0.11
-2205170654 metadata/md5-cache/dev-libs/fribidi-1.0.12
 2205170654 metadata/md5-cache/dev-libs/fstrm-0.6.1
 2205170654 metadata/md5-cache/dev-libs/gdl-3.40.0
 2205170654 metadata/md5-cache/dev-libs/geoip-1.6.12
@@ -38655,20 +38642,15 @@
 2205170654 metadata/md5-cache/dev-libs/girara-0.3.7
 2205170654 metadata/md5-cache/dev-libs/girara-9999
 2205170654 metadata/md5-cache/dev-libs/gjs-1.64.4
-2205170654 metadata/md5-cache/dev-libs/gjs-1.64.5
 2205170654 metadata/md5-cache/dev-libs/gjs-1.70.1
-2205170654 metadata/md5-cache/dev-libs/gjs-1.72.0
 2205170654 metadata/md5-cache/dev-libs/glib-2.70.4
 2205170654 metadata/md5-cache/dev-libs/glib-2.72.0
-2205170654 metadata/md5-cache/dev-libs/glib-2.72.1
 2205170654 metadata/md5-cache/dev-libs/gmime-2.6.23-r1
-2205170654 metadata/md5-cache/dev-libs/gmime-3.2.11
 2205170654 metadata/md5-cache/dev-libs/gmime-3.2.7
 2205170654 metadata/md5-cache/dev-libs/gmime-3.2.9
 2205170654 metadata/md5-cache/dev-libs/gmp-6.2.1-r1
 2205170654 metadata/md5-cache/dev-libs/gmp-6.2.1-r2
 2205170654 metadata/md5-cache/dev-libs/gobject-introspection-1.70.0
-2205170654 metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
 2205170654 metadata/md5-cache/dev-libs/gom-0.4
 2205170654 metadata/md5-cache/dev-libs/gost-engine-1.1.0.3_p20181031-r2
 2205170654 metadata/md5-cache/dev-libs/gost-engine-3.0.0
@@ -38714,14 +38696,9 @@
 2205170654 metadata/md5-cache/dev-libs/jansson-2.13.1-r1
 2205170654 metadata/md5-cache/dev-libs/jansson-2.14
 2205170654 metadata/md5-cache/dev-libs/jemalloc-5.2.1-r1
-2205170654 metadata/md5-cache/dev-libs/jemalloc-5.3.0
 2205170654 metadata/md5-cache/dev-libs/jerasure-2.0.0-r2
-2205170654 metadata/md5-cache/dev-libs/json-c-0.15
-2205170654 metadata/md5-cache/dev-libs/json-c-0.16-r1
 2205170654 metadata/md5-cache/dev-libs/json-c-9999
-2205170654 metadata/md5-cache/dev-libs/jsoncpp-1.9.5
 2205170654 metadata/md5-cache/dev-libs/jsonrpc-glib-3.40.0
-2205170654 metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
 2205170654 metadata/md5-cache/dev-libs/jthread-1.3.3
 2205170654 metadata/md5-cache/dev-libs/judy-1.0.5-r2
 2205170654 metadata/md5-cache/dev-libs/judy-1.0.5-r3
@@ -38792,7 +38769,6 @@
 2205170654 metadata/md5-cache/dev-libs/libcss-0.9.1-r1
 2205190840 metadata/md5-cache/dev-libs/libdaemon-0.14-r3
 2205170654 metadata/md5-cache/dev-libs/libdazzle-3.42.0
-2205170654 metadata/md5-cache/dev-libs/libdazzle-3.44.0
 2205170654 metadata/md5-cache/dev-libs/libdbh-5.0.22
 2205170654 metadata/md5-cache/dev-libs/libdbusmenu-16.04.0-r1
 2205170654 metadata/md5-cache/dev-libs/libdispatch-5.3.3-r1
@@ -38811,7 +38787,6 @@
 2205170654 metadata/md5-cache/dev-libs/liberasurecode-1.6.3
 2205170654 metadata/md5-cache/dev-libs/libestr-0.1.11
 2205170654 metadata/md5-cache/dev-libs/libev-4.33
-2205170654 metadata/md5-cache/dev-libs/libevdev-1.12.0
 2205170654 metadata/md5-cache/dev-libs/libevdev-9999
 2205170654 metadata/md5-cache/dev-libs/libevent-2.1.11
 2205170654 metadata/md5-cache/dev-libs/libevent-2.1.12
@@ -38858,10 +38833,8 @@
 2205170654 metadata/md5-cache/dev-libs/libgit2-1.3.1
 2205170654 metadata/md5-cache/dev-libs/libgit2-1.4.2
 2205170654 metadata/md5-cache/dev-libs/libgit2-1.4.2-r1
-2205170654 metadata/md5-cache/dev-libs/libgit2-1.4.3
 2205170654 metadata/md5-cache/dev-libs/libgit2-glib-1.0.0.1
 2205170654 metadata/md5-cache/dev-libs/libgnome-games-support-1.8.2
-2205170654 metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
 2205170654 metadata/md5-cache/dev-libs/libgnt-2.14.2
 2205170654 metadata/md5-cache/dev-libs/libgnt-2.14.3
 2205170654 metadata/md5-cache/dev-libs/libgpg-error-1.42
@@ -38872,7 +38845,6 @@
 2205170654 metadata/md5-cache/dev-libs/libgrapheme-1
 2205170654 metadata/md5-cache/dev-libs/libgudev-236
 2205171640 metadata/md5-cache/dev-libs/libgusb-0.3.10
-2205170654 metadata/md5-cache/dev-libs/libgweather-4.0.0
 2205170654 metadata/md5-cache/dev-libs/libgweather-40.0
 2205170654 metadata/md5-cache/dev-libs/libhid-0.2.17-r1
 2205170654 metadata/md5-cache/dev-libs/libical-3.0.12
@@ -38884,7 +38856,6 @@
 2205170654 metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
 2205170654 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2205170654 metadata/md5-cache/dev-libs/libinput-1.20.1
-2205170654 metadata/md5-cache/dev-libs/libintl-0.21
 2205170654 metadata/md5-cache/dev-libs/libixion-0.16.1
 2205170654 metadata/md5-cache/dev-libs/libixion-0.17.0
 2205170654 metadata/md5-cache/dev-libs/libixion-9999
@@ -38938,12 +38909,10 @@
 2205170654 metadata/md5-cache/dev-libs/libpcre2-10.39-r1
 2205192340 metadata/md5-cache/dev-libs/libpcre2-10.40
 2205170654 metadata/md5-cache/dev-libs/libpeas-1.30.0
-2205170654 metadata/md5-cache/dev-libs/libpeas-1.32.0
 2205170654 metadata/md5-cache/dev-libs/libpfm-4.11.0
 2205170654 metadata/md5-cache/dev-libs/libphonenumber-8.12.39
 2205170654 metadata/md5-cache/dev-libs/libplatform-2.1.0.1-r2
 2205170654 metadata/md5-cache/dev-libs/libplatform-9999
-2205170654 metadata/md5-cache/dev-libs/libportal-0.6
 2205170654 metadata/md5-cache/dev-libs/libpqxx-7.1.2
 2205170654 metadata/md5-cache/dev-libs/libpqxx-7.2.1
 2205170654 metadata/md5-cache/dev-libs/libpqxx-7.3.0
@@ -38953,7 +38922,6 @@
 2205170654 metadata/md5-cache/dev-libs/libpthread-stubs-0.4-r1
 2205170654 metadata/md5-cache/dev-libs/libptytty-2.0
 2205170654 metadata/md5-cache/dev-libs/libpwquality-1.4.4
-2205170654 metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
 2205170654 metadata/md5-cache/dev-libs/libpy-0.2.5-r1
 2205170654 metadata/md5-cache/dev-libs/libqtxdg-3.7.1
 2205170654 metadata/md5-cache/dev-libs/libqtxdg-3.8.0
@@ -39033,8 +39001,6 @@
 2205170654 metadata/md5-cache/dev-libs/libutf8proc-2.5.0
 2205170654 metadata/md5-cache/dev-libs/libutf8proc-2.6.1
 2205170654 metadata/md5-cache/dev-libs/libutf8proc-2.7.0
-2205170654 metadata/md5-cache/dev-libs/libuv-1.44.1
-2205170654 metadata/md5-cache/dev-libs/libuv-9999
 2205170654 metadata/md5-cache/dev-libs/libvarlink-22
 2205170654 metadata/md5-cache/dev-libs/libvarlink-23
 2205170654 metadata/md5-cache/dev-libs/libverto-0.3.1-r1
@@ -39124,7 +39090,6 @@
 2205170654 metadata/md5-cache/dev-libs/openspecfun-0.5.5
 2205170654 metadata/md5-cache/dev-libs/openssl-1.0.2u-r1
 2205170654 metadata/md5-cache/dev-libs/openssl-1.1.1n
-2205192340 metadata/md5-cache/dev-libs/openssl-1.1.1o
 2205170654 metadata/md5-cache/dev-libs/openssl-3.0.2
 2205190840 metadata/md5-cache/dev-libs/openssl-3.0.3
 2205170654 metadata/md5-cache/dev-libs/openssl-compat-0.9.8z_p8-r2
@@ -39250,7 +39215,6 @@
 2205170654 metadata/md5-cache/dev-libs/snowball-stemmer-2.1.0-r1
 2205191340 metadata/md5-cache/dev-libs/softhsm-2.6.1-r2
 2205170654 metadata/md5-cache/dev-libs/sord-0.16.8-r1
-2205170654 metadata/md5-cache/dev-libs/sord-9999
 2205170654 metadata/md5-cache/dev-libs/spdlog-1.10.0
 2205170654 metadata/md5-cache/dev-libs/spdlog-1.9.2
 2205170654 metadata/md5-cache/dev-libs/spdlog-1.9.2-r1
@@ -39262,7 +39226,6 @@
 2205170654 metadata/md5-cache/dev-libs/stfl-0.24-r4
 2205170654 metadata/md5-cache/dev-libs/teakra-20220224
 2205170654 metadata/md5-cache/dev-libs/template-glib-3.34.0
-2205170654 metadata/md5-cache/dev-libs/template-glib-3.34.1
 2205170654 metadata/md5-cache/dev-libs/thrift-0.16.0-r1
 2205170654 metadata/md5-cache/dev-libs/tinyxml-2.6.2-r4
 2205170654 metadata/md5-cache/dev-libs/tinyxml2-9.0.0
@@ -39330,10 +39293,8 @@
 2205170654 metadata/md5-cache/dev-libs/volume_key-0.3.12-r4
 2205170654 metadata/md5-cache/dev-libs/wayland-1.20.0
 2205170654 metadata/md5-cache/dev-libs/wayland-9999
-2205170654 metadata/md5-cache/dev-libs/wayland-protocols-1.24
 2205170654 metadata/md5-cache/dev-libs/wayland-protocols-1.25
 2205170654 metadata/md5-cache/dev-libs/wayland-protocols-9999
-2205170654 metadata/md5-cache/dev-libs/weston-10.0.0
 2205170654 metadata/md5-cache/dev-libs/weston-9999
 2205170654 metadata/md5-cache/dev-libs/xalan-c-1.11.0_pre1153059
 2205170654 metadata/md5-cache/dev-libs/xapian-1.2.25-r1
@@ -39380,15 +39341,12 @@
 2205260840 metadata/md5-cache/dev-libs/libatasmart-0.19_p5
 2205260840 metadata/md5-cache/dev-libs/libbytesize-2.7
 2205251440 metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20160218-r3
-2205252110 metadata/md5-cache/dev-libs/libevdev-1.12.1
 2205260840 metadata/md5-cache/dev-libs/libgdata-0.18.1
 2205241440 metadata/md5-cache/dev-libs/libgudev-237-r1
 2205251440 metadata/md5-cache/dev-libs/libqtxdg-3.9.1
 2205241340 metadata/md5-cache/dev-libs/libxml2-2.9.14-r1
 2205242210 metadata/md5-cache/dev-libs/libxmlb-0.3.9
 2205260340 metadata/md5-cache/dev-libs/log4cpp-1.1.3-r1
-2205250010 metadata/md5-cache/dev-libs/metee-3.1.3
-2205241940 metadata/md5-cache/dev-libs/mimalloc-2.0.6
 2205241440 metadata/md5-cache/dev-libs/newt-0.52.21_p20210816
 2205260410 metadata/md5-cache/dev-libs/nspr-4.33
 2205260410 metadata/md5-cache/dev-libs/nss-3.78
@@ -39396,13 +39354,52 @@
 2205251240 metadata/md5-cache/dev-libs/snowball-stemmer-2.2.0
 2205261010 metadata/md5-cache/dev-libs/libbytesize-2.6
 2205261010 metadata/md5-cache/dev-libs/nspr-4.34
-2205271040 metadata/md5-cache/dev-libs/Manifest.gz
 2205271010 metadata/md5-cache/dev-libs/ell-0.50
-2205271010 metadata/md5-cache/dev-libs/expat-2.4.8
 2205262110 metadata/md5-cache/dev-libs/gnulib-2022.05.26.07.24.56
 2205270510 metadata/md5-cache/dev-libs/libbsd-0.11.6
 2205270040 metadata/md5-cache/dev-libs/simdjson-2.0.1
 2205270240 metadata/md5-cache/dev-libs/zziplib-0.13.72-r1
+2205302140 metadata/md5-cache/dev-libs/Manifest.gz
+2205280910 metadata/md5-cache/dev-libs/atk-2.38.0
+2205291010 metadata/md5-cache/dev-libs/efl-1.26.2
+2205272110 metadata/md5-cache/dev-libs/expat-2.4.8
+2205280910 metadata/md5-cache/dev-libs/folks-0.15.5
+2205280910 metadata/md5-cache/dev-libs/fribidi-1.0.12
+2205280610 metadata/md5-cache/dev-libs/gjs-1.64.5
+2205280910 metadata/md5-cache/dev-libs/gjs-1.72.0
+2205280910 metadata/md5-cache/dev-libs/glib-2.72.1
+2205302140 metadata/md5-cache/dev-libs/glib-2.72.2
+2205280910 metadata/md5-cache/dev-libs/gmime-3.2.11
+2205280910 metadata/md5-cache/dev-libs/gobject-introspection-1.72.0
+2205280910 metadata/md5-cache/dev-libs/gobject-introspection-common-1.72.0
+2205280140 metadata/md5-cache/dev-libs/intel-compute-runtime-22.21.23269
+2205290010 metadata/md5-cache/dev-libs/jemalloc-5.3.0
+2205301010 metadata/md5-cache/dev-libs/json-c-0.16-r1
+2205301640 metadata/md5-cache/dev-libs/jsoncpp-1.9.5
+2205280440 metadata/md5-cache/dev-libs/jsonrpc-glib-3.42.0
+2205292310 metadata/md5-cache/dev-libs/libclc-14.0.4
+2205280910 metadata/md5-cache/dev-libs/libdazzle-3.44.0
+2205280440 metadata/md5-cache/dev-libs/libevdev-1.12.1
+2205280910 metadata/md5-cache/dev-libs/libgit2-1.4.3
+2205280910 metadata/md5-cache/dev-libs/libgnome-games-support-2.0.0
+2205280910 metadata/md5-cache/dev-libs/libgweather-4.0.0
+2205300610 metadata/md5-cache/dev-libs/libintl-0.21
+2205272040 metadata/md5-cache/dev-libs/libnop-2021.11.03
+2205291410 metadata/md5-cache/dev-libs/libpeas-1.32.0
+2205280910 metadata/md5-cache/dev-libs/libportal-0.6
+2205292340 metadata/md5-cache/dev-libs/libpwquality-1.4.4-r1
+2205301640 metadata/md5-cache/dev-libs/libuv-1.44.1
+2205301640 metadata/md5-cache/dev-libs/libuv-9999
+2205301840 metadata/md5-cache/dev-libs/libwacom-2.2.0
+2205281710 metadata/md5-cache/dev-libs/metee-3.1.3
+2205281310 metadata/md5-cache/dev-libs/mimalloc-2.0.6
+2205280710 metadata/md5-cache/dev-libs/openssl-1.1.1o
+2205291010 metadata/md5-cache/dev-libs/serd-0.30.12
+2205291010 metadata/md5-cache/dev-libs/sord-0.16.10
+2205291010 metadata/md5-cache/dev-libs/sord-9999
+2205280440 metadata/md5-cache/dev-libs/template-glib-3.34.1
+2205280910 metadata/md5-cache/dev-libs/vala-common-0.56.1
+2205280810 metadata/md5-cache/dev-libs/weston-10.0.0
 2203240726 metadata/md5-cache/dev-lisp/ecls-21.2.1-r4
 2205132310 metadata/md5-cache/dev-lisp/alexandria-1.4
 2205150110 metadata/md5-cache/dev-lisp/asdf-3.3.5
@@ -39931,8 +39928,9 @@
 2205170654 metadata/md5-cache/dev-ml/ocplib-simplex-0.4
 2205191710 metadata/md5-cache/dev-ml/ocurl-0.9.2
 2205170654 metadata/md5-cache/dev-ml/zarith-1.12
-2205220410 metadata/md5-cache/dev-ml/Manifest.gz
 2205220410 metadata/md5-cache/dev-ml/utop-2.9.1
+2205292310 metadata/md5-cache/dev-ml/Manifest.gz
+2205292310 metadata/md5-cache/dev-ml/llvm-ocaml-14.0.4
 2205011048 metadata/md5-cache/dev-perl/Acme-Damn-0.80.0-r2
 2205011048 metadata/md5-cache/dev-perl/Algorithm-Annotate-0.100.0-r2
 2205011048 metadata/md5-cache/dev-perl/Algorithm-C3-0.110.0
@@ -39941,10 +39939,8 @@
 2205011048 metadata/md5-cache/dev-perl/Algorithm-Diff-1.201.0
 2205011048 metadata/md5-cache/dev-perl/Algorithm-Munkres-0.80.0-r2
 2205011048 metadata/md5-cache/dev-perl/Alien-Base-ModuleBuild-1.150.0
-2205011048 metadata/md5-cache/dev-perl/Alien-Build-2.380.0
 2205011048 metadata/md5-cache/dev-perl/Alien-Build-2.420.0
 2205011048 metadata/md5-cache/dev-perl/Alien-GMP-1.160.0
-2205011048 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.33.0-r1
 2205011048 metadata/md5-cache/dev-perl/Alien-Gnuplot-1.34.0
 2205011048 metadata/md5-cache/dev-perl/Alien-HDF4-0.50.0
 2205011048 metadata/md5-cache/dev-perl/Alien-Libxml2-0.170.0
@@ -40687,7 +40683,6 @@
 2205011048 metadata/md5-cache/dev-perl/Image-Scale-0.140.0
 2205011048 metadata/md5-cache/dev-perl/Image-Size-3.300.0-r1
 2205011048 metadata/md5-cache/dev-perl/Import-Into-1.2.5-r1
-2205011048 metadata/md5-cache/dev-perl/Inline-0.860.0
 2205011048 metadata/md5-cache/dev-perl/Inline-C-0.810.0
 2205011048 metadata/md5-cache/dev-perl/Inline-Files-0.710.0
 2205011048 metadata/md5-cache/dev-perl/JSON-Any-1.390.0-r1
@@ -40976,7 +40971,6 @@
 2205011048 metadata/md5-cache/dev-perl/Net-SSH-AuthorizedKeysFile-0.180.0-r1
 2205011048 metadata/md5-cache/dev-perl/Net-SSH-Perl-2.140.0-r1
 2205011048 metadata/md5-cache/dev-perl/Net-SSH2-0.720.0
-2205011048 metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
 2205011048 metadata/md5-cache/dev-perl/Net-Server-2.10.0
 2205011048 metadata/md5-cache/dev-perl/Net-Server-Coro-1.300.0-r2
 2205011048 metadata/md5-cache/dev-perl/Net-Server-Mail-0.280.0-r1
@@ -41634,7 +41628,6 @@
 2205141340 metadata/md5-cache/dev-perl/Config-AutoConf-0.320.0
 2205141010 metadata/md5-cache/dev-perl/Cpanel-JSON-XS-4.270.0
 2205141010 metadata/md5-cache/dev-perl/DBD-SQLite-1.700.0
-2205141010 metadata/md5-cache/dev-perl/DBI-1.643.0
 2205141340 metadata/md5-cache/dev-perl/Data-OptList-0.112.0
 2205141340 metadata/md5-cache/dev-perl/Devel-Caller-2.60.0-r2
 2205141340 metadata/md5-cache/dev-perl/Devel-GlobalDestruction-0.140.0-r1
@@ -41790,8 +41783,14 @@
 2205170654 metadata/md5-cache/dev-perl/perl-headers-0.0.2
 2205251240 metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0-r1
 2205251240 metadata/md5-cache/dev-perl/GD-2.730.0-r1
-2205251240 metadata/md5-cache/dev-perl/Manifest.gz
 2205251240 metadata/md5-cache/dev-perl/Test-Fork-0.20.0
+2205310040 metadata/md5-cache/dev-perl/Alien-Build-2.480.0
+2205281540 metadata/md5-cache/dev-perl/B-Keywords-1.240.0
+2205290010 metadata/md5-cache/dev-perl/DBI-1.643.0
+2205281740 metadata/md5-cache/dev-perl/Inline-0.860.0
+2205310040 metadata/md5-cache/dev-perl/Manifest.gz
+2205291440 metadata/md5-cache/dev-perl/Net-SSLeay-1.900.0
+2205291440 metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
 2012150539 metadata/md5-cache/dev-php/File_Iterator-1.4.2
 2101072209 metadata/md5-cache/dev-php/File_Iterator-2.0.2-r1
 2108131009 metadata/md5-cache/dev-php/PEAR-Archive_Tar-1.4.14
@@ -41986,7 +41985,6 @@
 2201071810 metadata/md5-cache/dev-php/PHP_Timer-5.0.3
 2201301839 metadata/md5-cache/dev-php/adodb-5.21.4
 2202012143 metadata/md5-cache/dev-php/onphp-1.0.11_pre20141124
-2202081040 metadata/md5-cache/dev-php/smarty-4.0.4
 2202172039 metadata/md5-cache/dev-php/File_Iterator-3.0.6
 2202162239 metadata/md5-cache/dev-php/PEAR-Crypt_GPG-1.6.7
 2202172110 metadata/md5-cache/dev-php/Text_Template-2.0.4
@@ -42106,7 +42104,6 @@
 2204251110 metadata/md5-cache/dev-php/psr-log-1.1.4
 2204251110 metadata/md5-cache/dev-php/semver-3.2.6
 2204251110 metadata/md5-cache/dev-php/xdebug-handler-2.0.1
-2205180240 metadata/md5-cache/dev-php/Manifest.gz
 2205170654 metadata/md5-cache/dev-php/geos-php-1.0.0-r1
 2205170654 metadata/md5-cache/dev-php/igbinary-3.2.6
 2205170654 metadata/md5-cache/dev-php/igbinary-3.2.6-r1
@@ -42184,7 +42181,6 @@
 2205170654 metadata/md5-cache/dev-php/realpath_turbo-2.0.0
 2205170654 metadata/md5-cache/dev-php/scrypt-1.4.2
 2205170654 metadata/md5-cache/dev-php/scrypt-9999
-2205180240 metadata/md5-cache/dev-php/smarty-4.1.1
 2205170654 metadata/md5-cache/dev-php/snuffleupagus-0.7.1-r1
 2205170654 metadata/md5-cache/dev-php/swoole-4.4.16
 2205170654 metadata/md5-cache/dev-php/swoole-4.5.9
@@ -42195,6 +42191,8 @@
 2205170654 metadata/md5-cache/dev-php/xdebug-client-2.9.6
 2205170654 metadata/md5-cache/dev-php/xdebug-client-2.9.8
 2205170654 metadata/md5-cache/dev-php/xhprof-2.3.5
+2205271610 metadata/md5-cache/dev-php/Manifest.gz
+2205271610 metadata/md5-cache/dev-php/smarty-4.1.1
 2104060140 metadata/md5-cache/dev-python/python-docs-2.7.18
 2204211739 metadata/md5-cache/dev-python/python-docs-3.10.3
 2204211739 metadata/md5-cache/dev-python/python-docs-3.7.13
@@ -42239,10 +42237,6 @@
 2205170654 metadata/md5-cache/dev-python/absl-py-1.0.0
 2205170654 metadata/md5-cache/dev-python/abydos-0.5.0-r1
 2205170654 metadata/md5-cache/dev-python/adblock-0.5.2-r1
-2205170654 metadata/md5-cache/dev-python/aesara-2.5.3
-2205170654 metadata/md5-cache/dev-python/aesara-2.6.3
-2205170654 metadata/md5-cache/dev-python/aesara-2.6.4
-2205170654 metadata/md5-cache/dev-python/aesara-2.6.5
 2205170654 metadata/md5-cache/dev-python/agate-1.6.3-r2
 2205170654 metadata/md5-cache/dev-python/agate-dbf-0.2.2-r1
 2205170654 metadata/md5-cache/dev-python/agate-excel-0.2.5-r1
@@ -42289,7 +42283,6 @@
 2205170654 metadata/md5-cache/dev-python/apipkg-2.1.1
 2205170654 metadata/md5-cache/dev-python/apispec-5.2.2
 2205170654 metadata/md5-cache/dev-python/appdirs-1.4.4-r2
-2205170654 metadata/md5-cache/dev-python/apsw-3.35.4_p1
 2205170654 metadata/md5-cache/dev-python/argcomplete-2.0.0
 2205170654 metadata/md5-cache/dev-python/argcomplete-2.0.0-r1
 2205170654 metadata/md5-cache/dev-python/argh-0.26.2-r2
@@ -42304,7 +42297,6 @@
 2205171010 metadata/md5-cache/dev-python/asgiref-3.5.2
 2205181410 metadata/md5-cache/dev-python/asn1crypto-1.5.1
 2205181410 metadata/md5-cache/dev-python/asteval-0.9.26
-2205170654 metadata/md5-cache/dev-python/astor-0.8.1
 2205170654 metadata/md5-cache/dev-python/astroid-2.11.5
 2205170654 metadata/md5-cache/dev-python/asttokens-2.0.5
 2205170654 metadata/md5-cache/dev-python/astunparse-1.6.3
@@ -42335,16 +42327,12 @@
 2205191040 metadata/md5-cache/dev-python/babelfish-0.6.0-r2
 2205191040 metadata/md5-cache/dev-python/babelfish-9999
 2205170654 metadata/md5-cache/dev-python/backcall-0.2.0-r1
-2205170654 metadata/md5-cache/dev-python/backoff-1.11.0
-2205170654 metadata/md5-cache/dev-python/backoff-1.11.1
-2205170654 metadata/md5-cache/dev-python/backoff-2.0.0
 2205170654 metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.0-r1
 2205170654 metadata/md5-cache/dev-python/backports-entry_points_selectable-1.1.1
 2205170654 metadata/md5-cache/dev-python/backports-tempfile-1.0-r1
 2205170654 metadata/md5-cache/dev-python/backports-weakref-1.0_p1-r1
 2205170654 metadata/md5-cache/dev-python/backports-zoneinfo-0.2.1-r2
 2205171540 metadata/md5-cache/dev-python/backrefs-5.2
-2205170654 metadata/md5-cache/dev-python/bandit-1.7.4
 2205170654 metadata/md5-cache/dev-python/bareos-21.0.0
 2205170654 metadata/md5-cache/dev-python/bashate-2.1.0
 2205170654 metadata/md5-cache/dev-python/basho-erlastic-2.1.1
@@ -42373,7 +42361,6 @@
 2205170654 metadata/md5-cache/dev-python/blinker-1.4-r2
 2205170654 metadata/md5-cache/dev-python/blinker-1.4-r3
 2205170654 metadata/md5-cache/dev-python/blockdiag-3.0.0
-2205170654 metadata/md5-cache/dev-python/blosc-1.10.5-r1
 2205170654 metadata/md5-cache/dev-python/bluelet-0.2.0-r1
 2205170654 metadata/md5-cache/dev-python/blurb-1.1.0
 2205170654 metadata/md5-cache/dev-python/boltons-21.0.0
@@ -42434,7 +42421,6 @@
 2205170654 metadata/md5-cache/dev-python/certifi-3021.3.16-r2
 2205170654 metadata/md5-cache/dev-python/cffi-1.15.0
 2205170654 metadata/md5-cache/dev-python/cffi-1.15.0-r1
-2205170654 metadata/md5-cache/dev-python/cfgv-3.3.1
 2205170654 metadata/md5-cache/dev-python/cfn-lint-0.59.0
 2205170654 metadata/md5-cache/dev-python/cfn-lint-0.59.1
 2205170654 metadata/md5-cache/dev-python/cfn-lint-0.60.0
@@ -42472,7 +42458,6 @@
 2205170654 metadata/md5-cache/dev-python/cloudpickle-2.0.0
 2205170654 metadata/md5-cache/dev-python/cloudpickle-2.0.0-r1
 2205170654 metadata/md5-cache/dev-python/cloudscraper-1.2.60
-2205170654 metadata/md5-cache/dev-python/cmd2-2.4.0
 2205170654 metadata/md5-cache/dev-python/collective-checkdocs-0.2-r1
 2205170654 metadata/md5-cache/dev-python/colorama-0.4.4
 2205170654 metadata/md5-cache/dev-python/colorama-0.4.4-r1
@@ -42601,7 +42586,6 @@
 2205170654 metadata/md5-cache/dev-python/docutils-0.18.1
 2205170654 metadata/md5-cache/dev-python/docutils-0.18.1-r1
 2205170654 metadata/md5-cache/dev-python/docutils-glep-1.2
-2205170654 metadata/md5-cache/dev-python/dogpile-cache-1.1.5
 2205170654 metadata/md5-cache/dev-python/doit-0.36.0
 2205170654 metadata/md5-cache/dev-python/doit-py-0.5.0
 2205170654 metadata/md5-cache/dev-python/dominate-2.6.0
@@ -42649,7 +42633,6 @@
 2205170654 metadata/md5-cache/dev-python/fakeredis-1.7.5
 2205170654 metadata/md5-cache/dev-python/falcon-3.1.0
 2205170654 metadata/md5-cache/dev-python/fasteners-0.17.3
-2205170654 metadata/md5-cache/dev-python/fastimport-0.9.11
 2205170654 metadata/md5-cache/dev-python/feedgenerator-2.0.0
 2205170654 metadata/md5-cache/dev-python/feedparser-6.0.8
 2205170654 metadata/md5-cache/dev-python/ffmpeg-python-0.2.0
@@ -42717,9 +42700,6 @@
 2205170654 metadata/md5-cache/dev-python/frozenlist-1.3.0
 2205170654 metadata/md5-cache/dev-python/fs-2.4.15
 2205170654 metadata/md5-cache/dev-python/fsspec-2022.3.0
-2205170654 metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha0-r1
-2205170654 metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha1
-2205170654 metadata/md5-cache/dev-python/funcparserlib-1.0.0_alpha2
 2205170654 metadata/md5-cache/dev-python/funcy-1.17
 2205170654 metadata/md5-cache/dev-python/furo-2021.10.9
 2205170654 metadata/md5-cache/dev-python/fuse-python-1.0.5
@@ -42729,7 +42709,6 @@
 2205170654 metadata/md5-cache/dev-python/gast-0.5.3
 2205170654 metadata/md5-cache/dev-python/gatt-python-0.2.6
 2205170654 metadata/md5-cache/dev-python/gcs-oauth2-boto-plugin-2.7
-2205170654 metadata/md5-cache/dev-python/genshi-0.7.6
 2205170654 metadata/md5-cache/dev-python/genson-1.1.0
 2205170654 metadata/md5-cache/dev-python/genty-1.3.2-r1
 2205170654 metadata/md5-cache/dev-python/genty-1.3.2-r2
@@ -42740,20 +42719,14 @@
 2205170654 metadata/md5-cache/dev-python/ghp-import-2.0.2
 2205170654 metadata/md5-cache/dev-python/ghp-import-2.1.0
 2205170654 metadata/md5-cache/dev-python/git-review-9999
-2205170654 metadata/md5-cache/dev-python/gitdb-4.0.8
-2205170654 metadata/md5-cache/dev-python/gitdb-4.0.9
 2205170654 metadata/md5-cache/dev-python/github3-3.2.0
 2205170654 metadata/md5-cache/dev-python/glob2-0.7
 2205170654 metadata/md5-cache/dev-python/glob2-0.7-r1
 2205170654 metadata/md5-cache/dev-python/glooey-0.3.6
 2205170654 metadata/md5-cache/dev-python/gmpy-2.1.2
 2205170654 metadata/md5-cache/dev-python/gmpy-2.1.2-r1
-2205170654 metadata/md5-cache/dev-python/google-api-core-2.7.1-r2
-2205170654 metadata/md5-cache/dev-python/google-api-core-2.7.2-r1
-2205191040 metadata/md5-cache/dev-python/google-api-core-2.8.0
 2205180910 metadata/md5-cache/dev-python/google-api-python-client-2.48.0
 2205170654 metadata/md5-cache/dev-python/google-apitools-0.5.32
-2205170654 metadata/md5-cache/dev-python/google-auth-2.6.3-r2
 2205170654 metadata/md5-cache/dev-python/google-auth-httplib2-0.1.0-r1
 2205170654 metadata/md5-cache/dev-python/google-auth-oauthlib-0.5.1
 2205170654 metadata/md5-cache/dev-python/google-pasta-0.2.0-r1
@@ -42784,7 +42757,6 @@
 2205170654 metadata/md5-cache/dev-python/h2-3.2.0
 2205170654 metadata/md5-cache/dev-python/h2-3.2.0-r1
 2205170654 metadata/md5-cache/dev-python/h2-4.1.0-r1
-2205170654 metadata/md5-cache/dev-python/h5py-3.3.0
 2205170654 metadata/md5-cache/dev-python/happybase-0.9_p20210701
 2205170654 metadata/md5-cache/dev-python/hatch-vcs-0.2.0
 2205182140 metadata/md5-cache/dev-python/hatchling-0.24.0
@@ -42845,7 +42817,6 @@
 2205170654 metadata/md5-cache/dev-python/iniconfig-1.1.1
 2205170654 metadata/md5-cache/dev-python/iniconfig-1.1.1-r1
 2205170654 metadata/md5-cache/dev-python/iniparse-0.5
-2205170654 metadata/md5-cache/dev-python/installer-0.5.0
 2205170654 metadata/md5-cache/dev-python/intelhex-2.3.0
 2205170654 metadata/md5-cache/dev-python/iocapture-0.1.2-r2
 2205170654 metadata/md5-cache/dev-python/iocapture-0.1.2-r3
@@ -42861,7 +42832,6 @@
 2205170654 metadata/md5-cache/dev-python/ipyparallel-8.2.0
 2205170654 metadata/md5-cache/dev-python/ipyparallel-8.2.1
 2205170654 metadata/md5-cache/dev-python/ipyparallel-8.3.0
-2205170654 metadata/md5-cache/dev-python/ipython-7.31.1
 2205170654 metadata/md5-cache/dev-python/ipython-8.2.0
 2205170654 metadata/md5-cache/dev-python/ipython-8.3.0-r1
 2205170654 metadata/md5-cache/dev-python/ipython_genutils-0.2.0-r3
@@ -42885,8 +42855,6 @@
 2205170654 metadata/md5-cache/dev-python/jaraco-envs-2.4.0
 2205170654 metadata/md5-cache/dev-python/jaraco-functools-3.5.0-r2
 2205170654 metadata/md5-cache/dev-python/jaraco-itertools-6.2.1
-2205170654 metadata/md5-cache/dev-python/jaraco-logging-3.1.0
-2205170654 metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1
 2205170654 metadata/md5-cache/dev-python/jaraco-packaging-8.2.1-r1
 2205170654 metadata/md5-cache/dev-python/jaraco-path-3.3.1
 2205170654 metadata/md5-cache/dev-python/jaraco-path-3.4.0
@@ -42896,7 +42864,6 @@
 2205170654 metadata/md5-cache/dev-python/jc-1.19.0
 2205170654 metadata/md5-cache/dev-python/jdcal-1.4.1
 2205170654 metadata/md5-cache/dev-python/jdcal-1.4.1-r1
-2205170654 metadata/md5-cache/dev-python/jedi-0.18.0
 2205191540 metadata/md5-cache/dev-python/jellyfish-0.9.0-r1
 2205170654 metadata/md5-cache/dev-python/jikanpy-4.3.2
 2205170654 metadata/md5-cache/dev-python/jinja-2.11.3-r1
@@ -42932,8 +42899,6 @@
 2205170654 metadata/md5-cache/dev-python/jupyter-1.0.0-r4
 2205170654 metadata/md5-cache/dev-python/jupyter-lsp-1.5.1
 2205170654 metadata/md5-cache/dev-python/jupyter-server-proxy-3.2.1
-2205170654 metadata/md5-cache/dev-python/jupyter_client-7.1.2
-2205170654 metadata/md5-cache/dev-python/jupyter_client-7.3.0
 2205170654 metadata/md5-cache/dev-python/jupyter_console-6.4.3
 2205170654 metadata/md5-cache/dev-python/jupyter_kernel_test-0.4.3
 2205170654 metadata/md5-cache/dev-python/jupyter_packaging-0.12.0-r1
@@ -42944,9 +42909,6 @@
 2205170654 metadata/md5-cache/dev-python/jupyterlab-lsp-3.10.1
 2205170654 metadata/md5-cache/dev-python/jupyterlab_pygments-0.2.2
 2205170654 metadata/md5-cache/dev-python/jupyterlab_server-2.13.0
-2205170654 metadata/md5-cache/dev-python/jwcrypto-1.0.0
-2205170654 metadata/md5-cache/dev-python/jwcrypto-1.1.0
-2205170654 metadata/md5-cache/dev-python/jwcrypto-1.3.0
 2205170654 metadata/md5-cache/dev-python/k5test-0.10.1
 2205170654 metadata/md5-cache/dev-python/k5test-0.10.1-r1
 2205170654 metadata/md5-cache/dev-python/kafka-python-2.0.2
@@ -42962,7 +42924,6 @@
 2205170654 metadata/md5-cache/dev-python/klein-21.8.0
 2205170654 metadata/md5-cache/dev-python/kombu-5.2.4
 2205170654 metadata/md5-cache/dev-python/krb5-0.3.0
-2205170654 metadata/md5-cache/dev-python/lark-0.11.3-r1
 2205171540 metadata/md5-cache/dev-python/latexcodec-2.0.1
 2205170654 metadata/md5-cache/dev-python/lazr-config-2.2.3-r2
 2205170654 metadata/md5-cache/dev-python/lazr-delegates-2.0.4-r2
@@ -42972,7 +42933,6 @@
 2205170654 metadata/md5-cache/dev-python/leather-0.3.4
 2205170654 metadata/md5-cache/dev-python/leechcorepyc-2.10.2
 2205170654 metadata/md5-cache/dev-python/lesscpy-0.15.0
-2205170654 metadata/md5-cache/dev-python/libarchive-c-4.0
 2205170654 metadata/md5-cache/dev-python/libcloud-3.5.1
 2205170654 metadata/md5-cache/dev-python/liblarch-3.1.0-r1
 2205170654 metadata/md5-cache/dev-python/libnacl-1.7.2-r1
@@ -43009,7 +42969,6 @@
 2205170654 metadata/md5-cache/dev-python/lz4-4.0.0
 2205170654 metadata/md5-cache/dev-python/m2crypto-0.38.0
 2205170654 metadata/md5-cache/dev-python/m2r-0.2.1
-2205170654 metadata/md5-cache/dev-python/makefun-1.13.1
 2205170654 metadata/md5-cache/dev-python/mako-1.2.0
 2205170654 metadata/md5-cache/dev-python/mamba-0.11.2
 2205170654 metadata/md5-cache/dev-python/mando-0.7.1
@@ -43020,7 +42979,6 @@
 2205170654 metadata/md5-cache/dev-python/markdown-3.3.6
 2205170654 metadata/md5-cache/dev-python/markdown-3.3.7
 2205170654 metadata/md5-cache/dev-python/markdown2-2.4.2
-2205170654 metadata/md5-cache/dev-python/markdown2-2.4.3
 2205170654 metadata/md5-cache/dev-python/markups-3.1.3
 2205170654 metadata/md5-cache/dev-python/markupsafe-1.1.1-r1
 2205170654 metadata/md5-cache/dev-python/markupsafe-2.1.1
@@ -43033,7 +42991,6 @@
 2205170654 metadata/md5-cache/dev-python/matterhook-0.2-r1
 2205170654 metadata/md5-cache/dev-python/mccabe-0.6.1-r2
 2205170654 metadata/md5-cache/dev-python/mccabe-0.7.0
-2205170654 metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
 2205170654 metadata/md5-cache/dev-python/mdurl-0.1.1
 2205170654 metadata/md5-cache/dev-python/mdx_gh_links-0.2
 2205170654 metadata/md5-cache/dev-python/mecab-python-0.996-r1
@@ -43077,10 +43034,6 @@
 2205170654 metadata/md5-cache/dev-python/mongomock-4.0.0
 2205170654 metadata/md5-cache/dev-python/more-itertools-8.12.0-r1
 2205170654 metadata/md5-cache/dev-python/more-itertools-8.13.0
-2205170654 metadata/md5-cache/dev-python/moto-3.1.5
-2205170654 metadata/md5-cache/dev-python/moto-3.1.6
-2205170654 metadata/md5-cache/dev-python/moto-3.1.7
-2205170654 metadata/md5-cache/dev-python/moto-3.1.8
 2205170654 metadata/md5-cache/dev-python/mpdlcd-0.5.2-r1
 2205170654 metadata/md5-cache/dev-python/mpi4py-3.1.3
 2205170654 metadata/md5-cache/dev-python/mpmath-1.2.1
@@ -43117,13 +43070,11 @@
 2205170654 metadata/md5-cache/dev-python/nest_asyncio-1.5.5
 2205170654 metadata/md5-cache/dev-python/netaddr-0.8.0
 2205170654 metadata/md5-cache/dev-python/netcdf4-python-1.5.8
-2205170654 metadata/md5-cache/dev-python/netifaces-0.11.0
 2205170654 metadata/md5-cache/dev-python/networkx-2.8
 2205191040 metadata/md5-cache/dev-python/networkx-2.8.1
 2205170654 metadata/md5-cache/dev-python/nltk-3.7
 2205170654 metadata/md5-cache/dev-python/nnpy-1.4.2
 2205170654 metadata/md5-cache/dev-python/node-semver-0.8.1
-2205170654 metadata/md5-cache/dev-python/nodeenv-1.6.0
 2205170654 metadata/md5-cache/dev-python/nose-1.3.7_p20211111_p1
 2205170654 metadata/md5-cache/dev-python/nose-1.3.7_p20211111_p1-r1
 2205170654 metadata/md5-cache/dev-python/nose-exclude-0.5.0-r1
@@ -43144,9 +43095,6 @@
 2205170654 metadata/md5-cache/dev-python/numpy-1.22.0-r1
 2205170654 metadata/md5-cache/dev-python/numpy-1.22.1
 2205170654 metadata/md5-cache/dev-python/numpy-1.22.2
-2205170654 metadata/md5-cache/dev-python/numpydoc-1.2
-2205170654 metadata/md5-cache/dev-python/numpydoc-1.2.1-r1
-2205170654 metadata/md5-cache/dev-python/numpydoc-1.3.0
 2205170654 metadata/md5-cache/dev-python/oauth2client-4.1.3-r2
 2205170654 metadata/md5-cache/dev-python/objgraph-3.5.0
 2205170654 metadata/md5-cache/dev-python/oct2py-5.2.0-r1
@@ -43156,25 +43104,16 @@
 2205170654 metadata/md5-cache/dev-python/olefile-0.46-r1
 2205170654 metadata/md5-cache/dev-python/olefile-0.46-r2
 2205170654 metadata/md5-cache/dev-python/openpyxl-3.0.9-r1
-2205170654 metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
 2205170654 metadata/md5-cache/dev-python/openstacksdk-0.61.0-r1
 2205170654 metadata/md5-cache/dev-python/opt-einsum-3.3.0
 2205170654 metadata/md5-cache/dev-python/ordered-set-4.1.0
-2205170654 metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
-2205170654 metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
 2205170654 metadata/md5-cache/dev-python/osc-lib-2.5.0
 2205170654 metadata/md5-cache/dev-python/oslo-concurrency-4.5.0-r1
-2205170654 metadata/md5-cache/dev-python/oslo-concurrency-4.5.1
-2205170654 metadata/md5-cache/dev-python/oslo-config-8.8.0
-2205170654 metadata/md5-cache/dev-python/oslo-context-4.1.0
 2205170654 metadata/md5-cache/dev-python/oslo-i18n-5.1.0
 2205170654 metadata/md5-cache/dev-python/oslo-log-4.7.0
 2205170654 metadata/md5-cache/dev-python/oslo-log-4.8.0
-2205170654 metadata/md5-cache/dev-python/oslo-serialization-4.3.0
 2205170654 metadata/md5-cache/dev-python/oslo-utils-4.12.2
-2205170654 metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
 2205170654 metadata/md5-cache/dev-python/osrf_pycommon-2.0.2
-2205170654 metadata/md5-cache/dev-python/outcome-1.1.0
 2205170654 metadata/md5-cache/dev-python/ovs-2.13.0
 2205170654 metadata/md5-cache/dev-python/ovs-2.13.3
 2205170654 metadata/md5-cache/dev-python/ovs-2.17.1_p1
@@ -43275,7 +43214,6 @@
 2205170654 metadata/md5-cache/dev-python/polygon-3.0.9
 2205170654 metadata/md5-cache/dev-python/pony-0.7.16
 2205170654 metadata/md5-cache/dev-python/pooch-1.6.0
-2205170654 metadata/md5-cache/dev-python/portend-3.0.0
 2205170654 metadata/md5-cache/dev-python/poyo-0.5.0
 2205170654 metadata/md5-cache/dev-python/precis-i18n-1.0.4
 2205170654 metadata/md5-cache/dev-python/pretend-1.0.9-r1
@@ -43405,14 +43343,12 @@
 2205170654 metadata/md5-cache/dev-python/pykka-3.0.2
 2205170654 metadata/md5-cache/dev-python/pykwalify-1.8.0-r1
 2205170654 metadata/md5-cache/dev-python/pylama-8.3.8
-2205170654 metadata/md5-cache/dev-python/pylast-5.0.0
 2205170654 metadata/md5-cache/dev-python/pylatex-1.4.1
 2205170654 metadata/md5-cache/dev-python/pylev-1.4.0
 2205170654 metadata/md5-cache/dev-python/pylibacl-0.6.0
 2205170654 metadata/md5-cache/dev-python/pylint-2.13.5
 2205170654 metadata/md5-cache/dev-python/pylint-2.13.7
 2205170654 metadata/md5-cache/dev-python/pylint-2.13.8
-2205170654 metadata/md5-cache/dev-python/pylint-2.13.9
 2205170654 metadata/md5-cache/dev-python/pylru-1.2.1
 2205170654 metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
 2205170654 metadata/md5-cache/dev-python/pymad-0.10-r1
@@ -43440,7 +43376,6 @@
 2205170654 metadata/md5-cache/dev-python/pyopengl-3.1.5
 2205170654 metadata/md5-cache/dev-python/pyopengl-3.1.6
 2205170654 metadata/md5-cache/dev-python/pyopengl_accelerate-3.1.6
-2205170654 metadata/md5-cache/dev-python/pyopenssl-20.0.1
 2205170654 metadata/md5-cache/dev-python/pyopenssl-22.0.0
 2205170654 metadata/md5-cache/dev-python/pyotherside-1.5.9
 2205170654 metadata/md5-cache/dev-python/pyotp-2.6.0
@@ -43460,7 +43395,6 @@
 2205170654 metadata/md5-cache/dev-python/pypiserver-1.4.2
 2205170654 metadata/md5-cache/dev-python/pypiserver-1.5.0
 2205170654 metadata/md5-cache/dev-python/pyprof2calltree-1.4.5
-2205170654 metadata/md5-cache/dev-python/pyproj-3.3.0
 2205170654 metadata/md5-cache/dev-python/pyproject2setuppy-22-r1
 2205170654 metadata/md5-cache/dev-python/pypugjs-5.9.11
 2205170654 metadata/md5-cache/dev-python/pypy-7.3.9
@@ -43530,8 +43464,6 @@
 2205170654 metadata/md5-cache/dev-python/pytest-flakes-4.0.4
 2205170654 metadata/md5-cache/dev-python/pytest-forked-1.4.0
 2205170654 metadata/md5-cache/dev-python/pytest-forked-1.4.0-r1
-2205170654 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2
-2205170654 metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.3.24
 2205170654 metadata/md5-cache/dev-python/pytest-html-3.1.1
 2205170654 metadata/md5-cache/dev-python/pytest-httpbin-1.0.2
 2205170654 metadata/md5-cache/dev-python/pytest-httpx-0.20.0
@@ -43542,7 +43474,6 @@
 2205170654 metadata/md5-cache/dev-python/pytest-metadata-2.0.1
 2205170654 metadata/md5-cache/dev-python/pytest-mock-3.7.0
 2205171540 metadata/md5-cache/dev-python/pytest-ordering-0.6
-2205170654 metadata/md5-cache/dev-python/pytest-param-files-0.3.4
 2205170654 metadata/md5-cache/dev-python/pytest-plus-0.2
 2205170654 metadata/md5-cache/dev-python/pytest-pylint-0.18.0
 2205170654 metadata/md5-cache/dev-python/pytest-qt-4.0.2-r1
@@ -43562,14 +43493,12 @@
 2205170654 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r1
 2205170654 metadata/md5-cache/dev-python/pytest-subtests-0.7.0
 2205170654 metadata/md5-cache/dev-python/pytest-sugar-0.9.4-r1
-2205170654 metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
 2205170654 metadata/md5-cache/dev-python/pytest-tempdir-2019.10.12
 2205170654 metadata/md5-cache/dev-python/pytest-testinfra-6.7.0
 2205170654 metadata/md5-cache/dev-python/pytest-timeout-2.1.0
 2205200110 metadata/md5-cache/dev-python/pytest-toolbox-0.4-r1
 2205170654 metadata/md5-cache/dev-python/pytest-tornado-0.8.1
 2205170654 metadata/md5-cache/dev-python/pytest-tornasync-0.6.0_p2
-2205170654 metadata/md5-cache/dev-python/pytest-trio-0.7.0
 2205170654 metadata/md5-cache/dev-python/pytest-verbose-parametrize-1.7.0
 2205170654 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r1
 2205170654 metadata/md5-cache/dev-python/pytest-virtualenv-1.7.0-r2
@@ -43584,7 +43513,6 @@
 2205170654 metadata/md5-cache/dev-python/python-bugzilla-3.2.0
 2205170654 metadata/md5-cache/dev-python/python-bugzilla-3.2.0-r1
 2205170654 metadata/md5-cache/dev-python/python-caja-1.24.0-r2
-2205170654 metadata/md5-cache/dev-python/python-cinderclient-8.3.0
 2205170654 metadata/md5-cache/dev-python/python-cstruct-2.1
 2205170654 metadata/md5-cache/dev-python/python-ctags-1.5.0
 2205170654 metadata/md5-cache/dev-python/python-daemon-2.3.0-r1
@@ -43637,9 +43565,7 @@
 2205170654 metadata/md5-cache/dev-python/python-nbxmpp-2.0.6
 2205170654 metadata/md5-cache/dev-python/python-nbxmpp-3.0.1
 2205170654 metadata/md5-cache/dev-python/python-netlink-0.1
-2205170654 metadata/md5-cache/dev-python/python-neutronclient-7.8.0
 2205170654 metadata/md5-cache/dev-python/python-novaclient-17.7.0
-2205170654 metadata/md5-cache/dev-python/python-openstackclient-5.8.0
 2205170654 metadata/md5-cache/dev-python/python-pam-2.0.2-r1
 2205170654 metadata/md5-cache/dev-python/python-poppler-qt5-0.75.0
 2205170654 metadata/md5-cache/dev-python/python-poppler-qt5-21.3.0
@@ -43704,16 +43630,13 @@
 2205170654 metadata/md5-cache/dev-python/qtsass-0.3.0
 2205170654 metadata/md5-cache/dev-python/quantities-0.13.0-r1
 2205170654 metadata/md5-cache/dev-python/quex-0.71.2
-2205170654 metadata/md5-cache/dev-python/radon-5.1.0-r1
 2205170654 metadata/md5-cache/dev-python/raet-0.6.8-r4
-2205170654 metadata/md5-cache/dev-python/random2-1.0.1-r2
 2205170654 metadata/md5-cache/dev-python/rarfile-4.0
 2205170654 metadata/md5-cache/dev-python/ratelimit-2.2.1
 2205170654 metadata/md5-cache/dev-python/rcssmin-1.1.0-r1
 2205170654 metadata/md5-cache/dev-python/rdflib-6.1.1
 2205170654 metadata/md5-cache/dev-python/re-assert-1.1.0
 2205170654 metadata/md5-cache/dev-python/re-assert-1.1.0-r1
-2205170654 metadata/md5-cache/dev-python/readme_renderer-34.0
 2205170654 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.5
 2205170654 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.6
 2205191040 metadata/md5-cache/dev-python/rebulk-3.1.0
@@ -43725,20 +43648,16 @@
 2205170654 metadata/md5-cache/dev-python/redis-py-4.3.1
 2205170654 metadata/md5-cache/dev-python/reedsolomon-1.5.4-r1
 2205170654 metadata/md5-cache/dev-python/reflink-0.2.1-r1
-2205170654 metadata/md5-cache/dev-python/regex-2022.3.15
 2205170654 metadata/md5-cache/dev-python/rencode-1.0.6-r2
-2205170654 metadata/md5-cache/dev-python/reno-3.5.0
 2205170654 metadata/md5-cache/dev-python/reportlab-3.6.6
 2205170654 metadata/md5-cache/dev-python/reportlab-3.6.7
 2205170654 metadata/md5-cache/dev-python/reportlab-3.6.8
 2205191040 metadata/md5-cache/dev-python/reportlab-3.6.9
 2205170654 metadata/md5-cache/dev-python/requests-2.27.1
 2205170654 metadata/md5-cache/dev-python/requests-2.27.1-r1
-2205170654 metadata/md5-cache/dev-python/requests-cache-0.9.3-r1
 2205170654 metadata/md5-cache/dev-python/requests-credssp-2.0.0
 2205170654 metadata/md5-cache/dev-python/requests-file-1.5.1-r1
 2205170654 metadata/md5-cache/dev-python/requests-futures-1.0.0
-2205170654 metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
 2205170654 metadata/md5-cache/dev-python/requests-mock-1.9.3
 2205170654 metadata/md5-cache/dev-python/requests-ntlm-1.1.0-r1
 2205170654 metadata/md5-cache/dev-python/requests-oauthlib-1.3.1
@@ -43746,11 +43665,9 @@
 2205170654 metadata/md5-cache/dev-python/requests-unixsocket-0.3.0-r1
 2205170654 metadata/md5-cache/dev-python/requests_download-0.1.2
 2205170654 metadata/md5-cache/dev-python/requests_pkcs12-1.14
-2205170654 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
 2205170654 metadata/md5-cache/dev-python/resolvelib-0.5.4
 2205170654 metadata/md5-cache/dev-python/resolvelib-0.8.1
 2205170654 metadata/md5-cache/dev-python/responses-0.20.0
-2205170654 metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
 2205170654 metadata/md5-cache/dev-python/retry-decorator-1.1.1
 2205170654 metadata/md5-cache/dev-python/retrying-1.3.3
 2205170654 metadata/md5-cache/dev-python/rfc3339-validator-0.1.4
@@ -43759,9 +43676,6 @@
 2205170654 metadata/md5-cache/dev-python/rfc3986-2.0.0-r1
 2205170654 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1-r1
 2205170654 metadata/md5-cache/dev-python/rfc3987-1.3.8-r2
-2205170654 metadata/md5-cache/dev-python/rich-12.2.0
-2205170654 metadata/md5-cache/dev-python/rich-12.3.0
-2205170654 metadata/md5-cache/dev-python/rich-12.4.0
 2205170654 metadata/md5-cache/dev-python/rjsmin-1.2.0-r1
 2205170654 metadata/md5-cache/dev-python/robot-detection-0.4.0-r1
 2205170654 metadata/md5-cache/dev-python/roman-3.3
@@ -43780,7 +43694,6 @@
 2205170654 metadata/md5-cache/dev-python/rsa-4.8
 2205170654 metadata/md5-cache/dev-python/rsa-4.8-r1
 2205191610 metadata/md5-cache/dev-python/rst-linker-2.3.0
-2205170654 metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
 2205200540 metadata/md5-cache/dev-python/rtslib-fb-2.1.74
 2205170654 metadata/md5-cache/dev-python/ruamel-yaml-0.17.21-r2
 2205170654 metadata/md5-cache/dev-python/ruamel-yaml-clib-0.2.6-r1
@@ -43790,14 +43703,12 @@
 2205170654 metadata/md5-cache/dev-python/sarif_om-1.0.4
 2205170654 metadata/md5-cache/dev-python/scandir-1.10.0-r2
 2205170654 metadata/md5-cache/dev-python/scikit-build-0.12.0
-2205170654 metadata/md5-cache/dev-python/scikit-build-0.14.1
 2205171440 metadata/md5-cache/dev-python/scipy-1.8.0
 2205190610 metadata/md5-cache/dev-python/scipy-1.8.1
 2205170654 metadata/md5-cache/dev-python/scripttest-1.3.0-r1
 2205170654 metadata/md5-cache/dev-python/scripttest-1.3.0-r2
 2205181810 metadata/md5-cache/dev-python/scrypt-0.8.20
 2205170654 metadata/md5-cache/dev-python/seaborn-0.11.2
-2205170654 metadata/md5-cache/dev-python/secretstorage-3.3.1
 2205181740 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2205170654 metadata/md5-cache/dev-python/semantic_version-2.9.0
 2205170654 metadata/md5-cache/dev-python/semver-2.13.0
@@ -43811,15 +43722,11 @@
 2205170654 metadata/md5-cache/dev-python/serpent-1.40
 2205170654 metadata/md5-cache/dev-python/serverfiles-0.3.1
 2205170654 metadata/md5-cache/dev-python/service_identity-21.1.0
-2205170654 metadata/md5-cache/dev-python/service_identity-21.1.0-r1
-2205170654 metadata/md5-cache/dev-python/setproctitle-1.2.2
 2205170654 metadata/md5-cache/dev-python/setuptools-62.2.0
 2205171440 metadata/md5-cache/dev-python/setuptools-62.3.1
 2205170654 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r1
 2205170654 metadata/md5-cache/dev-python/setuptools-git-1.2-r2
 2205170654 metadata/md5-cache/dev-python/setuptools-git-1.2-r3
-2205170654 metadata/md5-cache/dev-python/setuptools-rust-1.3.0
-2205170654 metadata/md5-cache/dev-python/setuptools_scm-6.4.1
 2205170654 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r4
 2205170654 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1-r5
 2205170654 metadata/md5-cache/dev-python/setuptools_trial-0.6.0-r1
@@ -43849,7 +43756,6 @@
 2205170654 metadata/md5-cache/dev-python/slixmpp-1.8.2
 2205170654 metadata/md5-cache/dev-python/slixmpp-9999
 2205191840 metadata/md5-cache/dev-python/smartypants-2.0.1-r1
-2205170654 metadata/md5-cache/dev-python/smmap-5.0.0
 2205170654 metadata/md5-cache/dev-python/snakeoil-0.9.10
 2205170654 metadata/md5-cache/dev-python/snakeoil-0.9.5
 2205170654 metadata/md5-cache/dev-python/snakeoil-0.9.7
@@ -43879,7 +43785,6 @@
 2205171540 metadata/md5-cache/dev-python/sphinx-panels-0.6.0
 2205170654 metadata/md5-cache/dev-python/sphinx-prompt-1.5.0
 2205170654 metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2-r1
-2205170654 metadata/md5-cache/dev-python/sphinx-tabs-3.3.1
 2205170654 metadata/md5-cache/dev-python/sphinx-testing-1.0.1-r2
 2205170654 metadata/md5-cache/dev-python/sphinx_ansible_theme-0.8.0
 2205170654 metadata/md5-cache/dev-python/sphinx_ansible_theme-0.9.1
@@ -43899,7 +43804,6 @@
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-2.0.0-r1
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-httpdomain-1.8.0-r1
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r2
-2205170654 metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-newsfeed-0.1.4-r1
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-openapi-0.7.0-r1
 2205170654 metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.17-r1
@@ -43930,10 +43834,8 @@
 2205170654 metadata/md5-cache/dev-python/stapler-1.0.0_p20200531-r2
 2205170654 metadata/md5-cache/dev-python/starlette-0.18.0
 2205170654 metadata/md5-cache/dev-python/starlette-0.20.0
-2205170654 metadata/md5-cache/dev-python/statsd-3.3.0
 2205170654 metadata/md5-cache/dev-python/statsmodels-0.13.2
 2205171540 metadata/md5-cache/dev-python/stdio-mgr-1.0.1
-2205170654 metadata/md5-cache/dev-python/stestr-3.2.1
 2205170654 metadata/md5-cache/dev-python/stomp-py-8.0.0
 2205170654 metadata/md5-cache/dev-python/stomp-py-8.0.1
 2205170654 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r2
@@ -43964,9 +43866,7 @@
 2205170654 metadata/md5-cache/dev-python/tappy-3.1
 2205170654 metadata/md5-cache/dev-python/tappy-3.1-r1
 2205170654 metadata/md5-cache/dev-python/tblib-1.7.0
-2205190710 metadata/md5-cache/dev-python/tcolorpy-0.1.2
 2205170654 metadata/md5-cache/dev-python/tekore-4.3.0
-2205170654 metadata/md5-cache/dev-python/tempest-30.1.0
 2205170654 metadata/md5-cache/dev-python/tempita-0.5.3-r3
 2205170654 metadata/md5-cache/dev-python/tempora-5.0.0
 2205170654 metadata/md5-cache/dev-python/tempora-5.0.1
@@ -44040,7 +43940,6 @@
 2205191840 metadata/md5-cache/dev-python/txaio-22.2.1
 2205170654 metadata/md5-cache/dev-python/txrequests-0.9.6
 2205170654 metadata/md5-cache/dev-python/typed-ast-1.4.3
-2205170654 metadata/md5-cache/dev-python/typed-ast-1.5.2
 2205170654 metadata/md5-cache/dev-python/typeguard-2.13.3
 2205170654 metadata/md5-cache/dev-python/typing-extensions-4.1.1
 2205170654 metadata/md5-cache/dev-python/typing-extensions-4.2.0
@@ -44107,11 +44006,9 @@
 2205170654 metadata/md5-cache/dev-python/vncdotool-1.0.0
 2205170654 metadata/md5-cache/dev-python/vobject-0.9.6.1-r2
 2205170654 metadata/md5-cache/dev-python/vobject-0.9.6.1-r3
-2205170654 metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
 2205170654 metadata/md5-cache/dev-python/vpython-7.6.3
 2205171040 metadata/md5-cache/dev-python/waitress-2.1.1
 2205170654 metadata/md5-cache/dev-python/wand-0.6.7
-2205170654 metadata/md5-cache/dev-python/warlock-1.3.3-r3
 2205170654 metadata/md5-cache/dev-python/watchdog-2.1.7
 2205170654 metadata/md5-cache/dev-python/watchdog-2.1.8
 2205170654 metadata/md5-cache/dev-python/watchfiles-0.13
@@ -44224,14 +44121,11 @@
 2205230810 metadata/md5-cache/dev-python/cherrypy-18.6.1-r1
 2205231010 metadata/md5-cache/dev-python/click-log-0.4.0
 2205231010 metadata/md5-cache/dev-python/click-threading-0.5.0-r1
-2205211740 metadata/md5-cache/dev-python/cliff-3.10.1
 2205211010 metadata/md5-cache/dev-python/cloudpickle-2.1.0
 2205231240 metadata/md5-cache/dev-python/colorclass-2.2.2-r1
 2205230940 metadata/md5-cache/dev-python/coverage-6.4
-2205211740 metadata/md5-cache/dev-python/debtcollector-2.5.0
 2205212140 metadata/md5-cache/dev-python/deepmerge-1.0.1
 2205201140 metadata/md5-cache/dev-python/dill-0.3.5
-2205211010 metadata/md5-cache/dev-python/dill-0.3.5.1
 2205212040 metadata/md5-cache/dev-python/dkimpy-1.0.5-r1
 2205231240 metadata/md5-cache/dev-python/docopt-0.6.2-r5
 2205201140 metadata/md5-cache/dev-python/dulwich-0.20.40
@@ -44245,7 +44139,6 @@
 2205211240 metadata/md5-cache/dev-python/flask-babelex-0.9.4-r1
 2205211240 metadata/md5-cache/dev-python/flask-mail-0.9.1-r2
 2205212040 metadata/md5-cache/dev-python/flask-security-4.1.4
-2205201440 metadata/md5-cache/dev-python/fsspec-2022.5.0
 2205212040 metadata/md5-cache/dev-python/git-review-2.3.0
 2205212040 metadata/md5-cache/dev-python/google-api-python-client-2.47.0
 2205221910 metadata/md5-cache/dev-python/google-reauth-python-0.1.1
@@ -44261,13 +44154,10 @@
 2205202110 metadata/md5-cache/dev-python/jeepney-0.8.0
 2205212110 metadata/md5-cache/dev-python/jupyter_core-4.10.0
 2205220911 metadata/md5-cache/dev-python/jwcrypto-1.3.1
-2205211010 metadata/md5-cache/dev-python/keystoneauth-4.6.0
 2205211010 metadata/md5-cache/dev-python/kgb-7.0-r1
 2205201510 metadata/md5-cache/dev-python/libnacl-1.8.0
 2205212040 metadata/md5-cache/dev-python/locket-1.0.0
 2205230940 metadata/md5-cache/dev-python/lz4-4.0.1
-2205212040 metadata/md5-cache/dev-python/markdown-it-py-2.1.0
-2205212040 metadata/md5-cache/dev-python/myst_parser-0.17.2
 2205201140 metadata/md5-cache/dev-python/neovim-remote-2.5.1
 2205211740 metadata/md5-cache/dev-python/netaddr-0.8.0-r1
 2205220911 metadata/md5-cache/dev-python/networkx-2.8.2
@@ -44278,11 +44168,6 @@
 2205221810 metadata/md5-cache/dev-python/oauthlib-3.2.0
 2205211110 metadata/md5-cache/dev-python/objgraph-3.5.0-r1
 2205211240 metadata/md5-cache/dev-python/openpyxl-3.0.10
-2205211010 metadata/md5-cache/dev-python/openstacksdk-0.99.0
-2205211010 metadata/md5-cache/dev-python/osc-lib-2.6.0
-2205212040 metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1
-2205201140 metadata/md5-cache/dev-python/oslo-log-5.0.0
-2205211740 metadata/md5-cache/dev-python/oslotest-4.5.0-r1
 2205211540 metadata/md5-cache/dev-python/pbr-5.9.0
 2205221040 metadata/md5-cache/dev-python/pip-22.1.1
 2205230940 metadata/md5-cache/dev-python/pkgconfig-1.5.5-r1
@@ -44295,7 +44180,6 @@
 2205202110 metadata/md5-cache/dev-python/pydbus-0.6.0
 2205211010 metadata/md5-cache/dev-python/pydiffx-1.0.1-r1
 2205211010 metadata/md5-cache/dev-python/pyglet-1.5.26
-2205201710 metadata/md5-cache/dev-python/pygobject-3.42.1
 2205211310 metadata/md5-cache/dev-python/pygresql-5.2.4
 2205221410 metadata/md5-cache/dev-python/pylibmc-1.6.1-r2
 2205211710 metadata/md5-cache/dev-python/pyperclip-1.8.2-r1
@@ -44304,17 +44188,12 @@
 2205221410 metadata/md5-cache/dev-python/pytest-services-2.2.1-r1
 2205211010 metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.0
 2205231010 metadata/md5-cache/dev-python/pytest-subtesthack-0.1.2-r2
-2205211010 metadata/md5-cache/dev-python/python-glanceclient-4.0.0
-2205210240 metadata/md5-cache/dev-python/python-gnupg-0.4.9
-2205211010 metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
 2205230940 metadata/md5-cache/dev-python/python-magic-0.4.26
 2205201140 metadata/md5-cache/dev-python/python-nbxmpp-3.0.2
-2205211010 metadata/md5-cache/dev-python/python-novaclient-18.0.0
 2205211010 metadata/md5-cache/dev-python/python-swiftclient-4.0.0
 2205210210 metadata/md5-cache/dev-python/python-systemd-234-r2
 2205201140 metadata/md5-cache/dev-python/python-utils-3.2.3
 2205212040 metadata/md5-cache/dev-python/pytools-2022.1.7
-2205211010 metadata/md5-cache/dev-python/pytools-2022.1.9
 2205221510 metadata/md5-cache/dev-python/pyzmq-23.0.0
 2205221210 metadata/md5-cache/dev-python/repoze-lru-0.7-r3
 2205221810 metadata/md5-cache/dev-python/requests-mock-1.9.3-r1
@@ -44334,11 +44213,8 @@
 2205221810 metadata/md5-cache/dev-python/sphinxcontrib-apidoc-0.3.0-r1
 2205220911 metadata/md5-cache/dev-python/spyder-kernels-2.3.1
 2205211740 metadata/md5-cache/dev-python/stevedore-3.4.0
-2205211740 metadata/md5-cache/dev-python/stevedore-3.4.0-r1
 2205201140 metadata/md5-cache/dev-python/stripe-3.1.0
 2205231240 metadata/md5-cache/dev-python/tabulate-0.8.9-r1
-2205211540 metadata/md5-cache/dev-python/testresources-2.0.1-r1
-2205211440 metadata/md5-cache/dev-python/testscenarios-0.5.0-r2
 2205211440 metadata/md5-cache/dev-python/testtools-2.5.0-r1
 2205201140 metadata/md5-cache/dev-python/trimesh-3.12.3
 2205220911 metadata/md5-cache/dev-python/typed-ast-1.5.4
@@ -44348,7 +44224,6 @@
 2205211240 metadata/md5-cache/dev-python/virtualenv-clone-0.5.7
 2205211240 metadata/md5-cache/dev-python/weasyprint-54.3
 2205211240 metadata/md5-cache/dev-python/weasyprint-55.0
-2205211010 metadata/md5-cache/dev-python/wstools-0.4.10
 2205230940 metadata/md5-cache/dev-python/xmlschema-1.11.1
 2205222010 metadata/md5-cache/dev-python/yappi-1.3.5
 2205201910 metadata/md5-cache/dev-python/yarl-1.7.2-r3
@@ -44361,7 +44236,6 @@
 2205231340 metadata/md5-cache/dev-python/tenacity-8.0.1-r1
 2205232010 metadata/md5-cache/dev-python/typeguard-2.13.3-r1
 2205231540 metadata/md5-cache/dev-python/whisper-1.1.10
-2205241610 metadata/md5-cache/dev-python/GitPython-3.1.27
 2205240940 metadata/md5-cache/dev-python/PyPDF2-1.28.2
 2205240940 metadata/md5-cache/dev-python/ansible-compat-2.1.0
 2205251040 metadata/md5-cache/dev-python/asteval-0.9.27
@@ -44387,7 +44261,6 @@
 2205251040 metadata/md5-cache/dev-python/dulwich-0.20.42
 2205251240 metadata/md5-cache/dev-python/fastjsonschema-2.15.3-r1
 2205241610 metadata/md5-cache/dev-python/ghp-import-2.1.0-r1
-2205251910 metadata/md5-cache/dev-python/gst-python-1.20.2
 2205251040 metadata/md5-cache/dev-python/h5py-3.7.0
 2205240940 metadata/md5-cache/dev-python/httpx-0.23.0
 2205240940 metadata/md5-cache/dev-python/importlib_metadata-4.11.4
@@ -44433,13 +44306,10 @@
 2205242140 metadata/md5-cache/dev-python/pysimdjson-4.0.3-r1
 2205251040 metadata/md5-cache/dev-python/pytest-httpx-0.21.0
 2205240940 metadata/md5-cache/dev-python/pytest-shell-utilities-1.2.1
-2205250740 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
 2205240940 metadata/md5-cache/dev-python/pytest-xprocess-0.19.0
-2205251910 metadata/md5-cache/dev-python/pyx-0.15_p1
 2205260840 metadata/md5-cache/dev-python/pyxdg-0.27-r1
 2205251410 metadata/md5-cache/dev-python/qstylizer-0.2.1-r1
 2205251040 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.7
-2205240940 metadata/md5-cache/dev-python/rich-12.4.3
 2205251040 metadata/md5-cache/dev-python/rich-12.4.4
 2205240210 metadata/md5-cache/dev-python/ruamel-std-pathlib-0.9.2-r2
 2205240940 metadata/md5-cache/dev-python/setuptools-declarative-requirements-1.2.0-r2
@@ -44473,34 +44343,25 @@
 2205261140 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.4.0
 2205261210 metadata/md5-cache/dev-python/trimesh-3.12.4
 2205261140 metadata/md5-cache/dev-python/webcolors-1.12
-2205271240 metadata/md5-cache/dev-python/Manifest.gz
 2205271240 metadata/md5-cache/dev-python/aesara-2.6.6
 2205271240 metadata/md5-cache/dev-python/apsw-3.38.1_p1
 2205271240 metadata/md5-cache/dev-python/astor-0.8.1-r1
 2205271240 metadata/md5-cache/dev-python/backoff-2.0.1
-2205271240 metadata/md5-cache/dev-python/blosc-1.10.6
 2205271040 metadata/md5-cache/dev-python/boto3-1.23.9
 2205271040 metadata/md5-cache/dev-python/boto3-9999
 2205271040 metadata/md5-cache/dev-python/botocore-1.26.9
 2205262210 metadata/md5-cache/dev-python/bottle-0.12.20
 2205270940 metadata/md5-cache/dev-python/bottle-0.12.21
-2205271240 metadata/md5-cache/dev-python/cmd2-2.4.1
 2205270940 metadata/md5-cache/dev-python/dask-2022.05.2
-2205271240 metadata/md5-cache/dev-python/fastimport-0.9.14
 2205271240 metadata/md5-cache/dev-python/funcparserlib-1.0.0
-2205271240 metadata/md5-cache/dev-python/genshi-0.7.7
-2205271240 metadata/md5-cache/dev-python/gitdb-4.0.9-r1
 2205271240 metadata/md5-cache/dev-python/google-api-core-2.7.3
 2205270940 metadata/md5-cache/dev-python/google-api-core-2.8.1
 2205271240 metadata/md5-cache/dev-python/google-auth-2.6.6-r1
 2205270940 metadata/md5-cache/dev-python/googleapis-common-protos-1.56.2
-2205271240 metadata/md5-cache/dev-python/h5py-3.6.0
 2205271240 metadata/md5-cache/dev-python/installer-0.5.1
 2205271240 metadata/md5-cache/dev-python/jedi-0.18.1
 2205271240 metadata/md5-cache/dev-python/jupyter_client-7.3.1
 2205271240 metadata/md5-cache/dev-python/jwcrypto-1.2.0
-2205271240 metadata/md5-cache/dev-python/lark-1.1.2
-2205270940 metadata/md5-cache/dev-python/libcloud-3.6.0
 2205270940 metadata/md5-cache/dev-python/lockfile-0.12.2-r3
 2205271240 metadata/md5-cache/dev-python/moto-3.1.9
 2205270940 metadata/md5-cache/dev-python/nbconvert-6.5.0
@@ -44510,29 +44371,163 @@
 2205271240 metadata/md5-cache/dev-python/outcome-1.1.0-r1
 2205271240 metadata/md5-cache/dev-python/portend-3.1.0
 2205270940 metadata/md5-cache/dev-python/proto-plus-1.20.5
-2205271240 metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
 2205271240 metadata/md5-cache/dev-python/pyproj-3.3.1
 2205271240 metadata/md5-cache/dev-python/pytest-freezegun-0.4.2-r1
 2205271240 metadata/md5-cache/dev-python/pytest-helpers-namespace-2021.12.29
 2205262210 metadata/md5-cache/dev-python/pytest-shell-utilities-1.3.0
-2205270940 metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
 2205262210 metadata/md5-cache/dev-python/pytest-subtests-0.8.0
 2205271240 metadata/md5-cache/dev-python/pytest-trio-0.7.0-r1
 2205271240 metadata/md5-cache/dev-python/radon-5.1.0-r2
 2205271240 metadata/md5-cache/dev-python/readme_renderer-35.0
-2205271240 metadata/md5-cache/dev-python/regex-2022.4.24
-2205271240 metadata/md5-cache/dev-python/requests-cache-0.9.4
 2205271240 metadata/md5-cache/dev-python/rich-12.4.1
 2205271240 metadata/md5-cache/dev-python/secretstorage-3.3.2
 2205262210 metadata/md5-cache/dev-python/semantic_version-2.10.0
-2205271240 metadata/md5-cache/dev-python/setproctitle-1.2.3
 2205271240 metadata/md5-cache/dev-python/setuptools_scm-6.4.2
 2205261940 metadata/md5-cache/dev-python/stapler-1.0.0_p20220330
 2205270940 metadata/md5-cache/dev-python/trimesh-3.12.5
 2205271240 metadata/md5-cache/dev-python/twisted-22.4.0-r1
-2205271240 metadata/md5-cache/dev-python/typed-ast-1.5.3
-2205271240 metadata/md5-cache/dev-python/zope-component-5.0.1
-2205271240 metadata/md5-cache/dev-python/zope-hookable-5.1.0
+2205290010 metadata/md5-cache/dev-python/GitPython-3.1.27
+2205310610 metadata/md5-cache/dev-python/Manifest.gz
+2205291040 metadata/md5-cache/dev-python/PyPDF2-1.28.3
+2205301040 metadata/md5-cache/dev-python/PyPDF2-1.28.4
+2205281740 metadata/md5-cache/dev-python/autopage-0.5.1
+2205290040 metadata/md5-cache/dev-python/bandit-1.7.4
+2205281310 metadata/md5-cache/dev-python/beniget-0.4.1-r1
+2205272310 metadata/md5-cache/dev-python/blosc-1.10.6
+2205280810 metadata/md5-cache/dev-python/boto3-1.23.10
+2205280810 metadata/md5-cache/dev-python/botocore-1.26.10
+2205301040 metadata/md5-cache/dev-python/cachetools-5.2.0
+2205301410 metadata/md5-cache/dev-python/cfgv-3.3.1
+2205310540 metadata/md5-cache/dev-python/cgroup-utils-0.8-r1
+2205292310 metadata/md5-cache/dev-python/clang-python-14.0.4
+2205290040 metadata/md5-cache/dev-python/cliff-3.10.1
+2205290040 metadata/md5-cache/dev-python/cmd2-2.4.1
+2205281910 metadata/md5-cache/dev-python/debtcollector-2.5.0
+2205290010 metadata/md5-cache/dev-python/dill-0.3.5.1
+2205280810 metadata/md5-cache/dev-python/django-cacheops-6.1
+2205290040 metadata/md5-cache/dev-python/dogpile-cache-1.1.5
+2205280810 metadata/md5-cache/dev-python/fakeredis-1.8
+2205271310 metadata/md5-cache/dev-python/fastimport-0.9.14
+2205310010 metadata/md5-cache/dev-python/flatbuffers-2.0.6
+2205301040 metadata/md5-cache/dev-python/flit_scm-1.6.2
+2205301040 metadata/md5-cache/dev-python/fsspec-2022.5.0
+2205281310 metadata/md5-cache/dev-python/gast-0.5.3-r1
+2205272310 metadata/md5-cache/dev-python/genshi-0.7.7
+2205290010 metadata/md5-cache/dev-python/gitdb-4.0.9-r1
+2205280440 metadata/md5-cache/dev-python/gst-python-1.20.2
+2205302310 metadata/md5-cache/dev-python/h5py-3.6.0
+2205301040 metadata/md5-cache/dev-python/imageio-2.19.3
+2205291040 metadata/md5-cache/dev-python/ipython-8.4.0
+2205281010 metadata/md5-cache/dev-python/jaraco-logging-3.1.0-r1
+2205290040 metadata/md5-cache/dev-python/keystoneauth-4.6.0
+2205271410 metadata/md5-cache/dev-python/lark-1.1.2
+2205280910 metadata/md5-cache/dev-python/libarchive-c-4.0
+2205282010 metadata/md5-cache/dev-python/libcloud-3.6.0
+2205292310 metadata/md5-cache/dev-python/lit-14.0.4
+2205292240 metadata/md5-cache/dev-python/makefun-1.13.1
+2205292240 metadata/md5-cache/dev-python/markdown-it-py-2.1.0
+2205292240 metadata/md5-cache/dev-python/markdown2-2.4.3
+2205301040 metadata/md5-cache/dev-python/marshmallow-3.16.0
+2205292240 metadata/md5-cache/dev-python/mdit-py-plugins-0.3.0
+2205292240 metadata/md5-cache/dev-python/mergedict-1.0.0-r1
+2205292240 metadata/md5-cache/dev-python/mimerender-0.6.0-r1
+2205301040 metadata/md5-cache/dev-python/moto-3.1.11
+2205292240 metadata/md5-cache/dev-python/multipledispatch-0.6.0-r1
+2205292240 metadata/md5-cache/dev-python/munkres-1.1.4-r1
+2205292240 metadata/md5-cache/dev-python/myst_parser-0.17.2
+2205281910 metadata/md5-cache/dev-python/netifaces-0.11.0
+2205301540 metadata/md5-cache/dev-python/nodeenv-1.6.0
+2205301040 metadata/md5-cache/dev-python/nuitka-0.8.3
+2205281910 metadata/md5-cache/dev-python/openstackdocstheme-2.4.0
+2205290040 metadata/md5-cache/dev-python/openstacksdk-0.99.0
+2205290040 metadata/md5-cache/dev-python/os-client-config-2.1.0-r2
+2205290040 metadata/md5-cache/dev-python/os-service-types-1.7.0-r2
+2205290040 metadata/md5-cache/dev-python/osc-lib-2.6.0
+2205281910 metadata/md5-cache/dev-python/oslo-concurrency-4.5.1
+2205281910 metadata/md5-cache/dev-python/oslo-config-8.8.0
+2205281910 metadata/md5-cache/dev-python/oslo-context-4.1.0
+2205281910 metadata/md5-cache/dev-python/oslo-i18n-5.1.0-r1
+2205281910 metadata/md5-cache/dev-python/oslo-log-5.0.0
+2205281910 metadata/md5-cache/dev-python/oslo-serialization-4.3.0
+2205281910 metadata/md5-cache/dev-python/oslo-utils-4.13.0-r1
+2205290910 metadata/md5-cache/dev-python/oslotest-4.5.0-r2
+2205310610 metadata/md5-cache/dev-python/pefile-2022.5.30
+2205291040 metadata/md5-cache/dev-python/phonenumbers-8.12.49
+2205310510 metadata/md5-cache/dev-python/pyacoustid-1.2.2
+2205280910 metadata/md5-cache/dev-python/pygobject-3.42.1
+2205280810 metadata/md5-cache/dev-python/pykka-3.1.1
+2205282140 metadata/md5-cache/dev-python/pylast-5.0.0
+2205290010 metadata/md5-cache/dev-python/pylint-2.13.9
+2205301540 metadata/md5-cache/dev-python/pyopencl-2022.1.5
+2205271410 metadata/md5-cache/dev-python/pyopenssl-20.0.1-r1
+2205282140 metadata/md5-cache/dev-python/pyprof2calltree-1.4.5-r1
+2205301040 metadata/md5-cache/dev-python/pysimdjson-5.0.1
+2205292240 metadata/md5-cache/dev-python/pytest-param-files-0.3.4
+2205301710 metadata/md5-cache/dev-python/pytest-shell-utilities-1.4.0
+2205301710 metadata/md5-cache/dev-python/pytest-skip-markers-1.3.0-r1
+2205301710 metadata/md5-cache/dev-python/pytest-system-statistics-1.0.2
+2205290040 metadata/md5-cache/dev-python/python-cinderclient-8.3.0
+2205272240 metadata/md5-cache/dev-python/python-cstruct-2.1-r1
+2205272240 metadata/md5-cache/dev-python/python-daemon-2.3.0-r2
+2205290040 metadata/md5-cache/dev-python/python-glanceclient-4.0.0
+2205272240 metadata/md5-cache/dev-python/python-gnupg-0.4.9
+2205290040 metadata/md5-cache/dev-python/python-keystoneclient-4.5.0
+2205301040 metadata/md5-cache/dev-python/python-libevdev-0.11
+2205310510 metadata/md5-cache/dev-python/python-ly-0.9.7
+2205291040 metadata/md5-cache/dev-python/python-nbxmpp-3.1.0
+2205290040 metadata/md5-cache/dev-python/python-neutronclient-7.8.0
+2205290040 metadata/md5-cache/dev-python/python-novaclient-18.0.0
+2205290040 metadata/md5-cache/dev-python/python-openstackclient-5.8.0
+2205291040 metadata/md5-cache/dev-python/python-utils-3.3.0
+2205301040 metadata/md5-cache/dev-python/python-utils-3.3.1
+2205272240 metadata/md5-cache/dev-python/pytimeparse-1.1.8-r1
+2205301410 metadata/md5-cache/dev-python/pytools-2022.1.9
+2205291840 metadata/md5-cache/dev-python/pyx-0.15_p1
+2205292210 metadata/md5-cache/dev-python/random2-1.0.1-r2
+2205292210 metadata/md5-cache/dev-python/ratelimit-2.2.1-r1
+2205292210 metadata/md5-cache/dev-python/recommonmark-0.7.1-r1
+2205292210 metadata/md5-cache/dev-python/reedsolomon-1.5.4-r2
+2205292210 metadata/md5-cache/dev-python/reflink-0.2.1-r2
+2205271410 metadata/md5-cache/dev-python/regex-2022.4.24
+2205292140 metadata/md5-cache/dev-python/rencode-1.0.6-r3
+2205281910 metadata/md5-cache/dev-python/reno-3.5.0
+2205272310 metadata/md5-cache/dev-python/requests-cache-0.9.4
+2205292140 metadata/md5-cache/dev-python/requests-file-1.5.1-r2
+2205292140 metadata/md5-cache/dev-python/requests-futures-1.0.0-r1
+2205290040 metadata/md5-cache/dev-python/requests-kerberos-0.14.0-r1
+2205292210 metadata/md5-cache/dev-python/requests_download-0.1.2-r1
+2205290040 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+2205292140 metadata/md5-cache/dev-python/restructuredtext-lint-1.4.0
+2205292210 metadata/md5-cache/dev-python/retry-decorator-1.1.1-r1
+2205292140 metadata/md5-cache/dev-python/retrying-1.3.3-r1
+2205292210 metadata/md5-cache/dev-python/roman-3.3-r1
+2205292210 metadata/md5-cache/dev-python/rtimulib-7.2.1-r2
+2205281410 metadata/md5-cache/dev-python/scikit-build-0.14.1
+2205281410 metadata/md5-cache/dev-python/service_identity-21.1.0-r1
+2205271410 metadata/md5-cache/dev-python/setproctitle-1.2.3
+2205281410 metadata/md5-cache/dev-python/setuptools-rust-1.3.0
+2205290010 metadata/md5-cache/dev-python/smmap-5.0.0
+2205301210 metadata/md5-cache/dev-python/sphinx-5.0.0
+2205281340 metadata/md5-cache/dev-python/sphinx-tabs-3.3.1-r1
+2205310010 metadata/md5-cache/dev-python/sphinx_rtd_theme-1.0.0-r1
+2205281340 metadata/md5-cache/dev-python/sphinxcontrib-log_cabinet-1.0.1-r1
+2205291040 metadata/md5-cache/dev-python/sphinxcontrib-spelling-7.4.1
+2205291040 metadata/md5-cache/dev-python/starlette-0.20.1
+2205290040 metadata/md5-cache/dev-python/statsd-3.3.0
+2205290040 metadata/md5-cache/dev-python/stestr-3.2.1
+2205281910 metadata/md5-cache/dev-python/stevedore-3.4.0-r1
+2205310510 metadata/md5-cache/dev-python/tagpy-2018.1-r3
+2205282010 metadata/md5-cache/dev-python/tcolorpy-0.1.2
+2205290040 metadata/md5-cache/dev-python/tempest-30.1.0
+2205281340 metadata/md5-cache/dev-python/testresources-2.0.1-r2
+2205281340 metadata/md5-cache/dev-python/testscenarios-0.5.0-r3
+2205271410 metadata/md5-cache/dev-python/typed-ast-1.5.3
+2205310210 metadata/md5-cache/dev-python/versioningit-1.1.1
+2205290040 metadata/md5-cache/dev-python/voluptuous-0.13.1-r1
+2205282010 metadata/md5-cache/dev-python/warlock-1.3.3-r3
+2205281340 metadata/md5-cache/dev-python/wstools-0.4.10-r1
+2205281010 metadata/md5-cache/dev-python/zope-component-5.0.1
+2205281010 metadata/md5-cache/dev-python/zope-hookable-5.1.0
 2205170654 metadata/md5-cache/dev-qt/assistant-5.15.3
 2205170654 metadata/md5-cache/dev-qt/designer-5.15.3
 2205170654 metadata/md5-cache/dev-qt/linguist-5.15.3
@@ -44605,7 +44600,6 @@
 2205202310 metadata/md5-cache/dev-qt/qt3d-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtbluetooth-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtcharts-5.15.4
-2205202310 metadata/md5-cache/dev-qt/qtcore-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtdatavis3d-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtdiag-5.15.4
 2205202310 metadata/md5-cache/dev-qt/qtgamepad-5.15.4
@@ -44638,7 +44632,6 @@
 2205202310 metadata/md5-cache/dev-qt/qtxmlpatterns-5.15.4
 2205232210 metadata/md5-cache/dev-qt/qtcharts-5.15.3
 2205251440 metadata/md5-cache/dev-qt/qtconcurrent-5.15.4
-2205260240 metadata/md5-cache/dev-qt/qtcore-5.15.4-r1
 2205251440 metadata/md5-cache/dev-qt/qtdbus-5.15.4
 2205251440 metadata/md5-cache/dev-qt/qtdeclarative-5.15.4
 2205251440 metadata/md5-cache/dev-qt/qtgui-5.15.4
@@ -44649,10 +44642,11 @@
 2205251440 metadata/md5-cache/dev-qt/qttranslations-5.15.4
 2205251440 metadata/md5-cache/dev-qt/qtwayland-5.15.4
 2205251440 metadata/md5-cache/dev-qt/qtwaylandscanner-5.15.4
-2205251440 metadata/md5-cache/dev-qt/qtwidgets-5.15.4
 2205251440 metadata/md5-cache/dev-qt/qtx11extras-5.15.4
-2205262240 metadata/md5-cache/dev-qt/Manifest.gz
-2205262240 metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
+2205301940 metadata/md5-cache/dev-qt/Manifest.gz
+2205301940 metadata/md5-cache/dev-qt/qtcore-5.15.4-r2
+2205301940 metadata/md5-cache/dev-qt/qtwebengine-5.15.4_p20220526
+2205301940 metadata/md5-cache/dev-qt/qtwidgets-5.15.4-r1
 2205170654 metadata/md5-cache/dev-ros/Manifest.gz
 2205170654 metadata/md5-cache/dev-ros/actionlib-1.13.2-r1
 2205170654 metadata/md5-cache/dev-ros/actionlib-9999
@@ -45853,8 +45847,6 @@
 2205170654 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
 2205170654 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r2
 2205192010 metadata/md5-cache/dev-ruby/puppetdb-termini-7.10.1
-2205170654 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.7.2
-2205170654 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
 2205170654 metadata/md5-cache/dev-ruby/ruby-dict-0.9.4-r5
 2205170654 metadata/md5-cache/dev-ruby/ruby-gnome2-3.4.3
 2205170654 metadata/md5-cache/dev-ruby/ruby-romkan-0.4-r7
@@ -45876,103 +45868,67 @@
 2205220911 metadata/md5-cache/dev-ruby/actioncable-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/actioncable-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/actioncable-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actioncable-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actioncable-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actioncable-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actioncable-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actioncable-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actioncable-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actioncable-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actioncable-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actioncable-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actioncable-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actioncable-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actionmailbox-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actionmailer-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actionmailer-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actionmailer-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/actionpack-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/actionpack-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/actionpack-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/actionpack-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actionpack-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actionpack-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actionpack-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actionpack-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actionpack-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actionpack-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actionpack-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actionpack-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actionpack-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actionpack-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actionpack-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/actionpack-action_caching-1.2.2
 2205220911 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r1
 2205220911 metadata/md5-cache/dev-ruby/actionpack-xml_parser-2.0.1-r2
 2205220911 metadata/md5-cache/dev-ruby/actiontext-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actiontext-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actiontext-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actiontext-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actiontext-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actiontext-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actiontext-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actiontext-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actiontext-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actiontext-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actiontext-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actiontext-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/actionview-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/actionview-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/actionview-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/actionview-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/actionview-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/actionview-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/actionview-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/actionview-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/actionview-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/actionview-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/actionview-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/actionview-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/actionview-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/actionview-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/actionview-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/activejob-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/activejob-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/activejob-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/activejob-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/activejob-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/activejob-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/activejob-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/activejob-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/activejob-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/activejob-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/activejob-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/activejob-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/activejob-7.0.2.3
-2205220911 metadata/md5-cache/dev-ruby/activejob-7.0.2.3-r1
 2205220911 metadata/md5-cache/dev-ruby/activejob-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/activejob-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/activeldap-5.2.4
@@ -45982,15 +45938,10 @@
 2205220911 metadata/md5-cache/dev-ruby/activemodel-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/activemodel-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/activemodel-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/activemodel-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/activemodel-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/activemodel-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/activemodel-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/activemodel-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/activemodel-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/activemodel-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/activemodel-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/activemodel-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/activemodel-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/activemodel-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/activemodel-serializers-xml-1.0.2-r1
@@ -45999,45 +45950,28 @@
 2205220911 metadata/md5-cache/dev-ruby/activerecord-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/activerecord-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/activerecord-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/activerecord-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/activerecord-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/activerecord-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/activerecord-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/activerecord-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/activerecord-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/activerecord-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/activerecord-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/activerecord-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/activerecord-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/activerecord-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/activestorage-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/activestorage-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/activestorage-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/activestorage-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/activestorage-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/activestorage-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/activestorage-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/activestorage-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/activestorage-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/activestorage-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/activestorage-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/activestorage-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/activestorage-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/activestorage-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/activestorage-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/activesupport-5.2.6
 2205220911 metadata/md5-cache/dev-ruby/activesupport-5.2.7.1
-2205220911 metadata/md5-cache/dev-ruby/activesupport-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/activesupport-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/activesupport-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/activesupport-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/activesupport-6.0.4.8
-2205220911 metadata/md5-cache/dev-ruby/activesupport-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/activesupport-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/activesupport-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/activesupport-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/activesupport-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/activesupport-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/activesupport-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/activesupport-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/acts_as_list-1.0.4
@@ -46521,8 +46455,6 @@
 2205220911 metadata/md5-cache/dev-ruby/moneta-1.4.1
 2205220911 metadata/md5-cache/dev-ruby/moneta-1.5.1
 2205220911 metadata/md5-cache/dev-ruby/mqtt-0.5.0
-2205220911 metadata/md5-cache/dev-ruby/msgpack-1.4.3
-2205220911 metadata/md5-cache/dev-ruby/msgpack-1.4.4
 2205220911 metadata/md5-cache/dev-ruby/msgpack-1.4.5
 2205220911 metadata/md5-cache/dev-ruby/msgpack-1.5.1
 2205220911 metadata/md5-cache/dev-ruby/multi_json-1.14.1
@@ -46571,8 +46503,6 @@
 2205220911 metadata/md5-cache/dev-ruby/niceogiri-1.1.2-r1
 2205220911 metadata/md5-cache/dev-ruby/nio4r-2.5.4
 2205220911 metadata/md5-cache/dev-ruby/nio4r-2.5.8
-2205220911 metadata/md5-cache/dev-ruby/nokogiri-1.13.4
-2205220911 metadata/md5-cache/dev-ruby/nokogiri-1.13.5
 2205220911 metadata/md5-cache/dev-ruby/nokogiri-diff-0.2.0-r3
 2205220911 metadata/md5-cache/dev-ruby/ntlm-http-0.1.1-r3
 2205220911 metadata/md5-cache/dev-ruby/oauth-0.5.10
@@ -46668,15 +46598,10 @@
 2205220911 metadata/md5-cache/dev-ruby/rails-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/rails-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/rails-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/rails-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/rails-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/rails-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/rails-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/rails-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/rails-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/rails-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/rails-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/rails-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/rails-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/rails-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3-r1
@@ -46688,15 +46613,10 @@
 2205220911 metadata/md5-cache/dev-ruby/railties-5.2.7.1
 2205220911 metadata/md5-cache/dev-ruby/railties-5.2.8
 2205220911 metadata/md5-cache/dev-ruby/railties-6.0.4.1
-2205220911 metadata/md5-cache/dev-ruby/railties-6.0.4.4
-2205220911 metadata/md5-cache/dev-ruby/railties-6.0.4.7
 2205220911 metadata/md5-cache/dev-ruby/railties-6.0.4.8
 2205220911 metadata/md5-cache/dev-ruby/railties-6.0.5
-2205220911 metadata/md5-cache/dev-ruby/railties-6.1.5
 2205220911 metadata/md5-cache/dev-ruby/railties-6.1.5.1
 2205220911 metadata/md5-cache/dev-ruby/railties-6.1.6
-2205220911 metadata/md5-cache/dev-ruby/railties-7.0.2.2
-2205220911 metadata/md5-cache/dev-ruby/railties-7.0.2.3
 2205220911 metadata/md5-cache/dev-ruby/railties-7.0.2.4
 2205220911 metadata/md5-cache/dev-ruby/railties-7.0.3
 2205220911 metadata/md5-cache/dev-ruby/rainbow-3.0.0
@@ -46750,8 +46670,6 @@
 2205220911 metadata/md5-cache/dev-ruby/ref-2.0.0-r1
 2205220911 metadata/md5-cache/dev-ruby/regexp_parser-0.5.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_parser-1.8.2
-2205220911 metadata/md5-cache/dev-ruby/regexp_parser-2.2.1
-2205220911 metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
 2205220911 metadata/md5-cache/dev-ruby/regexp_parser-2.4.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_property_values-1.2.0
 2205220911 metadata/md5-cache/dev-ruby/regexp_property_values-1.3.0
@@ -47103,7 +47021,6 @@
 2205220911 metadata/md5-cache/dev-ruby/webrick-1.7.0
 2205220911 metadata/md5-cache/dev-ruby/webrick-1.7.0-r1
 2205220911 metadata/md5-cache/dev-ruby/webrobots-0.1.2-r2
-2205220911 metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
 2205220911 metadata/md5-cache/dev-ruby/websocket-driver-0.6.5-r1
 2205220911 metadata/md5-cache/dev-ruby/websocket-driver-0.7.5
 2205220911 metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r1
@@ -47146,13 +47063,23 @@
 2205261410 metadata/md5-cache/dev-ruby/ruby-mp3info-0.8.10-r1
 2205261410 metadata/md5-cache/dev-ruby/text-hyphen-1.4.1-r3
 2205261410 metadata/md5-cache/dev-ruby/vlad-2.7.1
-2205271010 metadata/md5-cache/dev-ruby/Manifest.gz
 2205270910 metadata/md5-cache/dev-ruby/hoe-3.23.1
-2205271010 metadata/md5-cache/dev-ruby/mime-types-3.3.1
-2205271010 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
-2205271010 metadata/md5-cache/dev-ruby/nokogiri-1.13.6
 2205270910 metadata/md5-cache/dev-ruby/sawyer-0.9.1
 2205270910 metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+2205301010 metadata/md5-cache/dev-ruby/Manifest.gz
+2205301010 metadata/md5-cache/dev-ruby/activesupport-5.2.8
+2205301010 metadata/md5-cache/dev-ruby/activesupport-6.0.5
+2205291210 metadata/md5-cache/dev-ruby/digest-3.1.0-r1
+2205281010 metadata/md5-cache/dev-ruby/mime-types-3.3.1
+2205281010 metadata/md5-cache/dev-ruby/mime-types-data-3.2021.0901
+2205280910 metadata/md5-cache/dev-ruby/msgpack-1.5.2
+2205271640 metadata/md5-cache/dev-ruby/nokogiri-1.13.6
+2205280910 metadata/md5-cache/dev-ruby/octokit-4.23.0
+2205290940 metadata/md5-cache/dev-ruby/regexp_parser-2.3.1
+2205290940 metadata/md5-cache/dev-ruby/regexp_parser-2.5.0
+2205281910 metadata/md5-cache/dev-ruby/rrdtool-bindings-1.8.0
+2205290910 metadata/md5-cache/dev-ruby/tomlrb-2.0.3
+2205282340 metadata/md5-cache/dev-ruby/websocket-1.2.9-r1
 1912150139 metadata/md5-cache/dev-scheme/elk-3.99.8
 2111181609 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2-r1
 1708031509 metadata/md5-cache/dev-scheme/scmxlate-20090410-r1
@@ -47191,7 +47118,6 @@
 2205170654 metadata/md5-cache/dev-scheme/bytestructures-2.0.1
 2205170654 metadata/md5-cache/dev-scheme/c-wrapper-0.6.1-r2
 2205170654 metadata/md5-cache/dev-scheme/chez-9.5.6-r2
-2205170654 metadata/md5-cache/dev-scheme/chez-9.5.8
 2205170654 metadata/md5-cache/dev-scheme/chibi-0.10
 2205170654 metadata/md5-cache/dev-scheme/chibi-9999
 2205170654 metadata/md5-cache/dev-scheme/cyclone-0.33.0
@@ -47226,8 +47152,9 @@
 2205170654 metadata/md5-cache/dev-scheme/tinyscheme-1.41-r1
 2205170654 metadata/md5-cache/dev-scheme/tinyscheme-1.42
 2205170654 metadata/md5-cache/dev-scheme/ypsilon-0.9.6_p3-r2
-2205231740 metadata/md5-cache/dev-scheme/Manifest.gz
 2205231740 metadata/md5-cache/dev-scheme/chicken-5.3.0
+2205291040 metadata/md5-cache/dev-scheme/Manifest.gz
+2205291040 metadata/md5-cache/dev-scheme/chez-9.5.8
 2005292239 metadata/md5-cache/dev-tcltk/expect-lite-4.9.0
 2109152309 metadata/md5-cache/dev-tcltk/itcl-4.1.1
 2111052109 metadata/md5-cache/dev-tcltk/itcl-4.2.0
@@ -47468,7 +47395,6 @@
 2203222209 metadata/md5-cache/dev-util/shunit2-2.1.8
 2203240726 metadata/md5-cache/dev-util/stepman-0.10.5
 2203240726 metadata/md5-cache/dev-util/sysprof-common-3.42.1
-2203252139 metadata/md5-cache/dev-util/sysprof-common-3.44.0
 2204011845 metadata/md5-cache/dev-util/android-studio-2020.3.1.24
 2204011845 metadata/md5-cache/dev-util/clion-2021.3.2
 2204011845 metadata/md5-cache/dev-util/goland-2021.3.3
@@ -47521,7 +47447,6 @@
 2205022240 metadata/md5-cache/dev-util/argouml-0.34-r1
 2205032210 metadata/md5-cache/dev-util/byacc-20220128
 2205051510 metadata/md5-cache/dev-util/bats-1.5.0
-2205051240 metadata/md5-cache/dev-util/checkstyle-7.2-r1
 2205051140 metadata/md5-cache/dev-util/stripe-mock-0.125.0
 2205061110 metadata/md5-cache/dev-util/stripe-mock-0.126.0
 2205072340 metadata/md5-cache/dev-util/mage-1.13.0
@@ -47573,25 +47498,12 @@
 2205170654 metadata/md5-cache/dev-util/bloaty-9999
 2205170654 metadata/md5-cache/dev-util/boost-build-1.78.0-r1
 2205170654 metadata/md5-cache/dev-util/boost-build-1.79.0
-2205170654 metadata/md5-cache/dev-util/bpftool-5.16.15
-2205170654 metadata/md5-cache/dev-util/bpftool-5.17.4
 2205170654 metadata/md5-cache/dev-util/bpftrace-0.14.1
 2205170654 metadata/md5-cache/dev-util/bpftrace-0.14.1-r1
 2205170654 metadata/md5-cache/dev-util/bsdiff-4.3-r4
 2205170654 metadata/md5-cache/dev-util/btyacc-3.0-r4
 2205170654 metadata/md5-cache/dev-util/build2-0.13.0
 2205170654 metadata/md5-cache/dev-util/build2-0.14.0
-2205170654 metadata/md5-cache/dev-util/buildbot-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-9999
-2205170654 metadata/md5-cache/dev-util/buildbot-badges-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-worker-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-worker-9999
-2205170654 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
-2205170654 metadata/md5-cache/dev-util/buildbot-www-3.4.0
 2205170654 metadata/md5-cache/dev-util/cargo-audit-0.15.0
 2205170654 metadata/md5-cache/dev-util/cargo-audit-0.15.2
 2205170654 metadata/md5-cache/dev-util/cargo-c-0.6.2-r1
@@ -47630,8 +47542,6 @@
 2205170654 metadata/md5-cache/dev-util/clazy-1.10-r2
 2205170654 metadata/md5-cache/dev-util/cligh-0.3
 2205170654 metadata/md5-cache/dev-util/cligh-9999
-2205170654 metadata/md5-cache/dev-util/clippy-8.1-r1
-2205170654 metadata/md5-cache/dev-util/clippy-8.2.2
 2205170654 metadata/md5-cache/dev-util/clippy-8.2.2-r1
 2205170654 metadata/md5-cache/dev-util/cmake-3.22.2
 2205170654 metadata/md5-cache/dev-util/cmake-3.23.1
@@ -47714,7 +47624,6 @@
 2205170654 metadata/md5-cache/dev-util/gcovr-4.2
 2205170654 metadata/md5-cache/dev-util/gdbus-codegen-2.70.4
 2205170654 metadata/md5-cache/dev-util/gdbus-codegen-2.72.0
-2205171110 metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
 2205170654 metadata/md5-cache/dev-util/geany-9999
 2205170654 metadata/md5-cache/dev-util/geany-plugins-1.37-r101
 2205170654 metadata/md5-cache/dev-util/geany-plugins-1.38-r1
@@ -47734,7 +47643,6 @@
 2205170654 metadata/md5-cache/dev-util/glade-3.38.2-r1
 2205170654 metadata/md5-cache/dev-util/glib-utils-2.70.4
 2205170654 metadata/md5-cache/dev-util/glib-utils-2.72.0
-2205170654 metadata/md5-cache/dev-util/glib-utils-2.72.1
 2205170654 metadata/md5-cache/dev-util/global-6.6.4
 2205170654 metadata/md5-cache/dev-util/glslang-1.2.198
 2205170654 metadata/md5-cache/dev-util/glslang-1.3.204
@@ -47845,7 +47753,6 @@
 2205170654 metadata/md5-cache/dev-util/meson-9999
 2205170654 metadata/md5-cache/dev-util/meson-format-array-0
 2205170654 metadata/md5-cache/dev-util/min-cscope-16.1.0-r1
-2205171010 metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0
 2205170654 metadata/md5-cache/dev-util/ninja-1.10.2-r1
 2205170654 metadata/md5-cache/dev-util/ninka-2.0_pre1_p20170402
 2205170654 metadata/md5-cache/dev-util/numdiff-5.9.0
@@ -47968,16 +47875,13 @@
 2205170654 metadata/md5-cache/dev-util/smem-1.5-r2
 2205170654 metadata/md5-cache/dev-util/snakeviz-2.1.1
 2205170654 metadata/md5-cache/dev-util/source-highlight-3.1.9-r1
-2205170654 metadata/md5-cache/dev-util/spirv-headers-1.2.198
 2205170654 metadata/md5-cache/dev-util/spirv-headers-1.3.204
 2205170654 metadata/md5-cache/dev-util/spirv-headers-1.3.211
 2205170654 metadata/md5-cache/dev-util/spirv-headers-99999999
 2205170654 metadata/md5-cache/dev-util/spirv-llvm-translator-12.0.0
 2205170654 metadata/md5-cache/dev-util/spirv-llvm-translator-13.0.0-r2
 2205170654 metadata/md5-cache/dev-util/spirv-llvm-translator-14.0.0-r1
-2205170654 metadata/md5-cache/dev-util/spirv-tools-1.2.198
 2205170654 metadata/md5-cache/dev-util/spirv-tools-1.3.204
-2205170654 metadata/md5-cache/dev-util/spirv-tools-1.3.211
 2205170654 metadata/md5-cache/dev-util/spirv-tools-1.3.211-r1
 2205170654 metadata/md5-cache/dev-util/spirv-tools-99999999
 2205170654 metadata/md5-cache/dev-util/splint-3.1.2-r2
@@ -47992,10 +47896,8 @@
 2205170654 metadata/md5-cache/dev-util/sysdig-0.27.1-r100
 2205181440 metadata/md5-cache/dev-util/sysdig-kmod-0.27.1
 2205170654 metadata/md5-cache/dev-util/sysprof-3.42.1
-2205170654 metadata/md5-cache/dev-util/sysprof-3.44.0
 2205170654 metadata/md5-cache/dev-util/sysprof-capture-3.36.0-r1
 2205170654 metadata/md5-cache/dev-util/sysprof-capture-3.42.1
-2205170654 metadata/md5-cache/dev-util/sysprof-capture-3.44.0
 2205170654 metadata/md5-cache/dev-util/systemtap-4.4
 2205170654 metadata/md5-cache/dev-util/systemtap-4.5
 2205170654 metadata/md5-cache/dev-util/tinlink-1.0.0-r1
@@ -48010,7 +47912,6 @@
 2205170654 metadata/md5-cache/dev-util/umockdev-0.17.6
 2205170654 metadata/md5-cache/dev-util/umockdev-0.17.7
 2205170654 metadata/md5-cache/dev-util/umockdev-0.17.8
-2205170654 metadata/md5-cache/dev-util/umockdev-0.17.9
 2205191740 metadata/md5-cache/dev-util/umockdev-9999
 2205170654 metadata/md5-cache/dev-util/uncrustify-0.71.0
 2205170654 metadata/md5-cache/dev-util/uncrustify-0.72.0
@@ -48031,11 +47932,9 @@
 2205170654 metadata/md5-cache/dev-util/vmtouch-1.3.0
 2205170654 metadata/md5-cache/dev-util/vmtouch-1.3.1
 2205170654 metadata/md5-cache/dev-util/vtable-dumper-1.2
-2205170654 metadata/md5-cache/dev-util/vulkan-headers-1.2.198
 2205170654 metadata/md5-cache/dev-util/vulkan-headers-1.3.204
 2205170654 metadata/md5-cache/dev-util/vulkan-headers-1.3.211
 2205170654 metadata/md5-cache/dev-util/vulkan-headers-9999
-2205170654 metadata/md5-cache/dev-util/vulkan-tools-1.2.198
 2205170654 metadata/md5-cache/dev-util/vulkan-tools-1.3.204
 2205170654 metadata/md5-cache/dev-util/vulkan-tools-1.3.211
 2205170654 metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -48145,10 +48044,48 @@
 2205232310 metadata/md5-cache/dev-util/umockdev-0.17.12
 2205251240 metadata/md5-cache/dev-util/xdelta-3.0.11
 2205261010 metadata/md5-cache/dev-util/cmake-3.22.4
-2205271010 metadata/md5-cache/dev-util/Manifest.gz
 2205271010 metadata/md5-cache/dev-util/clazy-1.11-r1
 2205270510 metadata/md5-cache/dev-util/jfrog-cli-2.18.0
 2205270040 metadata/md5-cache/dev-util/pkgcheck-0.10.11
+2205310810 metadata/md5-cache/dev-util/Manifest.gz
+2205281910 metadata/md5-cache/dev-util/bpftool-5.17.4
+2205302240 metadata/md5-cache/dev-util/buildbot-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-9999
+2205302240 metadata/md5-cache/dev-util/buildbot-badges-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-badges-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-console-view-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-console-view-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-grid-view-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-grid-view-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-pkg-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-pkg-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-waterfall-view-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-waterfall-view-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-worker-3.4.0
+2205310440 metadata/md5-cache/dev-util/buildbot-worker-3.5.0-r1
+2205302240 metadata/md5-cache/dev-util/buildbot-worker-9999
+2205302240 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.5.0
+2205302240 metadata/md5-cache/dev-util/buildbot-www-3.4.0
+2205302240 metadata/md5-cache/dev-util/buildbot-www-3.5.0
+2205301010 metadata/md5-cache/dev-util/clippy-8.2.2
+2205310810 metadata/md5-cache/dev-util/dialog-1.3.20220526
+2205280910 metadata/md5-cache/dev-util/diffoscope-214
+2205280910 metadata/md5-cache/dev-util/gdbus-codegen-2.72.1
+2205302140 metadata/md5-cache/dev-util/gdbus-codegen-2.72.2
+2205280910 metadata/md5-cache/dev-util/glib-utils-2.72.1
+2205302140 metadata/md5-cache/dev-util/glib-utils-2.72.2
+2205280140 metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11279_p20220528
+2205292310 metadata/md5-cache/dev-util/lldb-14.0.4
+2205291540 metadata/md5-cache/dev-util/maturin-0.12.18
+2205282240 metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0
+2205280440 metadata/md5-cache/dev-util/sysprof-3.44.0
+2205280440 metadata/md5-cache/dev-util/sysprof-capture-3.44.0
+2205280440 metadata/md5-cache/dev-util/sysprof-common-3.44.0
+2205302140 metadata/md5-cache/dev-util/umockdev-0.17.13
+2205280910 metadata/md5-cache/dev-util/umockdev-0.17.9
+2205292140 metadata/md5-cache/dev-util/web_page_replay_go-20220314
 2101070210 metadata/md5-cache/dev-vcs/colorsvn-0.3.3
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 2002230040 metadata/md5-cache/dev-vcs/cvsgraph-1.7.0
@@ -48269,10 +48206,11 @@
 2205170654 metadata/md5-cache/dev-vcs/tortoisehg-6.1
 2205170654 metadata/md5-cache/dev-vcs/tortoisehg-6.1.2
 2205170654 metadata/md5-cache/dev-vcs/tortoisehg-9999
-2205221210 metadata/md5-cache/dev-vcs/Manifest.gz
 2205202040 metadata/md5-cache/dev-vcs/darcs-2.16.3
 2205202040 metadata/md5-cache/dev-vcs/git-annex-8.20200810
 2205221210 metadata/md5-cache/dev-vcs/git-pw-2.3.0
+2205301410 metadata/md5-cache/dev-vcs/Manifest.gz
+2205301410 metadata/md5-cache/dev-vcs/pre-commit-2.19.0
 2110190339 metadata/md5-cache/games-action/descent1-freedata-1
 2110190339 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
 2110190339 metadata/md5-cache/games-action/descent2-freedata-1
@@ -48360,8 +48298,9 @@
 2205170654 metadata/md5-cache/games-action/xpilot-4.5.5-r1
 2205231340 metadata/md5-cache/games-action/polymc-1.3.0
 2205231340 metadata/md5-cache/games-action/polymc-9999
-2205260210 metadata/md5-cache/games-action/Manifest.gz
 2205260210 metadata/md5-cache/games-action/minetest-5.5.1
+2205292210 metadata/md5-cache/games-action/Manifest.gz
+2205292210 metadata/md5-cache/games-action/polymc-1.3.1
 2102241843 metadata/md5-cache/games-arcade/amphetamine-0.8.10-r1
 2109180739 metadata/md5-cache/games-arcade/apricots-0.2.7
 2104040939 metadata/md5-cache/games-arcade/bumprace-1.5.3-r1
@@ -48518,7 +48457,6 @@
 2205170654 metadata/md5-cache/games-board/gambit-1.0.4-r1
 2205170654 metadata/md5-cache/games-board/gmchess-0.29.6-r3
 2205170654 metadata/md5-cache/games-board/gnome-chess-41.1
-2205170654 metadata/md5-cache/games-board/gnome-chess-42.0
 2205170654 metadata/md5-cache/games-board/gnome-mahjongg-3.38.3
 2205170654 metadata/md5-cache/games-board/gnome-mines-40.1
 2205170654 metadata/md5-cache/games-board/gnubg-1.06.002-r3
@@ -48550,7 +48488,6 @@
 2205170654 metadata/md5-cache/games-board/stockfish-15-r1
 2205170654 metadata/md5-cache/games-board/tali-40.5
 2205170654 metadata/md5-cache/games-board/tali-40.6
-2205170654 metadata/md5-cache/games-board/tali-40.7
 2205170654 metadata/md5-cache/games-board/tetzle-2.1.3
 2205170654 metadata/md5-cache/games-board/xboard-4.9.1
 2205170654 metadata/md5-cache/games-board/xfreecell-1.0.5b-r1
@@ -48560,7 +48497,9 @@
 2205170654 metadata/md5-cache/games-board/xscrabble-2.10-r4
 2205170654 metadata/md5-cache/games-board/xskat-4.0-r2
 2205202040 metadata/md5-cache/games-board/goatee-gtk-0.4.0
-2205260940 metadata/md5-cache/games-board/Manifest.gz
+2205280910 metadata/md5-cache/games-board/Manifest.gz
+2205280910 metadata/md5-cache/games-board/gnome-chess-42.0
+2205280910 metadata/md5-cache/games-board/tali-40.7
 2109031939 metadata/md5-cache/games-emulation/emutos-1.1.1
 2103100539 metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
 1808150339 metadata/md5-cache/games-emulation/libretro-info-0.0.1_pre20180723
@@ -48643,8 +48582,9 @@
 2205202040 metadata/md5-cache/games-emulation/dolphin-5.0_p20220520
 2205202040 metadata/md5-cache/games-emulation/dolphin-9999
 2205220511 metadata/md5-cache/games-emulation/melonds-9999
-2205251010 metadata/md5-cache/games-emulation/Manifest.gz
 2205251010 metadata/md5-cache/games-emulation/pcsx2-9999
+2205291040 metadata/md5-cache/games-emulation/Manifest.gz
+2205291040 metadata/md5-cache/games-emulation/atari800-5.0.0
 2011050809 metadata/md5-cache/games-engines/exult-1.6
 2202012143 metadata/md5-cache/games-engines/nazghul-0.7.1-r1
 2204021210 metadata/md5-cache/games-engines/zoom-1.1.5-r1
@@ -48795,7 +48735,6 @@
 2204271010 metadata/md5-cache/games-misc/wtf-20210416
 2205170654 metadata/md5-cache/games-misc/ballerburg-1.2.0-r1
 2205170654 metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
-2205170654 metadata/md5-cache/games-misc/bsd-games-3.1-r2
 2205170654 metadata/md5-cache/games-misc/bsod-0.1-r1
 2205170654 metadata/md5-cache/games-misc/c++robots-0-r1
 2205170654 metadata/md5-cache/games-misc/doge-3.6.0-r1
@@ -48820,8 +48759,9 @@
 2205170654 metadata/md5-cache/games-misc/wumpus-1.4-r2
 2205170654 metadata/md5-cache/games-misc/xcowsay-1.6
 2205170654 metadata/md5-cache/games-misc/xcruiser-0.30-r1
-2205220911 metadata/md5-cache/games-misc/Manifest.gz
 2205220911 metadata/md5-cache/games-misc/lolcat-100.0.1-r1
+2205281840 metadata/md5-cache/games-misc/Manifest.gz
+2205281840 metadata/md5-cache/games-misc/bsd-games-3.1-r2
 2104041139 metadata/md5-cache/games-mud/tf-5.0_beta8_p8
 2002230040 metadata/md5-cache/games-mud/tintin-2.01.8
 2107132209 metadata/md5-cache/games-mud/tkmoo-0.3.32-r1
@@ -48864,7 +48804,6 @@
 2204011845 metadata/md5-cache/games-puzzle/tiny-and-big-1.4.1-r2
 2204011845 metadata/md5-cache/games-puzzle/triptych-1.16
 2204011845 metadata/md5-cache/games-puzzle/world-of-goo-demo-1.41-r3
-2205170654 metadata/md5-cache/games-puzzle/Manifest.gz
 2205170654 metadata/md5-cache/games-puzzle/amoebax-0.2.1-r2
 2205170654 metadata/md5-cache/games-puzzle/anagramarama-0.2-r1
 2205170654 metadata/md5-cache/games-puzzle/angrydd-1.0.1_p13-r2
@@ -48883,7 +48822,6 @@
 2205170654 metadata/md5-cache/games-puzzle/enigma-1.21-r3
 2205170654 metadata/md5-cache/games-puzzle/fish-fillets-1.0.1-r100
 2205170654 metadata/md5-cache/games-puzzle/five-or-more-3.32.2-r1
-2205170654 metadata/md5-cache/games-puzzle/five-or-more-3.32.3
 2205170654 metadata/md5-cache/games-puzzle/flobopuyo-0.20-r3
 2205170654 metadata/md5-cache/games-puzzle/freesweep-1.0.2
 2205170654 metadata/md5-cache/games-puzzle/galaxis-1.8-r1
@@ -48891,7 +48829,6 @@
 2205170654 metadata/md5-cache/games-puzzle/glightoff-1.0.0-r1
 2205170654 metadata/md5-cache/games-puzzle/gnome-klotski-3.38.2
 2205170654 metadata/md5-cache/games-puzzle/gnome-sudoku-40.2
-2205170654 metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
 2205170654 metadata/md5-cache/games-puzzle/gnome-taquin-3.38.1
 2205170654 metadata/md5-cache/games-puzzle/gnome-tetravex-3.38.2
 2205170654 metadata/md5-cache/games-puzzle/gnome2048-3.38.2
@@ -48927,7 +48864,6 @@
 2205170654 metadata/md5-cache/games-puzzle/seatris-0.0.14-r2
 2205170654 metadata/md5-cache/games-puzzle/sgt-puzzles-20190415
 2205170654 metadata/md5-cache/games-puzzle/swell-foop-41.0.1
-2205170654 metadata/md5-cache/games-puzzle/swell-foop-41.1
 2205170654 metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
 2205170654 metadata/md5-cache/games-puzzle/tetrinet-0.11-r2
 2205170654 metadata/md5-cache/games-puzzle/tint-0.03b-r1
@@ -48944,6 +48880,10 @@
 2205170654 metadata/md5-cache/games-puzzle/xwelltris-1.0.1-r1
 2205170654 metadata/md5-cache/games-puzzle/xye-0.12.2
 2205170654 metadata/md5-cache/games-puzzle/zaz-1.0.0-r1
+2205280910 metadata/md5-cache/games-puzzle/Manifest.gz
+2205280910 metadata/md5-cache/games-puzzle/five-or-more-3.32.3
+2205280910 metadata/md5-cache/games-puzzle/gnome-sudoku-42.0
+2205280910 metadata/md5-cache/games-puzzle/swell-foop-41.1
 2104040939 metadata/md5-cache/games-roguelike/adom-1.1.1-r2
 2104101609 metadata/md5-cache/games-roguelike/adom-3.3.3-r1
 2204011845 metadata/md5-cache/games-roguelike/FTL-1.5.13-r1
@@ -49057,8 +48997,6 @@
 2205170654 metadata/md5-cache/games-simulation/flightgear-9999
 2205170654 metadata/md5-cache/games-simulation/lincity-ng-2.9_beta
 2205170654 metadata/md5-cache/games-simulation/micropolis-1.0_p20180313
-2205170654 metadata/md5-cache/games-simulation/openrct2-0.3.5.1-r1
-2205170654 metadata/md5-cache/games-simulation/openrct2-0.4.0
 2205170654 metadata/md5-cache/games-simulation/openrct2-9999
 2205170654 metadata/md5-cache/games-simulation/openttd-12.2-r1
 2205170654 metadata/md5-cache/games-simulation/pmars-sdl-0.9.2e-r1
@@ -49069,7 +49007,8 @@
 2205170654 metadata/md5-cache/games-simulation/slime-rancher-1.4.1c_p34605
 2205170654 metadata/md5-cache/games-simulation/train-valley-1.3.31403
 2205222110 metadata/md5-cache/games-simulation/EmptyEpsilon-2022.03.16
-2205222110 metadata/md5-cache/games-simulation/Manifest.gz
+2205280140 metadata/md5-cache/games-simulation/Manifest.gz
+2205280140 metadata/md5-cache/games-simulation/openrct2-0.4.0
 2104062139 metadata/md5-cache/games-sports/billardgl-1.75-r2
 2010031709 metadata/md5-cache/games-sports/gracer-0.1.5-r2
 2202012143 metadata/md5-cache/games-sports/bygfoot-2.3.2-r1
@@ -49211,9 +49150,10 @@
 2205181440 metadata/md5-cache/games-util/xpadneo-0.9.1
 2205170654 metadata/md5-cache/games-util/xqf-1.0.6.2
 2205212340 metadata/md5-cache/games-util/joystick-1.8.1
-2205260940 metadata/md5-cache/games-util/Manifest.gz
 2205260940 metadata/md5-cache/games-util/xpadneo-0.9.2
 2205260940 metadata/md5-cache/games-util/xpadneo-9999
+2205300640 metadata/md5-cache/games-util/Manifest.gz
+2205300640 metadata/md5-cache/games-util/xpadneo-0.9.3
 2108271840 metadata/md5-cache/gnome-base/gnome-light-40.0
 2202080810 metadata/md5-cache/gnome-base/gnome-40.0
 2203131809 metadata/md5-cache/gnome-base/gnome-core-apps-41.3
@@ -49223,17 +49163,14 @@
 2205170654 metadata/md5-cache/gnome-base/dconf-editor-3.38.3
 2205170654 metadata/md5-cache/gnome-base/gconf-3.2.6-r5
 2205170654 metadata/md5-cache/gnome-base/gdm-41.3
-2205170654 metadata/md5-cache/gnome-base/gdm-42.0
 2205170654 metadata/md5-cache/gnome-base/gnome-applets-3.42.0
 2205170654 metadata/md5-cache/gnome-base/gnome-applets-3.44.0
 2205170654 metadata/md5-cache/gnome-base/gnome-common-3.18.0-r1
 2205170654 metadata/md5-cache/gnome-base/gnome-control-center-41.4-r1
 2205170654 metadata/md5-cache/gnome-base/gnome-control-center-42.0-r1
-2205170654 metadata/md5-cache/gnome-base/gnome-control-center-42.1
 2205170654 metadata/md5-cache/gnome-base/gnome-desktop-41.3
 2205170654 metadata/md5-cache/gnome-base/gnome-desktop-42.0-r300
 2205170654 metadata/md5-cache/gnome-base/gnome-desktop-42.0-r400
-2205170654 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
 2205170654 metadata/md5-cache/gnome-base/gnome-flashback-3.42.1
 2205170654 metadata/md5-cache/gnome-base/gnome-flashback-3.44.0-r1
 2205181110 metadata/md5-cache/gnome-base/gnome-keyring-40.0-r1
@@ -49242,18 +49179,13 @@
 2205170654 metadata/md5-cache/gnome-base/gnome-panel-3.42.0
 2205170654 metadata/md5-cache/gnome-base/gnome-panel-3.44.0
 2205170654 metadata/md5-cache/gnome-base/gnome-session-41.3
-2205170654 metadata/md5-cache/gnome-base/gnome-session-42.0
 2205170654 metadata/md5-cache/gnome-base/gnome-settings-daemon-41.0
-2205170654 metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1
 2205170654 metadata/md5-cache/gnome-base/gnome-shell-41.4-r1
 2205170654 metadata/md5-cache/gnome-base/gnome-shell-41.5
 2205170654 metadata/md5-cache/gnome-base/gnome-shell-42.0-r1
-2205170654 metadata/md5-cache/gnome-base/gnome-shell-42.1
 2205180610 metadata/md5-cache/gnome-base/gnome-shell-42.1-r2
 2205180610 metadata/md5-cache/gnome-base/gnome-shell-42.1-r3
-2205170654 metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r5
 2205170654 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-41.0
-2205171110 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
 2205170654 metadata/md5-cache/gnome-base/gvfs-1.48.1-r1
 2205170654 metadata/md5-cache/gnome-base/gvfs-1.50.0
 2205170654 metadata/md5-cache/gnome-base/libglade-2.6.4-r3
@@ -49266,18 +49198,28 @@
 2205170654 metadata/md5-cache/gnome-base/librsvg-2.54.0
 2205170654 metadata/md5-cache/gnome-base/librsvg-2.54.1
 2205170654 metadata/md5-cache/gnome-base/librsvg-2.54.2
-2205170654 metadata/md5-cache/gnome-base/librsvg-2.54.3
 2205170654 metadata/md5-cache/gnome-base/nautilus-41.2
 2205170654 metadata/md5-cache/gnome-base/nautilus-42.0
-2205170654 metadata/md5-cache/gnome-base/nautilus-42.1.1
-2205260840 metadata/md5-cache/gnome-base/Manifest.gz
-2205260710 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
 2205232310 metadata/md5-cache/gnome-base/gnome-keyring-42.1
-2205260840 metadata/md5-cache/gnome-base/gvfs-1.50.1-r1
+2205291810 metadata/md5-cache/gnome-base/Manifest.gz
+2205280910 metadata/md5-cache/gnome-base/gdm-42.0
+2205280910 metadata/md5-cache/gnome-base/gnome-control-center-42.1
+2205280010 metadata/md5-cache/gnome-base/gnome-control-center-42.2
+2205280910 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r300
+2205280910 metadata/md5-cache/gnome-base/gnome-desktop-42.1-r400
+2205280910 metadata/md5-cache/gnome-base/gnome-session-42.0
+2205280910 metadata/md5-cache/gnome-base/gnome-settings-daemon-42.1
+2205280910 metadata/md5-cache/gnome-base/gnome-shell-42.1
+2205291810 metadata/md5-cache/gnome-base/gnome-shell-42.2
+2205280910 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-42.0
+2205280910 metadata/md5-cache/gnome-base/gvfs-1.50.1-r1
+2205271340 metadata/md5-cache/gnome-base/gvfs-1.50.2
+2205280910 metadata/md5-cache/gnome-base/librsvg-2.54.3
+2205280910 metadata/md5-cache/gnome-base/nautilus-42.1.1
+2205280010 metadata/md5-cache/gnome-base/nautilus-42.2
 2203081240 metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.1
 2203240726 metadata/md5-cache/gnome-extra/gnome-getting-started-docs-3.38.1
 2203252139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-41.2
-2204012110 metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0
 2205050610 metadata/md5-cache/gnome-extra/cinnamon-translations-5.2.2
 2205170654 metadata/md5-cache/gnome-extra/chrome-gnome-shell-10-r5
 2205170654 metadata/md5-cache/gnome-extra/cinnamon-5.2.7-r3
@@ -49291,86 +49233,58 @@
 2205170654 metadata/md5-cache/gnome-extra/eiciel-0.9.13.1
 2205170654 metadata/md5-cache/gnome-extra/evolution-data-server-3.42.4
 2205170654 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.0
-2205170654 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
 2205170654 metadata/md5-cache/gnome-extra/evolution-ews-3.42.4
 2205170654 metadata/md5-cache/gnome-extra/evolution-ews-3.44.0
-2205170654 metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
 2205170654 metadata/md5-cache/gnome-extra/gconf-editor-3.0.1-r1
 2205170654 metadata/md5-cache/gnome-extra/gnome-boxes-41.3
-2205170654 metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
 2205170654 metadata/md5-cache/gnome-extra/gnome-calculator-41.1
-2205170654 metadata/md5-cache/gnome-extra/gnome-calculator-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-calendar-41.2
 2205170654 metadata/md5-cache/gnome-extra/gnome-calendar-42.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-calendar-42.1
 2205170654 metadata/md5-cache/gnome-extra/gnome-characters-41.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-characters-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-clocks-41.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-clocks-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-color-manager-3.36.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-commander-1.14.2
 2205170654 metadata/md5-cache/gnome-extra/gnome-contacts-41.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-contacts-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-directory-thumbnailer-0.1.11
 2205170654 metadata/md5-cache/gnome-extra/gnome-documents-3.34.0-r1
 2205200540 metadata/md5-cache/gnome-extra/gnome-integration-spotify-20140907-r2
 2205170654 metadata/md5-cache/gnome-extra/gnome-logs-3.36.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-logs-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-power-manager-3.32.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-19.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-22.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-23.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-41
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-14
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-37
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-39
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-26
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-27
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20211111
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20211209
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-45
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-47
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-0.24.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-38.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-43.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-48
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-49
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210603
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-pop-shell-1.2.0_p20210727
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20211108-r1
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extensions-41.2
 2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
 2205170654 metadata/md5-cache/gnome-extra/gnome-software-41.4
 2205170654 metadata/md5-cache/gnome-extra/gnome-software-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-software-42.1
 2205170654 metadata/md5-cache/gnome-extra/gnome-system-monitor-41.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-tweaks-40.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
 2205170654 metadata/md5-cache/gnome-extra/gnome-user-docs-41.2
-2205170654 metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-user-share-3.34.0
 2205170654 metadata/md5-cache/gnome-extra/gnome-weather-41.0
-2205170654 metadata/md5-cache/gnome-extra/gnome-weather-42.0
 2205170654 metadata/md5-cache/gnome-extra/gtkhtml-4.10.0-r2
 2205170654 metadata/md5-cache/gnome-extra/gucharmap-14.0.2
-2205170654 metadata/md5-cache/gnome-extra/gucharmap-14.0.3
 2205170654 metadata/md5-cache/gnome-extra/gucharmap-3.0.1-r200
 2205170654 metadata/md5-cache/gnome-extra/libgda-5.2.9
 2205170654 metadata/md5-cache/gnome-extra/libgsf-1.14.48
-2205170654 metadata/md5-cache/gnome-extra/libgsf-1.14.49
 2205170654 metadata/md5-cache/gnome-extra/mousetweaks-3.32.0
 2205170654 metadata/md5-cache/gnome-extra/nautilus-dropbox-2019.02.14
 2205170654 metadata/md5-cache/gnome-extra/nautilus-dropbox-2020.03.04
@@ -49378,27 +49292,61 @@
 2205170654 metadata/md5-cache/gnome-extra/nemo-5.2.4
 2205170654 metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
 2205170654 metadata/md5-cache/gnome-extra/nm-applet-1.24.0
-2205170654 metadata/md5-cache/gnome-extra/nm-applet-1.26.0
 2205170654 metadata/md5-cache/gnome-extra/office-runner-1.0.3
 2205170654 metadata/md5-cache/gnome-extra/pch-session-40.2
 2205170654 metadata/md5-cache/gnome-extra/pch-session-41.2
-2205170654 metadata/md5-cache/gnome-extra/pch-session-42.0
 2205181110 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2205170654 metadata/md5-cache/gnome-extra/seahorse-nautilus-3.11.92
 2205170654 metadata/md5-cache/gnome-extra/sushi-41.0
 2205170654 metadata/md5-cache/gnome-extra/sushi-41.1
-2205170654 metadata/md5-cache/gnome-extra/sushi-41.2
 2205170654 metadata/md5-cache/gnome-extra/synapse-0.2.99.4
 2205170654 metadata/md5-cache/gnome-extra/yelp-41.2
 2205170654 metadata/md5-cache/gnome-extra/yelp-42.0
-2205170654 metadata/md5-cache/gnome-extra/yelp-42.1
 2205170654 metadata/md5-cache/gnome-extra/yelp-xsl-41.1
-2205170654 metadata/md5-cache/gnome-extra/yelp-xsl-42.0
 2205170654 metadata/md5-cache/gnome-extra/zenity-3.41.0
 2205170654 metadata/md5-cache/gnome-extra/zenity-3.42.0
-2205170654 metadata/md5-cache/gnome-extra/zenity-3.42.1
-2205210940 metadata/md5-cache/gnome-extra/Manifest.gz
 2205210940 metadata/md5-cache/gnome-extra/nemo-5.2.4-r1
+2205310340 metadata/md5-cache/gnome-extra/Manifest.gz
+2205280910 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.1
+2205271340 metadata/md5-cache/gnome-extra/evolution-data-server-3.44.2
+2205280440 metadata/md5-cache/gnome-extra/evolution-ews-3.44.1
+2205271340 metadata/md5-cache/gnome-extra/evolution-ews-3.44.2
+2205280440 metadata/md5-cache/gnome-extra/gnome-boxes-42.0.1
+2205302310 metadata/md5-cache/gnome-extra/gnome-boxes-42.1
+2205280910 metadata/md5-cache/gnome-extra/gnome-calculator-42.0
+2205310340 metadata/md5-cache/gnome-extra/gnome-calculator-42.1
+2205280910 metadata/md5-cache/gnome-extra/gnome-calendar-42.1
+2205280910 metadata/md5-cache/gnome-extra/gnome-characters-42.0
+2205280440 metadata/md5-cache/gnome-extra/gnome-clocks-42.0
+2205290410 metadata/md5-cache/gnome-extra/gnome-contacts-42.0
+2205280440 metadata/md5-cache/gnome-extra/gnome-logs-42.0
+2205280010 metadata/md5-cache/gnome-extra/gnome-shell-extension-alphabetical-grid-24.0
+2205291340 metadata/md5-cache/gnome-extra/gnome-shell-extension-appindicator-42
+2205291340 metadata/md5-cache/gnome-extra/gnome-shell-extension-applications-overview-tooltip-15
+2205291340 metadata/md5-cache/gnome-extra/gnome-shell-extension-bing-wallpaper-40
+2205291340 metadata/md5-cache/gnome-extra/gnome-shell-extension-bluetooth-quick-connect-29
+2205291340 metadata/md5-cache/gnome-extra/gnome-shell-extension-control-blur-effect-on-lock-screen-20220323
+2205280440 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-46
+2205291410 metadata/md5-cache/gnome-extra/gnome-shell-extension-dash-to-panel-50
+2205291410 metadata/md5-cache/gnome-extra/gnome-shell-extension-desktop-icons-ng-45.0
+2205280440 metadata/md5-cache/gnome-extra/gnome-shell-extension-gsconnect-50
+2205291410 metadata/md5-cache/gnome-extra/gnome-shell-extension-weather-in-the-clock-20220504
+2205280910 metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.1
+2205291810 metadata/md5-cache/gnome-extra/gnome-shell-extensions-42.2
+2205280440 metadata/md5-cache/gnome-extra/gnome-shell-frippery-42.0
+2205302140 metadata/md5-cache/gnome-extra/gnome-software-42.2
+2205280910 metadata/md5-cache/gnome-extra/gnome-system-monitor-42.0
+2205280910 metadata/md5-cache/gnome-extra/gnome-tweaks-40.10
+2205280910 metadata/md5-cache/gnome-extra/gnome-user-docs-42.0
+2205280910 metadata/md5-cache/gnome-extra/gnome-weather-42.0
+2205280910 metadata/md5-cache/gnome-extra/gucharmap-14.0.3
+2205280910 metadata/md5-cache/gnome-extra/libgsf-1.14.49
+2205280910 metadata/md5-cache/gnome-extra/nm-applet-1.26.0
+2205291340 metadata/md5-cache/gnome-extra/pch-session-42.0
+2205280910 metadata/md5-cache/gnome-extra/sushi-41.2
+2205280910 metadata/md5-cache/gnome-extra/yelp-42.1
+2205280910 metadata/md5-cache/gnome-extra/yelp-xsl-42.0
+2205280910 metadata/md5-cache/gnome-extra/zenity-3.42.1
 2205170654 metadata/md5-cache/gnustep-apps/Manifest.gz
 2205170654 metadata/md5-cache/gnustep-apps/aclock-0.4.0-r1
 2205170654 metadata/md5-cache/gnustep-apps/addresses-0.4.8-r1
@@ -49534,23 +49482,17 @@
 2205170654 metadata/md5-cache/gui-libs/egl-wayland-1.1.7-r1
 2205170654 metadata/md5-cache/gui-libs/egl-wayland-1.1.9_p20211123
 2205170654 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.3
-2205170654 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
 2205170654 metadata/md5-cache/gui-libs/greetd-0.6.1
 2205170654 metadata/md5-cache/gui-libs/greetd-0.7.0
 2205170654 metadata/md5-cache/gui-libs/greetd-0.8.0
-2205170654 metadata/md5-cache/gui-libs/gtk-4.6.1
-2205170654 metadata/md5-cache/gui-libs/gtk-4.6.2
-2205170654 metadata/md5-cache/gui-libs/gtk-4.6.3
 2205170654 metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
 2205170654 metadata/md5-cache/gui-libs/gtk-layer-shell-0.6.0
 2205170654 metadata/md5-cache/gui-libs/gtksourceview-5.4.0
-2205170654 metadata/md5-cache/gui-libs/gtksourceview-5.4.1
 2205170654 metadata/md5-cache/gui-libs/libadwaita-1.0.1
 2205170654 metadata/md5-cache/gui-libs/libadwaita-1.0.2
 2205170654 metadata/md5-cache/gui-libs/libadwaita-1.1.0
 2205170654 metadata/md5-cache/gui-libs/libhandy-1.4.0
 2205170654 metadata/md5-cache/gui-libs/libhandy-1.6.1
-2205170654 metadata/md5-cache/gui-libs/libhandy-1.6.2
 2205170654 metadata/md5-cache/gui-libs/libwpe-1.12.0
 2205170654 metadata/md5-cache/gui-libs/neatvnc-0.4.0
 2205170654 metadata/md5-cache/gui-libs/neatvnc-9999
@@ -49570,13 +49512,18 @@
 2205221210 metadata/md5-cache/gui-libs/display-manager-init-1.0-r4
 2205220410 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-0.5.0
 2205220410 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
-2205260710 metadata/md5-cache/gui-libs/gtk-4.6.4
-2205260710 metadata/md5-cache/gui-libs/libadwaita-1.1.1
 2205260910 metadata/md5-cache/gui-libs/wlroots-0.15.1
 2205260910 metadata/md5-cache/gui-libs/wlroots-9999
 2205251440 metadata/md5-cache/gui-libs/xdg-desktop-portal-lxqt-0.2.0
-2205261310 metadata/md5-cache/gui-libs/Manifest.gz
-2205261310 metadata/md5-cache/gui-libs/gtk-4.6.4-r1
+2205310710 metadata/md5-cache/gui-libs/Manifest.gz
+2205280511 metadata/md5-cache/gui-libs/amtk-5.4.1
+2205280910 metadata/md5-cache/gui-libs/gdk-pixbuf-loader-webp-0.0.4
+2205280910 metadata/md5-cache/gui-libs/gtk-4.6.4-r1
+2205310710 metadata/md5-cache/gui-libs/gtk-4.6.5
+2205280910 metadata/md5-cache/gui-libs/gtksourceview-5.4.1
+2205280910 metadata/md5-cache/gui-libs/libadwaita-1.1.1
+2205280910 metadata/md5-cache/gui-libs/libhandy-1.6.2
+2205280010 metadata/md5-cache/gui-libs/tepl-6.0.2
 2205170654 metadata/md5-cache/gui-wm/hikari-2.3.3
 2205170654 metadata/md5-cache/gui-wm/wayfire-0.7.2
 2205170654 metadata/md5-cache/gui-wm/wayfire-9999
@@ -50138,7 +50085,6 @@
 2205170654 metadata/md5-cache/kde-frameworks/kjs-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/kjs-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/knewstuff-5.92.0-r2
-2205170654 metadata/md5-cache/kde-frameworks/knewstuff-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/knotifications-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/knotifications-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/knotifyconfig-5.92.0
@@ -50197,13 +50143,14 @@
 2205170654 metadata/md5-cache/kde-frameworks/syntax-highlighting-5.94.0
 2205170654 metadata/md5-cache/kde-frameworks/threadweaver-5.92.0
 2205170654 metadata/md5-cache/kde-frameworks/threadweaver-5.94.0
-2205251440 metadata/md5-cache/kde-frameworks/Manifest.gz
 2205251440 metadata/md5-cache/kde-frameworks/kcoreaddons-5.94.0
 2205251440 metadata/md5-cache/kde-frameworks/kf-env-5
 2205251440 metadata/md5-cache/kde-frameworks/kwayland-5.94.0
 2205251440 metadata/md5-cache/kde-frameworks/kwindowsystem-5.94.0
 2205251440 metadata/md5-cache/kde-frameworks/oxygen-icons-5.94.0
 2205251440 metadata/md5-cache/kde-frameworks/solid-5.94.0
+2205301940 metadata/md5-cache/kde-frameworks/Manifest.gz
+2205301940 metadata/md5-cache/kde-frameworks/knewstuff-5.94.0-r1
 2205170654 metadata/md5-cache/kde-misc/Manifest.gz
 2205170654 metadata/md5-cache/kde-misc/basket-2.49b
 2205170654 metadata/md5-cache/kde-misc/colord-kde-0.5.0-r2
@@ -50238,113 +50185,63 @@
 2205170654 metadata/md5-cache/kde-misc/wacomtablet-3.2.0-r1
 2205170654 metadata/md5-cache/kde-misc/zanshin-21.12.3
 2205170654 metadata/md5-cache/kde-misc/zanshin-22.04.1
-2204291639 metadata/md5-cache/kde-plasma/plasma-meta-5.24.4
-2205040210 metadata/md5-cache/kde-plasma/plasma-meta-5.24.5
-2205122041 metadata/md5-cache/kde-plasma/breeze-grub-5.24.4
-2205161140 metadata/md5-cache/kde-plasma/breeze-grub-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/bluedevil-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/bluedevil-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/breeze-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/breeze-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/discover-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/discover-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/drkonqi-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/drkonqi-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kdecoration-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kdecoration-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.4-r1
-2205172210 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/kgamma-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kgamma-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/khotkeys-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/khotkeys-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kinfocenter-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kinfocenter-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kmenuedit-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kmenuedit-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kscreen-5.24.4
-2205172210 metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/kscreenlocker-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/ksshaskpass-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5
 2205170654 metadata/md5-cache/kde-plasma/ksysguard-5.22.0-r1
-2205170654 metadata/md5-cache/kde-plasma/ksystemstats-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/ksystemstats-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kwallet-pam-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kwayland-integration-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/kwayland-server-5.24.4-r2
-2205172210 metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/kwin-5.24.4-r1
 2205172210 metadata/md5-cache/kde-plasma/kwin-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/kwrited-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/kwrited-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/libkscreen-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/libksysguard-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/libkworkspace-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/libkworkspace-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/milou-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/milou-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/oxygen-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/oxygen-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.4-r1
-2205170654 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-desktop-5.24.4-r1
-2205170654 metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-disks-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-disks-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-firewall-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-integration-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-integration-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-nm-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-nm-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-pa-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-pa-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-sdk-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-vault-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-vault-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plasma-workspace-5.24.4
-2205172210 metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/powerdevil-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/powerdevil-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/sddm-kcm-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5
-2205170654 metadata/md5-cache/kde-plasma/systemsettings-5.24.4
-2205172210 metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.4-r1
-2205172210 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1
-2205170654 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.4
-2205170654 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
-2205260040 metadata/md5-cache/kde-plasma/Manifest.gz
-2205260040 metadata/md5-cache/kde-plasma/kwin-5.24.5-r2
-2205251440 metadata/md5-cache/kde-plasma/libkscreen-5.24.5
-2205260040 metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1
+2205301940 metadata/md5-cache/kde-plasma/Manifest.gz
+2205282340 metadata/md5-cache/kde-plasma/bluedevil-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/breeze-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/breeze-grub-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/breeze-gtk-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/breeze-plymouth-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/discover-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/drkonqi-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kactivitymanagerd-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kde-cli-tools-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kde-gtk-config-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kdecoration-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kdeplasma-addons-5.24.5-r1
+2205282340 metadata/md5-cache/kde-plasma/kgamma-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/khotkeys-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kinfocenter-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kmenuedit-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kscreen-5.24.5-r1
+2205301940 metadata/md5-cache/kde-plasma/kscreen-5.24.5-r2
+2205282340 metadata/md5-cache/kde-plasma/kscreenlocker-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/ksshaskpass-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/ksystemstats-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kwallet-pam-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kwayland-integration-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/kwayland-server-5.24.5-r1
+2205282340 metadata/md5-cache/kde-plasma/kwin-5.24.5-r2
+2205282340 metadata/md5-cache/kde-plasma/kwrited-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/layer-shell-qt-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/libkscreen-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/libksysguard-5.24.5-r1
+2205282340 metadata/md5-cache/kde-plasma/libkworkspace-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/milou-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/oxygen-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-browser-integration-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-desktop-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-disks-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-firewall-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-integration-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-meta-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-nm-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-pa-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-sdk-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-systemmonitor-5.24.5
+2205281010 metadata/md5-cache/kde-plasma/plasma-thunderbolt-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-vault-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plasma-workspace-5.24.5-r1
+2205282340 metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/plymouth-kcm-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/polkit-kde-agent-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/powerdevil-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/sddm-kcm-5.24.5
+2205282340 metadata/md5-cache/kde-plasma/systemsettings-5.24.5-r1
+2205282340 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r1
+2205301940 metadata/md5-cache/kde-plasma/xdg-desktop-portal-kde-5.24.5-r2
+2205282340 metadata/md5-cache/kde-plasma/xembed-sni-proxy-5.24.5
 2107230909 metadata/md5-cache/lxde-base/lxappearance-obconf-0.2.3-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-common-0.99.2-r1
 2107211809 metadata/md5-cache/lxde-base/lxde-meta-0.5.5-r7
@@ -50436,7 +50333,6 @@
 2205170654 metadata/md5-cache/mail-client/claws-mail-9999
 2205170654 metadata/md5-cache/mail-client/evolution-3.42.4
 2205170654 metadata/md5-cache/mail-client/evolution-3.44.0
-2205170654 metadata/md5-cache/mail-client/evolution-3.44.1
 2205170654 metadata/md5-cache/mail-client/geary-40.0-r1
 2205170654 metadata/md5-cache/mail-client/hap-3.7-r1
 2205170654 metadata/md5-cache/mail-client/kube-0.7.0-r1
@@ -50453,13 +50349,14 @@
 2205170654 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
 2205170654 metadata/md5-cache/mail-client/s-nail-14.9.22
 2205170654 metadata/md5-cache/mail-client/s-nail-14.9.24
-2205170654 metadata/md5-cache/mail-client/thunderbird-91.9.0
 2205221610 metadata/md5-cache/mail-client/thunderbird-91.9.1
 2205210940 metadata/md5-cache/mail-client/thunderbird-bin-91.9.1
 2205241710 metadata/md5-cache/mail-client/aerc-9999
 2205251510 metadata/md5-cache/mail-client/mutt-2.2.5
-2205261610 metadata/md5-cache/mail-client/Manifest.gz
 2205261610 metadata/md5-cache/mail-client/alpine-2.25-r2
+2205300910 metadata/md5-cache/mail-client/Manifest.gz
+2205280910 metadata/md5-cache/mail-client/evolution-3.44.1
+2205271340 metadata/md5-cache/mail-client/evolution-3.44.2
 2111071239 metadata/md5-cache/mail-filter/dkimproxy-1.4.1
 2105021209 metadata/md5-cache/mail-filter/mailfilter-0.8.4
 2107120039 metadata/md5-cache/mail-filter/mimedefang-2.84-r1
@@ -50548,17 +50445,18 @@
 2205170654 metadata/md5-cache/mail-mta/postfix-3.6.6
 2205170654 metadata/md5-cache/mail-mta/postfix-3.7.1
 2205170654 metadata/md5-cache/mail-mta/postfix-3.7.2
-2205170654 metadata/md5-cache/mail-mta/postfix-3.8_pre20220509
 2205170654 metadata/md5-cache/mail-mta/protonmail-bridge-2.1.1-r1
 2205170654 metadata/md5-cache/mail-mta/sendmail-8.16.1-r2
 2205170654 metadata/md5-cache/mail-mta/sendmail-8.17.1-r2
 2205170654 metadata/md5-cache/mail-mta/ssmtp-2.64-r4
-2205212010 metadata/md5-cache/mail-mta/Manifest.gz
 2205212010 metadata/md5-cache/mail-mta/netqmail-1.06-r14
 2205212010 metadata/md5-cache/mail-mta/netqmail-1.06-r16
 2205212010 metadata/md5-cache/mail-mta/notqmail-1.08-r5
 2205212010 metadata/md5-cache/mail-mta/notqmail-1.08-r6
 2205212010 metadata/md5-cache/mail-mta/notqmail-9999
+2205301410 metadata/md5-cache/mail-mta/Manifest.gz
+2205281140 metadata/md5-cache/mail-mta/postfix-3.8_pre20220527
+2205301410 metadata/md5-cache/mail-mta/protonmail-bridge-2.2.0
 2111230440 metadata/md5-cache/mate-base/mate-1.24
 2111230440 metadata/md5-cache/mate-base/mate-applets-meta-1.24.0
 2203240726 metadata/md5-cache/mate-base/mate-common-1.24.2
@@ -50632,11 +50530,9 @@
 2205100440 metadata/md5-cache/media-fonts/fira-mono-4.202
 2205100440 metadata/md5-cache/media-fonts/fira-sans-4.202
 2205141340 metadata/md5-cache/media-fonts/urw-fonts-2.4.9
-2205161710 metadata/md5-cache/media-fonts/lxgw-wenkai-1.234.56
 2205171610 metadata/md5-cache/media-fonts/arphicfonts-0.2.20080216.1-r2
 2205171610 metadata/md5-cache/media-fonts/baekmuk-fonts-2.2-r2
 2205170654 metadata/md5-cache/media-fonts/cantarell-0.301
-2205170654 metadata/md5-cache/media-fonts/cantarell-0.303.1
 2205170654 metadata/md5-cache/media-fonts/encodings-1.0.5-r1
 2205170654 metadata/md5-cache/media-fonts/font-adobe-75dpi-1.0.3-r2
 2205170654 metadata/md5-cache/media-fonts/font-alias-1.0.4
@@ -50649,7 +50545,6 @@
 2205170654 metadata/md5-cache/media-fonts/noto-emoji-20211101
 2205170654 metadata/md5-cache/media-fonts/unifont-13.0.01-r1
 2205251140 metadata/md5-cache/media-fonts/Humor-Sans-1.0-r1
-2205251140 metadata/md5-cache/media-fonts/Manifest.gz
 2205251140 metadata/md5-cache/media-fonts/ahem-1.0
 2205251140 metadata/md5-cache/media-fonts/alee-fonts-13-r1
 2205251140 metadata/md5-cache/media-fonts/alef-1
@@ -50836,7 +50731,6 @@
 2205251140 metadata/md5-cache/media-fonts/umeplus-fonts-20180604
 2205251140 metadata/md5-cache/media-fonts/unfonts-1.0.2_pre080608-r1
 2205251140 metadata/md5-cache/media-fonts/unfonts-extra-1.0.2_pre080608-r1
-2205251140 metadata/md5-cache/media-fonts/unifont-14.0.03
 2205251140 metadata/md5-cache/media-fonts/urwvn-fonts-3.05
 2205251140 metadata/md5-cache/media-fonts/vdrsymbols-ttf-20100612
 2205251140 metadata/md5-cache/media-fonts/viga-1
@@ -50849,6 +50743,10 @@
 2205251140 metadata/md5-cache/media-fonts/wqy-zenhei-0.9.46
 2205251140 metadata/md5-cache/media-fonts/x11fonts-jmk-3.0-r4
 2205251140 metadata/md5-cache/media-fonts/zh-kcfonts-1.05-r3
+2205310810 metadata/md5-cache/media-fonts/Manifest.gz
+2205280910 metadata/md5-cache/media-fonts/cantarell-0.303.1
+2205310640 metadata/md5-cache/media-fonts/lxgw-wenkai-1.235
+2205310810 metadata/md5-cache/media-fonts/unifont-14.0.03
 2107180709 metadata/md5-cache/media-gfx/album-4.15-r1
 2009111309 metadata/md5-cache/media-gfx/dpic-20200901
 2101181809 metadata/md5-cache/media-gfx/exif-0.6.22
@@ -50959,10 +50857,8 @@
 2205170654 metadata/md5-cache/media-gfx/entice-0_pre20210919-r1
 2205170654 metadata/md5-cache/media-gfx/eog-41.1
 2205170654 metadata/md5-cache/media-gfx/eog-42.0
-2205170654 metadata/md5-cache/media-gfx/eog-42.1
 2205170654 metadata/md5-cache/media-gfx/eog-plugins-3.26.8
 2205170654 metadata/md5-cache/media-gfx/eog-plugins-42.0
-2205170654 metadata/md5-cache/media-gfx/eog-plugins-42.1
 2205170654 metadata/md5-cache/media-gfx/eom-1.24.2
 2205170654 metadata/md5-cache/media-gfx/ephoto-1.6.0
 2205170654 metadata/md5-cache/media-gfx/exact-image-1.0.2-r3
@@ -51014,9 +50910,7 @@
 2205170654 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
 2205170654 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20211108
 2205170654 metadata/md5-cache/media-gfx/gnome-font-viewer-41.0
-2205170654 metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
 2205170654 metadata/md5-cache/media-gfx/gnome-photos-40.0
-2205170654 metadata/md5-cache/media-gfx/gnome-photos-42.0
 2205170654 metadata/md5-cache/media-gfx/gnome-raw-thumbnailer-3.0.0-r1
 2205170654 metadata/md5-cache/media-gfx/gnome-screenshot-41.0
 2205170654 metadata/md5-cache/media-gfx/gnuclad-0.2.4
@@ -51031,7 +50925,6 @@
 2205170654 metadata/md5-cache/media-gfx/graphviz-2.49.0-r1
 2205171110 metadata/md5-cache/media-gfx/graphviz-2.50.0
 2205170654 metadata/md5-cache/media-gfx/gthumb-3.10.4
-2205170654 metadata/md5-cache/media-gfx/gthumb-3.12.2-r2
 2205170654 metadata/md5-cache/media-gfx/gtkimageview-1.6.4
 2205170654 metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
 2205170654 metadata/md5-cache/media-gfx/hugin-2021.0.0
@@ -51053,7 +50946,6 @@
 2205170654 metadata/md5-cache/media-gfx/inkscape-1.1-r1
 2205170654 metadata/md5-cache/media-gfx/inkscape-1.1.1
 2205170654 metadata/md5-cache/media-gfx/inkscape-1.1.2
-2205170654 metadata/md5-cache/media-gfx/inkscape-1.1.2-r1
 2205170654 metadata/md5-cache/media-gfx/iscan-2.30.4.2-r1
 2205170654 metadata/md5-cache/media-gfx/iscan-3.65.0
 2205170654 metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
@@ -51138,7 +51030,6 @@
 2205170654 metadata/md5-cache/media-gfx/prusaslicer-2.4.1
 2205170654 metadata/md5-cache/media-gfx/prusaslicer-2.4.2
 2205170654 metadata/md5-cache/media-gfx/prusaslicer-2.4.2_p20220506
-2205170654 metadata/md5-cache/media-gfx/pstoedit-3.75
 2205170654 metadata/md5-cache/media-gfx/qimgv-1.0.2
 2205170654 metadata/md5-cache/media-gfx/qvv-4.04.2
 2205170654 metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
@@ -51155,11 +51046,9 @@
 2205170654 metadata/md5-cache/media-gfx/scrot-9999
 2205170654 metadata/md5-cache/media-gfx/sfftobmp-3.1.2-r1
 2205170654 metadata/md5-cache/media-gfx/shotwell-0.30.14
-2205170654 metadata/md5-cache/media-gfx/shotwell-0.30.15
 2205181940 metadata/md5-cache/media-gfx/shotwell-0.30.16
 2205170654 metadata/md5-cache/media-gfx/simple-scan-40.7
 2205170654 metadata/md5-cache/media-gfx/simple-scan-42.0
-2205170654 metadata/md5-cache/media-gfx/simple-scan-42.1
 2205170654 metadata/md5-cache/media-gfx/skanpage-22.04.1
 2205170654 metadata/md5-cache/media-gfx/solvespace-3.0-r2
 2205170654 metadata/md5-cache/media-gfx/svg2rlg-0.4.0
@@ -51205,13 +51094,24 @@
 2205202210 metadata/md5-cache/media-gfx/mcomix-1.3.0_pre20211015
 2205201540 metadata/md5-cache/media-gfx/mcomix-9999
 2205202240 metadata/md5-cache/media-gfx/qiv-2.3.2-r1
-2205210110 metadata/md5-cache/media-gfx/qrencode-4.1.1
 2205212040 metadata/md5-cache/media-gfx/renderdoc-1.19
 2205230940 metadata/md5-cache/media-gfx/ttfautohint-1.8.4-r3
-2205260610 metadata/md5-cache/media-gfx/Manifest.gz
 2205260610 metadata/md5-cache/media-gfx/inkscape-1.1.2-r2
-2205260440 metadata/md5-cache/media-gfx/inkscape-9999
 2205251240 metadata/md5-cache/media-gfx/mkbold-mkitalic-0.11
+2205310610 metadata/md5-cache/media-gfx/Manifest.gz
+2205280910 metadata/md5-cache/media-gfx/eog-42.1
+2205290440 metadata/md5-cache/media-gfx/eog-42.2
+2205280440 metadata/md5-cache/media-gfx/eog-plugins-42.1
+2205280910 metadata/md5-cache/media-gfx/gnome-font-viewer-42.0
+2205280910 metadata/md5-cache/media-gfx/gnome-photos-42.0
+2205280440 metadata/md5-cache/media-gfx/gthumb-3.12.2-r2
+2205310610 metadata/md5-cache/media-gfx/inkscape-1.1.2-r1
+2205310610 metadata/md5-cache/media-gfx/inkscape-1.2
+2205310610 metadata/md5-cache/media-gfx/inkscape-9999
+2205301040 metadata/md5-cache/media-gfx/pstoedit-3.75
+2205292340 metadata/md5-cache/media-gfx/qrencode-4.1.1
+2205280910 metadata/md5-cache/media-gfx/shotwell-0.30.15
+2205280810 metadata/md5-cache/media-gfx/simple-scan-42.1
 2109230439 metadata/md5-cache/media-libs/alsa-topology-conf-1.2.4
 2109230439 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.4
 2110030209 metadata/md5-cache/media-libs/alsa-ucm-conf-1.2.5.1
@@ -51263,7 +51163,6 @@
 2203240726 metadata/md5-cache/media-libs/lsp-plugins-9999
 2203251709 metadata/md5-cache/media-libs/libpagemaker-0.0.4
 2203251709 metadata/md5-cache/media-libs/libzmf-0.0.2
-2203260340 metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1
 2203281010 metadata/md5-cache/media-libs/libcdaudio-0.99.12-r3
 2204121040 metadata/md5-cache/media-libs/esdl-1.3.1
 2205011048 metadata/md5-cache/media-libs/exiftool-12.30
@@ -51346,9 +51245,7 @@
 2205170654 metadata/md5-cache/media-libs/fontconfig-2.13.93
 2205170654 metadata/md5-cache/media-libs/fontconfig-2.14.0-r1
 2205170654 metadata/md5-cache/media-libs/freealut-1.1.0-r4
-2205170654 metadata/md5-cache/media-libs/freeglut-3.2.1-r2
 2205170654 metadata/md5-cache/media-libs/freeimage-3.18.0-r3
-2205170654 metadata/md5-cache/media-libs/freeimage-3.18.0-r6
 2205170654 metadata/md5-cache/media-libs/freetype-2.12.0-r1
 2205170654 metadata/md5-cache/media-libs/freetype-2.12.1
 2205170654 metadata/md5-cache/media-libs/freetype-9999
@@ -51362,7 +51259,6 @@
 2205170654 metadata/md5-cache/media-libs/gegl-0.4.36-r1
 2205170654 metadata/md5-cache/media-libs/gegl-9999
 2205170654 metadata/md5-cache/media-libs/gexiv2-0.12.2
-2205170654 metadata/md5-cache/media-libs/gexiv2-0.14.0
 2205170654 metadata/md5-cache/media-libs/giblib-1.2.4-r1
 2205170654 metadata/md5-cache/media-libs/giflib-5.2.1-r1
 2205170654 metadata/md5-cache/media-libs/glew-1.10.0-r100
@@ -51381,7 +51277,6 @@
 2205170654 metadata/md5-cache/media-libs/gmmlib-9999
 2205170654 metadata/md5-cache/media-libs/gnonlin-1.4.0-r1
 2205170654 metadata/md5-cache/media-libs/graphene-1.10.6-r1
-2205171210 metadata/md5-cache/media-libs/graphene-1.10.8
 2205170654 metadata/md5-cache/media-libs/grilo-0.3.14
 2205170654 metadata/md5-cache/media-libs/gsound-1.0.3
 2205172010 metadata/md5-cache/media-libs/gst-plugins-bad-1.16.3
@@ -51497,7 +51392,6 @@
 2205170654 metadata/md5-cache/media-libs/libebur128-1.2.6
 2205170654 metadata/md5-cache/media-libs/libeot-0.01
 2205170654 metadata/md5-cache/media-libs/libeot-9999
-2205170654 metadata/md5-cache/media-libs/libepoxy-1.5.9-r1
 2205170654 metadata/md5-cache/media-libs/libepoxy-9999
 2205170654 metadata/md5-cache/media-libs/libfame-0.9.1-r3
 2205170654 metadata/md5-cache/media-libs/libffado-2.4.5
@@ -51546,7 +51440,6 @@
 2205170654 metadata/md5-cache/media-libs/libmatemixer-1.24.1-r1
 2205170654 metadata/md5-cache/media-libs/libmatroska-1.6.3
 2205170654 metadata/md5-cache/media-libs/libmediaart-1.9.4
-2205170654 metadata/md5-cache/media-libs/libmediaart-1.9.5
 2205170654 metadata/md5-cache/media-libs/libmediainfo-20.09-r1
 2205170654 metadata/md5-cache/media-libs/libmediainfo-21.09
 2205170654 metadata/md5-cache/media-libs/libmediainfo-22.03
@@ -51601,7 +51494,6 @@
 2205170654 metadata/md5-cache/media-libs/libpng-compat-1.5.30
 2205170654 metadata/md5-cache/media-libs/libprojectm-3.1.12
 2205170654 metadata/md5-cache/media-libs/libprojectm-9999
-2205190840 metadata/md5-cache/media-libs/libpulse-15.99.1-r1
 2205170654 metadata/md5-cache/media-libs/libqaccessibilityclient-0.4.1
 2205170654 metadata/md5-cache/media-libs/libquicktime-1.2.4-r3
 2205170654 metadata/md5-cache/media-libs/libquvi-0.9.4-r100
@@ -51746,7 +51638,6 @@
 2205170654 metadata/md5-cache/media-libs/sdl_audiolib-9999
 2205170654 metadata/md5-cache/media-libs/sg-1.5
 2205170654 metadata/md5-cache/media-libs/sge-030809
-2205170654 metadata/md5-cache/media-libs/shaderc-2021.3
 2205170654 metadata/md5-cache/media-libs/shaderc-2022.1
 2205170654 metadata/md5-cache/media-libs/shaderc-2022.1-r1
 2205170654 metadata/md5-cache/media-libs/simage-1.8.0-r1
@@ -51790,12 +51681,9 @@
 2205170654 metadata/md5-cache/media-libs/vo-aacenc-9999
 2205170654 metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
 2205170654 metadata/md5-cache/media-libs/vo-amrwbenc-9999
-2205170654 metadata/md5-cache/media-libs/vulkan-layers-1.2.198-r1
 2205170654 metadata/md5-cache/media-libs/vulkan-layers-1.3.204
 2205170654 metadata/md5-cache/media-libs/vulkan-layers-1.3.211
 2205170654 metadata/md5-cache/media-libs/vulkan-layers-9999
-2205170654 metadata/md5-cache/media-libs/vulkan-loader-1.2.198
-2205170654 metadata/md5-cache/media-libs/vulkan-loader-1.2.198-r1
 2205170654 metadata/md5-cache/media-libs/vulkan-loader-1.3.204
 2205170654 metadata/md5-cache/media-libs/vulkan-loader-1.3.211
 2205170654 metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -51838,26 +51726,40 @@
 2205221110 metadata/md5-cache/media-libs/libxmp-9999
 2205230011 metadata/md5-cache/media-libs/opencv-4.5.5-r1
 2205201640 metadata/md5-cache/media-libs/osl-1.11.17.0-r4
-2205210340 metadata/md5-cache/media-libs/tiff-4.4.0_rc1
-2205252110 metadata/md5-cache/media-libs/freeglut-3.2.2
 2205251540 metadata/md5-cache/media-libs/freeverb3-3.2.1-r3
-2205260710 metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2
-2205251910 metadata/md5-cache/media-libs/gst-plugins-base-1.20.2
-2205251910 metadata/md5-cache/media-libs/gst-plugins-good-1.20.2
-2205251910 metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2
-2205251910 metadata/md5-cache/media-libs/gstreamer-1.20.2
 2205251240 metadata/md5-cache/media-libs/libde265-1.0.8
 2205251240 metadata/md5-cache/media-libs/libde265-9999
-2205252110 metadata/md5-cache/media-libs/libepoxy-1.5.10
 2205251440 metadata/md5-cache/media-libs/libexif-0.6.24
-2205252110 metadata/md5-cache/media-libs/mesa-22.0.3
 2205251440 metadata/md5-cache/media-libs/openal-1.22.0
 2205240010 metadata/md5-cache/media-libs/openjpeg-2.5.0-r2
 2205260840 metadata/md5-cache/media-libs/opusfile-0.12
 2205260840 metadata/md5-cache/media-libs/pcaudiolib-1.1
 2205260840 metadata/md5-cache/media-libs/speex-1.2.0-r2
-2205261310 metadata/md5-cache/media-libs/Manifest.gz
-2205261310 metadata/md5-cache/media-libs/libgphoto2-2.5.29
+2205310840 metadata/md5-cache/media-libs/Manifest.gz
+2205290440 metadata/md5-cache/media-libs/clutter-gst-3.0.27-r2
+2205280440 metadata/md5-cache/media-libs/freeglut-3.2.2
+2205302340 metadata/md5-cache/media-libs/freeimage-3.18.0-r7
+2205302340 metadata/md5-cache/media-libs/freeimage-3.18.0-r8
+2205280910 metadata/md5-cache/media-libs/gexiv2-0.14.0
+2205280910 metadata/md5-cache/media-libs/graphene-1.10.8
+2205280440 metadata/md5-cache/media-libs/gst-plugins-bad-1.20.2
+2205280440 metadata/md5-cache/media-libs/gst-plugins-base-1.20.2
+2205280440 metadata/md5-cache/media-libs/gst-plugins-good-1.20.2
+2205280440 metadata/md5-cache/media-libs/gst-plugins-ugly-1.20.2
+2205280440 metadata/md5-cache/media-libs/gstreamer-1.20.2
+2205310840 metadata/md5-cache/media-libs/gstreamer-editing-services-1.18.4
+2205310840 metadata/md5-cache/media-libs/gstreamer-editing-services-1.20.2
+2205280440 metadata/md5-cache/media-libs/libepoxy-1.5.10
+2205280910 metadata/md5-cache/media-libs/libgphoto2-2.5.29
+2205280910 metadata/md5-cache/media-libs/libmediaart-1.9.5
+2205291010 metadata/md5-cache/media-libs/libpulse-16.0
+2205291010 metadata/md5-cache/media-libs/lilv-0.24.14
+2205290940 metadata/md5-cache/media-libs/lv2-1.18.4
+2205280440 metadata/md5-cache/media-libs/mesa-22.0.3
+2205301740 metadata/md5-cache/media-libs/nv-codec-headers-11.1.5.1-r1
+2205291010 metadata/md5-cache/media-libs/sratom-0.6.10
+2205290940 metadata/md5-cache/media-libs/suil-0.10.12
+2205280840 metadata/md5-cache/media-libs/tiff-4.4.0
 2109230909 metadata/md5-cache/media-plugins/audacious-plugins-4.0.5
 2011090239 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2-r1
 2006152009 metadata/md5-cache/media-plugins/gmpc-alarm-11.8.16
@@ -51940,7 +51842,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdio-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.18.6
@@ -51949,7 +51850,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.18.6
@@ -51974,7 +51874,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dv-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dvb-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-dvb-1.18.6
@@ -51987,12 +51886,10 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faac-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faad-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faad-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-flac-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-flac-1.18.6
@@ -52032,7 +51929,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lame-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.1
 2205170654 metadata/md5-cache/media-plugins/gst-plugins-libav-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libav-1.18.4
@@ -52049,18 +51945,15 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libmms-1.18.6
 2205170654 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.15-r100
-2205170654 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18
 2205170654 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.19
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lv2-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-lv2-1.18.6
@@ -52074,7 +51967,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-modplug-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.18.6
@@ -52097,7 +51989,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-neon-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ofa-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ofa-1.18.6
@@ -52128,7 +52019,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.18.6
@@ -52143,17 +52033,14 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sctp-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sctp-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.18.6
@@ -52173,7 +52060,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-speex-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-srt-1.16.3-r1
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.4-r1
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-srt-1.18.6
@@ -52191,7 +52077,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-twolame-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-uvch264-1.18.6
@@ -52205,7 +52090,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.4-r3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.18.6-r1
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.1-r1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.18.6
@@ -52224,12 +52108,10 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.4-r1
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-x264-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-x264-1.18.6
@@ -52243,7 +52125,6 @@
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.18.6
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.1
-2205172010 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.16.3
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.4
 2205172010 metadata/md5-cache/media-plugins/gst-plugins-zbar-1.18.6
@@ -52587,34 +52468,56 @@
 2205170654 metadata/md5-cache/media-plugins/vdr-zappilot-0.0.5-r2
 2205170654 metadata/md5-cache/media-plugins/x42-plugins-20220327
 2205170654 metadata/md5-cache/media-plugins/x42-plugins-99999999
-2205251910 metadata/md5-cache/media-plugins/Manifest.gz
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2
-2205251910 metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2
 2205241310 metadata/md5-cache/media-plugins/qmmp-plugin-pack-1.6.0
+2205301710 metadata/md5-cache/media-plugins/Manifest.gz
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-assrender-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-cdio-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.20.2
+2205301710 metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-dv-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-dvb-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-faac-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-faad-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-flac-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-gtk-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-jack-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-lame-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-ldac-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-libav-1.20.2
+2205280910 metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.18
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-libpng-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-meta-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-modplug-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-mpg123-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-neon-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-openaptx-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-opus-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-oss-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-pulse-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.20.2
+2205301010 metadata/md5-cache/media-plugins/gst-plugins-sctp-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-shout2-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-soup-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-speex-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-srtp-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-taglib-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-twolame-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-vaapi-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-vpx-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.20.2
+2205301010 metadata/md5-cache/media-plugins/gst-plugins-webrtc-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-x264-1.20.2
+2205280440 metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.20.2
+2205281910 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r2
 2105202109 metadata/md5-cache/media-radio/adifmerg-31-r1
 2005281909 metadata/md5-cache/media-radio/ax25-tools-0.0.10_rc5
 2004131239 metadata/md5-cache/media-radio/dxcc-20191204
@@ -52626,7 +52529,6 @@
 2112231339 metadata/md5-cache/media-radio/flrig-1.4.3
 2202072210 metadata/md5-cache/media-radio/flrig-1.4.4
 2203240726 metadata/md5-cache/media-radio/cqrlog-2.4.0
-2203271540 metadata/md5-cache/media-radio/flrig-1.4.5
 2204271640 metadata/md5-cache/media-radio/flamp-2.2.07
 2204280210 metadata/md5-cache/media-radio/flmsg-4.0.19-r1
 2205170654 metadata/md5-cache/media-radio/ax25-apps-0.0.8_rc5
@@ -52638,7 +52540,6 @@
 2205170654 metadata/md5-cache/media-radio/fldigi-4.1.22
 2205170654 metadata/md5-cache/media-radio/fsync-mdc1200-decode-1.0
 2205170654 metadata/md5-cache/media-radio/fsync-mdc1200-decode-9999
-2205170654 metadata/md5-cache/media-radio/gpredict-2.3-r1
 2205170654 metadata/md5-cache/media-radio/ibp-0.21-r2
 2205170654 metadata/md5-cache/media-radio/js8call-2.2.0-r1
 2205170654 metadata/md5-cache/media-radio/kochmorse-3.5.1
@@ -52657,8 +52558,11 @@
 2205170654 metadata/md5-cache/media-radio/xlog-2.0.24
 2205170654 metadata/md5-cache/media-radio/xwxapt-3.4.2
 2205170654 metadata/md5-cache/media-radio/xwxapt-3.4.3
-2205212110 metadata/md5-cache/media-radio/Manifest.gz
 2205212110 metadata/md5-cache/media-radio/tqsl-2.6.2
+2205300010 metadata/md5-cache/media-radio/Manifest.gz
+2205291740 metadata/md5-cache/media-radio/flrig-1.4.5
+2205291740 metadata/md5-cache/media-radio/gpredict-2.3-r1
+2205300010 metadata/md5-cache/media-radio/tqsl-2.6.3
 2008082009 metadata/md5-cache/media-sound/cdstatus-0.97.03
 1912100409 metadata/md5-cache/media-sound/cdtool-2.1.8-r1
 2008082009 metadata/md5-cache/media-sound/chordii-4.5.3
@@ -52746,8 +52650,6 @@
 2205170654 metadata/md5-cache/media-sound/a2jmidid-9
 2205170654 metadata/md5-cache/media-sound/a2jmidid-9999
 2205170654 metadata/md5-cache/media-sound/abcm2ps-8.14.13
-2205170654 metadata/md5-cache/media-sound/abcmidi-2022.04.06
-2205170654 metadata/md5-cache/media-sound/abcmidi-2022.04.28
 2205170654 metadata/md5-cache/media-sound/abcmidi-2022.05.05
 2205170654 metadata/md5-cache/media-sound/aeolus-0.10.4
 2205170654 metadata/md5-cache/media-sound/aeolus-0.9.9
@@ -52837,7 +52739,6 @@
 2205170654 metadata/md5-cache/media-sound/flacon-5.5.1
 2205170654 metadata/md5-cache/media-sound/flacon-8.2.0
 2205170654 metadata/md5-cache/media-sound/flake-0.11
-2205170654 metadata/md5-cache/media-sound/fluidsynth-2.2.6
 2205170654 metadata/md5-cache/media-sound/fmdrv-1.0.7
 2205170654 metadata/md5-cache/media-sound/fmit-1.0.15-r3
 2205170654 metadata/md5-cache/media-sound/frescobaldi-3.1.3
@@ -52853,9 +52754,7 @@
 2205170654 metadata/md5-cache/media-sound/gmusicbrowser-9999
 2205170654 metadata/md5-cache/media-sound/gnome-music-41.0
 2205170654 metadata/md5-cache/media-sound/gnome-music-42.0
-2205170654 metadata/md5-cache/media-sound/gnome-music-42.1
 2205170654 metadata/md5-cache/media-sound/gnome-sound-recorder-40.0
-2205170654 metadata/md5-cache/media-sound/gnome-sound-recorder-42.0
 2205170654 metadata/md5-cache/media-sound/gogglesmm-1.2.1-r1
 2205170654 metadata/md5-cache/media-sound/gom-0.29.103-r1
 2205170654 metadata/md5-cache/media-sound/gpodder-3.10.16-r1
@@ -52892,8 +52791,6 @@
 2205170654 metadata/md5-cache/media-sound/kid3-3.9.1
 2205170654 metadata/md5-cache/media-sound/klick-0.12.2-r2
 2205170654 metadata/md5-cache/media-sound/kmetronome-1.3.0
-2205170654 metadata/md5-cache/media-sound/kmidimon-1.2.0
-2205170654 metadata/md5-cache/media-sound/kmidimon-1.3.0
 2205190840 metadata/md5-cache/media-sound/lame-3.100-r3
 2205170654 metadata/md5-cache/media-sound/lash-0.5.4-r4
 2205170654 metadata/md5-cache/media-sound/lilypond-2.22.0-r1
@@ -52995,12 +52892,9 @@
 2205170654 metadata/md5-cache/media-sound/puddletag-2.1.1
 2205170654 metadata/md5-cache/media-sound/pulseaudio-13.0-r1
 2205170654 metadata/md5-cache/media-sound/pulseaudio-15.0-r2
-2205190840 metadata/md5-cache/media-sound/pulseaudio-15.99.1-r1
-2205190840 metadata/md5-cache/media-sound/pulseaudio-daemon-15.99.1-r2
 2205170654 metadata/md5-cache/media-sound/pulseaudio-modules-bt-1.4
 2205170654 metadata/md5-cache/media-sound/pulseaudio-modules-bt-1.4-r4
 2205170654 metadata/md5-cache/media-sound/pulseeffects-4.8.5-r1
-2205170654 metadata/md5-cache/media-sound/pulseeffects-4.8.6
 2205170654 metadata/md5-cache/media-sound/pulsemixer-1.5.1
 2205170654 metadata/md5-cache/media-sound/pulsemixer-9999
 2205170654 metadata/md5-cache/media-sound/pwavecat-0.4.5
@@ -53024,7 +52918,6 @@
 2205170654 metadata/md5-cache/media-sound/rcenter-0.6.2
 2205170654 metadata/md5-cache/media-sound/rexima-1.4-r1
 2205170654 metadata/md5-cache/media-sound/rhythmbox-3.4.4
-2205170654 metadata/md5-cache/media-sound/rhythmbox-3.4.5
 2205170654 metadata/md5-cache/media-sound/rosegarden-21.12
 2205170654 metadata/md5-cache/media-sound/rplay-3.3.2-r4
 2205170654 metadata/md5-cache/media-sound/schismtracker-20220125
@@ -53100,7 +52993,6 @@
 2205170654 metadata/md5-cache/media-sound/wildmidi-0.4.3
 2205170654 metadata/md5-cache/media-sound/wildmidi-0.4.4
 2205170654 metadata/md5-cache/media-sound/xmms2-0.8_p20201016-r2
-2205170654 metadata/md5-cache/media-sound/xmms2-0.9.1
 2205170654 metadata/md5-cache/media-sound/xwax-1.8
 2205170654 metadata/md5-cache/media-sound/yarock-1.4.0-r2
 2205170654 metadata/md5-cache/media-sound/yoshimi-2.1.2.2
@@ -53116,10 +53008,23 @@
 2205251040 metadata/md5-cache/media-sound/din-54
 2205260840 metadata/md5-cache/media-sound/gsm-1.0.13-r1
 2205260840 metadata/md5-cache/media-sound/picard-2.8
-2205251910 metadata/md5-cache/media-sound/pulseaudio-15.0-r3
 2205260840 metadata/md5-cache/media-sound/sox-14.4.2_p20210509
-2205271240 metadata/md5-cache/media-sound/Manifest.gz
-2205271240 metadata/md5-cache/media-sound/fluidsynth-2.2.7
+2205310910 metadata/md5-cache/media-sound/Manifest.gz
+2205301010 metadata/md5-cache/media-sound/abcmidi-2022.04.28
+2205291140 metadata/md5-cache/media-sound/easyeffects-6.2.5
+2205271310 metadata/md5-cache/media-sound/fluidsynth-2.2.7
+2205280910 metadata/md5-cache/media-sound/gnome-music-42.1
+2205280440 metadata/md5-cache/media-sound/gnome-sound-recorder-42.0
+2205301010 metadata/md5-cache/media-sound/kmidimon-1.3.0
+2205310510 metadata/md5-cache/media-sound/patchage-1.0.6
+2205280440 metadata/md5-cache/media-sound/pulseaudio-15.0-r3
+2205282240 metadata/md5-cache/media-sound/pulseaudio-16.0
+2205291010 metadata/md5-cache/media-sound/pulseaudio-daemon-16.0
+2205291140 metadata/md5-cache/media-sound/pulseeffects-4.8.7
+2205310340 metadata/md5-cache/media-sound/rhythmbox-3.4.5
+2205310510 metadata/md5-cache/media-sound/sonata-1.7.0-r1
+2205310740 metadata/md5-cache/media-sound/soundconverter-4.0.3
+2205301010 metadata/md5-cache/media-sound/xmms2-0.9.1
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20171003
 2101060224 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20190922
 2110160409 metadata/md5-cache/media-tv/dtv-scan-tables-0_p20210430
@@ -53154,11 +53059,11 @@
 2205170654 metadata/md5-cache/media-tv/plex-media-server-1.25.7.5604
 2205170654 metadata/md5-cache/media-tv/plex-media-server-1.25.8.5663
 2205170654 metadata/md5-cache/media-tv/tvnamer-3.0.2
-2205170654 metadata/md5-cache/media-tv/v4l-utils-1.22.1
 2205241010 metadata/md5-cache/media-tv/v4l-dvb-saa716x-0.0.1_p20170225-r5
-2205270140 metadata/md5-cache/media-tv/Manifest.gz
 2205270140 metadata/md5-cache/media-tv/tvheadend-4.2.8-r2
 2205270140 metadata/md5-cache/media-tv/tvheadend-9999
+2205291340 metadata/md5-cache/media-tv/Manifest.gz
+2205291340 metadata/md5-cache/media-tv/v4l-utils-1.22.1
 2107272139 metadata/md5-cache/media-video/binkplayer-1.99w
 1810060109 metadata/md5-cache/media-video/blinkensim-2.7-r1
 1904012039 metadata/md5-cache/media-video/blinkenthemes-0.10-r1
@@ -53243,8 +53148,6 @@
 2205170654 metadata/md5-cache/media-video/ffmpeg-4.2.4-r1
 2205170654 metadata/md5-cache/media-video/ffmpeg-4.3.2-r1
 2205170654 metadata/md5-cache/media-video/ffmpeg-4.4.1-r5
-2205170654 metadata/md5-cache/media-video/ffmpeg-4.4.2
-2205170654 metadata/md5-cache/media-video/ffmpeg-5.0.1
 2205170654 metadata/md5-cache/media-video/ffmpeg-9999
 2205170654 metadata/md5-cache/media-video/ffmpeg-chromium-100
 2205170654 metadata/md5-cache/media-video/ffmpeg-chromium-96
@@ -53292,7 +53195,6 @@
 2205170654 metadata/md5-cache/media-video/mkvtoolnix-60.0.0
 2205170654 metadata/md5-cache/media-video/mkvtoolnix-61.0.0
 2205170654 metadata/md5-cache/media-video/mkvtoolnix-64.0.0
-2205180540 metadata/md5-cache/media-video/mkvtoolnix-67.0.0
 2205180540 metadata/md5-cache/media-video/mkvtoolnix-9999
 2205170654 metadata/md5-cache/media-video/motion-4.3.2-r1
 2205170654 metadata/md5-cache/media-video/motiontrack-0.1.3-r2
@@ -53363,7 +53265,6 @@
 2205170654 metadata/md5-cache/media-video/subtitleripper-0.3.4-r4
 2205170654 metadata/md5-cache/media-video/super_demux-0.3
 2205170654 metadata/md5-cache/media-video/totem-3.38.2
-2205170654 metadata/md5-cache/media-video/totem-42.0-r1
 2205170654 metadata/md5-cache/media-video/transcode-1.1.7-r6
 2205170654 metadata/md5-cache/media-video/ttcut-0.19.6_p1-r1
 2205170654 metadata/md5-cache/media-video/unifi-video-3.10.13-r5
@@ -53386,7 +53287,6 @@
 2205170654 metadata/md5-cache/media-video/vobcopy-1.2.0
 2205170654 metadata/md5-cache/media-video/vstrip-0.8f
 2205170654 metadata/md5-cache/media-video/webcamoid-8.8.0
-2205170654 metadata/md5-cache/media-video/wireplumber-0.4.10
 2205190840 metadata/md5-cache/media-video/wireplumber-0.4.10-r1
 2205170654 metadata/md5-cache/media-video/wireplumber-0.4.9
 2205170654 metadata/md5-cache/media-video/wireplumber-0.4.9-r1
@@ -53402,11 +53302,17 @@
 2205221810 metadata/md5-cache/media-video/vlc-3.0.9999
 2205221810 metadata/md5-cache/media-video/vlc-9999
 2205252240 metadata/md5-cache/media-video/vlc-3.0.17.3-r2
-2205260210 metadata/md5-cache/media-video/wireplumber-0.4.10-r2
-2205260210 metadata/md5-cache/media-video/wireplumber-9999
 2205261010 metadata/md5-cache/media-video/yle-dl-20220518
-2205270240 metadata/md5-cache/media-video/Manifest.gz
 2205270240 metadata/md5-cache/media-video/simplescreenrecorder-0.4.4
+2205310810 metadata/md5-cache/media-video/Manifest.gz
+2205301640 metadata/md5-cache/media-video/ffmpeg-4.4.2
+2205301640 metadata/md5-cache/media-video/ffmpeg-5.0.1
+2205291040 metadata/md5-cache/media-video/ffmpeg-chromium-102
+2205310240 metadata/md5-cache/media-video/mkvtoolnix-67.0.0
+2205310810 metadata/md5-cache/media-video/pitivi-2021.05-r1
+2205280910 metadata/md5-cache/media-video/totem-42.0-r1
+2205300810 metadata/md5-cache/media-video/wireplumber-0.4.10-r3
+2205300810 metadata/md5-cache/media-video/wireplumber-9999
 2110212239 metadata/md5-cache/net-analyzer/arptools-1.0.2-r1
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 2101201239 metadata/md5-cache/net-analyzer/authforce-0.9.9-r3
@@ -53425,7 +53331,6 @@
 2002112051 metadata/md5-cache/net-analyzer/ifmetric-0.3-r2
 2103162239 metadata/md5-cache/net-analyzer/ipsumdump-1.86-r1
 2103160139 metadata/md5-cache/net-analyzer/lft-3.91-r1
-2012131109 metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4
 1910021809 metadata/md5-cache/net-analyzer/mdns-scan-0.5
 2104031939 metadata/md5-cache/net-analyzer/mping-2.01
 1708070809 metadata/md5-cache/net-analyzer/munin-plugins-zfs-0.20170127
@@ -53712,8 +53617,6 @@
 2205170654 metadata/md5-cache/net-analyzer/raddump-0.3.1
 2205170654 metadata/md5-cache/net-analyzer/rain-1.2.9_beta1-r1
 2205170654 metadata/md5-cache/net-analyzer/rrdcollect-0.2.10
-2205170654 metadata/md5-cache/net-analyzer/rrdtool-1.7.2-r100
-2205170654 metadata/md5-cache/net-analyzer/rrdtool-1.8.0
 2205170654 metadata/md5-cache/net-analyzer/rtpbreak-1.3a-r2
 2205170654 metadata/md5-cache/net-analyzer/sancp-1.6.1-r7
 2205170654 metadata/md5-cache/net-analyzer/sarg-2.4.0-r1
@@ -53810,10 +53713,13 @@
 2205220710 metadata/md5-cache/net-analyzer/pypacker-5.1
 2205220710 metadata/md5-cache/net-analyzer/tcpflow-1.6.1-r1
 2205260840 metadata/md5-cache/net-analyzer/traceroute-2.1.0-r1
-2205271010 metadata/md5-cache/net-analyzer/Manifest.gz
 2205270910 metadata/md5-cache/net-analyzer/ssh-audit-2.5.0
 2205271010 metadata/md5-cache/net-analyzer/sslsplit-0.5.5
 2205271010 metadata/md5-cache/net-analyzer/sslsplit-9999
+2205282110 metadata/md5-cache/net-analyzer/Manifest.gz
+2205281340 metadata/md5-cache/net-analyzer/macchanger-1.7.0_p5_p4
+2205281910 metadata/md5-cache/net-analyzer/rrdtool-1.8.0
+2205280610 metadata/md5-cache/net-analyzer/ssldump-1.5
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2104161439 metadata/md5-cache/net-dialup/sercd-3.0.0-r2
 2111292209 metadata/md5-cache/net-dialup/pppconfig-2.3.21
@@ -53938,7 +53844,10 @@
 2205170654 metadata/md5-cache/net-dns/unbound-1.14.0-r1
 2205170654 metadata/md5-cache/net-dns/unbound-1.15.0
 2205222040 metadata/md5-cache/net-dns/knot-3.1.8
-2205241010 metadata/md5-cache/net-dns/Manifest.gz
+2205310640 metadata/md5-cache/net-dns/Manifest.gz
+2205310640 metadata/md5-cache/net-dns/bind-9.16.29
+2205310640 metadata/md5-cache/net-dns/bind-tools-9.16.29
+2205282110 metadata/md5-cache/net-dns/coredns-1.9.3
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2205170654 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.1.1
@@ -53959,7 +53868,6 @@
 2205181440 metadata/md5-cache/net-firewall/ipt_netflow-9999
 2205170654 metadata/md5-cache/net-firewall/iptables-1.8.7-r2
 2205190010 metadata/md5-cache/net-firewall/iptables-1.8.8-r1
-2205200640 metadata/md5-cache/net-firewall/iptables-1.8.8-r2
 2205170654 metadata/md5-cache/net-firewall/itval-1.2_p20121104-r1
 2205170654 metadata/md5-cache/net-firewall/nfacct-1.0.2-r1
 2205170654 metadata/md5-cache/net-firewall/nftables-1.0.1-r2
@@ -53976,8 +53884,9 @@
 2205181440 metadata/md5-cache/net-firewall/xtables-addons-3.13
 2205181440 metadata/md5-cache/net-firewall/xtables-addons-3.18
 2205181440 metadata/md5-cache/net-firewall/xtables-addons-3.20
-2205221440 metadata/md5-cache/net-firewall/Manifest.gz
 2205221440 metadata/md5-cache/net-firewall/nftables-1.0.2-r1
+2205280610 metadata/md5-cache/net-firewall/Manifest.gz
+2205280610 metadata/md5-cache/net-firewall/iptables-1.8.8-r2
 2012181339 metadata/md5-cache/net-fs/wdfs-1.4.2-r2
 2203240726 metadata/md5-cache/net-fs/smbnetfs-0.6.3
 2204150511 metadata/md5-cache/net-fs/mc-2021.03.23.05.46.11
@@ -54021,7 +53930,6 @@
 2203240726 metadata/md5-cache/net-ftp/pureadmin-0.4-r3
 2204111309 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 2204102210 metadata/md5-cache/net-ftp/tnftp-20210827
-2205170654 metadata/md5-cache/net-ftp/Manifest.gz
 2205170654 metadata/md5-cache/net-ftp/atftp-0.7.5
 2205170654 metadata/md5-cache/net-ftp/filezilla-3.58.0
 2205170654 metadata/md5-cache/net-ftp/filezilla-3.59.0
@@ -54040,13 +53948,12 @@
 2205170654 metadata/md5-cache/net-ftp/proftpd-1.3.7c-r1
 2205170654 metadata/md5-cache/net-ftp/proftpd-1.3.8_rc1-r3
 2205170654 metadata/md5-cache/net-ftp/proftpd-1.3.8_rc2-r2
-2205170654 metadata/md5-cache/net-ftp/pure-ftpd-1.0.49-r6
-2205170654 metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r1
-2205170654 metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
 2205170654 metadata/md5-cache/net-ftp/pure-ftpd-9999
 2205170654 metadata/md5-cache/net-ftp/tftp-hpa-5.2-r3
 2205170654 metadata/md5-cache/net-ftp/vsftpd-3.0.5-r1
 2205170654 metadata/md5-cache/net-ftp/yafc-1.3.7-r1
+2205280140 metadata/md5-cache/net-ftp/Manifest.gz
+2205272040 metadata/md5-cache/net-ftp/pure-ftpd-1.0.50-r3
 2102160539 metadata/md5-cache/net-im/centerim-5.0.1-r1
 2104192239 metadata/md5-cache/net-im/cpop-0.0.4-r1
 2011142339 metadata/md5-cache/net-im/librvp-0.9.7
@@ -54057,7 +53964,6 @@
 1912201239 metadata/md5-cache/net-im/tkabber-1.1.2
 2112171639 metadata/md5-cache/net-im/signal-cli-bin-0.9.2
 2201211639 metadata/md5-cache/net-im/sendxmpp-amm-1.1.1
-2202100210 metadata/md5-cache/net-im/jabber-base-0.01-r3
 2203240726 metadata/md5-cache/net-im/mcabber-1.1.2-r1
 2203240726 metadata/md5-cache/net-im/sendxmpp-amm-9999
 2203252323 metadata/md5-cache/net-im/prosody-modules-0_pre20220319
@@ -54147,10 +54053,11 @@
 2205202240 metadata/md5-cache/net-im/empathy-3.12.14
 2205222210 metadata/md5-cache/net-im/gajim-1.4.1
 2205251140 metadata/md5-cache/net-im/zoom-5.10.6.3192
-2205271010 metadata/md5-cache/net-im/Manifest.gz
 2205261610 metadata/md5-cache/net-im/discord-bin-0.0.17-r1
 2205261640 metadata/md5-cache/net-im/signal-cli-bin-0.10.6
 2205271010 metadata/md5-cache/net-im/signal-desktop-bin-5.44.1
+2205291840 metadata/md5-cache/net-im/Manifest.gz
+2205291840 metadata/md5-cache/net-im/gajim-1.4.2
 2106302209 metadata/md5-cache/net-irc/bnc-2.9.4-r2
 2002230040 metadata/md5-cache/net-irc/ircmap-0.99-r1
 2106302209 metadata/md5-cache/net-irc/muh-2.2a-r2
@@ -54174,9 +54081,7 @@
 2205011048 metadata/md5-cache/net-irc/pisg-0.73-r1
 2205141110 metadata/md5-cache/net-irc/limnoria-plugins-chantracker-1.6_p20220429
 2205141110 metadata/md5-cache/net-irc/limnoria-plugins-progval-20220513
-2205191040 metadata/md5-cache/net-irc/Manifest.gz
 2205170654 metadata/md5-cache/net-irc/anope-2.0.10-r1
-2205170654 metadata/md5-cache/net-irc/anope-2.0.11
 2205170654 metadata/md5-cache/net-irc/dccserver-0.5-r1
 2205170654 metadata/md5-cache/net-irc/emech-3.0.99_p3-r1
 2205170654 metadata/md5-cache/net-irc/ergo-2.9.1-r1
@@ -54228,6 +54133,9 @@
 2205170654 metadata/md5-cache/net-irc/znc-1.8.2-r1
 2205170654 metadata/md5-cache/net-irc/znc-9999
 2205170654 metadata/md5-cache/net-irc/znc-palaver-1.2.1-r1
+2205310240 metadata/md5-cache/net-irc/Manifest.gz
+2205281940 metadata/md5-cache/net-irc/anope-2.0.11
+2205310240 metadata/md5-cache/net-irc/polari-42.0
 2103061309 metadata/md5-cache/net-libs/courier-unicode-2.1.2
 2010101039 metadata/md5-cache/net-libs/enet-1.2.2-r1
 2109121739 metadata/md5-cache/net-libs/enet-1.3.17
@@ -54283,7 +54191,6 @@
 2205170654 metadata/md5-cache/net-libs/gloox-1.0.24
 2205170654 metadata/md5-cache/net-libs/gnet-2.0.8-r4
 2205170654 metadata/md5-cache/net-libs/gnome-online-accounts-3.40.1
-2205170654 metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
 2205170654 metadata/md5-cache/net-libs/gnutls-3.7.2
 2205191240 metadata/md5-cache/net-libs/gnutls-3.7.3-r1
 2205170654 metadata/md5-cache/net-libs/gnutls-3.7.5
@@ -54390,14 +54297,12 @@
 2205170654 metadata/md5-cache/net-libs/libnftnl-1.2.1
 2205170654 metadata/md5-cache/net-libs/libnftnl-9999
 2205170654 metadata/md5-cache/net-libs/libnice-0.1.15
-2205170654 metadata/md5-cache/net-libs/libnice-0.1.18
 2205170654 metadata/md5-cache/net-libs/libnice-0.1.19
 2205170654 metadata/md5-cache/net-libs/libnids-1.24-r8
 2205170654 metadata/md5-cache/net-libs/libnids-1.26-r1
 2205170654 metadata/md5-cache/net-libs/libnipper-0.12.6-r1
 2205170654 metadata/md5-cache/net-libs/libnma-1.8.34
 2205170654 metadata/md5-cache/net-libs/libnma-1.8.36
-2205170654 metadata/md5-cache/net-libs/libnma-1.8.38
 2205170654 metadata/md5-cache/net-libs/libnsl-0-r1
 2205170654 metadata/md5-cache/net-libs/libnsl-1.3.0-r2
 2205170654 metadata/md5-cache/net-libs/libnsl-2.0.0-r1
@@ -54553,7 +54458,6 @@
 2205170654 metadata/md5-cache/net-libs/zeromq-4.3.3-r1
 2205170654 metadata/md5-cache/net-libs/zeromq-4.3.4-r1
 2205170654 metadata/md5-cache/net-libs/zmqpp-4.2.0-r1
-2205210110 metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
 2205202210 metadata/md5-cache/net-libs/libnetconf2-2.1.11
 2205220010 metadata/md5-cache/net-libs/libnpupnp-4.2.1
 2205220010 metadata/md5-cache/net-libs/libnpupnp-4.2.2
@@ -54562,17 +54466,23 @@
 2205220810 metadata/md5-cache/net-libs/toxext-0.0.3
 2205231640 metadata/md5-cache/net-libs/quiche-0.14.0
 2205231640 metadata/md5-cache/net-libs/quiche-9999
-2205260840 metadata/md5-cache/net-libs/Manifest.gz
-2205260840 metadata/md5-cache/net-libs/glib-networking-2.72.0-r1
-2205241440 metadata/md5-cache/net-libs/libmbim-1.26.4
 2205241440 metadata/md5-cache/net-libs/libndp-1.8
 2205260840 metadata/md5-cache/net-libs/libotr-4.1.1
 2205260840 metadata/md5-cache/net-libs/libproxy-0.4.17-r1
-2205241440 metadata/md5-cache/net-libs/libqmi-1.30.6
 2205241440 metadata/md5-cache/net-libs/libqmi-9999
 2205260840 metadata/md5-cache/net-libs/libsoup-2.74.2
 2205241810 metadata/md5-cache/net-libs/nativebiginteger-1.7.0
 2205260840 metadata/md5-cache/net-libs/uhttpmock-0.5.3
+2205292340 metadata/md5-cache/net-libs/Manifest.gz
+2205280910 metadata/md5-cache/net-libs/glib-networking-2.72.0-r1
+2205280910 metadata/md5-cache/net-libs/gnome-online-accounts-3.44.0
+2205280610 metadata/md5-cache/net-libs/gnutls-3.7.6
+2205280910 metadata/md5-cache/net-libs/libmbim-1.26.4
+2205292340 metadata/md5-cache/net-libs/libmicrohttpd-0.9.75
+2205280910 metadata/md5-cache/net-libs/libnice-0.1.18
+2205280910 metadata/md5-cache/net-libs/libnma-1.8.38
+2205280910 metadata/md5-cache/net-libs/libqmi-1.30.6
+2205290440 metadata/md5-cache/net-libs/webkit-gtk-2.36.3
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 2108061839 metadata/md5-cache/net-mail/amavis-logwatch-1.51.04
 2104060140 metadata/md5-cache/net-mail/autorespond-2.0.4
@@ -54639,7 +54549,6 @@
 2205170654 metadata/md5-cache/net-mail/fetchmail-6.4.21-r1
 2205170654 metadata/md5-cache/net-mail/fetchmail-6.4.22
 2205170654 metadata/md5-cache/net-mail/getmail-6.14
-2205200640 metadata/md5-cache/net-mail/getmail-6.18.9
 2205170654 metadata/md5-cache/net-mail/gnubiff-2.2.17-r2
 2205170654 metadata/md5-cache/net-mail/hyperkitty-1.3.3
 2205170654 metadata/md5-cache/net-mail/isync-9999
@@ -54687,7 +54596,6 @@
 2205170654 metadata/md5-cache/net-mail/tpop3d-1.5.5-r4
 2205170654 metadata/md5-cache/net-mail/ytnef-1.9.3
 2205170654 metadata/md5-cache/net-mail/ytnef-2.0
-2205230940 metadata/md5-cache/net-mail/Manifest.gz
 2205212010 metadata/md5-cache/net-mail/dot-forward-0.71-r4
 2205212010 metadata/md5-cache/net-mail/ezmlm-idx-7.0.0-r4
 2205212010 metadata/md5-cache/net-mail/ezmlm-idx-7.2.2
@@ -54702,6 +54610,9 @@
 2205212010 metadata/md5-cache/net-mail/vchkuser-0.4-r1
 2205212010 metadata/md5-cache/net-mail/vpopmail-5.4.33-r9
 2205212010 metadata/md5-cache/net-mail/vqadmin-2.3.7-r1
+2205310610 metadata/md5-cache/net-mail/Manifest.gz
+2205310610 metadata/md5-cache/net-mail/getmail-6.18.9
+2205281140 metadata/md5-cache/net-mail/mailbase-1.8.1
 2007201539 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
 2007201539 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
 2105261539 metadata/md5-cache/net-misc/asterisk-g729-13.0.3.1.9-r1
@@ -54793,7 +54704,6 @@
 2203240726 metadata/md5-cache/net-misc/gwhois-20120626-r1
 2203240726 metadata/md5-cache/net-misc/iperf-3.99999.99999
 2203240726 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20210805
-2203240726 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315
 2203240726 metadata/md5-cache/net-misc/plowshare-9999
 2203240726 metadata/md5-cache/net-misc/ps3mediaserver-1.90.1-r2
 2203240726 metadata/md5-cache/net-misc/ttytter-2.1.00
@@ -54909,7 +54819,6 @@
 2205170654 metadata/md5-cache/net-misc/dropbox-cli-2020.03.04-r1
 2205170654 metadata/md5-cache/net-misc/econnman-1.1_p20160305
 2205170654 metadata/md5-cache/net-misc/efax-0.9a_p19_p1
-2205200440 metadata/md5-cache/net-misc/electron-cash-4.2.9
 2205170654 metadata/md5-cache/net-misc/electrum-ltc-4.0.9.1
 2205181440 metadata/md5-cache/net-misc/ena-driver-2.2.3-r1
 2205181440 metadata/md5-cache/net-misc/ena-driver-2.6.1
@@ -54929,10 +54838,6 @@
 2205170654 metadata/md5-cache/net-misc/freerdp-2.7.0-r1
 2205170654 metadata/md5-cache/net-misc/freerdp-2.9999
 2205170654 metadata/md5-cache/net-misc/freerdp-9999
-2205170654 metadata/md5-cache/net-misc/frr-8.1-r1
-2205170654 metadata/md5-cache/net-misc/frr-8.2.2
-2205170654 metadata/md5-cache/net-misc/gallery-dl-1.21.1
-2205170654 metadata/md5-cache/net-misc/gallery-dl-1.21.2
 2205170654 metadata/md5-cache/net-misc/gallery-dl-9999
 2205162310 metadata/md5-cache/net-misc/geoipupdate-4.9.0
 2205170654 metadata/md5-cache/net-misc/geomyidae-0.34-r1
@@ -55054,14 +54959,12 @@
 2205170654 metadata/md5-cache/net-misc/netstat-nat-1.4.10
 2205170654 metadata/md5-cache/net-misc/networkmanager-1.32.12-r1
 2205170654 metadata/md5-cache/net-misc/networkmanager-1.36.2
-2205170654 metadata/md5-cache/net-misc/networkmanager-1.36.4
 2205170654 metadata/md5-cache/net-misc/nextcloud-client-3.4.3
 2205171240 metadata/md5-cache/net-misc/nextcloud-client-3.4.4
 2205170654 metadata/md5-cache/net-misc/nextcloud-client-3.5.0
 2205170654 metadata/md5-cache/net-misc/nicstat-1.95
 2205170654 metadata/md5-cache/net-misc/ntp-4.2.8_p15
 2205170654 metadata/md5-cache/net-misc/ntpsec-1.2.1-r2
-2205170654 metadata/md5-cache/net-misc/ntpsec-1.2.1-r3
 2205170654 metadata/md5-cache/net-misc/ntpsec-9999
 2205170654 metadata/md5-cache/net-misc/nx-3.5.99.25
 2205170654 metadata/md5-cache/net-misc/nx-3.5.99.26
@@ -55102,7 +55005,6 @@
 2205170654 metadata/md5-cache/net-misc/ptpd-2.3.1-r2
 2205170654 metadata/md5-cache/net-misc/pulseaudio-dlna-9999
 2205170654 metadata/md5-cache/net-misc/putty-0.76
-2205170654 metadata/md5-cache/net-misc/putty-9999
 2205170654 metadata/md5-cache/net-misc/pyhoca-cli-0.6.1.2
 2205170654 metadata/md5-cache/net-misc/pyhoca-gui-0.6.1.1
 2205170654 metadata/md5-cache/net-misc/qtm-1.3.19-r1
@@ -55117,10 +55019,8 @@
 2205170654 metadata/md5-cache/net-misc/rclone-9999
 2205170654 metadata/md5-cache/net-misc/rdate-1.10
 2205170654 metadata/md5-cache/net-misc/rdate-1.10.2
-2205191040 metadata/md5-cache/net-misc/rdate-1.11
 2205170654 metadata/md5-cache/net-misc/rdesktop-1.9.0
 2205170654 metadata/md5-cache/net-misc/rdesktop-1.9.0-r1
-2205170654 metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
 2205170654 metadata/md5-cache/net-misc/remmina-1.4.25
 2205170654 metadata/md5-cache/net-misc/rinetd-0.62-r2
 2205170654 metadata/md5-cache/net-misc/rsync-3.2.3-r5
@@ -55172,7 +55072,6 @@
 2205170654 metadata/md5-cache/net-misc/sstp-client-1.0.17
 2205170654 metadata/md5-cache/net-misc/streamlink-1.3.1-r1
 2205170654 metadata/md5-cache/net-misc/streamlink-2.0.0
-2205170654 metadata/md5-cache/net-misc/streamlink-9999
 2205170654 metadata/md5-cache/net-misc/streamtuner-0.99.99-r5
 2205170654 metadata/md5-cache/net-misc/stunnel-5.59
 2205170654 metadata/md5-cache/net-misc/stunnel-5.64
@@ -55185,7 +55084,6 @@
 2205170654 metadata/md5-cache/net-misc/teamviewer-15.23.9
 2205170654 metadata/md5-cache/net-misc/teamviewer-15.28.6
 2205170654 metadata/md5-cache/net-misc/telnet-bsd-1.2-r2
-2205170654 metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
 2205170654 metadata/md5-cache/net-misc/throttle-1.2-r1
 2205170654 metadata/md5-cache/net-misc/tigervnc-1.12.0-r5
 2205170654 metadata/md5-cache/net-misc/tigervnc-1.12.0-r6
@@ -55251,16 +55149,34 @@
 2205241210 metadata/md5-cache/net-misc/dropbox-cli-2022
 2205252240 metadata/md5-cache/net-misc/gallery-dl-1.22.0
 2205242140 metadata/md5-cache/net-misc/lldpd-1.0.14
-2205260840 metadata/md5-cache/net-misc/ndisc6-1.0.5
 2205241440 metadata/md5-cache/net-misc/networkmanager-1.38.0
 2205260440 metadata/md5-cache/net-misc/pssh-2.3.4-r1
 2205241810 metadata/md5-cache/net-misc/remmina-1.4.26-r1
-2205260840 metadata/md5-cache/net-misc/vconfig-1.9
-2205261310 metadata/md5-cache/net-misc/modemmanager-1.18.8
 2205261310 metadata/md5-cache/net-misc/r8168-8.050.02
-2205261940 metadata/md5-cache/net-misc/Manifest.gz
 2205261610 metadata/md5-cache/net-misc/seafile-8.0.7
 2205261610 metadata/md5-cache/net-misc/seafile-client-8.0.7
+2205310610 metadata/md5-cache/net-misc/Manifest.gz
+2205282210 metadata/md5-cache/net-misc/electron-cash-4.2.10
+2205282210 metadata/md5-cache/net-misc/electron-cash-4.2.9
+2205280810 metadata/md5-cache/net-misc/electrum-4.2.2
+2205301010 metadata/md5-cache/net-misc/frr-8.2.2
+2205272240 metadata/md5-cache/net-misc/gallery-dl-1.21.1
+2205310610 metadata/md5-cache/net-misc/gallery-dl-1.21.2
+2205301740 metadata/md5-cache/net-misc/gnome-remote-desktop-42.2
+2205280910 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20220315
+2205280910 metadata/md5-cache/net-misc/modemmanager-1.18.8
+2205272240 metadata/md5-cache/net-misc/ndisc6-1.0.5
+2205280910 metadata/md5-cache/net-misc/networkmanager-1.36.4
+2205310610 metadata/md5-cache/net-misc/ntpsec-1.2.1-r3
+2205271340 metadata/md5-cache/net-misc/putty-0.77
+2205271340 metadata/md5-cache/net-misc/putty-9999
+2205272240 metadata/md5-cache/net-misc/rdate-1.11
+2205272240 metadata/md5-cache/net-misc/rdesktop-1.9.0-r2
+2205310310 metadata/md5-cache/net-misc/streamlink-4.1.0
+2205310210 metadata/md5-cache/net-misc/streamlink-9999
+2205272240 metadata/md5-cache/net-misc/telnet-bsd-1.2-r3
+2205272240 metadata/md5-cache/net-misc/vconfig-1.9
+2205271740 metadata/md5-cache/net-misc/wget2-2.0.1
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2203040040 metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
 2203282310 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -55325,8 +55241,6 @@
 2205170654 metadata/md5-cache/net-p2p/airdcpp-webclient-2.11.2
 2205170654 metadata/md5-cache/net-p2p/amule-2.3.3
 2205170654 metadata/md5-cache/net-p2p/amule-9999
-2205170654 metadata/md5-cache/net-p2p/arti-0.1.0
-2205170654 metadata/md5-cache/net-p2p/arti-0.2.0
 2205170654 metadata/md5-cache/net-p2p/arti-0.3.0
 2205170654 metadata/md5-cache/net-p2p/automatic-0.8.3-r1
 2205170654 metadata/md5-cache/net-p2p/bitcoin-cli-0.20.1
@@ -55382,7 +55296,6 @@
 2205170654 metadata/md5-cache/net-p2p/mktorrent-1.1_p20210130
 2205170654 metadata/md5-cache/net-p2p/mldonkey-3.1.7-r3
 2205170654 metadata/md5-cache/net-p2p/ncdc-1.22.1-r1
-2205170654 metadata/md5-cache/net-p2p/ncdc-9999
 2205170654 metadata/md5-cache/net-p2p/nicotine+-2.2.2
 2205170654 metadata/md5-cache/net-p2p/nicotine+-3.1.1
 2205170654 metadata/md5-cache/net-p2p/nicotine+-3.2.0
@@ -55405,13 +55318,18 @@
 2205170654 metadata/md5-cache/net-p2p/transmission-3.00-r1
 2205172340 metadata/md5-cache/net-p2p/transmission-3.00-r4
 2205172340 metadata/md5-cache/net-p2p/transmission-9999
-2205170654 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 2205170654 metadata/md5-cache/net-p2p/tremc-0.9.2_p20201101
 2205170654 metadata/md5-cache/net-p2p/vuze-5.7.6.0-r2
 2205260210 metadata/md5-cache/net-p2p/qbittorrent-4.4.3.1
 2205240140 metadata/md5-cache/net-p2p/qbittorrent-9999
-2205261940 metadata/md5-cache/net-p2p/Manifest.gz
 2205261940 metadata/md5-cache/net-p2p/deluge-2.0.5-r1
+2205310810 metadata/md5-cache/net-p2p/Manifest.gz
+2205310140 metadata/md5-cache/net-p2p/arti-0.4.0
+2205310740 metadata/md5-cache/net-p2p/ncdc-1.23
+2205310740 metadata/md5-cache/net-p2p/ncdc-9999
+2205310810 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
+2205310810 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.5.1
+2205310140 metadata/md5-cache/net-p2p/tremc-0.9.3
 2010020309 metadata/md5-cache/net-print/apsfilter-7.2.8-r1
 2011290239 metadata/md5-cache/net-print/c2esp-27
 2104060140 metadata/md5-cache/net-print/cups-windows-6.0-r1
@@ -55451,9 +55369,11 @@
 2205170654 metadata/md5-cache/net-print/mtink-1.0.16-r2
 2205170654 metadata/md5-cache/net-print/poster-20060221-r3
 2205170654 metadata/md5-cache/net-print/splix-2.0.0_p20130826-r1
-2205221540 metadata/md5-cache/net-print/Manifest.gz
 2205221540 metadata/md5-cache/net-print/cups-2.4.1
-2205221540 metadata/md5-cache/net-print/cups-9999
+2205291610 metadata/md5-cache/net-print/Manifest.gz
+2205280810 metadata/md5-cache/net-print/cups-2.4.2-r1
+2205280810 metadata/md5-cache/net-print/cups-9999
+2205291610 metadata/md5-cache/net-print/hplip-plugin-3.22.4
 2104192239 metadata/md5-cache/net-proxy/adzapper-20110915-r2
 2104172239 metadata/md5-cache/net-proxy/wwwoffle-2.9i-r2
 2011290239 metadata/md5-cache/net-proxy/ziproxy-3.3.1-r2
@@ -55503,12 +55423,13 @@
 2205170654 metadata/md5-cache/net-proxy/tayga-0.9.2-r2
 2205170654 metadata/md5-cache/net-proxy/tayga-0.9.2-r3
 2205170654 metadata/md5-cache/net-proxy/tinyproxy-1.11.0-r1
-2205170654 metadata/md5-cache/net-proxy/torsocks-2.2.0
 2205170654 metadata/md5-cache/net-proxy/torsocks-2.3.0
 2205170654 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
 2205211140 metadata/md5-cache/net-proxy/mitmproxy-8.1.0
-2205260840 metadata/md5-cache/net-proxy/Manifest.gz
 2205260840 metadata/md5-cache/net-proxy/tsocks-1.8_beta5-r9
+2205302240 metadata/md5-cache/net-proxy/Manifest.gz
+2205302240 metadata/md5-cache/net-proxy/tinyproxy-1.11.1
+2205301910 metadata/md5-cache/net-proxy/torsocks-2.4.0
 2205170654 metadata/md5-cache/net-voip/captagent-6.3.1-r1
 2205170654 metadata/md5-cache/net-voip/sipvicious-0.3.4
 2205170654 metadata/md5-cache/net-voip/telepathy-gabble-0.18.4-r4
@@ -55548,15 +55469,11 @@
 2205170654 metadata/md5-cache/net-vpn/networkmanager-libreswan-1.2.16
 2205170654 metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r1
 2205170654 metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.6-r2
-2205170654 metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8
 2205170654 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.16
-2205170654 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
-2205170654 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10
 2205170654 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.8-r2
 2205170654 metadata/md5-cache/net-vpn/networkmanager-sstp-1.3.0
 2205170654 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.5.2-r1
 2205170654 metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.6-r2
-2205170654 metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8
 2205170654 metadata/md5-cache/net-vpn/nstx-1.1_beta6-r3
 2205170654 metadata/md5-cache/net-vpn/ocserv-1.0.1-r1
 2205170654 metadata/md5-cache/net-vpn/ocserv-1.1.3
@@ -55592,11 +55509,16 @@
 2205170654 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210424
 2205170654 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210914
 2205230240 metadata/md5-cache/net-vpn/networkmanager-strongswan-1.6.0
-2205260910 metadata/md5-cache/net-vpn/Manifest.gz
 2205241810 metadata/md5-cache/net-vpn/i2p-1.7.0
 2205251010 metadata/md5-cache/net-vpn/i2pd-2.41.0
 2205252210 metadata/md5-cache/net-vpn/i2pd-2.42.1
 2205260910 metadata/md5-cache/net-vpn/libreswan-4.7
+2205282140 metadata/md5-cache/net-vpn/Manifest.gz
+2205282140 metadata/md5-cache/net-vpn/frp-0.43.0
+2205280910 metadata/md5-cache/net-vpn/networkmanager-openconnect-1.2.8
+2205280440 metadata/md5-cache/net-vpn/networkmanager-openvpn-1.8.18
+2205280440 metadata/md5-cache/net-vpn/networkmanager-pptp-1.2.10
+2205280440 metadata/md5-cache/net-vpn/networkmanager-vpnc-1.2.8
 2004041439 metadata/md5-cache/net-wireless/bluez-hcidump-2.5
 2009240309 metadata/md5-cache/net-wireless/hidclient-20120728
 2008032109 metadata/md5-cache/net-wireless/kismetmobiledashboard-1.5_beta1-r2
@@ -55633,7 +55555,6 @@
 2205170654 metadata/md5-cache/net-wireless/dump1090-5.0
 2205170654 metadata/md5-cache/net-wireless/dump1090-6.1
 2205170654 metadata/md5-cache/net-wireless/dump1090-9999
-2205170654 metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
 2205170654 metadata/md5-cache/net-wireless/gnuradio-3.8.4.0
 2205170654 metadata/md5-cache/net-wireless/gnuradio-3.8.5.0
 2205170654 metadata/md5-cache/net-wireless/gnuradio-9999
@@ -55754,8 +55675,10 @@
 2205202240 metadata/md5-cache/net-wireless/gnome-bluetooth-3.34.5
 2205260840 metadata/md5-cache/net-wireless/b43-fwcutter-019
 2205250010 metadata/md5-cache/net-wireless/unifi-7.1.65
-2205271010 metadata/md5-cache/net-wireless/Manifest.gz
 2205271010 metadata/md5-cache/net-wireless/iwd-1.27
+2205281410 metadata/md5-cache/net-wireless/Manifest.gz
+2205280910 metadata/md5-cache/net-wireless/gnome-bluetooth-42.0-r2
+2205281410 metadata/md5-cache/net-wireless/unifi-7.1.66
 2205011048 metadata/md5-cache/perl-core/CPAN-2.290.0-r1
 2205011048 metadata/md5-cache/perl-core/Encode-3.120.0
 2205011048 metadata/md5-cache/perl-core/File-Temp-0.231.100
@@ -56131,7 +56054,6 @@
 2203240726 metadata/md5-cache/sci-calculators/galculator-2.1.4-r2
 2204050539 metadata/md5-cache/sci-calculators/qalculate-gtk-4.1.1-r1
 2205011048 metadata/md5-cache/sci-calculators/orpie-1.6.1
-2205170654 metadata/md5-cache/sci-calculators/Manifest.gz
 2205170654 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
 2205170654 metadata/md5-cache/sci-calculators/grpn-1.4.0
 2205170654 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
@@ -56143,9 +56065,11 @@
 2205170654 metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
 2205170654 metadata/md5-cache/sci-calculators/tiemu-3.03-r1
 2205170654 metadata/md5-cache/sci-calculators/tilp2-1.18
-2205170654 metadata/md5-cache/sci-calculators/units-2.21
 2205170654 metadata/md5-cache/sci-calculators/wcalc-2.5
 2205170654 metadata/md5-cache/sci-calculators/xsv-0.13.0
+2205310210 metadata/md5-cache/sci-calculators/Manifest.gz
+2205280940 metadata/md5-cache/sci-calculators/qalculate-gtk-4.2.0
+2205310210 metadata/md5-cache/sci-calculators/units-2.21
 2108141339 metadata/md5-cache/sci-chemistry/bodr-10
 2011300009 metadata/md5-cache/sci-chemistry/cara-bin-1.8.4-r2
 2009162339 metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
@@ -56248,7 +56172,6 @@
 2203240726 metadata/md5-cache/sci-electronics/xnec2c-4.1.1
 2203251410 metadata/md5-cache/sci-electronics/kicad-meta-6.0.4
 2204171840 metadata/md5-cache/sci-electronics/eagle-9.6.2-r3
-2205170654 metadata/md5-cache/sci-electronics/Manifest.gz
 2205170654 metadata/md5-cache/sci-electronics/Stage-4.3.0-r1
 2205170654 metadata/md5-cache/sci-electronics/drahnr-oregano-0.84.40
 2205170654 metadata/md5-cache/sci-electronics/eagle-7.7.0-r1
@@ -56316,10 +56239,12 @@
 2205170654 metadata/md5-cache/sci-electronics/voacapl-0.7.6-r1
 2205170654 metadata/md5-cache/sci-electronics/xcircuit-3.10.30
 2205170654 metadata/md5-cache/sci-electronics/xcircuit-3.9.73
-2205170654 metadata/md5-cache/sci-electronics/xnec2c-4.4.11
 2205170654 metadata/md5-cache/sci-electronics/xnec2c-4.4.5
 2205170654 metadata/md5-cache/sci-electronics/xnec2c-4.4.7
 2205170654 metadata/md5-cache/sci-electronics/xoscope-2.2
+2205301540 metadata/md5-cache/sci-electronics/Manifest.gz
+2205301540 metadata/md5-cache/sci-electronics/NanoVNA-QT-20200507
+2205291740 metadata/md5-cache/sci-electronics/xnec2c-4.4.11
 2105311239 metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
 2006040939 metadata/md5-cache/sci-geosciences/dcw-gmt-1.1.4
 2002171539 metadata/md5-cache/sci-geosciences/gshhg-gmt-2.3.7
@@ -56349,7 +56274,6 @@
 2205170654 metadata/md5-cache/sci-geosciences/gmt-6.3.0
 2205170654 metadata/md5-cache/sci-geosciences/gnome-maps-41.4-r1
 2205170654 metadata/md5-cache/sci-geosciences/gnome-maps-42.0
-2205170654 metadata/md5-cache/sci-geosciences/gnome-maps-42.1
 2205170654 metadata/md5-cache/sci-geosciences/gpsbabel-1.5.4-r1
 2205170654 metadata/md5-cache/sci-geosciences/gpsbabel-1.7.0-r1
 2205170654 metadata/md5-cache/sci-geosciences/gpsbabel-9999
@@ -56359,9 +56283,6 @@
 2205170654 metadata/md5-cache/sci-geosciences/gpsd-9999
 2205170654 metadata/md5-cache/sci-geosciences/gpx-viewer-0.4.0-r1
 2205170654 metadata/md5-cache/sci-geosciences/gpxlab-0.7.0
-2205170654 metadata/md5-cache/sci-geosciences/gpxsee-10.5
-2205170654 metadata/md5-cache/sci-geosciences/gpxsee-10.6
-2205170654 metadata/md5-cache/sci-geosciences/gpxsee-10.7
 2205170654 metadata/md5-cache/sci-geosciences/grass-7.8.6-r1
 2205170654 metadata/md5-cache/sci-geosciences/grass-7.8.7
 2205170654 metadata/md5-cache/sci-geosciences/grass-8.0.2
@@ -56435,8 +56356,11 @@
 2205170654 metadata/md5-cache/sci-geosciences/viking-1.10
 2205170654 metadata/md5-cache/sci-geosciences/xtide-2.15.1
 2205222340 metadata/md5-cache/sci-geosciences/grass-8.0.1-r1
-2205241340 metadata/md5-cache/sci-geosciences/Manifest.gz
 2205241340 metadata/md5-cache/sci-geosciences/routino-3.3.3-r1
+2205291840 metadata/md5-cache/sci-geosciences/Manifest.gz
+2205280440 metadata/md5-cache/sci-geosciences/gnome-maps-42.1
+2205281640 metadata/md5-cache/sci-geosciences/gnome-maps-42.2
+2205291740 metadata/md5-cache/sci-geosciences/gpxsee-10.7
 2002230040 metadata/md5-cache/sci-libs/beagle-3.0.3-r1
 2107141939 metadata/md5-cache/sci-libs/ccolamd-2.9.6
 2110211309 metadata/md5-cache/sci-libs/clashscore-db-3.17-r1
@@ -56826,8 +56750,10 @@
 2205260510 metadata/md5-cache/sci-libs/dealii-9999
 2205240110 metadata/md5-cache/sci-libs/gdal-3.5.0-r4
 2205260910 metadata/md5-cache/sci-libs/kineto-2021.11.17
-2205261810 metadata/md5-cache/sci-libs/Manifest.gz
 2205261810 metadata/md5-cache/sci-libs/indilib-1.9.6
+2205281310 metadata/md5-cache/sci-libs/Manifest.gz
+2205281310 metadata/md5-cache/sci-libs/cgnslib-4.3.0
+2205280940 metadata/md5-cache/sci-libs/libqalculate-4.2.0
 2101170739 metadata/md5-cache/sci-mathematics/alt-ergo-2.3.0
 2111031339 metadata/md5-cache/sci-mathematics/eclib-20210625
 2101061839 metadata/md5-cache/sci-mathematics/flintqs-1.0
@@ -56966,7 +56892,6 @@
 2205170654 metadata/md5-cache/sci-mathematics/singular-4.2.0_p3-r1
 2205170654 metadata/md5-cache/sci-mathematics/singular-4.2.1
 2205170654 metadata/md5-cache/sci-mathematics/singular-4.2.1_p3-r1
-2205170654 metadata/md5-cache/sci-mathematics/singular-4.3.0
 2205170654 metadata/md5-cache/sci-mathematics/slepc-3.16.0
 2205170654 metadata/md5-cache/sci-mathematics/smtinterpol-2.5_p20211018
 2205170654 metadata/md5-cache/sci-mathematics/spin-6.5.2-r1
@@ -56993,8 +56918,9 @@
 2205260340 metadata/md5-cache/sci-mathematics/octave-6.4.0-r3
 2205260440 metadata/md5-cache/sci-mathematics/petsc-3.17.1
 2205260440 metadata/md5-cache/sci-mathematics/slepc-3.17.1
-2205270140 metadata/md5-cache/sci-mathematics/Manifest.gz
 2205270140 metadata/md5-cache/sci-mathematics/flint-2.8.5
+2205271540 metadata/md5-cache/sci-mathematics/Manifest.gz
+2205271540 metadata/md5-cache/sci-mathematics/singular-4.3.0_p1
 2104180939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2203231439 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2205022240 metadata/md5-cache/sci-misc/netlogo-bin-6.2.0
@@ -58173,10 +58099,8 @@
 2204011845 metadata/md5-cache/sys-apps/hponcfg-5.5.0.0
 2204011845 metadata/md5-cache/sys-apps/hponcfg-5.6.0.0
 2204121440 metadata/md5-cache/sys-apps/sg3_utils-1.46-r1
-2204170240 metadata/md5-cache/sys-apps/systemd-tmpfiles-250
 2204171010 metadata/md5-cache/sys-apps/xdg-dbus-proxy-0.1.3
 2204230540 metadata/md5-cache/sys-apps/miscfiles-1.5-r4
-2204290540 metadata/md5-cache/sys-apps/gawk-5.1.1-r2
 2204291110 metadata/md5-cache/sys-apps/help2man-1.48.5
 2204291110 metadata/md5-cache/sys-apps/kbd-2.4.0
 2204290540 metadata/md5-cache/sys-apps/less-590
@@ -58191,7 +58115,6 @@
 2205140110 metadata/md5-cache/sys-apps/yarn-1.22.19
 2205160710 metadata/md5-cache/sys-apps/rootlesskit-0.14.2
 2205170654 metadata/md5-cache/sys-apps/accountsservice-22.07.5
-2205170654 metadata/md5-cache/sys-apps/accountsservice-22.08.8
 2205170654 metadata/md5-cache/sys-apps/acl-2.3.1
 2205170654 metadata/md5-cache/sys-apps/agedu-20200617
 2205170654 metadata/md5-cache/sys-apps/agedu-20200705
@@ -58206,20 +58129,14 @@
 2205170654 metadata/md5-cache/sys-apps/attr-9999
 2205170654 metadata/md5-cache/sys-apps/audio-entropyd-2.0.3-r1
 2205170654 metadata/md5-cache/sys-apps/baobab-41.0
-2205170654 metadata/md5-cache/sys-apps/baobab-42.0
 2205170654 metadata/md5-cache/sys-apps/bar-1.11.1
-2205170654 metadata/md5-cache/sys-apps/baselayout-2.7
-2205170654 metadata/md5-cache/sys-apps/baselayout-2.7-r1
-2205170654 metadata/md5-cache/sys-apps/baselayout-2.7-r2
 2205170654 metadata/md5-cache/sys-apps/baselayout-2.7-r3
-2205170654 metadata/md5-cache/sys-apps/baselayout-2.8
 2205170654 metadata/md5-cache/sys-apps/baselayout-9999
 2205170654 metadata/md5-cache/sys-apps/baselayout-prefix-2.6-r3
 2205170654 metadata/md5-cache/sys-apps/bat-0.20.0
 2205170654 metadata/md5-cache/sys-apps/biosdevname-0.7.3
 2205170654 metadata/md5-cache/sys-apps/bolt-0.9.1
 2205170654 metadata/md5-cache/sys-apps/bubblewrap-0.5.0
-2205170654 metadata/md5-cache/sys-apps/bubblewrap-0.6.1
 2205170654 metadata/md5-cache/sys-apps/busybox-1.32.1-r1
 2205170654 metadata/md5-cache/sys-apps/busybox-1.33.1
 2205170654 metadata/md5-cache/sys-apps/busybox-1.33.1-r2
@@ -58262,7 +58179,6 @@
 2205170654 metadata/md5-cache/sys-apps/diffutils-3.8
 2205170654 metadata/md5-cache/sys-apps/dmidecode-3.3
 2205170654 metadata/md5-cache/sys-apps/dog-1.7-r6
-2205170654 metadata/md5-cache/sys-apps/dstat-0.7.4-r2
 2205170654 metadata/md5-cache/sys-apps/dtc-1.5.0
 2205170654 metadata/md5-cache/sys-apps/dtc-1.5.0-r2
 2205191540 metadata/md5-cache/sys-apps/dtc-1.6.0
@@ -58309,7 +58225,6 @@
 2205170654 metadata/md5-cache/sys-apps/fwts-20.11.00
 2205170654 metadata/md5-cache/sys-apps/fwts-22.03.00
 2205170654 metadata/md5-cache/sys-apps/fwupd-1.7.5
-2205170654 metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
 2205170654 metadata/md5-cache/sys-apps/fwupd-1.8.0-r1
 2205170654 metadata/md5-cache/sys-apps/fwupd-efi-1.1
 2205170654 metadata/md5-cache/sys-apps/fwupd-efi-1.2
@@ -58320,7 +58235,6 @@
 2205170654 metadata/md5-cache/sys-apps/gentoo-functions-0.15
 2205170654 metadata/md5-cache/sys-apps/gentoo-functions-9999
 2205170654 metadata/md5-cache/sys-apps/gnome-disk-utility-41.0
-2205170654 metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
 2205170654 metadata/md5-cache/sys-apps/gpet-0.4-r1
 2205170654 metadata/md5-cache/sys-apps/gptfdisk-1.0.8-r1
 2205191140 metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r1
@@ -58369,7 +58283,6 @@
 2205170654 metadata/md5-cache/sys-apps/ipmiutil-3.1.8
 2205170654 metadata/md5-cache/sys-apps/iproute2-5.15.0
 2205170654 metadata/md5-cache/sys-apps/iproute2-5.17.0
-2205170654 metadata/md5-cache/sys-apps/iproute2-9999
 2205170654 metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
 2205170654 metadata/md5-cache/sys-apps/kbd-9999
 2205170654 metadata/md5-cache/sys-apps/kcheck-0.0.2-r1
@@ -58434,7 +58347,6 @@
 2205170654 metadata/md5-cache/sys-apps/pcsc-lite-1.9.1
 2205170654 metadata/md5-cache/sys-apps/pcsc-lite-1.9.4
 2205170654 metadata/md5-cache/sys-apps/pcsc-lite-1.9.5
-2205171210 metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
 2205170654 metadata/md5-cache/sys-apps/pcsc-slb-rf72-drv-1.1.0-r2
 2205170654 metadata/md5-cache/sys-apps/pcsc-tools-1.5.6
 2205170654 metadata/md5-cache/sys-apps/pcsc-tools-1.5.7
@@ -58532,7 +58444,6 @@
 2205170654 metadata/md5-cache/sys-apps/sysvinit-3.04
 2205170654 metadata/md5-cache/sys-apps/tas-1.6.0.200601-r1
 2205170654 metadata/md5-cache/sys-apps/tcp-wrappers-7.6.31
-2205170654 metadata/md5-cache/sys-apps/texinfo-6.8
 2205170654 metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0
 2205170654 metadata/md5-cache/sys-apps/the_silver_searcher-2.2.0_p20201217-r1
 2205170654 metadata/md5-cache/sys-apps/thunderbolt-software-user-space-0.9.3-r1
@@ -58574,8 +58485,6 @@
 2205170654 metadata/md5-cache/sys-apps/zram-generator-1.1.2
 2205221440 metadata/md5-cache/sys-apps/ed-1.18
 2205221440 metadata/md5-cache/sys-apps/findutils-4.9.0
-2205210110 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
-2205210110 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
 2205220640 metadata/md5-cache/sys-apps/hwdata-0.358
 2205220640 metadata/md5-cache/sys-apps/hwdata-0.359
 2205220640 metadata/md5-cache/sys-apps/man-pages-5.13
@@ -58586,7 +58495,6 @@
 2205212010 metadata/md5-cache/sys-apps/ucspi-ssl-0.99e-r2
 2205212010 metadata/md5-cache/sys-apps/ucspi-tcp-0.88-r18
 2205231510 metadata/md5-cache/sys-apps/bleachbit-4.4.2
-2205232140 metadata/md5-cache/sys-apps/systemd-251
 2205250210 metadata/md5-cache/sys-apps/acl-2.3.1-r1
 2205260710 metadata/md5-cache/sys-apps/bubblewrap-0.6.2
 2205252010 metadata/md5-cache/sys-apps/dcfldd-1.7.1
@@ -58601,14 +58509,35 @@
 2205241010 metadata/md5-cache/sys-apps/s6-rc-0.5.3.1
 2205252010 metadata/md5-cache/sys-apps/sdparm-1.12
 2205252010 metadata/md5-cache/sys-apps/setserial-2.17-r5
-2205250210 metadata/md5-cache/sys-apps/systemd-251.1
-2205250210 metadata/md5-cache/sys-apps/systemd-9999
-2205260840 metadata/md5-cache/sys-apps/usbutils-014-r1
-2205251440 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
 2205260710 metadata/md5-cache/sys-apps/xdg-desktop-portal-gnome-42.1
 2205260710 metadata/md5-cache/sys-apps/xdg-desktop-portal-gtk-1.14.0
-2205261610 metadata/md5-cache/sys-apps/Manifest.gz
 2205261610 metadata/md5-cache/sys-apps/bat-0.21.0
+2205310810 metadata/md5-cache/sys-apps/Manifest.gz
+2205280910 metadata/md5-cache/sys-apps/accountsservice-22.08.8
+2205280910 metadata/md5-cache/sys-apps/baobab-42.0
+2205290010 metadata/md5-cache/sys-apps/baselayout-2.8
+2205280910 metadata/md5-cache/sys-apps/bubblewrap-0.6.1
+2205310610 metadata/md5-cache/sys-apps/dstat-0.7.4-r2
+2205310810 metadata/md5-cache/sys-apps/fakeroot-1.29
+2205271640 metadata/md5-cache/sys-apps/fwupd-1.7.7-r2
+2205271710 metadata/md5-cache/sys-apps/fwupd-1.8.1
+2205300610 metadata/md5-cache/sys-apps/gawk-5.1.1-r2
+2205292340 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9
+2205292340 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
+2205280910 metadata/md5-cache/sys-apps/gnome-disk-utility-42.0
+2205280640 metadata/md5-cache/sys-apps/iproute2-5.18.0-r1
+2205280640 metadata/md5-cache/sys-apps/iproute2-9999
+2205280940 metadata/md5-cache/sys-apps/irqbalance-1.9.0
+2205310610 metadata/md5-cache/sys-apps/pcsc-lite-1.9.7
+2205301040 metadata/md5-cache/sys-apps/systemd-250.6
+2205301640 metadata/md5-cache/sys-apps/systemd-251
+2205302310 metadata/md5-cache/sys-apps/systemd-251.1
+2205301640 metadata/md5-cache/sys-apps/systemd-9999
+2205301040 metadata/md5-cache/sys-apps/systemd-tmpfiles-250
+2205310240 metadata/md5-cache/sys-apps/systemd-utils-250.6
+2205300610 metadata/md5-cache/sys-apps/texinfo-6.8
+2205300610 metadata/md5-cache/sys-apps/usbutils-014-r1
+2205282340 metadata/md5-cache/sys-apps/xdg-desktop-portal-1.14.4
 2110110009 metadata/md5-cache/sys-auth/libyubikey-1.13
 2108271840 metadata/md5-cache/sys-auth/nss-myhostname-0.3-r1
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -58752,7 +58681,6 @@
 2205170654 metadata/md5-cache/sys-block/fwdl-1.2.3
 2205170654 metadata/md5-cache/sys-block/gpart-0.3
 2205170654 metadata/md5-cache/sys-block/gparted-1.3.1
-2205170654 metadata/md5-cache/sys-block/gparted-1.4.0
 2205190010 metadata/md5-cache/sys-block/gparted-1.4.0-r1
 2205170654 metadata/md5-cache/sys-block/hpacucli-9.40.12.0
 2205170654 metadata/md5-cache/sys-block/hpssacli-2.40.13.0-r1
@@ -58798,9 +58726,10 @@
 2205170654 metadata/md5-cache/sys-block/whdd-3.0.1-r2
 2205170654 metadata/md5-cache/sys-block/zram-init-8.1
 2205170654 metadata/md5-cache/sys-block/zram-init-8.1-r1
-2205260840 metadata/md5-cache/sys-block/Manifest.gz
 2205260840 metadata/md5-cache/sys-block/parted-3.5
 2205260840 metadata/md5-cache/sys-block/partimage-0.6.9-r3
+2205280810 metadata/md5-cache/sys-block/Manifest.gz
+2205280810 metadata/md5-cache/sys-block/gparted-1.4.0
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
 1912110241 metadata/md5-cache/sys-boot/mbr-1.1.11-r1
@@ -58814,7 +58743,6 @@
 2204061009 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20220328
 2204092309 metadata/md5-cache/sys-boot/raspberrypi-firmware-1.20211118
 2204171140 metadata/md5-cache/sys-boot/systemd-boot-250-r1
-2205191140 metadata/md5-cache/sys-boot/Manifest.gz
 2205170654 metadata/md5-cache/sys-boot/aboot-1.0_pre20040408-r3
 2205170654 metadata/md5-cache/sys-boot/aboot-2.0_pre20210801
 2205170654 metadata/md5-cache/sys-boot/aboot-9999
@@ -58828,7 +58756,6 @@
 2205191140 metadata/md5-cache/sys-boot/efibootmgr-17
 2205170654 metadata/md5-cache/sys-boot/elilo-3.16-r5
 2205170654 metadata/md5-cache/sys-boot/gnu-efi-3.0.12
-2205170654 metadata/md5-cache/sys-boot/gnu-efi-3.0.14
 2205170654 metadata/md5-cache/sys-boot/grub-2.06-r1
 2205170654 metadata/md5-cache/sys-boot/grub-9999
 2205170654 metadata/md5-cache/sys-boot/lilo-24.2-r1
@@ -58840,7 +58767,6 @@
 2205170654 metadata/md5-cache/sys-boot/os-prober-1.78-r1
 2205170654 metadata/md5-cache/sys-boot/os-prober-1.79-r1
 2205170654 metadata/md5-cache/sys-boot/os-prober-1.79-r2
-2205170654 metadata/md5-cache/sys-boot/os-prober-9999
 2205170654 metadata/md5-cache/sys-boot/palo-2.14
 2205170654 metadata/md5-cache/sys-boot/palo-2.15
 2205170654 metadata/md5-cache/sys-boot/palo-2.16
@@ -58855,7 +58781,6 @@
 2205170654 metadata/md5-cache/sys-boot/shim-15.5-r1
 2205170654 metadata/md5-cache/sys-boot/silo-1.4.14_p20200602
 2205170654 metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r2
-2205170654 metadata/md5-cache/sys-boot/systemd-boot-249.6
 2205170654 metadata/md5-cache/sys-boot/systemd-boot-249.9
 2205170654 metadata/md5-cache/sys-boot/tboot-1.10.5
 2205170654 metadata/md5-cache/sys-boot/unetbootin-700
@@ -58864,6 +58789,12 @@
 2205170654 metadata/md5-cache/sys-boot/vboot-utils-80_p20200108
 2205170654 metadata/md5-cache/sys-boot/woeusb-3.3.1
 2205170654 metadata/md5-cache/sys-boot/yaboot-1.3.17-r4
+2205310510 metadata/md5-cache/sys-boot/Manifest.gz
+2205310010 metadata/md5-cache/sys-boot/gnu-efi-3.0.14
+2205271940 metadata/md5-cache/sys-boot/os-prober-1.80
+2205271940 metadata/md5-cache/sys-boot/os-prober-9999
+2205310510 metadata/md5-cache/sys-boot/syslinux-6.04_pre1-r3
+2205310510 metadata/md5-cache/sys-boot/syslinux-6.04_pre3
 2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
 2002230040 metadata/md5-cache/sys-cluster/fake-1.1.10
 2103132309 metadata/md5-cache/sys-cluster/libcircle-0.3.0
@@ -58997,7 +58928,6 @@
 2205170654 metadata/md5-cache/sys-cluster/wulfware-2.6.0
 2205181510 metadata/md5-cache/sys-cluster/zookeeper-bin-3.7.1
 2205181510 metadata/md5-cache/sys-cluster/zookeeper-bin-3.8.0
-2205252010 metadata/md5-cache/sys-cluster/Manifest.gz
 2205252010 metadata/md5-cache/sys-cluster/kube-apiserver-1.21.13
 2205252010 metadata/md5-cache/sys-cluster/kube-controller-manager-1.21.13
 2205252010 metadata/md5-cache/sys-cluster/kube-proxy-1.21.13
@@ -59005,6 +58935,28 @@
 2205252010 metadata/md5-cache/sys-cluster/kubeadm-1.21.13
 2205252010 metadata/md5-cache/sys-cluster/kubectl-1.21.13
 2205252010 metadata/md5-cache/sys-cluster/kubelet-1.21.13
+2205300040 metadata/md5-cache/sys-cluster/Manifest.gz
+2205300040 metadata/md5-cache/sys-cluster/kube-apiserver-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kube-apiserver-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kube-apiserver-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kube-controller-manager-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kube-controller-manager-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kube-controller-manager-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kube-proxy-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kube-proxy-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kube-proxy-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kube-scheduler-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kube-scheduler-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kube-scheduler-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kubeadm-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kubeadm-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kubeadm-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kubectl-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kubectl-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kubectl-1.24.1
+2205300040 metadata/md5-cache/sys-cluster/kubelet-1.22.10
+2205292210 metadata/md5-cache/sys-cluster/kubelet-1.23.7
+2205292110 metadata/md5-cache/sys-cluster/kubelet-1.24.1
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.64-r1
 2104060140 metadata/md5-cache/sys-devel/autoconf-2.69-r5
 2105131939 metadata/md5-cache/sys-devel/autoconf-archive-2021.02.19
@@ -59032,7 +58984,6 @@
 2204291110 metadata/md5-cache/sys-devel/autoconf-archive-2022.02.11
 2204290540 metadata/md5-cache/sys-devel/automake-wrapper-11
 2204290540 metadata/md5-cache/sys-devel/binutils-config-5.4.1
-2204280040 metadata/md5-cache/sys-devel/bmake-20220418
 2204241940 metadata/md5-cache/sys-devel/crossdev-20220424
 2204241940 metadata/md5-cache/sys-devel/crossdev-99999999
 2204290540 metadata/md5-cache/sys-devel/gcc-config-2.5-r1
@@ -59061,7 +59012,6 @@
 2205170654 metadata/md5-cache/sys-devel/binutils-2.36.1-r2
 2205170654 metadata/md5-cache/sys-devel/binutils-2.37_p1-r2
 2205170654 metadata/md5-cache/sys-devel/binutils-2.38-r1
-2205170654 metadata/md5-cache/sys-devel/binutils-2.38-r2
 2205170654 metadata/md5-cache/sys-devel/binutils-apple-3.2.6
 2205170654 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
 2205170654 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r101
@@ -59141,41 +59091,45 @@
 2205170654 metadata/md5-cache/sys-devel/sparse-0.6.4-r1
 2205170654 metadata/md5-cache/sys-devel/sparse-9999
 2205221440 metadata/md5-cache/sys-devel/autoconf-wrapper-20220130
-2205202210 metadata/md5-cache/sys-devel/bmake-20220330
 2205251910 metadata/md5-cache/sys-devel/autoconf-2.13-r1
-2205260910 metadata/md5-cache/sys-devel/binutils-9999
-2205260910 metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2
 2205260910 metadata/md5-cache/sys-devel/gdb-11.2
 2205260910 metadata/md5-cache/sys-devel/gdb-12.1
 2205260910 metadata/md5-cache/sys-devel/gdb-9999
 2205251740 metadata/md5-cache/sys-devel/llvm-13.0.1
 2205251740 metadata/md5-cache/sys-devel/llvm-14.0.3
-2205270640 metadata/md5-cache/sys-devel/Manifest.gz
-2205270640 metadata/md5-cache/sys-devel/gcc-10.3.0-r2
-2205270640 metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
-2205270640 metadata/md5-cache/sys-devel/gcc-10.3.1_p20220519
-2205270640 metadata/md5-cache/sys-devel/gcc-10.4.9999
-2205270640 metadata/md5-cache/sys-devel/gcc-11.2.0
-2205270640 metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
-2205270640 metadata/md5-cache/sys-devel/gcc-11.3.0
-2205270640 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220520
-2205270640 metadata/md5-cache/sys-devel/gcc-11.4.9999
-2205270640 metadata/md5-cache/sys-devel/gcc-12.1.0
-2205270640 metadata/md5-cache/sys-devel/gcc-12.1.1_p20220514
-2205270640 metadata/md5-cache/sys-devel/gcc-12.1.1_p20220521
-2205270640 metadata/md5-cache/sys-devel/gcc-12.2.9999
-2205270640 metadata/md5-cache/sys-devel/gcc-13.0.9999
-2205270640 metadata/md5-cache/sys-devel/gcc-8.5.0-r1
-2205270640 metadata/md5-cache/sys-devel/gcc-9.4.0
-2205270640 metadata/md5-cache/sys-devel/gcc-9.4.1_p20220317
-2205270640 metadata/md5-cache/sys-devel/gcc-9.4.1_p20220520
-2205270640 metadata/md5-cache/sys-devel/gcc-9.5.9999
-2205270640 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
-2205270640 metadata/md5-cache/sys-devel/kgcc64-10.3.0
-2205270640 metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
-2205270640 metadata/md5-cache/sys-devel/kgcc64-11.3.0
-2205270640 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
-2205270640 metadata/md5-cache/sys-devel/kgcc64-9.4.0
+2205302310 metadata/md5-cache/sys-devel/Manifest.gz
+2205300940 metadata/md5-cache/sys-devel/binutils-2.38-r2
+2205300940 metadata/md5-cache/sys-devel/binutils-9999
+2205300940 metadata/md5-cache/sys-devel/binutils-hppa64-2.38-r2
+2205281910 metadata/md5-cache/sys-devel/bmake-20220418
+2205292310 metadata/md5-cache/sys-devel/clang-14.0.4
+2205292310 metadata/md5-cache/sys-devel/clang-common-14.0.4
+2205292310 metadata/md5-cache/sys-devel/clang-runtime-14.0.4
+2205302310 metadata/md5-cache/sys-devel/gcc-10.3.0-r2
+2205302310 metadata/md5-cache/sys-devel/gcc-10.3.1_p20211126
+2205302310 metadata/md5-cache/sys-devel/gcc-10.3.1_p20220526
+2205302310 metadata/md5-cache/sys-devel/gcc-10.4.9999
+2205302310 metadata/md5-cache/sys-devel/gcc-11.2.0
+2205302310 metadata/md5-cache/sys-devel/gcc-11.2.1_p20220115
+2205302310 metadata/md5-cache/sys-devel/gcc-11.3.0
+2205302310 metadata/md5-cache/sys-devel/gcc-11.3.1_p20220527
+2205302310 metadata/md5-cache/sys-devel/gcc-11.4.9999
+2205302310 metadata/md5-cache/sys-devel/gcc-12.1.0
+2205302310 metadata/md5-cache/sys-devel/gcc-12.1.1_p20220528
+2205302310 metadata/md5-cache/sys-devel/gcc-12.2.9999
+2205302310 metadata/md5-cache/sys-devel/gcc-13.0.9999
+2205302310 metadata/md5-cache/sys-devel/gcc-8.5.0-r1
+2205302310 metadata/md5-cache/sys-devel/gcc-9.4.0
+2205302310 metadata/md5-cache/sys-devel/gcc-9.5.0
+2205302310 metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r3
+2205302310 metadata/md5-cache/sys-devel/kgcc64-10.3.0
+2205302310 metadata/md5-cache/sys-devel/kgcc64-11.2.1_p20220115
+2205302310 metadata/md5-cache/sys-devel/kgcc64-11.3.0
+2205302310 metadata/md5-cache/sys-devel/kgcc64-9.3.0-r2
+2205302310 metadata/md5-cache/sys-devel/kgcc64-9.4.0
+2205292310 metadata/md5-cache/sys-devel/lld-14.0.4
+2205292310 metadata/md5-cache/sys-devel/llvm-14.0.4
+2205292310 metadata/md5-cache/sys-devel/llvm-common-14.0.4
 2205170654 metadata/md5-cache/sys-fabric/Manifest.gz
 2205170654 metadata/md5-cache/sys-fabric/mstflint-4.18.0_p1-r1
 2205170654 metadata/md5-cache/sys-fabric/opensm-3.3.23-r1
@@ -59410,7 +59364,6 @@
 2205170654 metadata/md5-cache/sys-fs/ubi_reader-0.8.0
 2205170654 metadata/md5-cache/sys-fs/udev-249.6-r2
 2205170654 metadata/md5-cache/sys-fs/udev-249.9
-2205170654 metadata/md5-cache/sys-fs/udev-250
 2205170654 metadata/md5-cache/sys-fs/udev-9999
 2205170654 metadata/md5-cache/sys-fs/udiskie-2.4.0
 2205170654 metadata/md5-cache/sys-fs/udiskie-2.4.1
@@ -59445,12 +59398,15 @@
 2205260310 metadata/md5-cache/sys-fs/btrfs-progs-9999
 2205260840 metadata/md5-cache/sys-fs/dmraid-1.0.0_rc16-r5
 2205252010 metadata/md5-cache/sys-fs/ncdu-1.16-r1
-2205260840 metadata/md5-cache/sys-fs/ntfs3g-2021.8.22-r4
 2205260840 metadata/md5-cache/sys-fs/udisks-2.9.4
 2205252240 metadata/md5-cache/sys-fs/unionfs-fuse-2.2-r1
 2205252240 metadata/md5-cache/sys-fs/unionfs-fuse-9999
-2205270240 metadata/md5-cache/sys-fs/Manifest.gz
 2205270240 metadata/md5-cache/sys-fs/ddrescue-1.26
+2205301840 metadata/md5-cache/sys-fs/Manifest.gz
+2205301111 metadata/md5-cache/sys-fs/bees-0.7
+2205301840 metadata/md5-cache/sys-fs/f2fs-tools-1.15.0
+2205272240 metadata/md5-cache/sys-fs/ntfs3g-2022.5.17
+2205301040 metadata/md5-cache/sys-fs/udev-250
 2106270109 metadata/md5-cache/sys-kernel/installkernel-systemd-boot-1
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.14.98_p20190215
 2112140909 metadata/md5-cache/sys-kernel/raspberrypi-image-4.19.75_p20190925
@@ -59478,7 +59434,6 @@
 2205181440 metadata/md5-cache/sys-kernel/cryptodev-9999
 2205170654 metadata/md5-cache/sys-kernel/dracut-053-r1
 2205170654 metadata/md5-cache/sys-kernel/dracut-055-r4
-2205170654 metadata/md5-cache/sys-kernel/dracut-9999
 2205170654 metadata/md5-cache/sys-kernel/dracut-crypt-ssh-1.0.7
 2205170654 metadata/md5-cache/sys-kernel/genkernel-4.0.10
 2205170654 metadata/md5-cache/sys-kernel/genkernel-4.2.5
@@ -59486,18 +59441,10 @@
 2205172340 metadata/md5-cache/sys-kernel/genkernel-4.2.6-r3
 2205181810 metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.9
 2205181810 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.9
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.279
 2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.243
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-4.9.314
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.110
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.116
 2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.32-r1
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.40
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.6
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.7
 2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.8
 2205181340 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.9
-2205170654 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.194
 2205170654 metadata/md5-cache/sys-kernel/git-sources-5.18_rc1
 2205170654 metadata/md5-cache/sys-kernel/git-sources-5.18_rc2
 2205170654 metadata/md5-cache/sys-kernel/git-sources-5.18_rc3
@@ -59556,8 +59503,6 @@
 2205212110 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.41
 2205231110 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.0
 2205212110 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.195
-2205231010 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.0
-2205252240 metadata/md5-cache/sys-kernel/Manifest.gz
 2205250740 metadata/md5-cache/sys-kernel/genkernel-9999
 2205252240 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.118
 2205252240 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.43
@@ -59583,10 +59528,28 @@
 2205251440 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.281
 2205251440 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.245
 2205251440 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.316
-2205251440 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.118
-2205251610 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.43
-2205251640 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.11
 2205251440 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.196
+2205310110 metadata/md5-cache/sys-kernel/Manifest.gz
+2205290511 metadata/md5-cache/sys-kernel/dracut-056
+2205280110 metadata/md5-cache/sys-kernel/dracut-9999
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.119
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.44
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-5.17.12
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.119
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.44
+2205310010 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.17.12
+2205301810 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.119
+2205301810 metadata/md5-cache/sys-kernel/gentoo-sources-5.15.44
+2205301810 metadata/md5-cache/sys-kernel/gentoo-sources-5.17.12
+2205301810 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1
+2205310110 metadata/md5-cache/sys-kernel/gentoo-sources-5.18.1-r1
+2205310010 metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.119
+2205310010 metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.44
+2205310010 metadata/md5-cache/sys-kernel/vanilla-kernel-5.17.12
+2205301310 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.119
+2205301310 metadata/md5-cache/sys-kernel/vanilla-sources-5.15.44
+2205301310 metadata/md5-cache/sys-kernel/vanilla-sources-5.17.12
+2205301310 metadata/md5-cache/sys-kernel/vanilla-sources-5.18.1
 2106100309 metadata/md5-cache/sys-libs/fortify-headers-1.1
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
 2107081310 metadata/md5-cache/sys-libs/lwp-2.8
@@ -59780,11 +59743,18 @@
 2205170654 metadata/md5-cache/sys-libs/zlib-ng-2.0.6
 2205221510 metadata/md5-cache/sys-libs/gdbm-1.23
 2205221140 metadata/md5-cache/sys-libs/libcap-2.64
-2205260910 metadata/md5-cache/sys-libs/Manifest.gz
 2205260910 metadata/md5-cache/sys-libs/binutils-libs-2.38-r2
 2205250340 metadata/md5-cache/sys-libs/glibc-2.35-r6
 2205260840 metadata/md5-cache/sys-libs/libblockdev-2.26
 2205240540 metadata/md5-cache/sys-libs/libxcrypt-4.4.28-r1
+2205302010 metadata/md5-cache/sys-libs/Manifest.gz
+2205302010 metadata/md5-cache/sys-libs/argp-standalone-1.5.0
+2205292310 metadata/md5-cache/sys-libs/compiler-rt-14.0.4
+2205292310 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.4
+2205292310 metadata/md5-cache/sys-libs/libcxx-14.0.4
+2205292310 metadata/md5-cache/sys-libs/libcxxabi-14.0.4
+2205292310 metadata/md5-cache/sys-libs/libomp-14.0.4
+2205292310 metadata/md5-cache/sys-libs/llvm-libunwind-14.0.4
 2110201309 metadata/md5-cache/sys-power/acpi-1.7-r1
 2104252209 metadata/md5-cache/sys-power/acpitool-0.5.1-r2
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
@@ -59800,8 +59770,6 @@
 2205170654 metadata/md5-cache/sys-power/acpilight-1.2-r4
 2205170654 metadata/md5-cache/sys-power/apcupsd-3.14.14-r3
 2205170654 metadata/md5-cache/sys-power/athcool-0.3.12
-2205181440 metadata/md5-cache/sys-power/bbswitch-0.8_p20200526
-2205181440 metadata/md5-cache/sys-power/bbswitch-9999
 2205170654 metadata/md5-cache/sys-power/cpupower-5.12
 2205170654 metadata/md5-cache/sys-power/cpupower-5.4
 2205170654 metadata/md5-cache/sys-power/iasl-20200326
@@ -59828,15 +59796,15 @@
 2205170654 metadata/md5-cache/sys-power/uhubctl-2.4.0
 2205170654 metadata/md5-cache/sys-power/upower-0.99.12-r1
 2205170654 metadata/md5-cache/sys-power/upower-0.99.17
-2205222340 metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
-2205270240 metadata/md5-cache/sys-power/Manifest.gz
 2205270240 metadata/md5-cache/sys-power/iasl-20200717
+2205302110 metadata/md5-cache/sys-power/Manifest.gz
+2205280040 metadata/md5-cache/sys-power/bbswitch-0.8_p20211129
+2205302110 metadata/md5-cache/sys-power/upower-0.99.18
 2005291309 metadata/md5-cache/sys-process/minicoredumper-2.0.1-r1
 2002112051 metadata/md5-cache/sys-process/supervise-scripts-4.0-r1
 2009171809 metadata/md5-cache/sys-process/xjobs-20200726
 2201242240 metadata/md5-cache/sys-process/cronbase-0.3.7-r8
 2203240726 metadata/md5-cache/sys-process/bashtop-0.9.25
-2204250610 metadata/md5-cache/sys-process/parallel-20220422
 2205032140 metadata/md5-cache/sys-process/parallel-20220322
 2205150610 metadata/md5-cache/sys-process/ctop-0.7.7
 2205170654 metadata/md5-cache/sys-process/acct-6.6.4-r3
@@ -59907,7 +59875,6 @@
 2205170654 metadata/md5-cache/sys-process/runit-2.1.2-r1
 2205170654 metadata/md5-cache/sys-process/schedtool-1.3.0-r1
 2205170654 metadata/md5-cache/sys-process/systemd-cron-1.5.17
-2205172240 metadata/md5-cache/sys-process/systemd-cron-1.5.18
 2205191340 metadata/md5-cache/sys-process/time-1.9
 2205170654 metadata/md5-cache/sys-process/tini-0.19.0-r1
 2205170654 metadata/md5-cache/sys-process/tiptop-2.3.1_p4
@@ -59917,10 +59884,12 @@
 2205170654 metadata/md5-cache/sys-process/usbtop-1.0
 2205170654 metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
 2205170654 metadata/md5-cache/sys-process/watchpid-0.1-r2
-2205212010 metadata/md5-cache/sys-process/Manifest.gz
 2205212010 metadata/md5-cache/sys-process/daemontools-0.76-r8
 2205212010 metadata/md5-cache/sys-process/daemontools-encore-1.11
 2205211140 metadata/md5-cache/sys-process/htop-9999
+2205291810 metadata/md5-cache/sys-process/Manifest.gz
+2205281940 metadata/md5-cache/sys-process/parallel-20220422
+2205291810 metadata/md5-cache/sys-process/systemd-cron-1.5.18
 2108131839 metadata/md5-cache/virtual/bitcoin-leveldb-0-r2
 2107020209 metadata/md5-cache/virtual/blas-3.8
 2108190539 metadata/md5-cache/virtual/checkpassword-0-r1
@@ -60014,8 +59983,6 @@
 2204290540 metadata/md5-cache/virtual/pkgconfig-2-r1
 2204291110 metadata/md5-cache/virtual/service-manager-1
 2204291110 metadata/md5-cache/virtual/ssh-0
-2204291110 metadata/md5-cache/virtual/tmpfiles-0-r3
-2204291110 metadata/md5-cache/virtual/udev-217-r5
 2204291110 metadata/md5-cache/virtual/yacc-0
 2205010512 metadata/md5-cache/virtual/cblas-3.8
 2205010512 metadata/md5-cache/virtual/fortran-0
@@ -60054,7 +60021,6 @@
 2205170654 metadata/md5-cache/virtual/libiconv-0-r2
 2205170654 metadata/md5-cache/virtual/libintl-0-r2
 2205170654 metadata/md5-cache/virtual/libudev-232-r5
-2205170654 metadata/md5-cache/virtual/libudev-232-r7
 2205170654 metadata/md5-cache/virtual/libusb-0-r2
 2205170654 metadata/md5-cache/virtual/libusb-1-r2
 2205170654 metadata/md5-cache/virtual/mpi-2.0-r6
@@ -60098,7 +60064,6 @@
 2205230011 metadata/md5-cache/virtual/perl-ExtUtils-MakeMaker-7.640.0
 2205220010 metadata/md5-cache/virtual/perl-autodie-2.340.0-r1
 2205220010 metadata/md5-cache/virtual/perl-bignum-0.650.0
-2205260840 metadata/md5-cache/virtual/Manifest.gz
 2205252240 metadata/md5-cache/virtual/dist-kernel-5.10.118
 2205252240 metadata/md5-cache/virtual/dist-kernel-5.15.43
 2205252240 metadata/md5-cache/virtual/dist-kernel-5.17.11
@@ -60128,7 +60093,6 @@
 2205250440 metadata/md5-cache/virtual/perl-Math-BigRat-0.262.100
 2205250440 metadata/md5-cache/virtual/perl-Math-Complex-1.590.200-r1
 2205250440 metadata/md5-cache/virtual/perl-Memoize-1.30.100_rc-r12
-2205252240 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200
 2205252240 metadata/md5-cache/virtual/perl-Module-Load-0.360.0-r2
 2205252240 metadata/md5-cache/virtual/perl-Module-Load-Conditional-0.740.0-r1
 2205252240 metadata/md5-cache/virtual/perl-Module-Loaded-0.80.0-r15
@@ -60169,6 +60133,14 @@
 2205260040 metadata/md5-cache/virtual/perl-threads-shared-1.640.0
 2205260040 metadata/md5-cache/virtual/perl-version-0.992.900
 2205242310 metadata/md5-cache/virtual/rust-1.61.0
+2205310010 metadata/md5-cache/virtual/Manifest.gz
+2205310010 metadata/md5-cache/virtual/dist-kernel-5.10.119
+2205310010 metadata/md5-cache/virtual/dist-kernel-5.15.44
+2205310010 metadata/md5-cache/virtual/dist-kernel-5.17.12
+2205301040 metadata/md5-cache/virtual/libudev-232-r7
+2205280440 metadata/md5-cache/virtual/perl-Module-CoreList-5.202.205.200-r1
+2205301040 metadata/md5-cache/virtual/tmpfiles-0-r3
+2205301040 metadata/md5-cache/virtual/udev-217-r5
 2112220410 metadata/md5-cache/www-apache/modsecurity-crs-3.3.2
 2203240726 metadata/md5-cache/www-apache/mod_auth_radius-1.6.0
 2203240726 metadata/md5-cache/www-apache/mod_auth_tkt-2.1.0-r2
@@ -60285,7 +60257,6 @@
 2205170654 metadata/md5-cache/www-apps/cgit-1.2.3-r100
 2205170654 metadata/md5-cache/www-apps/cgit-1.2.3-r200
 2205170654 metadata/md5-cache/www-apps/cgit-9999
-2205170654 metadata/md5-cache/www-apps/gitea-1.16.7
 2205192140 metadata/md5-cache/www-apps/grafana-bin-7.5.16
 2205192140 metadata/md5-cache/www-apps/grafana-bin-8.5.3
 2205170654 metadata/md5-cache/www-apps/hugo-0.93.3
@@ -60339,7 +60310,6 @@
 2205220911 metadata/md5-cache/www-apps/nanoc-4.12.3
 2205220911 metadata/md5-cache/www-apps/nanoc-4.12.5
 2205220911 metadata/md5-cache/www-apps/nanoc-checking-1.0.1
-2205220911 metadata/md5-cache/www-apps/nanoc-checking-1.0.2
 2205220911 metadata/md5-cache/www-apps/nanoc-cli-4.12.2
 2205220911 metadata/md5-cache/www-apps/nanoc-cli-4.12.3
 2205220911 metadata/md5-cache/www-apps/nanoc-cli-4.12.5
@@ -60348,12 +60318,19 @@
 2205220911 metadata/md5-cache/www-apps/nanoc-core-4.12.3
 2205220911 metadata/md5-cache/www-apps/nanoc-core-4.12.5
 2205220911 metadata/md5-cache/www-apps/nanoc-deploying-1.0.1
-2205220911 metadata/md5-cache/www-apps/nanoc-spec-0.0.2
 2205220110 metadata/md5-cache/www-apps/nextcloud-22.2.8
 2205220110 metadata/md5-cache/www-apps/nextcloud-23.0.5
 2205220110 metadata/md5-cache/www-apps/nextcloud-24.0.1
-2205261540 metadata/md5-cache/www-apps/Manifest.gz
 2205261540 metadata/md5-cache/www-apps/chromedriver-bin-102.0.5005.61
+2205300910 metadata/md5-cache/www-apps/Manifest.gz
+2205300910 metadata/md5-cache/www-apps/gitea-1.16.7
+2205282310 metadata/md5-cache/www-apps/miniflux-2.0.37
+2205290910 metadata/md5-cache/www-apps/nanoc-4.12.6
+2205290910 metadata/md5-cache/www-apps/nanoc-checking-1.0.2
+2205290910 metadata/md5-cache/www-apps/nanoc-cli-4.12.6
+2205290910 metadata/md5-cache/www-apps/nanoc-core-4.12.6
+2205290910 metadata/md5-cache/www-apps/nanoc-deploying-1.0.2
+2205290910 metadata/md5-cache/www-apps/nanoc-spec-0.0.2
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2104121139 metadata/md5-cache/www-client/fetch-1.0-r4
 2107180040 metadata/md5-cache/www-client/lynx-2.9.0_pre6-r2
@@ -60368,12 +60345,8 @@
 2205170654 metadata/md5-cache/www-client/epiphany-41.3
 2205170654 metadata/md5-cache/www-client/epiphany-42.0
 2205170654 metadata/md5-cache/www-client/epiphany-42.1
-2205170654 metadata/md5-cache/www-client/epiphany-42.2
 2205170654 metadata/md5-cache/www-client/falkon-22.04.1
-2205170654 metadata/md5-cache/www-client/firefox-100.0
-2205170654 metadata/md5-cache/www-client/firefox-100.0.1
 2205170654 metadata/md5-cache/www-client/firefox-91.9.0
-2205191940 metadata/md5-cache/www-client/google-chrome-beta-102.0.5005.61
 2205170654 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2205170654 metadata/md5-cache/www-client/jd-2.8.9_p150226-r2
 2205170654 metadata/md5-cache/www-client/luakit-2.2.1-r100
@@ -60384,8 +60357,6 @@
 2205181110 metadata/md5-cache/www-client/microsoft-edge-dev-103.0.1255.0
 2205170654 metadata/md5-cache/www-client/netrik-1.16.1-r3
 2205170654 metadata/md5-cache/www-client/netsurf-3.10-r6
-2205181110 metadata/md5-cache/www-client/opera-87.0.4390.25
-2205170654 metadata/md5-cache/www-client/opera-beta-87.0.4390.17
 2205170654 metadata/md5-cache/www-client/opera-beta-87.0.4390.21
 2205191940 metadata/md5-cache/www-client/opera-beta-88.0.4412.13
 2205170654 metadata/md5-cache/www-client/opera-developer-89.0.4415.0
@@ -60416,22 +60387,27 @@
 2205210940 metadata/md5-cache/www-client/firefox-bin-100.0.2
 2205210940 metadata/md5-cache/www-client/firefox-bin-91.9.1
 2205202140 metadata/md5-cache/www-client/microsoft-edge-101.0.1210.53
-2205211440 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.3
 2205251840 metadata/md5-cache/www-client/chromium-bin-102.0.5005.61
 2205242240 metadata/md5-cache/www-client/google-chrome-102.0.5005.61
 2205242210 metadata/md5-cache/www-client/microsoft-edge-beta-102.0.1245.22
 2205242210 metadata/md5-cache/www-client/opera-developer-89.0.4428.0
-2205261040 metadata/md5-cache/www-client/google-chrome-unstable-103.0.5060.24
 2205261010 metadata/md5-cache/www-client/links-2.26-r1
 2205261040 metadata/md5-cache/www-client/microsoft-edge-dev-103.0.1264.2
-2205271010 metadata/md5-cache/www-client/Manifest.gz
 2205271010 metadata/md5-cache/www-client/chromium-102.0.5005.61
-2205261840 metadata/md5-cache/www-client/chromium-103.0.5060.24
 2205262210 metadata/md5-cache/www-client/microsoft-edge-beta-102.0.1245.25
 2205261810 metadata/md5-cache/www-client/qutebrowser-2.5.1
 2205261810 metadata/md5-cache/www-client/qutebrowser-9999
 2205270140 metadata/md5-cache/www-client/vivaldi-5.2.2623.48
-2205270140 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16
+2205302240 metadata/md5-cache/www-client/Manifest.gz
+2205292110 metadata/md5-cache/www-client/chromium-103.0.5060.24
+2205301010 metadata/md5-cache/www-client/chromium-104.0.5083.0
+2205280910 metadata/md5-cache/www-client/epiphany-42.2
+2205281610 metadata/md5-cache/www-client/google-chrome-beta-103.0.5060.24
+2205281610 metadata/md5-cache/www-client/google-chrome-unstable-104.0.5083.0
+2205302240 metadata/md5-cache/www-client/links-2.27
+2205271640 metadata/md5-cache/www-client/opera-87.0.4390.36
+2205271640 metadata/md5-cache/www-client/opera-beta-88.0.4412.18
+2205291040 metadata/md5-cache/www-client/vivaldi-snapshot-5.3.2679.16-r1
 2104161439 metadata/md5-cache/www-misc/awstats-7.8-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -60459,7 +60435,6 @@
 2104180939 metadata/md5-cache/www-plugins/pdfjs-2.4.456
 2104180939 metadata/md5-cache/www-plugins/pdfjs-2.5.207
 2204150511 metadata/md5-cache/www-plugins/browserpass-3.0.9
-2205191940 metadata/md5-cache/www-plugins/chrome-binary-plugins-102.0.5005.61_beta
 2205170654 metadata/md5-cache/www-plugins/gosuslugi-plugin-3.1.1.0
 2205170654 metadata/md5-cache/www-plugins/lightspark-0.8.2-r1
 2205170654 metadata/md5-cache/www-plugins/lightspark-0.8.3
@@ -60467,8 +60442,9 @@
 2205170654 metadata/md5-cache/www-plugins/lightspark-0.8.5
 2205170654 metadata/md5-cache/www-plugins/passff-host-1.2.3-r1
 2205242240 metadata/md5-cache/www-plugins/chrome-binary-plugins-102.0.5005.61
-2205261040 metadata/md5-cache/www-plugins/Manifest.gz
-2205261040 metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_alpha
+2205281610 metadata/md5-cache/www-plugins/Manifest.gz
+2205281610 metadata/md5-cache/www-plugins/chrome-binary-plugins-103.0.5060.24_beta
+2205281610 metadata/md5-cache/www-plugins/chrome-binary-plugins-104.0.5083.0_alpha
 2012311940 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
 2205170654 metadata/md5-cache/www-servers/apache-2.4.53
 2205170654 metadata/md5-cache/www-servers/apache-2.4.53-r1
@@ -60521,10 +60497,6 @@
 2205170654 metadata/md5-cache/www-servers/tornado-6.1
 2205170654 metadata/md5-cache/www-servers/tornado-6.1-r1
 2205170654 metadata/md5-cache/www-servers/uwsgi-2.0.19.1-r109
-2205170654 metadata/md5-cache/www-servers/varnish-6.5.2
-2205170654 metadata/md5-cache/www-servers/varnish-6.6.1
-2205170654 metadata/md5-cache/www-servers/varnish-7.0.1
-2205170654 metadata/md5-cache/www-servers/varnish-7.1.0
 2205170654 metadata/md5-cache/www-servers/webfs-1.21
 2205170654 metadata/md5-cache/www-servers/xsp-3.8_p2014120900-r1
 2205170654 metadata/md5-cache/www-servers/xsp-4.7.1-r1
@@ -60534,25 +60506,22 @@
 2205220911 metadata/md5-cache/www-servers/adsf-1.4.6-r1
 2205220911 metadata/md5-cache/www-servers/puma-5.6.4
 2205220911 metadata/md5-cache/www-servers/thin-1.8.1
-2205241040 metadata/md5-cache/www-servers/Manifest.gz
 2205241040 metadata/md5-cache/www-servers/tomcat-8.5.79
+2205301840 metadata/md5-cache/www-servers/Manifest.gz
+2205301840 metadata/md5-cache/www-servers/varnish-6.5.2
+2205301840 metadata/md5-cache/www-servers/varnish-6.6.1
+2205301840 metadata/md5-cache/www-servers/varnish-7.0.1
+2205301840 metadata/md5-cache/www-servers/varnish-7.1.0
 2112190440 metadata/md5-cache/x11-apps/mesa-progs-8.4.0-r1
 2205100440 metadata/md5-cache/x11-apps/luit-20220111
-2205170654 metadata/md5-cache/x11-apps/appres-1.0.5-r1
 2205170654 metadata/md5-cache/x11-apps/bdftopcf-1.1-r1
 2205170654 metadata/md5-cache/x11-apps/beforelight-1.0.5
-2205170654 metadata/md5-cache/x11-apps/bitmap-1.0.9-r1
-2205170654 metadata/md5-cache/x11-apps/editres-1.0.7
 2205170654 metadata/md5-cache/x11-apps/fonttosfnt-1.2.2
 2205170654 metadata/md5-cache/x11-apps/fslsfonts-1.0.5-r1
 2205170654 metadata/md5-cache/x11-apps/fstobdf-1.0.6
-2205170654 metadata/md5-cache/x11-apps/iceauth-1.0.8-r1
 2205170654 metadata/md5-cache/x11-apps/ico-1.0.5
 2205170654 metadata/md5-cache/x11-apps/igt-gpu-tools-1.26-r2
 2205170654 metadata/md5-cache/x11-apps/igt-gpu-tools-9999
-2205170654 metadata/md5-cache/x11-apps/listres-1.0.4
-2205170654 metadata/md5-cache/x11-apps/mesa-progs-9999
-2205170654 metadata/md5-cache/x11-apps/mkfontscale-1.2.1
 2205170654 metadata/md5-cache/x11-apps/oclock-1.0.4
 2205170654 metadata/md5-cache/x11-apps/radeon-profile-20200824
 2205170654 metadata/md5-cache/x11-apps/radeon-profile-20200824-r1
@@ -60560,32 +60529,23 @@
 2205170654 metadata/md5-cache/x11-apps/radeon-profile-daemon-20190603-r1
 2205170654 metadata/md5-cache/x11-apps/radeon-profile-daemon-99999999
 2205170654 metadata/md5-cache/x11-apps/rgb-1.0.6-r1
-2205170654 metadata/md5-cache/x11-apps/rstart-1.0.5-r1
 2205170654 metadata/md5-cache/x11-apps/scripts-1.0.1-r1
 2205170654 metadata/md5-cache/x11-apps/sessreg-1.1.2
-2205170654 metadata/md5-cache/x11-apps/setxkbmap-1.3.2
 2205170654 metadata/md5-cache/x11-apps/showfont-1.0.5
 2205170654 metadata/md5-cache/x11-apps/smproxy-1.0.6-r1
 2205170654 metadata/md5-cache/x11-apps/transset-1.0.2
 2205170654 metadata/md5-cache/x11-apps/viewres-1.0.6
 2205170654 metadata/md5-cache/x11-apps/x11perf-1.6.1
-2205170654 metadata/md5-cache/x11-apps/xauth-1.1.1
 2205170654 metadata/md5-cache/x11-apps/xauth-9999
 2205170654 metadata/md5-cache/x11-apps/xbacklight-1.2.3
 2205170654 metadata/md5-cache/x11-apps/xbiff-1.0.4
-2205170654 metadata/md5-cache/x11-apps/xcalc-1.1.0
 2205170654 metadata/md5-cache/x11-apps/xclipboard-1.1.3
-2205170654 metadata/md5-cache/x11-apps/xclock-1.0.9
-2205170654 metadata/md5-cache/x11-apps/xclock-1.1.0
 2205170654 metadata/md5-cache/x11-apps/xcmsdb-1.0.5-r1
 2205170654 metadata/md5-cache/x11-apps/xconsole-1.0.7
 2205170654 metadata/md5-cache/x11-apps/xcursorgen-1.0.7-r1
 2205170654 metadata/md5-cache/x11-apps/xdbedizzy-1.1.0
 2205170654 metadata/md5-cache/x11-apps/xditview-1.0.5
-2205170654 metadata/md5-cache/x11-apps/xdm-1.1.12-r1
-2205170654 metadata/md5-cache/x11-apps/xdpyinfo-1.3.2-r1
 2205170654 metadata/md5-cache/x11-apps/xdriinfo-1.0.6-r1
-2205170654 metadata/md5-cache/x11-apps/xedit-1.2.2
 2205170654 metadata/md5-cache/x11-apps/xev-1.2.4
 2205170654 metadata/md5-cache/x11-apps/xeyes-1.2.0
 2205170654 metadata/md5-cache/x11-apps/xf86dga-1.0.3-r1
@@ -60604,11 +60564,9 @@
 2205170654 metadata/md5-cache/x11-apps/xkbprint-1.0.5
 2205170654 metadata/md5-cache/x11-apps/xkbutils-1.0.4-r1
 2205170654 metadata/md5-cache/x11-apps/xkill-1.0.5-r1
-2205170654 metadata/md5-cache/x11-apps/xload-1.1.3
 2205170654 metadata/md5-cache/x11-apps/xlogo-1.0.5
 2205170654 metadata/md5-cache/x11-apps/xlsatoms-1.1.3
 2205170654 metadata/md5-cache/x11-apps/xlsclients-1.1.4-r1
-2205170654 metadata/md5-cache/x11-apps/xlsfonts-1.0.6
 2205170654 metadata/md5-cache/x11-apps/xmag-1.0.6
 2205170654 metadata/md5-cache/x11-apps/xman-1.1.5
 2205170654 metadata/md5-cache/x11-apps/xmessage-1.0.5-r1
@@ -60623,61 +60581,55 @@
 2205170654 metadata/md5-cache/x11-apps/xrestop-0.5
 2205170654 metadata/md5-cache/x11-apps/xset-1.2.4-r1
 2205170654 metadata/md5-cache/x11-apps/xsetroot-1.1.2-r1
-2205170654 metadata/md5-cache/x11-apps/xsm-1.0.4
 2205170654 metadata/md5-cache/x11-apps/xstdcmap-1.0.4
 2205170654 metadata/md5-cache/x11-apps/xvidtune-1.0.3
 2205170654 metadata/md5-cache/x11-apps/xvinfo-1.1.4
 2205170654 metadata/md5-cache/x11-apps/xwd-1.0.8
 2205170654 metadata/md5-cache/x11-apps/xwininfo-1.1.5
 2205170654 metadata/md5-cache/x11-apps/xwud-1.0.5-r1
-2205252110 metadata/md5-cache/x11-apps/Manifest.gz
-2205252110 metadata/md5-cache/x11-apps/appres-1.0.6
-2205252110 metadata/md5-cache/x11-apps/bitmap-1.1.0
-2205252110 metadata/md5-cache/x11-apps/editres-1.0.8
-2205252110 metadata/md5-cache/x11-apps/iceauth-1.0.9
-2205252110 metadata/md5-cache/x11-apps/listres-1.0.5
-2205252110 metadata/md5-cache/x11-apps/mkfontscale-1.2.2
-2205252110 metadata/md5-cache/x11-apps/rstart-1.0.6
-2205252110 metadata/md5-cache/x11-apps/setxkbmap-1.3.3
-2205252110 metadata/md5-cache/x11-apps/xauth-1.1.2
-2205252110 metadata/md5-cache/x11-apps/xcalc-1.1.1
-2205252110 metadata/md5-cache/x11-apps/xclock-1.1.1
-2205252110 metadata/md5-cache/x11-apps/xdm-1.1.13
-2205252110 metadata/md5-cache/x11-apps/xdpyinfo-1.3.3
-2205252110 metadata/md5-cache/x11-apps/xedit-1.2.3
-2205252110 metadata/md5-cache/x11-apps/xload-1.1.4
-2205252110 metadata/md5-cache/x11-apps/xlsfonts-1.0.7
-2205252110 metadata/md5-cache/x11-apps/xsm-1.0.5
+2205302040 metadata/md5-cache/x11-apps/Manifest.gz
+2205280440 metadata/md5-cache/x11-apps/appres-1.0.6
+2205280440 metadata/md5-cache/x11-apps/bitmap-1.1.0
+2205280440 metadata/md5-cache/x11-apps/editres-1.0.8
+2205280440 metadata/md5-cache/x11-apps/iceauth-1.0.9
+2205280440 metadata/md5-cache/x11-apps/listres-1.0.5
+2205302040 metadata/md5-cache/x11-apps/mesa-progs-8.5.0
+2205302040 metadata/md5-cache/x11-apps/mesa-progs-9999
+2205280440 metadata/md5-cache/x11-apps/mkfontscale-1.2.2
+2205280440 metadata/md5-cache/x11-apps/rstart-1.0.6
+2205280440 metadata/md5-cache/x11-apps/setxkbmap-1.3.3
+2205280440 metadata/md5-cache/x11-apps/xauth-1.1.2
+2205280440 metadata/md5-cache/x11-apps/xcalc-1.1.1
+2205280440 metadata/md5-cache/x11-apps/xclock-1.1.1
+2205280440 metadata/md5-cache/x11-apps/xdm-1.1.13
+2205280440 metadata/md5-cache/x11-apps/xdpyinfo-1.3.3
+2205280440 metadata/md5-cache/x11-apps/xedit-1.2.3
+2205280440 metadata/md5-cache/x11-apps/xload-1.1.4
+2205280440 metadata/md5-cache/x11-apps/xlsfonts-1.0.7
+2205280440 metadata/md5-cache/x11-apps/xsm-1.0.5
 2104060140 metadata/md5-cache/x11-base/xorg-drivers-1.20-r2
 2110220439 metadata/md5-cache/x11-base/xorg-x11-7.4-r3
 2205081040 metadata/md5-cache/x11-base/xorg-drivers-21.1
 2205081040 metadata/md5-cache/x11-base/xorg-drivers-9999
 2205170654 metadata/md5-cache/x11-base/xcb-proto-1.14.1
 2205170654 metadata/md5-cache/x11-base/xcb-proto-1.15
-2205170654 metadata/md5-cache/x11-base/xorg-proto-2021.5
 2205170654 metadata/md5-cache/x11-base/xorg-proto-9999
 2205170654 metadata/md5-cache/x11-base/xorg-server-1.20.14-r1
-2205170654 metadata/md5-cache/x11-base/xorg-server-21.1.3-r1
 2205170654 metadata/md5-cache/x11-base/xorg-server-9999
-2205170654 metadata/md5-cache/x11-base/xorg-sgml-doctools-1.11
 2205170654 metadata/md5-cache/x11-base/xorg-sgml-doctools-1.12
-2205170654 metadata/md5-cache/x11-base/xwayland-21.1.4
-2205170654 metadata/md5-cache/x11-base/xwayland-22.1.0
 2205171210 metadata/md5-cache/x11-base/xwayland-9999
-2205252110 metadata/md5-cache/x11-base/Manifest.gz
-2205252110 metadata/md5-cache/x11-base/xorg-proto-2022.1
-2205252110 metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
-2205252110 metadata/md5-cache/x11-base/xwayland-22.1.1
 2205251310 metadata/md5-cache/x11-base/xwayland-22.1.2
+2205291840 metadata/md5-cache/x11-base/Manifest.gz
+2205280440 metadata/md5-cache/x11-base/xorg-proto-2022.1
+2205280440 metadata/md5-cache/x11-base/xorg-server-21.1.3-r2
+2205280440 metadata/md5-cache/x11-base/xwayland-22.1.1
 2202012143 metadata/md5-cache/x11-drivers/xf86-input-mtrack-0.5.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-libinput-1.2.1
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-13.1.0-r1
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-vmmouse-9999
 2205170654 metadata/md5-cache/x11-drivers/xf86-input-wacom-0.40.0
-2205170654 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-21.0.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-ast-1.1.5
-2205170654 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.3.8
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-fbdev-0.5.0-r1
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-geode-2.11.20
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-glint-1.2.9
@@ -60685,32 +60637,32 @@
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-omap-0.4.5
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-openchrome-0.6.0
-2205170654 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5_p20200205-r1
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-siliconmotion-1.7.9
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-vboxvideo-1.0.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-vesa-2.5.0
 2205170654 metadata/md5-cache/x11-drivers/xf86-video-vmware-13.3.0-r1
-2205231540 metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05
-2205231540 metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04
-2205250840 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
 2205260840 metadata/md5-cache/x11-drivers/xf86-input-elographics-1.4.2
 2205251910 metadata/md5-cache/x11-drivers/xf86-input-evdev-2.10.6
 2205251910 metadata/md5-cache/x11-drivers/xf86-input-joystick-1.6.3
 2205260840 metadata/md5-cache/x11-drivers/xf86-input-synaptics-1.9.1
 2205251910 metadata/md5-cache/x11-drivers/xf86-input-void-1.4.1
-2205251910 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-9999
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-ati-19.1.0-r1
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-ati-9999
-2205252110 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-mga-2.0.0
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-nouveau-1.0.17
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-nv-2.1.21
 2205251910 metadata/md5-cache/x11-drivers/xf86-video-r128-6.12.0
-2205260940 metadata/md5-cache/x11-drivers/Manifest.gz
-2205260940 metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
-2205260940 metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
+2205301940 metadata/md5-cache/x11-drivers/Manifest.gz
+2205301940 metadata/md5-cache/x11-drivers/nvidia-drivers-390.151
+2205301940 metadata/md5-cache/x11-drivers/nvidia-drivers-470.129.06
+2205301940 metadata/md5-cache/x11-drivers/nvidia-drivers-470.62.30
+2205301940 metadata/md5-cache/x11-drivers/nvidia-drivers-510.73.05
+2205301940 metadata/md5-cache/x11-drivers/nvidia-drivers-515.43.04
+2205301840 metadata/md5-cache/x11-drivers/xf86-input-wacom-1.0.0
+2205280440 metadata/md5-cache/x11-drivers/xf86-video-amdgpu-22.0.0
+2205280440 metadata/md5-cache/x11-drivers/xf86-video-dummy-0.4.0
 2102271539 metadata/md5-cache/x11-libs/fox-wrapper-3
 2104031909 metadata/md5-cache/x11-libs/gtkdatabox-0.9.3.0
 2002101739 metadata/md5-cache/x11-libs/libGLw-8.0.0-r1
@@ -60741,12 +60693,10 @@
 2205170654 metadata/md5-cache/x11-libs/fox-1.6.57-r1
 2205170654 metadata/md5-cache/x11-libs/fox-1.7.67
 2205170654 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.6-r1
-2205170654 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
 2205170654 metadata/md5-cache/x11-libs/gdk-pixbuf-xlib-2.40.2
 2205170654 metadata/md5-cache/x11-libs/gl2ps-1.4.2
 2205170654 metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2-r1
 2205170654 metadata/md5-cache/x11-libs/goffice-0.10.51
-2205170654 metadata/md5-cache/x11-libs/goffice-0.10.52
 2205170654 metadata/md5-cache/x11-libs/goocanvas-2.0.4-r2
 2205170654 metadata/md5-cache/x11-libs/goocanvas-3.0.0
 2205171210 metadata/md5-cache/x11-libs/gtk+-2.24.33
@@ -60754,7 +60704,6 @@
 2205170654 metadata/md5-cache/x11-libs/gtk+-3.24.32
 2205170654 metadata/md5-cache/x11-libs/gtk+-3.24.33
 2205171110 metadata/md5-cache/x11-libs/gtk+-3.24.33-r1
-2205190210 metadata/md5-cache/x11-libs/gtk+-3.24.34
 2205170654 metadata/md5-cache/x11-libs/gtk+extra-3.3.4
 2205170654 metadata/md5-cache/x11-libs/gtkglext-1.2.0-r5
 2205170654 metadata/md5-cache/x11-libs/gtkmathview-0.8.0-r4
@@ -60766,8 +60715,6 @@
 2205170654 metadata/md5-cache/x11-libs/libQGLViewer-2.7.1
 2205170654 metadata/md5-cache/x11-libs/libQGLViewer-2.7.2
 2205170654 metadata/md5-cache/x11-libs/libSM-1.2.3-r1
-2205170654 metadata/md5-cache/x11-libs/libX11-1.7.3
-2205170654 metadata/md5-cache/x11-libs/libX11-1.7.4
 2205170654 metadata/md5-cache/x11-libs/libX11-1.8
 2205181110 metadata/md5-cache/x11-libs/libXScrnSaver-1.2.3
 2205170654 metadata/md5-cache/x11-libs/libXau-1.0.9-r1
@@ -60775,7 +60722,6 @@
 2205170654 metadata/md5-cache/x11-libs/libXaw3d-1.6.3
 2205170654 metadata/md5-cache/x11-libs/libXaw3dXft-1.6.2h
 2205170654 metadata/md5-cache/x11-libs/libXcomposite-0.4.5
-2205170654 metadata/md5-cache/x11-libs/libXcursor-1.2.0
 2205171110 metadata/md5-cache/x11-libs/libXdamage-1.1.5
 2205170654 metadata/md5-cache/x11-libs/libXdmcp-1.1.3-r1
 2205170654 metadata/md5-cache/x11-libs/libXext-1.3.4
@@ -60791,18 +60737,15 @@
 2205170654 metadata/md5-cache/x11-libs/libXrandr-1.5.2
 2205170654 metadata/md5-cache/x11-libs/libXrender-0.9.10-r2
 2205170654 metadata/md5-cache/x11-libs/libXres-1.2.1
-2205170654 metadata/md5-cache/x11-libs/libXt-1.2.0
 2205170654 metadata/md5-cache/x11-libs/libXt-1.2.1
 2205170654 metadata/md5-cache/x11-libs/libXtst-1.2.3-r2
 2205170654 metadata/md5-cache/x11-libs/libXv-1.0.11-r2
-2205170654 metadata/md5-cache/x11-libs/libXvMC-1.0.12-r1
 2205170654 metadata/md5-cache/x11-libs/libXxf86dga-1.1.5
 2205170654 metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r2
 2205170654 metadata/md5-cache/x11-libs/libclxclient-3.9.2
 2205170654 metadata/md5-cache/x11-libs/libcryptui-3.12.2-r1
 2205170654 metadata/md5-cache/x11-libs/libdlo-0.1.2-r2
 2205170654 metadata/md5-cache/x11-libs/libdmx-1.1.4
-2205170654 metadata/md5-cache/x11-libs/libdrm-2.4.109
 2205170654 metadata/md5-cache/x11-libs/libdrm-9999
 2205170654 metadata/md5-cache/x11-libs/libfakeXinerama-0.1.0
 2205170654 metadata/md5-cache/x11-libs/libfakekey-0.3-r1
@@ -60839,7 +60782,6 @@
 2205170654 metadata/md5-cache/x11-libs/libxcb-1.15
 2205170654 metadata/md5-cache/x11-libs/libxcvt-0.1.1
 2205170654 metadata/md5-cache/x11-libs/libxcvt-9999
-2205170654 metadata/md5-cache/x11-libs/libxkbcommon-1.3.1
 2205170654 metadata/md5-cache/x11-libs/libxkbfile-1.1.0
 2205170654 metadata/md5-cache/x11-libs/libxklavier-5.4
 2205170654 metadata/md5-cache/x11-libs/libxshmfence-1.3-r2
@@ -60849,7 +60791,6 @@
 2205170654 metadata/md5-cache/x11-libs/pango-1.50.4
 2205170654 metadata/md5-cache/x11-libs/pango-1.50.5
 2205170654 metadata/md5-cache/x11-libs/pango-1.50.6
-2205170654 metadata/md5-cache/x11-libs/pango-1.50.7
 2205170654 metadata/md5-cache/x11-libs/pixman-0.40.0
 2205170654 metadata/md5-cache/x11-libs/pixman-9999
 2205170654 metadata/md5-cache/x11-libs/qscintilla-2.11.6
@@ -60871,7 +60812,6 @@
 2205170654 metadata/md5-cache/x11-libs/tslib-1.22
 2205170654 metadata/md5-cache/x11-libs/vte-0.28.2-r209
 2205170654 metadata/md5-cache/x11-libs/vte-0.66.2
-2205190840 metadata/md5-cache/x11-libs/vte-0.68.0
 2205170654 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r2
 2205170654 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r302
 2205170654 metadata/md5-cache/x11-libs/wxGTK-3.0.4-r303
@@ -60891,16 +60831,22 @@
 2205231710 metadata/md5-cache/x11-libs/cmrt-1.0.6-r1
 2205231510 metadata/md5-cache/x11-libs/intel-hybrid-codec-driver-2.0.0
 2205231510 metadata/md5-cache/x11-libs/libva-intel-driver-2.4.1-r2
-2205260840 metadata/md5-cache/x11-libs/Manifest.gz
-2205252110 metadata/md5-cache/x11-libs/libX11-1.7.5
-2205252110 metadata/md5-cache/x11-libs/libXcursor-1.2.1
-2205252110 metadata/md5-cache/x11-libs/libXvMC-1.0.13
-2205252110 metadata/md5-cache/x11-libs/libdrm-2.4.110
 2205260840 metadata/md5-cache/x11-libs/libfm-1.3.2
 2205251440 metadata/md5-cache/x11-libs/libfm-extra-1.3.2
 2205251440 metadata/md5-cache/x11-libs/libfm-qt-1.1.0
-2205252110 metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
 2205242140 metadata/md5-cache/x11-libs/libxkbcommon-1.4.1
+2205292210 metadata/md5-cache/x11-libs/Manifest.gz
+2205280910 metadata/md5-cache/x11-libs/gdk-pixbuf-2.42.8
+2205280440 metadata/md5-cache/x11-libs/goffice-0.10.52
+2205280910 metadata/md5-cache/x11-libs/gtk+-3.24.34
+2205280440 metadata/md5-cache/x11-libs/libX11-1.7.5
+2205280440 metadata/md5-cache/x11-libs/libXcursor-1.2.1
+2205280440 metadata/md5-cache/x11-libs/libXvMC-1.0.13
+2205280440 metadata/md5-cache/x11-libs/libdrm-2.4.110
+2205292210 metadata/md5-cache/x11-libs/libva-intel-media-driver-22.4.2
+2205280440 metadata/md5-cache/x11-libs/libxkbcommon-1.4.0
+2205280910 metadata/md5-cache/x11-libs/pango-1.50.7
+2205280910 metadata/md5-cache/x11-libs/vte-0.68.0
 1703221038 metadata/md5-cache/x11-misc/3dfm-1.0-r1
 1805220439 metadata/md5-cache/x11-misc/autocutsel-0.10.0
 1910111911 metadata/md5-cache/x11-misc/bblaunch-0.0.3
@@ -60934,7 +60880,6 @@
 1706300138 metadata/md5-cache/x11-misc/tinynotify-send-1.2.1-r1
 1911180939 metadata/md5-cache/x11-misc/urxvt-font-size-1.3
 2004261039 metadata/md5-cache/x11-misc/urxvt-perls-2.3-r1
-2104060140 metadata/md5-cache/x11-misc/util-macros-1.19.2-r2
 2104200509 metadata/md5-cache/x11-misc/whaw-0.2
 1703211738 metadata/md5-cache/x11-misc/wininfo-0.7-r1
 2109211710 metadata/md5-cache/x11-misc/wmctrl-1.07-r2
@@ -60981,7 +60926,6 @@
 2205151340 metadata/md5-cache/x11-misc/tdrop-9999
 2205170654 metadata/md5-cache/x11-misc/accessx-0951-r2
 2205170654 metadata/md5-cache/x11-misc/alacarte-3.42.0
-2205170654 metadata/md5-cache/x11-misc/alacarte-3.44.1
 2205170654 metadata/md5-cache/x11-misc/albert-0.17.2-r1
 2205170654 metadata/md5-cache/x11-misc/alock-1.0.0-r1
 2205170654 metadata/md5-cache/x11-misc/appmenu-gtk-module-0.7.3-r2
@@ -61012,8 +60956,6 @@
 2205170654 metadata/md5-cache/x11-misc/cdm-0.7
 2205170654 metadata/md5-cache/x11-misc/chgres-0.1-r2
 2205170654 metadata/md5-cache/x11-misc/clipmenu-6.2.0-r1
-2205170654 metadata/md5-cache/x11-misc/compose-tables-1.7.3
-2205170654 metadata/md5-cache/x11-misc/compose-tables-1.7.4
 2205170654 metadata/md5-cache/x11-misc/compose-tables-1.8
 2205170654 metadata/md5-cache/x11-misc/copyq-3.13.0
 2205170654 metadata/md5-cache/x11-misc/copyq-4.1.0
@@ -61055,8 +60997,6 @@
 2205170654 metadata/md5-cache/x11-misc/i3lock-2.13
 2205170654 metadata/md5-cache/x11-misc/i3status-2.13-r1
 2205170654 metadata/md5-cache/x11-misc/i3status-2.14
-2205170654 metadata/md5-cache/x11-misc/i855crt-0.4-r1
-2205170654 metadata/md5-cache/x11-misc/imake-1.0.8
 2205170654 metadata/md5-cache/x11-misc/imwheel-1.0.0_pre13_p20100827
 2205170654 metadata/md5-cache/x11-misc/j4-dmenu-desktop-2.18-r1
 2205170654 metadata/md5-cache/x11-misc/kapow-1.5.10
@@ -61243,7 +61183,6 @@
 2205170654 metadata/md5-cache/x11-misc/xkblayout-state-0_p20180118
 2205170654 metadata/md5-cache/x11-misc/xkblayout-state-9999
 2205170654 metadata/md5-cache/x11-misc/xkbset-0.5_p7_p1
-2205170654 metadata/md5-cache/x11-misc/xkeyboard-config-2.34
 2205170654 metadata/md5-cache/x11-misc/xkeyboard-config-9999
 2205170654 metadata/md5-cache/x11-misc/xkeycaps-2.47_p7
 2205170654 metadata/md5-cache/x11-misc/xlockmore-5.66
@@ -61292,17 +61231,20 @@
 2205222240 metadata/md5-cache/x11-misc/redshift-1.12-r6
 2205221410 metadata/md5-cache/x11-misc/virtualgl-3.0.1
 2205202040 metadata/md5-cache/x11-misc/xmobar-0.37
-2205252110 metadata/md5-cache/x11-misc/compose-tables-1.7.5
 2205251240 metadata/md5-cache/x11-misc/imake-1.0.8-r1
 2205251440 metadata/md5-cache/x11-misc/obconf-qt-0.16.2
 2205251440 metadata/md5-cache/x11-misc/pcmanfm-1.3.2-r1
 2205251440 metadata/md5-cache/x11-misc/pcmanfm-qt-1.1.0
 2205251440 metadata/md5-cache/x11-misc/sddm-0.18.1-r6
 2205241040 metadata/md5-cache/x11-misc/xfe-1.44
-2205252110 metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
 2205260840 metadata/md5-cache/x11-misc/xorg-cf-files-1.0.7-r1
-2205261310 metadata/md5-cache/x11-misc/Manifest.gz
 2205261310 metadata/md5-cache/x11-misc/colord-1.4.6
+2205310640 metadata/md5-cache/x11-misc/Manifest.gz
+2205280440 metadata/md5-cache/x11-misc/alacarte-3.44.1
+2205280440 metadata/md5-cache/x11-misc/compose-tables-1.7.5
+2205290310 metadata/md5-cache/x11-misc/i3lock-2.14
+2205280440 metadata/md5-cache/x11-misc/xkeyboard-config-2.35.1
+2205310640 metadata/md5-cache/x11-misc/xscreensaver-6.04
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 2104120442 metadata/md5-cache/x11-plugins/guifications-2.16
@@ -61521,7 +61463,6 @@
 2205170654 metadata/md5-cache/x11-terms/alacritty-9999
 2205170654 metadata/md5-cache/x11-terms/cool-retro-term-1.1.1-r2
 2205170654 metadata/md5-cache/x11-terms/gnome-terminal-3.42.2
-2205170654 metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
 2205170654 metadata/md5-cache/x11-terms/guake-3.8.5
 2205170654 metadata/md5-cache/x11-terms/kterm-6.2.0-r7
 2205170654 metadata/md5-cache/x11-terms/lilyterm-0.9.9.4-r2
@@ -61545,16 +61486,12 @@
 2205170654 metadata/md5-cache/x11-terms/terminology-1.12.1-r1
 2205170654 metadata/md5-cache/x11-terms/tilda-1.5.2
 2205170654 metadata/md5-cache/x11-terms/tilda-1.5.4
-2205170654 metadata/md5-cache/x11-terms/xterm-367
-2205170654 metadata/md5-cache/x11-terms/xterm-370
-2205170654 metadata/md5-cache/x11-terms/xterm-371
 2205170654 metadata/md5-cache/x11-terms/xterm-372
 2205170654 metadata/md5-cache/x11-terms/yeahconsole-0.3.4-r1
 2205170654 metadata/md5-cache/x11-terms/zutty-0.11
 2205222010 metadata/md5-cache/x11-terms/xfce4-terminal-1.0.4
 2205211240 metadata/md5-cache/x11-terms/zutty-0.12
 2205240040 metadata/md5-cache/x11-terms/terminator-2.1.1-r1
-2205260940 metadata/md5-cache/x11-terms/Manifest.gz
 2205260940 metadata/md5-cache/x11-terms/kitty-0.25.0
 2205260940 metadata/md5-cache/x11-terms/kitty-0.25.1
 2205260940 metadata/md5-cache/x11-terms/kitty-9999
@@ -61562,6 +61499,9 @@
 2205260940 metadata/md5-cache/x11-terms/kitty-shell-integration-0.25.1
 2205260940 metadata/md5-cache/x11-terms/kitty-terminfo-0.25.0
 2205260940 metadata/md5-cache/x11-terms/kitty-terminfo-0.25.1
+2205291840 metadata/md5-cache/x11-terms/Manifest.gz
+2205280910 metadata/md5-cache/x11-terms/gnome-terminal-3.44.0
+2205290440 metadata/md5-cache/x11-terms/gnome-terminal-3.44.1
 2104262239 metadata/md5-cache/x11-themes/blueglass-xcursors-0.4-r1
 2107020739 metadata/md5-cache/x11-themes/comix-xcursors-0.9.2
 2012311940 metadata/md5-cache/x11-themes/commonbox-styles-0.6
@@ -61657,7 +61597,6 @@
 2205170654 metadata/md5-cache/x11-themes/adapta-gtk-theme-3.95.0.11
 2205171110 metadata/md5-cache/x11-themes/adwaita-icon-theme-3.32.0
 2205170654 metadata/md5-cache/x11-themes/adwaita-icon-theme-41.0
-2205170654 metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0
 2205170654 metadata/md5-cache/x11-themes/adwaita-qt-1.3.1
 2205170654 metadata/md5-cache/x11-themes/adwaita-qt-1.4.0
 2205170654 metadata/md5-cache/x11-themes/adwaita-qt-1.4.1
@@ -61673,7 +61612,6 @@
 2205170654 metadata/md5-cache/x11-themes/fvwm-crystal-3.7.1
 2205170654 metadata/md5-cache/x11-themes/fvwm-themes-0.7.0-r1
 2205170654 metadata/md5-cache/x11-themes/gnome-backgrounds-41.0
-2205170654 metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
 2205170654 metadata/md5-cache/x11-themes/gnome-icon-theme-extras-3.12.0
 2205170654 metadata/md5-cache/x11-themes/gnome-icon-theme-symbolic-3.12.0-r1
 2205171210 metadata/md5-cache/x11-themes/gnome-themes-standard-3.28
@@ -61724,8 +61662,12 @@
 2205170654 metadata/md5-cache/x11-themes/xcursor-themes-1.0.6-r1
 2205170654 metadata/md5-cache/x11-themes/xfce-gant-icon-theme-3.9_p6-r1
 2205170654 metadata/md5-cache/x11-themes/zuki-themes-4.0
-2205251440 metadata/md5-cache/x11-themes/Manifest.gz
 2205251440 metadata/md5-cache/x11-themes/lxqt-themes-1.1.0
+2205291410 metadata/md5-cache/x11-themes/Manifest.gz
+2205280910 metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0
+2205291410 metadata/md5-cache/x11-themes/adwaita-icon-theme-42.0_p2
+2205280040 metadata/md5-cache/x11-themes/fluent-icon-theme-2022.02.28
+2205280910 metadata/md5-cache/x11-themes/gnome-backgrounds-42.0
 2101171809 metadata/md5-cache/x11-wm/e16-1.0.22
 2011261339 metadata/md5-cache/x11-wm/oroborus-2.0.20-r1
 2112111740 metadata/md5-cache/x11-wm/e16-1.0.24
@@ -61755,7 +61697,6 @@
 2205170654 metadata/md5-cache/x11-wm/goomwwm-1.0.0-r1
 2205170654 metadata/md5-cache/x11-wm/goomwwm-9999
 2205170654 metadata/md5-cache/x11-wm/herbstluftwm-0.9.3
-2205170654 metadata/md5-cache/x11-wm/herbstluftwm-9999
 2205170654 metadata/md5-cache/x11-wm/i3-4.20.1
 2205170654 metadata/md5-cache/x11-wm/i3-9999
 2205170654 metadata/md5-cache/x11-wm/i3-gaps-4.19.1
@@ -61779,7 +61720,6 @@
 2205170654 metadata/md5-cache/x11-wm/musca-0.9.24_p20100226-r4
 2205170654 metadata/md5-cache/x11-wm/mutter-41.4
 2205170654 metadata/md5-cache/x11-wm/mutter-42.0-r1
-2205192210 metadata/md5-cache/x11-wm/mutter-42.1
 2205170654 metadata/md5-cache/x11-wm/notion-3_p2015061300-r100
 2205170654 metadata/md5-cache/x11-wm/notion-9999
 2205170654 metadata/md5-cache/x11-wm/page-1.9.8
@@ -61799,7 +61739,6 @@
 2205170654 metadata/md5-cache/x11-wm/stumpwm-contrib-99999999
 2205170654 metadata/md5-cache/x11-wm/subtle-0.11.3244-r1
 2205170654 metadata/md5-cache/x11-wm/treewm-0.4.5-r2
-2205170654 metadata/md5-cache/x11-wm/twm-1.0.11
 2205170654 metadata/md5-cache/x11-wm/vtwm-5.4.7-r2
 2205170654 metadata/md5-cache/x11-wm/windowlab-1.40-r1
 2205170654 metadata/md5-cache/x11-wm/windowmaker-9999
@@ -61817,10 +61756,14 @@
 2205251440 metadata/md5-cache/x11-wm/openbox-3.6.1-r3
 2205251440 metadata/md5-cache/x11-wm/openbox-9999
 2205232310 metadata/md5-cache/x11-wm/qtile-0.21.0-r1
-2205252110 metadata/md5-cache/x11-wm/twm-1.0.12
-2205270140 metadata/md5-cache/x11-wm/Manifest.gz
 2205270140 metadata/md5-cache/x11-wm/xpra-4.3.3
 2205270140 metadata/md5-cache/x11-wm/xpra-9999
+2205301040 metadata/md5-cache/x11-wm/Manifest.gz
+2205301040 metadata/md5-cache/x11-wm/herbstluftwm-0.9.4
+2205301040 metadata/md5-cache/x11-wm/herbstluftwm-9999
+2205280910 metadata/md5-cache/x11-wm/mutter-42.1
+2205291810 metadata/md5-cache/x11-wm/mutter-42.2
+2205280440 metadata/md5-cache/x11-wm/twm-1.0.12
 2107251109 metadata/md5-cache/xfce-base/xfce4-meta-4.16-r2
 2203240726 metadata/md5-cache/xfce-base/exo-4.17.1
 2203240726 metadata/md5-cache/xfce-base/garcon-0.8.0
@@ -61928,7 +61871,6 @@
 2205150610 metadata/md5-cache/app-containers/img-0.5.11
 2205160310 metadata/md5-cache/app-containers/k3d-5.4.0
 2205170654 metadata/md5-cache/app-containers/apptainer-1.0.1
-2205170654 metadata/md5-cache/app-containers/apptainer-1.0.2
 2205170654 metadata/md5-cache/app-containers/buildah-1.25.1
 2205170654 metadata/md5-cache/app-containers/buildah-1.26.1
 2205170654 metadata/md5-cache/app-containers/conmon-2.0.30
@@ -61979,8 +61921,10 @@
 2205170654 metadata/md5-cache/app-containers/slirp4netns-1.2.0
 2205221140 metadata/md5-cache/app-containers/lxd-4.0.9-r3
 2205230010 metadata/md5-cache/app-containers/snapd-2.56
-2205232240 metadata/md5-cache/app-containers/Manifest.gz
 2205232240 metadata/md5-cache/app-containers/cadvisor-0.36.0
+2205300140 metadata/md5-cache/app-containers/Manifest.gz
+2205300140 metadata/md5-cache/app-containers/apptainer-1.0.2
+2205282040 metadata/md5-cache/app-containers/cri-tools-1.24.2
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-adamspiers-20210426
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-alexbarton-20210416
 2204291439 metadata/md5-cache/sec-keys/openpgp-keys-antoniodiazdiaz-20220406
@@ -62070,4 +62014,4 @@
 2205210240 metadata/md5-cache/sec-keys/openpgp-keys-vinaysajip-20220520
 2205251110 metadata/md5-cache/sec-keys/Manifest.gz
 2205251110 metadata/md5-cache/sec-keys/openpgp-keys-kamildudka-20220525
-2205271240 metadata/md5-cache/Manifest.gz
+2205310910 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9d7e6c438864..fc702bc241b4 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 27 May 2022 10:00:01 +0000
+Tue, 31 May 2022 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 7e9a61f5fffe..52f0142fcc28 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-190662ffa669c9d24e080bba3c6010f05aa90db1 1653644012 2022-05-27T09:33:32+00:00
+73877d2f675de518163431140eab75d059f6958a 1653976509 2022-05-31T05:55:09+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index b9502ede8237..945b7dc0852a 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1653644401 Fri 27 May 2022 09:40:01 AM UTC
+1653977401 Tue 31 May 2022 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 851d9aa7aaf8..2da4527f3341 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 27 May 2022 09:39:50 +0000
+Tue, 31 May 2022 06:09:30 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d0cc7dac6e6e..a5ead21dfc8c 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index f44b92f304b7..50956b4b65b6 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -1,5 +1,5 @@
 AUX macchanger-1.7.0-fix-caddr_t.patch 352 BLAKE2B 915bfe65108678b61c75fcf46338be1f05c2cbc482005e2bca917609d66a681e5ab36ad30fe6313395d090c96aca2a091ef60b22b0d2c25c0f975d99cae39ccd SHA512 493eaf79e658a23e55e17b95b63b457032eff8c73bf309df7605400ceb2dcd4331a83c2b8383bd04d564478fb50654ebbe9506d65946f960d2964b2b4e32f620
 DIST macchanger-1.7.0.tar.gz 396848 BLAKE2B 7a6e5cbf302568884363ab4023033b53b1adc16896d7f88b1717f72b1b2a4d6d2dbfa2259a5c4aaa38d72201c5624a648077730cbc25f869f5f50a343bb93d0c SHA512 69f2008ace6ff8223ecf25805c08ddf42add9ed16c65f3bb57f74b8b0d080d584381ce79592d2ef581a9ba73f12624dae8db63dbb12e4875dfd29d828a4a5da3
 DIST macchanger_1.7.0-5.4.debian.tar.xz 25084 BLAKE2B 65d39333e07a4c89da7e622aaccc0f2cab45af8d84721c3d39c457dfaf3063df872812d07860cbe78634159b0a2944e75aa54c11f46eadc37b9d4a23fc81b629 SHA512 b50b52532fc987f443088f2a4d0f2327dac972e69bc4c0bc0a94de4583df76c7d32c40a143d24b7fa6e066fc36b89c4b160c02b26860c484aab5054a4032f0cc
-EBUILD macchanger-1.7.0_p5_p4.ebuild 1316 BLAKE2B 8fe7a2a3efcd35b4acfcde041b5a148a0a56038a48edf3dc2205de8fadaeca17f588713c75e2470bb61ee99a5e665917e912a5297e0e5e7d67c563c14ee46841 SHA512 9b071279080331609b19e244d39651d96791c2bf06ac4f27adad4eb62481877c2a17bd44e3885341821cca500625ac7dde00036ba9f3322e9f67bb21189e7ebe
+EBUILD macchanger-1.7.0_p5_p4.ebuild 1323 BLAKE2B 2de4bd6a56f679801cfe680b878b3b93baa1f152fb23338151a2cd26cf4464a6041dc2b396f87bfb6c374aac03280ed627498defe8b96b4f39398efdbbead620 SHA512 581e4a33a0162b46d8586cb694a818be8574ee264a59bacc7040546088237522fa743621dd0fdcea190a5e512b1e74d96216213e44b252804fe21a89d8267923
 MISC metadata.xml 474 BLAKE2B bf5ebf9af4669a711eab0193a1cbe1b337fd741d4390e150ee2e2755fb668c12d867e5912b357deef123f86a7602ce19380c0247e9fe60d0a55fc4443a466714 SHA512 9f13d45129605873c87b98c577a2afe9d172d7fd2c808b6363702e05ddb3bc1f5ef488a2d8adf1da00c913e07c6e25a1e1315e458b96d4f760658c585c3cedcc
diff --git a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
index 93a8476bcb30..58e44aa4c97e 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.0_p5_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="
 	mirror://debian/pool/main/m/${PN}/${PN}_${PV/_p*}-$(ver_cut 5).$(ver_cut 7).debian.tar.xz
 "
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 ppc sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ~riscv sparc x86"
 SLOT="0"
 
 PATCHES=(
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index fd74f43533fc..473e1f6dcd11 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,13 +1,8 @@
-AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0
 AUX rrdcached.confd-r1 425 BLAKE2B bd5bd8789f07803304d53aed0ed80685b7b42d9b7d9067d9980564a4b485c4ae474ca88298ea72154945941de00ba6ccea71ae5f3b4fe3be14583fe3e7d4da52 SHA512 d22503eebf3a89fc5e14124716058efef2b78409995a9814cb72e8ab9b9172a89bab5bc0c1f796a1d735d41f20c9c0b8009539da9f9bb96554d71984a64adb72
-AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88
 AUX rrdcached.init-r1 799 BLAKE2B 2b276a75e1d910fc7931758710507490f1d41398555426d160d0985fa326431018cfaa4ad1f0d54524e8b56e531f4867308fd078d499aa717011f6fe133a46c6 SHA512 789fd4d6e50169e34a1d4d04c9d36ce6a913a6ae0a633e07cbec3a7936ca6b47910b0e8002b8a346824ba5fff048f700e72f819f803b9aa1f18634e85127f66f
 AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c
-AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-1.7.2-r100.ebuild 5767 BLAKE2B 7568e91cfaa2295ab8ac44736185605626cfb3fd000a3a009f45e6fdfe9011d6c49080d33b4a69717f3d2244ffd53edd1bab6bf889b65d5b437aa4072a591fbc SHA512 817cfe3581b506eac6f4a62441a32d0b7a218cb258e004af2283b23318c43d60d2fa1bdef1aad7968ec51973494209389b436b52a6e3090e37ca3990bf3ef6c6
-EBUILD rrdtool-1.8.0.ebuild 5446 BLAKE2B f74dfd05178853e37ac3fb10f8d14959538db8ff214edfc0af20a5b44bb27551245558afdc791997eac392391e4eb517f3840ad65e6b0260ec4410743e9bcec0 SHA512 a8e815bb3edf42792c286db2aaa759ed075c0c482430e056185456c1d42a178a76746cdd2251361376fdff76c4bb6803177daa69facf2583c02b061faba18a1b
+EBUILD rrdtool-1.8.0.ebuild 5445 BLAKE2B a9759f7ab31b351d7949c0498732c5860fc45514b0b2a786026037bdeab397b837e456578cbfa9b1d07a3d09211d14cd8b179aab7a3bfbd457ff1d42256eafcd SHA512 540f71cf177fe908776686a3cfbf6776d93768140a7353069003fc4ee35eab19a294afbc31c53214da34b4b9ea8a61efa5bca696ae2e96cc2e73e60683e726bb
 MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
deleted file mode 100644
index 0463a7923461..000000000000
--- a/net-analyzer/rrdtool/files/rrdcached.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F  -b /var/lib/rrdcached/db/ -B"
-
-USER=""
-GROUP=""
-
-MODE=""
-
-MAXWAIT=30
diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
deleted file mode 100644
index 51c2cbb6e818..000000000000
--- a/net-analyzer/rrdtool/files/rrdcached.init
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/rrdcached"
-command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
-start_stop_daemon_args="--quiet"
-description="RRDtool data caching daemon"
-
-depend() {
-	need localmount net
-	use logger
-}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
deleted file mode 100644
index 0c645548a202..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
-   DS:temp:GAUGE:600:-273:5000 \
-   RRA:AVERAGE:0.5:1:1200 \
-   RRA:MIN:0.5:12:2400 \
-   RRA:MAX:0.5:12:2400 \
-   RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
deleted file mode 100644
index 0c1a88cad569..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools lua perl-module distutils-r1 flag-o-matic
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	lua? (
-		${LUA_REQUIRED_USE}
-		test? ( graph )
-	)
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( ${LUA_DEPS} )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	rados? ( sys-cluster/ceph )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-	python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
-	test? (
-		sys-devel/bc
-		lua? ( ${LUA_DEPS} )
-	)
-"
-
-PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
-	"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
-	"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	if ! [[ -f doc/rrdrados.pod ]] ; then
-		cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
-	else
-		die "File already exists: doc/rrdrados.pod. Remove this code!"
-	fi
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	if ! use graph ; then
-		sed -i \
-			-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-			-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
-			-e 's|graph1||g' \
-			tests/Makefile.am || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	export rd_cv_gcc_flag__Werror=no
-	export rd_cv_ms_async=ok
-
-	filter-flags -ffast-math
-
-	export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd ; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi ; then
-		myconf+=( "--disable-libdbi" )
-	fi
-	if ! use rados ; then
-		myconf+=( "--disable-librados" )
-	fi
-
-	# We will handle Lua bindings ourselves, upstream is not multi-impl-ready
-	# and their Lua-detection logic depends on having the right version of the Lua
-	# interpreter available at build time.
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-lua \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
-	# We do need the cmod-dir path here, otherwise libtool complains.
-	# Use the real one (i.e. not within ${ED}) just in case.
-	emake \
-		LUA_CFLAGS=$(lua_get_CFLAGS) \
-		LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
-
-	popd
-}
-
-src_compile() {
-	default
-
-	if use lua; then
-		# Only copy sources now so that we do not trigger librrd compilation
-		# multiple times.
-		lua_copy_sources
-
-		lua_foreach_impl lua_src_compile
-	fi
-
-	use python && distutils-r1_src_compile
-}
-
-lua_src_test() {
-	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
-	LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
-
-	popd || die
-}
-
-src_test() {
-	export LC_ALL=C
-
-	default
-	if use lua ; then
-		lua_foreach_impl lua_src_test
-	fi
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
-
-	# This time we must prefix the cmod-dir path with ${ED} so that make
-	# does not try to violate the sandbox.
-	emake \
-		LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
-		install
-
-	popd || die
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
-	fi
-
-	if use lua ; then
-		lua_foreach_impl lua_src_install
-	fi
-
-	if ! use rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
-
-	find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
index 2cd8ee5e9e1e..ad96cbb55058 100644
--- a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0/8.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test"
 
 RESTRICT="!test? ( test )"
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index 938ff3d1e5fd..63c708d9b514 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,3 +1,5 @@
 DIST ssldump-1.4.tar.gz 129184 BLAKE2B db27f94deaa8b1f0e656d22e645db349bba872d8404a1d8a82098c3a2dd4c6d4b12bb3d430094825219a66bd203736cc27766967d3ce0923bd5fdd64a452d6cd SHA512 fb17c5610dcfce3e8020a5148d37be5b2fbc3083d78727281922ae32b5905c4aa882cd368c3581238f3492c6b5bab943dcff6a966d64160a3836d6a95bdc7682
+DIST ssldump-1.5.tar.gz 129388 BLAKE2B 9877bf604690911a3680cf4edfe0115a8a8e2ddf14abc260a99fdcc181bd727c5f3bfb0aa8864f502ff560ccab76e27a22266a3ed78eb516f019ed7cb44bef69 SHA512 4eb84744591539fdaf9b2454d23c917f5e97cb2e5f03e0c38393327caecc72dfc77ee7b734519b1f224a5e3a132185b8fccfeb9186fc9f1b586444fc748a3814
 EBUILD ssldump-1.4.ebuild 661 BLAKE2B c029ae3caf669efae13cebc005ac4de8cedaaedf6ed584cbd2b057a21c6b01e8ce7913f73007bd4223cd8b4dc9a5b84dffa04734fe2b0e7872ee30bc40fbee77 SHA512 cd906cc11d80bbf8ce11bedc09533f11f50f5fb6a7792861b89361635e04bff241c6353b14a3b13e03165b320004c0b4b6c15ceeaedd22514ba84292c7f4bafe
-MISC metadata.xml 360 BLAKE2B d246d62eaedf9defe0f50d890bd99bbb059c4cd843ba22538d678fbc3f1b0a8faa101cf9d8e90fcac0512f74108aa2a23dd46d1d2f197975c3c855b4b85dddd7 SHA512 9bb788583c0c13750a82c3214d0110d9e719cd5802438b9dbd475c273ca9cc9f4df7d7297014e4233bb84034092f85d77414d49881cc1566a1376e74c13af8aa
+EBUILD ssldump-1.5.ebuild 658 BLAKE2B 9fce9279cfc71c6348fa7a54f1209ecb6c688bd1edb0ff8733ec9b6aaa9c4f8ca6d2d537e158eeeb88117eabb187aeb2354bf49de2e9e231b659896cc25072ca SHA512 6c4591f93a2489c79df1268ca1b85811e2d95446294495898d7792a8a9a8f36dfd12ffa0d9aa70b227bc05e8f737bbb96106e2cbc087293ecfc46cfd3439e69f
+MISC metadata.xml 281 BLAKE2B 7e0e1c117646c2893f34d5ed50df583ba6450b0e9ed93eaeb7c689e0d73116233ad242160215fcb7261551f1c8475101b9ea5e605445d2c57d91dd8b8f0b972a SHA512 7208366ad23bf46ff28d5b9ebbe42c626cd6f04c6edb09cd2047a0100ad82ff174667835f3933dca94e44a8137b8b0af53aef684cbb38d244cee95275691226d
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 9e5143ab8627..d5af4bcfaf13 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/metadata.xml
@@ -5,7 +5,4 @@
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">downloads</remote-id>
-	</upstream>
 </pkgmetadata>
diff --git a/net-analyzer/ssldump/ssldump-1.5.ebuild b/net-analyzer/ssldump/ssldump-1.5.ebuild
new file mode 100644
index 000000000000..3935218c47f9
--- /dev/null
+++ b/net-analyzer/ssldump/ssldump-1.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="An SSLv3/TLS network protocol analyzer"
+HOMEPAGE="https://github.com/adulau/ssldump/"
+SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="dev-libs/json-c:=
+	 dev-libs/openssl:=
+	net-libs/libnet:1.1
+	net-libs/libpcap"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	dosbin ssldump
+	doman ssldump.1
+	dodoc ChangeLog CREDITS README README.md
+}
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 2b12a07b4b79..e6e8ac547fc4 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/bind-tools/Manifest b/net-dns/bind-tools/Manifest
index 2bc1a4091f7e..741a5b7c5063 100644
--- a/net-dns/bind-tools/Manifest
+++ b/net-dns/bind-tools/Manifest
@@ -4,10 +4,12 @@ DIST bind-9.16.21.tar.xz 5057816 BLAKE2B bc7de285b45084a4904aee7c5c3042c7a207596
 DIST bind-9.16.22.tar.xz 5059000 BLAKE2B c4853a8be268f9666f3677adf2e64c6d74f7df44d2dc05df544cead38c6c3b86489d25a66ccea6ce8ca89fa525a1848fe93a8aaa6bb1ee090aa189bf6aad40f3 SHA512 586fb4d5a656d6539033dcdfdd230b36465a2d2e6ada651c1f1548d062a9050e7a962af87e2a56931fe24c65586d29012d4a041dcddbb28f42b4d01fe291d9d1
 DIST bind-9.16.25.tar.xz 5086780 BLAKE2B cb62d0d4e25f508f1a77fae6a11ff144d2436346c45a936d572df4c843cd72ec81cffacd0a81dcb74eb73b8bca7d0762a5746baadda36f260b79b72eade24d18 SHA512 e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62
 DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
+DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
 EBUILD bind-tools-9.16.15.ebuild 3404 BLAKE2B 366a20661af50d30017201916c796e8ffda13d6621909e2df2e28e5834623699c5e27d7b3e12f603b2b9eeb5ac5b38e06f67b5c1750a57dfb3b2f645795b3097 SHA512 53cdf632ed2c18e4f39692d35c5d51fff1d1c944d576365f287a5f0176c24df090430342f601efbf59301faa6a7f512f69e112fef481d3cf70ac6addff5f3631
 EBUILD bind-tools-9.16.18.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
 EBUILD bind-tools-9.16.21.ebuild 3411 BLAKE2B 807ef0b010a90ac23c7df0303d1ca6a9013854b2646d9724f07421e749e3a89c1a7934df46a5f339095950fe382f84548f0b964e7d850f9c9edab17f31fa35d8 SHA512 7efea06b5792ed8a61b8f9eed76fa1dbd9ed308831ef2c235a7a7ded2cc549330159d2455396329ed4b25cacfb5574939e5c1f16df527e696130ce1d62b8dba9
 EBUILD bind-tools-9.16.22.ebuild 3423 BLAKE2B a281882b59088e033cf90c97882778b6e680dea00e9801c09e37c6fd01ee699a56ecc1efbc2a9eb1e035cf0fb0f5703b63e7fe95289c52f63f85fe4511a4f0b4 SHA512 06dec8bd8fd6595be35eb1cd45030a93f83fcffc2eb3461870c9b8e6fa21f0dd4fc8062d7302f9d23e3ca38515faa6a801bcabd988f0585021d6eaafaedd2185
 EBUILD bind-tools-9.16.25.ebuild 3430 BLAKE2B 9ada7340be99524687fa0d1d3370b628f6d1f5c693eef48b1244ff2ee73032f638fdbcd425aa70287b392f6fb90f2eedb40d0d23d779089613347fc1d5fba436 SHA512 a3f44254adeea24d7940d0533356ae1c84529681e2c5a114d9c6235c29b8126860d6f8ff749e20a4524787f4f6c3f5e629367eb84420285da24c662a0a83d73b
 EBUILD bind-tools-9.16.27.ebuild 3620 BLAKE2B 43fe2108014829574d1e4d4d88b80237690d26592f61b859d38dda0fe4212da02e5b6959cde406aa9b9a42b253512f56d9b4de36f23ed5dc4207c849766853d4 SHA512 b94d4fb99a74d7c55852102bf07113c5ba4b8646db505eda7c0acc94887a3b1390b0c9dc4c9f3f7e3ba9982c815f58867ce2af38e20ab20669f46e69768a8136
+EBUILD bind-tools-9.16.29.ebuild 3627 BLAKE2B 9964f625d984cbf271221cfdfe7f18ef02bc2df9eed8f65758d3df1915c4ea02d1942842002752ce03f73ef462064422b37022445db5d68734d303b0b3d9999d SHA512 a115230d78e0def5f885de8e742d841a1f466eb1776deb79acd14e55c273ca4d1c046d03f181d147f3c3e758ddf6ad6b813709a838f6e6ce1d8401ea7999ab68
 MISC metadata.xml 424 BLAKE2B cb17be35f118db8adb22f75f4b52fce963eb58b7c502cb090fb8ca7a269820e85f77aaa63a880b42f319482000ef43fff82f77c61ed68cb4e21180c2bae66db6 SHA512 a39b3205586616deb59191c2b9d3251cc424e3184f0ff98b0db3251732d96b45d8e6c37e59116917ee17c51b37a048457031b3504329472f0033e360fbd56b1a
diff --git a/net-dns/bind-tools/bind-tools-9.16.29.ebuild b/net-dns/bind-tools/bind-tools-9.16.29.ebuild
new file mode 100644
index 000000000000..ff87925c2430
--- /dev/null
+++ b/net-dns/bind-tools/bind-tools-9.16.29.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_PN=${PN//-tools}
+MY_PV=${PV/_p/-P}
+MY_PV=${MY_PV/_rc/rc}
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="bind tools: dig, nslookup, host, nsupdate, dnssec-keygen"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${MY_P}.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+caps doc gssapi idn ipv6 libedit readline xml"
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+COMMON_DEPEND="
+	dev-libs/libuv:=
+	caps? ( sys-libs/libcap )
+	dev-libs/openssl:=
+	xml? ( dev-libs/libxml2 )
+	idn? ( net-dns/libidn2:= )
+	gssapi? ( virtual/krb5 )
+	libedit? ( dev-libs/libedit )
+	!libedit? (
+		readline? ( sys-libs/readline:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+# sphinx required for man-page and html creation
+BDEPEND="
+	doc? ( dev-python/sphinx )
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# bug 479092, requires networking
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	export LDFLAGS="${LDFLAGS} -L${EPREFIX}/usr/$(get_libdir)"
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# Do not disable thread local storage on Solaris, it works with our
+	# toolchain, and it breaks further configure checks
+	sed -i -e '/LDFLAGS=/s/-zrelax=transtls//' configure.ac configure || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}"/var
+		--without-python
+		--without-libjson
+		--without-zlib
+		--without-lmdb
+		--without-maxminddb
+		--disable-geoip
+		--with-openssl="${ESYSROOT}"/usr
+		$(use_with idn libidn2 "${ESYSROOT}"/usr)
+		$(use_with xml libxml2)
+		$(use_with gssapi)
+		$(use_with readline)
+		$(use_enable caps linux-caps)
+		AR="$(type -P $(tc-getAR))"
+	)
+
+	# bug 607400
+	if use libedit ; then
+		myeconfargs+=( --with-readline=-ledit )
+	elif use readline ; then
+		myeconfargs+=( --with-readline=-lreadline )
+	else
+		myeconfargs+=( --without-readline )
+	fi
+
+	# bug 344029
+	append-cflags "-DDIG_SIGCHASE"
+
+	# to expose CMSG_* macros from sys/sockets.h
+	[[ ${CHOST} == *-solaris* ]] && append-cflags "-D_XOPEN_SOURCE=600"
+
+	# localstatedir for nsupdate -l, bug 395785
+	tc-export BUILD_CC
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+src_compile() {
+	local AR=$(tc-getAR)
+
+	emake AR="${AR}" -C lib/
+	emake AR="${AR}" -C bin/delv/
+	emake AR="${AR}" -C bin/dig/
+	emake AR="${AR}" -C bin/nsupdate/
+	emake AR="${AR}" -C bin/dnssec/
+	emake -C doc/man/ man $(usev doc)
+}
+
+src_install() {
+	local man_dir="${S}/doc/man"
+	local html_dir="${man_dir}/_build/html"
+
+	dodoc README CHANGES
+
+	cd "${S}"/bin/delv || die
+	dobin delv
+	doman ${man_dir}/delv.1
+
+	cd "${S}"/bin/dig || die
+	dobin dig host nslookup
+	doman ${man_dir}/{dig,host,nslookup}.1
+
+	cd "${S}"/bin/nsupdate || die
+	dobin nsupdate
+	doman ${man_dir}/nsupdate.1
+	if use doc; then
+		docinto html
+		dodoc ${html_dir}/nsupdate.html
+	fi
+
+	cd "${S}"/bin/dnssec || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+		revoke settime signzone verify; do
+		dobin dnssec-"${tool}"
+		doman ${man_dir}/dnssec-"${tool}".8
+		if use doc; then
+			docinto html
+			dodoc ${html_dir}/dnssec-"${tool}".html
+		fi
+	done
+}
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 2f2ef00b0216..bee260412d7d 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -9,6 +9,8 @@ AUX named.confd-r7 1364 BLAKE2B cfb72f221bc6657c5a8ef8b9cd804afeaf5f642d2046880f
 AUX named.init-r14 6167 BLAKE2B 7c3deb3492a50d2655814f9fb492706b671e08ccdc406be0fe9ef5e55de19f2e1ee3abe2c0f9fbff0a958ce751361c5faa690970d31a935aa2854a765a224c03 SHA512 65c65f261b950559487a6ac1d589cc51e6a4800aa9801c84aeb18083b7f587ff0ca6ce9e2994b1c58586d96a9181c05ca47ffef93fa210ffc53f4e9af21f4d1b
 AUX named.service-r1 327 BLAKE2B b0471100b425a1d4db29c1ef577dd6f14b2c3d040fd826bed03105f514bf1ea2c58c19d59557d0eafe27a96588adaf60156f31b6befdd9be96a8ca1fe8613678 SHA512 1d3dbf9d1de0c23c398a523b05c0fb266b6b699e54d232818b28205f697ca227acae9f2778d6f41309b117a6cd78eee170b745594b786b1c1571d5f66d6c3de4
 DIST bind-9.16.27.tar.xz 5084340 BLAKE2B 37b49ce81aa5122493a4feb2bb7be53c5d46ff2ce28456aec31ce1332520a09c10bb2293c736bffe7badbc2bc3d156c05f83367678bd101e17b99ca3ff69bebf SHA512 5c71f228db83aa8cc9e65466d6e5afca4a9f80c693358111a003fe09e1a14522175eb2b6a0f11e2a2cd4fdba01f2ae315de52e394a441b3861ca2a011e02af62
+DIST bind-9.16.29.tar.xz 5088348 BLAKE2B 17ee1443926327c30f1d5820110b01a193c53eb24e23385b713217a4e49d9c2b5ddb6e1c49cb80d2c9083c71ce7872a26fe3597209f2e3215e6cc7e930e68004 SHA512 b4acbafed370438ac53e73468ccb5ea5745a1c8f764dd96f9c9a027594a3b7ce0d486e7f01138b39795b456265e0e6116cd76e44f5a3329687cd718550ca79fb
 DIST dyndns-samples.tbz2 22866 BLAKE2B 409890653c6536cb9c0e3ba809d2bfde0e0ae73a2a101b4f229b46c01568466bc022bbbc37712171adbd08c572733e93630feab95a0fcd1ac50a7d37da1d1108 SHA512 83b0bf99f8e9ff709e8e9336d8c5231b98a4b5f0c60c10792f34931e32cc638d261967dfa5a83151ec3740977d94ddd6e21e9ce91267b3e279b88affdbc18cac
 EBUILD bind-9.16.27-r1.ebuild 11074 BLAKE2B 282aec1d9c3a12071c43af886b510ef60c28709f724a4c783b0c5ff03df3c9cdb7b9da19f161809b1f8b9fc75b608bf3bfe869cd3aca53b818f8cb418bf42685 SHA512 ee511e1132f571facebeb4b1c789492a6a5bc742ce2cb5dc87dcc245c94f0cf30ebe93a4139b70b6ec90198e26861d4f4865cb479ef84f6d90c0abb5f7eacd72
+EBUILD bind-9.16.29.ebuild 11080 BLAKE2B 52373acbad864b16fef7f13313c22a43de2f78d9dbb46ec1a9f6bdc28be01f7374dfc85964354ad19b9ed235a5dd46f55812d8e374260790e1e15d860c6822a1 SHA512 c65e350627f81caa87f1cddfa27feab221ae3726e49286d75db5f26fd3222bfb1d7225470a7a49862476edc04ddd9afb4bbfd9bade9121e60253a9cb7b71f7de
 MISC metadata.xml 974 BLAKE2B a2d3d119e1632c8c5565f0bdedd807c7eaab97f721c34e585ed19483db9b9e25ef364d1950d416acf1c7342cef8d763357c3a4e464b0704013e4a4b66788e6c7 SHA512 0255ae6a504d4f36fb7fe8b14b25328810bc500f610b4dcdb04a79d34a3dcb0ea8eb0a2298c1f69679d8679d89125cb34fc46be2897dbcb408827d718a9eb9d1
diff --git a/net-dns/bind/bind-9.16.29.ebuild b/net-dns/bind/bind-9.16.29.ebuild
new file mode 100644
index 000000000000..fce1301fbdf3
--- /dev/null
+++ b/net-dns/bind/bind-9.16.29.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Re dlz/mysql and threads, needs to be verified..
+# MySQL uses thread local storage in its C api. Thus MySQL
+# requires that each thread of an application execute a MySQL
+# thread initialization to setup the thread local storage.
+# This is impossible to do safely while staying within the DLZ
+# driver API. This is a limitation caused by MySQL, and not the DLZ API.
+# Because of this BIND MUST only run with a single thread when
+# using the MySQL driver.
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit python-r1 autotools toolchain-funcs flag-o-matic db-use systemd tmpfiles
+
+MY_PV="${PV/_p/-P}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SDB_LDAP_VER="1.1.0-fc14"
+
+RRL_PV="${MY_PV}"
+
+# SDB-LDAP: http://bind9-ldap.bayour.com/
+
+DESCRIPTION="Berkeley Internet Name Domain - Name Server"
+HOMEPAGE="https://www.isc.org/software/bind"
+SRC_URI="https://downloads.isc.org/isc/bind9/${PV}/${P}.tar.xz
+	doc? ( mirror://gentoo/dyndns-samples.tbz2 )"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+# -berkdb by default re bug 602682
+IUSE="berkdb +caps +dlz dnstap doc dnsrps fixed-rrset geoip geoip2 gssapi
+json ldap lmdb mysql odbc postgres python selinux static-libs xml +zlib"
+# sdb-ldap - patch broken
+# no PKCS11 currently as it requires OpenSSL to be patched, also see bug 409687
+
+# Upstream dropped the old geoip library, but the BIND configuration for using
+# GeoIP remained the same.
+REQUIRED_USE="
+	postgres? ( dlz )
+	berkdb? ( dlz )
+	mysql? ( dlz )
+	odbc? ( dlz )
+	ldap? ( dlz )
+	dnsrps? ( dlz )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+DEPEND="
+	acct-group/named
+	acct-user/named
+	berkdb? ( sys-libs/db:= )
+	dev-libs/openssl:=[-bindist(-)]
+	mysql? ( dev-db/mysql-connector-c:0= )
+	odbc? ( >=dev-db/unixODBC-2.2.6 )
+	ldap? ( net-nds/openldap:= )
+	postgres? ( dev-db/postgresql:= )
+	caps? ( >=sys-libs/libcap-2.1.0 )
+	xml? ( dev-libs/libxml2 )
+	geoip? ( dev-libs/libmaxminddb:= )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	gssapi? ( virtual/krb5 )
+	json? ( dev-libs/json-c:= )
+	lmdb? ( dev-db/lmdb:= )
+	zlib? ( sys-libs/zlib )
+	dnstap? ( dev-libs/fstrm dev-libs/protobuf-c:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/ply[${PYTHON_USEDEP}]
+	)
+	dev-libs/libuv:=
+"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-bind )
+	sys-process/psmisc"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/ldap-library-path-on-multilib-machines.patch"
+)
+
+# bug 479092, requires networking
+# bug 710840, cmocka fails LDFLAGS='-Wl,-O1'
+#RESTRICT="test"
+
+src_prepare() {
+	default
+
+	# should be installed by bind-tools
+	sed -i -r -e "s:(nsupdate|dig|delv) ::g" bin/Makefile.in || die
+
+	# Disable tests for now, bug 406399
+	sed -i '/^SUBDIRS/s:tests::' bin/Makefile.in lib/Makefile.in || die
+
+	# bug #220361
+	rm aclocal.m4 || die
+	rm -rf libtool.m4/ || die
+	eautoreconf
+
+	use python && python_copy_sources
+}
+
+src_configure() {
+	bind_configure --without-python
+	use python && python_foreach_impl python_configure
+}
+
+bind_configure() {
+	local myeconfargs=(
+		AR="$(type -P $(tc-getAR))"
+		--prefix="${EPREFIX}"/usr
+		--sysconfdir=/etc/bind
+		--localstatedir=/var
+		--with-libtool
+		--enable-full-report
+		--without-readline
+		--with-openssl="${ESYSROOT}"/usr
+		--without-cmocka
+		# Removed in 9.17, drags in libunwind dependency too
+		--disable-backtrace
+		$(use_enable caps linux-caps)
+		$(use_enable dnsrps)
+		$(use_enable dnstap)
+		$(use_enable fixed-rrset)
+		# $(use_enable static-libs static)
+		$(use_with berkdb dlz-bdb "${ESYSROOT}"/usr)
+		$(use_with dlz dlopen)
+		$(use_with dlz dlz-filesystem)
+		$(use_with dlz dlz-stub)
+		$(use_with gssapi)
+		$(use_with json json-c)
+		$(use_with ldap dlz-ldap)
+		$(use_with mysql dlz-mysql)
+		$(use_with odbc dlz-odbc)
+		$(use_with postgres dlz-postgres)
+		$(use_with lmdb)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+		"${@}"
+	)
+	# This is for users to start to migrate back to USE=geoip, rather than
+	# USE=geoip2
+	if use geoip ; then
+		myeconfargs+=( $(use_with geoip maxminddb) --enable-geoip )
+	elif use geoip2 ; then
+		# Added 2020/09/30
+		# Remove USE=geoip2 support after 2020/03/01
+		ewarn "USE=geoip2 is deprecated; update your USE flags!"
+		myeconfargs+=( $(use_with geoip2 maxminddb) --enable-geoip )
+	else
+		myeconfargs+=( --without-maxminddb --disable-geoip )
+	fi
+
+	# bug #158664
+#	gcc-specs-ssp && replace-flags -O[23s] -O
+
+	# To include db.h from proper path
+	use berkdb && append-flags "-I$(db_includedir)"
+
+	export BUILD_CC=$(tc-getBUILD_CC)
+	econf "${myeconfargs[@]}"
+
+	# bug #151839
+	echo '#undef SO_BSDCOMPAT' >> config.h
+}
+
+python_configure() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+	bind_configure --with-python
+	popd >/dev/null || die
+}
+
+src_compile() {
+	default
+	use python && python_foreach_impl python_compile
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake
+	popd >/dev/null || die
+}
+
+src_install() {
+	default
+
+	dodoc CHANGES README
+
+	if use doc; then
+		docinto misc
+		dodoc -r doc/misc/
+
+		# might a 'html' useflag make sense?
+		docinto html
+		dodoc -r doc/arm/
+
+		docinto contrib
+		dodoc contrib/scripts/{nanny.pl,named-bootconf.sh}
+
+		# some handy-dandy dynamic dns examples
+		pushd "${ED}"/usr/share/doc/${PF} 1>/dev/null || die
+		tar xf "${DISTDIR}"/dyndns-samples.tbz2 || die
+		popd 1>/dev/null || die
+	fi
+
+	insinto /etc/bind
+	newins "${FILESDIR}"/named.conf-r8 named.conf
+
+	# ftp://ftp.rs.internic.net/domain/named.cache:
+	insinto /var/bind
+	newins "${FILESDIR}"/named.cache-r3 named.cache
+
+	insinto /var/bind/pri
+	newins "${FILESDIR}"/localhost.zone-r3 localhost.zone
+
+	newinitd "${FILESDIR}"/named.init-r14 named
+	newconfd "${FILESDIR}"/named.confd-r7 named
+
+	newenvd "${FILESDIR}"/10bind.env 10bind
+
+	# Let's get rid of those tools and their manpages since they're provided by bind-tools
+	rm -f "${ED}"/usr/share/man/man1/{dig,host,nslookup,delv,nsupdate}.1* || die
+	rm -f "${ED}"/usr/share/man/man8/nsupdate.8* || die
+	rm -f "${ED}"/usr/bin/{dig,host,nslookup,nsupdate} || die
+	rm -f "${ED}"/usr/sbin/{dig,host,nslookup,nsupdate} || die
+	for tool in dsfromkey importkey keyfromlabel keygen \
+	revoke settime signzone verify; do
+		rm -f "${ED}"/usr/{,s}bin/dnssec-"${tool}" || die
+		rm -f "${ED}"/usr/share/man/man8/dnssec-"${tool}".8* || die
+	done
+
+	# bug 405251, library archives aren't properly handled by --enable/disable-static
+	if ! use static-libs; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	# bug 405251
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	use python && python_foreach_impl python_install
+
+	# bug 450406
+	dosym named.cache /var/bind/root.cache
+
+	dosym ../../var/bind/pri /etc/bind/pri
+	dosym ../../var/bind/sec /etc/bind/sec
+	dosym ../../var/bind/dyn /etc/bind/dyn
+	keepdir /var/bind/{pri,sec,dyn} /var/log/named
+
+	fowners root:named /{etc,var}/bind /var/log/named /var/bind/{sec,pri,dyn}
+	fowners root:named /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0640 /var/bind/named.cache /var/bind/pri/localhost.zone /etc/bind/{bind.keys,named.conf}
+	fperms 0750 /etc/bind /var/bind/pri
+	fperms 0770 /var/log/named /var/bind/{,sec,dyn}
+
+	systemd_newunit "${FILESDIR}/named.service-r1" named.service
+	dotmpfiles "${FILESDIR}"/named.conf
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/generate-rndc-key.sh"
+}
+
+python_install() {
+	pushd "${BUILD_DIR}"/bin/python >/dev/null || die
+	emake DESTDIR="${D}" install
+	python_scriptinto /usr/sbin
+	python_doscript dnssec-{checkds,coverage}
+	python_optimize
+	popd >/dev/null || die
+}
+
+pkg_postinst() {
+	tmpfiles_process named.conf
+
+	if [[ ! -f '/etc/bind/rndc.key' && ! -f '/etc/bind/rndc.conf' ]]; then
+		einfo "Using /dev/urandom for generating rndc.key"
+		/usr/sbin/rndc-confgen -a
+		chown root:named /etc/bind/rndc.key || die
+		chmod 0640 /etc/bind/rndc.key || die
+	fi
+
+	einfo
+	einfo "You can edit /etc/conf.d/named to customize named settings"
+	einfo
+	use mysql || use postgres || use ldap && {
+		elog "If your named depends on MySQL/PostgreSQL or LDAP,"
+		elog "uncomment the specified rc_named_* lines in your"
+		elog "/etc/conf.d/named config to ensure they'll start before bind"
+		einfo
+	}
+	einfo "If you'd like to run bind in a chroot AND this is a new"
+	einfo "install OR your bind doesn't already run in a chroot:"
+	einfo "1) Uncomment and set the CHROOT variable in /etc/conf.d/named."
+	einfo "2) Run \`emerge --config '=${CATEGORY}/${PF}'\`"
+	einfo
+
+	CHROOT=$(source /etc/conf.d/named 2>/dev/null; echo ${CHROOT})
+	if [[ -n ${CHROOT} ]]; then
+		elog "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		elog "To enable the old behaviour (without using mount) uncomment the"
+		elog "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		elog "If you decide to use the new/default method, ensure to make backup"
+		elog "first and merge your existing configs/zones to /etc/bind and"
+		elog "/var/bind because bind will now mount the needed directories into"
+		elog "the chroot dir."
+	fi
+}
+
+pkg_config() {
+	CHROOT=$(source /etc/conf.d/named; echo ${CHROOT})
+	CHROOT_NOMOUNT=$(source /etc/conf.d/named; echo ${CHROOT_NOMOUNT})
+	CHROOT_GEOIP=$(source /etc/conf.d/named; echo ${CHROOT_GEOIP})
+
+	if [[ -z "${CHROOT}" ]]; then
+		eerror "This config script is designed to automate setting up"
+		eerror "a chrooted bind/named. To do so, please first uncomment"
+		eerror "and set the CHROOT variable in '/etc/conf.d/named'."
+		die "Unset CHROOT"
+	fi
+	if [[ -d "${CHROOT}" ]]; then
+		ewarn "NOTE: As of net-dns/bind-9.4.3_p5-r1 the chroot part of the init-script got some major changes!"
+		ewarn "To enable the old behaviour (without using mount) uncomment the"
+		ewarn "CHROOT_NOMOUNT option in your /etc/conf.d/named config."
+		ewarn
+		ewarn "${CHROOT} already exists... some things might become overridden"
+		ewarn "press CTRL+C if you don't want to continue"
+		sleep 10
+	fi
+
+	echo; einfo "Setting up the chroot directory..."
+
+	mkdir -m 0750 -p ${CHROOT} || die
+	mkdir -m 0755 -p ${CHROOT}/{dev,etc,var/log,run} || die
+	mkdir -m 0750 -p ${CHROOT}/etc/bind || die
+	mkdir -m 0770 -p ${CHROOT}/var/{bind,log/named} ${CHROOT}/run/named/ || die
+
+	chown root:named \
+		${CHROOT} \
+		${CHROOT}/var/{bind,log/named} \
+		${CHROOT}/run/named/ \
+		${CHROOT}/etc/bind \
+		|| die
+
+	mknod ${CHROOT}/dev/null c 1 3 || die
+	chmod 0666 ${CHROOT}/dev/null || die
+
+	mknod ${CHROOT}/dev/zero c 1 5 || die
+	chmod 0666 ${CHROOT}/dev/zero || die
+
+	mknod ${CHROOT}/dev/urandom c 1 9 || die
+	chmod 0666 ${CHROOT}/dev/urandom || die
+
+	if [ "${CHROOT_NOMOUNT:-0}" -ne 0 ]; then
+		cp -a /etc/bind ${CHROOT}/etc/ || die
+		cp -a /var/bind ${CHROOT}/var/ || die
+	fi
+
+	if [ "${CHROOT_GEOIP:-0}" -eq 1 ]; then
+		if use geoip; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP || die
+		elif use geoip2; then
+			mkdir -m 0755 -p ${CHROOT}/usr/share/GeoIP2 || die
+		fi
+	fi
+
+	elog "You may need to add the following line to your syslog-ng.conf:"
+	elog "source jail { unix-stream(\"${CHROOT}/dev/log\"); };"
+}
diff --git a/net-dns/coredns/Manifest b/net-dns/coredns/Manifest
index 4f5e60dbd0b6..b61afeba129e 100644
--- a/net-dns/coredns/Manifest
+++ b/net-dns/coredns/Manifest
@@ -6,5 +6,8 @@ AUX coredns.service 452 BLAKE2B 835277ab1a76a6841d2f7f8cd7fa604351064d9ea88bcff2
 AUX coredns.tmpfiles 42 BLAKE2B 06e6b3be85cc66f5eb126639496dc962cbb3e9b77ca59da1acc4749208212ac24bbc53cd694ce63c579528ca040443a5cb3886ea05baf5b0cceb3f46fe94ff20 SHA512 b6aaf9b399a5c25efbbb4f23d9a0c97af0749adea7a58ae83af8b8220a167778ac8debc0359c75d3ac8b904176ee870523c9101f22e8352b61b2012c9002bab4
 DIST coredns-1.8.3-deps.tar.xz 160097444 BLAKE2B e7c59bc3b732b84211bb2142edf6953eec839adac239b92082eb86aebd6d3f31b7e736000ba789836acc0cd88c3beda30b6f208f1192a878889399c43328c1ef SHA512 9b519214762aee3c28071a21cc052ecfa32b001cca56b99f5fe675a0cc6c08aadb68bfe0bedf39ca87040d18c906b9e2c8829acd9741b3b1e333d6c27ae7fa74
 DIST coredns-1.8.3.tar.gz 553278 BLAKE2B 8dddf12686e498f937c057a2fd539ff455980deef1dc889f8e7f6891a712dedb4089528c0a228240332603a37040ab22f80e17af38998a73757f9d1c18d28064 SHA512 2cc2754e9e626d40a2101f17744e8c57bd6d469eacbb4cfee965c2bf485156ae91f4cc99f8e63b5641163e8716c9614b6f9481fb91acb96e62951044bdac1fa8
+DIST coredns-1.9.3-deps.tar.xz 205913904 BLAKE2B d5a630d7afa14577e1d5b9aba48a43808b990bc6e550408d141b509253c611266e3d5b5acc33222582693d7542630c0efdad973535564a37434a50dc67289099 SHA512 d954e73c3f6c3d1c37d959420c92cd59aa61bb5b2f69fdbcf017cbba173a0b8e9e0d73ef85e9b7fa8657c9916afd4843df0886058815c7df854ec3ddc67eae1d
+DIST coredns-1.9.3.tar.gz 624914 BLAKE2B a27e73da8c67ff38d33757bf8fdae5938574b1b0f4db4a469e67e6063c1643b0dc60227646998b87bbd79d48bdf8c792be432ae253b54fca0d6afdec1138bad7 SHA512 d0c24c5d9f27883519e0d6edf917c6e0051b80627a320a20f6d5ee3e154f65790d1f66b5e0255aeed66874ff5826b2ab3d1237d6fd53452e7dfaf3b34b17fdfb
 EBUILD coredns-1.8.3.ebuild 2371 BLAKE2B d8bf7f46162a7a81e16a15f2cb6cdf09e88cfe45c1dc27f203f8906bee7ac18584e75fc443c0b2f3977b946a6d4209fbc8e7560f46f53de85ccdfab6e30f9791 SHA512 268542145c0e7e3516bc76b4c6334318329abdffc353042137fd7fa69f306284df7283a9c120d1d1b11ee735a013d1bafc75ad6a829b893b1bbe2bb1781a76aa
+EBUILD coredns-1.9.3.ebuild 2371 BLAKE2B 8da48252ca48873c2bacbfd8cce0fe26825f9e411abe079eb268c26088383eb355bf2d600adbbf5935ede707f737a400141b70bbc7733cf47cc0f383b696712d SHA512 718454d268cd629a575745b3e651bd2d65bfde05f1ffd41f9948b12d59cbeffa875e4d24276842f3dd820682f350b78a15422be231a47dc1cee35f708ed0816c
 MISC metadata.xml 783 BLAKE2B cf0d7a90c49810d0411c529a75de683c084dd6649a3b3095906e028e21fc4679491bbc8cd55117362bbf4a53befb9006fc14a5b1ce76b873070817029751482e SHA512 95183bd32f17ee75e6b285ac54e0f44359786f058157c95ce59aa8726c6509476ba6a7d049fe32aef43a681d9a9c7684aa5fef4fc46f722a82948318de0bb48b
diff --git a/net-dns/coredns/coredns-1.9.3.ebuild b/net-dns/coredns/coredns-1.9.3.ebuild
new file mode 100644
index 000000000000..f2aae567db44
--- /dev/null
+++ b/net-dns/coredns/coredns-1.9.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Don't forget to update when bumping. Used in --version output
+EGIT_COMMIT="45b0a11294c59bfd806a57807aaa2a185f761cd5"
+
+inherit fcaps go-module systemd tmpfiles
+
+ARCHIVE_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="${ARCHIVE_URI} https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A DNS server that chains middleware"
+HOMEPAGE="https://github.com/coredns/coredns"
+
+LICENSE="Apache-2.0 MIT BSD ISC MPL-2.0 BSD-2"
+SLOT="0"
+RDEPEND="acct-user/coredns
+	acct-group/coredns"
+
+# TODO: debug test failure with deps tarball
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	go build -v -ldflags="-X github.com/coredns/coredns/coremain.GitCommit=${EGIT_COMMIT}" ||
+		die "go build failed"
+}
+
+src_install() {
+	dobin "${PN}"
+	einstalldocs
+	doman man/*
+
+	newinitd "${FILESDIR}"/coredns.initd coredns
+	newconfd "${FILESDIR}"/coredns.confd coredns
+
+	insinto /etc/coredns/
+	newins "${FILESDIR}"/Corefile.example Corefile
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/coredns.logrotated coredns
+
+	systemd_dounit "${FILESDIR}"/coredns.service
+	newtmpfiles "${FILESDIR}"/coredns.tmpfiles "${PN}.conf"
+}
+
+src_test() {
+	# eclass default '-x' makes tests output unreadable
+	export GOFLAGS="-v -mod=readonly"
+
+	local known_fail=(
+		"TestZoneExternalCNAMELookupWithProxy"
+		"TestMetricsSeveralBlocs"
+		"TestMetricsAvailable"
+		"TestMetricsAvailableAfterReload"
+		"TestMetricsAvailableAfterReloadAndFailedReload"
+	)
+	# concat as '|^Test1$|^Test2$|^Test3...$':
+	local known_fail_re="$(printf '|^%s$' "${known_fail[@]}")"
+	# drop '|' in the begining:
+	known_fail_re="${known_fail_re:1}"
+
+	local working_tests_re="$(
+		# get list of all test:
+		{ GOFLAGS="-mod=readonly" go test -list . ./... ||
+			die "Can't get list of tests"; } |
+		# skip "no tests" messages as well as know failures:
+		grep -v -E " |${known_fail_re}" |
+		# format a regexp:
+		sed -z 's/\n/$|^/g'
+	)"
+	# drop '|^' in the end:
+	working_tests_re="^${working_tests_re::-2}"
+
+	go test -race -run "${working_tests_re}" ./... || die "Tests failed"
+	go test -race -run "${known_fail_re}" ./... || ewarn "Known test failure"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process ${PN}.conf
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 42d3e3cca2c8..941aa26c70a7 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 2e0fdfa6daa3..b0ea3df23537 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -3,6 +3,8 @@ AUX iptables-1.8.2-link.patch 785 BLAKE2B 2ef5ac495260eef324f341d5d807e8c59afee8
 AUX iptables-1.8.4-no-symlinks.patch 800 BLAKE2B 721d2dcc881f781031d2be48659dcd54568b3e8c25ad19d0505699f0cf8276990b41f2ddf9d5eda5c2a77f66ae9a16ae542c42c6fc2d91b085cc5922121f9b00 SHA512 79601d8a8a352f82f0f3eaf85a7b1f830c9ddc400ae0fadaf08eb1848bb9a2801a886b2b0803bf498e353db1828c0976aa8d30c9ece5fdcf61a203070ed4d7cd
 AUX iptables-1.8.7-cache-double-free.patch 1574 BLAKE2B 475ed5b4d267b32a03b921cb009fa76931a7fc737ecabb70aed3d13b1f64d94bbb69194892c178fed9784d31c3478b00ab6dbc0d6fc5dd0b86a3ae86d8dcd681 SHA512 79e908845804b36a4a581485f61028570f58645aaaee9682d4a7b9609d4a410c8fb7547d082c5b02deafcf342f675da6e2a7e3436333d0ae6f3ce1a770afdc1a
 AUX iptables-1.8.8-format-security.patch 639 BLAKE2B df5c843d0cd6634740b372300263dd19df3289466ad83d3a10ba9f270519d738d90152cdef273d07c94502166082d6fa5a8908b603289e6d4c9bc9d6987b8b16 SHA512 6e1da61b648259dac02662eee995f9b5117bc8b8c028f0e2afc3346d82a94b7e7faf8ae5cfd484b7dd1a6530973191c1f147579f11e57ebda945115b40134094
+AUX iptables-1.8.8-musl-headers.patch 2061 BLAKE2B 6876d083d179a055c60422397e67a24137ae5bb72cba02f732d4dd7313171c10717202a41f1256196d5b64bc29d22e98d8d0eb9861130fa93481b527d0117e96 SHA512 136f3c7dae7c88739ed1c2d2c14e9a8381013c8a376bee80a7f994098810bb61d76dd143dc65430f0ec7b44d542b64242dd947134936468155840a4a26e6ce79
+AUX iptables-1.8.8-out-of-tree-build.patch 1058 BLAKE2B 5a358632780b607533033dc3bf6b6e24ac1af49dbbc26afae05668187c2a4072dba1cdbf51647b6b5f7c5f68e5a3d64fa82b5b0477d3cd4e936d466b731707fb SHA512 453ed9a2b3b2dddb3ccc9a099386c28290416ea356884084fd4d9bd2b026e21732b91f020fbe55de12ba970b815993f2e3a18a52a6774ab7738383e2f144a973
 AUX iptables-1.8.8-uint-musl.patch 4607 BLAKE2B 8ca4ba2fec97e99e1f57d9d1f376dbdab53a698279534879163ad5dade629cda3ac232df54d57ae75e589c2327492953e0c30356bdc4367b9a1474afc259136c SHA512 01d3af7330334b5002ec9d50e4b469651148b911d9ab5d45d5a2cd08e72c3be5e770c047cbc337485e40cb622ee470faa9ed91b53ca59e09a1c197bf5df48a9a
 AUX iptables-r1.confd 890 BLAKE2B 0aaca870e3c03f19a71cf1b210377dfda320faf118359e298bef419eaf280fd11c9726d200ae89602e863c9b48de0bb51ac05424b50c064afe948a980e300153 SHA512 10002da01ded6be0e9bca6041798ad0859fa2212fde077a048443e4f3012c95d86e4580ae426e87af5891368062af9af6f9fd35ed617d24cdd3c51702b816b13
 AUX iptables-r2.init 4384 BLAKE2B d11be1725e25d234e01af86c82d3745fd630b15b3ae2228845c5555db5c2ffdcd920fd565480f76ab91ef2d5b26f9ae96432efc288a1b9aa2abfb5b9bb01d7bf SHA512 8897ab985424c895e261e0fe521921f0da8e09e38394655b0f91c65c0e8f603731faf70489f7a6610c83d6c2fde75f92f309405d72277643165a847e62238df7
@@ -15,5 +17,5 @@ DIST iptables-1.8.7.tar.bz2 717862 BLAKE2B fd4dcff142eaadde2a14ce3eb5e45d41c3267
 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59
 EBUILD iptables-1.8.7-r2.ebuild 4561 BLAKE2B f0ce89cf5c49c7856f8702aad182b91abe99ce79b82c6e13194ca7a1499dd0fbe2112189e673aaedfbe0e40a030266e2b5d4bfa2d1b542b5ef744388af7d4dc7 SHA512 8f546a3ddef734f215cb0b9673cbd31b4be90a85ff99299c12f0a19cc053f56a095103e4d9c03d104542a0d978cbaff295074fca147db5f57a75d337fb5ca297
 EBUILD iptables-1.8.8-r1.ebuild 4560 BLAKE2B 1f80153ceab1981eb6933d66a7b48aa1c29f1e94a560b10ca64c06fd1a3e421226d8cc7fd09599886969033125061087be918affcfc9eaf6de0a70f747f25ebc SHA512 950c0ce4c773f0220b4f91be3c93b0a8d1735e39253bd4d5de1abe1b7bf4448f77e77a7667f7c42e9d9e2dadabd158ee29abbdefb31a0f2d30bc0d3d36169feb
-EBUILD iptables-1.8.8-r2.ebuild 4560 BLAKE2B 6297f266cfc5369c5310b1bc1c0937e0c3af9265aa41176cb703c54e5e6a750fe5e9f808499355942900bc1a2d9b12b2a6ddfd74dc4eefa81f313f07b673f83a SHA512 d76220a471241d7fbd9ae5342ddcb5c70c918aaa7ec946241b3c393991dbcc52b1f587beb10404c4b89597bd6eca783a18059cae24d4118e1a1dfc1dac74ffd4
+EBUILD iptables-1.8.8-r2.ebuild 4643 BLAKE2B 170d16b7ee582dcdb650062692b04293ee9e0dc994a18e5f0489c8a63698ddb625ba8162a650ff2c8f9de628c9f8cc5893c93b784e025983667799f47fccd1c8 SHA512 74377cde84eaaa7c1b810b433e3b5c851a47acfa5009cfc17a957fe12d6545ab8ccdf60fb73d89f8b97d5782fe88e779ac762da61a1477b5959780b2ab824def
 MISC metadata.xml 1466 BLAKE2B 7378fedb44c6e6d19e508a764ec997911f966beccd40b1f93096ad3343b7cd72f9ca129e67a666c54ca4382348a448597bd607197ffe6b94669d84306c81d127 SHA512 f89038980e81bfceaf872ff1938c47e8ad12060bbe9ff48e0e9ca9dd5acc0196b2261d2b22a156cbfd7be89d1d67448969d39ff9b28efb0896702760afa14842
diff --git a/net-firewall/iptables/files/iptables-1.8.8-musl-headers.patch b/net-firewall/iptables/files/iptables-1.8.8-musl-headers.patch
new file mode 100644
index 000000000000..52e2c7019972
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.8-musl-headers.patch
@@ -0,0 +1,59 @@
+https://git.netfilter.org/iptables/commit/?id=0e7cf0ad306cdf95dc3c28d15a254532206a888e
+https://bugs.gentoo.org/846377
+
+From: Phil Sutter <phil@nwl.cc>
+Date: Wed, 18 May 2022 16:04:09 +0200
+Subject: Revert "fix build for missing ETH_ALEN definition"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This reverts commit c5d9a723b5159a28f547b577711787295a14fd84 as it broke
+compiling against musl libc. Might be a bug in the latter, but for the
+time being try to please both by avoiding the include and instead
+defining ETH_ALEN if unset.
+
+While being at it, move netinet/ether.h include up.
+
+Fixes: 1bdb5535f561a ("libxtables: Extend MAC address printing/parsing support")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+Reviewed-by: Maciej Żenczykowski <maze@google.com>
+--- a/libxtables/xtables.c
++++ b/libxtables/xtables.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <netinet/ether.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/statfs.h>
+@@ -45,7 +46,6 @@
+ 
+ #include <xtables.h>
+ #include <limits.h> /* INT_MAX in ip_tables.h/ip6_tables.h */
+-#include <linux/if_ether.h> /* ETH_ALEN */
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/netfilter_ipv6/ip6_tables.h>
+ #include <libiptc/libxtc.h>
+@@ -72,6 +72,10 @@
+ #define PROC_SYS_MODPROBE "/proc/sys/kernel/modprobe"
+ #endif
+ 
++#ifndef ETH_ALEN
++#define ETH_ALEN 6
++#endif
++
+ /* we need this for ip6?tables-restore.  ip6?tables-restore.c sets line to the
+  * current line of the input file, in order  to give a more precise error
+  * message.  ip6?tables itself doesn't need this, so it is initialized to the
+@@ -2245,8 +2249,6 @@ void xtables_print_num(uint64_t number, unsigned int format)
+ 	printf(FMT("%4lluT ","%lluT "), (unsigned long long)number);
+ }
+ 
+-#include <netinet/ether.h>
+-
+ static const unsigned char mac_type_unicast[ETH_ALEN] =   {};
+ static const unsigned char msk_type_unicast[ETH_ALEN] =   {1};
+ static const unsigned char mac_type_multicast[ETH_ALEN] = {1};
+cgit v1.2.3
diff --git a/net-firewall/iptables/files/iptables-1.8.8-out-of-tree-build.patch b/net-firewall/iptables/files/iptables-1.8.8-out-of-tree-build.patch
new file mode 100644
index 000000000000..ee9e218b5dbd
--- /dev/null
+++ b/net-firewall/iptables/files/iptables-1.8.8-out-of-tree-build.patch
@@ -0,0 +1,26 @@
+https://git.netfilter.org/iptables/commit/?id=0ebf52fc951b2a4d98a166afb34af4f364bbeece
+
+From: Ben Brown <ben@demerara.io>
+Date: Wed, 25 May 2022 16:26:13 +0100
+Subject: build: Fix error during out of tree build
+
+Fixes the following error:
+
+    ../../libxtables/xtables.c:52:10: fatal error: libiptc/linux_list.h: No such file or directory
+       52 | #include <libiptc/linux_list.h>
+
+Fixes: f58b0d7406451 ("libxtables: Implement notargets hash table")
+Signed-off-by: Ben Brown <ben@demerara.io>
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+--- a/libxtables/Makefile.am
++++ b/libxtables/Makefile.am
+@@ -1,7 +1,7 @@
+ # -*- Makefile -*-
+ 
+ AM_CFLAGS   = ${regular_CFLAGS}
+-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir}/iptables ${kinclude_CPPFLAGS}
++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir}/iptables -I${top_srcdir} ${kinclude_CPPFLAGS}
+ 
+ lib_LTLIBRARIES       = libxtables.la
+ libxtables_la_SOURCES = xtables.c xtoptions.c getethertype.c
+cgit v1.2.3
diff --git a/net-firewall/iptables/iptables-1.8.8-r2.ebuild b/net-firewall/iptables/iptables-1.8.8-r2.ebuild
index 03c908c9d9b1..c4fcdc0fb260 100644
--- a/net-firewall/iptables/iptables-1.8.8-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.8.8-r2.ebuild
@@ -52,6 +52,8 @@ PATCHES=(
 
 	"${FILESDIR}/${P}-format-security.patch"
 	"${FILESDIR}/${P}-uint-musl.patch"
+	"${FILESDIR}/${P}-musl-headers.patch"
+	"${FILESDIR}/${P}-out-of-tree-build.patch"
 )
 
 src_prepare() {
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 03aa72c2fcc9..f7bdb7d06079 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 4cf70a7469cc..05ca86ee7186 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,21 +1,12 @@
 AUX pure-certd.initd 562 BLAKE2B 21431b74d2a745b13daa7772748b4484e18a640ffc07252ed60867b297a8f31267f583ceb408ee31c11bbc43de3fcda0b51e4324279b50c8a4a19ea6f1342945 SHA512 1a7a7dcba98e92e86ae3f35c33c5fe970c6530f1059692f32cdc851de1d8492720020b252e70c646eff6fdbbb32dfb99b1ae449acaea5fd0fe5541dc89891301
 AUX pure-certd.script 678 BLAKE2B 09a27afc2b1d885b051988d0d5af4ab3fe3ffff68a37a01071a7cfe5334d7f62b0510865381f5d226f12558a04214afdc3fc158e22cc7e2c940617997c9453cf SHA512 807598a1e7e2ad92e1b5e52b0f2321a45d032a74e806435fddbf4f6b99ca2663617ee6accbeeb187c17f8a35668d1b097b13a8930be24ddfd4fb5818e3b1523c
 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba
-AUX pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch 898 BLAKE2B ccccd0302184a768ac522197628b2021374579afcda595a70041dc14f3cab05317ac373a2fadf9d0565a95c0d730c87590c3dc13efa944e8d496264b3f0e4ab1 SHA512 7930dddc7e58bd00fdeb4cd0da49491d59907334f47f23d12433f71a9a2103a8b5cc503c5d4d461b110cdea61f2f6ef974bf123d96394334f668aacdb747f830
-AUX pure-ftpd-1.0.49-do-not-call-ar-directly.patch 609 BLAKE2B 5f3ac69ae824cd07a16629afdbed9d1d55718184fb0da09063ae5beacf189861263bb21bc4e3f6d9f853757169f8125221db4728002bbd2697992c8035201585 SHA512 91d15fbcf4d99100072bae5a7121122a0ae0e912a4df5a7d9645419506bdd7de70ce09d586b9a3ec83838fd98cddee6d744cda7b6383985f80278859ff5200e4
-AUX pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch 847 BLAKE2B f7e12194d219bb5a410a7b55743cdb2b8eb268a60aef8b8d9826e242264989a4502bb2378503c3a7ed8913fce4d95b681fcd185d184ef54e04dcda6b4853d99e SHA512 ff4aefeffd92f9e01e7c57779cc9ed59c0972a40a02431fa4e63696071ebbf28e4a0f83b6b6c878d4b62fed7efa05ff90e9d604e8c7e6a9358bc8853105731f1
-AUX pure-ftpd-1.0.49-quota_maxfile_size_check.patch 994 BLAKE2B 8a3a840af77642b1b00e7cc05dc095631400e4332a7f5ece140ea5034cd6cbf5f2d9509cfe1138dd4bc968dca60d848ef238a0bd0d7d0f44a978dde15cd9ad62 SHA512 7e5d79984355765dd1c167e23018cda5f17102424769a439a03e642ebc66838d2f9410af99151ce0d47056cbead6979df335a65e4468da5025b8555a84d4c798
-AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393
 AUX pure-ftpd.confd-r4 170 BLAKE2B d552480bea7503066ef3f0e90a082660a30f35cf809e26860ba9b49fcbb2fcdafdfe35041510fdd73f1b42cb35b7d90caa37ed9722de769750558818ebfbfe43 SHA512 6afde5a6e0f8e3a14bd23a6f861e18754980ab1b845defe06378493ed58e693628f4af71b591b3160037a0fdf6cc750c2a0d156a47c48a2a1d58c0032e389a1f
 AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e17f27671f9f70e3f1bb955326af390b709a4ff9cefd2ba48e1ef77efaaac5595a5dccbbb75e9376db7153 SHA512 2189b8761aa51b68bd4b5b5c79e3f7220c9f96e5187bf17ed55a50a74ebe0989b3d5f2c9d8b3bdc89d184ce7f97d16e1c51e46b3d178feacc72864090717b8a1
-AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba
 AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d
 AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af
 AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4
-DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef
 DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12
-EBUILD pure-ftpd-1.0.49-r6.ebuild 4399 BLAKE2B 11f875c1345ffde82632d1f7cb70c934f571a460bbe85583c381c1d9ee1cde305e9e413595afb034d34ad695e06bbccd2f695c560202f0a483524a149510737a SHA512 18f4236c55ff0d1f0fd059cf44bfa8fa8f1ddec4d225384bc66c21fefd17ee003e316f9a6f9cafcd6d658ad2ef66bd5d9858b8d05e629cc0071b7fc94453bd1c
-EBUILD pure-ftpd-1.0.50-r1.ebuild 4113 BLAKE2B b60eaf0982ea54aae3b738100017901b264e063c22d4b905358b4710e12c54a0785d58a0f024d04157db9e78be2eaaa61cc7cacdae8a37d02c8acad910155306 SHA512 0b5fd18b202a61ce01d749c5190d4b66ca843e55964891af26a618ce3c3aba16189741de421abaff582ee8d7b4e9420591ab58e25937c0976e3c439f2e42910e
-EBUILD pure-ftpd-1.0.50-r3.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
+EBUILD pure-ftpd-1.0.50-r3.ebuild 4363 BLAKE2B 48e2aa70ff578e49bd35d21e4ff002a63399b9c18e1466946b171a1e5fce5f226ba1bdd42df6164ab04005ca685d9c90c902a59a00c7b356ee6a7aad292d5212 SHA512 f29ce9b3262c80f75b8ea722763def4e52441fb735d0ebc1a564b43f018b05e1203de04ec2b344cd7a7aff9ca34cceca2377ac3736c1ee127bd67962baf676b2
 EBUILD pure-ftpd-9999.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7
 MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
deleted file mode 100644
index 7e29934caf5d..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Tue, 18 Feb 2020 18:36:58 +0100
-Subject: [PATCH] diraliases: always set the tail of the list to NULL
-
-Spotted and reported by Antonio Norales from GitHub Security Labs.
-Thanks!
----
- src/diraliases.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/diraliases.c b/src/diraliases.c
-index 4002a36..fb70273 100644
---- a/src/diraliases.c
-+++ b/src/diraliases.c
-@@ -93,7 +93,6 @@ int init_aliases(void)
-                 (tail->dir = strdup(dir)) == NULL) {
-                 die_mem();
-             }
--            tail->next = NULL;
-         } else {
-             DirAlias *curr;
- 
-@@ -105,6 +104,7 @@ int init_aliases(void)
-             tail->next = curr;
-             tail = curr;
-         }
-+        tail->next = NULL;
-     }
-     fclose(fp);
-     aliases_up++;
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
deleted file mode 100644
index 0df21320957d..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/721242
-Backport of https://github.com/jedisct1/pure-ftpd/pull/148
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AC_INIT([pure-ftpd],[1.0.49],
-   [https://www.pureftpd.org])
- AC_CONFIG_SRCDIR(src/ftpd.c)
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
-+AM_INIT_AUTOMAKE([1.11.2 dist-bzip2 tar-ustar])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- AM_MAINTAINER_MODE
- AM_DEP_TRACK
-@@ -17,6 +17,7 @@ AC_SUBST(VERSION)
- 
- dnl Checks for programs.
- LX_CFLAGS=${CFLAGS-NONE}
-+AM_PROG_AR
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_USE_SYSTEM_EXTENSIONS
- 
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
deleted file mode 100644
index 4ed197e46d35..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001
-From: Frank Denis <github@pureftpd.org>
-Date: Mon, 24 Feb 2020 15:19:43 +0100
-Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1)
-
-Reported by Antonio Morales from GitHub Security Labs, thanks!
----
- src/utils.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/utils.c b/src/utils.c
-index f41492d..a7f0381 100644
---- a/src/utils.c
-+++ b/src/utils.c
-@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len)
- 
- int pure_strcmp(const char * const s1, const char * const s2)
- {
--    return pure_memcmp(s1, s2, strlen(s1) + 1U);
-+    const size_t s1_len = strlen(s1);
-+    const size_t s2_len = strlen(s2);
-+
-+    if (s1_len != s2_len) {
-+        return -1;
-+    }
-+    return pure_memcmp(s1, s2, s1_len);
- }
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch
deleted file mode 100644
index 8b1877366c20..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fb93975777a1cffba80544e08ca81606532395d6 Mon Sep 17 00:00:00 2001
-From: DroidTest <53651584+DroidTest@users.noreply.github.com>
-Date: Thu, 29 Jul 2021 11:36:26 +0800
-Subject: [PATCH] fix the maxfile_size checking bug
-
-Fix the predicate that never evaluates true
----
- src/ftpd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ftpd.c b/src/ftpd.c
-index d856839..61275de 100644
---- a/src/ftpd.c
-+++ b/src/ftpd.c
-@@ -4247,8 +4247,8 @@ void dostor(char *name, const int append, const int autorename)
-     if (quota_update(&quota, 0LL, 0LL, &overflow) == 0 &&
-         (overflow > 0 || quota.files >= user_quota_files ||
-          quota.size > user_quota_size ||
--         (max_filesize >= (off_t) 0 &&
--          (max_filesize = user_quota_size - quota.size) < (off_t) 0))) {
-+         ((max_filesize = user_quota_size - quota.size) < (off_t) 0 &&
-+          max_filesize >= (off_t) 0))) {
-         overflow = 1;
-         (void) close(f);
-         goto afterquota;
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
deleted file mode 100644
index 29b15a5a8928..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
+++ /dev/null
@@ -1,90 +0,0 @@
-# Config file for /etc/init.d/pure-ftpd
-##Comment variables out to disable its features, or change the values in it... ##
-
-## This variable must be uncommented in order for the server to start ##
-#IS_CONFIGURED="yes"
-
-## FTP Server,Port (separated by comma) ##
-## If you prefer host names over IP addresses, it's your choice:
-## SERVER="-S ftp.rtchat.com,21"
-## IPv6 addresses are supported.
-## !!! WARNING !!!
-## Using an invalid IP will result in the server not starting,
-## but reporting a correct start!
-## SERVER="-S 192.168.0.1,21"
-## By default binds to all available IPs.
-SERVER="-S 21"
-
-## Number of simultaneous connections in total, and per IP ##
-MAX_CONN="-c 30"
-MAX_CONN_IP="-C 10"
-
-## Don't allow uploads if the partition is more full then this var ##
-DISK_FULL="-k 90%"
-
-## If your FTP server is behind a NAT box, uncomment this ##
-#USE_NAT="-N"
-
-## Authentication mechanisms (others are 'pam', ...) ##
-## Further infos can be found in the README file.
-AUTH="-l unix"
-
-## Change the maximum idle time (in minutes) ##
-## If this variable is not defined, it will default to 15 minutes.
-#TIMEOUT="-I <timeout>'"
-
-## Facility used for syslog logging ##
-## If this variable is not defined, it will default to the 'ftp' facility.
-## Logging can be disabled with '-f none'.
-#LOG="-f <facility>"
-
-## Charset conversion support *experimental* ##
-## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21).
-## Set the charset of the filesystem.
-# CHARCONV="--fscharset <charset>"
-
-## If you want to process each file uploaded through Pure-FTPd, enter the name
-## of the script that should process the files below.
-## man pure-uploadscript to learn more about how to write this script.
-# UPLOADSCRIPT="/path/to/uploadscript"
-
-## Misc. Others ##
-MISC_OTHER="-A -x -j -R -Z"
-
-#
-# Use these inside $MISC_OTHER
-# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
-#
-# -A [ chroot() everyone, but root ]
-# -e [ Only allow anonymous users ]
-# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
-# -i [ Disallow upload for anonymous users, whatever directory perms are ]
-# -j [ If the home directory of a user doesn't exist, auto-create it ]
-# -M [ Allow anonymous users to create directories. ]
-# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
-# -x [ In  normal  operation mode, authenticated users can read/write
-#	files beginning with a dot ('.'). Anonymous users can't, for security reasons
-#	(like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
-#	users can download dot-files, but not overwrite/create  them,  even  if they own
-#	them. ]
-# -X [ This  flag  is  identical  to  the  previous one (writing
-#       dot-files is prohibited), but in addition, users can't even *read* files and
-#       directories beginning with a dot (like "cd .ssh"). ]
-# -D [ List files beginning with a dot ('.') even when the client doesn't
-#      append the '-a' option to the list command. A workaround for badly
-#      configured FTP clients. ]
-# -G [ Disallow renaming. ]
-# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
-# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
-# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
-
-
-# Some filesystems don't like accesses being memory mapped. This happens for
-# example with ftpwho on JFFS2 filesystems (bug #330563). If you happen to 
-# have such a filesystem on /var set TMPFS_MOUNT to "true".
-TMPFS_MOUNT="false"
-
-# Special mount options (like nosuid or nodev) for the tmpfs mount can be added 
-# here. Several options must be separated by comma: "nodev,nosuid"
-#TMPFS_OPTS=""
-
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
deleted file mode 100644
index 35270ff33507..000000000000
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
-ftpd_rundir="/var/lib/run/pure-ftpd"
-daemon="/usr/sbin/pure-ftpd"
-script_daemon="/usr/sbin/pure-uploadscript"
-
-depend() {
-	need localmount
-	use netmount
-}
-
-start_pre() {
-	if [ -z "${IS_CONFIGURED}" ] ; then
-		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
-		return 1
-	fi
-}
-
-start() {
-	UPSCRIPT=""
-	if [ -n "${UPLOADSCRIPT}" ] ; then
-		UPSCRIPT="--uploadscript"
-	fi
-
-	FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH
-		     $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT"
-
-	WAIT="--wait 100"
-
-	if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then
-		[ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}"
-		einfo "Mounting tmpfs on ${ftpd_rundir}"
-		mount ${MOUNT_OPTS} -t tmpfs tmpfs ${ftpd_rundir} \
-			|| eerror "Unable to mount tmpfs"
-	fi
-
-	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
-		--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
-		-- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g')
-	result=$?
-	if [ ${result} -ne 0 ] ; then
-		eend 1 "Could not launch Pure-FTPd"
-	else
-		eend $result
-		if [ -n "${UPLOADSCRIPT}" ] ; then
-			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile \
-				 --pidfile ${script_pidfile} \
-				 --exec ${script_daemon} --background ${WAIT} \
-				 -- -r $UPLOADSCRIPT
-			eend $?
-		fi
-	fi
-}
-
-stop() {
-	if [ -n "${UPLOADSCRIPT}" ] ; then
-		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet \
-			--pidfile ${script_pidfile}
-		eend $?
-	fi
-	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
-	eend $?
-
-	if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then
-		umount ${ftpd_rundir} >/dev/null 2>&1
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
deleted file mode 100644
index 784e79dcafc5..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild
+++ /dev/null
@@ -1,160 +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
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
-else
-	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-fi
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-BDEPEND="sys-devel/autoconf-archive"
-
-DEPEND="dev-libs/libsodium:=
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	ldap? ( >=net-nds/openldap-2.0.25:= )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c
-	) )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		>=dev-libs/openssl-0.9.6g:0=[-bindist(-)]
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-
-	# https://bugs.gentoo.org/711124
-	"${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch"
-	"${FILESDIR}/${P}-pure_strcmp_OOB_read.patch"
-
-	# https://bugs.gentoo.org/721242
-	"${FILESDIR}/${P}-do-not-call-ar-directly.patch"
-
-	# https://bugs.gentoo.org/811786
-	"${FILESDIR}/${P}-quota_maxfile_size_check.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel && append-cppflags -DANON_CAN_DELETE
-	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren && append-cppflags -DANON_CAN_RENAME
-	use anonres && append-cppflags -DANON_CAN_RESUME
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		# Required for correct pid file location.
-		# pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir
-		# path, and tries to write to that file even when being
-		# started in foreground. So we need to pin this to /
-		--localstatedir="${EPREFIX}"/
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
deleted file mode 100644
index e78b1e52dc2e..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
-HOMEPAGE="http://www.pureftpd.org/"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git"
-else
-	SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
-		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd"
-
-REQUIRED_USE="implicittls? ( ssl )"
-
-BDEPEND="sys-devel/autoconf-archive"
-
-DEPEND="dev-libs/libsodium:=
-	virtual/libcrypt:=
-	caps? ( sys-libs/libcap )
-	ldap? ( >=net-nds/openldap-2.0.25:= )
-	mysql? ( || (
-		dev-db/mariadb-connector-c
-		dev-db/mysql-connector-c
-	) )
-	pam? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql:= )
-	ssl? (
-		>=dev-libs/openssl-0.9.6g:0=[-bindist(-)]
-	)
-	sysquota? ( sys-fs/quota[-rpc] )
-	xinetd? ( virtual/inetd )"
-
-RDEPEND="${DEPEND}
-	net-ftp/ftpbase
-	selinux? ( sec-policy/selinux-ftp )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.28-pam.patch"
-)
-
-src_prepare() {
-	default
-	[[ "${PV}" == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	# adjust max user length to something more appropriate
-	# for virtual hosts. See bug #62472 for details.
-	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \
-		-i "${S}/src/ftpd.h" || die "sed failed"
-
-	# Those features are only configurable like this, see bug #179375.
-	use anondel 	&& append-cppflags -DANON_CAN_DELETE
-	use anonperm 	&& append-cppflags -DANON_CAN_CHANGE_PERMS
-	use anonren 	&& append-cppflags -DANON_CAN_RENAME
-	use anonres 	&& append-cppflags -DANON_CAN_RESUME
-	use resolveids 	&& append-cppflags -DALWAYS_RESOLVE_IDS
-
-	# Do not auto-use SSP -- let the user select this.
-	export ax_cv_check_cflags___fstack_protector_all=no
-
-	local myeconfargs=(
-		--enable-largefile
-		# Required for correct pid file location.
-		# pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir
-		# path, and tries to write to that file even when being
-		# started in foreground. So we need to pin this to /
-		--localstatedir="${EPREFIX}"/
-		--with-altlog
-		--with-cookie
-		--with-diraliases
-		--with-extauth
-		--with-ftpwho
-		--with-language=${PUREFTPD_LANG:=english}
-		--with-peruserlimits
-		--with-privsep
-		--with-puredb
-		--with-quotas
-		--with-ratios
-		--with-throttling
-		--with-uploadscript
-		--with-virtualhosts
-		$(use_with ldap)
-		$(use_with mysql)
-		$(use_with pam)
-		$(use_with paranoidmsg)
-		$(use_with postgres pgsql)
-		$(use_with ssl tls)
-		$(use_with implicittls)
-		$(use_with vchroot virtualchroot)
-		$(use_with sysquota sysquotas)
-		$(usex caps '' '--without-capabilities')
-		$(usex noiplog '--without-iplogging' '')
-		$(usex xinetd '' '--without-inetd')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS )
-
-	default
-
-	newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN}
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN}
-
-	if use implicittls ; then
-		sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \
-			|| die "Adjusting default server port for implicittls usage failed!"
-	fi
-
-	keepdir /var/lib/run/${PN}
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/pure-ftpd.xinetd" ${PN}
-	fi
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins pureftpd.schema
-		insinto /etc/openldap
-		insopts -m 0600
-		doins pureftpd-ldap.conf
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog
-		elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
-		elog
-		ewarn "It's *really* important to read the README provided with Pure-FTPd!"
-		ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
-		ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
-		ewarn
-	fi
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
index 712fefda22b2..a01e48fe71f1 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild
@@ -15,7 +15,7 @@ else
 		ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 		http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 fi
 
 LICENSE="BSD GPL-2"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index b99d2ec450f0..b6d16f85e2cd 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 4e8be71e9acf..186ec545dd8a 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -2,9 +2,11 @@ DIST gajim-1.3.3-2.tar.gz 9578053 BLAKE2B de41eb488480c1e9267a7e64c33dcc225ba683
 DIST gajim-1.3.3.tar.gz 9886175 BLAKE2B 27c4163a5762e8fa72524f91d846439b5bd54aff8ec0c4f8ffe4061295540d986b71fc333a2d65110e87821efc5a96ce0dc8a519236c5d71df9a722c65851296 SHA512 b1b6ed1eeb9ce01c26240a0a0c1ff3991ac305787e2ed49ecf7ed9cc75789da2d0ec1c3a1fda6dc67fe440fa7aa143af9be1a837acfc94255d7027f63f55ced2
 DIST gajim-1.4.0.tar.gz 8932710 BLAKE2B 66924bf2e0f39c74e0ce45bfb24c6bd41c547f170c149611dc08e45db1f665f1159be6586dde1a64f1037de029dc2d83c1146545c36645dd67b63509ce156043 SHA512 9fb2b967325d04d7cfa8cb97d0dcebdd5cfd8b8a0a4f8928e7d8c547d90567b7fb0d84d48cdd151b5e38ce72f65de2679c8cc1543ff3ed25d792e6de070042a0
 DIST gajim-1.4.1.tar.gz 7321296 BLAKE2B 2b170800a1ee6304831e1ec7c006e2133c577dd6b34da4e89ab35a6032677c7db61939834a5b3ad73026b7417703321dc43bb63aa2d0c03676cddb728c7294e6 SHA512 614b96d1e64e8601992d608de279abdd38fcfa637094eeffef6adab725446b8955d07725a3d7577d71be4b883943e3341f84540a86e9a61c32ec51ae8999cfcc
+DIST gajim-1.4.2.tar.gz 7315938 BLAKE2B 2315be3d8efa98bf45cc7479a38a83f6d297bc4af9550ce70ccbb9f4fce681cdec57658f2c5c12c4b3b1b97d7623b1da32b675be971e186623957a267010d85c SHA512 d3402b39c9253334523538b86c3e2d6f272f576824048b344a235a12982c53280c3638b0b299c536ed38bcb8648388ba5bea8056c722cc8a5dc5d98012f6d57c
 EBUILD gajim-1.3.3-r1.ebuild 2513 BLAKE2B e2536b23b31c4609654c26ebf38cda6bfeff98eb032a4bf88809c406dda4575004416d9d1ec2ac1ad5efa110f3a71c9132bde35c5354c16aa616eebac35e6333 SHA512 aef65122835adf7fc44c5d22c01416e9c990aaf3331889d5be337f04089b0e883cefe113a5971e12a1bba9b396ba6ab1d667dbaccef11e99a6846258021b2b30
 EBUILD gajim-1.3.3_p2.ebuild 2633 BLAKE2B 95067aed248fb1bfe978f3268d8dd2f4905652428bed3c0069821e17aad7c6709bfd9a527b7e6a6f6a8f69d16f0ec96b3908656510167fcd7a2ca19130ce2a0d SHA512 eb8d9f82336521db25263eb88a537f7de16487161b771a0ebdc7717cb3c49866ee99389fcc017d8f2be3d0acd9daad120daee2757ea3c5267004b92ef66a0dd2
 EBUILD gajim-1.4.0-r1.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
 EBUILD gajim-1.4.0.ebuild 2629 BLAKE2B 4accd1c410318eef440b86058c1fecfc1a1d9dba700ff5be6a2b51264253b90b5a593132571f02b2c498f1738a4714610abbf4a60dbbd94cdbb532ec6bbd20d8 SHA512 3a790e4dafdad6a51753acf4ea3c28b617032e4cd7ef8541f56566a02440759eb9588a3eaa78fa0114ca40a725ca0675e18fe1c77349628fa1b661a0e3f9a56d
 EBUILD gajim-1.4.1.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
+EBUILD gajim-1.4.2.ebuild 2655 BLAKE2B dae2f3b7556ae5dfe003fd32fe3a4a4e70253306620b267e0b19e2332f778efa46f3cc228097a43b5002d83a7dc5925b44a1820e032d952247ef9eaf8e3b4133 SHA512 a4bc6fb7557ae61d93e3375859b407da1a1f1656f9feacda54fd572e0cf8e7f56d774b393dc6ea11177487c438d025a9e0a5b4456dac34f17544cdbaa0764897
 MISC metadata.xml 867 BLAKE2B b7dcc46c99a2c04f9382cd7eeb34b416a422baae8e8123369bb9809c89204413cc9a93c51979fd50f542aed29caff5e6bb18e3ea3a077814f89826972d778837 SHA512 e56580db1a6734f1e219eeb61176ba60e5c85895e0cf7699643f82c928d7f083d519cf3d490b0750b0cbe875cf1428e67e35961ad006c38f62829f04090af134
diff --git a/net-im/gajim/gajim-1.4.2.ebuild b/net-im/gajim/gajim-1.4.2.ebuild
new file mode 100644
index 000000000000..60900668dd5d
--- /dev/null
+++ b/net-im/gajim/gajim-1.4.2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="sqlite,xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jabber client written in PyGTK"
+HOMEPAGE="https://gajim.org/"
+SRC_URI="https://gajim.org/downloads/$(ver_cut 1-2)/${P/_p/-}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="+crypt geolocation jingle omemo remote rst +spell upnp +webp"
+S="${WORKDIR}/${P%_p2}"
+
+COMMON_DEPEND="
+	dev-libs/gobject-introspection[cairo(+)]
+	>=x11-libs/gtk+-3.22:3[introspection]
+	x11-libs/gtksourceview:4"
+DEPEND="${COMMON_DEPEND}
+	app-arch/unzip
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17-r1"
+RDEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/precis-i18n[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		dev-python/pycairo[${PYTHON_USEDEP}]
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/python-nbxmpp-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/python-nbxmpp-4.0.0[${PYTHON_USEDEP}]
+		x11-libs/libXScrnSaver
+		app-crypt/libsecret[crypt,introspection]
+		dev-python/keyring[${PYTHON_USEDEP}]
+		>=dev-python/secretstorage-3.1.1[${PYTHON_USEDEP}]
+		dev-python/css-parser[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+		net-libs/libsoup[introspection]
+		media-libs/gsound[introspection]
+		crypt? (
+			dev-python/pycryptodome[${PYTHON_USEDEP}]
+			>=dev-python/python-gnupg-0.4.0[${PYTHON_USEDEP}] )
+		geolocation? ( app-misc/geoclue[introspection] )
+		jingle? (
+			net-libs/farstream:0.2[introspection]
+			media-libs/gstreamer:1.0[introspection]
+			media-libs/gst-plugins-base:1.0[introspection]
+			media-libs/gst-plugins-ugly:1.0
+			media-plugins/gst-plugins-gtk
+		)
+		omemo? (
+			dev-python/python-axolotl[${PYTHON_USEDEP}]
+			dev-python/qrcode[${PYTHON_USEDEP}]
+			dev-python/cryptography[${PYTHON_USEDEP}]
+		)
+		remote? (
+			>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+			sys-apps/dbus[X]
+		)
+		rst? ( dev-python/docutils[${PYTHON_USEDEP}] )
+		spell? (
+			app-text/gspell[introspection]
+			app-text/hunspell
+		)
+		upnp? ( net-libs/gupnp-igd[introspection] )
+		webp? ( dev-python/pillow[${PYTHON_USEDEP}] )
+	')"
+
+src_install() {
+	distutils-r1_src_install
+
+	# avoid precompressed man pages
+	rm -r "${D}/usr/share/man"
+	doman data/*.1
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+# Tests are unfortunately regularly broken
+RESTRICT="test"
diff --git a/net-im/jabber-base/Manifest b/net-im/jabber-base/Manifest
deleted file mode 100644
index 65b552bf975b..000000000000
--- a/net-im/jabber-base/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD jabber-base-0.01-r3.ebuild 1244 BLAKE2B d2395b817577ccb314efe49ae173d3c55b7388e3e1f450c334023f0f426e9510614d166b9f536fa1d42c786924871b228ac6fc7f704664199e3ce9c8809679b0 SHA512 66f7ef9ccfeab3019d2d28929b577dc57ecb583aeb20ba1c8918b328664f74cf770abb7413ad96f84cb5a656d1b8740db3626c5ad2118fe3a89f67d3edcdc38e
-MISC metadata.xml 433 BLAKE2B a4c354f8541c76d06b80b0bb5f5369ddd5febaa60e3e2f14768827ab8ef1bc1276886d585f28c741c56e61e97c167c2f46ba752cc8953eb4fa56ecd2e0f9aa0a SHA512 47904b9cc57064bd3db54de9d49666884e11b83a52a36429a92f16399d65a061ff7ec4cf33eb715c42c57e3ccd266dd9c7de3c268312e7980c82f148aff12249
diff --git a/net-im/jabber-base/jabber-base-0.01-r3.ebuild b/net-im/jabber-base/jabber-base-0.01-r3.ebuild
deleted file mode 100644
index 858d3ba2224a..000000000000
--- a/net-im/jabber-base/jabber-base-0.01-r3.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
-
-DESCRIPTION="Base layout package for various jabber services"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
-
-RDEPEND="
-	acct-group/jabber
-	acct-user/jabber
-"
-
-# This package provides the base layout for all jabber related services.
-# Each service should use the user 'jabber' and the group 'jabber.
-#
-# The base layout contains of the following directories:
-# '/etc/jabber/'	: All main configuration, by jabber services used, is stored here.
-# '(/var)/run/jabber'	: All pid files, used by jabber services, are stored here.
-#			: Please note, that this directory should be
-#			: created dynamically by each jabber service during startup.
-# '/var/log/jabber/'	: All log files, used by jabber services, are stored here.
-# '/var/spool/jabber'	: All (flat) database files, used by jabber services, are stored here.
-
-src_install() {
-	local paths=(
-		"/etc/jabber"
-		"/var/log/jabber"
-		"/var/spool/jabber"
-	)
-
-	for path in ${paths[@]}; do
-		keepdir "${path}"
-		fowners "jabber:jabber" "${path}"
-		fperms 770 "${path}"
-	done
-}
diff --git a/net-im/jabber-base/metadata.xml b/net-im/jabber-base/metadata.xml
deleted file mode 100644
index 3ee268c59de6..000000000000
--- a/net-im/jabber-base/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="person">
-		<email>conikost@gentoo.org</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription>
-		This package creates the base layout,
-		which is used by several jabber services.
-		See ebuild for more information.
-	</longdescription>
-</pkgmetadata>
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7b0a0a2dbdd4..8b84b897c1bb 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index d9bc375d112e..e25f4f05d696 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -5,5 +5,5 @@ AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f
 DIST anope-2.0.10.tar.gz 1809378 BLAKE2B d10323ace767aff19194f7cff353aecbced6122ef72d379d050c8dab3c7013adf6b3e649ffd95edc03bc8ca4873f60ad84991ef0f5c9c454b27ec0eda29edc6d SHA512 2a0e4f14a275a6b986fd224449dddd66584de92509770311262076bd659ba0bbd6e2726fc7a22a6edef57ade5268756ac0c56e6f220fb953ed83e72017d1c67b
 DIST anope-2.0.11.tar.gz 1812305 BLAKE2B cb1579f5483df1207482458d63d5293375310f8a54ed528b749f8355f122a1a71a0c17b9ef82477bd429f0c672746f5d5c28d51e12d8695c8c1c8368fd651307 SHA512 120588a815600abb93b77d3e9cb18527a61e955e9dbc947e4e62c97bac871325863f519d20535882f3eff136743454c08af62fd3cd4825e5a956fd1a4ac4d728
 EBUILD anope-2.0.10-r1.ebuild 4190 BLAKE2B ebd7f27c1a900f9690f5fea4653af896857ff764118c6e79a3ef16f69ff4617fdcc59ff90ba8d18279806e258837b0697eeb3a66270538bc557e1fb23238f331 SHA512 c858baccb2ea3b753b98bb33a4b73c431d6b86acdb902c94e761c15b8f54661da18f291030bc96b117a3a63175f4799ceda12178fd449bd29673eddc8965c47b
-EBUILD anope-2.0.11.ebuild 4192 BLAKE2B 5c9f4e859bb44782f3455908e24e981d591ec292525b5df04bbf6621055b94db3ed02e5bfd62e982662a8a573328544d9009582bc1c8a94e170d3b4dafd38389 SHA512 2e3d9e039a81921ba33e24f9b0a23df1c1cf68b0f747f6c84808d41b5b01deeeec49c95c3e56b81e786721451625845e629c9fcd9aad34da5ffdd6a469670302
+EBUILD anope-2.0.11.ebuild 4188 BLAKE2B 403349a823279d2b44c95f747c6ac6bda078b35baa9896d41a9cc4511b5d17d591acc5f0add365d5fa2c310af7d824eed39d3f3c6c7be3592e98e97af34738e6 SHA512 1c6c108109becd0ad68f5419321639d085c5471866d2b73888c445a5f9a4c9302237c17e8924766ea5471ea19627aaf6cab6f67f28ddab72bb04212e367d0280
 MISC metadata.xml 902 BLAKE2B 4208986846c1165a25f7461e3c996107c1d178827f2d5e8d5ab6d4f6970182b42fb130ed976de90027368bd3d845dcadab00df0b430e404333db0f9d538af0f5 SHA512 8be8f6dc110e8943af544916bcae9fb71f74b40d8930c6496a257e386336b18da16c2cf83f2253e0ac925c9884d4e63bf2995ab907d2e8f1b792809f66b3bdd6
diff --git a/net-irc/anope/anope-2.0.11.ebuild b/net-irc/anope/anope-2.0.11.ebuild
index d692a1a5536c..5638effab5e0 100644
--- a/net-irc/anope/anope-2.0.11.ebuild
+++ b/net-irc/anope/anope-2.0.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
 REQUIRED_USE="sql? ( || ( mysql sqlite ) )"
 
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index cb0fe38c7805..6b0e8f891049 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-fix-build-with-meson-0.61.1.patch 1451 BLAKE2B 0ec6cb1e654e4f9bcecd78980f5d5fe08870fcc4b8b1e35a1b639f9ef718f744365b97628db93d7cba9b4fbeb3df962ffd1e6503f984857220cfb3d2d3004d02 SHA512 96eb969bbf907b0284a16aa7d4b6fbace4a621711765d696f4c173a12822a789c513b8fffa78305d1b277786157e3204d9985b75a3dae58757475dc221e0e975
 DIST polari-40.0.tar.xz 1051416 BLAKE2B ea6aea087ff3ba74e2cf16e848c228c0984eb7e5b7cc16579bbe8ceeb3655babb5dfbf3adbe245b66b590999c5b7e0077630b659d0db00e2da6ce0ac8b0281da SHA512 267eb904286f33e6ac510357de072285889d1c72ca832eb6a8520a20b1c2487708eaa0187d4c91b46b3b8019866f37a9ac036a71dee9cd9c9ad83443df0f146c
+DIST polari-42.0.tar.xz 1125160 BLAKE2B e4edeb2023c2df2e1ad855ceea4dc9e646eca18da61643698410724d1fbe031ee609a30e139b2ab2ad6ddf22d1a4ea0b408b4b93d7ac8874c35c9d49f96f16bd SHA512 a64e1841d91809389af4b1f7eebd1b1e187f9e5f7058a84ab3b50bbbdc3786a7ec89bd4ccc4935473d1de1c40f6dbd6daf30b6bff48dd132e28a4be3e8bfb114
 EBUILD polari-40.0.ebuild 1194 BLAKE2B 7ddf02126d2757b26591715a4658e08ce8ebd36df7529faebe58bd9f1ca0be01e64a9932917b07b8c03ca2be5dceb70c7e6e3b99a077f3db7802908394e437a0 SHA512 78c8ca4908a5cb9750dab715479b67c0d2603e7a0bd8c2d5e30329009ffed2808025d8ea94ced850d828e2ec69f884f0ebf8a9b222038538ecb013386d834e2b
+EBUILD polari-42.0.ebuild 1060 BLAKE2B afab26f6183184a902ed0c51475a7190d9f507dda72e4da44bc96a0968172285ed9f1d9d33dac19dc8e718ef91bbf1a8bc2fa1b72bf53faa8a5d1ead34330d4d SHA512 78aaf253e5aad85f3107458bc1ae174519c081723295a43bf1830b5a47540f803a27264878e758a0b2cdf37cfb24678e4a53e412c14681991c26a36421cb9536
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-irc/polari/polari-42.0.ebuild b/net-irc/polari/polari-42.0.ebuild
new file mode 100644
index 000000000000..2661d7d6748c
--- /dev/null
+++ b/net-irc/polari/polari-42.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="An IRC client for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari https://gitlab.gnome.org/GNOME/polari"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	net-libs/telepathy-glib[introspection]
+	>=dev-libs/gobject-introspection-1.50:=
+	>=dev-libs/gjs-1.69.2
+
+	x11-libs/gdk-pixbuf:2[introspection]
+	>=app-text/gspell-1.4.0[introspection]
+	x11-libs/pango[introspection]
+	app-crypt/libsecret[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-im/telepathy-logger[introspection]
+"
+RDEPEND="${DEPEND}
+	>=net-irc/telepathy-idle-0.2
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		dev-libs/json-glib
+	)
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 8eede053ffa2..0bb3fbb5fc9b 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index c5a63890b5c0..232332b80408 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,5 +1,5 @@
 DIST glib-networking-2.70.1.tar.xz 261312 BLAKE2B bd0fb33e1ad359b36f78c8003ceb15290a9403d978400573ec7caabc44851f83f080d651085b85f7a5836a39c12c499222d8f9ad5bde51e5b24f6344332be1f7 SHA512 a06b4df4481f95193f9ed4be6d39bbe9ecaf4de8e11a48750f7110d4cfa71aa56b7ec5b36af70b7128150447f1a39ce3aeadf71e2ac516f61708f1212f8f855d
 DIST glib-networking-2.72.0.tar.xz 265060 BLAKE2B 2ffb25b059db40fcf9b65b104cd50d81dda9482bc75031d62c10f70eaaa2e9fcfcdfb2b718253255a2565d7b6bc9ead2214167d1b5f482c0ddd3af8573dd2ef5 SHA512 2b42aebcf496f51604005f6f3243ed7e613ab3d485742b7d8af10e103b07eefd8931cc86c1cb021889fe1415ad98bf4d877a3f33203cb53688cc2c41373a8ce4
 EBUILD glib-networking-2.70.1.ebuild 1983 BLAKE2B dea87eb33410d28f6929d8b84babee64927c526afbe96f16e9d004389ee7527b8a2d773485c6077b1597b9df627beca6e3e722634ce42a2ecc9a87539d9ff2b1 SHA512 6767aad2c2bdf36daff61daeaa5f7c23a94af2c977e1d55e0191b00bc99fc857a2d5ac3e1b47d231f512671bad143047c39709c9e534982faaf4f1628e32a72a
-EBUILD glib-networking-2.72.0-r1.ebuild 2011 BLAKE2B 7ceb8c79478b66938a3094d8b65e17a5ce6b418e00c637dc84c6af285fe9977f585950018d4394b12682e1f78daaf7a0d41e2e228adda7da114dc4b00929beb5 SHA512 30ec3fb8ae63bfe1e6ca2c996bb9a38101ff8dca165a94d3835c12ddebde27591ea42528cf275811a2b947a0c24dd53fae9faeaf75c0fc349f17b155f658b7ba
+EBUILD glib-networking-2.72.0-r1.ebuild 2005 BLAKE2B 9208b1d56d0290f43947b77f02711d5ac7ef3ab4f68d8e17a2c62d0febc2ef27ba1841f6fc8a4c0b1b73c1e8cb2d158e929d58854338637bbd2e733191caad21 SHA512 67b944b97ec6991b7764b97fd64d09daad56310cf5fb8777711982b82771645c17cc480478856ec6cf61476ea4ac3fdae399244ecc0c868f77819b82881bf456
 MISC metadata.xml 482 BLAKE2B 6476d4ef1f145739fddc035541725994d4866553b56bb34606863d23c615b33f63db35368ba382fcf9846cb485ee050d850596fc91c72551c5f3798ce240910c SHA512 3dcd22ea3b3fb78f11aead9e57d3a30e4f60e468209729c9e4c4647bf6c8e9163dfaae1a99ca00fed1e46f5288f73c2eb671f480fcc8349366daaa6670357983
diff --git a/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
index f5cb25001455..b84366f8e644 100644
--- a/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.72.0-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.69.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/Manifest b/net-libs/gnome-online-accounts/Manifest
index eeed4ab152d7..046d680824aa 100644
--- a/net-libs/gnome-online-accounts/Manifest
+++ b/net-libs/gnome-online-accounts/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-online-accounts-3.40.1.tar.xz 861220 BLAKE2B 668af9cca8524e25b4f65f41983c527e0cac167317c28f6c451c9c9a6cea18a5774c42acd1cf80cfc707ed62524d1381039fd4f16e3e506d4789372a3db85f4f SHA512 ee7835efe6e1afd6a13f823e17eb93e4a3c55e90764f93a766270ef64f07ed18eff2fce325d8248783d7c6f1c0a7a7fe7512ebb7a8bc0a3e3b33b9037a75b088
 DIST gnome-online-accounts-3.44.0.tar.xz 859564 BLAKE2B 6131094df19d5f282491bd19a97f6e0248b10a5c4db19962a6804523101fb86d6bed7523b46cef91328e0f3c7b6496068594de0689ab1fcb63fd8fb80eece49c SHA512 e70a83b557b816dc7eb22bcd1e4a263044a16c981dfa945a529250ea76e743c9cc73f2ecd4f3006d28a4f3161c7a15dba8bd1416b413c28f4d86d0192755e809
 EBUILD gnome-online-accounts-3.40.1.ebuild 2121 BLAKE2B 3fb1d323c8897a2ca8ceb11e976b7a4a801dcb2d4e7f6c8b6f0155aadaef8efa3c912c948c85911a58ba1471b45fec60ecfbe9fb987050a01f355447b3a8c6c7 SHA512 a3a5aff663fa2c12bd615be67442b9b87b7bc3858f1d7fb5352e6ced75e75b1e2d51c27b1e2a9fe3a73cb210066d5a77fc44103f3e98f2c9cae8fab6716da29c
-EBUILD gnome-online-accounts-3.44.0.ebuild 2092 BLAKE2B 6b7450f2fd792d69b8f5edfa687d9c5df3420616cd9f8fa34b0fa9729b2c142d759518b41686083d1e105c16124ccf57661ca76d2ad11341368dcdbed3d00d71 SHA512 68558763f7670f6d632f7ba223ae73cb9a2e22e77631ca3102bad3dd09d0c1972bac43f2c7da942d74b1f413f650d43ff3828ff72b584750188464b93001e7b2
+EBUILD gnome-online-accounts-3.44.0.ebuild 2089 BLAKE2B 38bb7a0c89c92f4c0ef00b0cb4d935219c59c7b8ccd1681d5140f685a5cb93c1ece18ce0f1a2dec39220797b348ac255a0d70aaf7aa20aeac3096e949e622aa4 SHA512 68e5a9f935256c35dc3bf6c8cc66e0866e850a9125653faa78c1ced29f616096b0809118f7d0b0e72958c8f25a61a84ba32c430c93c9e38fa85317c8f5dfe833
 MISC metadata.xml 380 BLAKE2B 0c3c7edbcff0344c8e7929bf525916d8a6c8bec9628c7c20d9c98e81102525e2651e422e10edf53be338bd2a74b6d42396d9f8c0d1b8bfa2576a319236a07987 SHA512 eb224bd0e6ffb92203f9df3c56449dff3aeebd8623bd451810ac99a57cb84b277e5ba53354d36cede6678be209da55cc30386b903e71dbd90bd91623c2d005f1
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
index 433f793133ef..dbe8f1387ab6 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.44.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
 
 LICENSE="LGPL-2+"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~sparc x86"
 
 IUSE="debug gnome +introspection kerberos +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 574eff929c15..85963aea364e 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,7 +2,10 @@ DIST gnutls-3.7.2.tar.xz 6091508 BLAKE2B f408ff65f2e08cf294b449dfac64a272a8ba40e
 DIST gnutls-3.7.3.tar.xz 6119292 BLAKE2B 811e6fbb62fbd35fa63e66cfcbfc3bf899cea5cece1d2a68bc650f507df0f7be9f59c707c90fa19b7ef5a52455a663da49682704e0884af06075c566afbfc0bf SHA512 3ace744affe23e284342658d6d2d2de49dd50065489cbc8be18fc7d38187253e5268ca54027ce5cd517056c249ac039a7481e4548cec04325de37ae85617d077
 DIST gnutls-3.7.5.tar.xz 6321392 BLAKE2B e7b2da643dc8d5160d1872655ed6771b89587d62132eccfe0b7ce0cc9e81daa27b3608608df3301787d89148a27d321266ac52c1fde06afd2e821575e8805403 SHA512 2e4898e6aeff4f82abd48e6a442f5c9ebe4ecaeb0c038b76e2da8e468f6a7ae37fef5e8de17d90346f29aa0b56a08abf67fe8b81ba09dcf4612cc3b97b830bec
 DIST gnutls-3.7.5.tar.xz.sig 685 BLAKE2B 0a7fdeae9b10382e962c5ea7b49fbb2c0829203bded123597b7718b0cd9483204498a05556da82518f40a4775c90a9b275afdbb4d6a65e7a9396bd0c40ca522a SHA512 1110b859299d13c5121f9c68d6faf099a62b13500cd1c994ac6dea49d69c29a351fd4de42bb66fe01d2e6feef9c3fbd344e8eec0a409c804699d3f7956fe28ff
+DIST gnutls-3.7.6.tar.xz 6338276 BLAKE2B 9f3cce8dfc0b88f2c42d1d2633417dac649a265407b620b6d15967e5210debb99d287ef31d2b9dc37a527ac1e5b9db4c240b98a63293078fbd2e26ac694bf3d3 SHA512 f872339df80ec31d292821ff00eaafbe50e0bd4cdbb86e21e4f78541cd0a26d843596d5e69c91de4db8ce7d027fc639ae6462b57d89fb116162ae63c5a97486a
+DIST gnutls-3.7.6.tar.xz.sig 685 BLAKE2B eae022d6cb0d772e465257411381afd97f3dfd19d6f794a1c3e0f8c3c1232a8a1b91269ca7252a5662782183b11ca393c31efe3f88171a526884400fd0534528 SHA512 c969da9a938b9d29a70cea3b00cce337f9a4c4304aae7f501ef6263894f81a420395ddbe1b005f35dff2e900d3fac75e288f10bbfde0ebea034f7e257bb16d0e
 EBUILD gnutls-3.7.2.ebuild 4235 BLAKE2B 262daac5098ec971880045c668f61e138a2838f3e5b2e18e150bc1917de96b768cbd2716b9585893aa96737f3def5e78c3925a11ca0bffc438ea0ea008b6b70a SHA512 1f5a728084f2bf7bd634a96243b279ca29c88bfd2c51bff13767f158e9168a9f84419eb1270edcd18de0479451e1e59723a329f141c9bf25f7b8cfe7693611f6
 EBUILD gnutls-3.7.3-r1.ebuild 3964 BLAKE2B d334c886ac00f1436cccbcdbbddc4515f6c09d65ae4bd7c2844ddf56da3d4affff1468b47b50e97157423dd8b07d93f480cfe5956472a16da1e00ed97dd70d84 SHA512 3f3cdef700bf11937627ae986d42c945163527f591aba62092b2f5b383fd997cff53f0c0be9b75bf9912cb04d83e07f0de2a0719a8c826e788fb139dec97cbcd
 EBUILD gnutls-3.7.5.ebuild 4775 BLAKE2B 5c2c43d122336f14df9597f6cc801424db4ad8bf0f109b781b7ad57d101e9b7d556e0589e149eecdf23089303d3558e392d765751693b1f0c88a45d4cedeffd4 SHA512 56801bf41c6f9b63e9f6c12728588f98be0bb498b0acdd4142447cc36616c5cf94742a4b810969034eef55273367435f33e8026682787e3992fd05170cc9275b
+EBUILD gnutls-3.7.6.ebuild 4775 BLAKE2B 5c2c43d122336f14df9597f6cc801424db4ad8bf0f109b781b7ad57d101e9b7d556e0589e149eecdf23089303d3558e392d765751693b1f0c88a45d4cedeffd4 SHA512 56801bf41c6f9b63e9f6c12728588f98be0bb498b0acdd4142447cc36616c5cf94742a4b810969034eef55273367435f33e8026682787e3992fd05170cc9275b
 MISC metadata.xml 1369 BLAKE2B 586c5d851b4188a27db257e76ac6676e4f90b932e719f12be0d02c891cd943108a1747cfb572c56bad2489b8dbbe40c5ca6aa72d704e3d4445dad7419e0944ff SHA512 4bc3e4f0e896f75ef489922c9e3d7e43e485fa3b8498c5fe393c28f88c3754b116d5bdb152163cc987c28e168a3b5b9a7213990053e4ba9c80686f71aa655fc5
diff --git a/net-libs/gnutls/gnutls-3.7.6.ebuild b/net-libs/gnutls/gnutls-3.7.6.ebuild
new file mode 100644
index 000000000000..b8d1b4ecd567
--- /dev/null
+++ b/net-libs/gnutls/gnutls-3.7.6.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnutls.asc
+inherit libtool multilib-minimal verify-sig
+
+DESCRIPTION="A secure communications library implementing the SSL, TLS and DTLS protocols"
+HOMEPAGE="https://www.gnutls.org/"
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz.sig )"
+
+LICENSE="GPL-3 LGPL-2.1+"
+SLOT="0/30.30" # <libgnutls.so number>.<libgnutlsxx.so number>
+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="brotli +cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib zstd"
+
+REQUIRED_USE="test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}]
+	dev-libs/libunistring:=[${MULTILIB_USEDEP}]
+	>=dev-libs/nettle-3.6:=[gmp,${MULTILIB_USEDEP}]
+	>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
+	brotli? ( >=app-arch/brotli-1.0.0:=[${MULTILIB_USEDEP}] )
+	dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] )
+	guile? ( >=dev-scheme/guile-2:=[networking] )
+	nls? ( >=virtual/libintl-0-r1:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-0.16-r1:=[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.0:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		seccomp? ( sys-libs/libseccomp )
+	)"
+BDEPEND="
+	dev-util/gtk-doc-am
+	>=virtual/pkgconfig-0-r1
+	doc? ( dev-util/gtk-doc )
+	nls? ( sys-devel/gettext )
+	valgrind? ( dev-util/valgrind )
+	test-full? (
+		app-crypt/dieharder
+		>=app-misc/datefudge-1.22
+		dev-libs/softhsm:2[-bindist(-)]
+		net-dialup/ppp
+		net-misc/socat
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-gnutls-20220320 )"
+
+DOCS=( README.md doc/certtool.cfg )
+
+HTML_DOCS=()
+
+pkg_setup() {
+	# bug #520818
+	export TZ=UTC
+
+	use doc && HTML_DOCS+=(
+		doc/gnutls.html
+	)
+}
+
+src_prepare() {
+	default
+
+	# don't try to use system certificate store on macOS, it is
+	# confusingly ignoring our ca-certificates and more importantly
+	# fails to compile in certain configurations
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' lib/system/certs.c || die
+
+	# Use sane .so versioning on FreeBSD.
+	elibtoolize
+}
+
+multilib_src_configure() {
+	LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+
+	local libconf=()
+
+	# TPM needs to be tested before being enabled
+	# Note that this may add a libltdl dep when enabled. Check configure.ac.
+	libconf+=(
+		--without-tpm
+		--without-tpm2
+	)
+
+	# hardware-accel is disabled on OSX because the asm files force
+	#   GNU-stack (as doesn't support that) and when that's removed ld
+	#   complains about duplicate symbols
+	[[ ${CHOST} == *-darwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# Cygwin as does not understand these asm files at all
+	[[ ${CHOST} == *-cygwin* ]] && libconf+=( --disable-hardware-acceleration )
+
+	# -fanalyzer substantially slows down the build and isn't useful for
+	# us. It's useful for upstream as it's static analysis, but it's not
+	# useful when just getting something built.
+	export gl_cv_warn_c__fanalyzer=no
+
+	local myeconfargs=(
+		$(multilib_native_enable manpages)
+		$(multilib_native_use_enable doc gtk-doc)
+		$(multilib_native_use_enable doc)
+		$(multilib_native_use_enable guile)
+		$(multilib_native_use_enable seccomp seccomp-tests)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test-full full-test-suite)
+		$(multilib_native_use_enable tools)
+		$(multilib_native_use_enable valgrind valgrind-tests)
+		$(use_enable cxx)
+		$(use_enable dane libdane)
+		$(use_enable nls)
+		$(use_enable openssl openssl-compatibility)
+		$(use_enable sslv2 ssl2-support)
+		$(use_enable sslv3 ssl3-support)
+		$(use_enable static-libs static)
+		$(use_enable tls-heartbeat heartbeat-support)
+		$(use_with brotli)
+		$(use_with idn)
+		$(use_with pkcs11 p11-kit)
+		$(use_with zlib)
+		$(use_with zstd)
+		--disable-rpath
+		--with-default-trust-store-file="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+		--with-unbound-root-key-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+		--without-included-libtasn1
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+	ECONF_SOURCE="${S}" econf "${libconf[@]}" "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc doc/examples/*.c
+	fi
+}
diff --git a/net-libs/libmbim/Manifest b/net-libs/libmbim/Manifest
index ce7b6f55549b..81ef9cf4aac3 100644
--- a/net-libs/libmbim/Manifest
+++ b/net-libs/libmbim/Manifest
@@ -1,5 +1,5 @@
 DIST libmbim-1.26.2.tar.xz 561096 BLAKE2B 11e5339b63dbaca8fb6d31ce2afaf4897774aa4b531cfbb09bb400f64ab975495093b711d0a836feff86e3d9fc72ae2b85ab5cd84fab3d266e0fecf1129125d0 SHA512 7cce1fa6ff5630a1cc565a2198544de9f4a1db20b30304fac96de6c698eaf56b17fe6ccb089151623d4484d88fda6abe980bced19dfbf0d3ef425fc954fb5844
 DIST libmbim-1.26.4.tar.xz 566188 BLAKE2B 96fb932e89455364eec39d879256eb10efd4fafc18c0dc69619b3a73cea1e62e3ea50b828c2785082e6422c39d8775c9bc1c084db3aaafdf054b1e7aa7d6929f SHA512 a530a3611aa353d7b7a4a3d845a8a8b08e508004f44e9bc63a4c04729589397e264a5dca499ebb7c57f135e6848909d78124c4799bd932c24271c57824c3b5d8
 EBUILD libmbim-1.26.2.ebuild 811 BLAKE2B 9b19aa6ba3b08db780e51d7316610ff348bc7616601a07a19ba3d7842604d09eb3cf660778cdb8ab93dd192dcf936369ea410acfd813b748582e0ef56e57b74a SHA512 668d3805890a6a154c30adaf8f73ea2ba96d102b287c2bb4a9dbbfcc64ea295827ea7b7c245dd900c8c912d082254d89ee2cbe3936184e499801aa06ba572403
-EBUILD libmbim-1.26.4.ebuild 824 BLAKE2B f5b9d4dedfbbc77027dc61cb0bb5c84c234ff45a7650521b6d4830c8439d79fdb4562901b482f49ffdfc776d32d7cb5fc867bb1c2da7b1e5fc46f158f5871b5d SHA512 111c8391b32e8421d3175b91a7ff653d740d36d6aa0db4c297b737cbda500eeff25b4a1a9f3cc3e0891b44fd26731d9e88665bec863c750265e969b8b09ffc7a
+EBUILD libmbim-1.26.4.ebuild 819 BLAKE2B 41cb2598e9471fc2f6e5600eaf0f13453c872f768b8ffebedf6c235388c04fa842d68792888e68c2f91d82ff92e1cedc790146f5760f10ee79b3ba9d6aeed811 SHA512 17b1a3a4c5f759b6d55fffeef5b4cc468e8369967311ca384b576e5940c36bf33a893653bb9b1b89c2e28005ce1a52931deca4af035a632cd483de4534641dd6
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libmbim/libmbim-1.26.4.ebuild b/net-libs/libmbim/libmbim-1.26.4.ebuild
index 856e09f7d710..e40f58527550 100644
--- a/net-libs/libmbim/libmbim-1.26.4.ebuild
+++ b/net-libs/libmbim/libmbim-1.26.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/libmbim/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 
 RDEPEND=">=dev-libs/glib-2.56:2"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 2f07c5601d47..a7ed6badd632 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -8,5 +8,5 @@ EBUILD libmicrohttpd-0.9.68-r1.ebuild 1276 BLAKE2B 054bf890fc417e7cfae6ae5fd76f7
 EBUILD libmicrohttpd-0.9.72.ebuild 1312 BLAKE2B 789ae7820d0f18794673d6215119b33af8f769de2b48b8ed361f8ecc0faf210689e14a11ca2c60c45d4858a4247afce6e131c068bc1acf139e17a4a366172789 SHA512 4506663bfe461066d74be3e4ba3dffa2e50074a0ed4d1c8f722907ccb613a6a369ad83dc41758bb0631d143e8e963a103300b719f2fb3e93bbdb544cb3e96272
 EBUILD libmicrohttpd-0.9.73.ebuild 1439 BLAKE2B e4c43d565e2827e14c0698ced8ee6cf55f8cf9a1a64005881d4f8dba32cfee051d91751c7ebee2cbe6179fabfd548daa586d48aa8490125d5f3555ad999fdfd2 SHA512 295e483b95e2a0a16922c9ca4155092f0c3d950805fe091dbf779ed20236621fb100f9979b549ea75883de74ee8a7ec3ac121676beddc5ec8b143bb076753a58
 EBUILD libmicrohttpd-0.9.74.ebuild 1399 BLAKE2B c65c16dc88fb965625e895cb9a650d71dd4809103b7204174233827a808a2a27b935574d4dd11b636867b2c34869e4758bdb9b46fad2dc3b0d34e769b048caa0 SHA512 413885fd40f7ab597d3faa5ae853403c841d8150319f353d68a63497cb28a7566bfb8dd90598064172df27b75d43d7aee7a1a05d7ca2a1a65d443b27aa0062ec
-EBUILD libmicrohttpd-0.9.75.ebuild 1412 BLAKE2B 86953b8565eca730a3d036b59f58421531cbe6fdf3e61d49d681f06087c20b19ecd2371053e22e06d11d2594e851add3856efdbe6ca6e97b5322c920cd500f92 SHA512 c3a65ff2ce6e548d0f2bab5c338dc16548e0fa657da9a5da7f7db0b07061aecf862f117e139bcaaa435bce1af6c94ccdb7036522dec819de0b597e678f64ba65
+EBUILD libmicrohttpd-0.9.75.ebuild 1418 BLAKE2B d698536e9e7c249ab06dcdd75779258a0c7dc32dda353b7e0b10cc371536d30849b185cf7fa757d49ed27b971bd51168033205b66a114dfa1d66e78393b7d21d SHA512 6e2b7ef9928368a43566fc0b7bb830cfa7b50aba7e771abf3b1403f85781f0ff19623e405c5b56309131d9e1840f7ce1e0a5b1e879739ee87fe2558064cebd81
 MISC metadata.xml 632 BLAKE2B 1944894dc81e31fc69c406a905d6f2670c62d55938b53da47d98ba4b64795226230671c0ca7188653807def9b182191c817a7cbf5cdcbb07ef2c42fb68e61ab3 SHA512 43ebbf10601c286197dda1f2361f80fc2c2a9525dfbfcfd5870810dc7428143fde1fd9966097a64c2ee1ae792deca17864efdb4cb5a57e57e94cc86dda9cb318
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
index eea63f5a40c3..51d32b6c3fd6 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.75.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1+"
 SLOT="0/12"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="+epoll ssl static-libs test +thread-names"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libnice/Manifest b/net-libs/libnice/Manifest
index 543e6533ff66..3ed3861e4a70 100644
--- a/net-libs/libnice/Manifest
+++ b/net-libs/libnice/Manifest
@@ -2,6 +2,6 @@ DIST libnice-0.1.15.tar.gz 1064100 BLAKE2B 81f06ba599b01084586a8d904b9ae513d6bc3
 DIST libnice-0.1.18.tar.gz 439791 BLAKE2B 6bb68bb1484b4a622a580bc9c66b8be260d2615b211cf7991cb50a9f692df525cd0c3c9fc54ef86534426f396f8d2201966cdacfd3f69ff27193971f95886540 SHA512 08bac05874708f7e7a669d28727d8951a10c464b22dd6fada1a4644850bcf5c4cc022cce46bb24c806086a7869b274c4c7d3d6ddaa9ed0ce0bc2c47f72933227
 DIST libnice-0.1.19.tar.gz 453407 BLAKE2B 7bffde82a3e55d9aeeaadd159d944346a5192871e7f574e278dc43e8171e5fde472cd28186777a0b6cddd8bde34e035794b1c6b8f152c7fb4fae5202025bfdac SHA512 1c63cc0b7655186fd6f83da4dd607183d6ccfab9b7ad7189c1bea2ba7413183f24076aba5d6c7231d2ab3fbd471827256729a8a0c0d1bda48803586e68b3778b
 EBUILD libnice-0.1.15.ebuild 1532 BLAKE2B 30fb32dd731198a8b5b4d14e2dd08ae38af762d215a6d26658bdfc8753c60d1f46efb6ff587c91bf23cd6496f2b862b054e37fe3abf040bf3bef9707d14c9f8a SHA512 8f2b522cb92b1c8be8c413886329acdd8847fb358f222ec79eaf2a07980f1608459ae99211b6be2ceabbc6c1c891013f5710912114a7cd5cbab2b58ec26c6769
-EBUILD libnice-0.1.18.ebuild 1332 BLAKE2B 7b6dd88c449f922950bfba065bc57134be60cfe24a244ede5d5ba3670c6e2be73dd6672abc5e9c34d039ea89b5f1a28b35140ef974435c016e778c644ea259e2 SHA512 5ad68565e121b0dc176f477aeacea793cd7794b4e2303d3f7111e6e6409b0c4f821b9a84d17ae60ec55e1ace32de25b53bc933ac45b233a8d9febdb1b85fff0e
+EBUILD libnice-0.1.18.ebuild 1326 BLAKE2B 7b0f6a530add462d6a6c9db4793aef86281d065c2c3ab3f61460e25838fdfd4aed1191b7e481975046625a96e5d6388e58a10c790940e0bf669acda6bc2f10b3 SHA512 85e1959c6ef1eef8df018b0c8b28e7318dac814619b624c88ee89de6fc4f399626e370fd1bcf6b18b084a9bc2b6f33248de52f342eb133e2b0bf97ceefa1458e
 EBUILD libnice-0.1.19.ebuild 1356 BLAKE2B d7372ff64d7a29f7e4315977e6ce1d1846d14cc210cb443fccbd92814b290c5b37b8d4774eb5a078247228d7bc9f1286abde68baf102c82c66585330d53d2efa SHA512 eb1f43fc7ec009b379f368328e0e99681c6fc37894159d4ac784d1466c27ad891bdc2cf3d80737accd6fcacb7c22caca1b4cd8960ef834e97109533d3034b329
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/libnice/libnice-0.1.18.ebuild b/net-libs/libnice/libnice-0.1.18.ebuild
index 331cc388a3b3..abfac2c0fc2a 100644
--- a/net-libs/libnice/libnice-0.1.18.ebuild
+++ b/net-libs/libnice/libnice-0.1.18.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://nice.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( MPL-1.1 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+gnutls +introspection +upnp"
 
 RDEPEND="
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 0c60deeb379f..6ce24846da6e 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -3,5 +3,5 @@ DIST libnma-1.8.36.tar.xz 1368748 BLAKE2B b60f3d383e5a55a766be8f8df71eb710d68b38
 DIST libnma-1.8.38.tar.xz 1347004 BLAKE2B 108fc7d0a01ca72c84a738f831d442d82990f7b82301de3a47d8331af1e080a33c10806fb75830463fbfb8a4a1f556cdf5272ee52dbc4616ea3dbca1959cd128 SHA512 0421c598ccb6e3659f182b596eec76ffd695e51c11fd11b8325c2d08cb259536d7e74c11bbaac3ccb841016a0bc69a87f1c682b934a9eb569a74116e677eba63
 EBUILD libnma-1.8.34.ebuild 1635 BLAKE2B cede76686b07adc20c43c8234dfb123e4243205425689466317de7765c18d2d2469ac5526bfeee49c7d8ac8fd733af5220ceb876ee6242086d921563cabf2358 SHA512 7f41e954b1c1c55ff2f6f67f4d7c6b22fa73d844e79fde990e0f9cf7d011b3ac480b2d18b1c8a3c0633860e632ddc9cfafaa36b6c9ac19a39dea6deeb12b27b3
 EBUILD libnma-1.8.36.ebuild 1657 BLAKE2B aa3ae34299b238b9be5e03af99dfb56c83eee3026ce2e9974025ecaf889c802f18ae3e604730253189d848e02192a393300f481e691d32d4b729b8fe11a4164f SHA512 d1949a2708d82a59321fb018ecb803ec6c44633da90e7d0824965f0faf7d1b0d3a479f297428eac7d35631b1014d16131579a9b502abbf81a9807bbf75157525
-EBUILD libnma-1.8.38.ebuild 1682 BLAKE2B 5f2d2a76d3a776776cf254135180bd8ae493f74163dcde431cdc5d89da0722bf364392b8597e105326ddca5318378b3e086b5c8e33d0abcdbe3b6ba9c1a3f074 SHA512 434dd3138a59e226de5c97e3de69b5738d87f9f6d52752a19bd5331aea3b8bbd3aeda8680065bb9756c7ac139880387e891643da009393679208cf7877eb9869
+EBUILD libnma-1.8.38.ebuild 1677 BLAKE2B 1dc8995798cef11f1fef18d47f31ab886dac381f22e01c369c340d983a6b78113302ccb24e350c328fa81d1ba504e46e4872fa75f1d0d96af600b330b20fdc9d SHA512 cfbfb9b3a8df382ef3ff0ebb1eafdfb186e96955e5697969f8427e0b8ef52260c4a9cfb998f895287ba86adf843209ebc2cf75188ced78bc4d7e0d98a9be9689
 MISC metadata.xml 373 BLAKE2B 4107438e2ffa5c0e8a276745f518001ab71a5322ac3136fa2b23b1a767958f76c775ea551dd587877512ef18520926cbe74ebad8b36f9c2d4263645990ea3781 SHA512 488b3102778233f87a8fd06bf516ba31d62df2edd22dd9d556e7090483707c00ff12db7d2d372f396d9e5dda9d2f48a77415cf6de0e08c6279a541f43221d68d
diff --git a/net-libs/libnma/libnma-1.8.38.ebuild b/net-libs/libnma/libnma-1.8.38.ebuild
index 76713c40ed01..14a292955aa3 100644
--- a/net-libs/libnma/libnma-1.8.38.ebuild
+++ b/net-libs/libnma/libnma-1.8.38.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 # pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before
 IUSE="gtk-doc +introspection +pkcs11 vala"
 REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=gui-libs/gtk-4.0:4
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index d0e0de5bf253..c21330431ea6 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -1,6 +1,6 @@
 DIST libqmi-1.30.4.tar.xz 1241912 BLAKE2B 561a2d4afd1b65955176490337e4f2335b0468010f0af546ea6026441224fa2713c2e7ed6aab958cb2657755247b75529d390155ef0bfc3aabba738755d28f23 SHA512 969c3e3fc8086c38e9192070eca155f5309947cdd1cfc9b883c27d80c6af2d069098a59e193bf1786260ab4fe4d05375555b5081dd173a88b33d84d409fa4a59
 DIST libqmi-1.30.6.tar.xz 1242612 BLAKE2B 318af914b595f0442f7929be53c128dcd111e12913814bb52e683fff814b7aa00a32d40f8eae367db469a7adef6c146fb692d5908951cec4337f21e9a266a400 SHA512 6dc9819bb45063ea827b989e99e8e889db0ce6ebec62586003ea385bd54bd76f3e79d63e3f2b57e19da5f42ed87d7aa11aa024a805ec86a6b203981eb7922a76
 EBUILD libqmi-1.30.4.ebuild 1235 BLAKE2B 5ae87c213329b62ef4524cfa6467c51a293b47adbfa63c8029ba8644addd9c5fafd2e7cc51912ca92cb0cbe0ddbf605a73e5bcabdf992b24bff99c072aa8bcfa SHA512 3706265a9818b428d44a5e1cce48c43f51d847bc33ca846897520426988f3a72150ac797f3b8a50bd7af3d1ed1365160017c6ee05c37a86bdca1367e0caf6032
-EBUILD libqmi-1.30.6.ebuild 1248 BLAKE2B ca6d2a1424d2141ef895bb1e058b166822dd5390be785a33359cbe081787cd7d92049a8c3026974ea7956b889e910de7d23ea52cfc6109dd521af7dcd5635d50 SHA512 87099423ed0ab44753d09e36f08c1ba2524a86a0bc69be62d8d12357ddb5ac6e52d1296cbc83999ef2d70db9aea87a4eb74d8350b90d1d0f7713034d16c421ba
+EBUILD libqmi-1.30.6.ebuild 1243 BLAKE2B 7fd0850e77b9ec8ab65fac8c72f50e84a7f6c4f9c3e31cd031a35b26c6a579f35d50a2f51acbc153f92c260c2073ac0e39fce7abd400b7dd021e0b25ecd0ebcd SHA512 79f1580132ccf75e8f7d7d10235e1134d27875a81a5a3031366e7dc7b622db0b93558895b20a0083a3d1b94b5301df894042f964c0b6996dc3073cf26d48e4c4
 EBUILD libqmi-9999.ebuild 1241 BLAKE2B 06535ef221353d469c941cf5b72631c6c710d736a0e36ab1f0de059efe5a3c0699dfe6eacf412d6cc706df3aa542935498b499bc7ec050b7c8b65db2b44b930d SHA512 cec2f74bf33bfdb711cbd9ea016aaf6deee725b9e76ad3deebd62f950ee3620d232ea80dbbf1608c806ca222eb6ced511e3e39d117b8484a3b4b171bcf99ed96
 MISC metadata.xml 425 BLAKE2B 95b85fd54d9a2f9836025d60e76d9d51d39f7ff9c08c571b134326bdd69fccdae3f7483b3f3e178bc03939f90a3fafcbf2bc98876b64726172d2bf3b25ce3c01 SHA512 626784480b99bfc5c55ada209c4ee6a8e8891583a34c9f45c1f3ffe3a01b465444e352c3a508b24611a05ea7c4e49c5dbb6157a18d3ac8f478c05871b6ef0040
diff --git a/net-libs/libqmi/libqmi-1.30.6.ebuild b/net-libs/libqmi/libqmi-1.30.6.ebuild
index b391964108a5..b6cd743bf06e 100644
--- a/net-libs/libqmi/libqmi-1.30.6.ebuild
+++ b/net-libs/libqmi/libqmi-1.30.6.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mobile-broadband/libqmi.git"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 	SRC_URI="https://www.freedesktop.org/software/libqmi/${P}.tar.xz"
 fi
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a3b353c301b7..6ee4e1055e4e 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,4 +1,5 @@
 AUX nodejs-10.3.0-global-npm-config.patch 819 BLAKE2B 5e40738091bd1f3f18d4cfb2b3a0b94c87c2a570967aec9d418544c182f2e93f28d2dbe564980a975856ca31ab8c115b28fb9374701889cbebe3bba73d4ac83a SHA512 abe27eab0beb3444186fb3c4ce3c67fbc05b684a606f8f8bc4a5bae570fd8fd988f1ad5d65c442842fb6c7b069dc6e3f82577ba6becb1d934ae1039dac074e03
+AUX nodejs-12.22.1-jinja_collections_abc.patch 3159 BLAKE2B 52de2f76151fffa436bf8a53ef6f38cee0cc566832a31c68cfb8fd36a82a187cebe389041355137b2f2a53454e26b0460bfc8a63154528d51264aa01503db10f SHA512 197ae5b316af6a253614fb0f9cdef644678a9eede770b3443ab417397c40caea1fc00c7300dd67af859ffeab56a851b70778bc68bc915559fab1f3dcb27c0461
 AUX nodejs-12.22.1-uvwasi_shared_libuv.patch 297 BLAKE2B 1f23155371499f891cf796c9b5c8b4c7f69074550ab2de15971a2b53f80eaaeb32aacc661fcd305de68c188302d2ce16db7b702b28fbbfc37b666b370e2159e7 SHA512 31572ac8332a9551d3273516c91665d6064ae905b8676fe12aacaa1f10f3302dc31e41ea328452685be75c4956a1d7f4833df31dca35d8259d0fc13534547de4
 AUX nodejs-12.22.5-shared_c-ares_nameser_h.patch 15742 BLAKE2B e55d3aec80abffc81230ea46619d82d61fd2266ef62a96f39c47d7f9f5b6f61a4e978475c2e963214abdc45d5582d98c21e6be9f926f078108feb5f655b5c88a SHA512 080ede859262f5507a913b1f9995092ed075777e94c73c23ee74d74c739e9b2e6b4cc3afad189a333692f10485e7e3e12a15662286df2c946f73bdd6083baee8
 AUX nodejs-13.8.0-paxmarking.patch 4209 BLAKE2B 35a100bc24b638beb35e021a79c1687f8ddefdadbcf08e41d2f860451f7ec6fe8011afdf0198e8f973df7a0fcedd2f66bd3bcf7389be06c27e265822103fc79e SHA512 10d6206e80e7583ba5cd0977d6e067935dc51c00e3c16246dd4f34720a025d1a7b1a794ab7cd0e6a14d4b6d07438735da8230e2fb849f31e05a3372628d42f23
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
new file mode 100644
index 000000000000..5f0df09b6e2e
--- /dev/null
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch
@@ -0,0 +1,95 @@
+--- a/deps/v8/third_party/jinja2/tests.py
++++ b/deps/v8/third_party/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
+--- a/deps/v8/third_party/jinja2/runtime.py
++++ b/deps/v8/third_party/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/deps/v8/third_party/jinja2/sandbox.py
++++ b/deps/v8/third_party/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/deps/v8/third_party/jinja2/utils.py
++++ b/deps/v8/third_party/jinja2/utils.py
+@@ -482,7 +482,7 @@ class LRUCache(object):
+ 
+ # register the LRU cache as mutable mapping if possible
+ try:
+-    from collections import MutableMapping
++    from collections.abc import MutableMapping
+     MutableMapping.register(LRUCache)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/runtime.py
++++ b/tools/inspector_protocol/jinja2/runtime.py
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)):
+ 
+ # register the context as mapping if possible
+ try:
+-    from collections import Mapping
++    from collections.abc import Mapping
+     Mapping.register(Context)
+ except ImportError:
+     pass
+--- a/tools/inspector_protocol/jinja2/sandbox.py
++++ b/tools/inspector_protocol/jinja2/sandbox.py
+@@ -14,7 +14,7 @@
+ """
+ import types
+ import operator
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.environment import Environment
+ from jinja2.exceptions import SecurityError
+ from jinja2._compat import string_types, PY2
+@@ -79,7 +79,7 @@ except ImportError:
+     pass
+ 
+ #: register Python 2.6 abstract base classes
+-from collections import MutableSet, MutableMapping, MutableSequence
++from collections.abc import MutableSet, MutableMapping, MutableSequence
+ _mutable_set_types += (MutableSet,)
+ _mutable_mapping_types += (MutableMapping,)
+ _mutable_sequence_types += (MutableSequence,)
+--- a/tools/inspector_protocol/jinja2/tests.py
++++ b/tools/inspector_protocol/jinja2/tests.py
+@@ -10,7 +10,7 @@
+ """
+ import operator
+ import re
+-from collections import Mapping
++from collections.abc import Mapping
+ from jinja2.runtime import Undefined
+ from jinja2._compat import text_type, string_types, integer_types
+ import decimal
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 8aa0831cae1b..68f67096908e 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST webkitgtk-2.36.1.tar.xz 27149816 BLAKE2B 8136caed8779c23f872d2d540f3ca934e0e718699c575c893f44c63dac0f5fd59a93ad6cd299531a544719d6b5715c8d33fac3c3288983bcef51a47a2d75db59 SHA512 c0574bd8924df89c1a82905a8c0c09b4be49f75639db659b38fc3123922128a22fa6f4cf099f08ef7742ecefbbde765177a77e00fd641db3a5eb509586e96ae4
 DIST webkitgtk-2.36.2.tar.xz 26444132 BLAKE2B 5ad4f3aad0e5c984a2c18b32faf13b5357828a010b64f35d743f5fc3b45c6912339b2d1996735ca690547c8cdc3aceaeac2c89e104d4addd29ab47aa4a139ab3 SHA512 00849ab0a4f6deca4287d3556ee10d9779197fcb618045174c3d39ff1847937bd3fe4208a39a13c53ebf7e2fe35a915494ddf6bec1120100dfba8695c883154a
+DIST webkitgtk-2.36.3.tar.xz 26600236 BLAKE2B 80c1127e75a12603e3646b840d6fd8cc4146b5a964d9a44966ff7d40e67f8743420c87f3c001f9299b2449f492401d86c02e55395e2db8938ff0e3bbb08790cb SHA512 dfd02e22a58d0080d9bf6c7dd2a710bb9d8698ff8a4226653629294b74cc981a3e35d4d93eed5ebad35c81b339ec8b96755ad0b36c0238da151b359e07bcb692
 EBUILD webkit-gtk-2.36.1.ebuild 7442 BLAKE2B e573bec3b57464a80aec549ad4759418d8a8a0f4ce812e510c8f17ca45bb760d41c0634c63c3973c328e7d4ce4275f01dfac4f77463d3170061f530f44ec0e26 SHA512 2acd23be1757f6e40f6be3e39d9bcc1c4a8ee885a4d621a2775d4ed6befc94d9755e7bd397300af0fc96177c4b3739740c3160532a747c384088013be30811ac
 EBUILD webkit-gtk-2.36.2.ebuild 7455 BLAKE2B 9d9ca1ddaf613095b4a5542eb6e23afe343fbd30df55f75e4395a25435448910ac2f5b5cbd67c64a4552dc0b3e33920eeab50bd651192685fa2626b7746a98d4 SHA512 d166d19990c5bd9e2ca49c642feaf1b710450466b464fa0ea527dcc47739cf04e01dd48f00922c5673b0ba17f1af5ba678f867378309700b2863ba89628f9316
+EBUILD webkit-gtk-2.36.3.ebuild 7455 BLAKE2B 279467ccc502ee5f195b7275fb092969976bc99078782b490958daa04621fa5f9848effe622585c41a10ede9283a9d06c686cf04e9df8948401b450488cf85b6 SHA512 bcde0b8a846aa0fce3429d24cab8b60f138f0ce786382976ea546a9ab904841be14d0f94c2dd068f9c9e070bff204787b46ea518fde1f5d6ae0a79f3fa727fe9
 MISC metadata.xml 741 BLAKE2B a9445f675a7fb64e6e79f49de24759e8f797723c13e7c534e4f209d4116af79bafaeb7dd0132e07638ac6eaea75a7bcf7fec46adf87b8499c271db8899c18bb2 SHA512 53beb5307257e7d22b33c6824237654cab8941da9f3e5393499c3674257b5d94434b87c786491d91e5353058b7f9ffda2af6a094f2ad7f59a210f0896b852bbe
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
new file mode 100644
index 000000000000..4743940081ea
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.36.3.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{8..11} )
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit check-reqs flag-o-matic gnome2 python-any-r1 ruby-single toolchain-funcs cmake
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="https://www.webkitgtk.org"
+SRC_URI="https://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="4/37" # soname version of libwebkit2gtk-4.0
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="aqua avif +egl examples gamepad +geolocation gles2-only gnome-keyring +gstreamer gtk-doc +introspection +jpeg2k +jumbo-build lcms libnotify seccomp spell systemd test wayland X"
+
+# gstreamer with opengl/gles2 needs egl
+REQUIRED_USE="
+	gles2-only? ( egl )
+	gstreamer? ( egl )
+	wayland? ( egl )
+	|| ( aqua wayland X )
+"
+
+# Tests fail to link for inexplicable reasons
+# https://bugs.webkit.org/show_bug.cgi?id=148210
+RESTRICT="test"
+
+# Dependencies found at Source/cmake/OptionsGTK.cmake
+# Missing WebRTC support, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF) and shouldn't be used yet in 2.30
+# >=gst-plugins-opus-1.14.4-r1 for opusparse (required by MSE)
+# TODO: gst-plugins-base[X] is only needed when build configuration ends up with GLX set, but that's a bit automagic too to fix
+RDEPEND="
+	>=x11-libs/cairo-1.16.0:=[X?]
+	>=media-libs/fontconfig-2.13.0:1.0
+	>=media-libs/freetype-2.9.0:2
+	>=dev-libs/libgcrypt-1.7.0:0=
+	>=x11-libs/gtk+-3.22.0:3[aqua?,introspection?,wayland?,X?]
+	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
+	>=dev-libs/icu-61.2:=
+	media-libs/libjpeg-turbo:0=
+	>=net-libs/libsoup-2.54:2.4[introspection?]
+	>=dev-libs/libxml2-2.8.0:2
+	>=media-libs/libpng-1.4:0=
+	dev-db/sqlite:3=
+	sys-libs/zlib:0
+	>=dev-libs/atk-2.16.0
+	media-libs/libwebp:=
+
+	>=dev-libs/glib-2.67.1:2
+	>=dev-libs/libxslt-1.1.7
+	media-libs/woff2
+	gnome-keyring? ( app-crypt/libsecret )
+	introspection? ( >=dev-libs/gobject-introspection-1.59.1:= )
+	dev-libs/libtasn1:=
+	spell? ( >=app-text/enchant-0.22:2 )
+	gstreamer? (
+		>=media-libs/gstreamer-1.20:1.0
+		>=media-libs/gst-plugins-base-1.20:1.0[egl?,X?]
+		gles2-only? ( media-libs/gst-plugins-base:1.0[gles2] )
+		!gles2-only? ( media-libs/gst-plugins-base:1.0[opengl] )
+		>=media-plugins/gst-plugins-opus-1.20:1.0
+		>=media-libs/gst-plugins-bad-1.20:1.0
+	)
+
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		x11-libs/libXrender
+		x11-libs/libXt
+	)
+
+	libnotify? ( x11-libs/libnotify )
+	dev-libs/hyphen
+	jpeg2k? ( >=media-libs/openjpeg-2.2.0:2= )
+	avif? ( >=media-libs/libavif-0.9.0:= )
+	lcms? ( media-libs/lcms:2 )
+
+	egl? ( media-libs/mesa[egl(+)] )
+	gles2-only? ( media-libs/mesa[gles2] )
+	!gles2-only? ( virtual/opengl )
+	wayland? (
+		dev-libs/wayland
+		>=dev-libs/wayland-protocols-1.12
+		>=gui-libs/libwpe-1.5.0:1.0
+		>=gui-libs/wpebackend-fdo-1.7.0:1.0
+	)
+
+	seccomp? (
+		>=sys-apps/bubblewrap-0.3.1
+		sys-libs/libseccomp
+		sys-apps/xdg-dbus-proxy
+	)
+
+	systemd? ( sys-apps/systemd:= )
+	gamepad? ( >=dev-libs/libmanette-0.2.4 )
+"
+DEPEND="${RDEPEND}"
+# Need real bison, not yacc
+BDEPEND="
+	${PYTHON_DEPS}
+	${RUBY_DEPS}
+	>=app-accessibility/at-spi2-core-2.5.3
+	dev-util/glib-utils
+	>=dev-util/gperf-3.0.1
+	>=sys-devel/bison-2.4.3
+	|| ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	>=dev-lang/perl-5.10
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-JSON-PP
+
+	gtk-doc? ( >=dev-util/gtk-doc-1.32 )
+	geolocation? ( dev-util/gdbus-codegen )
+	>=dev-util/cmake-3.10
+"
+#	test? (
+#		dev-python/pygobject:3[python_targets_python2_7]
+#		x11-themes/hicolor-icon-theme
+#	)
+RDEPEND="${RDEPEND}
+	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]] ; then
+		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
+			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+			check-reqs_pkg_pretend
+		fi
+
+		if ! test-flag-CXX -std=c++17 ; then
+			die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		check-reqs_pkg_setup
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# It does not compile on alpha without this in LDFLAGS
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
+	use ia64 && append-ldflags "-Wl,--no-as-needed"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags $(test-flags-CCLD "-Wl,--no-keep-memory")
+	fi
+
+	# Ruby situation is a bit complicated. See bug 513888
+	local rubyimpl
+	local ruby_interpreter=""
+	for rubyimpl in ${USE_RUBY}; do
+		if has_version -b "virtual/rubygems[ruby_targets_${rubyimpl}]"; then
+			ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ${rubyimpl})"
+		fi
+	done
+	# This will rarely occur. Only a couple of corner cases could lead us to
+	# that failure. See bug 513888
+	[[ -z $ruby_interpreter ]] && die "No suitable ruby interpreter found"
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+
+	local mycmakeargs=(
+		${ruby_interpreter}
+		$(cmake_use_find_package gles2-only OpenGLES2)
+		$(cmake_use_find_package egl EGL)
+		$(cmake_use_find_package !gles2-only OpenGL)
+		-DBWRAP_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/bwrap # If bubblewrap[suid] then portage makes it go-r and cmake find_program fails with that
+		-DDBUS_PROXY_EXECUTABLE:FILEPATH="${EPREFIX}"/usr/bin/xdg-dbus-proxy
+		-DPORT=GTK
+		# Source/cmake/WebKitFeatures.cmake
+		-DENABLE_API_TESTS=$(usex test)
+		-DENABLE_BUBBLEWRAP_SANDBOX=$(usex seccomp)
+		-DENABLE_GAMEPAD=$(usex gamepad)
+		-DENABLE_GEOLOCATION=$(usex geolocation) # Runtime optional (talks over dbus service)
+		-DENABLE_MINIBROWSER=$(usex examples)
+		-DENABLE_SPELLCHECK=$(usex spell)
+		-DENABLE_UNIFIED_BUILDS=$(usex jumbo-build)
+		-DENABLE_VIDEO=$(usex gstreamer)
+		-DENABLE_WEBGL=ON
+		# Supported only under ANGLE
+		-DENABLE_WEBGL2=OFF
+		-DENABLE_WEB_AUDIO=$(usex gstreamer)
+		# Source/cmake/OptionsGTK.cmake
+		-DENABLE_GLES2=$(usex gles2-only)
+		-DENABLE_GTKDOC=$(usex gtk-doc)
+		-DENABLE_INTROSPECTION=$(usex introspection)
+		-DENABLE_JOURNALD_LOG=$(usex systemd)
+		-DENABLE_QUARTZ_TARGET=$(usex aqua)
+		-DENABLE_WAYLAND_TARGET=$(usex wayland)
+		-DENABLE_X11_TARGET=$(usex X)
+		-DUSE_ANGLE_WEBGL=OFF
+		-DUSE_AVIF=$(usex avif)
+		-DUSE_GTK4=OFF
+		-DUSE_JPEGXL=OFF
+		-DUSE_LCMS=$(usex lcms)
+		-DUSE_LIBHYPHEN=ON
+		-DUSE_LIBNOTIFY=$(usex libnotify)
+		-DUSE_LIBSECRET=$(usex gnome-keyring)
+		-DUSE_OPENGL_OR_ES=ON
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_SOUP2=ON
+		-DUSE_WOFF2=ON
+		-DUSE_WPE_RENDERER=$(usex wayland) # WPE renderer is used to implement accelerated compositing under wayland
+	)
+
+	# https://bugs.gentoo.org/761238
+	append-cppflags -DNDEBUG
+
+	WK_USE_CCACHE=NO cmake_src_configure
+}
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 85061b9632de..9fd1a3b0ae1a 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index aa89581bd2db..9308f9ab3661 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,5 +1,5 @@
 DIST getmail-6.14.tar.gz 185308 BLAKE2B c74fce627e6a23e0b209dddca690301f80626d9c4489d8cd2391884908e6f1c017602ed23ca4d343e2dd400b911d3f808235231217afd38f96017d8f0d20b3a2 SHA512 b8d2df52cbf145ee7e00ec1dbf589013d3caf8e39a3981e6ae4f1e36fe0b3d3d88df639e03e8697c39e6d00e20ddf1e995ed17f0b1fa1fa2ea52a803c16f062f
 DIST getmail-6.18.9.tar.gz 204488 BLAKE2B 4bf95cec36ce10d5fd6c9fbb6b96923915a13f4b339a9846caafc5602a56612fb9f4b7209a138a03b81b19b7d28328bb46c60165215384650e7dcf98294cc5fa SHA512 dfeaebbca0c8766a16783d27171e65595d97a4b557943677dd7e7a66a9da8b49dfdbfb4aba9655ce3815ff6e2f991905317085b156ba6dbac841bb0fbb26c8b5
 EBUILD getmail-6.14.ebuild 778 BLAKE2B aca076c12f21939cc7db0546db6a6d4b432dc0142b22d1517feffbe044f663ef5b999b04b096fdb6ce267655c4f41fcf24776ab7280f9ada937e479cc65daec1 SHA512 a7ce4ddda04bafe7a04e0e3ce90c5a8b71e4df05e40689b978c88e97d72adf959b66a81eda58132dcf0964225d0985d97a50e4b84558c649f6d343e6b1ea96a8
-EBUILD getmail-6.18.9.ebuild 800 BLAKE2B 381dedc4eb7f97b0860082a85155e182bcd74dc0200631739329982c5f93c87a00f82be61e0145d6e14dcf9dcfbfee8c1b44bb53d126dbfbde1caf585bd90d53 SHA512 c7a677d0d8188dc9092db93fdd6947f749df68ca1b1aafe2daeb745cb4e86639c72166c1552e0176222fd79749e7feff5950a796c9259f0944a347a01656f07d
+EBUILD getmail-6.18.9.ebuild 799 BLAKE2B 19905ca83e4a4988d8afc1c7b97d3d0fdd665c105d63e0367ab2a8f0c19bfdb5890a710c97afe6bb1377bb22a2c0f4f8d56d56bc66ea02cfd6b9e272327b89c2 SHA512 62e07c2b574fff86576512fd5f3ca1ae6d3dbb1f5af8efb88128548262bd51f6610fc21343029cfe6672dc5167e7875836c67e5e694d678f32fea9164c1b0b0c
 MISC metadata.xml 716 BLAKE2B 4e72451457ace0c7335d06a94ad5f01e8d7efcd03520f5c058ab989bd962a8e719c742b23c4628e928197b002578b8f3d92c69d70f55f902b352d159b514eb3a SHA512 f4d28a26166d50307bb2a8d5bb7628725ca8af089043d4f8b40b79f31307b3fea56abdefab4c50af1d486942475b311d1072164f096d0d31b9f9668ffecf0e6e
diff --git a/net-mail/getmail/getmail-6.18.9.ebuild b/net-mail/getmail/getmail-6.18.9.ebuild
index 473959e43c57..734f390f84cf 100644
--- a/net-mail/getmail/getmail-6.18.9.ebuild
+++ b/net-mail/getmail/getmail-6.18.9.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/getmail6-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 python_prepare_all() {
 	# Use gentoo version number (including revision) for doc dir and remove COPYING file
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 09eb48464d8d..c25da7d5f57b 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -2,6 +2,8 @@ AUX aliases 809 BLAKE2B bc6295e7cddae8ee29450f4054992b6fe47f301303be7ea284d42f9e
 AUX common-pamd 308 BLAKE2B 95a2b44b1bd2112da1160cf5c3f993debb85692111e046a79c14f89a83cd82eebc5580ea0375f6548d373a04ac17f214a0135047d99f7ed3cf62f5500953bf6a SHA512 5b7d878969e644aac8aa9355e1a8ff9e2a9c1b07edb5a62c694bd7a4f87961242db7c85b1030540c9ad733a4d3d4c5367a047a188b21517d1d077bec6e620ec7
 AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd37037d3ea10bfab18fb48fae565304bd2eba6fc686da3f3bf71249975e8f8bc9deada66eb3665d20929020d SHA512 3516815034b419bf4fd57a43536e7a25b820013d5339cb818bbbee3f0e8e26651f6b4aefae0177240219e05010ba8a2aaf6d0337220cf176801992204c3216f0
 AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2020fc0affcbc121529c62d9cad1419e42b5a9d95ec3166c3f71385b047827c97acc0cc81d460 SHA512 3be98f171d9b6d891a24cc759d595eb856e28bbe29a2578d409993a6dec33ffd369f1c40bdb143e3e0a3698d009b06d5a0a5d329563c886fc592d58d874eab35
+AUX mailcap-r4 1569 BLAKE2B 33100eb2bf0f0bf1b07584894f3c385635388b8446dba33e7949cbf5ae21c607f4c86360b8d88fd73f5af9323a9ae17dda3c0ab320c2223b15a1eea64588969d SHA512 6c326b4b90f680cd278543c7fdbd086617ce22bba0ecd4de6ab3c06b5da1ae627bdbc782c9a7147d40d49373b3e10d1946dae72e3cdc429345285d1ba0eec257
 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
+EBUILD mailbase-1.8.1.ebuild 1016 BLAKE2B 064e5e98eb89df74bf9ef4dbc54e8cd7a09ba601379019c71d9c0c85c1e99c62d6cab7b54f68a86057c9640a33f196e17db970be2e58da54495a79d7b277c390 SHA512 fddb156152e9140dd892e19c1e3757638ac8abb5341bf2194ac4a6f2a6fa8f28184b2e76d10ff85e4ad031e8d123d78a72a9702f7d35205831b22a576a39bbb6
 EBUILD mailbase-1.8.ebuild 1008 BLAKE2B 548491b99107ec8e4b6a65d5993f4feb4e393ee60d6aae8aa1aae968096eebb26fb63bfda967506b0dd955c3337e941af562ee9c6c7e151e0fd2f9a29f231e3d SHA512 be4f5edcc5f207654560306decfc091e87fa986ccb8e6e8ab9a9ceb93aaccf4b59b0bf007614d1b22e72fd1f107c222e2f423c894eb1e239cec51d11d9287c43
 MISC metadata.xml 273 BLAKE2B b4cfe539dd0b8abaa460e6a58d4eb4abca02c82a3174ed097dce35389b4d6aa0f80c0ae9fcb6cec3b57b0d5de6e8105f569a7872193177fade6a3ca96939ef9c SHA512 ea73916029216f884fa542103def24e21b8e7bd9efd6764554d14e7c34e0d4b289c39bb81b07524dc3ce87adc5abfd4c421a965506c583430e134e235f26012d
diff --git a/net-mail/mailbase/files/mailcap-r4 b/net-mail/mailbase/files/mailcap-r4
new file mode 100644
index 000000000000..8c1bd310e3de
--- /dev/null
+++ b/net-mail/mailbase/files/mailcap-r4
@@ -0,0 +1,30 @@
+# Database binding MIME types to programs that can process them.
+# This file is generally used by mail clients to view attachments.
+#
+# Users should add their own rules to their ~/.mailcap file.  That file will be
+# processed first before falling back to this one.
+#
+# For more information, see the mailcap(5) man page.
+
+# NB: Do not quote %s.  Clients will handle expanding it with proper quoting,
+# so adding quotes ourselves just confuses things.
+
+application/pdf; xdg-open %s; needsterminal
+application/postscript; xdg-open %s; needsterminal
+application/x-info; info --subnodes -o /dev/stdout -f %s 2>/dev/null; copiousoutput; description=GNU Info document
+application/x-gtar; tar tvzf -; print=tar tvzf - | print text/plain:-; copiousoutput
+application/x-tar; tar tvf -; print=tar tvf - | print text/plain:-; copiousoutput
+application/x-troff-man; nroff -mandoc -Tutf8; copiousoutput; print=nroff -mandoc -Tutf8 | print text/plain:-
+# It'd be nice to limit this to compressed formats (e.g. x-*), but the file
+# format doesn't support that, and less has good fallbacks already.
+application/*; less %s; needsterminal
+
+audio/*; xdg-open %s; needsterminal
+image/*; xdg-open %s; needsterminal
+
+text/html; lynx -dump -assume_charset=%{charset} %s; copiousoutput; description=HTML Text; nametemplate=%s.html
+text/troff; man -l %s; needsterminal; description=Man page
+text/*; less %s; needsterminal
+text/*; gview %s; edit=gvim -f %s; compose=gvim -f %s; test=test "$DISPLAY" != ""
+text/*; view %s; edit=vim %s; compose=vim %s; needsterminal
+text/*; more %s; needsterminal
diff --git a/net-mail/mailbase/mailbase-1.8.1.ebuild b/net-mail/mailbase/mailbase-1.8.1.ebuild
new file mode 100644
index 000000000000..31a62191a865
--- /dev/null
+++ b/net-mail/mailbase/mailbase-1.8.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit pam
+
+DESCRIPTION="MTA layout package"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S=${WORKDIR}
+
+LICENSE="GPL-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pam"
+
+RDEPEND="
+	acct-group/mail
+	acct-user/mail
+	acct-user/postmaster
+	pam? ( sys-libs/pam )
+"
+
+src_install() {
+	insinto /etc/mail
+	doins "${FILESDIR}"/aliases
+	insinto /etc
+	newins "${FILESDIR}"/mailcap-r4 mailcap
+	doman "${FILESDIR}"/mailcap.5
+
+	dosym spool/mail /var/mail
+
+	if use pam ; then
+		newpamd "${FILESDIR}"/common-pamd-include pop
+		newpamd "${FILESDIR}"/common-pamd-include imap
+		local p
+		for p in pop3 pop3s pops ; do
+			dosym pop /etc/pam.d/${p}
+		done
+		for p in imap4 imap4s imaps ; do
+			dosym imap /etc/pam.d/${p}
+		done
+	fi
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 9c6f56cfb72f..825c2d4b5f3f 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 8f0aeed8db81..48708b43f39f 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,4 +1,6 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
+DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
 DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c
-EBUILD electron-cash-4.2.9.ebuild 3775 BLAKE2B dfe001d97367761e0e52aa6fd71ee920d2aeee002bfd09271f4762a91977dd35e0eed526788b5a64333722965875258e21113ccfde742610a8ead8795108672a SHA512 7bd3f132e1c06741c4d73d5666b10bcbaed4fb09fafc0c865e5b5e87e74b3f8696e3bbefb16257ede285202c8ecbf9e25973be7f6835d688a2d68b1e07449080
-MISC metadata.xml 1042 BLAKE2B 7ed8b7ef3098f98149ca20b79406e3b9dbb2e55899d298758158e86d894c34df253ad2c110761502b34c034b8809cc5903c145de3542040741e664deda303a91 SHA512 9c44cb6b0a6327971390648732b32085e267b3d284be712de7772b1539babb02aec1fe9da74b393dd795d008af913b32331278602f21a12cdded9d5353585264
+EBUILD electron-cash-4.2.10.ebuild 3785 BLAKE2B 35214f7792a4dbfbfdaccb802a5e95b5479ca8a3dfec6763d49feeea0874267e87102b9258cd2fa3d087d31aa393a5df8bccee3a6f38ad64ae1984ab6d0b422d SHA512 9c2b44d48c6236a98457cfc90952a7ef1aecd444a3247076e590234bfbda5ee22f86981e213b1172657c01f3fb54bd99c32f38e3f983b5965a882f1112ca2c40
+EBUILD electron-cash-4.2.9.ebuild 3736 BLAKE2B 923872b101367b68dfcb37ff78150e7824d7e080b6985ea0821c65cc7bc430d6791dd4e916f98cf893f4277ed2c7b6b3182e67f6f2015bd464a532c6a7496ab2 SHA512 e103992e65ea1d1d6c188aecaa674264e208cdaf18dcec20216d407f4b9714efaa624c121008dc46bc8a602ac40945e90ae603f5a96abf740c234ef3dd5f7882
+MISC metadata.xml 981 BLAKE2B 10c823bd62005a00acf1e410e78a5e2917af126f1cc4c98608ab8277570c4defe53b3e282168189ac3c18634860a93b664c83cde1959553b0182069830c6f3a3 SHA512 30538ee18680bf39e49cc434977376b6bce2be717204781d2e17dffcdcfe4970a772834474511c12b94906d05f026882d3b6ffde8dd3992eb1030d3ee78c77d6
diff --git a/net-misc/electron-cash/electron-cash-4.2.10.ebuild b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
new file mode 100644
index 000000000000..fc56ca7c306e
--- /dev/null
+++ b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+	l10n_es l10n_ja l10n_pt l10n_zh-CN"
+RESTRICT+=" test"
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	amodem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	net-libs/stem[${PYTHON_USEDEP}]
+	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+	dev-libs/libsecp256k1
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	if use qt5; then
+		pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
+	else
+		sed "s|'electroncash_gui.qt',||" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		rm -f "electroncash/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die
+	done
+
+	# Remove unrequested GUI implementations:
+	local gui setup_py_gui
+	for gui in  \
+		$(usex cli      '' stdio)  \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm electroncash_gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' "${PN}" || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex amodem          '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r electroncash_plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electron-cash/electron-cash-4.2.9.ebuild b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
index 5a6a8226cb0c..ab269027a1f4 100644
--- a/net-misc/electron-cash/electron-cash-4.2.9.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
@@ -17,11 +17,10 @@ SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
 	l10n_es l10n_ja l10n_pt l10n_zh-CN"
 
 REQUIRED_USE="
-	!audio_modem
 	|| ( cli ncurses qt5 )
 	amodem? ( qt5 )
 	cosign? ( qt5 )
diff --git a/net-misc/electron-cash/metadata.xml b/net-misc/electron-cash/metadata.xml
index 30b925e7f44d..213f5fe41bbc 100644
--- a/net-misc/electron-cash/metadata.xml
+++ b/net-misc/electron-cash/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="amodem">Enable plugin to support Audio Modem</flag>
-		<flag name="audio_modem">Deprecated name for amodem</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
 		<flag name="email">Enable plugin to support emailing invoices</flag>
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 1210e12b18b9..3229e3c2faa5 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,6 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
 DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88
+DIST electrum-4.2.2.gh.tar.gz 5071636 BLAKE2B a13ae03e513736e5f24ded46a9b6ce13312a7d9243082f1d5b1948e7519f40f1fab238ec73550f72607ff2463a54a31f47c6ab8e511efddfcec362d5e427c6c1 SHA512 ae39ca0b548f3e4c7454096a7a05f9400a738e3b1c217ae9d41bf6156f7d642d3f1911f97829bfadbf6fdb6873538f38525363d256b363dac41d378c6b41002d
 EBUILD electrum-4.2.1-r2.ebuild 2412 BLAKE2B 36f5445b5542899758480636ec24c1274201f926077305e871dd69420b235ab2ced4cd18399f09a24610f124cd8100b2b624016800b358ec600442a5d177511c SHA512 06273dd7ba69bce1f45d00527ab203cb34afe7f3dfcc2558e5add727337989889ca9b533599e67d7a8e84a232bed63d2b0941ea3e096d5768f725dcc137b53c8
+EBUILD electrum-4.2.2.ebuild 2414 BLAKE2B 34c2a467c6ce919693bf15b54451df0f9326fbc690821f8271410c507a983b4d51cca09df2bc00666a644505951f224af05430faf92b329ae4fcfc47fc65075a SHA512 02e1741c17c32af254c4ed5b231b475238b68b8a6d9894c538d99f29c0cccc975d8da456e1e952d0b38858767d6dde1dfab4d495e6e542e9600f777f4c4fd44d
 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
diff --git a/net-misc/electrum/electrum-4.2.2.ebuild b/net-misc/electrum/electrum-4.2.2.ebuild
new file mode 100644
index 000000000000..24459edb0784
--- /dev/null
+++ b/net-misc/electrum/electrum-4.2.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="
+	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libsecp256k1
+	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/bitstring[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/PySocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+
+	# Prevent data files from being installed in the wrong location
+	sed -i -e '/icons_dirname/d' -e '/applications/d' setup.py || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	eapply_user
+
+	xdg_environment_reset
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 electrum/gui/icons/${PN}.png
+	domenu electrum.desktop
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/frr/Manifest b/net-misc/frr/Manifest
index 7379cb88b45d..6b03d10a8490 100644
--- a/net-misc/frr/Manifest
+++ b/net-misc/frr/Manifest
@@ -1,8 +1,6 @@
 AUX frr-7.5-ipctl-forwarding.patch 731 BLAKE2B 9c97d7fdc7b7facb59a73f4b693c285ebd91cb0ba8f7fea0ef49d5eddd8660100315ca7d74ece8d553cdd8ad79a9a0b1a4c173c6dedf90e0be2bdc72d948b2be SHA512 56bdeb8a1f350fea3ad8ed0cdba28964b00384878853e584746d8ce80c6f9ea5ca5adc4539e314f7fd82203c08d5f2ce6adeec61dac9a7a28282131d0d371447
 AUX frr-openrc-v1 7078 BLAKE2B d5c0276540fa09318f6e92575dd7e03f3bc6ebfce186d062c2d65fa49c502b3b4de0fd32914ce7c4708bb6f6188296f75d387e0384c142381bb77cfb706c7e1c SHA512 8e6f0e58863402f0169b8a7625d049bf85db60bebe40a42dfb450a1bddfcd6f8f436002de6c1ff599c8f848e4ba85a70e4058cb55a9a49fafb1e69a8e7eb9f57
 AUX frr.pam 969 BLAKE2B 227dc91f51fab504229fa5489486fed1aa393d33c024849724ea3fb934e3fd78ee6c9147240133d458ec52021f13e8a27a2d8a0b4625415007c4595222b815ee SHA512 9a169d58232eba7481aee83d92b4e104b6c4ca95e5b31befe29117fbcebc187ad87c061f37ec7c571ff5702101a329ae0c113cf714e2d0dcd39ca4212734a9ed
-DIST frr-8.1.tar.gz 8514995 BLAKE2B 6b70756909b54af3317b1e97956345206612a471893dcfa4d4a7edaf27ae8d94624b0129eb511bf96ac100cc8c5c5234c2f7031d1692f4a81d5025fe797cfd11 SHA512 dcbee55b48e9d4aba005a455f8c89e63a86d63a230e6bf2e1f691adf99654e0e170efaf2c8759e0bfc33b977659a828bed248370722210e98a6e2abad8f502aa
 DIST frr-8.2.2.tar.gz 9439460 BLAKE2B 7ea4b44e3d167677e087ac8767c470b91c485e52f9e45513fb6da8498ff3c56e84dd90257eff3b0067c061e7596578968017cbec7de7ea951b6f80134332e1bf SHA512 52d8e82979823f61ec6f117db1eb41b23fd8ad3197ae3f9d2cfa3ad9d96636a3d2f0b36720b2041a9261c8b639ddd48e46a2351ce41cb596f7dc432cddf29256
-EBUILD frr-8.1-r1.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
-EBUILD frr-8.2.2.ebuild 3475 BLAKE2B e92fefd9d1326b742b21c96b47c18500736c7642ce745e07998ba17c48532bb97a48c47e6f3150cc65415c13995b86ef30e4382dbc165acf71e1dc56b931580c SHA512 a6e7eb0600f1d56df1446a2fbe988898c37397c61c02c5c3b13a98b5995664fd8f57c0fce2ba1ca91712f22cb0be84ce9864c0c214336d22dec57c3d7f04650f
+EBUILD frr-8.2.2.ebuild 3473 BLAKE2B 9f3639c7f9eb192cce91e0f7ed3ea0a310c66f64c33bb6c32e735698fb62be4e93eb31c8148492e44541be1ac63b358e1f5aa677988431967efe53cd02f7a381 SHA512 05a86b3c5166eee80145301923cefecdb4586d6dfb4a906cfe199f6dc31ba59fc0567e24e14ace48ab661becc6d46b0cdf9984ccc3bd2ffeaaf386d00a680aee
 MISC metadata.xml 767 BLAKE2B ce7920e238d443a1ede5f38b323c86dc2f4e24d5efeb6603a59e8ec9a0d083cdc8e6162d7d3e9463b29bf786b26e00aac19c549ddf943b16175897fb94265516 SHA512 29dd8aa5ad6706a53e00c14feea8e7a75d10ec453dec715a495a75a0390661c268d5a5fc10acdb26d050a0d804162930de79bf0e41a499b803a4762442b8a108
diff --git a/net-misc/frr/frr-8.1-r1.ebuild b/net-misc/frr/frr-8.1-r1.ebuild
deleted file mode 100644
index 930f7303dc8f..000000000000
--- a/net-misc/frr/frr-8.1-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools pam python-single-r1 systemd
-
-DESCRIPTION="The FRRouting Protocol Suite"
-HOMEPAGE="https://frrouting.org/"
-SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz"
-# FRR tarballs have weird format.
-S="${WORKDIR}/frr-${P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	acct-user/frr
-	dev-libs/json-c:0=
-	>=net-libs/libyang-2.0.0
-	sys-libs/libcap
-	sys-libs/readline:0=
-	virtual/libcrypt:=
-	grpc? ( net-libs/grpc:= )
-	nhrp? ( net-dns/c-ares:0= )
-	pam? ( sys-libs/pam )
-	rpki? ( >=net-libs/rtrlib-0.6.3[ssh] )
-	snmp? ( net-analyzer/net-snmp:= )
-"
-BDEPEND="
-	~dev-util/clippy-${PV}
-	sys-devel/flex
-	virtual/yacc
-	doc? ( dev-python/sphinx )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-	test? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/ipaddr[${PYTHON_USEDEP}]')
-	!net-misc/quagga
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.5-ipctl-forwarding.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang tools
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--with-pkg-extra-version="-gentoo"
-		--enable-configfile-mask=0640
-		--enable-logfile-mask=0640
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/lib/frr
-		--sbindir="${EPREFIX}"/usr/lib/frr
-		--libexecdir="${EPREFIX}"/usr/lib/frr
-		--sysconfdir="${EPREFIX}"/etc/frr
-		--localstatedir="${EPREFIX}"/run/frr
-		--with-moduledir="${EPREFIX}"/usr/lib/frr/modules
-		--with-clippy="${BROOT}"/usr/bin/clippy
-		--enable-user=frr
-		--enable-group=frr
-		--enable-vty-group=frr
-		--enable-multipath=64
-		$(use_enable doc)
-		$(use_enable fpm)
-		$(use_enable grpc)
-		$(use_enable ipv6 ospf6d)
-		$(use_enable ipv6 ripngd)
-		$(use_enable ipv6 rtadv)
-		$(use_enable kernel_linux realms)
-		$(use_enable nhrp nhrpd)
-		$(usex ospfapi '--enable-ospfclient' '' '' '')
-		$(use_enable rpki)
-		$(use_enable snmp)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	# Install user documentation if asked
-	use doc && dodoc -r doc/user/_build/html
-
-	# Create configuration directory with correct permissions
-	keepdir /etc/frr
-	fowners frr:frr /etc/frr
-	fperms 775 /etc/frr
-
-	# Create logs directory with the correct permissions
-	keepdir /var/log/frr
-	fowners frr:frr /var/log/frr
-	fperms 775 /var/log/frr
-
-	# Install the default configuration files
-	insinto /etc/frr
-	doins tools/etc/frr/vtysh.conf
-	doins tools/etc/frr/frr.conf
-	doins tools/etc/frr/daemons
-
-	# Fix permissions/owners.
-	fowners frr:frr /etc/frr/vtysh.conf
-	fowners frr:frr /etc/frr/frr.conf
-	fowners frr:frr /etc/frr/daemons
-	fperms 640 /etc/frr/vtysh.conf
-	fperms 640 /etc/frr/frr.conf
-	fperms 640 /etc/frr/daemons
-
-	# Install logrotate configuration
-	insinto /etc/logrotate.d
-	newins redhat/frr.logrotate frr
-
-	# Install PAM configuration file
-	use pam && newpamd "${FILESDIR}"/frr.pam frr
-
-	# Install init scripts
-	systemd_dounit tools/frr.service
-	newinitd "${FILESDIR}"/frr-openrc-v1 frr
-
-	# Conflict files, installed by net-libs/libsmi, bug #758383
-	rm "${ED}"/usr/share/yang/ietf-interfaces.yang || die
-}
diff --git a/net-misc/frr/frr-8.2.2.ebuild b/net-misc/frr/frr-8.2.2.ebuild
index 44fb6e2685fc..930f7303dc8f 100644
--- a/net-misc/frr/frr-8.2.2.ebuild
+++ b/net-misc/frr/frr-8.2.2.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/frr-${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc fpm grpc ipv6 nhrp ospfapi pam rpki snmp test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index 89ac26938a39..ea3f5a061a10 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -1,8 +1,8 @@
 DIST gallery-dl-1.21.1.tar.gz 432380 BLAKE2B 58267dad8af16cb8b03bc7532e934e15c510f8ac36a92cfbf4cf48791634973fa68dc0c1fae8968a5df1a340833980ef032c8c47fc2b2ae4c7b9018bf2d6b197 SHA512 6725937e81ef0ff6b3ad2718f51eb7be09ce364584b16be6031e5608f6b58b366aa96cf0616974147d4ec101825cdedbed8c8790970040f4f80e955847772901
 DIST gallery-dl-1.21.2.tar.gz 434114 BLAKE2B 2f1335d0745c3fd3de95f9f3005fc67f079fec16925b7ac8fb3f2e9c8521139e56bf18675e15e7e0edbad2889cd7fa895552e8b40d9f1cf6bc555894c8d1da48 SHA512 11615ebb3cab5a6d9e042a94cf802f3781af6166eb199ac22f70a0d3351299bdc82dda212a3a363c323e0edb6707355fe9b6f3d89a851037a8f6ebc12894558f
 DIST gallery-dl-1.22.0.tar.gz 455543 BLAKE2B 1f3f8cb30c2360a9218bea5521a2aedf74a17b82d973b5f3f3f2cfb0580acec1346c34df36a7f3465e641efadec4a599a7cfe35111a860f11238d6de49d1fb5a SHA512 c621103562ad008327c1748b5ce0b49b4832511e1e2e12ee8656f49d1ae57abb133268ff6024a96a961de0949eceabd2b069441ceef9d30ea50e9bf52f846907
-EBUILD gallery-dl-1.21.1.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
-EBUILD gallery-dl-1.21.2.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
+EBUILD gallery-dl-1.21.1.ebuild 969 BLAKE2B e8df2558fdeb053b34e55fb7b8281c3bf06391f2887bf0ad2117de4f98af4768b03fb1aac05dfe8323e9b57b2dc44473cce7d5c85cb51d3c448badb7b663a4cb SHA512 8a60bddae7d2feacd7e4055974d50793d8fec7b49e0cb64f3de65f01f86341988dd459551bb3dca052c64b0aec97084c1dd5fdcd24c941427e8a87e2934c5839
+EBUILD gallery-dl-1.21.2.ebuild 974 BLAKE2B 3dd0f3237021fab7f2822b807187aebf48d69960f7980d3071d1aa7d1bba249703c569e500b739416a16d13620107e6c9d73875188c6763b35ff045bfc40c9e8 SHA512 b62a9f89f67d8182addb4616bfd0d43b867ed0a5825348d9973f14596f91e1a080adef162ae89d950b2ed6ae8cef112110907ca80ea82ea11ff2285ed46a60bd
 EBUILD gallery-dl-1.22.0.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
 EBUILD gallery-dl-9999.ebuild 976 BLAKE2B f0505742e4f1b3bd00d7fd0f403d3bc4c559cd01ae1ea89183e9515e36d0c87926b4275dd7b2ff5fd2fa9fe4d7e75870743f9bd32b9c8aafd3915ebe7c7410c1 SHA512 c2127643d9829404d17114457dbaac1b3ca392a0c51958367fe0dd3a34e8d964589ef8835714ad7be35c0391c32f3f02409176dbe66fe6d56654e0bb889ac394
 MISC metadata.xml 722 BLAKE2B d44c3a3cc18ecaceb2e112a314c63bb913448516eec1118a86a4c0e770ed6dca322d4653358bd78b0b3c0dcf10007e1c5d1033dd9d5996f6d6f3dc5659280f74 SHA512 7a95345138c738aec445af215a3381308a40bcc1475d2718880cc124795237bff6bbc4312e63b5a135815b17b37b1b130da90b81b895c16f3f86de4b51fd3f40
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
index d424151deeb1..2290b4caea08 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
index d424151deeb1..4fb3e482e72a 100644
--- a/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.21.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/mikf/${PN}.git"
 else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
index 63272c416725..52cd1be0a6fa 100644
--- a/net-misc/gnome-remote-desktop/Manifest
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -2,8 +2,10 @@ DIST gnome-remote-desktop-41.2.tar.xz 111000 BLAKE2B 1d6dfcc9860a5253cfb2a8111c5
 DIST gnome-remote-desktop-42.0.tar.xz 158448 BLAKE2B 35c5458ec314d7e3abc60583d136e18296609af2caac658cf936685085b6f8b6725bc453336131293dadd1b548d110a4cf5cf8871fcb80d838212e60e204feb1 SHA512 3bf03fc96205df4c5efcef0e340ad85e7011ad8e4fecf2e29d9902fbb1633801da7d1094645e850267249dda9383ae0aa782f3e0207a7351d764482f2d0dc349
 DIST gnome-remote-desktop-42.1.1.tar.xz 160632 BLAKE2B 9686a9fc626c7bb5cb57196ff24ba4c694edda2a9419697283746afaf166f57511e2949699cb92885e44687bf528dde0060b559c87a7fa623a0df4bbc83f7ce0 SHA512 4fbf9305aa7339d9e7fcbf8df8eea97ba675630f6d01ef9a9f049ca3a3bf930f26b0e993ffe386682906d719b15058ce752e4592a3e710ceceb977000ebb1ce1
 DIST gnome-remote-desktop-42.1.tar.xz 160320 BLAKE2B 6f797a49cd0e17f3a553b6bd63d32d22cfedc633230ab13cd464a8755c77a14cd26a5eeb7872573b527d3fa84ff05347ea50dc798aef2f631749c29076b8bf53 SHA512 3e17d6482941fccfe6860d2ca2db50235ee70a26fd8942ee1850addb11006cfb152dd949102a4c573f2b6a29f9f2bb78c9ad5be1cba8622ad5b54f82c509376f
+DIST gnome-remote-desktop-42.2.tar.xz 165452 BLAKE2B 110d456dd6f91e00584755425b8dbad1e02ad9a0cef7a7325fcf8438c2e5cd64238fff7da17c6724f6b17ae24be4456e8470a2b519968d044386d3bf4cb36ab4 SHA512 620f2119bec845bf93226b1b873519c5609b7b6212232b33de2d1c420160378ad917c7b593b00c3e15a3b3c3788f3300ef89a226952afb6dae40f9fcc6782e16
 EBUILD gnome-remote-desktop-41.2.ebuild 1195 BLAKE2B eb6178bfec196d8139080fa5414f5d90670ccde2fa80bad95fa6c9f1b13b5ec59195e4e28935b32ecdd06dcb2955878280a1462917938911dae6028c903d2f1c SHA512 887d7d4ca98c987088f287c0baaf99e559b07fb92d15899a0dc2bc07dd1a2b351d8c8fa2c6fd11661ecef368692726a2945782750720f02b174daf3d4e6edfdc
 EBUILD gnome-remote-desktop-42.0.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
 EBUILD gnome-remote-desktop-42.1.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
 EBUILD gnome-remote-desktop-42.1.ebuild 1260 BLAKE2B 19090e2c2377fdc1b9a048422e1eac61e686390666d5f89125413de5e1eae9bc40c725ab636508b9a6c17b01e87babbe0ce20b074e64ea770521cc68c4d3314c SHA512 edb68cc632781ba078cfc2ca503b27f32c6a4d3f6a9daccabb0ebd979df5e8f0b265dc18a912732edc638124fb76731f9232fb9c2b19ea015c2427bbc84b72c4
+EBUILD gnome-remote-desktop-42.2.ebuild 1260 BLAKE2B e16100517cfefbade34a12ff2d2a68491a345c5be6e6396fee0471ae41457daa641a5a644d1c38440c6d5579abb86b8162c97b11f4cea240b750b339dca3b68a SHA512 d07d5b6a60cbafc21b979904944105b8e3996a21e5e88661d66246022ea7e968e0dd35b720c3f697ab77dfd8d1f5df04793821864ac1b3b042fbdbbf07f3e023
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild
new file mode 100644
index 000000000000..b7ff4b497493
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-42.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-remote-desktop"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+rdp systemd +vnc"
+REQUIRED_USE="|| ( rdp vnc )"
+RESTRICT="test" # Tests run xvfb-run directly
+
+DEPEND="
+	x11-libs/cairo
+	>=dev-libs/glib-2.68:2
+	>=media-video/pipewire-0.3.0:=
+	app-crypt/libsecret
+	x11-libs/libnotify
+	media-libs/libepoxy
+	x11-libs/libdrm
+	rdp? (
+		>=media-libs/nv-codec-headers-11.1.5.0
+		>=net-misc/freerdp-2.5.0:=[server]
+		>=sys-fs/fuse-3.9.1
+		>=x11-libs/libxkbcommon-1.0.0
+	)
+	vnc? (
+		net-libs/libvncserver
+	)
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use rdp)
+		$(meson_use vnc)
+		$(meson_use systemd)
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 9e72479189f1..375e4493a935 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -2,6 +2,6 @@ DIST mobile-broadband-provider-info-20210805.tar.xz 83756 BLAKE2B c7872a4bbb9c0e
 DIST mobile-broadband-provider-info-20220315.tar.xz 84068 BLAKE2B 69b1805cdac393d733c7c4bd033f623d01260abe9be97108b1f7525a1e96935dd6b6582cd647e415a4f6329988cc105a220fbd3672b0d8c719e298ac53e0bcac SHA512 92da9e03f48d1a3e5807cab616627d0d31539dfee5c9650f78c5eb4371748366700ffe26f922ac061f877cd1bd5c3fb766e71fea0677eee007e68873c39c597c
 DIST mobile-broadband-provider-info-20220511.tar.xz 85064 BLAKE2B 7abb1d493cc39b9988a188edf260b5440bc8cb9e0879897df550ee63cb46c52721ee75dee304bbc93add3173a7ff56bd17bccf8dd062590ae583cee67e9093ab SHA512 7b3a9c0a2e618ef3ef0e29b947ab9f0a55f30bd738f0e976529e8f3ddbb60a738f623e718ea67fa6e6008275dbbe78ce3ed9852c005748a266f04e3dd65179a6
 EBUILD mobile-broadband-provider-info-20210805.ebuild 481 BLAKE2B c3c19e8e6fe775978d4d6e6f711263a79cb5b1e4021db4134fd7605b09dbb4bcd2f99dfc19a189c492f1bc5b9ca0f996283d4c28b72cdee87ed48f04efd992a4 SHA512 584d39732abe9789cf94ec2f0a74c769e4119b9660685ae078b337dc5fe67cd580a55f6580d34546e846d6113cf06017b3ad641afb1cafad4a1ef8c4189b246f
-EBUILD mobile-broadband-provider-info-20220315.ebuild 488 BLAKE2B 53964ee3d58e66980dde3d952e25295a648fe86b48693ecd13c59be8c999bc349ec55cf893887a898b2be0b05c81994b07161b8870efadb9c4a296202c2eb247 SHA512 58f291acd42c78dfaddde0f3d96ccab717710dae8f35ccd373bab5a564d1b62eb98cc3348a7f55ad5d7baa12c3c172ddb855f913c29fe734c9c7571b7f4d9bfb
+EBUILD mobile-broadband-provider-info-20220315.ebuild 482 BLAKE2B 6333c33afe55a89a108a3f8895f63f2d09b8035fb2c5ba9f81e37891f4f3d9014de52dfa76de3e012f2f767bbff8182fd8a81785b5409eeee9fee83676f96ff8 SHA512 2107215cbb8569a1c0cead2b7336213717aaf3847af39ea173eeb20e86a8392d85c97c6d6ffedb6085e4dfcf871628c37561dff2891a255b63353defae28957a
 EBUILD mobile-broadband-provider-info-20220511.ebuild 495 BLAKE2B 965640686d3108a286e6532ac320e4dd31dfeeaa193fee9c39be04c6820db7a03f7b9ca123a761aa42669f0efed99998ff0f7deac1c23fa033caac11e137a778 SHA512 728c18ba169f3e451f02dae6d69db50c3a12337ec6c4dd054472c74ffa6a1ad693d565f159244121373a479e0b893a1fe696218bbbfc45b53c5aba208c873701
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
index d0704be34ed8..a313c4ad453a 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20220315.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index affcbee00c0f..97c133ace883 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -3,5 +3,5 @@ AUX modemmanager.initd 234 BLAKE2B 391d7b1809b86d33bfd3a37dd2fb953b3ed34152e9149
 DIST ModemManager-1.18.6.tar.xz 2519572 BLAKE2B 022e461d43a10bfce8d97f39b855cd28e1d165d07ec65db15c4ec3e89d932829b8c88a1834d182bc966c22f0d848cb6bb06bae2cc2930f685c9fa43b277668d9 SHA512 3b154d459e1196494d7f99303f88088215992aadb57a8cc66f838b068e762fa3d25f19a597922c26a138f670e1da46d627de11cf41d83ce96b3197a086f8e91b
 DIST ModemManager-1.18.8.tar.xz 2533392 BLAKE2B 7e95aa2303b55524174475ace96e0b938d2ac9abee0867bb56c6405f3460e73fad0ab68e50361c148551401ff2450abe70733616534507251cbaaee41ee02028 SHA512 fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c
 EBUILD modemmanager-1.18.6.ebuild 3997 BLAKE2B 899f0debecec6c84737ac6abcf6a1bbf09b2caa9c112d138836817acf583d398369791c081362dfdfcd5cdad4f2899334506ba39e0390972f101c6bda6a8ae88 SHA512 3c6d50fb4c231fbaa57394d8a04edb627815be67aa6acead2caa5e8f57e5f5a02d81546a9d6ed86bf28484a826181f6a0c7eee6116ea3eb3dac9aca5b53975c6
-EBUILD modemmanager-1.18.8.ebuild 4036 BLAKE2B 8f26d8ca6d680cf1c74ae528dc77d24d2513a0f2b6c3892ee4538311ba636c52bb14d1d225838d56b4e0f271744fd4221d9c3c613114160c68aa4af64c786193 SHA512 3e6ff8a3d7805eed337aed7f2bde1c65ba729d86411dd475aec8d3544a9c922ee769523ad4a4c8c27b521ed08c6a78eef4133f08c949c94c76dcccfb78cbbcec
+EBUILD modemmanager-1.18.8.ebuild 4031 BLAKE2B f0b35c51094ae44e853973587f09b778b46bf6be2e4c510623b4f0b0cbe1d54da5c93c06ca9812a5bd182b5ec7db5ccfd7f4ac39e76beae6b0ee75dda3469ac8 SHA512 7361e81d92f815d6a7dba29e4d29ef1ca7cadd0f67e19e853e9ae9f8a907285849d83e008c9dbb6c4b7264718c0823ab151de00b1b60e57409714bf7fc6da67b
 MISC metadata.xml 432 BLAKE2B f9a84e1bbcd6bb14effe1d41ef9eddfdf5b10ccaee4cfe041ac2f68e405dfdffe4930d5e701f9808d62832253e3255498425df53b6c652fb313365f260765433 SHA512 57f8df2fc04eea86d59a03e151dbd1df719faf3fad8c2ff6b8a74567ea01c0c30a1a92d4bd29db29116b4cdb8b688821f4fe62b81a89239c68ca884b160cefee
diff --git a/net-misc/modemmanager/modemmanager-1.18.8.ebuild b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
index 8c0c002a115a..f54a32214521 100644
--- a/net-misc/modemmanager/modemmanager-1.18.8.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.18.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
 
 LICENSE="GPL-2+"
 SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="elogind +introspection mbim policykit +qmi systemd test +udev vala"
 REQUIRED_USE="
diff --git a/net-misc/ndisc6/Manifest b/net-misc/ndisc6/Manifest
index ef25c18f2b6b..f051ba1cebfe 100644
--- a/net-misc/ndisc6/Manifest
+++ b/net-misc/ndisc6/Manifest
@@ -4,5 +4,5 @@ AUX rdnssd.rc-1 502 BLAKE2B 39875eee2e81627e0e603bc01e552622e219af3bb18fede1d6b8
 AUX resolvconf 148 BLAKE2B 7e11d5f6d87fdf2e60ebb2b308663c51d4683cc389ba9640cd026da5ac99dcdd196c9e7dc4733b77da58285fe3fd6a0eab9d0a6b9695eeb8b7cf54aa17c560c8 SHA512 ba04b2ae327a1136122bf68929fee7946bc2938ce335cfe3c982ccb5bc4d53a66154dad65d79eeb47fd3b306cf203e69aa0197f6751ae5b0e021aff6d7f01ecf
 AUX resolvconf-1 152 BLAKE2B 1219e02e170a1cf279a1497e12269061659af7c61d662adb9beab39e772068d597a5f63b6c1f39efa5001c5f8d1014cd2f265cb3e49c3163ff38d9205126dbcd SHA512 cdba5bbfa69a8288696f14d1f7798445769bf37c6363cf0bdeb2aa162ff5c83728f513917c7649e3f6493bfc9cf437e0c08e460a87b80604fa31dd599441ef83
 DIST ndisc6-1.0.5.tar.bz2 263243 BLAKE2B 638e47e2bb1671a0bdd53edafd65acc774f068442dd6ade398e8bcae5630353f64b753b04237443aa6a6ea27de36206359e93e308fe5e610a4133ed730d71dd1 SHA512 d2742fee8202da988fd6d2b4b811125a4ab786b645b96b3a1fcfe248a3d9a39706055cf499c6cc742decfa5c3dbcbaac28ae01a50b9ad3ec10906dd468fec47e
-EBUILD ndisc6-1.0.5.ebuild 742 BLAKE2B 147ff868afcf1211b70b5d4808459b1e4662031c14f18734f1fe599ed1ce4ee436b8d9be4dedbf8954aebd66e9e07c658fa7012f7dfaeb89245673289a2a56fb SHA512 6ed0c43c574b5c478b7dea8ab1a0701739c554fbcd1fa078996fe5d99e9f698ee32a5ba4c4d7b2f8d09a29040ad6708c9e77641c90ab0402511a2cf8319bd7c1
+EBUILD ndisc6-1.0.5.ebuild 749 BLAKE2B 7d7f3647238e0a2a42f584bb5ae1b20f6230b4f8fa3c823b008a0701f12ed527820c741479788fd7c96f6fe193bc81979887428792ae70e77a009617de0b05ce SHA512 64b2890d31f5bbc6bdd7db9ed59a8381df40f74ca29e98009282206442c6dd4b720dc2fb3ea3735dad54c5ff828b3d57ae3b024ab7e2c9e66b70a36b446b999a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-misc/ndisc6/ndisc6-1.0.5.ebuild b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
index d4cc1091edbb..3e0dcf8b5974 100644
--- a/net-misc/ndisc6/ndisc6-1.0.5.ebuild
+++ b/net-misc/ndisc6/ndisc6-1.0.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos"
 IUSE="debug"
 
 BDEPEND="dev-lang/perl
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 77402dfb1f0d..b10b05163bc5 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -8,6 +8,6 @@ DIST NetworkManager-1.36.4.tar.xz 5433152 BLAKE2B 2bb625381bc5a816a9fdc51498721f
 DIST NetworkManager-1.38.0.tar.xz 5431664 BLAKE2B adc298681e339d6cfac9c7310a94a1b11bc7f5044a0b2a129d5ab764bd5f29ccc604bbc27c49d52ceab9e2e6dbd923a686fbaf96cf20c73438d680fa5659e5ff SHA512 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
 EBUILD networkmanager-1.32.12-r1.ebuild 12157 BLAKE2B f41710a7b10d2869c5227e3f3059050616445073da2c93e5b503d417867950aa48f25483dcbf052cee0b42c4fa03d01b757afa1352ea27bf3b54956d2db093a2 SHA512 0d345d32d59aae9a5ac30ed4170e474479c441dd3b83ad83988c47826438b3ed50ada13bba73a92c4cc846fc9a75a17798281df711a20bf8f24424383932bc04
 EBUILD networkmanager-1.36.2.ebuild 12422 BLAKE2B 83ab78809afd86c015c8d9a70d2ebfa4d7c2a8b6ec64c3f33ea4364865d9e50c8daf69d2806b6953463a3c40b299276c85bba42e89cfb6dd0f1eccb7113256eb SHA512 a13101efec79eacf7175cf37b9dcc165d2927fe5135c33c28df26cd53e58cdc40a87061925506b6165e73212ccdafa49a580db632389cdcb68cd6d07a055f225
-EBUILD networkmanager-1.36.4.ebuild 12422 BLAKE2B 246ed312b874ced5d1dcfbd0dce2e96eb252f9627dac000f7983ccaafa526e419245ff77b79ef92b60f71fcb94a34a2c2e3d565f12aa5437eac68921ba5b107e SHA512 e9698d31d78e5a6bab1ddc83f47c62cffd7b5f2b887540cc765fe0ad274d169d1fd743266b93d5a09d3b34cce7a003084edeb40e3d1ba1228730e8ae72ccd1cc
+EBUILD networkmanager-1.36.4.ebuild 12417 BLAKE2B 2655dd3bd4dcac3c4ddc7206d7a54ed036feffad4c7943bc9d9b56efcc9668a182afdc0418d08933074e5e763451ec26cdcd17c686c18b162c1edadeecfd2b51 SHA512 053a380840676435cde570b8b5fab8678f23c635b28c4e35b6b336873940acaf94ed1a0b70b730655b1e0424e168d339a3adaf05c41d52873b3b502f8b9c01aa
 EBUILD networkmanager-1.38.0.ebuild 12443 BLAKE2B 08a72bf84b2792dac2a690c0a0a19ee909966d2e467f5918c7b9d915ee49e79f9718c0969d05a1c2319e0d2465febb6a744ed18f74df290fcb49a03d5a508094 SHA512 431bb6002ec3989720384ba005a2787ba47629d2edfa602c030c0e347464d2b705f1cab3be24815f31561ecfa77cd94ea6c5c5a812805d641a8231effaeb55f3
 MISC metadata.xml 2377 BLAKE2B e665210ad074426373296d0164654cd793c0fad1eb71ba68ede73ecbcbb17c1636722a7676bc5ccde93d0a8b7c75c170a3cc0bfe1f06305984dc630e8c0e0b2b SHA512 e43a86d9af9ff0dbc2d701b59f29ffca279f9a3adaf3fd3473f170827c15e77a454e6f5df554028c300e13dd536fdee0528acab62eb706f7061a3600b2e9dad3
diff --git a/net-misc/networkmanager/networkmanager-1.36.4.ebuild b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
index 400242fc95b3..617a2d56b33a 100644
--- a/net-misc/networkmanager/networkmanager-1.36.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.36.4.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="
 	?? ( syslog systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 COMMON_DEPEND="
 	sys-apps/util-linux[${MULTILIB_USEDEP}]
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index e76768f8ff65..a5aa938fa565 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -10,6 +10,6 @@ AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0
 AUX ntpsec-py3-test-clarify.patch 993 BLAKE2B 85df81d6301e3f057601bbb2e01590a11cefe338b8a309d37818524896cb694d9a479ab80613763bd2c779680ccecc06526dfca87370409372788ba9254b9003 SHA512 3ac296a2329b2a9dede51499a75f82eeae1870ad5dbd769b7ea1f3d4634ff2512fda8383f7d3adc6fa1a4fd03e035cf0b52157639ca21f458af161fffbf6a0e4
 DIST ntpsec-1.2.1.tar.gz 2681237 BLAKE2B bfb2674131718dcf9f393e93d1148cfb6631591dbcce1ade91746586f261123b80b238393ac2a763fab119cd627f8eae4b006b023ad2b319e752db9eb4b04cc0 SHA512 0b8b0bda52d3025f6e9a06c00b1e0c25c595ada72b87ed0e5d3d6f77a034f557745156bc6d9a263c9876c041efffa38d42fa93ba8bfda31f67efbd842a726277
 EBUILD ntpsec-1.2.1-r2.ebuild 4434 BLAKE2B fc33f87243be18fe8ccf1faccc5aa261a162656e8c675fedaa333631ae85c95ca59bf8a06b24c4a3b3e46ab669bc026ae164afdb2a507f3e19b2cef3c7139602 SHA512 d564a533817ad9a54c81db43b8ab1e09dea2f8aa749c930662e2912bb0e058d9fdc835ab22599d403fe34dc85c6a1a25fe0635667ea8a6cf12cd9d5718baa507
-EBUILD ntpsec-1.2.1-r3.ebuild 4686 BLAKE2B 648e6194976a9a9e237f49c5fc05e7fab7bb777ffc318887d137f0222ddeaf14aee9785d03d574bf45cd2503c0e80605eb9badc4ff158c360a83444db41ebaa6 SHA512 270c6e2496e250f9871a16f74438aa709105c2da06f0df0459cdafc8692543ddcb2e2e7b44af85c66d7c33badeeae6647f9592165fd8dd9ee2f066014d22d49b
+EBUILD ntpsec-1.2.1-r3.ebuild 4685 BLAKE2B 3a6e0e8b0a143613e460dc45f209d729e84c8f641572089f1e1fbe97eee41df7dba6199c176e7ec0bc521b7982dcf902d8f91c1b2d512d7ec5683e9990ccffa0 SHA512 94ac0d62ce80b5ee7c9fd70742fd09f24c926eb761218cbca2b89df64a97feedde8bb6a15d1316091c46bf7e787a5ba5741fa01a5d5540ee0abab7445684d953
 EBUILD ntpsec-9999.ebuild 4534 BLAKE2B baffc367ed04fe5042e4acad1c7172e280f49e9f391f409f14bc4511ae02d3a1927c3c4f2198e7bedd64243c81ff8e75b797faf8b04f8c1b92cda922468f9843 SHA512 979c140c15e1c7f6b99c21fad33d825961e22306031d6ada7775d0af35f35391af33007049359a8b66b983cf0dc178683c8f5db62cd42600fb10f15826f31f12
 MISC metadata.xml 1902 BLAKE2B d807dc3dae199835bfa1624e76b43e39a1392f07d736ab5936c48bd4cfd69fdc1bae71a02c3cd9f405aa0992e7ebe27f5ffb639eafed027deba96eaa99ace391 SHA512 a29e4dfebcda69c393487ccfccdefd2b9e4e5c63591d2ed7c008b54b7c04afea071938fd2e0ce6c67f26ccecf427053b1a2b8e946dfcc3e092f64d00bc28aadf
diff --git a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
index 69d38d6263b9..400b27367022 100644
--- a/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.1-r3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index ed97830d7f5b..2a01cdc8ee18 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,5 +1,7 @@
 DIST putty-0.76.tar.gz 2735687 BLAKE2B 7994a8ea4eb735091e92438fd9558b1047b2ddffe53e3cd2ae7c182e333d21482de7c1a549b738d00af1e592e078648b153fa095a9e5310ee4a884c0cc9fb896 SHA512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25
+DIST putty-0.77.tar.gz 2619481 BLAKE2B 83b0838a3923c93f95020297d6402872605609da81d33f864d72074d1e5cae2fcf2710a038aef1de56077de2e296f4c5e573af077f4b55e433563f680cd9cc4b SHA512 35eb1e3f98a07611365bedc492c69a5475ce9b3d920ecebc78c76813505684c16cfcbfbb2306c1106fb5a9b72ca3dd52cbd39b9e9805c6689c9a9464910c0e7d
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.76.ebuild 1702 BLAKE2B bf252a9a45fd62cd5c791c99ecfd055e2343ccdb75ab5dc3a21f7738aa2ad2014b7a8e203dbd4030aae05311ad87394af83eb9efe8c0bb65d563383e9bb59beb SHA512 0e5d4e5507610e9d905e5e9c0304747d07002618c698c6b73413e82302c3b12c4ce8b66dd1aa9101c36e39d1bcc63185d124a7e81657f9900193574d19b93883
-EBUILD putty-9999.ebuild 1748 BLAKE2B c19463b704de38bc5226c6f37b58aeabeb888a85f5cfcdbed00d32f525241daca1b7382a7f7f0a7c86fbbd1c2ccda92481a209e353afd6760c9b9dcc14441af1 SHA512 f18023f6866e116aae2b6cc9aa92cd3421942d6396768321bc44da8f88292ea50a38999053bb015914cc23af37d52b275cb0d7dad7c7a5ec15412ffe7f70ed23
+EBUILD putty-0.77.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
+EBUILD putty-9999.ebuild 1836 BLAKE2B 371707bb25ee6363fe7a2744762fa5d3b53201845d77c6f4df977e56b547ae54ac7639d2489f46931f42660e31773a3463a6f4508ca018ddb4c9821526e26f80 SHA512 3d1c3b6e2112d31c4c872eb1dec125dc3643e662729702d8d355687809224c29edb3da90c65fdb5e9e536f5f27b4c554af14bcf521383c79f9315d501d2abe0f
 MISC metadata.xml 1011 BLAKE2B a759a93b5f4affdefc2ad81edd6a9c15fa31feb5b549d23a56114e7a9937bef6e60aa6b630fba223043cd0909e8052dcb3f1e848199399aa1f249b9d4dd59715 SHA512 3c48cbb3dff26aee751960ceccb5214c97adb60c68eb67fe69a2c6ffa059b2defeb66623e85da970c4fa0668fafa5c4b61404685fcc3e6d5b803944d11ea9bf9
diff --git a/net-misc/putty/putty-0.77.ebuild b/net-misc/putty/putty-0.77.ebuild
new file mode 100644
index 000000000000..a09ae7ae4600
--- /dev/null
+++ b/net-misc/putty/putty-0.77.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake desktop xdg-utils
+
+DESCRIPTION="A Free Telnet/SSH Client"
+HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+LICENSE="MIT"
+
+SLOT="0"
+IUSE="debug +gtk gtk2 ipv6 gssapi"
+
+RDEPEND="
+	!net-misc/pssh
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf
+		x11-libs/libX11
+		x11-libs/pango
+		gtk2? ( x11-libs/gtk+:2 )
+		!gtk2? ( x11-libs/gtk+:3[X] )
+	)
+	gssapi? ( virtual/krb5 )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+"
+#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
+
+REQUIRED_USE="
+	gtk2? ( gtk )
+"
+
+src_unpack() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
+	default
+}
+
+src_configure() {
+	cd "${S}"/unix || die
+	local mycmakeargs=(
+		-DPUTTY_DEBUG="$(usex debug)"
+		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+		-DPUTTY_IPV6="$(usex ipv6)"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	doman "${BUILD_DIR}"/doc/*.1
+
+	#if use doc ; then
+	#	docinto html
+	#	dodoc "${BUILD_DIR}"/doc/html/*.html
+	#fi
+
+	if use gtk ; then
+		local i
+		for i in 16 22 24 32 48 64 128 256; do
+			newicon -s ${i} \
+				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+				${PN}.png
+		done
+
+		# install desktop file provided by Gustav Schaffter in #49577
+		make_desktop_entry ${PN} PuTTY ${PN} Network
+	fi
+}
+
+pkg_postinst() {
+	use gtk && xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	use gtk && xdg_icon_cache_update
+}
diff --git a/net-misc/putty/putty-9999.ebuild b/net-misc/putty/putty-9999.ebuild
index 97dbfaea150f..a09ae7ae4600 100644
--- a/net-misc/putty/putty-9999.ebuild
+++ b/net-misc/putty/putty-9999.ebuild
@@ -1,18 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools desktop git-r3 toolchain-funcs xdg-utils
+EAPI=8
+inherit cmake desktop xdg-utils
 
 DESCRIPTION="A Free Telnet/SSH Client"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
 SRC_URI="https://dev.gentoo.org/~polynomial-c/${PN}-icons.tar.bz2"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.tartarus.org/simon/putty.git"
+else
+	SRC_URI+=" https://the.earth.li/~sgtatham/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS=""
-IUSE="doc +gtk gtk2 ipv6 gssapi"
+IUSE="debug +gtk gtk2 ipv6 gssapi"
 
 RDEPEND="
 	!net-misc/pssh
@@ -30,62 +35,47 @@ DEPEND="
 	${RDEPEND}
 "
 BDEPEND="
-	app-doc/halibut
 	dev-lang/perl
 	virtual/pkgconfig
 "
+#[[ ${PV} == *9999 ]] && BDEPEND+=" doc? ( app-doc/halibut )"
+
 REQUIRED_USE="
 	gtk2? ( gtk )
 "
 
 src_unpack() {
-	git-r3_src_unpack
-	default
-}
-
-src_prepare() {
+	[[ ${PV} == *9999 ]] && git-r3_src_unpack
 	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	./mkfiles.pl || die
-
-	eautoreconf
 }
 
 src_configure() {
 	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR="$(tc-getAR)" $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_test() {
-	emake -C unix cgtest
-	unix/cgtest || die
+	local mycmakeargs=(
+		-DPUTTY_DEBUG="$(usex debug)"
+		-DPUTTY_GSSAPI="$(usex gssapi DYNAMIC OFF)"
+		-DPUTTY_GTK_VERSION=$(usex gtk $(usex gtk2 2 3 ) '')
+		-DPUTTY_IPV6="$(usex ipv6)"
+	)
+	cmake_src_configure
 }
 
 src_install() {
-	dodoc doc/puttydoc.txt
+	cmake_src_install
 
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
+	doman "${BUILD_DIR}"/doc/*.1
 
-	cd "${S}"/unix || die
-	default
+	#if use doc ; then
+	#	docinto html
+	#	dodoc "${BUILD_DIR}"/doc/html/*.html
+	#fi
 
 	if use gtk ; then
+		local i
 		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
+			newicon -s ${i} \
+				"${WORKDIR}"/${PN}-icons/${PN}-${i}.png \
+				${PN}.png
 		done
 
 		# install desktop file provided by Gustav Schaffter in #49577
diff --git a/net-misc/rdate/Manifest b/net-misc/rdate/Manifest
index 0e162827e1c2..e7bb7b8336fa 100644
--- a/net-misc/rdate/Manifest
+++ b/net-misc/rdate/Manifest
@@ -7,5 +7,5 @@ DIST rdate-1.10.tar.gz 19159 BLAKE2B 71c858b5eb10b07a2974fcb463a91808fc59582dfce
 DIST rdate-1.11.tar.gz 20210 BLAKE2B 0ff4abebe08f33b45c753dd2912c36e3895c1745b2d78340c7574116f50cd4d05364c5bee97e883b7ad587fcd5261931d928689cd583aa86b43aac408d2a4a6d SHA512 916952c26cdd51c8666bf62cdd823cf8a07fd4487fbf73213d529525b31a90f056120ea2ff16e6d37ea7c662853ba3c15789fef90724b2dbf17c21a6ff3f415d
 EBUILD rdate-1.10.2.ebuild 857 BLAKE2B 8970e5d2d8a0e6b77addb0b09d25ac975a8c10e34e1615a6780eae75d2fa1761434b81810c3c9524c3c78df854852548925457e7d713e935d03877266b4b58cd SHA512 a0fc238d98e0217ff2a79faf32570d1018dbe3e2c3339e3da8f5151dc55ffa4619f9e3bc295f5dddbf0f8a4dbfe768118d092344e0afc2cde6e3a072c1e6968d
 EBUILD rdate-1.10.ebuild 743 BLAKE2B a3241a2734fbde24280b2a78cbd91b11151d7536504ef01229dca386198c524f417b7c4714e1788a77ffe77515fcbf2b9c92cdb3d0523d1f899fc20a866a29ae SHA512 582511eb5b1c66b6575a4cf7f2e8a9663013a612f25943213d392e418e1f3b8b0786cb8ce45446b84250c3336c0838e72b6a220b2ba78ed7a687c89b4655b480
-EBUILD rdate-1.11.ebuild 757 BLAKE2B 99e9b843faf42effa76c1e50d7e1efe409491667c892fa0cdc3146f3523d013e454bf50f71da4cee30617d3a67baf5b5fc93911a315fbb4e6ed22e195dd5fbb1 SHA512 154f5d2555e26072c89ba0110656a49023b85b8a80cb95b7b34325537129fbb4139d824dbd3932ea1a5006921c9aa1a8278c33c849319690571a305afb160514
+EBUILD rdate-1.11.ebuild 764 BLAKE2B 82c6407b5e4ff389857f66b33792e639dd20edb9084d9225dae9c8c4b8f59b45ba0ff8ad0914024d50c6605d7bcbf484ab6d807b89789c833fff06c5f542b3ca SHA512 ab3fa9c687842fd1954fdc1f34da576e8686ac83e308473386fa2543715b8609836282167be95c0887d46e46ffa4b2b9850ec75bfb470419dbb876cf478d0c61
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/net-misc/rdate/rdate-1.11.ebuild b/net-misc/rdate/rdate-1.11.ebuild
index 91f7ec9ca122..29e33f3c2cd9 100644
--- a/net-misc/rdate/rdate-1.11.ebuild
+++ b/net-misc/rdate/rdate-1.11.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
 
 LICENSE="BSD-4"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DEPEND="dev-libs/libbsd"
 RDEPEND="${DEPEND}"
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index 0bba6866b818..f103b42516e3 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -4,6 +4,6 @@ AUX rdesktop-1.9.0-gssapi-check.patch 332 BLAKE2B 618723ba40cd536556eafdebd44a4f
 AUX rdesktop-1.9.0-rdssl_rkey_get_exp_mod.patch 783 BLAKE2B 0bb5f27486f31ed7150271cebb5e901e013b05d22106304304d5bac0e3d5344265779152cf74878dee7d3f7cd30f3e6e47356598eea94ee4a8fc7d3c8490c9bd SHA512 d408c0cd4ab31edd6246e41d173426993ec046810c83753eef005eaa018d72dbaea8de8738a099527a08e7248904e18ed29a8eb04e9a37a0e8939699e247f485
 DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.9.0-r1.ebuild 1749 BLAKE2B 23e0faddcc839ce9ef8bbade80f66a642d2804cbdc12eca2b70cd41700ce6248b5e5d6490b1616e92b0fd1d0a2d895117b8136abc5f3bf8fbe7c7fc73db6bf1e SHA512 39fb5a3187dfa26161da186b26821c2c6d33fb9b242056a706cfa920b41a01307f799043d14478e6e723f6ecae350201e7adf2ab2bee088de6dea89b576c1b01
-EBUILD rdesktop-1.9.0-r2.ebuild 1788 BLAKE2B ec12da46b590b92ba54db4c475e8b7c0e46d9d714aea353636de859ec6f868cee495d9875b493b2eabeec7f4e34802d82701a4925e490e3e58572f66ecdd3fcb SHA512 87d3b47cdc4378b7dda51a17d9c750c89cb6699570c3d5c503c3c0722f3f06e2d400fbfcbbc2423d985e58a0aed89dd4e96c5aeb60d67e87b034ec8d0ded5e8d
+EBUILD rdesktop-1.9.0-r2.ebuild 1795 BLAKE2B 0b27ac660fb99ea8417d3daf3ab4788c82b4b6bd7a1767b137130ba39449f7f2eefd57fd30450c64f4458467fa0eb04c2ddec5b7ceac2a6cce153cd2e384d6ff SHA512 6c258cdcd7d14da85449aa1c40dd29acab05359456cd6e861164b9f3d40f1dc60a4de2c8d6ebf12add9f5c42ee787b47e15a1bd741692bae5ddaf24ca0abd812
 EBUILD rdesktop-1.9.0.ebuild 1694 BLAKE2B 643d0eb4f1aa7d86ebed2fea56d07c7d17f6610c4b6adaa2b3c502c0bc1821e2bb95b4b07f27f09e2b4592beadd29f6ffcf9d788a5a64b4deaec0888748dbe29 SHA512 7922b7ffc4cf08ba3c96faa43dfba382e573abfec39ab61d0bccbd63fed6b130fd536eec0bbe18996c519cf6a13935c8ced073632d62275c1829444aa4b2a84c
 MISC metadata.xml 884 BLAKE2B 175e0ddd380e3859b0cdc13f443187549181d966d19a1c6259d5f41fa23ed05b1c991806b6c5d7970763e90f8cfa4851e99282f3e3a23c5448ab921d7bc56cd7 SHA512 7e06750601ec13b823abac83b9794ebe2f0b48a0f5ecdb5adccc0db1b295f7804d545719b9372b0c38dc8df986c8886f108127488b32e2c600e2c36df5fa201e
diff --git a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
index 1f5e5559a2bc..4d21768aeb01 100644
--- a/net-misc/rdesktop/rdesktop-1.9.0-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0-r2.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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 82b9d88817ef..0d789638e8e2 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,7 +1,9 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
+DIST streamlink-4.1.0.tar.gz 447665 BLAKE2B 18577544c64266bbd013ad90f80b452d0ec8800ba6650acdf30da00997498d3b642873069f64f1445ddfcfdc91d4bd4b64a7f35895ac2685fb01735e7d4f4539 SHA512 f163766bffe079c10cb9f33792ca1e8fa806f46fac64716bada5221f97b6b7b6786f1a218a9ba0ba6ae4eb1b9e5bfc8bf2de1a6b2e5bf9d4c9ba8b11a6a99b9e
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
 EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
-EBUILD streamlink-9999.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
+EBUILD streamlink-4.1.0.ebuild 1440 BLAKE2B 588f9de5e8c2caef8a6dcd69356c6c9192718939e4429ff173417e74d015f59ad1d70113eb754cc069dea9a7e5abb09fa9c4aa37efcd52539bde5f1a8356ea73 SHA512 f30e86076c88899bc71dae2dd6198af75adeff2990eee0a5e9ce9c182b5ab05adb1711e14b4619b5ffdf5c156a91bb8f7c5ee40923b333f7de19aa46ac9d7945
+EBUILD streamlink-9999.ebuild 1440 BLAKE2B 588f9de5e8c2caef8a6dcd69356c6c9192718939e4429ff173417e74d015f59ad1d70113eb754cc069dea9a7e5abb09fa9c4aa37efcd52539bde5f1a8356ea73 SHA512 f30e86076c88899bc71dae2dd6198af75adeff2990eee0a5e9ce9c182b5ab05adb1711e14b4619b5ffdf5c156a91bb8f7c5ee40923b333f7de19aa46ac9d7945
 MISC metadata.xml 331 BLAKE2B 7872b2d59cd70d3f8fe1cad4d41d66a0e0fb5cac22412b7239273d0ab7fe028da8992b8d1113cb3bcb8d04a4486ff60155935bfd4dcb17b412ed4e2ea0db42a2 SHA512 4606169ce928cad0bddfde73fe826ba58c901756e8c23e46b998d1fcf317cad922f0816bb459188a2267fe242239fc330805a493a5a28ab43c58d61d97429a3c
diff --git a/net-misc/streamlink/streamlink-4.1.0.ebuild b/net-misc/streamlink/streamlink-4.1.0.ebuild
new file mode 100644
index 000000000000..fa55f7a3837a
--- /dev/null
+++ b/net-misc/streamlink/streamlink-4.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/rtmpdump
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 92c0803d4cf5..fa55f7a3837a 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -1,31 +1,29 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	GIT_ECLASS="git-r3"
+	inherit git-r3
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${GIT_ECLASS}
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
 
 DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
 HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	$(python_gen_cond_dep '
@@ -34,6 +32,7 @@ DEPEND="
 		dev-python/websocket-client[${PYTHON_USEDEP}]
 		dev-python/pycountry[${PYTHON_USEDEP}]
 		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
@@ -42,33 +41,17 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
 		test? (
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
 			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
 		)
 	')"
 
-src_prepare() {
-	distutils-r1_src_prepare
-	if [[ ${PV} != 9999* ]]; then
-		mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die
-	fi
-}
+distutils_enable_tests pytest
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
 	export STREAMLINK_USE_PYCOUNTRY=1
 }
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if [[ ${PV} != 9999* ]]; then
-		doman "${WORKDIR}"/streamlink.1
-	fi
-}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 502794180dd9..9e18bd9e05dd 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -4,5 +4,5 @@ AUX telnet-bsd-1.2-musl.patch 1097 BLAKE2B 3b2d7424a04abd910cc6dcb94b8ca740ed7a2
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
 EBUILD telnet-bsd-1.2-r2.ebuild 987 BLAKE2B 6dac32fbd4f801b5bdd417508aca59e167e321fc7404d29cabcda4ab86adc68f8bd1830b762c970ef141a62fae14c3c384911bdba2ff1605163cd6d6336fe60c SHA512 b2b4c7d5f80bb63d5283d9f1b57949ec8d6d60f3d2c2855c3376c08731ba5a4d14849e4772796a54f0b4d6e8df3c7effddb1e44f78036651089f587ced3f20d8
-EBUILD telnet-bsd-1.2-r3.ebuild 1025 BLAKE2B 1c616145fcc1126016273e71c478fa3d9bb4ba15db30c47f2c051f262f412a30fb3dd1b61864da9a597318aeb6d39110b4c7699132afc087d204ff0f0bd81c68 SHA512 e4c5834c0813c352ccd3cf927318899dcd44a2eed8700dbd931dbf68d7b27d8533d69f2b3ddd5f1e646598a2eb6e8ef9391185424add5556da26cec2f80fe142
+EBUILD telnet-bsd-1.2-r3.ebuild 1032 BLAKE2B e97ba174fec6774c6ca82136010303d53347a61c579535c7bb2174700ea7648890f3e6ec62e066322ce6c124aced8da150e06b69a77a104af141b3e664d2daed SHA512 db98a04727c49cb0bce6c1d411ae28fb1f52c13edffc46d92f1247310555c0f565a5a9c855f149c24f48129cefac56a2b9eb7462f8ed6d0288602fde5d948e73
 MISC metadata.xml 219 BLAKE2B 2fe85c11a74cf8d398ec29c5020439a021f69054a954b93d63766ff5963de42af156892cad77dfccb8923af28fa32b5e8c1a7dd9c2dc62ca599895823225581f SHA512 7b38d4f37d5ec30669c0d5ebf9ee4356bd751312c621b548fee1dca1971da061e73ceb8a10a843f255338ce77a09526d0d90d7a45309bc5b1502616ad04c439a
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
index c131d25aed1d..db4c5fe6c4dc 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="nls xinetd"
 
 RDEPEND="
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index 26f6b10c21a8..cec2e32f6977 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,3 +1,3 @@
 DIST vlan.1.9.tar.gz 176135 BLAKE2B 195acf3d3bf12de3d11856ec3fdab9791d744af8a5c0003d42a2dd8dda5b22d92bdb43aac392a2c3281cf43f67c2b05dc442352f1cfb589bc540593a92a2a46d SHA512 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5
-EBUILD vconfig-1.9.ebuild 1120 BLAKE2B dad52e1f0cde432cbf3514f5ea40dc1b7aa38604b1ef59270d78f88fd5cd3811d439e570ed0df855d487816fbd84e1d0abcfccc230e362fec2002d153d445d85 SHA512 9949951252d36859be3763abf7dd6b519e2e5f5c779e207950eda03e223f55a3f65e121af14df0eb81b2d8c610b978ee454e80595f8039e46ba9b47605cbaea1
+EBUILD vconfig-1.9.ebuild 1127 BLAKE2B 210dcc93e515ba37178d92e928aca0125be8f70d09fe1fdadc4ceee68c68e90de04e1c03216921dbac1f02c0214d50d969c31052e4816973d12f921a43a1b9e4 SHA512 1b5d210f284e425e527d05fe2b5540e377505fd1e0a5eaa4b81bbfc82cfd026973d1bc0b63ff321c58383b5a78e242a28b4bbef2b4951ad02d36f425813c90da
 MISC metadata.xml 491 BLAKE2B 841e0806081bfe0bdd9114438b47bf6d273262f9b9b70295cc5d0049a9a9f973d0f6362c8f530c92f5288263e2d24d9a9ef79b5c630fc762b7a4a5833bda56df SHA512 ebc64c22068ea18cd35bc4d6c91d321c16521cd55ad34f7b54f51461812b69d2636c1affd85bf0e4cc7e03e098afbeb263a70160b3f4ccc0ee36e5d4cb8d3d0d
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index b3df5575193b..6d231ef02de7 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~loong ~ppc ~ppc64 ~riscv sparc x86"
 IUSE="static"
 
 S="${WORKDIR}/${MY_PN}"
diff --git a/net-misc/wget2/Manifest b/net-misc/wget2/Manifest
index 6889be2cae49..0065678ebfcb 100644
--- a/net-misc/wget2/Manifest
+++ b/net-misc/wget2/Manifest
@@ -1,4 +1,6 @@
 DIST wget2-2.0.0.tar.gz 3565643 BLAKE2B 8792950942c88aceed41aa1d00b2c39d55e057795d0f68e8bfe9a1da548161aa49eaa82d13e8ea3e14cccee4423d41f9643baff1007361c26464b10683a8ef88 SHA512 59be98a43057220f4eb4314d0876990c21bbc2606a82444e03282ca55d6de18a382fb75b3fcbb1e7f5a5930cd9a81c6c73cdac2ffba3932b55816fb8140c00eb
+DIST wget2-2.0.1.tar.gz 3780748 BLAKE2B cc28c58ab59c28540259545d60b19d6c513725e856fce02690e40ab0818d213bd656de704bd6310650af7190d7d3265fee859eebab326ad441f7351213fce6d3 SHA512 7a4afebf87ecda9e7e2d1fb2861c220875a96bab7c7ead6397c7ac11b6effae80d80f71b57a58d6b91a6c849b9a9fd974ce620d3050f677dd0fc4bc05358b27e
 EBUILD wget2-2.0.0-r1.ebuild 1848 BLAKE2B 29c9e15fa14842d81817b9638a36a2281175992d9704349f9f718b07c42174b7fc8588a41de668498537890abc3a84a21a896882a88074b5f06b80f657a08567 SHA512 cd96f2efa6b7e03fad24c35d6086110b8524d2a1e5138c561aa5ca418662ae571b61c091b1eb0c2a523a5bb9f960d9cf9c992d6d53437e2b614b6c6a37858bf5
+EBUILD wget2-2.0.1.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 EBUILD wget2-9999.ebuild 2665 BLAKE2B b09cebc9e727fdd708880233c9edb32d195631aa10809e579dcc008744861d39315e5a1501d1940ca05e7bf497d9d070ad9f28084b37fad0dcbbc295263c12b6 SHA512 dcdb10877cd2f32ffe8e3d00013e89c0c264841cff6e05021e4d735350305437d1fabab4d4d5d458b3d3fcad0951a1c3b79b5f74d27261a7f4909387b7a5fc37
 MISC metadata.xml 803 BLAKE2B 4860e2cc4d9a541e80312d966a38c15c56eb93dd28021f5d747511c1333655962c7531bca4e46c940ed5d069cb16fc3c4ae5b295f440ff72de76b4d08847c79b SHA512 e74f8725d08af2d94e582900b83dfed7586fca50eda89200a71cf37e009fb73f34916e23ece6b07d94e2d29107f9f02110e5f4136a5bd1160be40001c8973b40
diff --git a/net-misc/wget2/wget2-2.0.1.ebuild b/net-misc/wget2/wget2-2.0.1.ebuild
new file mode 100644
index 000000000000..57cdc0a2f977
--- /dev/null
+++ b/net-misc/wget2/wget2-2.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="GNU Wget2 is a file and recursive website downloader"
+HOMEPAGE="https://gitlab.com/gnuwget/wget2"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://gitlab.com/gnuwget/wget2.git"
+else
+	SRC_URI="mirror://gnu/wget/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3"
+SLOT="0/0" # subslot = libwget.so version
+IUSE="brotli bzip2 doc +gnutls gpgme +http2 idn lzma openssl pcre psl +ssl test valgrind xattr zlib"
+REQUIRED_USE="valgrind? ( test )"
+
+RDEPEND="
+	brotli? ( app-arch/brotli )
+	bzip2? ( app-arch/bzip2 )
+	!gnutls? ( dev-libs/libgcrypt:= )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? (
+			dev-libs/openssl:0=
+		)
+	)
+	gpgme? (
+		app-crypt/gpgme:=
+		dev-libs/libassuan
+		dev-libs/libgpg-error
+	)
+	http2? ( net-libs/nghttp2 )
+	idn? ( net-dns/libidn2:= )
+	lzma? ( app-arch/xz-utils )
+	pcre? ( dev-libs/libpcre2 )
+	psl? ( net-libs/libpsl )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	valgrind? ( dev-util/valgrind )
+"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+			--skip-po
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--with-plugin-support
+		--with-ssl="$(usex ssl $(usex gnutls gnutls openssl) none)"
+		--without-libidn
+		--without-libmicrohttpd
+		$(use_enable doc)
+		$(use_enable valgrind valgrind-tests)
+		$(use_enable xattr)
+		$(use_with brotli brotlidec)
+		$(use_with bzip2)
+		$(use_with gpgme)
+		$(use_with http2 libnghttp2)
+		$(use_with idn libidn2)
+		$(use_with lzma)
+		$(use_with pcre libpcre2)
+		$(use_with psl libpsl)
+		$(use_with zlib)
+
+		# Avoid calling ldconfig
+		LDCONFIG=:
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == *9999 ]] ; then
+		if use doc ; then
+			local mpage
+			for mpage in $(find docs/man -type f -regextype grep -regex ".*\.[[:digit:]]$") ; do
+				doman ${mpage}
+			done
+		fi
+	else
+		doman docs/man/man{1/*.1,3/*.3}
+	fi
+
+	find "${D}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/bin/${PN}_noinstall || die
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index ad184b108c5c..9714a8556bcc 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/arti/Manifest b/net-p2p/arti/Manifest
index 0f68b5628a4e..e862ec6953ab 100644
--- a/net-p2p/arti/Manifest
+++ b/net-p2p/arti/Manifest
@@ -1,39 +1,30 @@
 DIST addr2line-0.17.0.crate 32260 BLAKE2B 23c3715820a04260460a41695d535da3565f76519b7313d0ed684352b339de2ea668c44fe8ca58fc1a5b9f84cc5e9d04d889440abb5985bdc04b267dbdad9d9c SHA512 ef3bbd7c6d1dfdd0b47e3be1fb4c8b15ed61a769bed7e80dce80461a1ee13ef21c75e62e9a66328504f862341f1e808abec5790ac79784e18655afcc16206b95
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
-DIST aes-0.7.5.crate 128544 BLAKE2B 7381fe4963324b1f9b5cd1e81b2f2e3010ebb435b049b20fd1a9b37e472fed0062c63fe0a1629a59680f3c99154836a147db9561ee01dddbdeeefe6efdca5b6a SHA512 1e1e6714af9131af6a7e9546339d729979719c9c6751e4e2274e9cc243803920a7317c01a6dc20e31d730ccd43fc65cc2e9a3a29a6bc4d0c9bc0a6a3b65fe5c7
 DIST aes-0.8.1.crate 123260 BLAKE2B a926f713752eb3914c337df5fb9714d47929822d7cc8d6c893e3fdd437a475604f43ed9a5c0b37d13874bfc5cb7b4966f0383607d9a8850863f3fd087f88aa9d SHA512 c27cae53c87117b97f3b711fdd6e73e8c38f0e810f55d0828494caf6c8cb00a9830bedd9afc3cc4940165eac2d3587b4fd8e15dc09be7ee1ac986dec3e27dc54
 DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.55.crate 44429 BLAKE2B 9d6838c859bb5a37a0558b7a4d8af245fc2db1e8418252575939ef74851e547549459a97ffb9e512f0d5c6d5166a82cc03c18cc3e8a1bffa79f2d3c5f0c94a14 SHA512 d789d56eadb1a6a6d8bedd20d318747a9ad11598d84239ee9214fcfc319f729ae61e09f6d2d7e54ec5553ee65b6a4428b793adc17fb158dc07a69f15c8fd818b
-DIST anyhow-1.0.56.crate 44780 BLAKE2B 142a2c02e51dc6fa2709d349881aea404b14dbdfa379ddd6a99672df4977dcca0658897c9e9881e291fb56f5b522cf2a0e2da12afb7038d0929d05f436ff68a9 SHA512 9dc8233b87f8229676ad08903cc1507370588d63702c10bff3426d00ce10754744477d5ba3396c94e7128eeef12c647f8f042de8cc6d1943c2882785ac7ebab5
 DIST anyhow-1.0.57.crate 44614 BLAKE2B b8d8274325b7959cedb2b8f4023d13b0d3824034c8433aea9a0a6f3c3fa6a6d7460b93bf624dff4b7168075524545f1a312e454ed0b15e8dff2109cf3c6dc433 SHA512 311b9280aa7d573c11752ca2ffe810e2d4b55fe4c34cca948bbd42f1ddb1d36a51eda39684cffb7f6c4a18508cb53a5a38495521562a0088e3374fee800ff004
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arti-0.1.0.tar.gz 849334 BLAKE2B da4cec582e89a1feaf6017cefc93cc108b71cddd97e50002d946806011d57561d5d684ec07498e15acac5a0f93b18be5ce874e0d5a93e42ede898e21f83bc3d8 SHA512 050645858387f00ed02df58f6b728dd55180185d72ae81627d17e2339e38e6e3c584cdafc91b5c024c3873700fcb8e19a57dde4a2e9848481ca11cf5465fa2c2
-DIST arti-0.2.0.tar.gz 903284 BLAKE2B fff0725ee23dc09ae8f006e2e5dcb115ba680fcfaca858e7c7dce392822a3cc0a4fe534cad1868301815a22a17badb4870e6edbaa7cd7c4fc959bc8166492659 SHA512 7973163d028850e43168b4671ade444813d10694881ad011ef939d6c7d2a7ff15f829d9f91b0715b3776724ffc42cd29b232e3c6fdab421755c4d517921e18a7
 DIST arti-0.3.0.tar.gz 966554 BLAKE2B dc088b4354824559b56fecedb149844554735cadd8e5f5da4235ed7800fd7060f57785856d0770c121d661557aaf77d6bf7b8d498b0ca18acdfb5d37c599c431 SHA512 42a93648cca2cdae907d73cbf456e114c5dc80adb4d3a1ac5b1805eb3fb934b02de976038129d1b51e6adc3529f2d12288c1d27cb74153a3bff0a905cd15fd01
-DIST async-broadcast-0.3.4.crate 18539 BLAKE2B fdde29219480ff23cb1b8374ce97f9b1b878c9792e20bd4c4db5784797b0eaf1f5bc114675956c2c6d0ba8fda1c071b6d9c3dfe57e30a24338759c57ba2cad1b SHA512 2081f37699bcde02ec9ae0cb3a2727a0277ed498abaf1949c0b49894cb6570939d835df4c547fe64d0956f979cd744a7425cc6f6f37a001bc887bb098ec2e43d
+DIST arti-0.4.0.tar.gz 1009762 BLAKE2B 47c3917847bb854ecaaeedf2d1836abf7f35cf0cd0a10833ff03294b97f71a8281ccd99a63ea4b06db9686199a5f6a3f52668c37ecefd8a8260b721fd52e4a2d SHA512 fa3f1aa4bae28aff5757fc845e7cfe8ac3759530b963425b06d51e98d65308a4ea63cbd71e5450872771f3a518986d7b79a49cc24e49dc4078b326bb1a70f285
 DIST async-broadcast-0.4.0.crate 19657 BLAKE2B ec7c50cd2fb8e8268b98e72a5a785d388bc28f6d33179157101ba778783b46b17276f5d9381e2e43892fbb7bbe18df15f6c9e16375f5baf67df1750e24363eb1 SHA512 bbc72a254c115781f1a291a8aa562ab4354b7f7762a13ca280a68d6fdb0e23e09f23b75e7ef555141ae3f4f00835299d9b2ed632060c33e9412f4ea07b94252f
 DIST async-channel-1.6.1.crate 12574 BLAKE2B 5c5c8f1cf1458d952637a439a1534e68bcb4a1cf478cec6b6d224387f56c59dc6cffd2e3621dc24e03e20df3fdbda5b8855fccfbbc26a2aa03656aff3a17d02f SHA512 797b1f5b4c07853f78670e62b67fb787c329ffa2c89475a3767a963d524a69dce082cc7f3a2878d9c990f00ae2d9cd7e0d21743fc4186769c238467bdb20c65e
 DIST async-compression-0.3.12.crate 57646 BLAKE2B 66b801ea92dbf5911815874c2df967ace5a89a15d9af95b89116976228c45cb2f42e9d4c0090527528b09827a6d1c195ceb8566a9a6817a89c8ce6ac5356104b SHA512 03e47d9c9df03e4db1faba4abbddec0cbeaf1273a970cac7d8b58ee8965a5ead8500c5031b6c3f7a32f03abd2191d17609aa2af9deae35fcc4882bd19aa115d1
+DIST async-compression-0.3.14.crate 57942 BLAKE2B 00314cddd0e561d3107d297ceedbfaee8a3718e55e564d7efa0c90b4c0dc2c825bb7ade2503438b2ea2896f39b849648dda9e5988f265a4aaeb62bffeda3115c SHA512 6d604f4937b5c3283dd882a62c2498ba804adb802a2720ffe1c69a8642b55685f0ae2dbc50f58974520167b1b4e43517bc54977299b3bd956d55bab8febc7852
 DIST async-ctrlc-1.2.0.crate 12413 BLAKE2B 8a3850b2528d768af4c3f1681df2eca8a46e0d81b281f91bcf5da9fb06597fa32163ef81bec143f921839a172695e6837fb059f557140566a6fa7d670b0b1224 SHA512 62e648b216630b3a8309e8619bda64f1f12263fc97598618813921d79d9bb0d6eea80f4612512bca802d4f2b71654b9bb5e768460f35c528ae9494a8bc1a236f
 DIST async-executor-1.4.1.crate 15490 BLAKE2B 2d85825f9deec4a89eae4be6c2899d22bd96f095413598abe2a58ca07e6b8745ee02a6e1db6a3be034159c7844e55009d6da9845116647c0b021dca115acf6be SHA512 24f8403f7cf7639a9477c0a4ee6fba8ebf73fc64b5c896ff07b5b9ea787ca65fa2e642e46a0ba3796e76774d46373e6ea6a20309feaf1f801281aea20cf82578
-DIST async-global-executor-2.0.2.crate 11665 BLAKE2B 7cbe0c3b4193061ab5e36a9679d09e9046eb11cf8cfcddebfe6d86f6a9a09b6af9aac0bd3d673db1fef278542be2b417316147bad395ca7cd0ccc6ae43b87408 SHA512 13d2d0b400832b1965cba680505fd65b87a45a4ab69c110a4a67394e726d340331fe292f6b1079de277d447688a1b97c15c095d106e132d02628892b825a3612
 DIST async-global-executor-2.0.4.crate 11628 BLAKE2B d8e9e47414a67c928b821d739eac00ec1577f55865c481af597236f296600ceea6aebdfb569d4bf848d2e7a9bd130835dc8b720b07c8bc82a01e8f07caec5e62 SHA512 f2191c8abe560e51c2d7125361d23f614f58316e66534f7d54f838eb77c7959630de0af98a24b095e638bbb704994a4e9f432a052c6c7d6decb138488da2a363
 DIST async-io-1.6.0.crate 32282 BLAKE2B fdd46328b23d58058d4501f6a30e396302c36f9a8f91276e6b50b9ddd628a63b8af22e35b5efb4c7cd91cc6c823ffa2ecc492da525c1139f30c02004f0a5b0a7 SHA512 0451c6d53da593bc1753ab56c043d855d2642de5679265970ade0c63cef09268ac5b133100230637bf16506f475e322ffea2c85f8eaa3788a0bbe24ff7e671f5
+DIST async-io-1.7.0.crate 30669 BLAKE2B 1efc8a576b44b7853de5bcb2e4de7e031fab805cdd5d9c19a6716b9cac629992f59edb0f340cf247edbb62ce028767e2ca0dc5b2d4414aa86d6048a58e4268fa SHA512 aacb634f225b674cd79ea1e152ef0539f789b698768804ee7f4fd261321cf73ce55cd9028b062acc5ec82d29a072d15da408e14071f78ecc27f2ebe746e08074
 DIST async-lock-2.5.0.crate 15656 BLAKE2B ba9bdebf220cb53638d8d000b5eb49ff9871c2cc35fa9117280b6ce4aee8c0c296975f315487b5f1fbdf42057e12cc90a72e9f5acd7aa90d3bc3bac580e0be17 SHA512 4b0a834b9f1b841421cf9af0d0f6826a7fcf91b5be208e3f3b923839475d866d9113b37011a9abe0daa5762f5b684b37db062360baf094810a219103fffbe62c
 DIST async-mutex-1.4.0.crate 10223 BLAKE2B ce1a32be713c33680081ef5d14ae159fa3ad6ff569430d8336268898a7adddad86472865afccb4c2b7c37dc50cfd8501239828f263e952b88bad23c0a795af42 SHA512 5957912e28f9e5a09cf85a0f0ee44e9396161469cedf343bb37dbeddc1dd1bfcfdf4f162fae6e2543edce3e148fb34bf80864e2f35f18e6d4f6fc9190b1179bd
 DIST async-native-tls-0.4.0.crate 24651 BLAKE2B 7c5e0b1a489ad2be45aa442ccd0ed2c831946750145209f054d9d402baf9c05b5ea6ff51c9db55972ee8d8aea69de853dbdc86432174b1aa916d969fc49cf082 SHA512 49f5e8b2bd72b607cb12016b61f191d8495a6ebd4068b2c337b2a6ca456b99ed72f9ee835a4f44822b46c2c22ea9515a664eaced620ac37336001bd918393412
-DIST async-process-1.3.0.crate 17199 BLAKE2B 26d365c73e55129b3496fe6a1bb55f5c15c46ff20b608b900363d0e5795968bddcfbf0b2487463431aad6bde5f0a861b83c1504a72a51aa96743f86dc7e5e08d SHA512 da151b84b0986b3e6d42e2be71c6931daae98c27b4a8f712e5174eafae4d0ca739bbdaa09065815799a65b5553e8cfdd71be021ec32d630d664c0e1b4e47f6e2
 DIST async-process-1.4.0.crate 16750 BLAKE2B 9f8182836a1670ed5cdc855d4cb0ce3e545e9c961885873b4813689f7d3abffa59a65899c8868743406cb3787a29d4897bbc8b1f25160795b4c4ac49f9ce665b SHA512 e57bc0a223939bd01feb41ab8b2d8b7e86b9efeb4f77fe71f0845756d9ed3d20203e37a7f22662fbd0f3dd2cd8e35b39cce5d9381be2bf0973161f465c939a80
 DIST async-rustls-0.2.0.crate 22857 BLAKE2B 10b93012827f371a18576d59c7501e258c50173111790a2d40d082ca36a587af8a708c3063f12d86d3debeb4b06e59456bfd7b75b42874c8b8808f5779394c5a SHA512 c8db1babc70f7cfb6527a02cc68b0fd102b6a2ed923eecd44669a4d42331cf016cccda677d7f6cbcb876f36bcc380456ef564bf6faef63d60115c4e27672ffbf
-DIST async-std-1.10.0.crate 221375 BLAKE2B 6d54b66b6ad19f6f44cba95935d551cde7828fdcbc45fc7c278325da2a5cfeabf16fc12dd276cbe352bf689ac7028a72a1d2667576e447bc9b3aba30ce7633a1 SHA512 c71d52060160003f52e82b0e6783e378f6a2837bc7ee5622d0e6237751f622cfa66bd6a1ab97e48961c3d0b85a87b1089659c4bdd4c3d98e123ba92698060905
 DIST async-std-1.11.0.crate 215743 BLAKE2B 90f086917a7afee083c0530469d407bae413d929e1164e15ab577ba86a5fabf28d58f1af1e752c0adeeeba62f9cb8c822635ff6d0781dd1e8b3fd15219b17d08 SHA512 8978520f1031273ef93e7af63b7b72d43fe52f4c4058a3538ed1c16ae21bff79b787f79d5e9c54cb5266c24875681a52bd68d85ff322423dfb6656e215f32c20
-DIST async-task-4.1.0.crate 28350 BLAKE2B 815db3c52cb43c5233bd56e1b15883681c27fe48c5fc5ef957a2d2209dc4b8e0ad8df6e5ee126a9c4d7292ba64548312560197b96a3973ef3daa759aed5c9603 SHA512 0b0fdbe99f31076242860b282addf4c6663ff05763f7bcd5ef3aaaf3b610b7435f8858f9fc69403fe266844602de0a8613e4eab7de42713f730c7ca74ef79e8a
 DIST async-task-4.2.0.crate 28496 BLAKE2B 327895275248fb0d405a85e603d26cc4a9dd0dea73c9d1d7f7a56de716010c08636a87a224431b8c4bb7c2efc2254631cea176dfa7cd20867c4e67da6c893200 SHA512 fc52d82da34e84611012cc4cff9624481402ab0ce56d7dae99ddcb5a59eb31a264e5e2597db6ec7595b681c0bea1f159e1f7bcb3e033ba5740b9b11c080c4259
-DIST async-trait-0.1.52.crate 25913 BLAKE2B fed6b6688cf10c712597dd612d505aabca0953c825b45e2a63cdb0fdee231e70436b3a7a02a56eca34ef7c11951f52eb2d67740c5c7226ed4417df55745714c6 SHA512 1a17e3771d0f8ded921a561ce052f397e997c99599fbcd741a69b7f43ebc10476d412dd9cc18a096c791717ada71e8439ce38d0312d6aa59dd4c0c34b5465696
 DIST async-trait-0.1.53.crate 26210 BLAKE2B b48cd91fd63579c7e0317a72befec93168bf067ca08cb4e51f1121ccd5bbe3e3ac03d343a97c57e19571af31636901ba335f4296b0cdba997dd3630e176a25d2 SHA512 33fac59f2329997b3b17b076f816e32cd667f3317b324b74e1bf4ea28ef1d3ed53572316f9e034d1149cb8456dcb29e78474426aa04c42fa8bcb0dcf1da53763
-DIST async_executors-0.4.2.crate 32843 BLAKE2B b139eec4422a350359b97b56e74ae99a136342ed005693b2873fd5bb6dc52fa3c7939c56365f9b5748c79fe49d3b37fe2ef393d161bb1704dcb5747a856c1317 SHA512 a14b26f2370eb4a7267dd8c70742e3555a2337e357099795ee22bddf873e548704c3c78c9d9e30af13692bbcb24e6707713c7a1ed8091fd7dc5ef235dd63bd88
 DIST async_executors-0.6.0.crate 34932 BLAKE2B 8254266dd6f6f204797b298bcc899935a35d21e23a3ee7f1364f7b4a7a483f5e14b8eacbcf173ed7bbf15ec1eab324d4c89577ea6bcce8fb7e568ab8e60b6f89 SHA512 a521c8d7e7065a7d0341f558510ac0fedb8e8b2ff31907be345139994ce3cab6361e7f2ea1a4d97e6162de93163991684781ce805e8b2fd099278094479ec017
 DIST asynchronous-codec-0.6.0.crate 13621 BLAKE2B d8b00ac8d7b091050f61b6de544835622c5d7c8030f8c7bcb1a5503628647bc31d150686dcf0849d59c506b5f8e3ece19d441847c99527565e51c97566ef8ce6 SHA512 36fa19f9d04a5c82d2ee94e4f3f363ac61f7534a3436620c46151873af8990b5188de098d61a2a0a07f47ede62db2e9c0f530f874bcfe898d1c9c460eb57bc8d
 DIST atomic-0.5.1.crate 12817 BLAKE2B b3f44cc09d87ceaec67bf5f16fabe5b0e891a6d732c6720380456bc38917858447ec4b2625b856d9d8dae8b0b14002251b17b2f1f92037566cf748e15eb4d2d4 SHA512 d9983a39da849a9852237eb00e727fee10b30b15b2e75f6c7e091a2fbadd289c688744997ae1ea933f1541cf867b7df3531870e7628ae9ef75fc7a78dccc9bd4
@@ -41,7 +32,6 @@ DIST atomic-waker-1.0.0.crate 11771 BLAKE2B 4e94bf07e1df3b605bd0f8e8f8750323a5fa
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.8.crate 6621 BLAKE2B 15afc4b27028f542b6977bcf19cc75f7e47df1f4e241e43d858bf451a659a2e937e0a3c1c8918d4fba6d1f66e47ba2f2e329023f3dcaff182e048e9e4f783825 SHA512 d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
-DIST backtrace-0.3.64.crate 74311 BLAKE2B 32650d755fec8a9e04f915572c999eb6cffc782284a4bd71f2e0f3f73519d5b84fa016199fc11fdbbe510316498adc2bd4f8e059e9c447e5a64ec5853e75243a SHA512 37435cca0587c1c7b511536478ff448914d423c9cf6152ec8bb884c19d1c2466c377b270ebce2028960b4a380f3152fbfeb940de943ef4071ed271c7cd576f2e
 DIST backtrace-0.3.65.crate 74129 BLAKE2B b10a78685e7e90ab7e02b769d5445ee24753fd30212bb7204ab720fedb1df64259bae44500d9162c1c001d2e9d70ff5d698e02e5ac51e5734dbb7c601e602b3f SHA512 9cf3cda1d86deb6b7f3cada0ed7a9e6e54e2d323533e385222a260b2f667bd1989a552cc35806a1579c1493ee1177e474b1d42b29480c09a2735251586740321
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST base64ct-1.1.1.crate 15267 BLAKE2B 061e97d59cd93fd15fe688aed1fcea3e44a2f1487320944e9c584ab7e7b4eb8621aaf38232ae2019e87cc896a011501fb8b531c1b23dd703dd328a8f1f486c95 SHA512 95e8f9296ce115b4be7521d3ae4cd0632fba239068b00e87d827dd4274a7641f4a079e88aba7987c507615d8dc33652d994a8143fac3e41c24088da5f72da57e
@@ -49,7 +39,6 @@ DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616de
 DIST blanket-0.2.0.crate 16600 BLAKE2B 440eb1681ba5367199b4d613f54262709c8cbe647e72021c3fb34b1e3cf55b50565e4bfa07d58da115067c2e587bf045b53509d161d28fc8e2ae6cf8555d6edc SHA512 6517dea5b05d6fa1d985ea319fb563b3746c777696dea78fb78ce26a75039590dc567f180fcfd2055eba6a6f408ae322f2b3fdc136ac8eaf0506c7adcbcbe4f7
 DIST block-buffer-0.10.2.crate 10258 BLAKE2B d3ad2f9f0379e04320e954e1a2226949d83cc1acdda806b98329a5ddcfdbbafdf511907d99ad7daae271a2981ad0c39de218968c22c3487e21a32817d41c23fa SHA512 8f1d99af7c08bf3b54ba7383cf0272eb5a8137f6244bc2d7e6d6761016614514ad7d27c5c51946c5cd7becd84b320f62fc2770e7aa07038d370505c29e032078
 DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
-DIST blocking-1.1.0.crate 19091 BLAKE2B a7777476f3c6397a51c7e05114b7682e3904ff36c2c28c87e5ef363982a82d36c1ca44018b2d7f17dca5474c5f2c15e77c49def0a811ef3834724f1b7b4bdac6 SHA512 db898435e8f96af8b77865be4f0df10c5e869518893d192b23ccb308339c0a1d48043cf4c95c13016cdcf324e941ecb7b1546af2ef7d80e7e8e401c8f2110337
 DIST blocking-1.2.0.crate 18494 BLAKE2B 252a17536290d3898015b6eb844225c7fb78cd84424fda2459331d5eda56d19efff48c670b692288d32d870f62a539449a9b3ad7aef947de50f8862d44fbd9a7 SHA512 aa5cc62a340fb94859e90bd54b9e61d897026ee66570f15f94a0be287b470f5222233dbf30cdf1b0860c4a24abdb0c40f925d9ccbabfbf38fa27b5b17917aa33
 DIST bounded-vec-deque-0.1.1.crate 22869 BLAKE2B b3ed72740db336a70f0a8fccbb1e4a1397ea689f3bae6cefcd513fd8b9a5a92d798503dffbceceed3fe4a9e77764a85a6c6f1b437574115969bbeba54e9f0429 SHA512 e26e28d67ae780cbf49baf7e5634a8c386ede6169bcc5a54d06044c19e772133208dd19f2156ea07d252e54da4b0e7fd0d5b2ba325d63641da85ea6b2f7f286e
 DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
@@ -60,52 +49,33 @@ DIST cargo-husky-1.5.0.crate 4526 BLAKE2B e772a2b62036adbb8a15333cbc63a2a2773990
 DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480e6cdd3bdcf27e5f9d3a88dc16cbcbf54cd021470a7cc521e1ad468116c112bbd30752bac0d5486939ac SHA512 980f012b90c6410144f6de4995048337e09214f19603076db6d4edb88e9ef9ac9e8c6e25569f66c2be3a47e99298f5886dafc102e1a9122316179aa26bc1c985
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST cipher-0.3.0.crate 12756 BLAKE2B a572b0140512b7512d496f2706cdfaedb680d47a283e3db8b4be97418585ed988929a3beed44012e8a9d9728cbc21f00b78bcbe376bbf57614d54ea07e4daf4c SHA512 8f0094c7786160730825cff21ca838f52801783f1f4f66755b0771595963b8b99fc926265ff502c66b94a2e6703d592d42bbed96ebf8d3a690bd5e731f0f5c4f
 DIST cipher-0.4.3.crate 19206 BLAKE2B 72872751c936c1ff15eeb850acaa6faf38160a8ba291b8541533dbb1c8257ccae33563bfb606ea6b0e181c3e232aca8ab06535602d0816211168754a1d79f05e SHA512 1ac7725e76867ed7c93979c0ec81208e2732cca75cc7a18e28daf1ca4d6f0c32d43b5dd7aa043c6e47faf328ab7e6b32fb4b67280f5d8f1928413a4d73212228
 DIST clap-2.34.0.crate 202210 BLAKE2B f383adf1d757ac4b68995132b33837686ce451f85a02a8d05d2c746da398510d05d46330f3efade063c3952aacb1754cdac73dd0afcae0df5340a89f9353aa1c SHA512 c648a761b9996a7e7464a538bb53621bae22090b846a42c3b729beca3363958ae67e3da9f93f58b10a10e043cadf7ff930388680d168646178c2824177832db8
-DIST coarsetime-0.1.21.crate 8167 BLAKE2B a1a1f27be5895197ebb28085d2b385f3b9e1208762e9d4404bcbbd8136f940b821ef6fa73b29eb4557c46f81d27b6a2f7d2b95f0ed24297a54576b503e8245a3 SHA512 1f135a58c8fec4f2e27742fc98b4e34683d843a92d3f0419377dd4eda845703b7c12d28833b5a74787b8cc33a38acdfb6f2889c66f74b10d48ce20de938cfef8
 DIST coarsetime-0.1.22.crate 8159 BLAKE2B 7d2539a1ef4817b17922545c7f05153e230318e18437b0c3601c2f37b66b6bee9c13b268984344f6be3cfd739408bb7520af1a944e153c8e197c458a6929d70d SHA512 6bde59ec4b51a0e6e1b44c41a6a45b700d60a649afeec678c78759a6f77ca744c9758c3df3d2d251251eb23999165a4f4fafac9fd15eef6389a256dba23e2460
 DIST concurrent-queue-1.2.2.crate 15859 BLAKE2B 97eb49d7f6270999f24d37e7a3967c0abcbf584637388c4507f89fd5284120759c9845219c463cf066f6568191b874fefddd7edee9292ed02183123161074514 SHA512 84e348dc3d40c73c11c54ecd0f1e6cf7fd6c7033f4723a428ed1c09bc9548cf317a0d8182144b689cb9781190b9c8ce4374717012eccee54a11ed0869dee10fc
-DIST config-0.12.0.crate 63509 BLAKE2B bf820dc8de6bde18d56fad8283162c895cf1b72a521eed3c3540e63506bae28a7bb9b07f330130be8f2d0f58051e50438fcc011003a7197bf9906ec85fbb11a9 SHA512 37ea281f2a21855a0c0cc6466d47b8615b7f317cb21a700ad4dd02dcccd27c4b56c6cc6907ec645e2b49678800dae8eabfbab6a1ce4afc8cdd15bf3ed8cc46fd
 DIST config-0.13.1.crate 65302 BLAKE2B 5295243f2604f0caa09990388eed407f8d1617bc25505330b06c0acb2c8358d597bc8b7137514a37ac9bdc5c2d4644fec983fd1b6511438392587662dba2fed2 SHA512 b853e721974bd56f1ab5f52d4eeb436602d88641cccb03600d8a699434a867d94c2688ec6a304678e9ba4b492a41e9e725bbf8d53e03f13ca0f09964ee4a50b1
 DIST const-oid-0.6.2.crate 13926 BLAKE2B daf4ba1eaab14dec189957b6ebc89bd85ec6de2b1b94ab61d744e75144f17e4ea889e758a5287480ab63106dd27789a4aa2982b419c3e3d5cb2ce3c7e159e9b3 SHA512 504a12910eec46286122a87dfeeb5251d180ca8fcf056e8f5d35698b7d56b34a8013ce45ee0b9c3634e09103a4edf5625466c9bd86d4a192bcd182fa38c12cc1
 DIST convert_case-0.4.0.crate 8098 BLAKE2B cd038a7b0d52a9e183a96cbd548a8deefbe0c60d6aea15d7c6f92a4bbf991444d401b5cd3c944f3d37019e7e3db2a648e321402e13803768556f32c08ec00084 SHA512 e17e92b94b030e39f368ef0dd0288dbb45f77c8ce3034c1a6fd2fd43f38cf10a1af5aa7bebdfb447c335d9593c32dde7262e13f97c271c419c6106cf47dc01e1
 DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072
 DIST core-foundation-sys-0.8.3.crate 17519 BLAKE2B 4ac3d9ab16753dd995abe82f158d460d0d22184ab55d260e73b20305cffe4e03427dabfe0c8be968b6c3ecd348be2e17154ded7c9bbd5a95334ff266fe83bbf7 SHA512 a3ba3184cef65dafe8318c4db7e59eb2749dcde7b2370ad20272b0735ded0032daf2de3fd0cf55eb48448a335f5b81e8e745f2a647f9a43bb85946ce714bfd82
-DIST cpufeatures-0.2.1.crate 10500 BLAKE2B 92e676cd9a8901cdb344340dc7cd7b6d66114a15bd72cdaf600283c79c2339fc8f89b57ac38808141037ea45ae32628e9485cb825c7bcc25abd94c41b6549407 SHA512 0db2486beb0f287b2b4f8543f0f02c4e6d00f66e65c9785a1ecd2868c460553f016b33426c24d0b0ade1417906f5853cfbdeed98ad85cfb73b4f7ad3af85a613
 DIST cpufeatures-0.2.2.crate 10655 BLAKE2B 7e068032f818af691ce1bbeacc1e79af17284cf6d1b9896fd146b2b87ebab7b12e7a9ec93b28f77106856c1d11a565e4a64f8dc60c30b401c08836097f587530 SHA512 a771a86e2fa26033b27d22fe250968cd80cc64031838d1c111ad5c69951d5f29de0cad375965c7c2cbceda2a005dedaf6df15c699041c9d0cf65a1c2033f69c5
 DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
-DIST crossbeam-channel-0.5.2.crate 87842 BLAKE2B 9901a136366ad9afd698c4e385137717964f40c7d035142cb26724e7af45bd6730a0a601320a301a24a7a4f66611a0a650c582fb5a61f6692480bff99ea26492 SHA512 dc8dbfa40a7046ad82da3f33a20b29d216ff98180217489653e53aa46244089d1fd2490051d3f05b00333911e303e9efe76d16d4cbce8257be91f96554fb88d0
 DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
-DIST crossbeam-queue-0.3.4.crate 15808 BLAKE2B c62759d2aa5d1c922e15448980896e6eafce3b6c5d5d900b76c44e20cada95dd295fad05b8dd730d6b2584f56d381922cdbbe25ba1129f61a1324cb84a5ddf3a SHA512 851f0494f14259935cda2653296897e21bcadedc5e265cde5f2c8881eedca40e0e9eaed9a24fd890bddee22a7b06fa335d81ab7e5a095ab492815efefa08c657
 DIST crossbeam-queue-0.3.5.crate 16341 BLAKE2B 83389842b96f88cca9e7711baae0cb3bbc99d680a5fb5e121c7f93f55e13140201959dd66243a43c27745bd8b81016dd9fd2e869fedae1d71cd8a6e32a614daf SHA512 ada7505beabf0a8b7dfe9ce13b37aa1423fb51af2ef1bfec422d04df779372ab889ab842b8bcf4be90922a183f0c3f82c03cf94bc0968e862025e8b90e0c6c4f
-DIST crossbeam-utils-0.8.7.crate 39751 BLAKE2B 79e1d6454887e8c61f498be0f4475726529e1c45d5b24bb0799cebedacc8d92db735bbc0ececf2d64a9601dfffd142b372bd2802fd0aa0e98dd4994158846a3e SHA512 b9c999f570640513c38c95fe5e50d0e89adfd27a9370952a8ee441118ffc0f092d21f6dbe7c68f653a6e766e5c1aeb209145d49542f1bdaa1f561e6707ad482b
 DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
 DIST crypto-bigint-0.2.11.crate 34837 BLAKE2B fdfe2ea4b35bbae86566a751d0c675015780d2dbaa6a44c3d06653133df560bbf02dc927ab287a3f15d8097c7091db97dc3d33109db92e06a2f07064997dbe81 SHA512 dbc24bcd0b5192f11c32b687a5e4a3d730a35c953bdfb935487e7e317fe68810e7df10068f913c84e415945b41f31556c5607d53ee54b8bb5b6b00de2a0738c4
 DIST crypto-common-0.1.3.crate 8556 BLAKE2B 980c3d820633b62d3aa08e00b4737dc44ed08db3c2cae4f14aa4ad769b6a84d5eca03ed3d8a4d35cacfc051ba9cf23826bc098400996a80cd5a264abae873d0b SHA512 d32fa67b9baafc32ce6f4d97d54deb7f1b4453849bf549384689b0ce8d417407d11f405793e7765ea47dfa86c8d6df5661bd17793c145351731c39f8124d1a2f
-DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
 DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
-DIST ctr-0.8.0.crate 17740 BLAKE2B 33a9d2427a0def6b38dd7f53e5540841f1f1fbb6f4d571913712215d9a40a798b820a70581acffd5b2d8b57b6c7b2ef54a51463c374eed685e9f2aaa7797bcb9 SHA512 26f4925cb50c72263cb939a4dcc7750f8fd50e3a2785fe86ae01f0d6c76d2842f4b8c35e67cf4df51cb9a72601065b0338f2311acbc2c8d0402b53444a7532cb
 DIST ctr-0.9.1.crate 18206 BLAKE2B ee89ccd2cf12ba68bb3d281fb6b433dd4f0ac3f5617e01005554d99dddfdacd795309a3a3ea46560d511a39e528ffddac23c122ba375322f3210d38a0bd599b0 SHA512 96c46ad09d6be2af8e926da6df16063b5a64129bf191eec63db2f290abb64b4476c73c6796b1d0ceaedb070421ce74f41b63e5c22c4a6ae040a686f85295c59e
-DIST ctrlc-3.2.1.crate 12893 BLAKE2B d366e12c8d2d5f34399c9e8ff797e30870682bf8f7bcf4e1bcd50a7ab5c4610cc6db154fc9b4c1abf9852cf0fff1c7c927514ea7a2cdb9d199c6e1bae9368716 SHA512 7305e97a3f161db942ddc194d14f670087f88e3ccb5b94114fbd6afba04b4ac1cb063cf87ccf6fdf4678bb667b02f3cb2e6fc1ca8bc47b6ed8e36620cc4a1a8b
 DIST ctrlc-3.2.2.crate 12699 BLAKE2B 39d2e05a943280f3a62f3464bd77cad5f606ebf912c6430f4b49ec07a3cf2b1fb19ef5be5d589e931b9d79c5af882d51782b580d1a89a48bee221585c1212b1c SHA512 9536489c3b871685f20eabe7b8fa4a1a4db8e362e8e83b4b2fe244d98eb4da8f84737d26854505cbb53a311e6aab6327b0644689206a19dc5f7d3b88bac580d9
 DIST curve25519-dalek-3.2.1.crate 518091 BLAKE2B b1296335873e80bff213219475045d46becc751302023ea6450c0144a369bd0b725e706708cf5d1f7eeb62620663d65868db653898558e8705e33df7e6c49893 SHA512 e6cd01f8975cf235abe589a62da53e84bb14b2636c3c817fedb90702c5d5d0cd54378bc5d566aaab2a2c3f8618e235daafece7f70e0c62a907d7d6cb1615fb56
-DIST darling-0.12.4.crate 19031 BLAKE2B 460587ac5f11ce01116da6c07c1bb0c94da24bd5f3003de028ff772af2111ffc3ec4db1fcb4e732763c441dd8c449297c778854f8b40387b311b3d5086263c67 SHA512 12358298bbbe4c18a6b8b1ff838c210806980973f7fa2307af97f0b33df2e3f1bb43dc2b990b5e8bbdd4f8ec97e1785ece556ada8ad6d6957f9dfb37316ab7a6
 DIST darling-0.14.1.crate 21844 BLAKE2B fb1fe8f63524f944acb0471ea4658fca55edb7aa4d7443739e5d7d16e917909d34cea6985f1d45429616a929839452cdd7b16b635d81c7ae6b4110bccad31d80 SHA512 2b2bfded33f23d042805e15f28befe6bf1329ed8984513a71ecd57a1d443414afb2ec4f9f92037a352fc358bf5aa02df33c21081e44bf5e8a2c62bd425bf703a
-DIST darling_core-0.12.4.crate 49742 BLAKE2B 72f2b7994565f56bf369ee74658da4fcc15712f001754797bb066c5ef0e6b1669b1ff5ee3145ee1cd26dcf92c184f911288db187b686c333762812ab23ca78e7 SHA512 0e89867284cf34506d0dee4423120c8e1f40efcc66d510e111959fe0c8eecc956b9a03c85b81ea0489be067b18113586909d1ee36f78495b123e4d64d41b300f
 DIST darling_core-0.14.1.crate 53655 BLAKE2B fa48d25bc37e7630ed9abbe7c2df16e45e249fe388396e113882f699d53eabe49ca368011afdfc9a9eb34465f35a1de315937cf544b90c41ef265b884118fdb5 SHA512 e4f8d9bbac9d7be9e11d01cd965c0c398b68987572255761ae52eef7a5047ead452d880f1f6a4b4a7af014b819ecd88cba667cd169a802ff5fa9b61735c4f567
-DIST darling_macro-0.12.4.crate 1866 BLAKE2B 67832eb0da1abeebfdb1a883ea31bc919589d259e4ae03a8ffd9bbc242907204985f7e3c5f041b52acab41fa8055b19eb6c3ef2e05f63b0c437cd92a974f2cc3 SHA512 324c778f4243b0d34d10998dd1ef7f911fba9392928eb8626c8ce389c599f6fe39791b1558a4480d366bdaea8be78f9d6a4f7ded48a4a020e721bda240804e1f
 DIST darling_macro-0.14.1.crate 1911 BLAKE2B c22bf421f89f4159a3df4245e050e58e01c22404c0bb9a7ceccdb47a0ff2abb02b6900d20744d6626ecb4bacd442c0915bcdf5678eb33890382390316a6e26b2 SHA512 450dcafc222f611902526e9d269224c5a5374b8e3f510c2b103fa6eeca240977d8dc53926c09d77245e041f140b9d1546ea840b19688e14d3ee53ccec8ae2d02
 DIST data-encoding-2.3.2.crate 19159 BLAKE2B 43208abc26b243537e9a2556bc3ec5db53ff1aa0cc9c0111728d51b4fce6c6b4314ba445bbb9ac7d813bea57ab600a3a671c5167257f0c344e5e3b149a01f6dd SHA512 b62d0c9a937df59f3c84d4c27bafdac9088370a250d3b85e259258cb0843ee32ccd0a9fb1a01ecc5929dcb22e36bf82f7c1edbc9981acec70f5a1a01f00731c4
 DIST der-0.4.5.crate 43641 BLAKE2B 0b4d5a32e8e921b850f8a62022b08dfd5b177b35d0a009782753863e1641552e282715a74355a0a8707b2bfd908ebdea36a3d91c422c5023bc31c256aff99840 SHA512 9d58e6b0fe348a53adc3dbd944bad4499f65efa14d19dad0a62f026801d8c31fcaee877f31242e73dfb9816a58489fb88c59e289c9a6a21c8edde325050329c6
-DIST derive_builder-0.10.2.crate 29777 BLAKE2B ee35b2093c9fd49a24778972df7e62fa28ff766493f2a6348d7542b347811c5c48a4a4d15b160ae4f62a9ad4826e8ffab17c391b9c67eaad73cac20433958bbe SHA512 1d76ced2c6c566eee5bbe44cb437c863396f989d0f850ec2d269fb90621e8a9445e68062ec1d8eabd0fb3dbc5ccb827bc6d13d74023282f82015f84d926eb221
-DIST derive_builder-0.11.1.crate 33058 BLAKE2B 0beb24f183afb328b9d78ec30a6ba37b032dbfdc3665bdd7cb1bbcc47f37db76dfa77dc99e6602121c07ad05193423ce357625167c3704277c8ae34a725b0a91 SHA512 4d66a9916d1a7176c1d422e1832d10f265f6cace8f580068acffc7594ca5da097a824232c6f055152963ca478e58451503161830c203b2150103733d89a0ccad
-DIST derive_builder_core-0.10.2.crate 24691 BLAKE2B 4336ef5879dad9dc442b771644df2067767dc43a105ae99337573e9f53584289c4ae553ca980a1529b0b2d4a5263e74d5c58f087391dd5b32d0a1ae5e8647ece SHA512 4037d4dff2f2ade95135e28f05c0bfd792acd0faf4edb8bcc6f04b4032f222bbe9251910b79735b162101445f5f17264b8e8b9318a30aeb65c9a7ae1b178cc07
-DIST derive_builder_core-0.11.1.crate 26683 BLAKE2B 6cedf0d343ebd7517297e0c41da5b1ea9ad9524654d9779af579888acfef969bac54e42668cae99fb4a55865655fcf4a7968f73d1b80f72d6ee15d8b9847c16a SHA512 e1cd431c9fda61358a9c9ba7264def6dbd68e2ea16db5e4a9a137cd5b08db3089d16595bb3a54715e81f144b8495b62d680c1bcceb84a5e6a0075f1706fcdeaf
 DIST derive_builder_core_fork_arti-0.11.2.crate 31064 BLAKE2B 1e2fc6de858d9f48325ba6cf5beec5342bace2bea08213f5f9c7e94505435ed1c129b493f8aba4dd59b0b66f10b6832bad7144ce56a8d7fee3a83f8100920610 SHA512 5f62dfdf43ecfcb02ee49538233d8a9600b3a4042ec79d9d0476b11954faa5b38d5463d7825ae70b9738421941951da7137a4035b045de9684b403562322f89f
 DIST derive_builder_fork_arti-0.11.2.crate 35894 BLAKE2B deaf01f4302b5c04a8dcfefa7f4d0ac7b2f0fc58a399d3e50a08a55e23e3552218013ae64cc8052e57c30228622f3b7951dc3bcf5c15d1b6c4131cb15c244670 SHA512 db5fdc656a3c7d235e2ffd691d4b056538fbbf871d1def9850046e703b58f67abd3d8e49fc2815435f3bc9ae1d1c0fee789cdab77e02ce7b08172687080834a6
-DIST derive_builder_macro-0.10.2.crate 6210 BLAKE2B 00de51ccd227cfaf16cf7f35c8144c7be63dca0584afcf528aae862cd15d73d4d59549d3f8dd39990fef43cdf601cdd5232cd8b9d0a925e28c1edc3ec505695b SHA512 36356bf7e2f6c56b0856c1df0c04388d8d0d1f6e5843396276c3cc2b2c39cc649d6cb08f54b91eb0e2fb3dcd30a9dcb29e98f769f840ca725c9e9a62dc3827eb
-DIST derive_builder_macro-0.11.1.crate 6228 BLAKE2B 6f683287c48059d1f7127bcc69e3afc01e846a7d4ef4b5999373bf0985b9d83d9abcd6e254c492b7345b5ccd603b77dca008e2ae92bd9682667f33e3faab1f3a SHA512 55f06fdae2c5b3305c949ce9e71a5b317c16a051e28ebf7c770b914b3327ca1e64932beda527625698da31d7b1f367d78aca81d7ec913b8d1029ef8ce6093abd
 DIST derive_builder_macro_fork_arti-0.11.2.crate 6446 BLAKE2B 041b0335a9df2948a46199d4451e8607832cf13467b775f31d4615c812c25236d593fc72a67868cdbdc57d8359b6c5faad8047ba016635874c85e0dde547f20d SHA512 9f97c56fc1ba89e54d5a904d23da16901a9fec6ddfc52356f4b6905cd1aa5ff4b3d9f49a8828ed0b1f3c37e9a2ccda8e13e212fd91186e48e0e56a01193e11f2
 DIST derive_more-0.99.17.crate 55771 BLAKE2B b290bfbf06119018206be0f8ad4c92508be4cbc443f1a937c38961e207fc3f433d8a87b2b5a17e72aa1735520799540557d9dd9e49e26b8eb7cc80289afd44bd SHA512 0bb5a94e56d35a17ff4deed61c437ba75c9063694032ba98b58be1b072d33f2fb170d51bd262a17ff1beed2110b334528de75d5315ac627202ccb13d8c490baf
 DIST digest-0.10.3.crate 18990 BLAKE2B 871a9939e5a4352781dfcb1bef82aba66ddc32e77a2db5e43488302ac3836adfc87869921e95a2af63e46699419e20d526453ee31f3d7b2171198dc23922dec2 SHA512 bfc9b24e4a6e3df91669a36f8ddcdcfb643e22b3102a200d56bbe88d94e8f1f1e52f5ac29f06253913fbd977b149a3e775c95175b93950340946152f6525803e
@@ -113,14 +83,14 @@ DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90c
 DIST directories-4.0.1.crate 16040 BLAKE2B 57368021712e652af2dbc64e3b219ac072c2fd5e5f7f882ac36649e0e804b5345c3f9afcd6d75caec3851a371f6eec3101e80a125f6ad20c045fd105980922f8 SHA512 babe4e23759b2e01a284a14aa1b45ba9d705ad7257246fe8c1ee6a071f48192c58a30b7d09c222268be83f7ebb59c0cc91e8b1342c1f9f0a96ec079fd264f8d5
 DIST dirs-4.0.0.crate 12503 BLAKE2B 02c0b9b68d09ca713e365410c72d761de5adb87a0fc5176c4f980050198cc05078fa67b43a8af1b16e80e7edf41a428dbe55807463bab59f3fade09b53d7399e SHA512 be582e5045f1916fb6b918c8e8c5907b4b663534025e4227ea4828e2aa9fe7fbcb3c48f1f0d08d163ba684aa4404076ac210e7f14766a09b9ed89a2825121b3b
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST dirs-sys-0.3.7.crate 10597 BLAKE2B bbeadbfe15d9b92e4057cb600f1957e066e295e0208e1645ee49fa76c55c45e273ae5b87337eeb398dd3ef3adf0a5584087b8fc0fb780aa23c6d9392029d6581 SHA512 e630964e4c452950a475c10a490b49b2979dd7dfda48172b905cc789153ae4a0ba2d7d91f690705cbfff23737c4b4a339eb0c49e922efd7d68a92fe6368a929f
 DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
+DIST displaydoc-0.2.3.crate 17060 BLAKE2B c9f2f57a653b5f669de53bf25d8d0d58cf39b7638a8cb398172c5aa6795bd26aa29c353f52154c9bc93b5fa742b5d46664ca8fa5928fad819e5a6627d6f232a2 SHA512 848d88d1642f4000be88a728a3ff1835fe2887ebd38e26c032e0ae0a3ad4ba658ee1a7a98deab7bbffb90fc7ed6067232a2dc100d9b7391e69977646390c4664
 DIST downcast-rs-1.2.0.crate 11670 BLAKE2B 7d44d708c1ac068a02ea5d72dd3caa8a7f6d18b7ee653d520600acc9c52365824f5b8d3c68143d1d13aa438a18b16ff9975e15131cac7ec48b2d995184673d37 SHA512 b80b72f30b42c5e6b2bd33287f2dd22be5673b2fa5c1a8c75c5de224fc7eca46a55f2fce63c02d225dfbc94ac3462b4b2fec53d63331c70da6307ebcdcc6cb14
 DIST dyn-clone-1.0.5.crate 11942 BLAKE2B 308c4571d8c31bf95bc11bf42e9190d02cd37aaa4ccb2da25d479b30342199c2a4100706be71e5ea8f6752af7428276799f1673bd54972b9f0e103ec4fe56216 SHA512 76175579757272286a5141a320675636695b14fb400bfd0d19dd66d525fa8f0ca199a0ea9405e92e971a87f5f972d8c5528f5f1b36a9d84bc6950e4071ebd044
 DIST easy-parallel-3.2.0.crate 9276 BLAKE2B dcc1d186459d3b383354467a5eb2408d0b247bd7c1b2328bf5dc8abdf86811e7ebb9f0f6fa72ba949a06681ab223af4723f46a6997e2bc93b7e0bf880439f078 SHA512 0c83fa27d6d72be2afc3dd6fabf21b1b06e3aed70b60ba059b3447f6e593611224ddbf76fdcfe412a5b7d45936421afef2d4aa7e4162811177aabdb9e7af56d7
-DIST ed25519-1.4.0.crate 11367 BLAKE2B c1f5d16bb90cd51e31f00d2d3e3d8878e9f41962e95a69711e453ecb01f4bbf49c60da61bd0a605e46a22e8a73e9d2fd5d606e258ef8c525d280fa997f82ff37 SHA512 5c31db65e8ea127503b574abf2bf3747647e2a6c459394ea7735146c84b4c779f5d2521b26e62ca7128f1ddb0e4189547a0c40bf8d4f94435bdbeb90a5728b91
 DIST ed25519-1.4.1.crate 16779 BLAKE2B 8041cc0d41427b63b77fff6075c94afc22ded3f1c840ded1d06476486ef46b57f51f816c79ded063f2ea3df8c685e28f288370874d9a30b31dd7e39224100940 SHA512 c0db4fa04d3a9c0c724ce6f7660599eb4f7ae824ef7bea9b07efc47ee9781ab7e84a731868125b1bf6aa36ce4137f5de834278a35fa58b2ff5a862973b4739e7
+DIST ed25519-1.5.2.crate 17073 BLAKE2B cc8191b98140d89ff249d6049c301a92891242ae9d9d43236f23008c50387e1d9d2e485192fef0f0bdd6be73379fa47ebb846d6b5d86ddcc1c45e6f6d097791c SHA512 86c5dbdd18d32d226f6384c883538a1553c66f76c89cc94c15868ff037b8749f37b7d3d9c148ad558f8df3be500768b3323885c2763fbf8a19009aaecfffaab7
 DIST ed25519-dalek-1.0.1.crate 29460 BLAKE2B b156de45f81957a0f631354b7b438e35592306045a00360df71ecc1ae3298eb737fbd436b2148c471f94dacd08ef1c04dc193feed82b1d9963809ac999decadb SHA512 e3d6c4e9a8f573783817e9ec905e5fcb76f743c91f45bfff486625cebca02e17b5fd2c222f03b73932f8bf5ed680e729e6eb81f541d3f32f6d82b7cec4df7fe5
 DIST educe-0.4.19.crate 43859 BLAKE2B ef7c28871bcc25930c4f404924e023f99d4f05e52797b275a4f358a57d52a4cc1bcde7a66de4a26d2809cfe1cf5d6a37db58ac8cf0c081213c06c54dc4467b23 SHA512 0e72d27c2fa9b31464746103fd3902700c80e19ddfa45e312e1a49a2be3963158e8f336fd3c86579322157a76631f5f30430e953bfbd4810e0a396e59dd797ed
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
@@ -131,9 +101,7 @@ DIST event-listener-2.5.2.crate 15225 BLAKE2B 3a8b8fbc6b938fd6c2882dabc1bc23eefb
 DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
 DIST fallible-streaming-iterator-0.1.9.crate 9249 BLAKE2B cc4459b34a9ad00552a5248d090d1f25804b92838f41131e475abb83ae0b89401248feeb52a49dbffd499ccc0ba0f2f1d044f2f3e9b06662be01fe2257a4e885 SHA512 34824e2007cb944eaf54b10d6d3885bb17ef2a2976c6dd7695ff82a937cc95eb65d343dd7a5cd2fab5aa5859faae3352a9e1c78f239ff736900c1dbc3f5ef7dc
 DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
-DIST filetime-0.2.15.crate 14511 BLAKE2B 6659bfbe4c15c639deae9734ead88b31c118e7335dccead7deef103a795521e42de2903a7fa08cf802049e9df9cecee8d619c3db3d507a7f8f9f5bd706584090 SHA512 34d320a9aa71059d0303c62936aa94b30a873ba4b0b3b78851fe636d132422a662f79596d79edc33e778e07b0a1259693b59d7035ea390aefa4849f1af459f64
 DIST filetime-0.2.16.crate 14502 BLAKE2B c19a6a72ca4f6a34f9de39d9acbae694326a7a8c1a3aed50ca749e09905470a26c5c61986759d9fa83b9740354796d0dd3d3781c1d4c2cf1d8da5cfb630f045f SHA512 4c6277f43b2de6432769353615406af824295742e5604b40c2673acc2010b349fcbba201e7273756857938256f1693a515f3b9145f34405a56cd23af4dd30222
-DIST flate2-1.0.22.crate 76026 BLAKE2B a6b7630a31a4d3768540662380f6eb1ae162174947ed76ea8781021467547bbf8733642996e391453d3f074f2101d15ce65f5995cd07834351abd8c3b759df5f SHA512 c76fa3b097774f1da884b969285bb3aa7fac489446845c93dec1afe6b94bfa11f708e6718d5e4460022b9398a698378a210c3b25e9e676d2bde9d5be1a63261f
 DIST flate2-1.0.23.crate 70440 BLAKE2B 82fd8fca09a429c1a9081b450b1f255c7b7cf62852c6b1fcc8f1252b60b79f4f1e1ee187b41510e8752f4b67a817daf68319ac8df63b682f2736b761ed98fb0a SHA512 01f84f0d4d0c06aa0c807e5ccb418a5675d88d568694f74aabec8ee06c74e6b75c9c28fbeba2a99fe74b00bd29e71b9aa2df0d96da85beec76b3a30b4d044fe9
 DIST float-cmp-0.9.0.crate 10102 BLAKE2B 46bce5f7e838a947bbbdd22b085435e795b67fd23479780f65bf1586a70e7a35f04f9af086be98bff24e2583eeac7c9688727a2ddbd1ce978526dc01abf67dfd SHA512 f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8
 DIST float-ord-0.3.2.crate 7683 BLAKE2B ef9b6d27b92f82857974cb790156c2e7c8e178728c362d60db33d0a01d4a015a361fb9572c96ff136f4f93d0966058cbc70db9b3e3d49fee6df660e71c3d3e0d SHA512 a2f3a5745f1b2a0a9f9dd44d72baf75bb61009916fbd72839eaad0de3f7dd5f6cbb5f1eceed2206ff948dff4c79787e31ad10fb00aa91d2530d20abf38b34c1c
@@ -146,7 +114,6 @@ DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb
 DIST fsevent-0.4.0.crate 7292 BLAKE2B e55fa22bca32165c17ab1cf623311de85d1c1cd78f89fcc016babfa3557658352c17e1fd9a2fa64c753b0073a96361461662c4583f780cd7195ffcaa254da0ce SHA512 98d5e6998e3ae0cf3e0f383aa1e8f7fadd9b75154753168da4f6b87cc9a37b8830e7bed4b2169993ddf49646c9d47aa022d6af8a8a66370e7fc533932e70855f
 DIST fsevent-sys-2.0.1.crate 3984 BLAKE2B abcecda1e75e47b735f8cf638c958bcf0862d121b046b7b70b4ab6bd1913398967a1019422a0796398fc4f759cc2d326f656c003d9f2f47b63c884650d8513bd SHA512 4c7f96586c4564f804390c3ad22388456a138bef1902a5985463515ca9b56976fc14c993f08ac188897c449b2d2843890c2357398eb3ef5eb064326881e7167d
 DIST fslock-0.2.1.crate 13463 BLAKE2B dca565da8e760d016a659b7b81289034b8c48c416b326e403086a96aa4f50d6b30abe96f3026bc87e9deecbb49d7ee2b8352641f26d99dd9e9b85dfa7640d6ed SHA512 89f69658457994697f090c5ea090fed0699d032e2fa66fdafaab12d545ad6d21a324912e7132dab02e2bb1a09fc7b72d6562004c0321988a0b34332542f061f4
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST futures-0.3.21.crate 49935 BLAKE2B 290dee4f7662a473d82350092c0b12a8270f6d6f5eae9e4f7e06a6abf59e2d9f2d33e5e62e2682fcf6e109d62f651cb37cc467cff2b20f909c72b5fee2cb7683 SHA512 723fc190e4480fd812a852656fa6509a188f0d06adaa1c22ef24ec4afa7688a1c5d3961e5747f0812d073fc672b0e084af6ad5e5c3fac3ea5829466f993ad865
@@ -163,10 +130,8 @@ DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099
 DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
 DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
-DIST getrandom-0.2.5.crate 27719 BLAKE2B 881c4d498cecb55b2d89b1b382dc26e9f2f26df487460bf923b250e8d3131cac56fad42a35ffd4349cfc33cf8d890112578cab1ee6865a9e89090b35dc14c0c2 SHA512 4ae1e046a143c4ab818d130bb86c9fdd51dc55b70ad3e8a0378359341402636f69df27f7480f9c0caa26ac98b45ec88aea47b66ff000e2dd22e1ce52ba99e644
 DIST getrandom-0.2.6.crate 28043 BLAKE2B b9871b18389f6e5503b3b817baa37dc585eec980851114b3407f34d25bbf68fd70e8bdef60ab682967a1397cb9659b343312deee740aa2107bbf38d1f4629d60 SHA512 3fca26198bbab1a9e189fb45ad6cc7c7a18969eed6f68ca43407a2d463fe004955b1d199c1794a23a53ba21fedb61eff86d380d2bf49bfdb6c7055c11d543096
 DIST gimli-0.26.1.crate 716168 BLAKE2B c138e890457e8724295cc8996f8e60f1f4d3eed46c865dc7ff2379c65e8d470080953eee70718867b73524f57d54d4a91b5d5ba74d79bd3da38084a880f3fed6 SHA512 c341354e13a78c4afeb651a0ed651f60d188957216ba51079512531ab1273b1b79c86c57e904b87064015f8e7efe4280d9edd4acf90e25fb29f8813a4c7bf9a9
-DIST gloo-timers-0.2.3.crate 5421 BLAKE2B e4152041c152924c516618fe8effe37673c51a0bc7bf22e5a97197836c5a54f75e1687792f4a6e7c385f666cd745c8b9b32c4b824c14b61819bbc300d828f575 SHA512 f7396af8ee5789051598f4ebccfd5740e7fb6be0ccc780ec8031fa98054b10824aeddbdffad931f3aa956e6da4d9234dbd2f762db8026faa7953d2f62aff0fde
 DIST gloo-timers-0.2.4.crate 5438 BLAKE2B 04113c72a2d47b1b41b2c6494ecdce8ea2c43d54019afb6d622caf3c8fef55367e029827ecbc64ae8cb3e95d2e09951801da5bdd3b58342a346ecb9e6a197a07 SHA512 ceb57d8f72ac460a9c411f3e58116c049b7e922c5d7010dee8c0cf8955bc5241c0098d27e4b5b39c6f79071a6df7045ee39aefff235023f89f63a50e4dbccd38
 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c
 DIST hashlink-0.7.0.crate 25309 BLAKE2B 39370daa12ee047f1fbf4251b46dfc797a75cadb743b1dddaf94295352888d0d9cd2fc2049e6646ffefac527cd16126c2d61b62f271c9cb678ba40a2677e8da9 SHA512 bef02ac4ff270a7021e0da24f6f0a7c2d601c20e2bf347bb4ab24058d97d25fc863d6aaad7971fbb7fb777643f66c7e1af47251acd89e12a123056c0a7810861
@@ -176,17 +141,14 @@ DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc
 DIST hex-literal-0.3.4.crate 9933 BLAKE2B 65072b283fa7e7572a1ba8b65281054f2dfe1c3ebe830f6c02c6e97bd0a96a2db17f531aed0e2d39bcda1b99a648ae41e3ac82f208918cfaa2f04d925e5f08f4 SHA512 b064b9b66e36890d29f414ed5cb9c066000752c218867fcf96918e089d28a851dec8c790850e5a65e4105fa66c8e954cc0a950ad77c11fbfeed490e896301966
 DIST hkdf-0.12.3.crate 170910 BLAKE2B 08d0c28891f780abb46936481251f217e9d8f2d17d04e6e504368fe9028300ed02f091cf6a0a0983eeb02dee04309f713f73278e9b0f1b918caa2cd998112753 SHA512 bba8bd837e994e5f5131d4269fb80fb84d789dc0ca68dd967d71e92576617c933ee8c355427b470ad71ab89178b1c36e8a7e122457287f023dd4073605784d3f
 DIST hmac-0.12.1.crate 42657 BLAKE2B 5d432a666dbcf9077a98e1f8a4aaa3afc88f3d88553cf7a2356d117c66f38efafe686c148598ad67ae89d64ee3edf56387a6f89b75dd9ab5eee63e13953dcead SHA512 77d4bf51f4633a8c36712ce3178945141df31cd645eafcf4bd130b8ecd7cb498bf1ee6f2d9c8dfbbc9f97ac638919fcc81bd3ee600a1b27c3be3fa87313aa0b8
-DIST http-0.2.6.crate 106384 BLAKE2B 7c6627eeb73834c56dee8280bf2415a5e0045ff721b02ea207ddb2cf286b69487874af0bd3d40942474989642c59efbb35c0db75d9e4156a66efde2b2c51900f SHA512 ffafa748077a1122d3f7f1b9f34da43f5923dc8cf09b7b492d286d8a924b3fc9949c3df5bebe358b11801adcea8f20d8e8986eeda1e63a2ab92d4ed1fe0e6746
 DIST http-0.2.7.crate 104219 BLAKE2B a36788bca43effd34d8a328b428a896d71b1a036c6faa3559f4f452f6ff7a1bfa3237160392ccb04a3a33c518682ed7f4d3a43c720727bc413cbc1e025a0bacb SHA512 ab0227703cf3721d15de8b8e7aea441611d038928f60e04c6a7d40a66b1c1a4107c86848fe64376ba3ba99a3135ca1f60f2bc240b7f55251f110835576b88eeb
 DIST http-body-0.4.4.crate 7836 BLAKE2B 7f417ff8520753324d5915e3f092988fdd26b2413db5e917045a1201d7d701d8308b468c05da4d4ddb9abb7b0a0eeaf82f15a786f29cb1ef621e4c168f4e4bfb SHA512 cbfa91e31e91807f004df77a9d8999b1224f862d4765ba92ad4d34d288fcab67372734295f30760a96eb32454d78fc527c6519eb45b484e341617686e743381c
-DIST httparse-1.6.0.crate 28175 BLAKE2B e3c079f26fd250a89747f65e02632b2e3808a3a1d3d78d2356803bec3e228ade5d26d80d92cfac2dc3b1d6b3dff05488ab1ea27a3d51d93c6d3b6c18593c9201 SHA512 6f1f39c778dc5c14be863d2462e76f521ce3ec0b945799f5370828d29453760c0bc2eff888a529db74bf287c22673771bf4a5568b3a997a87004ebf292a4e237
+DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5
 DIST httparse-1.7.1.crate 29379 BLAKE2B 2e938694bb1afb0bcd79d19637a4dfd9201b217661fda14dff7b6652666e14fbdea6454743778530ea12d3c51ab51944981d29aa06ebf6e58e493684886be2dd SHA512 6db3892a754a49d9d529859acdacd548a71203eafc29c485b83006650a26f82b6e34969bd5e11d3f259259eae4d71bbdd0992fc7cad78a9a6f102977d057a8ba
 DIST httpdate-1.0.2.crate 10673 BLAKE2B fbe2230262cd041e1ea8d6f9782376c25b0e841d711961464fd5cdae0e9effa33f50841d8adceb6b9753cdab911f3456c86bed0d2b8acc9be5f81da8e62a1b9c SHA512 4d650dbe7ec1d0f457bab71cd009fd92ee296fbe0a6b0c0ce4d71aa3bee720094a03968c08e542be60869350e05b4a1739542c6415e401407345f5643e15f8fd
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST humantime-2.1.0.crate 16749 BLAKE2B e2ae8325b037fb175b9200cc5c1944ce579056c6662cce307beb6701894552362a25e371aad65f8fb9384945b48815ca74bb8b544a32e0a5845b7edd30b918c9 SHA512 3bf29ddd1391d82897c22baa0ff3ed58ef6d6959859f1f8ed54d324caba5b6fb4422e56790511ce82f902cd11467f93c8ab7fc7b0e0bdb719308a4d0a446ae0c
-DIST humantime-serde-1.0.1.crate 7727 BLAKE2B f1c0fc0fdc53c9b93b082ad511a90f50f173faf0f1c4005fda95394720a1a4a56e3bad0ed2dc9da133663f0f6cb03c7f8fd4a100e779344110f7cf4a18459388 SHA512 1e6b3e391d8943979a08f60766bf5eeefadaf3bbefeb64a72f8823c88c824174025253e30c8a913e954e02b04989352c840454fb45f7d3d5f4b8c1a52e2e904b
 DIST humantime-serde-1.1.1.crate 7886 BLAKE2B 4c66a483276e0cc5f4bd82fd49cfa0ee40c8ceda753919cfb7a8c794d098e9e4e851643fbc42a209d6ab00c5c62d9edc81c3bb1f6da218a09eafc96da9b566f6 SHA512 0bd72554e700f89506d2d1c8191832aed0065ea02aacb99e27139a60c883d3dbabb1fc3d60f499f5aeb20bd155fdcf21dc671aec1ca68d4041bf98ddf324248d
-DIST hyper-0.14.17.crate 179560 BLAKE2B e055162f393d31ddcf23a58c66874fe235711793576279276250c26a4f32367c5fe17e999a4047a57601a95908bec83a218710edac1289d379beeb8bc171d422 SHA512 47f2b10d76b417f19985a87b935557be9a35b06d7cb5fe7675b27a4fb2d6b00e235cd5c09820aa88fec5f5c52157c65a6dcf4aae3b33daf538c09d9214126a63
 DIST hyper-0.14.18.crate 179660 BLAKE2B f9c48cf9f2fccf4839a9abc1cc585c30713cf9cd57627a87d2d3ef815fb13b5795a1e6d9ae2e2c1f3f67cba16ec8441a509848a83053c558ecf6f01a6e9b9aea SHA512 9415eebfdbe3795488f57e6628ccfee4195f7b04ab3beb3fb5a0768f546322c2528f482838107cd32e2d71d1f562c8b2e6b34d94a6e7f1bbd049b44ae5cc41b9
 DIST ident_case-1.0.1.crate 3492 BLAKE2B bc79ebeefbb7e3ed1139e3f41d8d20fb175786bb123bdb9c1a92ea70effb4a0e5e798f24b068cd66a1bf20d53eea4bf24de495b5568c2d649ea804389a1327ab SHA512 81003a43f18da5997d644319274502e2066af9f9fd1400afda7cf2986b3ae0b7355b932302723cd3bda2d46b264340434d9279dea58425bad13785698d5808a9
 DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
@@ -195,86 +157,66 @@ DIST inotify-sys-0.1.5.crate 6965 BLAKE2B d70124656ce3e6f5ea3f430e8e7100d0691003
 DIST inout-0.1.3.crate 10743 BLAKE2B ac2fa5cadd98088ea3f6eb94ca46b3a9ceb6547ba49f0de311d86474d71024d1a087ce9b8d44ec808008db69146e9c81446bcfeebeb2fd74d2e8d0ad2c4975ed SHA512 1db5bc2bd87aae145b3b0be6669a9a722df2aac8f970fda210aaf945c372e641b941cee822917926dfa1ab8381c6e99cc7df4b18d2f4e2fbef17fdec36ed2beb
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST iovec-0.1.4.crate 8720 BLAKE2B aa1b4cd98ebe47901c0959cf1d8eb2586a803d0453e2a8bdd5c63442b32886dbcb37650aa218c748fd45c9fe3a7fdf20569eae5b19716487b139caae1526da4c SHA512 e23fcaac239807daea20ddcf2cdd4fb858ba1aa970ce6248f70f0fba5bff7ebdb27247c0997ac0ff2791178f86ff9657e473d8f64b86c644763e5b3474edd158
-DIST ipnet-2.4.0.crate 25186 BLAKE2B 98d53e3585f9a1587aca577391200a5083b8868de48a71d8403de3a6006e6576161b8ca90fe143d327b253458de05cf00865e23ee5754a6c2c51473420ce408e SHA512 8658cf15c500969f58b3515cca0f7d055b6060cc2978121f184d51e2ea7eb876fd36a947b41939a0d9929ce492b377d3502d69507ffe3f08507ca597eee2b689
 DIST ipnet-2.5.0.crate 25808 BLAKE2B 8fbc550daddf083d3d4e90941a807d5f15bf0b95931e2f47db25eb3284f4c7bbab655f2a88682911bc00543c24131aab6c514ed30a2fab8b751975eb5f43ad33 SHA512 40c841c71694d47f77757860c62a1b109bfb2e2d490e9b6d441d39116f7bda57e7be866d25348c1afb522f4b1caa75122fef79dfe9e3fec824345f3cc54376f9
 DIST itertools-0.10.3.crate 118661 BLAKE2B 0095d6e7f14ddda69605d09f74e8cc881eec1a1d234f705e667d7f9e738ef157b7ddee066855cbcad7f134bf79b99a4a4c77bff3371397a567cd34d98b68bf97 SHA512 9d17357eb68159edf4f4ccd2eb9895672c7fb633803166d5e24ee12350639eaf66f1c822910518185cd1f1ca5d9c3e228dd37525e6c337ba3fc7ce967f9bfc85
 DIST itoa-1.0.1.crate 11059 BLAKE2B 5a2e22ab891ec883a90f652c88f924113252765579c03c783e43210fb2604e9e3ccbd4c1571087791be07bb99c4e85c7f85253be831b3ea883bc0ac18a927980 SHA512 8e7bc1e9bf4fc06871b9fe20caad4e0af965477d724f4c8d0e2a3a4d87aedf99f92e4e583a6440ce574d0fb43fc9d6a2e80add52a2f64210c6aa3b402e424295
+DIST itoa-1.0.2.crate 11112 BLAKE2B e277db8e2f506d4d20b6888b609d9726d594e1cb2c9f21df60a8cf8dcbad1808d8c1bdb0b7857ce7734b92c0f23fb1ec56f8564e779f27eea953d0ffbfcd3f84 SHA512 44a732a102d60b58e72fe76c43a1d185fa12ff08d04eeacf03234368552f84d3de87a2ea0a6e7a56b8cfa74cb6f6697005afcee26f45afe0c2fc7dce5da3b593
 DIST jobserver-0.1.24.crate 21303 BLAKE2B 571e6f18f09d56d8281d2b2d206647666dc6e9ebb0a1fa48f707d3cdf603880b78ac6a2ec2239658a220e70924ed1612dc19ad90fcef883f21972a1df4f67d57 SHA512 0feade0f1f0a458bdbcedafce8fc39f44adeb56772ea94a59f16f038a743f506db1405a7c8deae65a6a5c1695bfb363c19aeea1c82c41c7f4d1101469f32e42e
-DIST js-sys-0.3.56.crate 70520 BLAKE2B 3ea566b937221963b0aaa037b3b702e5d4143300a5463e8474cddeed0c82612b76711518b91b2bcb63f5bae4c11a207c0c1a33d23f9c8ebcf5b54ae1109fd1e4 SHA512 52c2020d2bc80173a2ba5c614ed07d86755e969f4d6b071b5857259cbfdd3eb5a62a5abadd42ebc0d673397ad18721e1ce55e177fef831ac13e15971373056da
 DIST js-sys-0.3.57.crate 78605 BLAKE2B 260e2fe94a213ea169d9296dc8f5639fe62f47ce69eb69f2ac2f9b1f409c3f2dc1b26fef56cda5cbfbb775a7f85d2b6d866bd4e30cd6041feb337b744e57358f SHA512 797865ba4c40bdd338ea3b980d6f7139b580a12057437319d3427da6c5045455e0612461289ecbd6ed445e8b675369a8ce77ec8ac0383c8a800a7fc84606ac2b
 DIST keccak-0.1.0.crate 5849 BLAKE2B 7795f1f9918d8723eab2b4e6dd99c371cf90e43699154356052fabdd1d4736765c13ccdfab51baf63088676d521ea674ef1b742f0ea8613049f0da2c46df4be8 SHA512 5514a50d52979ed616290309cb27d17fd1521ee89ff51131fc2cd2ab38bae2a22f00749b8de2ab75420d557c7400b4f59a9bddaa532efffb22a5fed5fbcdf65d
+DIST keccak-0.1.2.crate 13616 BLAKE2B 68758d550f4462fc7d2f0f4f3a26f0d2928b5a99b51523965c5e28f1148f0fb168fac571e565a0930bea736ef09de598e3286fa7e048b0f40ab2adad11f17419 SHA512 65b308152fa19c8991f1bfc65b38cf4f922be38abd905fb75acba1c3b751310e9e91a7f8d5ebc25c875a2773c4197961fb1e188d13756933d470507aab53439d
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST kv-log-macro-1.0.7.crate 16842 BLAKE2B ad3c028863d78730e4b2bb2e8cb980581b13d741b5dd2b76435ae91f5a7498a1e9f99178a0c9370b693a3af6a95c0682ff0d63e81a2515a267c6564d50ec3683 SHA512 aa7d79ae599930dcbca06f77590d9623dce461b118435dae1a4128fa8f38149a820109fe4bd1f19944b67285cf1b41bbf78e94b47e561dff1af683953c55a697
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
-DIST libc-0.2.119.crate 575749 BLAKE2B 5fa2bf66a4d642e1380335fde0fd190d5168dca58376379caeb52171a3382e5342c727eb4d92f1e27adde58a24d00352896a73c45309d947f56787a99f2753f8 SHA512 a43f8d1cac7a0d8c1bf6f2125695c03d91243498d2dea19a3a674ccb2c64fd00bac4040c42130a1a096b2148451f62e1292c5c71f424f51f888d6a37c7db0bcd
-DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
 DIST libc-0.2.125.crate 589236 BLAKE2B 57ca3aa19687b5c5702b66ad690a86ec7639dca41c5846c7cc3500f2d0fffcfee95a2def7695652174862fb6b8d211e7564fef6bef6d1197c481b5b8f18a9c74 SHA512 64ea5bb20120b9893bf5a3648f28da07384972e3cbad13da40c3ecc501efe1bff0bd6b71f52d5f253f00d7a97c2f69d86fba490955e8d70ca1360b8db1e431cf
+DIST libc-0.2.126.crate 590481 BLAKE2B 1000de6b9fa2b3ff025b961e504d6d20b401f37cdeda6710187d18ad2dfe8ec89142bba65486d7853f1796897b58f343c5a34dd6381a0d0794b615635ac31175 SHA512 9bbb17f64a7503819616a71076ebe8ee317daf07b17b9fff783a4459da0439aecee535c09e7185bf148b1993e6fc958d182a490fc9c9a7b9fb635429c491ca44
 DIST libm-0.2.2.crate 113226 BLAKE2B 126ff68b4ccc7c4e3043095c84ef010bffdc1f76d3c0c871441d1ecaaa044534506844fd6accf145f94cfdbb611fbb1fb13ce976521911dcfe77d57c3c81463a SHA512 5aed180dec326ed9ee2fb90dfd94127ee5f75804f7ce7fa0ed5c7e1f0533215690553551da44c055f9ad47170ca32971467fb378f7328a3c22930832388eed75
-DIST libsqlite3-sys-0.23.2.crate 4687087 BLAKE2B e1b91a2b1b380045ca31c7afb80fc3127bd4ce5e8d5cec1fc90ea07052a42e890272098618ca9ef0ab4d36673867e91a0f301b798abfe4eeeeead5a101bea4a3 SHA512 7f079c6bfbfaa2af24a351631736467f428fca0a9c04946e89e629884e11a13b0233c59a534c8962cdaf97b94242aacc315431c9f57ffc68d50bc43a0b0e501f
 DIST libsqlite3-sys-0.24.2.crate 4771096 BLAKE2B 0c9d4f13f94995104ca0b205fc880ff8e86baa591fac13f9595bdc9a00f6909ea604148589c8933b93d0504538e780fad0b97648d740b40db591ea5315ce6d7f SHA512 765fe281a5d232c3cb08b3fafed9a2dd6d07e71b49763f9ed4391038875bdb4d332930e9afc10cba7a191926a2ebe84a13620c0fcb944c81dc245f81d0e66d30
-DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
 DIST lock_api-0.4.7.crate 25371 BLAKE2B 9ed08433ffa70af60193dcf307287991a3154f0ef16b485f32a6c83e64962661a6e08ef83a6b217d6cbf5bd964c0638d8ed86b290087677c1fb3218321c4bbf8 SHA512 b1a5227fd131edaa70e017f7ddb43af8b4efa58488007b898ca1dfc818a3a441b732b7adbf1270e72a68ee5d2a99a5d48f33b2bca8e2cf78694953d20d27636d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
-DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
 DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST lzma-sys-0.1.17.crate 764176 BLAKE2B e596bdcfc1fff4d34b6e02ce75452986801afdc7bdbdce69bef07ab07d3ef779a15f4ba4e90881d138c581d022b814b32b7e94581ee2f9916e54d5418ef8fe63 SHA512 1801602b11b479c71552e67b1e0384535b7b6ffbfeb3abee122c2a965db0f07e98452d046b1036143047d4675f3749507eb144591eda083573175b392af2e0af
 DIST matchers-0.1.0.crate 6948 BLAKE2B ec3a5d01d2fedbb4dbf5bb185afbb9401410463a61f51674e0df6a571db352b2bbabfb99cdbdcfb4e511ae783165bf0258f5163f240a229b9087f9edbd0df41a SHA512 84214c1a84952d85631aa1ab5115df7cda223ac64e2acf055b6129ba1aa26ddc87615a8b51ca890ce3fee0419053fa7fe1599ae128f1d211b58c07b0c4af3b19
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
-DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memmap2-0.5.3.crate 24967 BLAKE2B 743b61983108eeb82e547b216c71039ad8606d2fe533694415233d73accc14388cfbdaf9048fcf13448abfb4a49ecc3f3c961a8ea8a364a428626fed499eadce SHA512 b570f0ea37ba18a8eb22c9207dc952456864fdabf0296bac63c4741e0aec424ac7932fc0dbbd0292ad94406b1e6911826406fa00d11b7590c54816fb7898df5d
-DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST merlin-2.0.1.crate 10943 BLAKE2B 0cfb92dcb14a5731f0e3e59a51c98e463547ef817a9d9c08d9ef92d0ce8b0446af7175da7e3b49d713e2f1ce2131d25d9436a194768beb739ebaec71856110d3 SHA512 b7772f46e410cf1a1f87f4d9a8d70e788ccb171fd339d28b99680c52352d15296203617c174d88b1179df88e850a1fc4ff9894b17697fd7c65412a5e2c511b74
 DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c
-DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST miniz_oxide-0.5.1.crate 52418 BLAKE2B ec1d640a1e8d3f6c518545ae51c4b2e3a2f2d37dc4465c09f7dfd1df181b3c8bbcc6802b9abaab47e58d704e3b0ed0060aea1cd2ce8b7bb64d376817ebe96dcc SHA512 7fd2c28f3afcb993d48452eac55d0d6037f4eab5c05d6d9abbaab76145d5ea9c6163af9b6461f91d4940c91b9b7734a351096a313311c07cc53518559d578c01
 DIST mio-0.6.23.crate 103554 BLAKE2B 1286ea6deb7579964a5c15926509d438c5454d4f56e936753c76927826fbc5444dbe33b7465a15d0ae6c122bcc98899959391a5418bff31c176d51d7b2f33077 SHA512 ea95d15072fe36524a85b50108415a809d7ea3744deee45e4b6a1b763a11c88cda6dbabe4f8d01945a5edeb52296a74fcf457c85be3032c1311a35025860d05c
-DIST mio-0.8.0.crate 82954 BLAKE2B c88da4c6681cfc518707e421251ccca176b12762e8d5d8fe2e71a89746eae94f3b3d1ccba3e7a32ac68928b81718552f6faec267e79a889d858e0c215cd1b2a7 SHA512 b7db8f400c46937302a091a90ef05b501aaaf8cbd9b5d8a4415e140e5ad54fe745ac3248b49a6ab42399d145c01fbbdf0a69defc379caaa67f64e8b7cf160b07
 DIST mio-0.8.2.crate 88272 BLAKE2B f704802aeec66cb47a011989709e6c35352b55bc7330dac7631ea144ed71bc86a433ef742207e3e37c47417bcd7ebb505287baebb839294e5833d228a2514c57 SHA512 c82ea0afc0de8acf162188a6131373f3cb3e7f3abb3094dd51fa9094e42a36806954f267840b3fed18c0ac3ee75af0451dfea5509ab65a94dcc93057c7d37393
+DIST mio-0.8.3.crate 92506 BLAKE2B 4ae9e7f68921d7102274cd8afe2dbdd59393f9a0f63a1d4a1d9418ba8978e31d521ea73eac7ed1b27bf31d67450952b28964f6d35b14eabf2325c08aee43bbea SHA512 c6eaff99cbfe797dd97e6d29da09a6bbb2a46b3f3ddab7d75fb756950d463545199d13ccb2d51d367a2499d18f88500fce8084b82b2f020865dec0d9d9ccdfbb
 DIST mio-extras-2.0.6.crate 16292 BLAKE2B 08b9fc0d594e8ac8a04c70be88e34e390a24d90b9640907ac7900c26bfc1f982502e70c19172d57a0b697ed4701493ebc03ae4959284b74babedb8059e9faf10 SHA512 2d92e5afb34ef4c7d00c78d6ed15d4e786aaa9b57ea6e2743b996b8377389c9ae058a6aa227c5c66c39a2f86a7bb0b22a13c73a3e35c4b7c65b7b01fcf7fa232
 DIST miow-0.2.2.crate 22044 BLAKE2B bec3bbd899a080e5c97a8c1dd9dead16a57aa44cf2bcd97be03155c28345c45fb731650eabffd2fe18a633ff947e63561327cfc86560ee86c3fa71ad4d2a3b62 SHA512 e42012f67e1c5a475d1c9790bc731add53f7a3838d36f8a701f69974c3ff33d31364006220e69c8f37bae2eb31055ee704c42b64241d13be528c768ca5c3d6ba
 DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
 DIST native-tls-0.2.10.crate 28590 BLAKE2B c2dda4aab348cf0fe436bbece790ceac9d1b5425555aa40d09a5560058a22a931843e905ccf9e8cbbcda87ac7a7a4146b77ba369f6f7d7043598ea0088140feb SHA512 1cc30c3e16e103e49d585d017fb09962798d33dc4186a5dd3a28f224d3645e8301d4f5cab9b667a27dee88a49233b69974b41ee4aec2bb32ae0745e27b92b352
-DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
 DIST net2-0.2.37.crate 21311 BLAKE2B 21cef5df92d5d51c8e23c57ad2225e3311c13083fb86830bcb313965eb5ad0170519bed9a47cefb2305d3614ce55e11896a06437cf9ca50c79b7843ea633e99f SHA512 9ae70c655468c3e35ce05988626e0398a3cdf7b7343c08aaecf1267bb958329e608b814cc7be252fe085de3cf6913a1c72aad206c677459469ba4886c20206ec
-DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
 DIST nix-0.24.1.crate 263506 BLAKE2B 6e89beb88a924d4bd4d4cdb8b384cb4d3b080f3594817a663038d906b1e26b044f32271d5e1cb6f17053ba2b5133b6a2ba8b748aaa08cec2855159b14160f51b SHA512 eea2346477b5acbcc7c74fc0d3f99e35bc85f8195563599423cd838f258c388561e82feb66e9793528f55eea2cb015e899a335d6da82ca0c1b8acdff1b53efaa
-DIST nom-7.1.0.crate 115647 BLAKE2B 5adbe8250d168379aa7051a4fad7fce3cee74820043ba8233f1016417f91ecff64887c3bec1dd6bf4cc6b3b3803a2c19a44513f1affc635d8be6212bdc8ee47d SHA512 aacf14e84be17edced412e3d256734508426a8acb8352e83a5d9d4f26d640f60a881d8f70fbc6edf1843173af63ec05be7694fcd6c6287d871e40518e2ed04ee
 DIST nom-7.1.1.crate 115818 BLAKE2B 1ec3df3d9a7527f26618a9b6b976ca8ad5176d711dc7e6163dafb1ec214a55345e952439b4c98b2ac371c9a67c7ffdc3213d1081b62b699b36af68207fa8b320 SHA512 1456efdbda4f5b3da6c8580721acf101ed7d779619ee0190c1df103244e405a8ffa0c3889901a2d8beeab0ab84074ed4c7cec5330c7cc2a5a3c30e36a2530be8
 DIST notify-4.0.17.crate 54419 BLAKE2B 826315718f1135bf49daac9d0eaa87f2c49bd34f83fb8e3b7970ca954b7942d20466d2c90a1c90c899f9c5683066fa341e38b0cd83a1942ccf387652a712aabe SHA512 78fffa1da9fafef40ac92190dfaa71e22b8999bb8bd9425e4d8e9054d234ca0fbaf7726c023987756a3900b00aa9e713b093ba7643374f2ffb20416ce19bd193
 DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
 DIST num-bigint-0.4.3.crate 97799 BLAKE2B afe9a08bf20dc974dcea12b5f9dd465e8b399a0cb0a6d0028d08f7f753aa4dfc929710e4dae883e67633d9dda073f995287e5315b1487e8f99f8f23f1f70e581 SHA512 4b38eaa8b51119dbc7cd8a1e177f37ec935ee348b693a93378742e9bfa68fe5f7e5062b7f34638283c23f04d2127451d796d310cd8adb64dc8e865b28708374f
 DIST num-bigint-dig-0.7.0.crate 123930 BLAKE2B d6c41249cf34cdab7e2d612f3d785d746611ff1399d101f7c00ddd609e15c4fc44c62d6f74c9cc45c9152240d98c7bb7c343f5e5e58e8df531f7f134b187f3c4 SHA512 984fa9094dd16bbef9014eaf58d06df9b43eedec936bd1b1aea51e690bc2d3b1ee91d3a7781cadd9a51a38c7c8653ab3e0208c9fbcda322ca035f81326dcf090
-DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735
-DIST num-iter-0.1.42.crate 10450 BLAKE2B 8ef03f8f84bbac51a11d22ad79d745c74c4092bdd6e65b91c472967c006fb3cd6b944c4bef913465e39e6a2fd734ac2b1ce1f21b332b2faece823fe410b54340 SHA512 46b0e05c4f4587121ec300da51cbf02e04ee8f8441eb4dcaab5a2ccee3b40210f1badde56addf053fb876aed3749dfb5f01e757042573fdf99defc77fb265f3e
 DIST num-iter-0.1.43.crate 10655 BLAKE2B 41ee6d80f38f0767e134835ac84dacee8b50395b29c3e620b74cf4a843cfedfa71dc690e787b291a2b08750cd8386f1dad768e1b506ce088df33cf9e51b90a8e SHA512 97ac20f16d4518c8cbe944e5c80089fa6bb75d4632fb9f3c9d9891aaddb0e0f2209f6e854317f3d3b41bfb330c9d3ed830f3797f0120d4b1863b1d6fa3b9c07b
-DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8
 DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
-DIST num_threads-0.1.3.crate 6374 BLAKE2B 9eade62e9a320f9b5818b6a823ac396771ae9524033535a9dc5fde407c233ec48915752a14262032a0fe37c92e3ea50de2ced1070bdffd8a280b147bf1c1d607 SHA512 f8537933810ff5b582473d757faa0b39418e0aa557fe78e48fe611984666f7e8a1e98eeccebf42526e21260a6f35ca5a3b987e5bda445582be16fe2354ad33e4
-DIST num_threads-0.1.5.crate 7109 BLAKE2B b5a1055937a87c3f3b758ad527fce0a14c812b40c3bbda530bfc0e03f43dd3155c17e1eaa210c512a98919da802d9d48fec4e3c8464072fe4d309b9a402d9b61 SHA512 3ad2234945ea20f47efdd8381de2f0f05790163bb1e4b28d9e630a2da4d86c99e596558ed231e2e9d62d84ae85f8f5422dc11c323ba899e37ad1e654e3c4fdd1
 DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6
-DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
 DIST object-0.28.3.crate 233545 BLAKE2B 241e399112a4962c034f1aed3c651eb810c1cead10c7c6b1d6ad4bd8bd61412794f18827979c477005ed8ec4e2fb2b2e7ffdab118083143e20862f1d3425cc03 SHA512 40dfafba5105a270be3c8378df9000efde2f6bb149b1012da50ded7415c43143f2718431b516cef1b14c739b73e1915e9a1bd4a38141db2c24008fd1d8e1f8ba
+DIST object-0.28.4.crate 237248 BLAKE2B eaea0931cec7c2c71f859b56a70719c71ee06cf78eedd0141467eb4afadff514eb8a996976032b7625a08dc9105e28bc6929890f2e721f7156fe21e3dfcac56c SHA512 32a20452ed62b789c859c442009faf905ba4bc28f11bddfad3da3509861afd8dbe54e5bc0523c0eea5d5ce19cb94dee2e74f218f79df52d95ad22657d571839f
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
-DIST once_cell-1.9.0.crate 30702 BLAKE2B 3d492e64db120d8a23c08490a34d376a006e46b28bb5f0f44c3a955896e6e597c67ced35daeb4ccc7f7748f142d3bf2cb1d81ee61a99dc6526c48730c86a2fdc SHA512 cfdb6aa4bcc0f50d4c37eb69867d2deefa70323a7b607e55180b7d417b7188c4f2889417fd04fc51671c65eac75c7d9e7eda06a87dedb846056def66d14eaa46
+DIST once_cell-1.12.0.crate 31549 BLAKE2B 72a6c2efe279abce207096dfc47d207adae34764642f742bcbddcd8ebab9f78f6c2ea7750bd670844de5f6989e4951904b5f624281c28346cb6c41c585137e91 SHA512 02da0e6eccee2d5246fff5e6323bd7eff0f4641801be5e5910763929a5e9d8b62c07f81001c405cc6aff03f68a14ed5bfebd9900bbdd09568bd1ab9ca9b73093
 DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
-DIST openssl-0.10.38.crate 207436 BLAKE2B e2c999f1f04f7646e765fd0c1b51058136043d84c052812c4fcb0dc3cd3605768a8104d9b3ab9ada3d7d57ac057cc6ee0e7addb6e4f5897cda9236de3402a3ff SHA512 3cdd25b722b036779187a8906c11abefe69ead198204ecb8cd71aab549c910c3992761439336baf82c61dd6eb3258a365fad7eae4e4b7bd1959a979ac6c3faaa
 DIST openssl-0.10.40.crate 217120 BLAKE2B 7470af72e060a4dd087468dd8f092f7519978e49e3a9e7df78cd1ae8d33819a4a14aea078d113772528f3eb4134c019fda9458656b25b9483352b1a19259acf9 SHA512 c07b2fa47cec33ad3abfbfdfe0c8c99ce00aafed5437f864e9be1d151c8f82e52c54ba565ab710693f108429f48df2ce0d2955f54b1926d808ea56fa168afcf9
 DIST openssl-macros-0.1.0.crate 5566 BLAKE2B 51116df0f86274435f41b8bfd2b385d5a6464560a05c214445dde5cb414999d200c55e5529fa98e95abfbf26bdfe31c88708ddfa2a81671341792059ea703c07 SHA512 7e37a0c05781da13bbaf4c056c19d032a93820cc324f9f6e5743bfcbfb30e057501af1bc7cbf5f07e3a05191678cd5ae5bc4d6832f02ce75bfb03c027d18abfd
 DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c
-DIST openssl-src-111.17.0+1.1.1m.crate 5097946 BLAKE2B 2315aa82144e27a4b6df50d468665cab2efe1a0b40a41e1c07d29ac11fb5e66165558f18979a2e0454d71b82957d11683e404ba35730e2dd5121df8f65ad5f6e SHA512 b22a6620d91936ae942597aa430675e7ac2e9b7439fc2c51ff820b2e1f1322a1a51a7d2bc4aad73ec544d142e79154d5ed74cbc94cdd1a665fe02ea26d5cf282
 DIST openssl-src-111.18.0+1.1.1n.crate 5100899 BLAKE2B 2f5e44216252b33c07876e7b7627799f882f53e3ec861ab8526a1e1027e179ffd19b55a9a979c898686d6127e2c83210cbffd2c97e9db942af5ef5baa8f9530c SHA512 e82d90e38b8d57be7494221c0aa069fce072ec545ff8956370cdc6d29a53e9c67a994b1ef0113fe0f87431a1666eaf85e45c2803266ec914156577a7480699d7
-DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
+DIST openssl-src-111.20.0+1.1.1o.crate 5102014 BLAKE2B 3328b4c0c5d76c9176ebf31805380b7170a3eb5b0673631c5130bbb11da39b448438645247408aa7f804092a01ca1a682ac244710973bbb327a3920da0dd2722 SHA512 8c937c1f739411ca1ae6de864fc2c41b7342a788f076e8d83f27d9e8c93d9d0e1994f85d0f6d62d288fa42d1773b7c4bdad6b71f69e3595baf39a3017287c70e
 DIST openssl-sys-0.9.73.crate 59581 BLAKE2B 77b56f2defb4725daf671e1651d0033909bfcdf8cb7df8ed7c942f2b2998ef17d7c5aaa335e48566d2988ee0f489545266b2fd1214c0dd5de732dbdd34201909 SHA512 b17ba906433b212587d6274def3cfc1beba2c50497f5653eb1a3ce767924dbe279f750ab58c77c216de852e2a3aea8c7cb0c2577c67dcbff1b6584c7d55866e0
 DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
 DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
 DIST parking_lot-0.12.0.crate 39761 BLAKE2B 227ae508bebea21bd06c7a9c1651879ce3f5cd308019c8733f6b88e75a57b57d19b7bbc5dfed5ef1bff57ec0f116606ab699cfa6017b6e00078e7e4717cd58a6 SHA512 efa1ebe2f3849a9c6ac484c7e1cdd279640539468bd4d4da6c4c97ae34e86fa3a42818ee4839dea512635fbbd836829dbadd81dc05208614c820d1374139673f
 DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
-DIST parking_lot_core-0.9.1.crate 32234 BLAKE2B d9f829350c9b17d9fb68c4efc2112fecf0e4b7b8b5e4b5efeee694c68759ae6a59b7678c00b63118c8a464c22ae970acae4928982aae70c75f06e7b381729265 SHA512 c084dc175c3d91ab19b897d0bafb736a9c2ae89242ac4e2ed87e6f73ae61862c641fa29fe6beec27602686f36a52bf5eff7a3c2138a4a8edbcaf1338e62d4df2
-DIST parking_lot_core-0.9.2.crate 32254 BLAKE2B ef53a3e10228569dd38e1c5a8816fadfdf6b02ce01bf8b7099c7e3f1f71b4fb6c4d8ece8e52c9ddfc9a5ece6c273def2d9bf5aad8afd76ebdcea8b1ce08ad7e7 SHA512 0443dcd867d8be6e5d1b6ff0af8e31bde6378789e30865442bb15f48ac955beb847ab5954be4336fa47aadb7478606bd217b745134de50c16486c26e07fb10b5
 DIST parking_lot_core-0.9.3.crate 32256 BLAKE2B 79a1924a983b948a5c2b0c074452a7b2b61abda973d3bc8040d9153d34b378f0ee330e36aa813f49544319c479665d6328be71481f2e1e41bc94abb9bfbd12a0 SHA512 fa30db0fc73b268ab8395adb8bda35d12dc15363b247a95b7c4bb848ff9b8dbfb971a20f320b4feff3317d5b533c59b62152e4c652c1809a422c5671310b30df
 DIST paste-1.0.7.crate 18285 BLAKE2B c32095dc3e828fb91aac7af107af824866d2efb70ad6e01faea4862156341130ca686076e3cfc1b5f127354bd4ad513f47da553577c91437794f63d2a8b6f29e SHA512 6f203485cd916f68c4acac6fe6193e2ed8c5a36a6f58865fecbbc4e112e14c6e849cf61cfdbe22fd5b6311d60f1831d726da519a51a1a936552c3b39f01c90f0
 DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7
@@ -287,79 +229,65 @@ DIST phf_macros-0.10.0.crate 3552 BLAKE2B e254526a4ef4868ed9b57f066f4715ea903cfc
 DIST phf_shared-0.10.0.crate 4095 BLAKE2B 9155a2c145148f3c36ba6d6d8be86a526480b127f4af79b2b5855cb014a0080bec1ec45be466513bd57faa39c77cfde0d6ca02b6bb77d37a23d697603227da37 SHA512 f088a6836a28afca7a2ef5440d7aa953227785d52aa0b9fcb76c88d085fe7f0e68732f2354c9f8dfc0a90ab1b8ac214f28549780e6f32d857ff7e8963093d9e5
 DIST pin-project-1.0.10.crate 56366 BLAKE2B 6f9257c9d5c1ac52ccce7f7a6d479768d8fd43083a9775b01db78036f01afa774732eb3e386bda69ef18e04ebe73d9ebf031e88d0667c5c75acfcb0563c72f52 SHA512 d714512e74b41b0923a6e670d2b132f556102c449512d0028a69548173f870de95ecbc9de8d31326474d3d46fe26f91797dbbb82f739adee4310d3423c510539
 DIST pin-project-internal-1.0.10.crate 27913 BLAKE2B ce42cb46ebb64f3ba1aeb761ea55a054f51835b9352a1452cf7db825e8ad2206bb1c105c639bec78defb4746f0018b2477565690bb1a2b6a6be1d7008e43d29c SHA512 da2c806b1328971b16f169259477f27c85724756edfbcff1f6f232e2aa305b291068b95bc3508d1c4c860237c8f97f22d2d3412eb4aa47cac5d2532609aabb14
-DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
 DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkcs1-0.2.4.crate 26580 BLAKE2B 1b587462f3e3995fccda4b409774c0f1852a8f9e25c0cb68d3e283d81c5c0a7f3f7e59ccf1ecbc5a3be721c6388d064a07da556b2adca34fac9306960a99c4a0 SHA512 35421e2c1c3110f5ee977604c513699ec836cca166b99b0f7533c74bc3fa08b4bb9e5304c88a93fcf081c7591ab983022e80f1a4c09a1cdfa01e64a50e97365b
 DIST pkcs8-0.7.6.crate 28858 BLAKE2B c637ade59727272b7bccb1fcc71b5958d2cabd2a20e654bb6e13406e1015326e0cd81a9ae5dc5fe8c842711b4318ea1c7deafd4ed5dec7be2cb6dc55ccc9dde6 SHA512 b7e6c580467082337e5772f0f90477cdd36ff9d8f80702cbde46ebef0fd89995cae40bc6861818f0b67c53098917337189f76e666a87a15039f5f5a094bccb39
-DIST pkg-config-0.3.24.crate 16489 BLAKE2B d0bd099bcc39928b6758c22b14291f2dc4f4452c0837aeed8c3ff6086cdcf29518806e4f3f379804c998d752b717a26d5c0054c071c5f4c224a3e03cc6a3ee51 SHA512 be22c609b3d5a9a38bab1d30792cff397cc908f1c53fb2da68a9a7d1258e53ef64c1c5b26d840b0ed1d35b307c98ffb499c82e5796e88be0a6ecc0c6f3b5dbfb
 DIST pkg-config-0.3.25.crate 16838 BLAKE2B b6ebbcacdc0f440e24ce5730edd4b371387cf7f44e438216893f29c0f303ac7920791630d4a9bf13581da840c8888e18bdd78dc61458d3331e967b3dfa6d0597 SHA512 46658794f0a7446354041c1cc08cf637970f7651c0c506e2b90c9d4e284347cb82f05ce282cc55c8087bed58a5b961424a56574f4500de9f3ba9cb9e71667aa8
 DIST polling-2.2.0.crate 21616 BLAKE2B b431e4d31a677ee3d0d36710b27fe98b5df11bd37ac1dfdc464b8a0864dee56985125be388afe9f4c5f8e8c556f668578b2566a6de85f0797d6ecce285d42953 SHA512 6592682d6abf61341e18e5b7e6aedccc31de36016c323ee4e01ca4247d5a40be14f9f60e0602f828ce6ed55e29daa3e601e62a1d472a7ab3a75d760fb1fbd99b
-DIST postage-0.4.1.crate 419430 BLAKE2B 685acc55c593b68e730204ce23e0ebb337854f744894d99d728bc72c16dd86bcc30c5f45f267f4af1f17a711f42ad3c060b2e18e4bc6b3120c93e2d847d4cce6 SHA512 991ae507db8b50add171575a7d7a1248200fa5b636a88448d0cbba8cdb0a40212d7403e52a87b016ba2ed84c350a00db7008d8d53a8056e73eebefef8a805dba
 DIST postage-0.5.0.crate 431521 BLAKE2B 641efa40f8edfa53e9764f8f89fabf150588e293d62d054b2ed3739e30af409ba4f40b6011aa1f8140db9d651133b2613145a0aaa099e11d6918d506f4ed06da SHA512 f30825d5326830047f9d1dad63c63cc8655a0bfe92ab65ebb2338145688dbb9250ca0c53923b038d4ba04b687898eb4accc1040f3d2f1d158c666e192a528c89
 DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed737e101b1952467a1e19706bdce6c758eca4ec7d575b2f61daa47cb25fa1d74039b2adb0dbf949b66b7aff3f10a SHA512 264b916f7d1bb6f1c0c0d3cc45f40b72b638abc7174416b49241c3663fe500409509ef6c8241a24515a21a20288c2ba508035b6b37972e4ae7ad02ad19118b74
 DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
 DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
-DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
 DIST proc-macro2-1.0.38.crate 41687 BLAKE2B 226f76a1c264d6e74b72fe1f1a10fa8ab1405b618d0412863cc7e04509f682435dcc2703bf196e4fb1628219630d882d2be64926da19903b36d052113dfa60d8 SHA512 f360b00b4b1e05df52ca1714df34c719778f7bb6ed54fab04a84811acd0a29f7c4d4871fad7d988f0c042fe0fc326d7b1fedc731c55fd32c7257dd1895203080
+DIST proc-macro2-1.0.39.crate 41663 BLAKE2B f7d83709efa289ccf12500389c7a4f4f0e32aa686f2d9c47f0da2a5381981e70e45f1b689023891c2543ce633c593a68a629c6414fbb3c2266e4cd99b8660048 SHA512 cd1572831493f83eb51985eed06d8ef5c0ea96ce4231d5ce3be5af9db97e7dd24400332d3b80e0e9c808091fc11889340dd86d8783ff3d9681dc53b876f49a0e
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a
-DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
-DIST quote-1.0.17.crate 28629 BLAKE2B f4c586b9869e9fa24e0b5a2eb9b4dda7aa55924c6a7f6349825c5c9a55ce170397af975d9c6b319009791cf48f51fdc0aa38530ea31efb45fc0659f07c30ca32 SHA512 d34fa0c864e3b9007449269ad5ea8736bbaa359e61eeb454e9c1cc30f9739a96778a04421e2a014879aeee417d8b51e20c6c41ebdab6878567af027096ff9ebd
 DIST quote-1.0.18.crate 28911 BLAKE2B 623872402cb185a57e2ffb1bfe4105c49c152c33c44c8054af59df7bb193d14416ea2caa7b28b3f9b9ae6985bec7fc7825bc946e2e41915d2744c887a51559b6 SHA512 3fa537aa96a8970104411471b0e4b7b9339583d552c1d9297737a59ef5301af41da105b92aeace87376e1395e379153f6551bfcfe9c740e6945064426f5f6f84
-DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
 DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
 DIST redox_syscall-0.2.13.crate 23759 BLAKE2B b59c3e923b7bddc84285377eca86e649c21ee7dd61924245d43c6554124adf689f9b92841ca64876b34797249698511b322f6e8e639d71e45e1ae9da5f8b7834 SHA512 6551f503ba52c4edc0cb4a418ff212188ddc7be80dcb39eaf3bfb82faa9a76cdf359f604d6b32be6c6a335b54180c9399a0e32670333a5a08351957308486100
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
+DIST regex-1.5.6.crate 238593 BLAKE2B d2b200d9d3d8924e7dd7a1f96c769a5bdf01d9bcd358ffb90692c526a81ac6f1a5db8ab0c343b96868ef9d71e78633373744468fe97d281676c84ac795352745 SHA512 43ad2ebe14f43d69c62f563a4fd53b5657f0f2cc130a0e6353a13073027640ff891e9f9b40ea85858507047bddb2e023d668c9bf57f2ba0ae045b74b5f0d2a1f
 DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
 DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
+DIST regex-syntax-0.6.26.crate 293912 BLAKE2B b0ea1ea1f87a493c770265a8d9371e3c532bf5ca20330b5946f5c922292d4420ddcfc30105a4ec3c1b154b5a77e55e86987f7edd61ef34c12eb0b4bbcaf23d2b SHA512 46087f5a2abfb48f24da77e79e66f6e514b5d005c4ae2c3283418ec471ddac9e4a1361edbae9d27efeb10217157092f812946b7b98182cf9f8aa703e01c03634
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST retain_mut-0.1.7.crate 3945 BLAKE2B 475a46e0e3df8a55305b0d14d6da595874a3c3bceefc4a4d4feabb5ae245d48190bbc7ec325499d2aafb4ddfcc0906789bee89689fdbac261a92b66bf33cd493 SHA512 c90538becfbac41952a0d5ea1ba0dfda4ef6fc8988ae60080c0ac32e3abfcb0cd674be7e7c221debd916060c6447ac59ef8b3cd93fd9d558228e70d0dacfbcb9
+DIST retain_mut-0.1.9.crate 4058 BLAKE2B 225d5d42d4987e97964470dc52bb4c7629ca1e71cb3b3b7aea8d47e2cfa95b22260c95c106e787a364a808d27368ab5cd7155dff83920d15633558e4c568d4c3 SHA512 e4ff39445a1fd6f0456055a9a12b55f7b6f61e2188495185d133801ba4397811b2d0e7857457564e40e92fab1db622df8d09a140062e1caa548d48abf7fce2d1
 DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea030e4d7dcb30574b977f0b0c7e53e09f6e6dbb2d068cdf110262876c48dfaeeef1b691932a056fe149916d934 SHA512 d97d1b08eb796d4c107426ff2c015ab1f221612500c8a57fca8e3f064e8c0f5ae2a5e6071d013313cd9f4be8fed4ba03beae84bd446f56b2b2ca5d483c328191
-DIST rlimit-0.7.0.crate 16328 BLAKE2B d7590e3f189738ee50c1987f28e7550e938832eaa2c89490e172794daae3199d49b2ef8bb4a1535febaaeb93140f0fbf25142ecfd7ccb285cceab55ef4dbdb7d SHA512 89e280f12c065546ae2075432a4368e7dc5980057b22acd13f79cd61815f99f9d72a97b8f9dadc0e1aab2c3bd529b6d237f6612543cea4171c18341aad2b2dc2
-DIST rlimit-0.8.0.crate 17433 BLAKE2B 4003abbabbf1191c7e67f333da6d3dcdf261f1c1927e49aa5547c1590e3f0044440318f220c9fbc0d3dba28a9f237701fdf80a341d1baa67f67a965f7706d81d SHA512 4423f1c3a5976b30667744a851e2adb7ddcc0357939c15b97102e82ea5271106be76cd0d4c00e18663623c836b1024128d6e978901defd58e67595292969616d
 DIST rlimit-0.8.3.crate 16575 BLAKE2B db1477bd44f239d7f1e39e67c279d6229b139ef8e1581e4329694de703c6360b85c1d8f18ce600d6ce45ab183b5addfce3c6be86cd5cd294bd174733bb845385 SHA512 81ae2fa0bf6798abe8ab569f8165b33a2453ccbfbdff21ce48b4ff7d811d4a190e88b94a474c6c90e6fc0297cc5c1565b32b230cfea054e50c8d70a2252b5326
 DIST rmp-0.8.11.crate 28829 BLAKE2B 42aeff1a8d4874f1cec8a19085e4f23ae33cebcfd024c28772c0cea36e096d5ff012e6063647f31b9e9c3ca311f1036566411675fe2f632dd9dc1d5d1f7f929c SHA512 27a499316542722a4d9fe4fa9cc005b6b5fa75dcf66686a5c08aa6130497b67511c0283419adb64fec09a51a563f4991f2039280d2e74f8ea4102afbe4977f38
 DIST rmp-serde-1.1.0.crate 30373 BLAKE2B 2fdfea3ad2a8c3cff4c68cbf8c4254c9c7dfa7cd135a9c4316eac7d6498cb650faf542737517ecc0df81e638434d86ecc3c18fcfef9725b5922043f2c5d67262 SHA512 5d6828614dbaf5939043871dffeb1fd515b27e583f6587057a1c29d41cb12c91d0657a0778196c7bff713f97c9a740619945d8988d618f9667a497b08a4efc4f
 DIST rsa-0.5.0.crate 52584 BLAKE2B c3e86b600d611f0cd09234c21cbd5e7fc8c47971af4bc053c72410e1732d56be49f6820beacfceb733ef81d2a508b9e63bec0c91cc3491c2070c4f704f11aab1 SHA512 185c4d2c176f205d575b00e5fc917a31254bf6753eeadae37ce838ba8e9383c7fe6793aab1143e15f39b0bc4f37da4bddde1090212011f3bf4761bfb7d2ca8a3
-DIST rusqlite-0.26.3.crate 135951 BLAKE2B 17f758cae3234c6950c0901f9fcddf29b8ff9286fbda3224facefc135c1d71d22f870dde06c4a89f12497830fc2c00de961830220e51a01d094ae5767b5e5305 SHA512 1d8ae38d3863530a941da111045a7d4e785c24e01ce34f38573eec9d8faad91ffdbe9ebd32e8f812522db304ea56c1dd08b3cb0482ae7a688ce56799df07239e
 DIST rusqlite-0.27.0.crate 128298 BLAKE2B 9b2203bf2a746dd22dbfe4253908703bcec7ebd8e9e0526ca38e55d4fee08ad6eb9288184164aa5d60a5585c3ed2d0ce3623f96d83b423c35c87e4974b39469e SHA512 e761b1f0dfd70fdb5e4e32a5820779943e42aa479b89a010ca4580340b4a5681e4bf57b3679790cd18839cd833d99e70deec6ee5df3df3fc50295823cef6d647
 DIST rustc-demangle-0.1.21.crate 27920 BLAKE2B 73ada923b9b293c5a9893f86fda0586139afbb7d56894cabbd70612d1fb0330a9e491d5143fe3498a0c8d3e1a3f8e63c14b20865926e4c831915592486ae32d0 SHA512 4031b26863a726cc6d3398b48682e0f0f9e5665abf20a5d35343a904ebd7c0d3752dcdd3a049b2bfa3e2a303214dc39a2980700bcc64464f7029be3c7f34727c
 DIST rustc_version-0.4.0.crate 12175 BLAKE2B 6fda2ce03eab45d7193fa0d70175cc7ffb56b7be85fb1314092bdcfd3948ea145420569ace3a47218a4a2a6e44a818862cea6dd8cfb945475496f63b591c29da SHA512 f66da7c6efe431db06cd01180d84ba67fcd38f8cd6ef693762957c00ccc2211f23c08079d7f184776e08f28d2d6ca3bdb5f5016f7de245c6193d4722891ba1db
 DIST rustls-0.19.1.crate 208143 BLAKE2B 2ec02f40bac911d85db013cd99fc859fc4815f98114abe7041cee61bc106e83334378711d0acda916d9cb72a78f8d1a7237bd5d0a51ceb928d98bbe75cab93f6 SHA512 c86b0809f7cb2b31cf9c87d7744334ea3a0c743e26303026ab48194435289b1face6a7009aa4971f719cf31d7f84bb0e56e923cfd326ce0bc4ed990b8c9aeab9
 DIST rustversion-1.0.6.crate 18380 BLAKE2B 2969bb40849dbd2f0d3f4a190629e53204cc5ef9065be6aec7a4504470e1dba6cde7172a3075a1bade421b30b88947cef6b29c0ab5aea8601695f72a7acc45d1 SHA512 fa9efca7e49eff6c510d062d02fc73d15341b1fe16d24dada86108202a4295d2e0519aecf3f1701540cd4d49a513c05e74d3d27e21e5eb3cb1aba46c70a992cc
+DIST ryu-1.0.10.crate 48485 BLAKE2B cbc0ab4e0b2031f4ca3a34914bd61395d14706d42e2414757aa23a67530d549382d61b630159c92a169d1dd3315951b0071ff18349d2b090ae262de536aa29e2 SHA512 1bd0af71a20715251dd42596df6e7677e44f712bbb40b0d9544109c1b2478a7bd2c9393535f0d4f3bfe2d1b75b3a2b899044051715a7da7d165d6d586e0775f2
 DIST ryu-1.0.9.crate 48391 BLAKE2B d5c1035ffd6340d846009953cb4303fb8c250a3a6ac60b51a2fec77a6cb3648524420064b7380fe31af33c57011f950f6f739a1f0114196675b3b5de4b54efc6 SHA512 4e7c2c7ec73da1ddb32e18d36b8159cb4047b9f4feeb975361e7ba68135e671e11419bb7786df789f5d08e5895231d2c98e36035b515f2c64ac40474d08905cb
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST sanitize-filename-0.3.0.crate 3590 BLAKE2B d87cfe36ed60d4e885faa2fa3ec3795a007b402be30f7211b5056ab0eadb3dd6b65577d9febe9969040603a3040a762671ad834bd2e595f03e8bc1a2b56958a1 SHA512 5292794894f9cd1de3af57b61ac62d0407f543f31c1208eb53f464ef1486e27c3bef3e20f48fc131c1c332c20e0eed5e0992d0d95a6dfcddc158c0bb680d38da
+DIST sanitize-filename-0.4.0.crate 3802 BLAKE2B 4665fa1caff0ab773cc070aa418ca0d2c47df3f729dc3c6bdca1e16651e97552cbd759a26907d53a9b6260e70ebc3ee3e0726016dfc2ad30133c3b0c51381e6a SHA512 650045508d0970f046e4107bc90829a72016102f3abbce53e7d954aebeda79e73df5b25226dc753e76cf566703099c7e6a52c682b9485ea729e6bd96a616af36
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
+DIST schannel-0.1.20.crate 41579 BLAKE2B a7924b4bf0f130e2aa4668cad3c7112e39e028fdcb04259c6926fac4875f8061a9148da5f001dc49051310ed8e6ab341da0990ccf0a7cbd4dccce8da54c1ca46 SHA512 19f217fd4571a0d0fcf52060a8639e0ce7114719aa23fb0aa2ab5a531e8f8be0a21af55ef45c8da804101e5a62f15669e66fe005c4cd5bb24def09f1b4afe059
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST sct-0.6.1.crate 26825 BLAKE2B 162c72a8e370237f846125de358f773560d94acae2675bfbd07719ed761c112cde04e2f59e13378fce33b725becb094775c76bc04baea2abc34dc25493e86d7c SHA512 78d17cc8af85c386fc37fa24e71ce7744ef214cb77516633098466da0ed02df67402c981a4cfc2808f4a51224f82e2600afe4449446e3d483cae240f703423f2
 DIST security-framework-2.6.1.crate 71688 BLAKE2B 45236a76721bde18400aa286263b5dc389db66a02a5b8feb38fc6ca576fca305cdc5f7e7d6984ebef1379209740ebef3180c4598d5117b04394562de5ceb52d8 SHA512 e4690acf5609f52c89cbe0b577c68a22caf0763d8dc781817010e695824dae44dc27f58c9ffec4254a8461e88040892b89f9628d6a71102d06ab5441b84800a4
 DIST security-framework-sys-2.6.1.crate 17717 BLAKE2B 5951228dab98af742825a30584e38aafb096d1580375c960feb1ccce7163c6e42802fba4212f556ea8b8b09b1b40bdeec0bcf4af1d7eb4b05fbd271aa3a4cd01 SHA512 7315c0d67d2e792932cd6634cbb9da5021c8d9a1a1e96b9d92c6718d73be3aafbc5613cb355fa1a3d1860f13c62e829bc220b43ad18d739ea1b5aece0cab470a
-DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215520030d697e863427fa06edd9f63d05c522f696c5b9c1c45556803ae381cb4c77a2d4a7fc30f7363e3ecea SHA512 0470b9a3a6d398233d19a8240de3b0d18c4cd8f8fc6887658baac4053c88463d5de9b7145a564abd43f813e03b75a26050eedc1689450895953bc7f96b64859f
-DIST semver-1.0.7.crate 30064 BLAKE2B 5006e6eb5f28493be476c97799bcb53009485283d114c3f4eee99f1377a5b5e4cb0de89808dc7dd4d1e47c162ff4399679fbbda7520c256673fd0e592c29ce77 SHA512 1956b173e70a9ae78d4e96d62951072879998125bf4703a2763c8cafa4e94100010d6f923afb3b7201d0a3128948b71a5cad0b82cae1239e8f7631d5e003c663
 DIST semver-1.0.9.crate 30843 BLAKE2B 52c90056ec744bccbeb4a603b8e138a9b980a063c05462011d3b4cd11c5272c5284d0eec427ffd1e838d73f97a21af70a6c7f8094b6faecd3c18adb1b0be1449 SHA512 23da181209ca26a9e78d8111444c465273cdaac23ef6023b1e9a9a10e2ab9dfb13baf51f8b6f597598bde84c36910e0a45bae4f14555d731a9c9a3e94f37214a
-DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST serde-1.0.137.crate 76182 BLAKE2B dffef53be259eeb051a375e532c3748219f8219413af0615debdbbce61c5ca17be13b06c0bbbd7a85a696b4bc76ae8e252d880b01ecf540b758fc10f11415b21 SHA512 28223488e18826f83a7e90029aebc0722e0cd238a2c0c021e5a162d0f5deaa494713fad10f7ac79c8e14de856af931b6d83cb3efcfd0885837fc71e35ee38a2b
-DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
 DIST serde_derive-1.0.137.crate 54831 BLAKE2B 19a0324c18bd00da4feabcf83dd78de2ff7a1905abb82d5600c6128a8351f5ccc37df21e0135601167a51ea1e6691bd22957c2bbd9da637653c7673dbb808d24 SHA512 ee47d3bad717ae16118c43e6f308a0e264bde80caab8f8649bef96ed3f7aa0f9b6a479311df22ecdc7bbcdade65f7b03b79100f8b86caf02f9a0bc77ce01035a
-DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
+DIST serde_ignored-0.1.3.crate 12434 BLAKE2B 665fffd6ed4c42b331f3589d7bffa48d581ea730d352a5f26c7d133a82b77a3eb0f29bd22da19df6a7fe08334a262140d44195d7c591991da174ee29d0e3e444 SHA512 9c459540b614a2075cc4d6a6d5bf1f3b3f91e8e48687388b1aee4872ca0eb95b1c265fb2c918929f99d0d8f2dae22f9eef4c67c5ed2fc5376b391163b20d7bda
 DIST serde_json-1.0.81.crate 144480 BLAKE2B 3c95d56e65c6673ebe9ef0aa41ba184c5246cbcfb0dd9edf8e87ca6cab736d195ce8b6349846806ba7047854d579517d2d19bbfa932c90b700f06e54cf49b131 SHA512 9f224b2182db2fdddfe1878d05d857c52a60a38f9b4fdfc87c09c20efc8b6ec2419bc60e4b18a0852ed080b09332773eac372f8356af5ac0ddf3da8212345cb8
-DIST serde_test-1.0.136.crate 19796 BLAKE2B 17f1b20127f198a6a2b3a2598c62726d5c01ed30ded872e51068e6d8e21a133dfdf5e9b4e0930927ebbaeedb40faba6c2de5658b3d8c2f218cc5b95a9b9339ca SHA512 fffdfc426000328aa05794b0d89e70261748c27942139b064dcae404f83be2a2c2609a472493a3f0782165576334d8f5e8673b1198506963e7eaa991e850773c
 DIST serde_test-1.0.137.crate 19864 BLAKE2B 377df62aed99eb85863b34900c249e0924c2ea615c3cec5b330ec174c11268bf8cced84f2dc3d3fb25ee2a01f10119092db0278c8fd42c98a6fbe3c794246da3 SHA512 511a67f8847827688f1c8e0085365298d0a1a147bf5c1981163c09bb6621b1e99c861dac8c9eeb379f0c78c745ee3523595d011d80f057b099fac0b6e3b509f3
 DIST serial_test-0.6.0.crate 4494 BLAKE2B d68c70c5cb079cae1a22173d90045789b578d8f50407c56df80a30ee7e4abab26445f0a304693e0c3936d466fb1778de71c9f3f9185fd690f595dc02f5a1f588 SHA512 36340e6234b44ef99d0e4f25a6f98dbe080cb0c2b0de06bdb8fe72cf7c6398110ca0489e556b7ba24be708e7fae3fc63400075e1d061a86d5d612d70b216d46f
 DIST serial_test_derive-0.6.0.crate 5581 BLAKE2B 8757effde13525634b73466eb8a10113138248172ccd131c5de6bc8918dbbb435987e0aed5aa66580290eab316bd72f58349f029a43efe9c63df2497dce41208 SHA512 45885b6556ec89356b0db59f53cdec2f147ed71c61c072ab3d5c472bb574c3e64632668272f1b43cb10c6e3113cbbac85e58bb0e2ea589630aba6545a0d2da2b
@@ -368,15 +296,13 @@ DIST sha2-0.10.2.crate 20213 BLAKE2B 9e8942b4f4a4a86f5fdb0e1c237d6bfac8f3f29622c
 DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
 DIST sha3-0.10.1.crate 521609 BLAKE2B b6fcc9519cdc6fb086b8e7bb713f3ff73c696dd9a371e30c3918b183f29643b4fc03b4e77952bd1ce885aaeb8fb2b84523b73044ec37fd8bf1cf0e543b6c885f SHA512 1aafd9075a96a2fc5855dc70d48516b4beb15fe15c16c75d32c8dbeb09a3c931700a3cc650045524d7434ba5b7c28a36c659b71fc1abc581c3cd31486cb1f66b
 DIST sharded-slab-0.1.4.crate 52479 BLAKE2B 766d81761909006ac740cce13e8361734c3c7072cd07c8c8f611f09772e16f11aa93cabdc5273b9446f5da391b26b7e7d619be523488d8b3558c64c18f20d591 SHA512 123a9ddb126d1adf41a30a632604264d66a06bacc497db6373e9dd36164197f8321f2fc826a16247674f0f69d9f6e30aca37810f787693c4a5c2cee8c5887c55
-DIST shellexpand-2.1.0.crate 14697 BLAKE2B 257bf22e55a71a3cb11964de7613abdf1928ffa969336584401c2976245d32108c44628a5240a6adf763a33b0fecd10bf4753e7aa62793055e86879570935ba0 SHA512 90d32a5547691c9118a50748feb71bafca44718f0d5ff90cd5d4d9ee893ed4cad2d761a562917f7f26a8ea39154a4aba8dd6351fbf38f8bbf9157aa7c7947413
 DIST shellexpand-fork-2.1.1.crate 15397 BLAKE2B 9d9464fdc13d75c628d8e687f5e0b092080557023f0f51c3895ef9325fe672617375c422474509816c59c6e0e891ff9fc3e791cd13eb2c1eb4ce31c58fcc6d7d SHA512 d20fcc32471d9c969c7e243fac5b46fee1f46cf668c61e57f3db177a17aed50977ef906e8c0320636174075f1d007baaa8b0d4f5a35ec565039389d61abeddd5
 DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
+DIST signal-hook-0.3.14.crate 49446 BLAKE2B 927363305748118e235fc4add923678cce406d6c5041cced17bf2a0602cf5a912d31143a4479672eb12ef86bcb682f54bef8489407aa1c1067542da295fc788f SHA512 32ecf012e46b94d3a87f2e56cd4c03a97886013309a4e52ef3e7769ed14b49ae2814bb6346cfc9766525dcf15db4182d260d3c9311134e3e6f5301c58729442a
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST signature-1.5.0.crate 15084 BLAKE2B 9f5febbbe4a23b797ad945ffb8a2c59eaa823f82140a915655ffa6dd4f65fb5ff0d404bd070e524c1a6611ab1bcc8582749f87bbbc1970a348dd5d70af1aed6a SHA512 5e4dc0ee1da74ef6391e78b0b2abc921faa5b9264b357e9e9b4028c8f424818532b4d7457c8451fbef18b497e133e4c32827d74616ce5ee95b15d07daf6a1772
 DIST simple_asn1-0.6.1.crate 15961 BLAKE2B 7991e60e979350ff8a9010effe4ee0be03ada3b282df59c150229497d7adb627ee4bc355bb11fe07c6c2daed329fc1c9a6eed111c09c18cba1fd89499794d805 SHA512 7797884aa59ce2c32f4a3c26ccd08d79a7b08fac469ccce7f84604775abf766cee87892a75c14d1091a44ec42fe5c9d627d8e2539235dbc58cfda6e49c8f0ddd
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
-DIST siphasher-0.3.9.crate 10108 BLAKE2B 5babf4bd9edc4703205a56bcb87577c4456fc105b5b92ce992227293cf2ce515cc6181c629a766684280ac208578d8f46fd425f7e36ca1a97958f361cbc31a7e SHA512 2d5f25e9f3703718a8b8e5d790f336b70ac817605e52b893e37f154f07603f18a36c849c5ad06443c4661527d3092c984948c62ef83db4bfe2b2368c17425972
-DIST slab-0.4.5.crate 15888 BLAKE2B da43a90a8c1e8b8e0d353751cfac036076be56421f80ca5c911f6e30fd19f43e2ab50be7163f22b2e9785286941d62f036a6778b62f2c9f640f48501276eec78 SHA512 9ab2db11b5da437148486a7da44f06eae2572a735764711145738f9da66b1ccbb8b974ebe3600d1ff7a6ddf07d1fa9dd04c9207c4ba54eaa8311c41d317182ca
 DIST slab-0.4.6.crate 16067 BLAKE2B 0aa3d8914479baf2409ce83644f8eca93f49b426333f1b82392b779fd79cdc04a0a33bc1aa5e34e8248df9ebd88e742b3e870716adf1787bcb7aa5b9caee307c SHA512 788837db210be63579eccf12d96fcaa3280c7515bedebe3040a71ed27d013430815ebc74acc06280daf22c0b16871bad210981d32615c26cb1da344b4b0d9488
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST socket2-0.4.4.crate 44048 BLAKE2B b2b1aad2995e44944b98ff3291479fb74e8cc965f866e692821427e488c68282290773dcd77da0542c45daf231a5e676d20e59a1d4568b8dde2da2f16425feb2 SHA512 6624fb9b933763c22e6114a8f72c6af0969912717017dd5b13f1b5df19faa1b160376c12e8c8023c435281f6a7864e802f3c4c535de8a345fe206652104f2cd5
@@ -388,79 +314,54 @@ DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d
 DIST strum-0.24.0.crate 5524 BLAKE2B 6ad43c6588218d99ac05ba9cc20176264e8c88f7552c0527bfc81ce63488e755e9e2e6ff3b62e171ac7f50f83efdd16140a513cd19f6b9894e4eb7c1436d3713 SHA512 9136deb6bc6c4d48123b2df0f0bb4a46212622ed7bf92f6080a6520e7ce8610f7b55102357cd50d635977d7cde13581f80ce372d8473733b66070e4945166dd0
 DIST strum_macros-0.24.0.crate 18785 BLAKE2B c12f6a27db5e258eea99272661c88bfca3307b320aef3d4261f4a9178a847b4a6f0419f689fba73dcc9422384d8b6af8d59c13e9c8f3576d53c78384968fc2c8 SHA512 3a6a13d8c705b71dfa69857b04e821e63df21109d4469363e5eac51299a135f98865b6eaec5826949c4d8606d7b5242393ce57de16bb0318e40f73de284ba65a
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
-DIST syn-1.0.86.crate 235126 BLAKE2B 89973130279128cab73443ee36c8e0d7bc83364ef91d0f086a40c136e26e612428b867a54a1da8ee5b1778cedeafc7403180bd84df2c21017ad5bb76bc0c9138 SHA512 1462dc9fbf0a89b023421064908c7e349ede23c986eddcb8d260559b5e1346fe0206c88e5317eea7e8293ea58b94466d486fae3aa57a1dee4220f5431b1fb68a
-DIST syn-1.0.90.crate 235956 BLAKE2B 671d79ecd54cc7ea913301e8ac0e598a0b748575d4c22982e4132172f00957b3faadbd6e58ff23317f0bb44b5aa57c475dc4ba381372bd979dbc889c825347b5 SHA512 367638bd9d768a93392e7191f1ed5f094d787be5c6ece03632f87e9b54be176b43ab357b4d4f19df95a182b14552024852d540b0f9e0c0b302af793e2e052784
 DIST syn-1.0.92.crate 236605 BLAKE2B 3d23ad321e639ff45c169197cfe2fc09c23772a745fde4a8b72dbfbabc7e93f822eb127cbb42762d1e6a05e22eb5b40f3457d779530f466e7265f6a99e34714d SHA512 1884dd85a13bd0dd84f3599de428304f90b9bad91d8e51f23523fb75aab950df017ea85dc5efb99f793a37769bf2a1b972580ed5b14500b2706c45336a9068b7
+DIST syn-1.0.95.crate 236676 BLAKE2B a42463accafeda7b69ce1b69b3be5e8131f612e2e0eb1522d85623cc210b8640aa4489b8450e388e87c78a832eafea3b7074af01901df429a4dd8c37a6ee28de SHA512 a03283c628e85debf93a08bf906cfa7764c157176673cc32ed7c74d9dc8a087d83579fb2671bce5ba30f6fc13f504ebf9abe0ea5440194b13f81ff0e5e753aca
 DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d6744edca8675c89bfb4397fbbb8da60bbc582da24bf9953afd9bb17cdb22654d933468697e9fa9e9903e6a7c77 SHA512 ba6faafb2dd56d694efe424752099a2efb50316afc0a4db9fdb7620ae3f1a31dfbb2a7b41724878cb977fa11f7568a406bd3b6a4f7cfc0b88b86b2cc616b953e
-DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c
 DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
-DIST test-cert-gen-0.7.0.crate 6365 BLAKE2B 2f625100c828bb8c9430f2da5f8910443d91e64aa8c916c2b0a8365335bf0996a8cfd2e3dddc11d38fd511295e56b8a836e37e496b2e7a5b76b76f9a2605d63d SHA512 42b818cd7753fcf7a61fd9a63a87afde87b2bf9e5cbf198587b00ed0ec8f7c0648e3555a0d3f1792c231f133a1cf9cb3004ee44bebd17574b6fc184e181a9018
 DIST test-cert-gen-0.8.0.crate 6522 BLAKE2B 711389b5970a28939e2fc7ba1be6f11b3164e422f7be303f7d8a9516e5f292c4edee0a8ff69a5da402c3ae228430f49db5c7f5663d11c4dba23dd229edf44248 SHA512 d94839cc4af7370b70df5b9e9e4468b870938710f138e43051777cda686385cc3f562bb50fd758a3a7c9739a701a173ce5cd6abba6ef1ffae440ca1cced1c132
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
 DIST thiserror-1.0.31.crate 18013 BLAKE2B 5a46332efc602f8ce864024a538379b23b4586c04b18bf01b32b3cafae3ad90ae0c1ae5639cad555c01767c20f0109f87384918cb15a7ce51437094e70a2e544 SHA512 0e11aba54d38fc164c65b9357d1738ca96af2bc7bc2bcacfc4efc6f5c26a594effbb5e47aef46772ccafbe88871825a517920030572b79fae3d305550bfa6431
-DIST thiserror-impl-1.0.30.crate 15230 BLAKE2B bdfd4451304a2ef4ddbecb48eb1a1307e6eeadab0860c785a2b6a5e7de270ac42ac4f11e46eb9dba77ec5a86b203d9baf8e4fd5c83cdaa10e2af34a95d29d2e5 SHA512 465b1d4eb79075d8abb11f5c260d68847ea52806a2f519515705b03da376fffb3686bebb23c11462b1c59e1ae5b3ee96d834c62cac69862c491001b1ff7cbb46
 DIST thiserror-impl-1.0.31.crate 15283 BLAKE2B ad7afdfbbf9c42a08dfbd5a2385883bc0bd855c123040cb187f8ec633456a7912f9e46559b41e4943bcca86043adcee08ddd9c61ec04ab6fcd78ebb42c1d1d10 SHA512 a265be50ae209775abb812f0e9b8c5af7a639514149d9f50f4a95bcedabd3666076bf7764351ea6f1836eb8a0e3c67c0b76abd26b27b0a853132fef011543e1e
 DIST thread_local-1.1.4.crate 13106 BLAKE2B 64c19368f8cec46f23b3052759c4c4ef0de50748432790e6ea11b12477239b177d54e60b9046fdcb2f495b8e0b37ad82809d03602edab9fc85cf814e3bd94fe2 SHA512 db7ff3eb88a73d9313dd58d72397614c5aae6be1d64ead7f16535cae2857be3b27d189e7955308591ec64a0d67777fd2a62a2b124ca73facb9a2d8e0458bdbb5
-DIST time-0.3.7.crate 76358 BLAKE2B 4cd8baca0e59a494bb2b6d5929d6ab606272dc06686e17ddf2f984528cd38f1b28142b8672569db928168272a8b6e15edf247042a173e6aeceaab83da2be63c0 SHA512 88479430d9e9dd206b41aee1c35cb28334b1a76fc6bfaa5e3586b2d9d2b4466e2e510bd00d165755fc9ef00e5b7e3fd558c7e7caf09638372ab11293ed6932b4
 DIST time-0.3.9.crate 81412 BLAKE2B 018cd6ee08fc16cb91b894f15e20c41dfcea51691551e54b4252af27b6368e42c6c3c86734dcff2f9742d93829b1e0b5186aad77b96bf5aab01796f480385497 SHA512 2dd8c57d2fc232d8a05109f0d41f964fc587345eff0a68c42c2b1690d6da1a4868188df7f03bece12148e7434b973c472fb0c85fa1f840053da3b30cf6c47e80
-DIST time-macros-0.2.3.crate 16838 BLAKE2B 34340d9700dc3303bbef72ec25f8cff9734ba881cf8aca263c6a63a0bb2d4d4e4f3800d0ffcf79c800d9e42a1a7cfc5167ba7d26142fb52986f10809c4a2de8a SHA512 07f19f3660de094fd49404c730ba08023d0801098178760a0f24663d4e4128a93838933b8d110d77aa5fd4a3585ce2ec1b0dabcf1e1d569dc9f4d0a3c6e101d8
 DIST time-macros-0.2.4.crate 18421 BLAKE2B 6806e235cc7258a76877f705a8637c39bc30316603c7eedd4795a3a597d8d1e78a79c213af84cc184fe3b67c5c3f6f9efeb95c70f6f4239af1882916afdca834 SHA512 f3887ce839db40d13c143a9f11bea804fe4760ab2655df68cbba9029cfff7d0476135608fbfdba6cdec1f9b0753b2de0e3ce0161b40c5d2b9596980d9deaae59
-DIST tinyvec-1.5.1.crate 44942 BLAKE2B d02f610dfb599ae4957d81140bb8945f4cae49c1b7ec5de4bd4a7d07a1334cd00557993dfae2516d506f362305025bd1a6617d55efdad8ebb549fe573e9e6f21 SHA512 80b68058e3264b3fbc537debf01b6b60d438bf5cba6ad366083cb440ed6b45587f367d3a134ec6fab769495b94413d0eca47544b26959a2c35b1a997423eb849
+DIST tinystr-0.6.0.crate 18124 BLAKE2B bb1773ed6d08d23766504611b637cf98b667b5afcf323b7b89e70ff0da57e47f3fa1f8b22e9a32fdc3dbe0149f26ed6ae3b22e81ca8e6490988849bcc75cf8ee SHA512 9c9800f6825a6a426701b88e3f7468b8d8ad951cf8f7a2c8b38b168987cc4e0774bb038bc6d4b4b899be9e5dd44ea705075ebfb416904a3fcac823efe0149dfd
 DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c
 DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
-DIST tls-api-0.7.0.crate 13684 BLAKE2B 064873b3c435f5881801f900d32cebe903b374015b97ffb8f2add8822d7e98fcd8160fcce4d0705a62f8dc06633456e0b9dd9309cdeb28d045b6625aa0aaf37f SHA512 6b024be9a906f55ec319e6e8035ce47e3755ac655cddaf026ac3c2fa9afdb088bcdaf797805dafd98f4196d85cb9fd372efb45a370556d9db98d9f3e45c012bd
 DIST tls-api-0.8.0.crate 13727 BLAKE2B 4ff304c78e7b25cda4534d68a26c1aecaf4556420917eca895199684f3f65c1c3c1aef5b8a06f88630404b278cd3353173a14c9b03699ef33af48ebf080d063c SHA512 c082ce945b121f199748aa5295351672d51025bd60b661cdc259db884bf1eaa904c8fbfa884468b8ffc9ed415cd06d87488b0e8459091eec68bcc8bcc6b92457
-DIST tls-api-native-tls-0.7.0.crate 12151 BLAKE2B f84f086c402de93ab53470c1280417e85794ee3796aafda6ad56d9d56f909c93a61a7849b4e7a50c680bf8a595f1708c2280fd084214b86fab914a0390ad4e82 SHA512 956db464f284032aafd82d23c06bb9517319188decfd56b8ed0c29bc573a7a00a906d4fcd3bbe139f868608b4dbc8cdd863cb0d16471352584be6e8e083b66b7
 DIST tls-api-native-tls-0.8.0.crate 11348 BLAKE2B a5dfa82ed3c171e24de31213751873bc8307e759549b527c389fe709864d38c4122a3fc2d77eacead07d25e952f4a9ac52b4ec8536d1d8026e7eb7c64777c71a SHA512 8f885b1108ed01c8a1f4d74e69de9c7fa666ae323071fe26d937db60cf1a1ed0c10271dc32adaf5dc5dc0fd25f10e152700c439313225cb3734e3915f0771bb3
-DIST tls-api-test-0.7.0.crate 6105 BLAKE2B 018b180b3a938dc12f8abaa6b0eda7e13a348f95dcc0275c6cc66089fef62d630650486e6d97388af6791a30b26e9c49475602ce91827c53a20601f60c2950f0 SHA512 6c6307a6e2cc2c329ba0dd9c4ffcc75931e98e15514cd50610f85a543e14dd516cab6931d6c928d3d76522b66371ee9ac3606c6eb7ccdfec5fc0a11b8967d23a
 DIST tls-api-test-0.8.0.crate 6149 BLAKE2B a66079cccd58b06ebec5abf7062f3f3ab9f71b423d2628266985f2cf9d2837e01de68de431443be6a0e28a7cd6ec2b3e41b88eef100f32fe0d01258ebf523f7a SHA512 984d03202228e3f0e3254eae4505776dad7b6c9c87946a0f78496e9e94162faee7e8b86221a78a2476b92ae4f4525dd4148a67780e8fd4242e6c028f0b2d04fd
-DIST tokio-1.17.0.crate 562425 BLAKE2B 988f9b8f4710c37be84b883646dd88807a1aedcaa62b9d8bb5fe1007fae8b994765535492f51a0369e033e1c7ae417c194c559f1444a2fb9fd91ff456a183143 SHA512 7024d06c718261f5a992e1e5fc09e85ccd59009a462ce8d2707214f5117c991f70d823995b19ab453d2863b3a469f8228a3bdbf2ed51f25728061ecd706fe0c1
 DIST tokio-1.18.1.crate 572287 BLAKE2B c89181ed0fed84f5726a009e372fcd01e985a553e7adbf78c6a91c1d03c5e260cab80e774285282ddcfe0761c148899e1a535f1c9aaa757b9cc5402a7abc2deb SHA512 7a9dab9c6f1b3f673ade467faeae419f8cb27605f6fd7a87d4d9e1ab78fe511e27af76bd2f67d1ba69adbdfa446365912051964986ce09eb23a0333b25c50ee3
+DIST tokio-1.18.2.crate 572381 BLAKE2B be787bec9f8249a3a741440fe3f8086257f410c66c5d0fbfad3b415bdce77497dd9163f0fb690ac664496cbe2a2503d559b044e83998569a6541d1dc791f8969 SHA512 4fcadd729aa38eebc4a3e69cee10236a0867423035715a80595f43bfb21d0687fe6aa49752820d05f7885019e65cf78ca2bc34d01b248e6c067a7b781b4c636a
 DIST tokio-macros-1.7.0.crate 9261 BLAKE2B b22228dadc1e4158666a4102d582c2d15668f8451e6c4959640119408d6d712de66813fbb2c26ca692d7f935430b54fc14c276be7e11f869dd70e2115da4be99 SHA512 30c57950d4477a92043683fbc654e8cbc23e87a34276ec11e33ee094ef3cab1bd3e5b2574b3b65030e04ca937f9046d024ec50506ed4eec2ce9ef4d295e7e8cc
 DIST tokio-socks-0.5.1.crate 16137 BLAKE2B 195c302b357369aabc9759709eed3369bce26d423d4349ee8c85e06dce8f985062e19e52f338d65fba76844bb56b1b36c4d501ef4079fc001aabd0be38dd783d SHA512 dc0ea053d11935646df436d19a653d18c7a495af1dd8dd0c02696dceabfa5b6e91f370072dae426848915f91c95f7c37a1f3835256e3e23b144b9380210fca2d
-DIST tokio-util-0.7.0.crate 86609 BLAKE2B bdaf20ad6213afff8b1b38bbea101ebc48c5d6060a945ad3354a1aec6b48c5c4ba5d47a76604dbe580cc8be085e71c8bfa9840613e583d91f346f1cd8099e1be SHA512 aaf648a54901b25f23bb8ed32bd35c998cd15e80f860c3222e1cec85a59d9deafa562d092960a4d798354b7f3d0398a7dfa2db2e8df13d7a9c7671909ecbcd01
 DIST tokio-util-0.7.1.crate 87364 BLAKE2B 8c6b5efb9a5a693330867710458cc1dad797ae951105a0882f73662634879300412f4e097aef22bd2ed43214487589a21fbdada95458fce9ccd0b6100b2218a6 SHA512 738e206a107d721dbbaa6cebbf24153af317338416a7fee632e3a895f7702df9538629d2016cb0e7cd28338e7e38e9d6ac5e289dedce2d0230f3d852b4814f20
-DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
+DIST tokio-util-0.7.2.crate 82006 BLAKE2B 374b8f9865f63395ac6cc75d24ce6130932c1887b134401f6ce0ab03b3a42fcd51d7b0b041bbcdb9997cbffae288a2835e445c4219eb45912d6b94debfd3373b SHA512 c67c0ef7fa90a07503f932c2d11e27077570681abf6ad82773e0408c2f7751feda4208dcf86ea1ceef721591541a25328ba1b38a34653f4196433f2314549d87
 DIST toml-0.5.9.crate 55667 BLAKE2B f2bbcac136e0182cad9b51f07943610c8700b68afd08fdbb822b47bb79d215e8132376da8ac61fd550e86c353a83b007297b6ac92ef5d503e1b90e746c40c649 SHA512 7151bcafbe2bdb1d2bb91562daebd357c884819af047843f1b4a56bc3812d4153eaf70683d0f9bff51bd1048700920322d64d41da13ebb4cbf34f0f7822d7ce7
 DIST tower-service-0.3.1.crate 6299 BLAKE2B f56562faebe3a933f39f8e2093af65378bd307c59f9695408510ea9ca2230c68228c6726a0a2c7c42943002837dd9d86ce0a1d4b7849ba5c61df28df7632d909 SHA512 d23f9db2d6632f561970b55eaeaac22a20c8b9af18931cd564db193688eb2a2973127b440e175cfd7358f3d0ead53f7a759e34b7b86c293751079af9c2181ba7
-DIST tracing-0.1.31.crate 77638 BLAKE2B 1577d8ede01fb5ecfdfbcc9686bbef82de51e25cd6a607f97393d5243754f97cda4e11539747ffe38c0adbb85ae19fd162e052ac3dbb58c8f4a693125b5f3fe1 SHA512 c43bf98bc67332f67fbeaa067c430b99aed88bab48fe2dcac19eddd3704a76daf3e587a50f86dd0065fc359de7ff09d3a359160421964d202a0715b2862f2e96
-DIST tracing-0.1.32.crate 77985 BLAKE2B bc48fa82223ed423ab46269de0d78c1a20d463054e8b1d54605bebd3ae18551f64284c16b2daba9d891b94c6b33d099e89ce880e03be8f5c7c54fd05b2635138 SHA512 9633647e7545817c685054bf9fa6decad2e9b42c35367221cc60fc95fff83446c9c624f96c32e2fc5d2e7e2a543a26d5e341d4ad2399c5066d5d84bd53f9dc83
 DIST tracing-0.1.34.crate 72775 BLAKE2B afdcc78ba29f68f3e87e401a89e4c5944da620890823d56f3d345c2e97a2268c19c342014903aa4a62b8d39b67a5313506563a7be0a555b86cd93aa9db4dbae4 SHA512 d4641f3f239d158547d7c811a80cbd2d1d7df366122dcc678d01844988ef3c5f5db637707e7e91bfb2ea16bef5463d52f8a481d1a9804bac197157453b5877d8
-DIST tracing-appender-0.2.1.crate 16257 BLAKE2B c713f208bc9527810bc529a358d4d394b035ff6e6e00fe7ec5c911a426e3c55e30f1b3346993e80b50bd801bfc869f0975001a5b4a2558b3ab5834742ed05e03 SHA512 c8cd4df27a04a9f0e79f0069d3b94a5af70bfb5a32b03b59a58c3dd0a5807f348cdf6d51bd3313e29b07be17624e68aa6df44eb33d529adb42707722d2578360
 DIST tracing-appender-0.2.2.crate 17208 BLAKE2B 9d5823776ad13c4a02df9547991b4112f1e76c49491a3f2fb890d1fdb87596a8a61f94f0ff3327eaf8f9ee69018411ed7988338a13a0f95659453a5abf2dee89 SHA512 e84ff6d993a7bb3526f0133953e62e95376960a1648481903bf70a7b8b7601397f709bb328b5753499f29db2a08c435b8f80379e9bb94a5f4a444b3b09615315
-DIST tracing-attributes-0.1.19.crate 26201 BLAKE2B cdb968b00745e289a287c3588a68b98281ac370dc90176117fd857accde321cbe07c07da8e7fc918be1b1b788081970e5166bcd2ff8def2cf8096427079516be SHA512 2ec00ee73d0dbfc53dd38b137826fee32495efd0c8889f2f10195d4519e00bc513931291101a00ccdf9b7f3ff0f2377abf045f5d58f312e7260daded0ce0b640
-DIST tracing-attributes-0.1.20.crate 26316 BLAKE2B 33d5d160d4de0d117bc45e33ca76f2dbb0838021bd7b3cee07603ec86e328b27e4fea993becaa9cdda11f4c6fced74575ae9a4a25bba64b26646d72b72942156 SHA512 8ae65a131ba700a03a2e35646a1bdaf043f04b4d5de00f5c58022caf06346b50cd88e1917bcad3a3ad591921fbf2dcef3b49793b8569604eddeea2470627a0c6
 DIST tracing-attributes-0.1.21.crate 27552 BLAKE2B 999e6e257c8778f01cf43365db21d97b9f055019bebba5462968a806e173fc7effc35cacbb60696e3db45d3487627ec3858c282458b38fad74f2f49bdcaa75c0 SHA512 a48da3338cd86e7d9a196e06505d53a6d60278bcd3b709e175219c8d1cbd9c0191af07c335b6401a157563e22d75dd13d5be664c02913c289079bfa667f99e65
-DIST tracing-core-0.1.22.crate 53199 BLAKE2B c31087b526f23340d246fe658d11cf28cd9ea579e25b73233f819e67e19b1d96b1f01ccfd72fb212dae63de8aaf07fdc2d95e7f0ccc9f2752163e5d6f14d685d SHA512 500e74a0a3a54599bb4614b6377d9d721635dd4ce0119697fb234725db8b60e6aecbb850d7dd311af4796e47b060832fe3be39324d484a039e9b8a08d36c3ab2
-DIST tracing-core-0.1.23.crate 53204 BLAKE2B d11cf54f0572e4b9521ca948853bbd3df3c3a6421912d30c253e331a74e0356ae75db67f062be6e944e638110e14bd31103fd65502948604bbaf3b2492cf8a79 SHA512 c01d58dd814d0d9d71a631284c6e8fd5881e8728d79d3715f246530d474900f3b0d396b88f9358f3521e5b171ad577003ae5dd3994d66fa3e016970f6df5184f
 DIST tracing-core-0.1.26.crate 53727 BLAKE2B 1e3efbd8e5ad0617ce15ea14eb6365752067f580504a4cc90f1f486ad3eb7e59087c0f332e3e93ae32a2f4c42a42482a9ecbe180f43dcf34a427babd5290fc61 SHA512 b9d44c307d0fee51675bef07ed7f7d2eb8de8a6ffb37256994f3485f7f80e40f1fa9de1663e5360f945270f10d22e42cd9af60193449bd0a0d323895e994bdbb
-DIST tracing-journald-0.2.3.crate 10900 BLAKE2B ae1e9050cad56f344b4e207f71344c136a4bf62bdef8b31cb6127c3d0318be792761a4b79da4dd670d51c169d16c57dd53c8ee0cd2d19757aff509150300c3cd SHA512 b0ee1e58d621d0c447adaac42a6eef3e5e21fe754bb8b962cad395a5eec124dd04a6b7bfdc965fc7dee2e89de5f59c8052f027bfe712245c604a662665c8f17e
-DIST tracing-journald-0.2.4.crate 10968 BLAKE2B 0752228b48dd342c1cf08337e28511dbc4192ed32d748242254b73dd3e0cb70d1139a95d81e2aa958334c38c6dfb18760872850ac681c3cc31ce030e5a094b25 SHA512 b48b93065288d8bb839c45840a3ebb33e0e7c875d5b2a49713165c35f4daaf927a1b4e424c5798b6b9dce76fc40028d6eec2465cb2ad54149817bcdcf1017f90
 DIST tracing-journald-0.3.0.crate 11592 BLAKE2B 5cf510c6b64bede0a6cbcf20a4224fcd838fc117d56befce60cd83e8bf1f6189c8df06460d82b4be14f6a7e083780ca705909801e0234ed95dcb4fa7cb1f9f48 SHA512 f51a48f8329f92a459511f64408a91067bcc7c91824effb4dacbb3712c553e7e5b0ef9d5a630dc2e1f373c453b352884a8fd67cf4ba7e96a559246b3a778e78e
-DIST tracing-log-0.1.2.crate 14915 BLAKE2B 72967c7262a8fb2b1b9c693ae19d84424a037e09b9f1b1b94852e39caa0a0ca30c846b2cfcf94b378c9ccd2aab67af2e4809e2e733d22f173cd57a3842a022fa SHA512 c4e146026ea7b27e79c630da9994dfafb90f9bdd581f51cbd5a5f985b0e60b2412937214e0365203148eb91f0a5ef3644e64757dadaa10287a097ad85989b620
 DIST tracing-log-0.1.3.crate 20549 BLAKE2B 1e2b5f1d96983b0dcf3e61f71132536e21dc19af0d532dcff7cc91db45e60cbdc1f8b5b7a7b2c13214dda4e3becd4f3d62262def1b608a99fa330ccf1d716323 SHA512 440cb8ddd5823cd0d86b68bbbf29f6886d5800f95d0aaa9477f98f188013fd009c2b9bc982b17efd08abd071bc70ca511f988b9db8c21d8e3d323fb67614d289
 DIST tracing-subscriber-0.3.11.crate 184827 BLAKE2B 83686c5affeb40a84e95c161b121dcdd533b782151896b86752f4d9a922683847dc350482a7436fee23a23cbadbb9522dcb7966993e877fb84fa8e6deda050e2 SHA512 5d45d5108742aece42bfe7d6f6ed71b0bee81c3e3e3a3117489ec5d4d4ee9c23c157077ad5020b74b019d212fb2a46623e93dc57a7f6bc0a1a853981ea097493
-DIST tracing-subscriber-0.3.9.crate 171130 BLAKE2B 9a0c91ec55acd0095f6773ef91a9fadb8d059ba3af6ab64a69665ed6b8e614667a5f91469b1cfc8450db8cb8535ed2021a6afb7148234fded11811d3d36d8ea2 SHA512 eb4a96dc635b02ea275f014582b9f1f69329c79e8ecec881a97e81a4b7ecbe4b68277000c59bae8f0a40184bef95d9603f621e49f1708d2e28e73433bc19e5e6
 DIST tracing-test-0.2.1.crate 3916 BLAKE2B 3e6c4c4dc65c1a5f52a8cfb814b7dbf04d051810e96affe6553fbcdfc51cad9a2b6b7eb65bc653c5c27489b9b6a93efdd63ab17d146c2b7275542c156b93c266 SHA512 269c5360173cbeb35fe6bcba7f8052fe21bd9d2fafb3123173c51b95c78e95a32a47b28163c33e98243d7d655a15c6e2cbfb40af09ae8a3681f0554bc1f259c6
 DIST tracing-test-macro-0.2.1.crate 2767 BLAKE2B e1fb4eb38f118f12a35b8105c7797e3ed0b5fe6abc6aa31bfc422d1834e309c4c6c539ec692a040876a848259612b8dd3df0454f938a5e29f3fb2f444053e128 SHA512 839e4fbfa017041af0117c5c497726442b05268cf3a8d045ccb82501853841fb788e207fe9b52575b9387e78a1d18c8fdac80cf69f08227c7619801c3a1edca4
 DIST trust-dns-proto-0.21.2.crate 291378 BLAKE2B e6bebc903080c32f61928841fc7ad62e65ca8be8404d83fdfc495f772146dcb286fc87e967843743494a23f6061e25a87ee757cdfc0ba99c63c6b1d409264975 SHA512 e27b2bef0d4bfc90ffe19cd4f998b9d654447b41317ec9b013db628dc09e589b8496adef769575bc7f5b0451dbff912d26cb6aa067b74c2070f6ee9dac5e4ef6
 DIST try-lock-0.2.3.crate 4158 BLAKE2B d8bb2fd8ba10285871ac3dee069474d4225e312c0a13b6bc238604c5207fe33437541abfdb507a6b400fc3359b78d39a7e9a5bebca426692b5dab4622b09c192 SHA512 ebae7ba9227e6fc20499b48ab85169943765342d4790bb4a31ac33a2be0af9401e2854c8e00b9d3b7e225d16875c90700b1c3fa99af07833d3b7a91b7a414fc3
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
-DIST unicode-bidi-0.3.7.crate 33759 BLAKE2B 4d5224062c829b5e48d26ca727bb60d10d7c663cfca24762331b36a2819a70e7d43d2b6b64ba64751d9b686949142b53346a52027d400acf8cb1e1b1895b2796 SHA512 6eeafec87a504ac968b59dd3168714e555b5b374cfbb5a6a9c962445c423f82b68ee54d1b732c5939eb17fdbb804f9b3affe828745bf4ff34e8a1587df2bc8bf
 DIST unicode-bidi-0.3.8.crate 36575 BLAKE2B c0442dd47a8ee81f575b28e34c9781ccf507b53ea96d1d4df2e8117231e8e67579031e4244a2dacfd6f4c24ec01fbbd4da7c9ab72ad50af51ef56d7d813b6444 SHA512 810b5be48159ecbca542c715496f279518285c3b09f7c39451986f94e6c259fab1057512a2148bf99ba9abf76e861a24456b547cc2273f0b45ed5d3ce9dfe3d5
+DIST unicode-ident-1.0.0.crate 34224 BLAKE2B 62100357db87b74e44166a70a1d0f911281fc7410571554e9e89c94f3529920d1d43a8cdf3a3bf163c8acb8e9f575e83a024cb94217b84ecddc582751486954e SHA512 ccdad29fc63f71c507cdf276b02a5bb7fad44dffa123bf04d5b1495eb9c26bd7ec42ad6e11717eb10dc6499693047952c6b766c40d7b0696bd011779649d5fc9
 DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST unicode-xid-0.2.3.crate 15174 BLAKE2B 5cfb2a094047106a45eaeb77ebc1ae2e17ca51ece71082c127d3e2bf36773959f52df1c6df0d0d5cbc40ec4ee7f81820a094fd7ee99f01a2f99a1f7f68317223 SHA512 2adea0c8447c9450be34859f2b2e2b87a61b5e313685da994d21bc24a96dd94088f3320bcdb8d20466a3fdafb0bc0375823f0c28ec0077c9c42a9818f66ac1f5
 DIST untrusted-0.6.2.crate 7526 BLAKE2B 6886853aa5a9152a47534ff6ceb419782163d3c57a06b2f592cb7d00d07eebfee38a87f198c25bd3a4ad3b9f406afbed1993b4001c0af179d099723a07d5b779 SHA512 45ef8c556a13868a13d5bc6aac26281677edc7bc647b03b51a1294cf83d7699c712c1bc0a1453dbea643207f9aede11550aa7b16750d83048f88ac7a8c93b574
 DIST untrusted-0.7.1.crate 7924 BLAKE2B e0152791e781a4805120e3437b7e0219db3aa0282af4faaf2cfb15718421ff26abc56021c546f6aebb411f5abd27020273ba0f785e012a4b0089e96c2db4faa6 SHA512 5ebe3266912e4e78fdfdd13f9fcc07e9cf489d19d5e9ff346486f47aa58a0aca35278d561612c49eb3cab5a6759ac974d3b92bfabc399e1bc0808428dc347be0
 DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST valuable-0.1.0.crate 27718 BLAKE2B ef5ded994c9a6dd302bed27f0d757447b0c86dfefa499c1ef0d25c3a6745ce61cfa2c926826534c9f605f9b89b4a19f91f06f94ae7c03f1ddc4c58fab3ae58bb SHA512 a97f65db1f1c5049a276dbb0e45e25c6fc6ce9d27ac1fcd77c945324cd8216ef60344065c79799ca04e338455e4f7422c44078eea32d5fc359dd0211ee7eb387
-DIST value-bag-1.0.0-alpha.8.crate 26139 BLAKE2B 49a55c3ca514008bf5dee4577ae290dc9adba0c93ee9630f60f62809c9a8504ead0a1233818f811133f4ac4d70aae53d989324cfb0d44412f1c7e1ff009308b5 SHA512 aaa6070148e6ff201563e11619cf2899daaa3e0aea62492550a06c21a0ea918f44e1e4911cd7941c549754dc5e4de23863c3a04ed510c25a661c57b3552b69e3
 DIST value-bag-1.0.0-alpha.9.crate 26630 BLAKE2B 300e33ff2a397ee1d5463c868740a0a8baa007be023a5cf7bc4836acc5babd4d529c136fc7d968556397f9bac6b884259222a92d292b659fc24df0520a7da58f SHA512 52ae5b11c2f9befe58c28274f0596ba5b5a59e64f60be715967693600b94adf8329471e0db45c7abcd7d13bcf8a8dbf6f7818de253509ce6f87e04d6af084709
 DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
@@ -474,20 +375,13 @@ DIST want-0.3.0.crate 6550 BLAKE2B d97ac51dd5e49bec27cd196711110679013bb7aca5202
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
-DIST wasm-bindgen-0.2.79.crate 164276 BLAKE2B c3eeb98f9df18d52d7842886c187ea952923290725a0f90e1195152b54fa7859f0b05a618ee62c3f2eea36647c1299d4506f2cb5825cdddf823564882a93cd91 SHA512 30bbf75950c1f55560d88aa2ac37a00c55023974a73e59db575c16addad52c03eac401297be664f1f7bbd202dbba9f33c293ce063f4523082f5b2eec33ee2f85
 DIST wasm-bindgen-0.2.80.crate 164576 BLAKE2B ee581f812bdab9dcf23c73ce25afa6aafeffb7b9c70d5a64539487548efb290bfcb94cbe5af6e12b5a5912548ae0fc6cc3168de4a5ab63b3823b6b071d41161c SHA512 928fd6575217909a46f23ea8147caa438efed8eef31d1e0d75610fc380c18d7cf51cb74c7d5c83136d36433fd19bc9256b6566c2624a4008daca1b3e155aacf1
-DIST wasm-bindgen-backend-0.2.79.crate 25776 BLAKE2B 4fe72230364c889e74134baff9c4d661e54da3b8612f6139baf0897deea218bce4b1ef47b13fb4314729bf37641f9a066cc94bf83c2c9ca9928ab05e4ee93280 SHA512 8463996051ff7af350d32a871ebca080c434ead1c47d6f4e7b39b406adfab249615cc84d775ab550ad2a23a9af6514ecf9538d0936c54a2e253109c962b198f8
 DIST wasm-bindgen-backend-0.2.80.crate 25741 BLAKE2B bac730f41a17aa963bdb005bcbce76e988b0c163fdf1b117cb3bf838d7186b732f81ce4edc068c6e3d2934802c974e19f1d8588ff71310462a189b3e5b9d4653 SHA512 20c33664f194dbc5998093831d8ed0eae82cfa6c90b8c3b9338c4f32104594a8864c68a51ee3e39fca1eba166b241a9a8e508d5f942791d727deb2decd9056d2
-DIST wasm-bindgen-futures-0.4.29.crate 14730 BLAKE2B 6c8f7012d9ba13020b02a23c92da6b08bff34c9abe2b8a6dfe9e5cd008bf931494d59733ec4bcbf0b2dc66e40e96cccfc41e30c9f89fd3c3fecdc4a0b897662e SHA512 74c1c80f7fa04c18feda38691d4bbf02a7c31d90ca503db1e4d7efe4122cfec57ca50557fd3edba88f7326c4ab2ea9ae211ba6e73c358f4685e1da463fa9ac99
 DIST wasm-bindgen-futures-0.4.30.crate 15220 BLAKE2B 7e6788f03958ee3df9a81a594ab4ede3842232b9a187031ae5420838decc38e9db2b46dab54cdf1d447d4f633fb5dac4f3b80bb336c1146510e58b8258e457a3 SHA512 71248ac2ed1711650f4dba1b51d5b4d48c8f2f3c39eec2d55fa95b91c017ca2cf3c50c13cf654d0541c309683b502d5f518dc11f10c4e3b8d6b3e46d52a77ed9
-DIST wasm-bindgen-macro-0.2.79.crate 11806 BLAKE2B 8b06ecd90701e37810644d9a28cae3e9d18abe7aea7178dee92b373991a02e2d718b0546f8f90bef1e4c7ec2c0e00221dd6f8f4f796225197184f407b585dce4 SHA512 b4d6b7b70ad6b1b2017726032923965f1bd0431a1badac1d050ef2539815cf9b705f7668da57c1bee2b7ecdf403c7d1c753217d25b8acbd32cbdca110c69c99b
 DIST wasm-bindgen-macro-0.2.80.crate 11805 BLAKE2B ce070eac93a0cecac6d2e303f40b9f9784489133da2cf7fabbadd57afdeff5966308481276d4375150f0950fdbee165f466b4b099f0932ce26dd02ce6007af10 SHA512 816922762591e7ccd07d9bab1f089d1d0484c04ca4d8b9060d432fabe4ca28a6b6f0e701129f6d0a3fc341b845115c2dd1bea3bb67493234a73f7cd2bc0c66db
-DIST wasm-bindgen-macro-support-0.2.79.crate 17861 BLAKE2B 0368ed79c618949580a3aeee03853f0174399de2ca8e0f0aeae88c8b9d3cc61f86bd38481937ca3d7a1424d17586625ab581d2662045ffea4d9af0062d8404dd SHA512 a8b83cc222889b8d90801787c99a92c93383a8313f16d96949598e137e47cbd5690cedbe97cc610e7d72042462beb6562124a0fca6e2e777d4133ede376a9b99
 DIST wasm-bindgen-macro-support-0.2.80.crate 17857 BLAKE2B 9f51e4193f64088d95079a105164c75d2397f07846bc8fb29bf7f9dd3747dd7d4d6f3b340cde219fbc3b181199c8f1aaf62317ddd3ce8e7f25f68b2d5ffbd514 SHA512 8d4a68c363dde93d9644f30ab69ef28879e8c354e41e6ed1d1598beeeaba5bb6c8e6769fac5404faf438a90d87fbdaf9bc9b4d082dd7b1986f789d739f7b5108
-DIST wasm-bindgen-shared-0.2.79.crate 7204 BLAKE2B 726e4df99b50052a9eed71b94e3887f75bf611d08e50d22724863a2cb95a9ddab59c67c88cfed21fb1b09ff9f7f154cb3acd27cae71aafc0850d4ff19f61ba2b SHA512 f81088018534c91b542d5a9085509544ea47c3a1ac13291e9dc291c23bf1a912bc61cc64d94469ae5de3b98010270956f222a08e462332ccd0b450c8f198af74
 DIST wasm-bindgen-shared-0.2.80.crate 7204 BLAKE2B dd955b920bb74d96734b58c3143a10182c64ff5d4c1cbcdcba909521b45c0f97422c3aca2894722d96a226884a7c334b06649ca7c1cb2e7b08c2cac5acf53dd5 SHA512 c170759d46e12edd41dcafc908caa887756a811006a178b3bf5ae73f73556d51fa13fc4a0844e28071d21c177a1d98e1e2f6dcac41dc240b972b697d36d74203
 DIST weak-table-0.3.2.crate 23989 BLAKE2B f5b12d62704a86f77fabaac918d084a4f7471b52994307da20376d48264b811eaeffe2cae2f28ebeeefa4338c758516bcdba5d138cd7ac12ebfccc697009e167 SHA512 78936f2afca36575d3faa823ef4e621d7dea9e3eb4c8c3e1d66af296951fc25476dc8cbadae184322f6e1e8166410df617fe74794b2d3696d599bb2406499562
-DIST web-sys-0.3.56.crate 666465 BLAKE2B 903a54a43cdb7d990ac3e01b3ab7bd9ad33a7877fca2873296d3df3d7e1fc47d2eac52296d37579cfa1055746a0d07d3aa3d909cd86f1524e7c1ba60af16a3b2 SHA512 00db771aff344a7c05ff0c6e3c7648646913ebf16a38eb83cdb4b9afaae3ea90215ba802fe8586e50e20ccb96af11b8dcf2f81b6a11f44e26a2b0f9978b7e641
 DIST web-sys-0.3.57.crate 686563 BLAKE2B ddb687a252181a9198bc96da3feaea007ff188641996172293772257cffd748a79f306c24d9eb619c61a5ddcec4bb6e423288a831ff14c7b5ec6b37839b52508 SHA512 144a481ff7562ff5f96145c7db64ecc704863e2fd6c0c9afc87fe87513e5be660fcadec6b1114ed2c86da36ccd97024ce601b843c8768dd8b5c53c71daae9800
 DIST webpki-0.21.4.crate 58505 BLAKE2B 29a5fae21d885e90be8fa0b78a9b164f925e881431e79e9ea9702e8458242559c3f5b5535e04ff3ffb2018c1831b7dd685b5cdb5b9aa9942f6b9038c403da363 SHA512 667c9dc1c50a3d99aab53b6a9974f503e5c88f79012b3c94386a321761b96a74cc743a4e3b85d8314c36cef5ef01c2a2faffa80c773be1ba9680af4f21af3119
 DIST webpki-0.22.0.crate 58663 BLAKE2B 4fff91a8ce3d46a9daa9e39c50755f79574c91faddead2f6c879f6e9bc2189b76c4951cbc36e607e099ab8a870b422e1afcd4bcbecc14e96555c26c8cbefeb84 SHA512 7c2916d47f2232587e3ccaa8fefc8b576addaf84b55166011032e471f91ce54a79d2fca7fcc1144552c254f5baead708fba2b0ce76a1c34286838a8744b0f570
@@ -498,23 +392,11 @@ DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST windows-sys-0.32.0.crate 3361554 BLAKE2B b49573a17d526783ea445e49f6a7abf6080bb6d58b45e52fc977ca23573d737d952550664e3083793e25d5dc51fbc20b15d9ccfbc890c7529d6307bbf655d60b SHA512 a141bf37b6b72d83c46252e2fc4dd9daece02edbe8ddcb9d3262125c7733db1399c0342161a638cbbd3d980e532f785e0e0c77944e80270618ac30b0548b8ab9
-DIST windows-sys-0.34.0.crate 3369228 BLAKE2B 301f89dd2cc7e60980269deeb7f328d8895c80acad9f0056b3c510e339c7eb6963a152d7dd2c69380c802b17a630cd6df269399f18c298aefd8e9cc53e19042b SHA512 e12b2ddac3e1b841630639c6896f1389e6bb69c33da278e6499e0d31fde5d5b197ac636f430a52ccea6c3bc622e4410618d13819ba4d4c272ef2ea599be356d8
 DIST windows-sys-0.36.1.crate 3347053 BLAKE2B 818f7812bd9a55a4e95b3d461fa5fcc14569a159882f950d20fd5a6b7d2a2841f082c0bccaab657f5830549e6286a37d9f8fdf825a42403f543b51e35b2d20d4 SHA512 80973e461bef3be0d0d0c13d02b2129aeb0d0700768d637544315654126f101b39f980738035fe325bd96f549493a2245bd7b82511f833efa7bbcb2f62266001
-DIST windows_aarch64_msvc-0.32.0.crate 673810 BLAKE2B bd32e62f6530a37371b3f4aa67c41a201c47d035ecf4681daa05d5a5ab0bffaa67fb3e6d4b2cc10dc2de5b7ffffc465f66c576ed9fac313a5f96d1e9f28c6289 SHA512 d50661dc66f773edbfd82bdd2ddcc2b2c10216160595c771b61f9a56d0b288714d5f6b37a0a06e9d484395b2c1a228f342caff157bcb6c44534fe60bc1f5f844
-DIST windows_aarch64_msvc-0.34.0.crate 674445 BLAKE2B cba324bb4fdcde12f4d89384450c5adfbd6f728ac47bd162b33a12c5adf0654c8374d4b0f1e9347d48d2e7d014f701fe85763709824f75df21b42d01341b53a2 SHA512 974c6f3c4bdbd217d9deac7e973b00c115e8b9b831f8b9d933455b11b8b6eb59782f7c7a06c9a4d81fdd41729858e303051eb0d56b971fea1025e86d2b702710
 DIST windows_aarch64_msvc-0.36.1.crate 661960 BLAKE2B d503150a05c4aa6ec376d1094ad24a7a4b3579d8f60cae65f4a98adfe830dd776c8996d5c3acfbfca1a69598475b918b5de2a162e3253b0b28cd6aa17de2dc13 SHA512 d0c352c78caec9c71bbaa1a688baab8f39a33c903c0492b19398c76e08194183e254ecd3a8b24af3e7e5e1d9d97373dcbab54499236829898a4fd153cfde2ccf
-DIST windows_i686_gnu-0.32.0.crate 772251 BLAKE2B 60a6e4fe3783361fe773aa90aa2696350e67a443976a7dc946d828bf73b793ff6e1b9bb5f2899cb3d66f9869b99a2120f433fc766555f6c897106401c4735d3b SHA512 7dd93d6a8fef58114dd5574deb3d5285b851cf2fe85d5bde466a9ccfe8584f3dcbeb293d4e40bf4b228a5ba4e54306d7e30364cebf7fbe6fe568bda96ab33d44
-DIST windows_i686_gnu-0.34.0.crate 772343 BLAKE2B 7c3fb8d9b375ea82ab3e28da0c462c912a5286236a6bb8bb3c5eb68013d527dde064c368e1d452e73e26efcb1b832933b2891c2255673824c27045be9edd954d SHA512 e388b214d45ec14182af4c72e7b27f22dc7ac17725ce833e05cef9770b677dc929a20ffc1c28f604d5c8100f68d7bf4427feb2aeaf6edb776dc5bc1b505a94fd
 DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd1ff37b48bc24726d754cfec5b3e77075162f291f93aa709c07c9fa38ccb21a6c31cb5149dabc2cc8ad8a85c03408384a0b SHA512 e2c60e6639beb879472a06ed4462667eb4a78385df6bcde1ca579af759cf2b4ac70e84f7dd7b736e7fbd1b129061555671fed4b83bcd81a6083cc013963194a5
-DIST windows_i686_msvc-0.32.0.crate 733422 BLAKE2B fa1c9c2e5a879797212caff8cbaf17043d4019bb88070eeba39ea64fae46eb4d4c254527a74f21b5604a817859c5a5647b631e743d412e0c3a92bc523f778053 SHA512 3d8b8db6ce629f8a3598b00f4a11f8af81cd8da1b9ed5f14e0b200c0512539118a7206866e9c63bb73528877ce74b33e92bbcc88f036afefe07936298eaff932
-DIST windows_i686_msvc-0.34.0.crate 733497 BLAKE2B fe7588e946d95c1570ea0d90db82dfdb8a050ca331dc3edae6a786c2a10fad88ae99906959334b396c1972d88dc40010dacf655fbf9f5d39a6bd78bacf2025bd SHA512 86771e1fed40e7398d3ce65bee46fcbfeb630e0f77766eeb1da0e5b2c47f94bd728f645a5c799ea8f7ef6653b37903d476b5b3eb763218bf10dd7af6b31c76dd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
-DIST windows_x86_64_gnu-0.32.0.crate 744209 BLAKE2B 76106af387f443f2a24a0cd15d53b59a9e66977df8a0a4074993b4efded7cf63f88d18ddd0bfae467bf37b47b4f9400bdcd3db9cec31bc8febaabef995f406d6 SHA512 35cf64bf981a16a011b2276dbbb65200834235075d369fe60ca06092e1c0631c114c402eb43db223ec885f0ab07a77aa9f1822d1db44c5e6747645c65a7ac182
-DIST windows_x86_64_gnu-0.34.0.crate 744301 BLAKE2B fb0775c40069aa42fcabd01ff09fc7557236e3cd270c771b3648d7f556e9aeb9add7130b117fb107f3562bc199b728d3636779a99c9a1aad96aaf6b99f975f3e SHA512 61f532c2c95edf42f79ced48be9d4a9810dda327f45ff2dbff19a5fb888e3ba206f2b875c5b5571884f27742fb380d5f1e105e6d5fa460a2e529b53625123d86
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
-DIST windows_x86_64_msvc-0.32.0.crate 669835 BLAKE2B f8c9dc578d652c2abf0d689dfa9681da29f760bc45ecec83b7d994e7df7c04f91fbcebee464ebd94d5fe7eb0dea90ac7c04578b56264d89ca9d91213fd89b17f SHA512 4720246d2aed3c3b3c252cda7773096642e78891b1a9776c920da908b2d3741e9e341060424327f1c16e4cb47b6e22af1be229589a51b5a3a04d2a6447275332
-DIST windows_x86_64_msvc-0.34.0.crate 669900 BLAKE2B 15a851bb19557ee896ade2db29872754549e4df9cf895a1387d9ddfbf8c599e6e5a2bcb835f450d8218296a99d08fbfb2db469e244b0abdaa13f16bcc38b35a9 SHA512 3bf5308993a259f5d1b3964698550151c5819a0d28a02928c6f7d70443be69131255a896d423f086a298842ba773502de8a8e8bb2ce8adbf7bf848ab40184bec
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
 DIST x25519-dalek-1.2.0.crate 88676 BLAKE2B 8707b34b7d438ae97ddd7ce35084d1e9d4f15b08827d021fdf5e1d407a70e0a636bfed5860289f293ac4cb7ee9cee41bd6792c7cb4783adda5815775dd495adb SHA512 d1366c56e79e2d764c8c9d463445896d870871867957fa120c9987fd7733e7f94db9e34b6ae546f9caa2140ee09f44a8359e701d30affc6a2fc2e70f0ba729b7
@@ -523,9 +405,11 @@ DIST xz2-0.1.6.crate 24512 BLAKE2B 47f260f4ce920bf8eff1446981672c9d877b4e5908fe2
 DIST zeroize-1.3.0.crate 15913 BLAKE2B 571d96420e85e3d12100dcaff00d4721eae7296465cafce83db81293e801cd5a1f78b19986dc537fab208519a48e6a7df344d8e8a7053b094c1aa5bb90de083b SHA512 352a668a4c491cbd644368eb19f797709a41f3abf9a09028b6c1c4077710d48b74c3018e65112762a31403917f000340a0e57bc095a745e3f99300d6c25ca8bb
 DIST zeroize_derive-1.3.2.crate 10299 BLAKE2B 39cd21629ae91a3a80ec283c8a988be3559973b891c8ff9098dc78d2ccd8ac4352db3e52577fe6d560b2063f66d5e39cd77c9f24a01b7736fdb2d70f6dbc417d SHA512 3efcb9265a6bef7a752562ef9e3af1ccf28749afffdf1e21abf5baa51d5d761e10f77b9d655e69f26c587f2a0c412ddedf29776c2c66a9f69443a82d66c9da88
 DIST zstd-0.10.0+zstd.1.5.2.crate 28748 BLAKE2B bc9dfd18367faba7920bce5c28cc4ca99a00c11d23ef4d8a88bf657d5ef61dda25f7ebcfa06cf67f27cf447bee483f404662ea1be90524b46232c8201069fd8b SHA512 b6559710b10da68fd0cb242029145c2176d9bcbf5aa04c0d035341a27a6cc10038c0872d0df3a8fb94f0be573dfec65015032f583a93408da20377cef037746c
+DIST zstd-0.11.2+zstd.1.5.2.crate 28987 BLAKE2B e04fe25ec6661819efeca08698c207922c38447459aa291961d3512d7c30016c51ddf49a8dadac0b7b2bf677b6a89d22670ec1e214607b476584a7e1b2dbf36d SHA512 d3f053c4acbdb45f3dadc9590db56095c761f0ff8899d22461f664701de766dde2fac2960a4477cd05d0a9c7ec200caa02ff891eb1f04630734996e0c38d10dd
 DIST zstd-safe-4.1.4+zstd.1.5.2.crate 17166 BLAKE2B 9a43efdb808756ab729d0c525229afb62ae9528635c24d071a1befcfc57f251bc496481a67911d256eeb568b952554f9ea5fb132e5c8c9f0739493adda9f8bb7 SHA512 0b9ad154307954b977a990273b11dba3349fffa1a2b3cb89dc233cc20deb6dc0a10bd97d06c3fc5304124320ee8ff607b6d8859ebdaa562365d4baf490fdbcd8
+DIST zstd-safe-5.0.2+zstd.1.5.2.crate 17273 BLAKE2B 74dc561046f9bc595c58b62bc6ff291325bc23fd06a1249148426bb853271393eab5121d2e1e29e433eff562c9eab72c1be265f3fe3bf14cc35d4a741db03c38 SHA512 03a6f07ada211fd6c364f03d06acff705fa5b08129aa09c29ad310f05b233553f8ea697e504470d4c104bd947f5d4102328c4df0df5e1da6d8e537f51451a014
 DIST zstd-sys-1.6.3+zstd.1.5.2.crate 720054 BLAKE2B 4c0a709afa55eb66bcee82bbd6258ac7eb007cea608be7a981b445f8e0fe75c42007998072d93238ed2b0aee0cef1964ba327506de195e8a912b4c2e1aa468b8 SHA512 a8aaa3ddb7295cdb12623d1b6b06e30a029bce42a825adb427594e030ba0a1e51bf499f462d42bae47cd75178761d0e5071e86b0bcb8d8ff9cc8ebff1406b689
-EBUILD arti-0.1.0.ebuild 7163 BLAKE2B 835bcf95d6b34636f111810b1c8e05a87fb74bf56cad4bb1df6e1596dd6a5e37a1c058fd96082d02df6ab86ba2f61c882cddc065130e1fc0520e03c162b04180 SHA512 aaacb70210c491bcffc55e6ed2323a811f7b5fbc091e36c718e80649e02fae1bade8375fa59241aaa237b729186635bbde6d1739c999036efb9afece64ab1453
-EBUILD arti-0.2.0.ebuild 7775 BLAKE2B 09f2b68f1f4668ea77bc9b11e7a49a07322046aa961f61e012304f5e36bc4e3eee473861e935106f37b3c2275b283b922111ad67672be0b234eea1e42d0ddc48 SHA512 5496ddc87f316d5afd903b5003eb4a4cd2830803a5ecf67dba582573f69ac5702c020023e5f813bd03627885f888ea4bb8009f7899fa16262dc11a35e9757bc6
+DIST zstd-sys-2.0.1+zstd.1.5.2.crate 715552 BLAKE2B 497901ccaff7f92aa607797970c6beaaa3fcbeb08a48a2dffdfd465af999291e65024dfb7fc844802e5befa0e67dbe225310f72e6292bdcd22596b2614665d8e SHA512 a54ff4159640d31f898cbd374b9117d1e7ee4b54c5b4a8e1ed6286d9e954341e077088c52161e086ef0f28dfec13e03f64013712fa9bc59d471191cffd8e0e1e
 EBUILD arti-0.3.0.ebuild 7953 BLAKE2B 3bc97dea2ad8b7a1b4c2349f125c51674d1f105b7e168e01ed1491e2bf6f6690db775525d42a785861abc785c22873343cc0a5d0a77dc6d5058ffccbaca032f2 SHA512 7bd9a2f8780cce6def4905d795e0878041bb73059557cff2c2251d6d285aa9aeeabfde2dd723ac6dae9e5e53fb16f5103bf8b62255bba8f16a9da0507a158782
+EBUILD arti-0.4.0.ebuild 7984 BLAKE2B 92679c5e4f6e8db25b6ffcaffc1631997e9d36f1ea46391161a5028f68615d23578cb719c4fd9cfc9cdfc643ab1677e7035fcd26298365fe44c99341b8a1f594 SHA512 c69ca169c8186a2da1c199edda25f59a902cc4e8028cdc7f38d4a824b9127576c59f69f3005dd638087b26c82bf277a4e2a437b3fdcda2d34b0d545b8816339c
 MISC metadata.xml 248 BLAKE2B d74a668fe3651516ae5fc09d05b19f23c3805226f2bd6a467bb335a120dec22aef68395a1a3b3b48f88a54bb65be7809344fd846262e61d19ebaa752107c8700 SHA512 a666e44641b0092cedb169972387594c198b6f22ecbb2574fe9a68fdf40e639bd436f8b2bb7ef2546fb13a18cef97f6acb4665d40bed0fcf6f4bd8dced3e16b0
diff --git a/net-p2p/arti/arti-0.1.0.ebuild b/net-p2p/arti/arti-0.1.0.ebuild
deleted file mode 100644
index 253434bfa3f3..000000000000
--- a/net-p2p/arti/arti-0.1.0.ebuild
+++ /dev/null
@@ -1,406 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-addr2line-0.17.0
-adler-1.0.2
-aes-0.7.5
-ahash-0.7.6
-aho-corasick-0.7.18
-ansi_term-0.12.1
-anyhow-1.0.55
-arrayref-0.3.6
-asynchronous-codec-0.6.0
-async-broadcast-0.3.4
-async-channel-1.6.1
-async-compression-0.3.12
-async-ctrlc-1.2.0
-async-executor-1.4.1
-async-global-executor-2.0.2
-async-io-1.6.0
-async-lock-2.5.0
-async-mutex-1.4.0
-async-native-tls-0.4.0
-async-process-1.3.0
-async-rustls-0.2.0
-async-std-1.10.0
-async-task-4.1.0
-async-trait-0.1.52
-async_executors-0.4.2
-atomic-0.5.1
-atomic-waker-1.0.0
-atty-0.2.14
-autocfg-0.1.8
-autocfg-1.1.0
-backtrace-0.3.64
-base64ct-1.1.1
-base64-0.13.0
-bitflags-1.3.2
-blanket-0.2.0
-blocking-1.1.0
-block-buffer-0.9.0
-block-buffer-0.10.2
-bounded-vec-deque-0.1.1
-bumpalo-3.9.1
-byteorder-1.4.3
-bytes-1.1.0
-cache-padded-1.2.0
-cargo-husky-1.5.0
-cc-1.0.73
-cfg-if-0.1.10
-cfg-if-1.0.0
-cipher-0.3.0
-clap-2.34.0
-coarsetime-0.1.21
-concurrent-queue-1.2.2
-config-0.12.0
-const-oid-0.6.2
-convert_case-0.4.0
-core-foundation-0.9.3
-core-foundation-sys-0.8.3
-cpufeatures-0.2.1
-crc32fast-1.3.2
-crossbeam-channel-0.5.2
-crossbeam-queue-0.3.4
-crossbeam-utils-0.8.7
-crypto-bigint-0.2.11
-crypto-common-0.1.3
-ctor-0.1.21
-ctrlc-3.2.1
-ctr-0.8.0
-curve25519-dalek-3.2.1
-darling-0.12.4
-darling_core-0.12.4
-darling_macro-0.12.4
-derive_builder-0.10.2
-derive_builder_core-0.10.2
-derive_builder_macro-0.10.2
-derive_more-0.99.17
-der-0.4.5
-digest-0.9.0
-digest-0.10.3
-directories-4.0.1
-dirs-4.0.0
-dirs-next-2.0.0
-dirs-sys-0.3.6
-dirs-sys-next-0.1.2
-easy-parallel-3.2.0
-ed25519-1.4.0
-ed25519-dalek-1.0.1
-either-1.6.1
-env_logger-0.5.13
-event-listener-2.5.2
-fallible-iterator-0.2.0
-fallible-streaming-iterator-0.1.9
-fastrand-1.7.0
-filetime-0.2.15
-flate2-1.0.22
-float-cmp-0.9.0
-float-ord-0.3.2
-float_eq-0.7.0
-fnv-1.0.7
-foreign-types-0.3.2
-foreign-types-shared-0.1.1
-form_urlencoded-1.0.1
-fsevent-0.4.0
-fsevent-sys-2.0.1
-fslock-0.2.1
-fuchsia-cprng-0.1.1
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-futures-0.3.21
-futures-await-test-0.3.0
-futures-await-test-macro-0.3.0
-futures-channel-0.3.21
-futures-core-0.3.21
-futures-executor-0.3.21
-futures-io-0.3.21
-futures-lite-1.12.0
-futures-macro-0.3.21
-futures-sink-0.3.21
-futures-task-0.3.21
-futures-util-0.3.21
-generic-array-0.14.5
-getrandom-0.1.16
-getrandom-0.2.5
-gimli-0.26.1
-gloo-timers-0.2.3
-hashbrown-0.11.2
-hashlink-0.7.0
-hermit-abi-0.1.19
-hex-0.4.3
-hex-literal-0.3.4
-hkdf-0.12.3
-hmac-0.12.1
-httparse-1.6.0
-httpdate-1.0.2
-http-0.2.6
-http-body-0.4.4
-humantime-1.3.0
-humantime-2.1.0
-humantime-serde-1.0.1
-hyper-0.14.17
-ident_case-1.0.1
-idna-0.2.3
-inotify-0.7.1
-inotify-sys-0.1.5
-instant-0.1.12
-iovec-0.1.4
-itertools-0.10.3
-itoa-1.0.1
-jobserver-0.1.24
-js-sys-0.3.56
-keccak-0.1.0
-kernel32-sys-0.2.2
-kv-log-macro-1.0.7
-lazycell-1.3.0
-lazy_static-1.4.0
-libc-0.2.119
-libm-0.2.2
-libsqlite3-sys-0.23.2
-lock_api-0.4.6
-log-0.4.14
-lzma-sys-0.1.17
-matchers-0.1.0
-matches-0.1.9
-memchr-2.4.1
-memmap2-0.5.3
-memoffset-0.6.5
-merlin-2.0.1
-minimal-lexical-0.2.1
-miniz_oxide-0.4.4
-miow-0.2.2
-miow-0.3.7
-mio-0.6.23
-mio-0.8.0
-mio-extras-2.0.6
-native-tls-0.2.8
-net2-0.2.37
-nix-0.23.1
-nom-7.1.0
-notify-4.0.17
-ntapi-0.3.7
-num-bigint-0.4.3
-num-bigint-dig-0.7.0
-num-integer-0.1.44
-num-iter-0.1.42
-num-traits-0.2.14
-num_cpus-1.13.1
-num_threads-0.1.3
-object-0.27.1
-once_cell-1.9.0
-opaque-debug-0.3.0
-openssl-0.10.38
-openssl-probe-0.1.5
-openssl-src-111.17.0+1.1.1m
-openssl-sys-0.9.72
-parking-2.0.0
-parking_lot-0.12.0
-parking_lot_core-0.9.1
-pathdiff-0.2.1
-pem-0.8.3
-pem-rfc7468-0.2.4
-percent-encoding-2.1.0
-phf-0.10.1
-phf_generator-0.10.0
-phf_macros-0.10.0
-phf_shared-0.10.0
-pin-project-1.0.10
-pin-project-internal-1.0.10
-pin-project-lite-0.2.8
-pin-utils-0.1.0
-pkcs1-0.2.4
-pkcs8-0.7.6
-pkg-config-0.3.24
-polling-2.2.0
-postage-0.4.1
-ppv-lite86-0.2.16
-proc-macro2-1.0.36
-proc-macro-hack-0.5.19
-quickcheck-1.0.3
-quick-error-1.2.3
-quote-1.0.15
-rand-0.4.6
-rand-0.7.3
-rand-0.8.5
-rand_chacha-0.2.2
-rand_chacha-0.3.1
-rand_core-0.3.1
-rand_core-0.4.2
-rand_core-0.5.1
-rand_core-0.6.3
-rand_hc-0.2.0
-rdrand-0.4.0
-redox_syscall-0.2.11
-redox_users-0.4.0
-regex-1.5.4
-regex-automata-0.1.10
-regex-syntax-0.6.25
-remove_dir_all-0.5.3
-retain_mut-0.1.7
-ring-0.16.20
-rlimit-0.7.0
-rsa-0.5.0
-rusqlite-0.26.3
-rustc-demangle-0.1.21
-rustc_version-0.4.0
-rustls-0.19.1
-ryu-1.0.9
-same-file-1.0.6
-sanitize-filename-0.3.0
-schannel-0.1.19
-scopeguard-1.1.0
-sct-0.6.1
-security-framework-2.6.1
-security-framework-sys-2.6.1
-semver-1.0.6
-serde-1.0.136
-serde_derive-1.0.136
-serde_json-1.0.79
-serde_test-1.0.136
-sha2-0.9.9
-sha2-0.10.2
-sha3-0.10.1
-sharded-slab-0.1.4
-sha-1-0.10.0
-shellexpand-2.1.0
-signal-hook-0.3.13
-signal-hook-registry-1.4.0
-signature-1.5.0
-simple_asn1-0.6.1
-siphasher-0.3.9
-slab-0.4.5
-smallvec-1.8.0
-socket2-0.4.4
-spin-0.5.2
-spki-0.4.1
-static_assertions-1.1.0
-strsim-0.8.0
-strsim-0.10.0
-subtle-2.4.1
-synstructure-0.12.6
-syn-1.0.86
-tempdir-0.3.7
-tempfile-3.3.0
-termcolor-1.1.2
-test-cert-gen-0.7.0
-textwrap-0.11.0
-thiserror-1.0.30
-thiserror-impl-1.0.30
-thread_local-1.1.4
-time-0.3.7
-time-macros-0.2.3
-tinyvec-1.5.1
-tinyvec_macros-0.1.0
-tls-api-0.7.0
-tls-api-native-tls-0.7.0
-tls-api-test-0.7.0
-tokio-1.17.0
-tokio-macros-1.7.0
-tokio-socks-0.5.1
-tokio-util-0.7.0
-toml-0.5.8
-tower-service-0.3.1
-tracing-0.1.31
-tracing-appender-0.2.1
-tracing-attributes-0.1.19
-tracing-core-0.1.22
-tracing-journald-0.2.3
-tracing-log-0.1.2
-tracing-subscriber-0.3.9
-tracing-test-0.2.1
-tracing-test-macro-0.2.1
-try-lock-0.2.3
-typenum-1.15.0
-unicode-bidi-0.3.7
-unicode-normalization-0.1.19
-unicode-width-0.1.9
-unicode-xid-0.2.2
-untrusted-0.6.2
-untrusted-0.7.1
-url-2.2.2
-valuable-0.1.0
-value-bag-1.0.0-alpha.8
-vcpkg-0.2.15
-vec_map-0.8.2
-version_check-0.9.4
-void-1.0.2
-waker-fn-1.1.0
-walkdir-2.3.2
-want-0.3.0
-wasi-0.9.0+wasi-snapshot-preview1
-wasi-0.10.2+wasi-snapshot-preview1
-wasi-0.11.0+wasi-snapshot-preview1
-wasm-bindgen-0.2.79
-wasm-bindgen-backend-0.2.79
-wasm-bindgen-futures-0.4.29
-wasm-bindgen-macro-0.2.79
-wasm-bindgen-macro-support-0.2.79
-wasm-bindgen-shared-0.2.79
-weak-table-0.3.2
-webpki-0.21.4
-webpki-0.22.0
-web-sys-0.3.56
-wepoll-ffi-0.1.2
-winapi-0.2.8
-winapi-0.3.9
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-winapi-x86_64-pc-windows-gnu-0.4.0
-windows-sys-0.32.0
-windows_aarch64_msvc-0.32.0
-windows_i686_gnu-0.32.0
-windows_i686_msvc-0.32.0
-windows_x86_64_gnu-0.32.0
-windows_x86_64_msvc-0.32.0
-ws2_32-sys-0.2.1
-x509-signature-0.5.0
-x25519-dalek-1.2.0
-xz2-0.1.6
-zeroize-1.3.0
-zeroize_derive-1.3.2
-zstd-0.10.0+zstd.1.5.2
-zstd-safe-4.1.4+zstd.1.5.2
-zstd-sys-1.6.3+zstd.1.5.2
-"
-
-inherit cargo
-
-MY_P="${PN}-${PN}-v${PV}"
-
-DESCRIPTION="An implementation of Tor, in Rust."
-HOMEPAGE="https://gitlab.torproject.org/tpo/core/arti/"
-SRC_URI="https://gitlab.torproject.org/tpo/core/${PN}/-/archive/${PN}-v${PV}/${PN}-${PN}-v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/xz-utils
-	dev-db/sqlite:3
-	dev-libs/openssl:="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-QA_FLAGS_IGNORED="usr/bin/arti"
-
-src_compile() {
-	cd crates/arti || die
-	cargo_src_compile
-}
-
-src_test() {
-	cd crates/arti || die
-	cargo_src_test
-}
-
-src_install() {
-	cargo_src_install --path ./crates/arti
-
-	dodoc -r doc
-}
diff --git a/net-p2p/arti/arti-0.2.0.ebuild b/net-p2p/arti/arti-0.4.0.ebuild
similarity index 71%
rename from net-p2p/arti/arti-0.2.0.ebuild
rename to net-p2p/arti/arti-0.4.0.ebuild
index aaa48d64ce0e..b2c002afbb2b 100644
--- a/net-p2p/arti/arti-0.2.0.ebuild
+++ b/net-p2p/arti/arti-0.4.0.ebuild
@@ -6,35 +6,35 @@ EAPI=8
 CRATES="
 	addr2line-0.17.0
 	adler-1.0.2
-	aes-0.7.5
+	aes-0.8.1
 	ahash-0.7.6
 	aho-corasick-0.7.18
 	ansi_term-0.12.1
-	anyhow-1.0.56
+	anyhow-1.0.57
 	arrayref-0.3.6
 	asynchronous-codec-0.6.0
 	async-broadcast-0.4.0
 	async-channel-1.6.1
-	async-compression-0.3.12
+	async-compression-0.3.14
 	async-ctrlc-1.2.0
 	async-executor-1.4.1
 	async-global-executor-2.0.4
-	async-io-1.6.0
+	async-io-1.7.0
 	async-lock-2.5.0
 	async-mutex-1.4.0
 	async-native-tls-0.4.0
-	async-process-1.3.0
+	async-process-1.4.0
 	async-rustls-0.2.0
 	async-std-1.11.0
 	async-task-4.2.0
 	async-trait-0.1.53
-	async_executors-0.4.2
+	async_executors-0.6.0
 	atomic-0.5.1
 	atomic-waker-1.0.0
 	atty-0.2.14
 	autocfg-0.1.8
 	autocfg-1.1.0
-	backtrace-0.3.64
+	backtrace-0.3.65
 	base64ct-1.1.1
 	base64-0.13.0
 	bitflags-1.3.2
@@ -47,15 +47,14 @@ CRATES="
 	byteorder-1.4.3
 	bytes-1.1.0
 	cache-padded-1.2.0
-	cargo-husky-1.5.0
 	cc-1.0.73
 	cfg-if-0.1.10
 	cfg-if-1.0.0
-	cipher-0.3.0
+	cipher-0.4.3
 	clap-2.34.0
 	coarsetime-0.1.22
 	concurrent-queue-1.2.2
-	config-0.12.0
+	config-0.13.1
 	const-oid-0.6.2
 	convert_case-0.4.0
 	core-foundation-0.9.3
@@ -68,16 +67,16 @@ CRATES="
 	crypto-bigint-0.2.11
 	crypto-common-0.1.3
 	ctor-0.1.22
-	ctrlc-3.2.1
-	ctr-0.8.0
+	ctrlc-3.2.2
+	ctr-0.9.1
 	curve25519-dalek-3.2.1
-	darling-0.12.4
-	darling_core-0.12.4
-	darling_macro-0.12.4
+	darling-0.14.1
+	darling_core-0.14.1
+	darling_macro-0.14.1
 	data-encoding-2.3.2
-	derive_builder-0.11.1
-	derive_builder_core-0.11.1
-	derive_builder_macro-0.11.1
+	derive_builder_core_fork_arti-0.11.2
+	derive_builder_fork_arti-0.11.2
+	derive_builder_macro_fork_arti-0.11.2
 	derive_more-0.99.17
 	der-0.4.5
 	digest-0.9.0
@@ -87,10 +86,11 @@ CRATES="
 	dirs-next-2.0.0
 	dirs-sys-0.3.7
 	dirs-sys-next-0.1.2
+	displaydoc-0.2.3
 	downcast-rs-1.2.0
 	dyn-clone-1.0.5
 	easy-parallel-3.2.0
-	ed25519-1.4.1
+	ed25519-1.5.2
 	ed25519-dalek-1.0.1
 	educe-0.4.19
 	either-1.6.1
@@ -101,11 +101,12 @@ CRATES="
 	fallible-iterator-0.2.0
 	fallible-streaming-iterator-0.1.9
 	fastrand-1.7.0
-	filetime-0.2.15
-	flate2-1.0.22
+	filetime-0.2.16
+	flate2-1.0.23
 	float-cmp-0.9.0
 	float-ord-0.3.2
 	float_eq-0.7.0
+	fluid-let-1.0.0
 	fnv-1.0.7
 	foreign-types-0.3.2
 	foreign-types-shared-0.1.1
@@ -113,7 +114,6 @@ CRATES="
 	fsevent-0.4.0
 	fsevent-sys-2.0.1
 	fslock-0.2.1
-	fuchsia-cprng-0.1.1
 	fuchsia-zircon-0.3.3
 	fuchsia-zircon-sys-0.3.3
 	futures-0.3.21
@@ -132,7 +132,7 @@ CRATES="
 	getrandom-0.1.16
 	getrandom-0.2.6
 	gimli-0.26.1
-	gloo-timers-0.2.3
+	gloo-timers-0.2.4
 	hashbrown-0.11.2
 	hashlink-0.7.0
 	heck-0.4.0
@@ -141,10 +141,10 @@ CRATES="
 	hex-literal-0.3.4
 	hkdf-0.12.3
 	hmac-0.12.1
-	httparse-1.6.0
+	httparse-1.7.1
 	httpdate-1.0.2
-	http-0.2.6
-	http-body-0.4.4
+	http-0.2.7
+	http-body-0.4.5
 	humantime-1.3.0
 	humantime-2.1.0
 	humantime-serde-1.1.1
@@ -153,62 +153,62 @@ CRATES="
 	idna-0.2.3
 	inotify-0.7.1
 	inotify-sys-0.1.5
+	inout-0.1.3
 	instant-0.1.12
 	iovec-0.1.4
-	ipnet-2.4.0
+	ipnet-2.5.0
 	itertools-0.10.3
-	itoa-1.0.1
+	itoa-1.0.2
 	jobserver-0.1.24
-	js-sys-0.3.56
-	keccak-0.1.0
+	js-sys-0.3.57
+	keccak-0.1.2
 	kernel32-sys-0.2.2
 	kv-log-macro-1.0.7
 	lazycell-1.3.0
 	lazy_static-1.4.0
-	libc-0.2.121
+	libc-0.2.126
 	libm-0.2.2
 	libsqlite3-sys-0.24.2
 	lock_api-0.4.7
-	log-0.4.16
+	log-0.4.17
 	lzma-sys-0.1.17
 	matchers-0.1.0
 	matches-0.1.9
-	memchr-2.4.1
+	memchr-2.5.0
 	memmap2-0.5.3
-	memoffset-0.6.5
 	merlin-2.0.1
 	minimal-lexical-0.2.1
-	miniz_oxide-0.4.4
+	miniz_oxide-0.5.1
 	miow-0.2.2
-	miow-0.3.7
 	mio-0.6.23
-	mio-0.8.2
+	mio-0.8.3
 	mio-extras-2.0.6
 	native-tls-0.2.10
 	net2-0.2.37
-	nix-0.23.1
+	nix-0.24.1
 	nom-7.1.1
 	notify-4.0.17
-	ntapi-0.3.7
 	num-bigint-0.4.3
 	num-bigint-dig-0.7.0
-	num-integer-0.1.44
-	num-iter-0.1.42
-	num-traits-0.2.14
+	num-integer-0.1.45
+	num-iter-0.1.43
+	num-traits-0.2.15
 	num_cpus-1.13.1
-	num_threads-0.1.5
-	object-0.27.1
-	once_cell-1.10.0
+	num_threads-0.1.6
+	object-0.28.4
+	once_cell-1.12.0
 	opaque-debug-0.3.0
-	openssl-0.10.38
+	openssl-0.10.40
+	openssl-macros-0.1.0
 	openssl-probe-0.1.5
-	openssl-src-111.18.0+1.1.1n
-	openssl-sys-0.9.72
+	openssl-src-111.20.0+1.1.1o
+	openssl-sys-0.9.73
 	parking-2.0.0
 	parking_lot-0.11.2
 	parking_lot-0.12.0
 	parking_lot_core-0.8.5
-	parking_lot_core-0.9.2
+	parking_lot_core-0.9.3
+	paste-1.0.7
 	pathdiff-0.2.1
 	pem-0.8.3
 	pem-rfc7468-0.2.4
@@ -219,69 +219,73 @@ CRATES="
 	phf_shared-0.10.0
 	pin-project-1.0.10
 	pin-project-internal-1.0.10
-	pin-project-lite-0.2.8
+	pin-project-lite-0.2.9
 	pin-utils-0.1.0
 	pkcs1-0.2.4
 	pkcs8-0.7.6
 	pkg-config-0.3.25
 	polling-2.2.0
-	postage-0.4.1
+	postage-0.5.0
 	ppv-lite86-0.2.16
-	proc-macro2-1.0.36
+	proc-macro2-1.0.39
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
 	proc-macro-hack-0.5.19
 	quickcheck-1.0.3
 	quick-error-1.2.3
-	quote-1.0.17
-	rand-0.4.6
+	quote-1.0.18
 	rand-0.7.3
 	rand-0.8.5
 	rand_chacha-0.2.2
 	rand_chacha-0.3.1
-	rand_core-0.3.1
-	rand_core-0.4.2
 	rand_core-0.5.1
 	rand_core-0.6.3
 	rand_hc-0.2.0
-	rdrand-0.4.0
 	redox_syscall-0.2.13
 	redox_users-0.4.3
-	regex-1.5.5
+	regex-1.5.6
 	regex-automata-0.1.10
-	regex-syntax-0.6.25
+	regex-syntax-0.6.26
 	remove_dir_all-0.5.3
-	retain_mut-0.1.7
+	retain_mut-0.1.9
 	ring-0.16.20
-	rlimit-0.8.0
+	rlimit-0.8.3
+	rmp-0.8.11
+	rmp-serde-1.1.0
 	rsa-0.5.0
 	rusqlite-0.27.0
 	rustc-demangle-0.1.21
 	rustc_version-0.4.0
 	rustls-0.19.1
-	ryu-1.0.9
+	rustversion-1.0.6
+	ryu-1.0.10
 	same-file-1.0.6
-	sanitize-filename-0.3.0
-	schannel-0.1.19
+	sanitize-filename-0.4.0
+	schannel-0.1.20
 	scopeguard-1.1.0
 	sct-0.6.1
 	security-framework-2.6.1
 	security-framework-sys-2.6.1
-	semver-1.0.7
-	serde-1.0.136
-	serde_derive-1.0.136
-	serde_json-1.0.79
-	serde_test-1.0.136
+	semver-1.0.9
+	serde-1.0.137
+	serde_derive-1.0.137
+	serde_ignored-0.1.3
+	serde_json-1.0.81
+	serde_test-1.0.137
+	serial_test-0.6.0
+	serial_test_derive-0.6.0
 	sha2-0.9.9
 	sha2-0.10.2
 	sha3-0.10.1
 	sharded-slab-0.1.4
 	sha-1-0.10.0
 	shellexpand-fork-2.1.1
-	signal-hook-0.3.13
+	signal-hook-0.3.14
 	signal-hook-registry-1.4.0
 	signature-1.5.0
 	simple_asn1-0.6.1
 	siphasher-0.3.10
-	slab-0.4.5
+	slab-0.4.6
 	smallvec-1.8.0
 	socket2-0.4.4
 	spin-0.5.2
@@ -289,51 +293,55 @@ CRATES="
 	static_assertions-1.1.0
 	strsim-0.8.0
 	strsim-0.10.0
+	strum-0.24.0
+	strum_macros-0.24.0
 	subtle-2.4.1
 	synstructure-0.12.6
-	syn-1.0.90
-	tempdir-0.3.7
+	syn-1.0.95
 	tempfile-3.3.0
 	termcolor-1.1.3
-	test-cert-gen-0.7.0
+	test-cert-gen-0.8.0
 	textwrap-0.11.0
-	thiserror-1.0.30
-	thiserror-impl-1.0.30
+	thiserror-1.0.31
+	thiserror-impl-1.0.31
 	thread_local-1.1.4
 	time-0.3.9
 	time-macros-0.2.4
-	tinyvec-1.5.1
+	tinystr-0.6.0
+	tinyvec-1.6.0
 	tinyvec_macros-0.1.0
-	tls-api-0.7.0
-	tls-api-native-tls-0.7.0
-	tls-api-test-0.7.0
-	tokio-1.17.0
+	tls-api-0.8.0
+	tls-api-native-tls-0.8.0
+	tls-api-test-0.8.0
+	tokio-1.18.2
 	tokio-macros-1.7.0
 	tokio-socks-0.5.1
-	tokio-util-0.7.1
-	toml-0.5.8
+	tokio-util-0.7.2
+	toml-0.5.9
 	tower-service-0.3.1
-	tracing-0.1.32
+	tracing-0.1.34
 	tracing-appender-0.2.2
-	tracing-attributes-0.1.20
-	tracing-core-0.1.23
-	tracing-journald-0.2.4
-	tracing-log-0.1.2
-	tracing-subscriber-0.3.9
+	tracing-attributes-0.1.21
+	tracing-core-0.1.26
+	tracing-journald-0.3.0
+	tracing-log-0.1.3
+	tracing-subscriber-0.3.11
 	tracing-test-0.2.1
 	tracing-test-macro-0.2.1
 	trust-dns-proto-0.21.2
 	try-lock-0.2.3
 	typenum-1.15.0
-	unicode-bidi-0.3.7
+	unicode-bidi-0.3.8
+	unicode-ident-1.0.0
 	unicode-normalization-0.1.19
 	unicode-width-0.1.9
-	unicode-xid-0.2.2
+	unicode-xid-0.2.3
 	untrusted-0.6.2
 	untrusted-0.7.1
 	url-2.2.2
+	users-0.11.0
 	valuable-0.1.0
-	value-bag-1.0.0-alpha.8
+	value-bag-1.0.0-alpha.9
 	vcpkg-0.2.15
 	vec_map-0.8.2
 	version_check-0.9.4
@@ -346,16 +354,16 @@ CRATES="
 	wasi-0.9.0+wasi-snapshot-preview1
 	wasi-0.10.2+wasi-snapshot-preview1
 	wasi-0.11.0+wasi-snapshot-preview1
-	wasm-bindgen-0.2.79
-	wasm-bindgen-backend-0.2.79
-	wasm-bindgen-futures-0.4.29
-	wasm-bindgen-macro-0.2.79
-	wasm-bindgen-macro-support-0.2.79
-	wasm-bindgen-shared-0.2.79
+	wasm-bindgen-0.2.80
+	wasm-bindgen-backend-0.2.80
+	wasm-bindgen-futures-0.4.30
+	wasm-bindgen-macro-0.2.80
+	wasm-bindgen-macro-support-0.2.80
+	wasm-bindgen-shared-0.2.80
 	weak-table-0.3.2
 	webpki-0.21.4
 	webpki-0.22.0
-	web-sys-0.3.56
+	web-sys-0.3.57
 	wepoll-ffi-0.1.2
 	winapi-0.2.8
 	winapi-0.3.9
@@ -363,22 +371,22 @@ CRATES="
 	winapi-i686-pc-windows-gnu-0.4.0
 	winapi-util-0.1.5
 	winapi-x86_64-pc-windows-gnu-0.4.0
-	windows-sys-0.34.0
-	windows_aarch64_msvc-0.34.0
-	windows_i686_gnu-0.34.0
-	windows_i686_msvc-0.34.0
-	windows_x86_64_gnu-0.34.0
-	windows_x86_64_msvc-0.34.0
+	windows-sys-0.36.1
+	windows_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
 	ws2_32-sys-0.2.1
 	x509-signature-0.5.0
 	x25519-dalek-1.2.0
 	xz2-0.1.6
 	zeroize-1.3.0
 	zeroize_derive-1.3.2
-	zstd-0.10.0+zstd.1.5.2
-	zstd-safe-4.1.4+zstd.1.5.2
-	zstd-sys-1.6.3+zstd.1.5.2
-	"
+	zstd-0.11.2+zstd.1.5.2
+	zstd-safe-5.0.2+zstd.1.5.2
+	zstd-sys-2.0.1+zstd.1.5.2
+"
 
 inherit cargo
 
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 740ed795a74a..361eb2837740 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,4 +1,6 @@
 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
+DIST ncdc-1.23.tar.gz 378384 BLAKE2B 0558b8b51f9cda81ec553171f76a0f6c29a1a67e6f69c5cc2c181428f3bb1db2ecd5a9c2f0c609dac53323ad62e478171121572f0a9d707d9d6d9e9727441873 SHA512 c1b2098df517631a64b24efaeb328a796ed716dca08b61248bb39bba866055ce1e017f33cc594197824476ec65ada53b13bfb56878b5b8aa330288017ad15df2
 EBUILD ncdc-1.22.1-r1.ebuild 993 BLAKE2B 7d6a6c92d00a611710a578ac512ab835fa73f7b23a43748e2ac9de2ddf161c4c275d6a61c01b642df68f09aef482964bc365328b389410616b7beda67f8b9e9a SHA512 f2915f78eb33cd82edb0af152119ba9fb48b48a447b66edbaccd431daf0757dfb9bf1d9864f1ccc0572405f3bd37687d3a325c8f5fc7aab2b45a927e6a5f8b88
-EBUILD ncdc-9999.ebuild 995 BLAKE2B 3622d210b4c48feac9582f18b178a6d6e84dab2da2fd9dd08db461ea2c8e1e85c99f56dce6bb049c0d2e10dbd10d7861b2f3d1c715e0cbf61859fddf8594dbf3 SHA512 eab10df54ff414ba10bded7a946861c27467cdb9fa1cc931ae0ef0b179cdfd6272ade5de5bba13352e515b8273c8130b480fd4eb5269d70827eb4303d6d98814
+EBUILD ncdc-1.23.ebuild 1003 BLAKE2B e467d067bee2cf8a1fe9778d254aa14ed0149fd5f38b7d4b4bfc706460efb7b7b2b27b9e47179af78852d36e4b21d5b0b2f8f9dfdf43ac1bf7958d0841973211 SHA512 c5202b5daa51dd93ffb3854f2c5a5e1cb8c7b67b94d22c52c0b80e5de5763de4bf0764244536859ca715083fb0fa719106c4703e82702547c05df91c0633e240
+EBUILD ncdc-9999.ebuild 999 BLAKE2B 67a32123bf8e43f67931fdb0db01e4a7f1d4361fde369d5c7ed0be242ab5edec4139b6cf58021feecae92a92566a4ce616767a1ee264e60d88235e2fa12f20f9 SHA512 b84904ea8f5621c9bcd9b6a3e1037efa86faae67e3a18eb82b2fd6f65773f707622124db5a498857fb001f061842565226f85093aa5d6e6141db689146f4641a
 MISC metadata.xml 459 BLAKE2B a5e6e81e1e8f565a988a9592009adf521bcb1f14ef1b2cadadc7d4209e30894ad42258d7beb313157dca25dfac7abf3fd5ac8faf27a84448c2f846f5f708fcbb SHA512 3bbb3d84c87580a8a0be3383a49f1fcde1b21f06dee17ebb5567ee2996a4c6e8f39fb8bea96f0e5d71bc27834e59e38c904e948252ff328bc03dc1e694de56c4
diff --git a/net-p2p/ncdc/ncdc-1.23.ebuild b/net-p2p/ncdc/ncdc-1.23.ebuild
new file mode 100644
index 000000000000..dea5357e9c22
--- /dev/null
+++ b/net-p2p/ncdc/ncdc-1.23.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="ncurses directconnect client"
+HOMEPAGE="https://dev.yorhel.nl/ncdc"
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
+else
+	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="geoip"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.32:2
+	>=net-libs/gnutls-3:=
+	sys-libs/ncurses:=[unicode(+)]
+	sys-libs/zlib:=
+	geoip? (
+		dev-libs/geoip
+		dev-libs/libmaxminddb
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/makeheaders
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with geoip)
+	)
+
+	if [[ ${PV} == *9999 ]] ; then
+		myeconfargs+=( --enable-git-version )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
diff --git a/net-p2p/ncdc/ncdc-9999.ebuild b/net-p2p/ncdc/ncdc-9999.ebuild
index f6cebc9b3c0a..e001c6590371 100644
--- a/net-p2p/ncdc/ncdc-9999.ebuild
+++ b/net-p2p/ncdc/ncdc-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="ncurses directconnect client"
 HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
 else
@@ -22,7 +22,7 @@ IUSE="geoip"
 RDEPEND="
 	app-arch/bzip2
 	dev-db/sqlite:3
-	dev-libs/glib:2
+	>=dev-libs/glib-2.32:2
 	net-libs/gnutls:=
 	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib:=
@@ -38,16 +38,19 @@ BDEPEND="
 
 src_prepare() {
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
 	local myeconfargs=(
 		$(use_with geoip)
 	)
-	if [[ "${PV}" == *9999 ]] ; then
+
+	if [[ ${PV} == *9999 ]] ; then
 		myeconfargs+=( --enable-git-version )
 	fi
+
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index baccbee2dd16..c356155c3295 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1,4 +1,6 @@
 AUX transmission-remote-gtk-1.4.1-gcc10-fno-common.patch 748 BLAKE2B f22473d0f56a3cfbf207a1fa946d1095873a63582b65593d4758a583d7817b1b8d046af718f079543e2bf82453d7f21da128dba14608416e18f51ca78f65c28d SHA512 d2f762c10fa72b25dfaf0623a880f7694d405f933e3285b845c6f7ea416c745b1ee7bcbd686caf0381f61a547edddd82bdf50ccb415ec0c394059125983aaa45
 DIST transmission-remote-gtk-1.4.1.tar.xz 543620 BLAKE2B dea556138a7f554a6cbe5c3e0d5bdd9057cb61d2d80e2d89beb96b2926218e19ce85759fd079375ba8896e185bbdec74979372a9413dc5c513204f47b93e4304 SHA512 c1a2c26d01bc2557bafae9baa370f713e0412ac8445e12b19e9b3027c1a269745dbb865195d683af397d43a2956f51aad8bdfcaff93e4f07015e33715770de48
-EBUILD transmission-remote-gtk-1.4.1.ebuild 1348 BLAKE2B 3a6bde9ecc4d1d5368bf6c09be79fbacfa28c9329cd6a0605281a3ac4bf40157742a7765576b5530be99a207fb3d279a7956f718261732461878707e9916068d SHA512 38bd6e8b222cd67e985efe497c68351d890983524dd6742c81902c84683fa9c425acf7b78c197a60138b98ae4d62725d71295a0aa529179bdd749d5735b98a44
+DIST transmission-remote-gtk-1.5.1.tar.xz 236804 BLAKE2B b2aeb4641a0ab55d2a212cdb04e8929c8c580e2f20a9a60fce7977404d1f0af64b5fc9ff2f9d7dd7d5744dddc34181d689c8dcab34cc23a0989a7e7f03d84395 SHA512 4488714f483dfbf539e39dc4b742127dc47799b255e7bc0e27c33aea92cea26d229616a484b566f5d85034d841a34546b113fc0428908ada4876840ff25cc824
+EBUILD transmission-remote-gtk-1.4.1.ebuild 1363 BLAKE2B acfe8c443dca6bf76d010be021567794a5a2d9a168bb92a11e6d39908225c51737874c2ddaf4e484f3cbcd706080b949529910dbda73b7d3f15f30ea2c66c471 SHA512 b97e2cf1695b11cec9aee6274af1e507bd9e5d29cd7cfef9257a90fcbcf3fa825fa9dc490a426672c50c2e7c5468a8ae5004cbbeaf72688e0e4fd296aa5536c2
+EBUILD transmission-remote-gtk-1.5.1.ebuild 1050 BLAKE2B 58265efdd4c3e823187d97a29f5be6af406b8a626bdcfa5b2186e1c4e84e40afb089beeac61d57ecfeca7d73e961bef5709f244a30cbcfbec971ea8ccb418a62 SHA512 9ae033019db1d814816c86faf73f2a92593fd59078628b31de1016e5ac273bb66d49bbc0e57a4b391fe876528141c177dcc390c3f52b4b64a6e79a2b1ae5f65c
 MISC metadata.xml 494 BLAKE2B 2e167b40b40278005b63f39916e385a1c42c086add76df4c2e8b9ced1584f2cee4d835a99bdf90ce283c0cac0609dc9cd589a11c8d080f09d979dbc5f54c64e7 SHA512 2607fd8bfcc96c4dc296ef258891cbf6c7b6a7995a1fb8987786d9913eeebe4b8e0080c5682e8ffbb901f90723c53ddfd67746456a29b6baeef53b1e8a5ad5a2
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index 75cb7a97c1a9..ee61ccb864e8 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE="ayatana debug geoip libnotify libproxy rss"
+IUSE="appindicator debug geoip libnotify libproxy rss"
 
 # RESTRICT="test"
 
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/json-glib-0.12.6
 	net-misc/curl
 	>=x11-libs/gtk+-3.16:3
-	ayatana? ( dev-libs/libappindicator:3 )
+	appindicator? ( dev-libs/libappindicator:3 )
 	geoip? ( dev-libs/geoip )
 	libnotify? ( >=x11-libs/libnotify-0.7 )
 	libproxy? ( net-libs/libproxy )
@@ -45,7 +45,7 @@ src_configure() {
 		$(use_with geoip libgeoip) \
 		$(use_with libnotify) \
 		$(use_with libproxy) \
-		$(use_with ayatana libappindicator) \
+		$(use_with appindicator libappindicator) \
 		$(use_with rss libmrss) \
 		APPSTREAM_UTIL="$(type -P true)"
 }
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
new file mode 100644
index 000000000000..8204b107612a
--- /dev/null
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC"
+HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="appindicator debug geoip libproxy rss"
+
+# RESTRICT="test"
+
+# FIXME: bundles rss-glib-0.2.3
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/json-glib-1.2.8
+	net-misc/curl
+	>=x11-libs/gtk+-3.22:3
+	appindicator? ( dev-libs/libappindicator:3 )
+	geoip? ( dev-libs/geoip )
+	libproxy? ( net-libs/libproxy )
+	rss? ( >=net-libs/libmrss-0.18 )
+"
+DEPEND="${RDEPEND}
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature rss mrss)
+		$(meson_feature libproxy)
+		$(meson_feature geoip)
+		$(meson_feature appindicator libappindicator)
+	)
+	meson_src_configure
+}
diff --git a/net-p2p/tremc/Manifest b/net-p2p/tremc/Manifest
index 6c0cccb78444..12058d3b0f3d 100644
--- a/net-p2p/tremc/Manifest
+++ b/net-p2p/tremc/Manifest
@@ -1,3 +1,5 @@
 DIST tremc-0.9.2_p20201101.tar.gz 334602 BLAKE2B 916274775cb51948b3322f0d037d3130e2032ef31acdbbd2b7c42b17c639a82b9dccfe413db4936e9bd580caa7c1ec140091ad09b06058138e8fc0e4882b6c21 SHA512 acae099b2fd24362c02f24b5a6aca85e5b6b0608080a79e0a9a6950a3f61135e271415d0db60d04e39195272ea6e2e494ee85345db454811d6de430c75b5bece
+DIST tremc-0.9.3.tar.gz 334602 BLAKE2B 916274775cb51948b3322f0d037d3130e2032ef31acdbbd2b7c42b17c639a82b9dccfe413db4936e9bd580caa7c1ec140091ad09b06058138e8fc0e4882b6c21 SHA512 acae099b2fd24362c02f24b5a6aca85e5b6b0608080a79e0a9a6950a3f61135e271415d0db60d04e39195272ea6e2e494ee85345db454811d6de430c75b5bece
 EBUILD tremc-0.9.2_p20201101.ebuild 1095 BLAKE2B 41add7b051f40fa68d4891f88ece304309567b1a0a0ce4dfb1613997366f9c104ab7da3c75c08a93e34a58b6d78f20d5bae775032055ae48205a35f4ff953c90 SHA512 e6f0a89e5bfc42b266835a1ff7788927ea69f03023f471cdb8586fc1d55482c99b0d2bc27dc4f5fcd03fc723d2dd8de31bb6300b71113ee7a302f798dc9932bc
+EBUILD tremc-0.9.3.ebuild 1168 BLAKE2B 0adc7066ad0f470d521dda6030b52c608e204a591b21b969a8086cf2792dcd6bdeea9496a91e5554201826b5ec75cb7322304df6ef3bad4c2ed4dd761f895583 SHA512 237d56c5ea57d72d0178d80ccb6a26aacd60937aa31bf6dd224b043b830f8b5dba3f1157610df15cee2be97c3d4b758ca65bd435557522a22960eb53222b128f
 MISC metadata.xml 324 BLAKE2B 1a9314ffb5310792eb521599d96d9ae4e8b48dfb32ecbaa8c0e7eb88c0c286246d6a25ceefe74709cb9f8d383731a7c9a36c60d0920e817cd9db3c17ae03de21 SHA512 85f57f99c57254d742c5122489f27f2467444b1bf02eabba57df455b5d2159caace65f889b2bb8013149758c1dc9dcdcdd94c347cd3ece24ddd4e123146a213a
diff --git a/net-p2p/tremc/tremc-0.9.3.ebuild b/net-p2p/tremc/tremc-0.9.3.ebuild
new file mode 100644
index 000000000000..f08595a9ba3e
--- /dev/null
+++ b/net-p2p/tremc/tremc-0.9.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="ncurses"
+
+inherit bash-completion-r1 optfeature python-single-r1
+
+DESCRIPTION="Ncurses interface for the Transmission BitTorrent client"
+HOMEPAGE="https://github.com/tremc/tremc"
+SRC_URI="https://github.com/tremc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+COMMIT="8b6b29163295e5cf12d9d874e80203c5906619c8"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+# Github tag tarballs include the repo with commit in the dir's name
+# Specify a no-op src_compile so upstream's broken Makefile doesn't get used
+src_compile() {
+	:
+}
+
+src_install() {
+	python_doscript tremc
+	newbashcomp completion/bash/tremc.sh tremc
+	insinto /usr/share/zsh/site-functions
+	doins completion/zsh/_tremc
+	doman tremc.1
+	dodoc NEWS README.md
+}
+
+pkg_postinst() {
+	optfeature "GeoIP support" dev-python/geoip-python
+	optfeature "Extract ipv4 from ipv6 addresses" dev-python/ipy
+	optfeature "Clipboard support" dev-python/pyperclip
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 893aadff7836..1f96eaf56640 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index bdc76c498a5a..f8730d0e951b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -15,10 +15,13 @@ AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f634
 AUX cups-2.4.1-nostrip.patch 411 BLAKE2B 67b7ebe76e3586ef819a0dfee5729781ee6d5ece9ea3ff2e6805ed5bffd7cdaac039e62bbb0c47ef663fae46ae42041e025ada586f978301077124ff0ce85712 SHA512 6e792b90dbba541142f505563d37f5a567ef8469e298e2b373a9ac1900b31ffde3050b995d16fcbbeed792252b933e75c7517419a5907f9ce69e22e9c5656ff0
 AUX cups-2.4.1-resolve-uri.patch 1481 BLAKE2B 6b4b7c8cbbdad3e5c434c55f41de8a18891d393fbf40cc7926600f3cf8f38ac82831ccc94387418504eeb4c6d017bf6f8e377dac9ad3a61f7329c9eb28af8747 SHA512 7d8c4f43fdd8253bc4224416b19b9087f9d924e64372f24e35fbe641fe8187695ed8463de3656d373d5685cce4dd4680f1491f2b328f54c5899667eb161d361e
 AUX cups-2.4.1-user-AR.patch 567 BLAKE2B 06e91a7601ebbe534808b310e80d482b0dc0b3df0d2c738979fc0917a6c497341dbb0c5f12eedc19b58a149546bab26c13324bc4d1916966d9628413a18d065f SHA512 136871e48c19be011e368dc004c39d104405a2f6729b7612c3c6355d6e1bb8dc112909c850cb58bffcbcf1efe0d4b1c3cfa3083bb63dbfc512dc93a2d0379a9e
+AUX cups-2.4.2-no-fortify-override.patch 637 BLAKE2B d5bed1249fa6e55884d0a8cb6a60e850c01fb50ba367d1c22e2363795bf39faa09f71f4d62d5b0f91e24ec728ae97962feac63283d35834b97280d5d7516bfd4 SHA512 f39ece2d8e46c627c79bae65032867fdaa3fec1e03909d354746e666c15d7d5692c64b9f8249eb9610e5d40ed43c3a8f7e0552b1968683f1e31e2ddcfb6f1a19
 AUX cupsd.init.d-r4 577 BLAKE2B 48508b10a13ee73e905b3d061275f5cb12ebdc2175ce46affb2007d4a5d007719a147f490e7c17a3e9a5211b82d9b89be7111921b1c9d991a6fc4c457f63eae0 SHA512 23ec5714764f2bac4105130efe6f79a508a352ecb45ab3f6e08042b156af05065330b2ac85615d0ce792a4dcd8f5230302dba9d1a96fca84c11d8bf2573ccc0e
 DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
 DIST cups-2.4.1-source.tar.gz 8113914 BLAKE2B 690d9d92f9bc84c2bb360699191cd67e1489ffc3ab219376dfc1a8795379950c95bf58c2033a0dbd2918262c5d104e21e31c4585cb35d229b0fac6cf4967bfd7 SHA512 74e83728fcc3baf709176442b26711250fd4d4ede1e81e35b02a5607711067e28cd5a05d5bc3337953f6b2236c5a429b13f3a7f1218a08a2d3c30a8c9b0d96fd
+DIST cups-2.4.2-source.tar.gz 8128785 BLAKE2B 97053feb502d4fdc28810b806000b6c84a6795d5adcec0789e73e5477d5802d46a99381366d16219f627166df088f6decde5c144bd0c38b5745815dc1e426bc5 SHA512 07474643bffe11c79b3226b70d28f1bb803dc19daa10711938cea303feacdcce3945ba8ff0334d94fdd5922ea7d6bf37a28c1ea62cce8ce946c2f90a0faf002f
 EBUILD cups-2.3.3_p2-r3.ebuild 9571 BLAKE2B 5afeb6352867c9069d4446c83e854f790b1e13b6a88a73f1fb72b27e139f2694435ac2db5328d031d91408f31ccbde60e7b29287dc402437e29831199e8ea295 SHA512 0265ec3ab43990be1917cf6e021049cf5fcae7e17a2e968ada26eef5a1e0f5cd9a2e5221781c2800382b943c08376947337e43aca6e6052e62fce28c2d448e38
 EBUILD cups-2.4.1.ebuild 9851 BLAKE2B 180f6df4690f747539c1dec368923b1e9ceca3f8fb5069ef7726f31244423c5bbf93866f88313f9176f098257441b6a64d9326547dd6dd0827175f9e854391b4 SHA512 90b988b4f7ceae8f4f6e86a02ade98553380ab69b43da589d9cdcc1a6d4fab87a3ea1a375c8fc30b0158bd5085606b3cfe69c8b8fe2dd1f539dbcf0e78a33950
-EBUILD cups-9999.ebuild 9310 BLAKE2B 15e638e4f37888832fe3ef01953888fd8a05f6675d648fe4253da2ae82be73924e55a1fe2d35f74f7cf6fb028c163a5a2b70ee9dcbe7cce27c13782c2ca56d8e SHA512 d9ff8fdc45f511da0f19fe5a4a6aefcf9f431fd48b4a5438dcf8d47055ce963214e19e138a0414498fa12437c9a2609755fa17293f73f7aa3a60435b140be0c8
-MISC metadata.xml 401 BLAKE2B 7fd9a08cb38904aab05d630005049400a2473c8fa576ec09dd1028d133f31465c869690d1ac0ae336cdd55565a0b67f75e57da3da1b35ff624d3fa990c38f98e SHA512 7050922826abfaaba7f7da84f6df1900b64fb917f2854bc135641b230b9a79d0c4944541728dc3b2bca7ae045cb92c6793b6146f701e13cdceea7433a52ad25e
+EBUILD cups-2.4.2-r1.ebuild 9441 BLAKE2B 0c3e0d14e8315bc487196ff8ed7f3a8ee79db6ec9943772982af652e0f104b301c0546a69a4d820231df362a5c15d1d00247b2f1321010dd6695adec26c125fb SHA512 1f194f9dde815b4f721fa8ec2181fca69a07e0a6ae0298b16be40148575b2d911aed3ed6af188e66850ccf6097cf1b45ee868bbc0311a9582c410198115f5eff
+EBUILD cups-9999.ebuild 9441 BLAKE2B 0c3e0d14e8315bc487196ff8ed7f3a8ee79db6ec9943772982af652e0f104b301c0546a69a4d820231df362a5c15d1d00247b2f1321010dd6695adec26c125fb SHA512 1f194f9dde815b4f721fa8ec2181fca69a07e0a6ae0298b16be40148575b2d911aed3ed6af188e66850ccf6097cf1b45ee868bbc0311a9582c410198115f5eff
+MISC metadata.xml 527 BLAKE2B 04a32175e666165226eaa97785a6b9e4b779644e352c503a4653870631f28089dddbaaa3db3143f09a1d97c7f57952e4d760d64005eafacb379c23035fe9ad19 SHA512 136c81a99b501ffcedfd71f4425ba556292b79abc0ac819d336d2c845401775955b8cd72e6194f02f4c48d0cd26bc93ee7c94c7438228b49410daca80a159523
diff --git a/net-print/cups/cups-2.4.2-r1.ebuild b/net-print/cups/cups-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..8583dd21407e
--- /dev/null
+++ b/net-print/cups/cups-2.4.2-r1.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_PV="${MY_PV/_p/op}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
+	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
+else
+	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	fi
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
+
+# As of 2.4.2, they don't actually seem to be interactive (they pass some flags
+# by default to input for us), but they fail on some greyscale issue w/ poppler?
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	acct-group/lp
+	acct-group/lpadmin
+	virtual/pkgconfig
+"
+DEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
+	ssl? (
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	)
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	acct-group/lp
+	acct-group/lpadmin
+	selinux? ( sec-policy/selinux-cups )
+"
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.1-nostrip.patch"
+	"${FILESDIR}/${PN}-2.4.1-user-AR.patch"
+	"${FILESDIR}/${PN}-2.4.2-no-fortify-override.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# Recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug #501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug #524338).
+	sed 's#^.SILENT:##g' -i Makedefs.in || die
+
+	AT_M4DIR="config-scripts" eautoreconf
+
+	# Custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	# Explicitly specify compiler wrt bug #524340
+	#
+	# Need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		# Follow Fedora permission setting
+		--with-cupsd-file-perm=0755
+		--with-exe-file-perm=755
+		--with-log-file-perm=0640
+		# Used by Debian, also prevents printers from getting
+		# disabled and users not knowing how to re-enable them
+		--with-error-policy=retry-job
+		# Used in Debian and Fedora
+		--enable-sync-on-close
+		#
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable test unit-tests)
+		# USE="ssl" => gnutls
+		# USE="ssl openssl" => openssl
+		$(use_with ssl tls $(usex openssl openssl gnutls))
+		$(use_with systemd ondemand systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_with zeroconf dnssd avahi)
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	# Handle empty LINGUAS properly, bug #771162
+	if [[ -n "${LINGUAS+x}" ]] ; then
+		myeconfargs+=(
+			--with-languages="${LINGUAS}"
+		)
+	fi
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
+
+	econf "${myeconfargs[@]}"
+
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# Additional path corrections needed for prefix, see bug #597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	# Avoid using /tmp
+	export CUPS_TESTBASE="${T}"/cups-tests
+
+	mkdir "${T}"/cups-tests || die
+
+	# We only build some of CUPS for multilib, so can't run the tests.
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# Move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm "${ED}"/etc/cups/cupsd.conf.default || die
+
+	# Clean out cups init scripts
+	rm -r "${ED}"/etc/{init.d/cups,rc*} || die
+
+	# Install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r4 "${T}"/cupsd || die
+	sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	if use pam ; then
+		rm "${ED}"/etc/pam.d/${PN} || die
+		pamd_mimic_system cups auth account
+	fi
+
+	if use xinetd ; then
+		# Correct path
+		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# It is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# Write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd
+	else
+		# Always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -r "${ED}"/etc/xinetd.d || die
+	fi
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# Create /etc/cups/client.conf, bug #196967 and bug #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# The following file is now provided by cups-filter:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# The following are created by the init script
+	rm -r "${ED}"/var/cache || die
+	rm -r "${ED}"/run || die
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} /var/log/cups /var/spool/cups/tmp
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		elog
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		break
+	done
+
+	optfeature_header "CUPS may need installing the following for certain features to work:"
+	use zeroconf && optfeature "local hostname resolution using a hostname.local naming scheme" sys-auth/nss-mdns
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index bd33925c49a8..8583dd21407e 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
+
 inherit autotools linux-info xdg multilib-minimal optfeature pam toolchain-funcs
 
 MY_PV="${PV/_beta/b}"
@@ -9,15 +10,13 @@ MY_PV="${MY_PV/_rc/rc}"
 MY_PV="${MY_PV/_p/op}"
 MY_P="${PN}-${MY_PV}"
 
-if [[ ${PV} == *9999 ]]; then
+if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-#	EGIT_REPO_URI="https://github.com/apple/cups.git"
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
 	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
 else
-#	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
-	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	fi
 fi
@@ -27,10 +26,11 @@ HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos openssl pam selinux +ssl static-libs systemd test usb X xinetd zeroconf"
 
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
+# As of 2.4.2, they don't actually seem to be interactive (they pass some flags
+# by default to input for us), but they fail on some greyscale issue w/ poppler?
+RESTRICT="!test? ( test ) test"
 
 BDEPEND="
 	acct-group/lp
@@ -50,7 +50,10 @@ DEPEND="
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
 	!pam? ( virtual/libcrypt:= )
-	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	ssl? (
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+		openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	)
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:1 )
 	X? ( x11-misc/xdg-utils )
@@ -67,6 +70,7 @@ PDEPEND=">=net-print/cups-filters-1.0.43"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.4.1-nostrip.patch"
 	"${FILESDIR}/${PN}-2.4.1-user-AR.patch"
+	"${FILESDIR}/${PN}-2.4.2-no-fortify-override.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -82,7 +86,7 @@ pkg_setup() {
 			ewarn "Can't check the linux kernel configuration."
 			ewarn "You might have some incompatible options enabled."
 		else
-			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			# Recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug #501122)
 			if use usb; then
 				if linux_chkconfig_present USB_PRINTER; then
 					elog "Your USB printers will be managed via libusb. In case you run into problems, "
@@ -91,7 +95,6 @@ pkg_setup() {
 					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
 				fi
 			else
-				#here we should warn user that he should enable it so he can print
 				if ! linux_chkconfig_present USB_PRINTER; then
 					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
 					ewarn "support in your kernel."
@@ -111,29 +114,21 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Remove ".SILENT" rule for verbose output (bug 524338).
+	# Remove ".SILENT" rule for verbose output (bug #524338).
 	sed 's#^.SILENT:##g' -i Makedefs.in || die
 
-	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i install-sh || die
-
-	# Do not add -Werror even for live ebuilds
-	sed '/WARNING_OPTIONS/s@-Werror@@' \
-		-i config-scripts/cups-compiler.m4 || die
+	AT_M4DIR="config-scripts" eautoreconf
 
-	AT_M4DIR=config-scripts eaclocal
-	eautoconf
-
-	# custom Makefiles
+	# Custom Makefiles
 	multilib_copy_sources
 }
 
 multilib_src_configure() {
 	export DSOFLAGS="${LDFLAGS}"
 
-	# explicitly specify compiler wrt bug 524340
+	# Explicitly specify compiler wrt bug #524340
 	#
-	# need to override KRB5CONFIG for proper flags
+	# Need to override KRB5CONFIG for proper flags
 	# https://github.com/apple/cups/issues/4423
 	local myeconfargs=(
 		CC="$(tc-getCC)"
@@ -152,6 +147,7 @@ multilib_src_configure() {
 		--enable-sync-on-close
 		#
 		--with-rundir="${EPREFIX}"/run/cups
+		--with-pkgconfpath="${EPREFIX}"/usr/$(get_libdir)/pkgconfig
 		--with-cups-user=lp
 		--with-cups-group=lp
 		--with-docdir="${EPREFIX}"/usr/share/cups/html
@@ -165,7 +161,10 @@ multilib_src_configure() {
 		$(use_enable kerberos gssapi)
 		$(multilib_native_use_enable pam)
 		$(use_enable static-libs static)
-		$(use_with ssl tls gnutls)
+		$(use_enable test unit-tests)
+		# USE="ssl" => gnutls
+		# USE="ssl openssl" => openssl
+		$(use_with ssl tls $(usex openssl openssl gnutls))
 		$(use_with systemd ondemand systemd)
 		$(multilib_native_use_enable usb libusb)
 		$(use_with zeroconf dnssd avahi)
@@ -173,7 +172,7 @@ multilib_src_configure() {
 	)
 
 	# Handle empty LINGUAS properly, bug #771162
-	if [ -n "${LINGUAS+x}" ] ; then
+	if [[ -n "${LINGUAS+x}" ]] ; then
 		myeconfargs+=(
 			--with-languages="${LINGUAS}"
 		)
@@ -185,7 +184,7 @@ multilib_src_configure() {
 		)
 	fi
 
-	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# Install in /usr/libexec always, instead of using /usr/lib/cups, as that
 	# makes more sense when facing multilib support.
 	sed -i -e 's:CUPS_SERVERBIN="$exec_prefix/lib/cups":CUPS_SERVERBIN="$exec_prefix/libexec/cups":g' configure ||die
 
@@ -195,7 +194,7 @@ multilib_src_configure() {
 	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
 	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
 
-	# additional path corrections needed for prefix, see bug 597728
+	# Additional path corrections needed for prefix, see bug #597728
 	sed \
 		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
 		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
@@ -213,6 +212,12 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	# Avoid using /tmp
+	export CUPS_TESTBASE="${T}"/cups-tests
+
+	mkdir "${T}"/cups-tests || die
+
+	# We only build some of CUPS for multilib, so can't run the tests.
 	multilib_is_native_abi && default
 }
 
@@ -228,14 +233,14 @@ multilib_src_install() {
 multilib_src_install_all() {
 	dodoc {CHANGES,CREDITS,README}.md
 
-	# move the default config file to docs
+	# Move the default config file to docs
 	dodoc "${ED}"/etc/cups/cupsd.conf.default
 	rm "${ED}"/etc/cups/cupsd.conf.default || die
 
-	# clean out cups init scripts
+	# Clean out cups init scripts
 	rm -r "${ED}"/etc/{init.d/cups,rc*} || die
 
-	# install our init script
+	# Install our init script
 	local neededservices=(
 		$(usex zeroconf avahi-daemon '')
 		$(usex dbus dbus '')
@@ -251,16 +256,16 @@ multilib_src_install_all() {
 	fi
 
 	if use xinetd ; then
-		# correct path
+		# Correct path
 		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
 			"${ED}"/etc/xinetd.d/cups-lpd || die
-		# it is safer to disable this by default, bug #137130
+		# It is safer to disable this by default, bug #137130
 		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
 			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
-		# write permission for file owner (root), bug #296221
+		# Write permission for file owner (root), bug #296221
 		fperms u+w /etc/xinetd.d/cups-lpd
 	else
-		# always configure with --with-xinetd= and clean up later,
+		# Always configure with --with-xinetd= and clean up later,
 		# bug #525604
 		rm -r "${ED}"/etc/xinetd.d || die
 	fi
@@ -271,13 +276,13 @@ multilib_src_install_all() {
 		rm -r "${ED}"/usr/share/applications || die
 	fi
 
-	# create /etc/cups/client.conf, bug #196967 and #266678
+	# Create /etc/cups/client.conf, bug #196967 and bug #266678
 	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
 
-	# the following file is now provided by cups-filters:
+	# The following file is now provided by cups-filter:
 	rm -r "${ED}"/usr/share/cups/banners || die
 
-	# the following are created by the init script
+	# The following are created by the init script
 	rm -r "${ED}"/var/cache || die
 	rm -r "${ED}"/run || die
 
diff --git a/net-print/cups/files/cups-2.4.2-no-fortify-override.patch b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch
new file mode 100644
index 000000000000..e9153ce2f082
--- /dev/null
+++ b/net-print/cups/files/cups-2.4.2-no-fortify-override.patch
@@ -0,0 +1,18 @@
+Gentoo already sets -D_FORTIFY_SOURCE=2 by default in GCC (patched in), so
+we need to avoid doing this in packages to avoid redefinition errors if
+we try to upgrade to e.g. =3.
+
+So, no effect on users, but important to stop issues w/ F_S=3.
+--- a/config-scripts/cups-compiler.m4
++++ b/config-scripts/cups-compiler.m4
+@@ -106,8 +106,8 @@ AS_IF([test -n "$GCC"], [
+     ], [
+ 	# Otherwise use the Fortify enhancements to catch any unbounded
+ 	# string operations...
+-	CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+-	CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
++	CFLAGS="$CFLAGS"
++	CXXFLAGS="$CXXFLAGS"
+     ])
+ 
+     # Default optimization options...
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index b938d1f561a9..d4081ef99041 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:apple:cups</remote-id>
-    <remote-id type="github">apple/cups</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<use>
+		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> instead of <pkg>net-libs/gnutls</pkg> for TLS support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:apple:cups</remote-id>
+		<remote-id type="github">OpenPrinting/cups</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 6485e576ced0..06666c51ee1c 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST hplip-3.22.2-plugin.run 11487296 BLAKE2B 2c953e85b3ef299066aaf158121f4a3db68b00f2e2df3cb35acc78a54a466e8a3e204592fbfa2128acb87c0f9b258178cd29faf4e93600ee4b10fe81b93f213b SHA512 5efa533863bec3e7e5fc354411216e6e4232c2bbc15a062ff829296e1357c523333df8221a341b10c940022708299a33449020e633a9873205b568959327cb24
+DIST hplip-3.22.4-plugin.run 11487215 BLAKE2B dc9b0977c35bff29c81f3854e7104301c3bd96cf77833a056a09dd2b2465e8f47c53c941ff4d1235f62eae9a3af93fe95129111d7abf5e82032959de1167920e SHA512 be53ad8d2f910d772535775037b912f332122a6aa141fa2f92415dd9a259efca34011939e648fc7a46e8123ee409396b28236947e37539153c55f80c6d7f8cd1
 EBUILD hplip-plugin-3.22.2.ebuild 1484 BLAKE2B 00d10feb206b7c70c6523e5c8757a4a1d4846d20be7d1b34e0d4ceda452d686404abee5a01d76b6cf9ba5510ecdb79e87807a4635c19cdce79ab9a3999e5faec SHA512 e6947d194de5aee27f8253d104ddc0d1ba82d83f54fee6106b4f5937c2d05e26fa78306dee8cfd208c84add673f953bd73462c8e64413ffc32979456eeba9260
+EBUILD hplip-plugin-3.22.4.ebuild 1487 BLAKE2B e80cf0d84b6a8bd542f60eb43a7ba99908913a25d9158c10d3c25e829d47bb74edbb4342bcd57891cfa6293c9fd8c95c186fab6e9afa5cec1b8a6d8bff32608f SHA512 3666cfece271f4e9f04f1b7bb5f34580f42867c070b08c3282cbe80df34a2885640e6b150afc977c3c3498e3b083c4ed96a5995ce46f66eb3d39493196c9e4fd
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.4.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.4.ebuild
new file mode 100644
index 000000000000..54c789992915
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.22.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit unpacker
+
+DESCRIPTION="Proprietary plugins and firmware for HPLIP"
+HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
+SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+S="${WORKDIR}"
+
+LICENSE="hplip-plugin"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="orblite"
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
+
+RDEPEND="
+	~net-print/hplip-${PV}
+	virtual/udev
+	orblite? (
+		media-gfx/sane-backends
+		>=sys-libs/glibc-2.26
+		virtual/libusb:0
+	)
+"
+
+HPLIP_HOME=/usr/share/hplip
+
+# Binary prebuilt package
+QA_PREBUILT="${HPLIP_HOME}/*.so"
+
+src_install() {
+	local hplip_arch plugin
+	case "${ARCH}" in
+		amd64) hplip_arch="x86_64" ;;
+		arm)   hplip_arch="arm32"  ;;
+		arm64) hplip_arch="arm64"  ;;
+		x86)   hplip_arch="x86_32" ;;
+		*)     die "Unsupported architecture." ;;
+	esac
+
+	insinto "${HPLIP_HOME}"/data/firmware
+	doins *.fw.gz
+
+	for plugin in *-${hplip_arch}.so; do
+		local plugin_type=prnt
+		case "${plugin}" in
+			bb_orblite-*)
+				use orblite || continue
+				plugin_type=scan ;;
+			bb_*)
+				plugin_type=scan ;;
+			fax_*)
+				plugin_type=fax ;;
+		esac
+
+		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
+		newexe ${plugin} ${plugin/-${hplip_arch}}
+	done
+
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
+		[plugin]
+		installed = 1
+		eula = 1
+		version = ${PV}
+	_EOF_
+}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index e6f3fcb33e22..3c8f233ca250 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest
index a2b0808d7e81..c454e021e74d 100644
--- a/net-proxy/tinyproxy/Manifest
+++ b/net-proxy/tinyproxy/Manifest
@@ -2,5 +2,7 @@ AUX tinyproxy-1.10.0.initd 855 BLAKE2B 4bd9a260a930958ea449a08edce1f9e8633429a52
 AUX tinyproxy-1.10.0.service 181 BLAKE2B 1e5c14f607d0c54d215a6ffe5656bac288e48ca809aca67b658bb13917869e5203d66730f52670fb9030dd9f6cf249d09f357bbdd143436f6b358377d8f78036 SHA512 7721b986326f82b03d79983be33047fdf4b37b5c63992645a321bf8bd3edea63680a2bf81b2d51fbeab2a5884773a0598dba14f9d597d3db0eea7c7f6b4c79d3
 AUX tinyproxy.tmpfiles.conf 44 BLAKE2B a4e1cf0c8cbd78360175b8260c7d83885dfc9560a78faa6fc111f8611b6dd43c3cbf9fa62e60f8333cac4d0bededbe048c626d8a85d4f3c6c1bfa1ae249c599e SHA512 59d1efcc996e94ae684708ef06263c61f17680a776938a90ce145cf6f0243ed253d402cd886dab7c2c287f47dbc6f02f0e34904433e7b6756cfaa18a1b766b4e
 DIST tinyproxy-1.11.0.tar.xz 177664 BLAKE2B 6ea74ef0fff22fbc6e04b37519151fda771a7d3e789d94cbd2a77a76dce7b16151cfbad83ac665a5c1fdb7334cd4d26ed6d2bc73f70b3858ffe439b16698fd2e SHA512 c0ff2a90da2352e6021efc87d1293b85f2a7588b2a1ab13bd96d906382eda8188b22b01f9acb2d200fd570bf3ec9484fa370cae6834d1f055c0af1631d22ae9d
+DIST tinyproxy-1.11.1.tar.xz 182080 BLAKE2B d39fa1986343af60cdfd07c6a049962e646a72874f7058fd082b9758bae3c7bc1a2288103527e0e1054ab098a3a41fc67eb3e08cd160e2bd4bd030e114326a6f SHA512 2e3435bbfece3797c11ccce222eef494ed92e00dd82bea2c40a54e454b7e03c8abc8e09b244f2da7192209c39047369439d08974b79eebc996fb3095230d0374
 EBUILD tinyproxy-1.11.0-r1.ebuild 1719 BLAKE2B b4987e58b93d3e6bba9005766d882629a505b5c5509c7bbc0b12d823962f4bf19c5fae80cf1e3d074b638e99de76a97a3ab873f6613129f5a828cedc67903069 SHA512 aea1be8126aa552d56fd43716c6aafa3fc4098d80f1d3d99cc34dbf6ab184fdbc99c5610c5d7affde99c85ca26274a03a89a4157a6abad737b719be509c0c954
+EBUILD tinyproxy-1.11.1.ebuild 1722 BLAKE2B a9c60ba219e08a5a634286faf5d8cb198fc32f1df468bffdb938519e3be86d1829c2556d11ffdddc17d7f1cb73c6715c3c5dcb9ec7cb72bc555b24f42d58d808 SHA512 6f62adb2fe0a70773f64b7ee5a68f3c9e3ab838c99eef7ba0992373e45713f4b29d2fa9d1bddbc9a051ccf35871e02d44a590a42893e08d8fd9750df47762e8d
 MISC metadata.xml 563 BLAKE2B 07ee935476f241bbe02aef78b978263fbc0bc0440f191a61d9ca99ffe59a5c3c5d5e84e77e032159dc9aff83a18a453bbdbb18f4a2e14478b6249cae22a7aadb SHA512 c6495e76d667793098e3697854e68acc8fe8cce28cb70ca115fb8f48ea3ccad48b4f31f0c709fd6887435c06a015434596896eb8e8fef1d78a2406b672146c1e
diff --git a/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild
new file mode 100644
index 000000000000..6c987419d72d
--- /dev/null
+++ b/net-proxy/tinyproxy/tinyproxy-1.11.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd tmpfiles
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="A lightweight HTTP/SSL proxy"
+HOMEPAGE="https://github.com/tinyproxy/tinyproxy/"
+SRC_URI="https://github.com/tinyproxy/tinyproxy/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+IUSE="test debug +filter-proxy reverse-proxy transparent-proxy
++upstream-proxy +xtinyproxy-header"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( xtinyproxy-header )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+DEPEND="
+	acct-group/tinyproxy
+	acct-user/tinyproxy
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s|nobody|${PN}|g" \
+		etc/${PN}.conf.in || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable filter-proxy filter) \
+		$(use_enable reverse-proxy reverse) \
+		$(use_enable transparent-proxy transparent) \
+		$(use_enable upstream-proxy upstream) \
+		$(use_enable xtinyproxy-header xtinyproxy) \
+		--localstatedir=/var
+}
+
+src_test() {
+	# The make check target does not run the test suite
+	emake test
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	diropts -m0775 -o ${PN} -g ${PN}
+	keepdir /var/log/${PN}
+
+	newinitd "${FILESDIR}"/${PN}-1.10.0.initd tinyproxy
+	systemd_newunit "${FILESDIR}"/${PN}-1.10.0.service tinyproxy.service
+	dotmpfiles "${FILESDIR}"/${PN}.tmpfiles.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.tmpfiles.conf
+
+	elog "For filtering domains and URLs, enable filter option in the configuration"
+	elog "file and add them to the filter file (one domain or URL per line)."
+}
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index d3290fe484fd..bb67121fdff5 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,6 +1,6 @@
 AUX torsocks-2.3.0-fix-syscall.patch 2687 BLAKE2B 2ef527aa1618af20da02e2b08ddc59d2f66322c63ac0ed6245e52367124b13122ad2d6686790ef0823022bce6de53c13e4127dc97bd37d329266fe1f562c6396 SHA512 4baf4f7d8a218d255fa23004ffb9669de8938caffcb1107ff182bf8fe7c466edc32171635adb4cf69896b7cd9f3afe2ca45efedb37c2afc188568925ae9a07d6
-DIST torsocks-2.2.0.tar.gz 115269 BLAKE2B e6e376dbe9b248bcb51fb0c3c16346f4888310abd6e84942acca69f67ae15afe5dfeba9a6b3a8d1fa562f87548450af93cea3bea4d899980ca6acb651658cfaa SHA512 903d11d58ece76eaf75ff8fc11a27e4a29f94be530f2d77d1a6f0982d556a4b9c78677a43eed88f2451054d0e985672900ecf73b360fa09e80195c3b9006622b
 DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114
-EBUILD torsocks-2.2.0.ebuild 1010 BLAKE2B 3a9fe259df34618bd7156b544051e09c13c957736803d78524bd9319328eebc408c663c732322f366dae443aa06386978d5f74e1b18e3ad3b05e96ab6d589a2d SHA512 bcb08ee5636cc37573f456c22af6e0a1b56ade236263e56a8392d2f267bf64819e80343088e8483a9353978d8d128a529a934bfdb30aba4e3caf11a1fcc01a79
+DIST torsocks-2.4.0.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e
 EBUILD torsocks-2.3.0.ebuild 1026 BLAKE2B b7ec706ca0d001952893f21983f26fcf7dae8a7e694b9966dfafde1f11038dc6169a47443d36c1b5190117976ba7992c2cf10f49f9ade06d081783257f043a22 SHA512 1721265f13357ada138dd0a6768754e0ece133ebbe952bc8b8144461d2bf0f03cbb03252bb53a5153640bfa06e2ea038254e34f3c2529550ccacb1a3530688da
+EBUILD torsocks-2.4.0.ebuild 1001 BLAKE2B 24ea27dc25a26ed098ca6de11a3f7cce1d05e476cb0e6d40368afb79146dc689a02c1e4c1eea62f5b41fb4ecc02d1e5ad2fb861e5ee22a87dcd0c72dd9a6de81 SHA512 ff031df06c5bd558752171535e06ef806202de643599b90ee451fbc8caaa2d01efc203332ada2458eb461b7425dadc00d5e81ec922de3c9b754b61add96c369a
 MISC metadata.xml 387 BLAKE2B ae2839753c5bcf74c79d3931d8a0d7525475c89646ebf050f87744ae85915c740dc05cb695942ae6d042abe68099802581ef1730b9b0cc4d62277d9d0da17339 SHA512 8e71f9eeb801270df3f8e9855f2158eaa460bf02ff6ec4cf13cca9daaa7bc8e9febc2d410d6b9f33529831c713888dbb94b121bad5721efe324572d817097764
diff --git a/net-proxy/torsocks/torsocks-2.2.0.ebuild b/net-proxy/torsocks/torsocks-2.4.0.ebuild
similarity index 67%
rename from net-proxy/torsocks/torsocks-2.2.0.ebuild
rename to net-proxy/torsocks/torsocks-2.4.0.ebuild
index e6454f696b72..4b2ee2aea47a 100644
--- a/net-proxy/torsocks/torsocks-2.2.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.4.0.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools versionator
+inherit autotools
 
-MY_PV="$(replace_version_separator 3 -)"
-MY_PF="${PN}-${MY_PV}"
-S=${WORKDIR}/${MY_PF}
+UPSTREAM_PF="${PN}-v${PV}"
+S=${WORKDIR}/${UPSTREAM_PF}
 
 DESCRIPTION="Use most socks-friendly applications with Tor"
-HOMEPAGE="https://github.com/dgoulet/torsocks"
-SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
+HOMEPAGE="https://gitlab.torproject.org/tpo/core/torsocks"
+SRC_URI="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v${PV}/${UPSTREAM_PF}.tar.gz -> ${PF}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static-libs"
 
 # We do not depend on tor which might be running on a different box
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 9d4ef3b33308..f5ca27939122 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/frp/Manifest b/net-vpn/frp/Manifest
index d832bd271adf..6f0d0a17d803 100644
--- a/net-vpn/frp/Manifest
+++ b/net-vpn/frp/Manifest
@@ -1,4 +1,10 @@
+AUX frpc.service 283 BLAKE2B 9ed07bc1296c8bc2b24df3787e0bc5f6d955ba4ceebc84b4e10a89c0ba9779e42cb76318c6a05401f009dde883ed8a8a8b81df40a94ad9f56f0e896ba3826a36 SHA512 28ba0fb299b48109340ef0adc2107285c41f69426311128fb14d2074d04ea9dd0d44a3927d0928ed371d4b3d45150690351891a2783c62ca9d3d993413a3a9d4
+AUX frpc_at_.service 279 BLAKE2B 6285f0ff4c91696cc662426d47d61b52bf3e9374a48463de411b4eb89106b3b614c88426a1f4cdc6d0a5c4dec3e33baf80d1b3c08881a9d410874330e5efb997 SHA512 97602e6d0e1390cf3e6a23e74500f93661251de3525c620085e82fba5d765e3a782bf01b46924080ab052e29557dae1e0edd3b426cd990f0ed9501f9da8c8831
+AUX frps.service 230 BLAKE2B 7bc291cf644898a0fe4ffd8761e9474a598dd9e9a39f5afc52d8319917b62ac7e75c962c1038c3d132bb19d78f77bb40abf515e5de6ce13563ac36f41dab2a0b SHA512 58f97b93cf5b15976ed6600cdd0d32fd4c0203c4ad718d010c205d81f25a00608a0082721330629beb251e157733b388b09d3dc5d1e104e5bc6fa95972130794
+AUX frps_at_.service 228 BLAKE2B e6464ef7fd71bf87f82101dd80b6633708d5d4b336515e0aace4f8a5107c2ce1b1930ffa3586da622163d1477246828eb7ec76b3f631da9f608e57dc414b880a SHA512 8a1d94cc14e133290b0ac20b0c1cb532fbf41136f1f1cba3b4dafb971bdaa63cbec8fadf51e94adf7730b8952072457a8567996eca3d904911652535e29586f4
 DIST frp-0.42.0-deps.tar.xz 40716624 BLAKE2B 60f8f1486c0c83627954f45d55fff6e42564549950557ffdf0bed6f4ee752670547a6968ec19bd7ce04ebd259480d9f665d6b93fc3550e0830fbc9e5bee55f80 SHA512 ddab5192b9399dab54b521fa35c38c6e6cf293737b8677d384f3d991255aa49ed6c6ccb3e4ff686f4946b30e7d84499c4d5564e327ef19aa3fdf465d85b15a49
 DIST frp-0.42.0.tar.gz 1280863 BLAKE2B 5377aeb7ef83ace3a36772bf56ab671a91688da6d6b54ce23833221cc7cadee1107a3a5d1ad8a615bb7b4e6cc6eca214888449481ad18584ca03f1b0bc484be2 SHA512 b61786a1023a09d9f854e09c406ac241c4a8684fb903511b70adc7527c44d80df92b2d3493fe49e9e04d19dbd994b8fe866285862c88ff89f090860c3bda1987
+DIST frp-0.43.0.tar.gz 1282855 BLAKE2B d2e60e89de8823ae129f91aa2cf50fe5101bcc3c42d63fde48febf89cb2511e5ecabaf799803cf6ba0042b523ef1a3de19fb7d027a34074df0ccb40ba8393b86 SHA512 e6ccbf98d9d8fb714f37784ca582684b9f27994cf3f74b7081043285394243a8e9114b65f0918b64207a99064422312d700d01adaed085175314ad0ae238eb8f
 EBUILD frp-0.42.0.ebuild 867 BLAKE2B 5cf05d20c378625fdba349796b2a84ade9c58fc180b7cf94f9710f00843471b7a9486db0fb48063e46fce7f661985a0a1f4176a76fd4c63a4a8dde512b1d621b SHA512 e61f2e1721b0afbcb1777f26559ba426b6d7330d359a20db09c68e3d393ea808bdc689132cd8b71e9b9e31aa6885a10388cf906deae433e7423ca00da2eda7d2
+EBUILD frp-0.43.0.ebuild 1013 BLAKE2B e44c3ec402f582c4a17132e45379ec5be8e87b6574e16575be82e26e452078472985d1e0f4a4b34b7cd7f685c3d469cb6db68e6f4ce70e204a3c4d197cff27a0 SHA512 50182b1948739fe3fe16f0fd9e6573340d1e6d51bbbcb5d98998f8fa584d2498b2d8628453c529e025a4e4497714be4906b13c58cc04b848741893d0e8e96ca9
 MISC metadata.xml 322 BLAKE2B 8438877d202ce024eb32c6ba8196e1d6bf14b2e29179be7a0c92fb521f110b2501f29f8961752b5bfe07e2c5ddbaae6f1ea087713259c26c3255e985003d56a5 SHA512 3204b6e7ff9565b4677ffa681e88c440e12fea53936d31cd6617f6e86180f92729e5f28f7b81419b131150a89fec364a073249047cf1a36066199b76e5c174ab
diff --git a/net-vpn/frp/files/frpc.service b/net-vpn/frp/files/frpc.service
new file mode 100644
index 000000000000..37a6a9bccbac
--- /dev/null
+++ b/net-vpn/frp/files/frpc.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Frp Client Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/frpc -c /etc/frp/frpc.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/frpc.ini
+LimitNOFILE=1048576
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/frp/files/frpc_at_.service b/net-vpn/frp/files/frpc_at_.service
new file mode 100644
index 000000000000..5914ff6ae97e
--- /dev/null
+++ b/net-vpn/frp/files/frpc_at_.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Frp Client Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/frpc -c /etc/frp/%i.ini
+ExecReload=/usr/bin/frpc reload -c /etc/frp/%i.ini
+LimitNOFILE=1048576
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/frp/files/frps.service b/net-vpn/frp/files/frps.service
new file mode 100644
index 000000000000..c00f2dc53c64
--- /dev/null
+++ b/net-vpn/frp/files/frps.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Frp Server Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/frps -c /etc/frp/frps.ini
+LimitNOFILE=1048576
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/frp/files/frps_at_.service b/net-vpn/frp/files/frps_at_.service
new file mode 100644
index 000000000000..2942e0ba7a69
--- /dev/null
+++ b/net-vpn/frp/files/frps_at_.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Frp Server Service
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/frps -c /etc/frp/%i.ini
+LimitNOFILE=1048576
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-vpn/frp/frp-0.43.0.ebuild b/net-vpn/frp/frp-0.43.0.ebuild
new file mode 100644
index 000000000000..a9d8f761c7f8
--- /dev/null
+++ b/net-vpn/frp/frp-0.43.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="A reverse proxy that exposes a server behind a NAT or firewall to the internet"
+HOMEPAGE="https://github.com/fatedier/frp"
+SRC_URI="https://github.com/fatedier/frp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~zmedico/dist/frp-0.42.0-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE=""
+
+src_prepare() {
+	# patch LDFLAGS to preserve symbol table #792408
+	sed -e "s|^\\(LDFLAGS :=\\) -s \\(.*\\)|\1 \2|" -i Makefile || die
+	default
+}
+
+src_compile() {
+	emake all
+}
+
+src_install() {
+	local x
+	dobin bin/{frpc,frps}
+	dodoc README*.md
+	systemd_dounit "${FILESDIR}"/frp{c,s}.service
+	systemd_newunit "${FILESDIR}"/frpc_at_.service frpc@.service
+	systemd_newunit "${FILESDIR}"/frps_at_.service frps@.service
+	insinto /etc/frp
+	for x in conf/*.ini; do mv "${x}"{,.example}; done
+	doins conf/*.example
+}
diff --git a/net-vpn/networkmanager-openconnect/Manifest b/net-vpn/networkmanager-openconnect/Manifest
index 09c52e201c67..bb321eb285cc 100644
--- a/net-vpn/networkmanager-openconnect/Manifest
+++ b/net-vpn/networkmanager-openconnect/Manifest
@@ -2,5 +2,5 @@ DIST NetworkManager-openconnect-1.2.6.tar.xz 713464 BLAKE2B 7837d2e825b8e962a960
 DIST NetworkManager-openconnect-1.2.8.tar.xz 857808 BLAKE2B b9dd1f75eb34b3149b1d8520fa34caec9547c581affd8065116376f5ee9b0332dc8791af63a88b918445b17b9fd5655b5c154a32c150da62a015ae94221c4634 SHA512 5209fb15ce22511f9b9ccde5e19c86136c3236490c4793afcc2d4081ad87dc4c5fde7f6335db1f50cbbb674b1afc7c42a8c89a6d046ba3945691b2dfb3691d38
 EBUILD networkmanager-openconnect-1.2.6-r1.ebuild 955 BLAKE2B 82f2db460538780d49cb2c2b74952e57d5e8278f826bc1d68f97ecff8c4ce2e7d1178e00349ffb52bf3f8d8060ffe0a590e04353256b2872edd59a5672b0f20c SHA512 eaec4389ac3b33bef9ff0fce60a3a122ff26bf8b454ae8b4a4e87e22a0d1b7b2881e9113dec7c53f045f7f62cdebf0c78cb4ca8f86d57cb4a1f0a51cc3af8450
 EBUILD networkmanager-openconnect-1.2.6-r2.ebuild 1031 BLAKE2B a0ee551e7abccd027c15e7a530dcfba1119e6e69238a38bc4fb10e6182fb258a67b3b50f62ce510fe8ddaa4766912f769c5537b71150fa286452ffde92a92d70 SHA512 c8cdf147fe4bbc5762b6d7f7e03dd95f976749ba79fe63679075dfc7e43e96cccabcbfb3ce6f25d4dbc276fe262695ec40043c602df7825b7f26587a321e81c3
-EBUILD networkmanager-openconnect-1.2.8.ebuild 1167 BLAKE2B 727f2c89832d83149975df4deab831a3e3bf25304b1f3ad771e7d85ceead8ff0d00a1a0c1f8d785d673ea4c61e2dd30a8892e83b48566bcff55afd8cdee7c18a SHA512 544973fe428188f3874fde78e129e5bee6a157dca56895fb37a612e128bb5f8e0ebcfc3e3e8dde72d5899a71b33f7e5fd39ec1a4b4ca095d8f2fcc3f30ffa329
+EBUILD networkmanager-openconnect-1.2.8.ebuild 1164 BLAKE2B 610f95b87fd2d2a232c2fef564ffebf34529b8bf55bae06a29d537d3ca7f4086c12505263ddd2f877646351dadc17324e7e6806917a2c50275b9bd1af9eaf6a0 SHA512 e96973b3c7992b8fffbd07e42dc744c265cb1fe20ada38037209690bac74e7848bbf1c485431d1cc1fae5bd1ceac55fada31058141984d41f8498d10e909b79c
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild
index 3ce7b7a9443e..9d7f4bac2ba7 100644
--- a/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild
+++ b/net-vpn/networkmanager-openconnect/networkmanager-openconnect-1.2.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager https://gitlab.gnome.or
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="gtk"
 
 DEPEND="
diff --git a/net-vpn/networkmanager-openvpn/Manifest b/net-vpn/networkmanager-openvpn/Manifest
index d6a984431916..51b9d261e86d 100644
--- a/net-vpn/networkmanager-openvpn/Manifest
+++ b/net-vpn/networkmanager-openvpn/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-openvpn-1.8.16.tar.xz 613848 BLAKE2B 17d01a83181eef42b30181bfc54c45dbedf6275c0112d5d24b5873e82cb41727d1ea79486b690f62229a59559e568d7d9186bd85c743b0f5b118445a35d6b595 SHA512 970b8a5aa6cbe29bab8c079657921f836d8b12234eaf378e6ead9ededee80b1ee97f315ef1037de49699e3cf9498cc667b60812892b857fbce2782a774d8caaf
 DIST NetworkManager-openvpn-1.8.18.tar.xz 592488 BLAKE2B 01880d834b8eee62d66a81652cc3a6904afc0ad926193b9f346298bfc66fb05922d49a19bfa2c788f76026df1a052e2c0727021ded22ba63545ab669a9250296 SHA512 4cdbd6e6fc6ae1849b45e18bbad29748ee7a538c753901f871de350f08d861acb24770ec74dfb288136b0307b36e6ca784f51f982ade26babaa60e4a1e2f31fd
 EBUILD networkmanager-openvpn-1.8.16.ebuild 1292 BLAKE2B bed7b0bf5eeb5c6e42f62f978e7d9c0295972a2cb6604141eebc251a353b4614ff40c11d02efe7a292e1a0d5c142e0da93cff90ba60628f30585471de17a3f77 SHA512 8f55eae1a66308fcdb79df773d56cf5a78951c76da4289fd8635992b8f4706d91367cbc6a88bc8389ae47e1619e440ccaf4502e9a70268a983b7258c9e8afc6b
-EBUILD networkmanager-openvpn-1.8.18.ebuild 1115 BLAKE2B 82f5e8a88570c96bd1f5c9bd7136d3195c750193897359aa9a101c9d87c714d8cbe507b5112faac66c6e118d7d1d06c45da6aab251421c9bcb9e7041a05764ca SHA512 488c0f98a3a6c59c96900e540566c2c2c4990b4ce29dc023ed7bf260b9ea484e13c1eef225ec957169f87933fc7df86a37c2bcf42708f1ee830659ce6fe6beaa
+EBUILD networkmanager-openvpn-1.8.18.ebuild 1113 BLAKE2B 7e7a35d8810107d138394a61f47b9d596670bd47b6f3a1b10d93b0210aae89f9152120c583d4a164ce510ae09105c28c0c62c57e8e139963f01851ae46e43818 SHA512 c9f4b0e5db24f0e9ca997e8d7e90e22d11219341104f23962bf45c42cc6afd7457232578fd4fbf8e09bf33b96219d163ab09dc1deeda02c443372fd19a5a47e2
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
index 1c3abcf71f1b..a50a42de9c7d 100644
--- a/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
+++ b/net-vpn/networkmanager-openvpn/networkmanager-openvpn-1.8.18.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/NetworkManager-openvpn https://gitlab.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-vpn/networkmanager-pptp/Manifest b/net-vpn/networkmanager-pptp/Manifest
index 998f645ace66..c9bdf76c1cbe 100644
--- a/net-vpn/networkmanager-pptp/Manifest
+++ b/net-vpn/networkmanager-pptp/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-pptp-1.2.10.tar.xz 400760 BLAKE2B 47fe1da3f173f91a7b4b0993e59feb20db10707c119e4270b51730b9e171431025d428f5dd76db66eee0df76f4509d2cd3b44d69af3c8b89a4d07e02ef028410 SHA512 712f6f79642d82b729eaf6a6d03ea62c0c09e0b151af01f02dfca1dfa142aadefd84ab16bb04424e85698ed69f1674520a50620dbf9e49f52e67822b476db9a3
 DIST NetworkManager-pptp-1.2.8.tar.xz 401540 BLAKE2B 64b3fe344a39eb64b462bda9204fb80b95a6cb54988efef9dbd1a5a6b04b3577edee97afabef410488868736d751846bdd98f3965a96806790527434c8207ec8 SHA512 ff1bee257d6aa6750c2fbd302edc3022780e9182fde1d79d4b37246daf01b0a9e5115dd64ec70a4b128e273eff6f9bc22af87fe2b25618008be6f452bbcd41a7
-EBUILD networkmanager-pptp-1.2.10.ebuild 1332 BLAKE2B f3144aafefbeefd2fbcf21928bcfea7b00007ec2e78d9c5588d50373b1ca7ae8ee8f03fc6042ae85d15aeb706fe82f229332e29aff5959d3b775393cea497c7f SHA512 0ff3245adfc6622c807b7efa99a18bb2e78c465fbbd6d2577706a8969af4b5428813c43441547d7a12b8d963875184b95c7267120425308448e4d3be221048d2
+EBUILD networkmanager-pptp-1.2.10.ebuild 1330 BLAKE2B f38770f7a40310fb4531e8d2d0b0782ad68454c6a96eb4202c2569af5ab9bc919437a87f4c40b0fd2e3bc5e3ef1064fd28610787e6b34b05e7103f4d928240d1 SHA512 5ae4c1f22a2a9340751dfafc32249ced96b6c3f305fe59e8a2ff534348c27bb13f465f9bb296d684f865f47b96c9f9a7219057bcb7eda33fe409f562bf23f54d
 EBUILD networkmanager-pptp-1.2.8-r2.ebuild 1278 BLAKE2B 6719b10c3226e823cfef615119d30311eb9206e7be7d59eb3be2b56fc35a03a15bcaddb1d0b6a3d91877f5a14d56d7c51c532ec6dbe035a971010bfe3694ac71 SHA512 e33dfe7f0131379699064ca796bc0da09c5287bffe6e6a3cb469866ec82aa6c0a51081ad679580dc5d65ff20aa645918fb92dfedc0d2e413ec44aeff4c9e08d3
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild
index acec84623b34..0ca0e5404f62 100644
--- a/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild
+++ b/net-vpn/networkmanager-pptp/networkmanager-pptp-1.2.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/VPN"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-vpn/networkmanager-vpnc/Manifest b/net-vpn/networkmanager-vpnc/Manifest
index 809bd2de18d4..1b550d2c2f1f 100644
--- a/net-vpn/networkmanager-vpnc/Manifest
+++ b/net-vpn/networkmanager-vpnc/Manifest
@@ -1,5 +1,5 @@
 DIST NetworkManager-vpnc-1.2.6.tar.xz 417412 BLAKE2B 00072e2f5449687a55ff4dc0382c4ef2bb2042f9b2a4437d1d6790084ff1b88210e45909808048498f315d59ed5408630ae15d09a1d22e4acbf840554e452546 SHA512 4f8adf58d73cef74a950d822c6f17cd813a1e74fcd3c0391f847541c279e448a6353b83984d593fe5e11138a37b7f1c21b9a24a6843c1d35e4cb68bc29bc3eb1
 DIST NetworkManager-vpnc-1.2.8.tar.xz 428980 BLAKE2B 637bcd1c9bcc443056629c86c3bce50065a209dee4f20a7cf40d15d1ffd622dac5c9aea664d0903d32c0db1503e6976fc65461d821920f531aefb2f141f95bee SHA512 04ed5d64aad5168b0a3585d62742ff3ed3d084ad2ade7016506cc42e91db598aa3199b40c9b1787c77eca59780784960e1c629e900536267bfed6d878807b1fe
 EBUILD networkmanager-vpnc-1.2.6-r2.ebuild 1110 BLAKE2B 2eca31a7e7539ca8a000c3c2a256c23d106c66d8d68376839c48a7a632c423bcd1c9063910c76c384c811a75328adfccd26f5fb8f32dfb4aa381076767a750a7 SHA512 a655427ecdec2dd22965368e9ff5a1c471c193b713d9129794bda3caabaf723f894b596536fd21d49fea84d2ca7c21d8e74ab3b6fc1b18fb500ef7306e1dc2dc
-EBUILD networkmanager-vpnc-1.2.8.ebuild 890 BLAKE2B f16667e7393fa3b9433a108efb2c3492556694944e3768ca04b56f85d679cb51d8d372237fd1ff0c3648e4a252567286ece3c8c1362dac6d7db1b26834190aab SHA512 6a93e6fab454d03270dae2bfb37a72451808c959019720c0d647456ba206ff68e7b34c2449190b17cccfff9a215dc2e544925f065486faf30e374919fb005436
+EBUILD networkmanager-vpnc-1.2.8.ebuild 888 BLAKE2B f6e50249be97afc2c458e637ce6425ea28990d98469b7ccf013c23022d4d9405436221fdee88024be808308e8c5cd88a3386d873fefdf1fa43e48fd3ab6a68a6 SHA512 3521800eb42791b0b411e911676d5d206d2150f4b331251a891722f832f147f566475b63c0cd0b0e119b49747522729156858351d10e11af36beb95defb9f16a
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
index d22f6de95722..2eb86be217e1 100644
--- a/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
+++ b/net-vpn/networkmanager-vpnc/networkmanager-vpnc-1.2.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index a26f4967f725..1f8cc7029283 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gnome-bluetooth/Manifest b/net-wireless/gnome-bluetooth/Manifest
index c7958ce6bac3..7fbd72de37e3 100644
--- a/net-wireless/gnome-bluetooth/Manifest
+++ b/net-wireless/gnome-bluetooth/Manifest
@@ -3,5 +3,5 @@ AUX gnome-bluetooth-3.34.5-meson-0.61-build.patch 549 BLAKE2B 85812555ab5cc25ae3
 DIST gnome-bluetooth-3.34.5.tar.xz 353936 BLAKE2B 40300752830f71d436591e22a64a282745d8419ee46de534f76c4871a86a4c8f7b2203e3ddc4ca08d26348b97bf4a68315802ffa09c69265c55001e4806c7f1e SHA512 48431b3d19083705a6623442c5cd2d6c14962cdf30fc599ba47dceb6612b80142af77e1b6df142b530cb1015638081a06de38a3034177e0d05a354c40f19d9e5
 DIST gnome-bluetooth-42.0.tar.xz 302440 BLAKE2B f7e02efe04b1dddee365b9c316368d92428099d6d1191d9c785018bc4bebc19942e7216bd7e6e824cd132a53b6750b1f41393d270e99718312c96da7f6a4ad5b SHA512 769bd9300fa1d830240e84257230425fe7f2e871cbd6c8fa6416514487a26326601a21c16075a66cf886850bab17f5c8e2235463f3695ea194c9230d6e50337c
 EBUILD gnome-bluetooth-3.34.5.ebuild 1839 BLAKE2B 1c1b073899d5b0e4552a2209b4bdd7f7150a692982705e0e6a7f212f4c32beb4bdc379ae84f0e567e67bf19057098ff9f2b48d901f3a57e3265249eb877647d4 SHA512 2c164a83a36f01c31d1afffb7fb4575fd35fc2fcc739b170165d6173db08af4f9ab12be9dbfe37cdcf5f03d982bc2ab255979811856404b6de6ac555171bfdf7
-EBUILD gnome-bluetooth-42.0-r2.ebuild 1602 BLAKE2B f39841ad14ab1367dd1b934109a68e76cbfb78e64a53bfbf49b562fc983d119bc6d71c71ca2c617d8080aec32d7ca96d18a1afa6f6b3bfe9ba851d260592cf75 SHA512 58a5fa6460581c00790ddcbc00d3205e1fe03af2ffbe4efa6c290ee3a6573ef5d0b31c20340793b2704e723da2b6664212bcbf129139acf3781ace20acb3dcd5
+EBUILD gnome-bluetooth-42.0-r2.ebuild 1599 BLAKE2B d6cd5b2b3c22952556c3162585be6cc3dcdd21271349144e1e17ee2be74fdbc757322aefb23eb33d535a384eac11d1f19be1e16ba60fec028d6c192d8a3fb614 SHA512 4109becf8b787938de229cd87cd7138a1bbd5c251c94e3d84c3c56456b003cac03fd869cacdf7fd017dd3a0edacec1f912df83cb25e2596b44d564daafa79486
 MISC metadata.xml 373 BLAKE2B 06ad2a850886ca86649105c60fc64b5e6eb56250669a4eaa50524b500c59a39db80db85cfb7a1be7386f97e60cb758848be389b2eb3cb0a8a4cf42a95eb36c81 SHA512 976a99db6d5b42b1b2a22c59a05f44f9e5a3fee093082778e67fad2fb910c49bc7783b81bb81a6b678457ad8c1f4c3b954a906ade7913057c00def44ca4b0d13
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
index 553891df97b2..16063fda9f67 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-42.0-r2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="3/13" # subslot = libgnome-bluetooth-3 soname version
 IUSE="gtk-doc +introspection sendto test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 7e5fcc34e6ee..35c8d9beb90e 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -6,6 +6,8 @@ AUX unifi.initd-r2 477 BLAKE2B 11dc44ebc7c9d9a670b6aecfd3a82265df60f21057ae459fa
 AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60badef834d6f9ec250612ea5b32724c9df28c735e22183180c9c646729e375d3e38f6a26371661af93b SHA512 cafa67126e7416c736e1ab59e8b31cd2f9ce3f8933b84985f4ba983898b664bb892255855c2fc6cbdb4519732f63e58207209d7701f908d48828dfdd399f1550
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.1.65.zip 202088813 BLAKE2B 0d643cf44711e3bc793461aa9eee51afcfacb576dcfacab978aa2483d90b0e877d3b87ad78a9784ccabbe90c09123209f367d6347338c3a30bd13d282d1dce3b SHA512 e3ed3ccbd6e1b79a11c12b9597ed71aabcb9dc3fe021a2bc2237875f9f313350602ed210a95aa531e8e766305bf88cd201a20b010127d33e9dc2bc2335656983
+DIST unifi-7.1.66.zip 202065717 BLAKE2B afab055746e961b648405519f3ebd339e103e212e552843f453923237408a5e19f4d7041576eb0eb7ffa6fbdbd929975e54984f70bb037bca8c5ea4229c34677 SHA512 3e3cef3a2bde99f6172ae17499d2ce2ca69143ebaefc22d91129f2fb61a44d620485008763de3775a125dfb1244891e704b4b265bf7db36491700c0b5b47ba70
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
 EBUILD unifi-7.1.65.ebuild 2769 BLAKE2B c500ae22a53f9cf048fac1dc9b12ee5395ec4a69ac7bc21fb734f978b02bda0fbe565620b0c8365eaa95599710cdb9075be1d527e5ccbe52e6d923ada778d3f5 SHA512 0b2c290a87d2933399349e59c8ba9205b60e02c5441150f6bb39cbda6b5ef0cdfc1e8ef3aa3c12e622200827a5e9a6a6385456c0304ae7176dfbd244ded0e62b
+EBUILD unifi-7.1.66.ebuild 2770 BLAKE2B 83fa89bbaa6b70e9d233054a57059787d8ac84a3f5ddfffd1eeba57203314db21c2c54995b05c1a5169b1fde90f57df638b5197012f9aa2815b5e3651b3a3ff4 SHA512 fc077e06e90f905a02bed1bfc7d8ca8eef6cb19be105af4964f24ab6f330461cb68924137de8a19b6e89234df629710cc45806c549a59949fad3c03141808e5b
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.1.66.ebuild b/net-wireless/unifi/unifi-7.1.66.ebuild
new file mode 100644
index 000000000000..e0e060ce787b
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.1.66.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+RC_SUFFIX="-c70daa41cf"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f28da748ff65..9deb9d46edb9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/x32/package.use b/profiles/arch/amd64/x32/package.use
new file mode 100644
index 000000000000..1383f0ef9805
--- /dev/null
+++ b/profiles/arch/amd64/x32/package.use
@@ -0,0 +1,7 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Mike Gilbert <floppym@gentoo.org> (2022-05-30)
+# Provide sensible default for EFI.
+sys-boot/gnu-efi abi_x86_64
+sys-boot/syslinux abi_x86_64
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 9329affc5dc8..f4e2ecac1ba4 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -30,7 +30,6 @@ gimp
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not yet stable.
 appindicator
-ayatana
 
 # Andrey Grozin <grozin@gentoo.org> (2014-05-16)
 # No stable gcl
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index f652ff6f5267..d32c7c4ee25c 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -53,7 +53,6 @@ cpu_flags_arm_neon
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libindicate).
 appindicator
-ayatana
 
 # Michał Górny <mgorny@gentoo.org> (2018-07-09)
 # No OpenCL provider is available on arm64.
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 98774ff4b52d..e561ee2f467c 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -40,7 +40,6 @@ vpx
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libappindicator).
 appindicator
-ayatana
 
 # Matt Turner <mattst88@gentoo.org> (2018-05-26)
 # Unmask systemd since it is keyworded here.
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 3bb8098c052e..a3f9822da813 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -41,7 +41,6 @@ gnome-online-accounts
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libindicate).
 appindicator
-ayatana
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2017-06-17)
 # There is no luajit support on ia64. Bug #554376
diff --git a/profiles/arch/loong/package.unmask b/profiles/arch/loong/package.unmask
new file mode 100644
index 000000000000..d649daa66178
--- /dev/null
+++ b/profiles/arch/loong/package.unmask
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# WANG Xuerui <xen0n@gentoo.org> (2022-05-28)
+# Confirmed working on real hardware, so unmask for wider testing.
+# Remove once the global masks are removed.
+=dev-lang/perl-5.36*
+~virtual/perl-Archive-Tar-2.400.0
+~virtual/perl-Attribute-Handlers-1.20.0
+~virtual/perl-bignum-0.650.0
+~virtual/perl-Compress-Raw-Zlib-2.105.0
+~virtual/perl-CPAN-2.330.0
+~virtual/perl-Data-Dumper-2.184.0
+~virtual/perl-DB_File-1.857.0
+~virtual/perl-Devel-PPPort-3.680.0
+~virtual/perl-Digest-1.200.0
+~virtual/perl-Encode-3.170.0
+~virtual/perl-Exporter-5.770.0
+~virtual/perl-ExtUtils-MakeMaker-7.640.0
+~virtual/perl-ExtUtils-ParseXS-3.450.0
+~virtual/perl-File-Spec-3.840.0
+~virtual/perl-HTTP-Tiny-0.80.0
+~virtual/perl-if-0.61.0
+~virtual/perl-IO-1.500.0
+~virtual/perl-IO-Compress-2.106.0
+~virtual/perl-JSON-PP-4.70.0
+~virtual/perl-libnet-3.140.0
+~virtual/perl-Locale-Maketext-1.310.0
+~virtual/perl-Math-BigInt-1.999.830
+~virtual/perl-Math-BigInt-FastCalc-0.501.200
+~virtual/perl-Math-BigRat-0.262.100
+~virtual/perl-Module-CoreList-5.202.205.200
+~virtual/perl-Pod-Simple-3.430.0
+~virtual/perl-Scalar-List-Utils-1.620.0
+~virtual/perl-Socket-2.33.0
+~virtual/perl-Storable-3.260.0
+~virtual/perl-Test-Harness-3.440.0
+~virtual/perl-Test-Simple-1.302.190
+~virtual/perl-Text-ParseWords-3.310.0
+~virtual/perl-Text-Tabs+Wrap-2021.81.400
+~virtual/perl-threads-2.270.0
+~virtual/perl-threads-shared-1.640.0
+~virtual/perl-Time-HiRes-1.977.0
+~virtual/perl-Unicode-Collate-1.310.0
+~virtual/perl-Unicode-Normalize-1.310.0
+~virtual/perl-version-0.992.900
+~virtual/perl-XSLoader-0.310.0
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index 4133c6e73598..9ae9ba8de940 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Andreas K. Hüttel <dilfridge@gentoo.org> (2022-05-29)
+# No TMP here, no xkb here
+sys-apps/systemd tpm xkb
+
 # Adel Kara Slimane <adel.ks@zegrapher.com> (2022-03-14)
 # Untested useflag on other arches, needs keywording
 media-video/ffmpeg vmaf
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 8f41225fa087..297d48be89a7 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -96,7 +96,6 @@ valgrind
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not keyworded.
 appindicator
-ayatana
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-03-31)
 # sys-auth/elogind is not keyworded here.
@@ -168,7 +167,6 @@ R
 rdma
 samba
 slang
-systemd
 tcl
 tk
 xemacs
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 2e6d18e809f5..85e68d05e19c 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -48,7 +48,6 @@ samba
 # Mart Raudsepp <leio@gentoo.org> (2017-02-07)
 # dev-libs/libappindicator not tested
 appindicator
-ayatana
 
 # Anthony G. Basile <blueness@gentoo.org> (2015-08-01)
 # There is no luajit support on mips.  Bug #554376.
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index 05881727de15..5a92cd7a0e0f 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -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
 
 # PPC Specific use flags
@@ -52,7 +52,6 @@ gnuefi
 # Patrick Lauer <patrick@gentoo.org> (2015-04-28)
 # dependencies not keyworded yet
 appindicator
-ayatana
 
 # These flags should only be used for ppc
 -ppcsha1
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 1dee45c7eabe..c4f3c6a8e82b 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -61,7 +61,6 @@ libglvnd
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependencies not keyworded.
 appindicator
-ayatana
 
 # James Le Cuirot <chewi@gentoo.org> (2017-06-29)
 # Unmask as this profile is big endian.
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index a88935985b69..30eeb4fb2ca3 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -43,7 +43,6 @@ gimp
 # Mattéo Rossillol‑‑Laruelle <beatussum@protonmail.com> (2019‑08‑31)
 # Dependency not keyworded (dev-libs/libappindicator).
 appindicator
-ayatana
 
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-12-12)
 # mongodb is not keyworded on sparc
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 314ef3858475..ac789454f4c1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Stephan Hartmann <sultan@gentoo.org> (2022-05-29)
+# Not ready for general use.
+>=www-client/chromium-104 pgo
+
 # Michał Górny <mgorny@gentoo.org> (2022-05-25)
 # dev-python/sphinxcontrib-openapi is masked for removal.
 dev-python/jupyter_server doc
@@ -56,6 +60,7 @@ media-video/wireplumber system-service
 # runtime crashes. The effect of using USE=custom-cflags globally in make.conf
 # isn't the same as it is for just glibc specifically.
 sys-libs/glibc custom-cflags
+sys-devel/gcc custom-cflags
 
 # Sam James <sam@gentoo.org> (2022-01-12)
 # Unmask PCH for now for GCC to avoid unnecessary rebuilds
diff --git a/profiles/default/linux/m68k/17.0/systemd/eapi b/profiles/default/linux/m68k/17.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/m68k/17.0/systemd/parent b/profiles/default/linux/m68k/17.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/m68k/17.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/package.mask b/profiles/package.mask
index d63bf87cba5e..0c3c9dee4e95 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,59 @@
 
 #--- END OF EXAMPLES ---
 
+# Sam James <sam@gentoo.org> (2022-05-30)
+# Doesn't support Python 3.10+, maintainer-needed, and out of date.
+# Bugs #818847, #845936, #786585.
+# Removal on 2022-06-30.
+dev-util/dput-ng
+dev-util/distro-info
+dev-util/distro-info-data
+
+# Sam James <sam@gentoo.org> (2022-05-30)
+# No upstream activity since 2019, doesn't even support Python 3.9+ properly,
+# and doesn't support Python 3.10. Bugs #845819, #798384. Removal on 2022-06-30.
+dev-python/pypcap
+
+# Sam James <sam@gentoo.org> (2022-05-30)
+# Obsolete, no new releases since 2015, doesn't support Python 3.10.
+# Bugs #845681, #747982. Removal on 2022-06-30.
+dev-python/3to2
+
+# Sam James <sam@gentoo.org> (2022-05-30)
+# No upstream development since 2017, doesn't support Python 3.10. Bug #845678.
+# Removal on 2022-06-30.
+dev-perl/Inline-Python
+
+# Sam James <sam@gentoo.org> (2022-05-30)
+# Out of date, no tests, and most importantly, doesn't yet support Python 3.10
+# which will soon be the default. Bugs #845783, #822540, #798204.
+# Removal on 2022-06-30.
+dev-python/pycapnp
+
+# Matt Turner <mattst88@gentoo.org> (2022-05-30)
+# libwacom-2 broke ABI compatibility; reverse dependencies need to be updated.
+# Bug #848501
+>=dev-libs/libwacom-2.0
+>=x11-drivers/xf86-input-wacom-1.0
+
+# Hans de Graaff <graaff@gentoo.org> (2022-05-29)
+# Old slots that are no longer used by dependencies. Upgrade to the
+# latest slot instead. Masked for removal in one month.
+dev-ruby/regexp_parser:0
+dev-ruby/regexp_parser:1
+
+# Sam James <sam@gentoo.org> (2022-05-28)
+# GCC 9 and older no longer receive upstream support or fixes for
+# bugs. Please switch to a newer GCC version using gcc-config.
+# The lowest supported version of GCC is GCC 10.
+<sys-devel/gcc-10
+
+# Sam James <sam@gentoo.org> (2022-05-28)
+# Masked for removal. Dead upstream, no releases in a long time, and superseded
+# by dev-python/python-pam. Fails tests in a few scary ways too. Removal
+# on 2022-06-28. Bugs #833297, #802927.
+dev-python/pypam
+
 # Andrey Grozin <grozin@gentoo.org> (2022-05-25)
 # Does not work with the current dev-python/pyx
 # Removal on 2022-06-24
@@ -367,23 +420,6 @@ java-virtuals/jms
 # should update to that. #841437
 ~sci-physics/bullet-3.22b
 
-# Conrad Kostecki <conikost@gentoo.org> (2022-04-27)
-# Old base package for jabber services, which is not being used anymore,
-# as jabber services do now use their own user instead of generic jabber user.
-# Removal in 30 days on 2022-05-27.
-net-im/jabber-base
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-04-22)
-# Blocks removal of vulnerable dev-java/guava:20, bug #833309.
-# Removal on 2022-05-30
-dev-util/checkstyle
-app-emacs/jde
-
-# Matt Turner <mattst88@gentoo.org> (2022-04-26)
-# Dead package. No reverse dependencies.
-# Removal on 2022-05-26
-gnome-base/gnome-vfs
-
 # Mike Pagano <mpagano@gentoo.org> (2022-04-26)
 # These kernels contain a major regression that causes power button
 # to stop working, apparently making it impossible to leave suspend
@@ -459,20 +495,6 @@ dev-ml/core_bench:0/0.15
 dev-ml/patience_diff:0/0.15
 dev-util/patdiff:0/0.15
 
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-04-22)
-# Unused java library. Removal on 2022-05-24.
-dev-java/jgraph
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-04-19)
-# Release of the source-based ebuild is from 2014. At the moment
-# impossible to provide source-based ebuild for the current version.
-# Up-to-date binary package exists. Removal on 2022-05-30
-app-text/jabref
-dev-java/glazedlists
-dev-java/jempbox
-dev-java/microba
-dev-java/spin
-
 # David Seifert <soap@gentoo.org> (2022-04-17)
 # Dead library, part of >=sys-fs/e2fsprogs-1.46.5 now, bug #806875,
 # removal on 2022-05-17.
@@ -500,11 +522,6 @@ sys-cluster/singularity
 sys-devel/automake:1.13
 sys-devel/automake:1.15
 
-# David Seifert <soap@gentoo.org> (2022-03-20)
-# Mask gcc-8 branch (ended upstream support). Please switch
-# to a fresher gcc branch.
-<sys-devel/gcc-9
-
 # Michał Górny <mgorny@gentoo.org> (2022-03-18)
 # The new version breaks building docs w/o Internet access (because it
 # tries to fetch and install all dependencies locally).
@@ -517,11 +534,11 @@ sys-devel/automake:1.15
 # necessity.
 net-p2p/arti
 
-# Stephan Hartmann <sultan@gentoo.org> (2022-05-06)
+# Stephan Hartmann <sultan@gentoo.org> (2022-05-29)
 # Dev channel releases are only for people who
 # are developers or want more experimental features
 # and accept a more unstable release.
->=www-client/chromium-103
+>=www-client/chromium-104
 
 # Anton Fischl <github@fischl-online.de> (2022-02-23)
 # Version 2.5.* is not meant for production according to upstream
@@ -546,11 +563,6 @@ net-p2p/arti
 <sci-electronics/kicad-templates-6.0.2
 <app-doc/kicad-doc-6.0.2
 
-# Jonas Stein <jstein@gentoo.org> (2022-02-11)
-# Not usable anymore
-# Removal after 2022-06-01.  Bug #833144.
-x11-misc/i855crt
-
 # Jonas Stein <jstein@gentoo.org> (2022-02-08)
 # Not maintained, open bugs, upstream outdated.
 # Removal after 2022-07-01.  Bug #832953.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index bf181432d3c5..5cb1b885f855 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -149,7 +149,8 @@ loong		default/linux/loong/22.0/la64v100/lp64d/systemd				exp
 
 # M68K Profiles
 # @MAINTAINER: m68k@gentoo.org
-m68k		default/linux/m68k/17.0				exp
+m68k		default/linux/m68k/17.0					exp
+m68k		default/linux/m68k/17.0/systemd				exp
 
 # MIPS Profiles
 # @MAINTAINER: mips@gentoo.org
diff --git a/profiles/use.desc b/profiles/use.desc
index a3b6b0d0f339..52f51fa3cdbe 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -22,7 +22,6 @@ atm - Enable Asynchronous Transfer Mode protocol support
 appindicator - Build in support for notifications using the libindicate or libappindicator plugin
 audiofile - Add support for libaudiofile where applicable
 audit - Enable support for Linux audit subsystem using sys-process/audit
-ayatana - Build in support for Ayatana notification using the libindicate or libappindicator plugin
 bash-completion - Enable bash-completion support
 berkdb - Add support for sys-libs/db (Berkeley DB for MySQL)
 bidi - Enable bidirectional language support
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 8addff6bf00c..7a671cc4375b 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3024,6 +3024,7 @@ games-board/stockfish:optimize - Enable upstream -O3 optimizations (default enab
 games-board/tablebase-syzygy:6-pieces - Install tablebases for 6 pieces (huge!)
 games-board/xboard:default-font - Install the default font that xboard uses
 games-board/xboard:zippy - Enable experimental zippy client
+games-emulation/atari800:encode-mp3 - Support recording sound in MP3 format
 games-emulation/desmume:gdb - Enable support for the remote GDB stub
 games-emulation/desmume:openal - Use media-libs/openal for microphone input
 games-emulation/desmume:wifi - Enable support for Wi-Fi (experimental and discouraged)
@@ -4252,6 +4253,7 @@ media-libs/libprojectm:gles2 - Provide support for OpenGL ES 2 and 3
 media-libs/libpulse:asyncns - Use libasyncns for asynchronous name resolution.
 media-libs/libpulse:doc - Build the doxygen-described API documentation.
 media-libs/libpulse:glib - Add support to dev-libs/glib-based mainloop for the libpulse client library, to allow using libpulse on glib-based programs.
+media-libs/libpulse:valgrind - Compile in valgrind memory hints
 media-libs/libsdl:joystick - Control joystick support (disable at your own risk)
 media-libs/libsdl:sound - Control audio support (disable at your own risk)
 media-libs/libsdl:tslib - Build with tslib support for touchscreen devices
@@ -4762,6 +4764,7 @@ media-sound/pulseaudio-daemon:oss - Enable OSS sink/source (output/input). Depre
 media-sound/pulseaudio-daemon:ssl - Use dev-libs/openssl to provide support for RAOP (AirPort) streaming.
 media-sound/pulseaudio-daemon:system-wide - Allow preparation and installation of the system-wide init script for PulseAudio. Since this support is only supported for embedded situations, do not enable without reading the upstream instructions at https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/ .
 media-sound/pulseaudio-daemon:systemd - Build with sys-apps/systemd support to replace standalone ConsoleKit.
+media-sound/pulseaudio-daemon:valgrind - Compile in valgrind memory hints
 media-sound/pulseaudio-daemon:webrtc-aec - Uses the webrtc.org AudioProcessing library for enhancing VoIP calls greatly in applications that support it by performing acoustic echo cancellation, analog gain control, noise suppression and other processing.
 media-sound/pulseaudio-modules-bt:fdk - AAC encoding support using media-libs/fdk-aac
 media-sound/pulseaudio-modules-bt:ffmpeg - APTX, APTX-HD encoding support
@@ -6427,7 +6430,6 @@ net-misc/dropbear:multicall - Build all the programs as one little binary (to sa
 net-misc/dropbear:shadow - Enable shadow password support
 net-misc/dropbox-cli:gpg - Use app-crypt/gpgme to verify signatures
 net-misc/electron-cash:amodem - Enable plugin to support Audio Modem
-net-misc/electron-cash:audio_modem - Deprecated name for amodem
 net-misc/electron-cash:cli - Enables the CLI interface
 net-misc/electron-cash:cosign - Enable plugin to support multisig wallets between multiple Electrum clients
 net-misc/electron-cash:digitalbitbox - Enable plugin to support Digital Bitbox hardware wallet
@@ -6805,6 +6807,7 @@ net-p2p/transmission:lightweight - Optimize transmission for low-resource system
 net-p2p/transmission:mbedtls - Use mbed TLS instead of OpenSSL
 net-p2p/transmission:web - Build Web client
 net-p2p/transmission-remote-gtk:libproxy - Use net-libs/libproxy for getting the HTTP/HTTPS/SOCKS proxy configuration.
+net-print/cups:openssl - Use dev-libs/openssl instead of net-libs/gnutls for TLS support
 net-print/cups-filters:foomatic - Build the included foomatic-rip printer driver. Strongly recommended.
 net-print/cups-filters:pclm - Enable PCLm support
 net-print/dymo-cups-drivers:usb-modeswitch - Include usb_modeswitch for some hardware (bug #601242)
@@ -7260,7 +7263,9 @@ sci-libs/ceres-solver:cxsparse - Enable simple support for sparse matrix algebra
 sci-libs/ceres-solver:gflags - Use dev-cpp/gflags for flag parsing
 sci-libs/ceres-solver:schur - Enable fixed-size schur specializations (disable if binary size is an issue)
 sci-libs/ceres-solver:sparse - Enable support for sparse matrix algebra with various packages from SuiteSparse
+sci-libs/cgnslib:base-scope - Enable base scoped families or connectivities
 sci-libs/cgnslib:legacy - Enable or disable building legacy code (3.0 compatible)
+sci-libs/cgnslib:scoping - Enable scoping of enumeration values
 sci-libs/cgnslib:tools - A number of utility programs: cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
 sci-libs/cholmod:cuda - Use nvidia cuda toolkit for speeding up computations
 sci-libs/cholmod:matrixops - Support basic sparse and dense matrix operations (add, multiply, scale, et cetera)
@@ -7824,6 +7829,7 @@ sys-apps/iproute2:elf - support loading eBPF programs from ELFs (e.g. LLVM's eBP
 sys-apps/iproute2:iptables - include support for iptables filtering
 sys-apps/iproute2:libbsd - Use dev-libs/libbsd instead of internal funcs
 sys-apps/iproute2:minimal - only install ip and tc programs, without eBPF support
+sys-apps/iproute2:nfs - Support RPC lookups via net-libs/libtirpc in ss
 sys-apps/irqbalance:numa - Support balancing IRQs across NUMA nodes
 sys-apps/irqbalance:tui - Enable build of irqbalance terminal user interface
 sys-apps/kexec-tools:booke - Include support for Book-E memory management
@@ -8048,6 +8054,8 @@ sys-boot/refind:iso9660 - Builds the EFI binary iso9660 filesystem driver
 sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
 sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
 sys-boot/silo:tilo-only - Install only the tilo netboot tool
+sys-boot/syslinux:bios - Enable BIOS support
+sys-boot/syslinux:efi - Enable EFI support
 sys-boot/vboot-utils:libzip - Use dev-libs/libzip.
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
 sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesystem built on top of ceph
@@ -8597,6 +8605,7 @@ www-client/chromium:js-type-check - Enable JavaScript type-checking for Chrome's
 www-client/chromium:libcxx - Use bundled libc++ instead of libstdc++ for building.
 www-client/chromium:lto - Build with Link Time Optimizations (via clang's ThinLTO)
 www-client/chromium:official - Enable Official build instead of Developer build.
+www-client/chromium:pgo - Build with Profile Guided Optimizations (2-stage compilation)
 www-client/chromium:pic - Disable optimized assembly code that is not PIC friendly
 www-client/chromium:proprietary-codecs - Enable codecs for patent-encumbered audio and video formats.
 www-client/chromium:screencast - Enable support for remote desktop and screen cast using media-video/pipewire
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 8640d8a93c9a..0609626778cc 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/qalculate-gtk/Manifest b/sci-calculators/qalculate-gtk/Manifest
index 4594b2435474..0bd9ca6ae027 100644
--- a/sci-calculators/qalculate-gtk/Manifest
+++ b/sci-calculators/qalculate-gtk/Manifest
@@ -1,5 +1,7 @@
 DIST qalculate-gtk-3.22.0.tar.gz 2555367 BLAKE2B dcaa3495f75f4c24d0482b13978f19785cf192d231b46f031f0c69c4b9c8b5f49c328a14319e4ad0b1930be799fb5ff5805dab6696a21685eaaabb0b9dcccf47 SHA512 029e0a5db69d04a1bfb796915ded3b4533f3036d99833035ae7e8b214f0b2086f6ecb1c08f463561642bdbbd0fd729250a9bc892bbac5ee0a72a9073d7555a04
 DIST qalculate-gtk-4.1.1.tar.gz 2811609 BLAKE2B ffc5769050368a7883d82ea65251e77057f77dd59f365ff04c85bd8fc6d74e5958d982fb82b3d0519ed6439810ece41102eb4b0647990b126fa2f14cebee0ed3 SHA512 d7a6ce496dc6747300b1fff8b8e2ff74ba7530b4b83539d31ec99a0862e8147d250750cef585063a35a8f6aaadf12e99c51bdff4cb6a4ff83683f4fcf4ceae12
+DIST qalculate-gtk-4.2.0.tar.gz 2817864 BLAKE2B 4d40045ef4aafad292717b289bba3ddbc4d7ca7cfa5f44a479840ad5ccf8b8104e7e25093bdd32bbf5e0ccd73a8bed486c14de1c278a523db5a27922d4658c0b SHA512 ca0c864174f862a2f78e8743c3d7556da53d1d890773c5c8907d1d210f2101419cd083cfd9351e98c4b5fc64c602d5bc53fccecc8df1aa0451ee8418fbdfaa32
 EBUILD qalculate-gtk-3.22.0.ebuild 905 BLAKE2B 94596dcc5b2f64262faaabefd8356bed5759018e83fb9815e02ceda317e87db5e290d139099f79fe26f585774151ef1b4d7038365ce326fd752c379e56234e8b SHA512 70ab0d05a311807a4ac74eef1c55a27d65ea917787345b6d65490abdedb5d1e4c9cd2b19688be21860259795d8214dffa890a46469d511e03ecce77ec9c67ca8
 EBUILD qalculate-gtk-4.1.1-r1.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
+EBUILD qalculate-gtk-4.2.0.ebuild 875 BLAKE2B 73ce98060eb9fd48010fbc572b68b6dffee5ff9c69441f2bfa663a46e3baa2c6b0b071ae0db1adba24c879630d1bc5be462f4477f1de6d0d142d8daf75187fee SHA512 244f2ed840a75b83e0a10a747c3ee638ddaa6aa431e49d8cf32ae6b8ace14d6c65b0133711d9a89d3d94af7e5395a1533fde257da375a01245469f043e4abe1c
 MISC metadata.xml 607 BLAKE2B 7572be504616d69914849d6bdd53a9768fa649606f7f64f3a5ce136f0971ed57b410bf90796091f95f94c73dfdfe8748f31e30a656765de82e68e3d40abc48c3 SHA512 fba3a4df947551ec5421975ec33830e2c3c30b26030abf13a3ba1d524cb64f92adbf77015683142457ea715883a39198f3fb83a932629b887d077ab9b34d77d4
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild
new file mode 100644
index 000000000000..47ce82e13fba
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-4.2.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: bump with sci-libs/libqalculate!
+
+inherit xdg
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-libs/glib:2
+	>=sci-libs/libqalculate-${PV}:=
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/pango"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gdbus-codegen
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Required by src_test() and `make check`
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/calendarconversion.ui
+		data/periodictable.ui
+	EOF
+
+	default
+}
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index e358fa56083c..3b6e025d0164 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -1,5 +1,5 @@
 AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457a08ddbe98e85cd3c195c149215de8753aa72fec618ccf4bdf584002c507cc53532ee92af6e8097c7fa2573628de34b17c SHA512 f54fb5d006263f89ff8c376f100066d79883b68a30441e8665ca4d8a6aa061e5c697c715ccb93c67a692145a44a441862039e5249e4795159f1c43a12ffe1c97
 AUX units-2.20-readerror.patch 306 BLAKE2B 7007ed50539043f1b21a9676c8d1ff377d1d6e1d9e1d3e4bca9e4dcda520d77cddc28abe35333cd1cb4a5d451264d94f22bc6594a5f1fd15488d5d5e1d5bf12d SHA512 4d1acb3ca6e4bd2874854cfa27e8bc5418ef30d628589eace8011733556835feb30630a2b37bb1e5e975392fe75e684b48f31a9b2624b8703714dbb501f6f27d
 DIST units-2.21.tar.gz 1308533 BLAKE2B 0a02979eafa21af759128ec72b11e1f532640c9d0e88ae8f389a1beb52d5a400cbd6294042aa4c7d8786c06c8ac4106a77c302805b8c5e3bb84d4134805fd517 SHA512 34bacff606f12aa5b2e59170f6b2142277aa1121d79610a51b57f07f17ae2dbdfbbb0e60be34522f367679cc152408f77c1ebb551016224d23f81c21f4b3ba62
-EBUILD units-2.21.ebuild 1196 BLAKE2B b10d3326f7e25664ab11ed85d56e5d4b74a8b930e15ec463f78a77089e057acb167fc5e89412ffcb6c3804d02b5441eb2e805a57de3f3cb149bf752465701449 SHA512 c081bc4ce4e1dce3bf3f83f6c8e313474df9c65032e02f86827d122472ed3608f6e26147b4107258199a0134dba92bb6478d90cfb459bedac727c24127d89fa3
+EBUILD units-2.21.ebuild 1196 BLAKE2B 82474e1b2b54891cf7e4021ec1137b1e7721c6b0d5809530aff9cde1c18f114f8a30aa9ade3e01759f8a913e8190a2ab38ec1bebdd1b26a4582ec608dcf5fbe2 SHA512 1c2dd9233318b8058f24a3b7152e801afad1a54c09cf0a3693ebf04850cebe9c7ab69f5e8bce0abafc9821c895594b3465b705de3ac271f825e62eaaa7b3f80a
 MISC metadata.xml 270 BLAKE2B 7dee9687f98896d38a4c70f35424d66e1b4e5065cf948953d772a4a4e54de2f44cafc2d99b4ca62f0d0a025f868c9cd010a7da76e090d36d0a8083c45642bcc1 SHA512 6c8ad4908b0adbe2854527906adc067f0fece43a36cdb4149e50d4d4ebacfa29b5005db482442e63235e6aaca222862413cd5bfcdcd7425ec978fc24abad5c00
diff --git a/sci-calculators/units/units-2.21.ebuild b/sci-calculators/units/units-2.21.ebuild
index 27e2401c7804..0c1c7e86fb23 100644
--- a/sci-calculators/units/units-2.21.ebuild
+++ b/sci-calculators/units/units-2.21.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit python-r1
 
 DESCRIPTION="Unit conversion program"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index ffc8737f6914..22513893b3c2 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/NanoVNA-QT/Manifest b/sci-electronics/NanoVNA-QT/Manifest
new file mode 100644
index 000000000000..16ec2949c5d6
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/Manifest
@@ -0,0 +1,4 @@
+AUX NanoVNA-QT-20200507-missing_headers.patch 513 BLAKE2B 541d4a6e9ca4db5735c96c73bc8999c57db892cf808025917e8e7670b864a10477092cfe64f790998e08d3d778e4159d81f36b9d7c78cb46cfec787ca4fb9b81 SHA512 1c756605fb1f813862d32823ad085b7a9642771c9870eaca54e22375b11ff1129a4a9a1f5c93eeddfc5d3acbc2eca332dbe3306c234e86fb1fd99477f81ad921
+DIST NanoVNA-QT-20200507.tar.gz 876476 BLAKE2B bda4424b0dfb8b977a3e4227393d477f7c6d6518b34887fb4104deb805768f1466d3a01f4b5949c80c0177151b6660158296a1eff24f6f6614ee53e185e2df38 SHA512 7b465c06cdff8cdc9c13ab4e6d6c4502849a2ef42e81de3f3d47bcf49008761307ea57e6572d316a96993aa547ce7f8185bab742d11139e313c33161d2324a21
+EBUILD NanoVNA-QT-20200507.ebuild 1416 BLAKE2B fcf58a1acef4b868407432fb8bee111d38078052e8cb7012957e476355c1f600700d304b40c5ec021a2a191fdaa3b083fd46186b66b2c08d3002ccf2327ca146 SHA512 5a1bb9c1ca297a78b0f3a58b608f1120e785265c6aabf5466f8afc5bf35a2b8dc938a5b98146c2ccf081e0f663e61ec3c664429f938db87f8be2be55c9bb996b
+MISC metadata.xml 332 BLAKE2B 0df01b9398bb0f96090d0742dba0320ff3e389ee4b795ce19f39924146b91408bcfe04ea38287228879785df135b51b8d0ebf7c56b8a99def323c59c85228829 SHA512 42897e30597f019edfb1c444e56e4f7226e0acd481aef7ac9e96a6e5f777bb849b31458b598c53a1556c5f48f7d12dab8da8069cfede5178f40698ccbec48926
diff --git a/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild b/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild
new file mode 100644
index 000000000000..30d703f63aa8
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/NanoVNA-QT-20200507.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools qmake-utils
+
+DESCRIPTION="Library and GUI software for NanoVNA V2"
+HOMEPAGE="https://github.com/nanovna-v2/NanoVNA-QT"
+SRC_URI="https://github.com/nanovna-v2/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-cpp/eigen:3=
+	dev-qt/qtcharts:5=
+	dev-qt/qtcore:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtsvg:5=
+	dev-qt/qtwidgets:5=
+	sci-libs/fftw:3.0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20200507-missing_headers.patch
+)
+
+DOCS=( README.md ug1101.pdf )
+
+src_prepare() {
+	default
+	eautoreconf
+	sed -i -e "s|/usr/lib|/usr/$(get_libdir)|" libxavna/xavna_mock_ui/xavna_mock_ui.pro || die
+}
+
+src_configure() {
+	default
+
+	pushd libxavna/xavna_mock_ui > /dev/null || die
+	eqmake5
+	popd > /dev/null || die
+
+	pushd vna_qt > /dev/null || die
+	eqmake5
+	popd > /dev/null || die
+}
+
+src_compile() {
+	default
+
+	pushd libxavna/xavna_mock_ui > /dev/null || die
+	emake
+	popd > /dev/null || die
+
+	pushd vna_qt > /dev/null || die
+	emake
+	popd > /dev/null || die
+}
+
+src_install() {
+	default
+
+	pushd libxavna/xavna_mock_ui > /dev/null || die
+	emake INSTALL_ROOT="${D}" install
+	popd > /dev/null || die
+
+	pushd vna_qt > /dev/null || die
+	dobin vna_qt
+	popd > /dev/null || die
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
new file mode 100644
index 000000000000..cebe3c5239fa
--- /dev/null
+++ b/sci-electronics/NanoVNA-QT/files/NanoVNA-QT-20200507-missing_headers.patch
@@ -0,0 +1,20 @@
+--- a/libxavna/xavna_mock_ui/xavna_mock_ui.H
++++ b/libxavna/xavna_mock_ui/xavna_mock_ui.H
+@@ -2,6 +2,7 @@
+ #define XAVNA_MOCK_UI_H
+ 
+ #include <functional>
++#include <string>
+ using namespace std;
+ typedef function<void(string dut_name, double cableLen1, double cableLen2)> xavna_ui_changed_cb;
+ 
+--- a/vna_qt/polarview.C
++++ b/vna_qt/polarview.C
+@@ -3,6 +3,7 @@
+ #include <cmath>
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ PolarView::PolarView(QWidget *parent) : QWidget(parent)
+ {
+ 
diff --git a/dev-java/spin/metadata.xml b/sci-electronics/NanoVNA-QT/metadata.xml
similarity index 54%
rename from dev-java/spin/metadata.xml
rename to sci-electronics/NanoVNA-QT/metadata.xml
index 9f47c959bca9..84af1563757c 100644
--- a/dev-java/spin/metadata.xml
+++ b/sci-electronics/NanoVNA-QT/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">spin</remote-id>
+		<remote-id type="github">nanovna-v2/NanoVNA-QT</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 8f1ade7e53a6..0cc14e2517e6 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -4,7 +4,7 @@ DIST xnec2c-v4.4.11.tar.gz 1061014 BLAKE2B f7af594a1f97b0ad9d93b57235afaf04a8500
 DIST xnec2c-v4.4.5.tar.gz 972268 BLAKE2B d68b525324ddc8a621e7b186364031b3739210aea9581347e1fa38916eefb97f7ef3d7e5b8f673d9fd514dea36815ebc3f9d17d3a6eea26af90d5981ad738828 SHA512 8edf19357d619bfc9fcf2ed29380b51d8dc5e8dd1f7fa798a01f15652e0c5c65217e1e8797be6118a655d124dcf1fe8f3d959744128d75afef5c60738864d3cc
 DIST xnec2c-v4.4.7.tar.gz 977084 BLAKE2B 1bf17da252e9a1a38613a7d0e808f190ddb704af9903b897fdd5d68f1942d0c65ac43e9daa6d10b311c866733e96d216f3f610b6d5e7f957ad0230e6e35cfb8d SHA512 d9ed8bf0eaa43fb4cf77997e71af6c70c5be120e2979ea6036af20caa1886897a543f7d7ec75df907f3f1c2adf55e1c4fa5e95f9fde034ebdfc51e932aaf674e
 EBUILD xnec2c-4.1.1.ebuild 785 BLAKE2B 525e838b9b4b95226960ad3b63d4b0d3287e22d8bc95e0071afc0f3fb9b8fe049a4ee0b71ba42f75faab02521629df012825768d0f052c1de4aa97c2f5adc954 SHA512 e350dba8b64219dbd4ddbccd31c135b97bf2c62133d6d6a7dec1b4eeb06df2ab86851dd4aed32555b6a3ca53850f0b115c73d94df697449b6463c89e56c9b584
-EBUILD xnec2c-4.4.11.ebuild 989 BLAKE2B 7eb5ba8d638b81fc4058228bd1c8eb17037d2b0ca869e28dd6d4f9b46d558be996427d46d3b2c242ebc5a319c0619aafab0d7cd0e30cdc3b6ad73a1c143d830f SHA512 f9af501ed02ed7ec26d16cef9b4d7e7811eb04eb08107ebee0efde9f8b3403ec09fa4d8bea9407dc963bb95c854da4a9f98a637fada1fbc8c5b04544d9df3dc8
+EBUILD xnec2c-4.4.11.ebuild 987 BLAKE2B 8dd5bc27a43fc5fec236d579e288cc7eac8b067ddd7c4335d2c48c47e1fd3403eb878cda75ac3fd8e01173cf8f85e62786c416c26379a0bf933102c67354a88b SHA512 6e206d36ffdefe3879316477eb324dbb11c7d2e098f2bc96040cdc750ff9728e7049c9f28ac3d0db6729ff1e2117c12a4ec53624bd35ae31571ddd08d74dc18c
 EBUILD xnec2c-4.4.5.ebuild 942 BLAKE2B 359d6b68c87dea093bc8018b155ff5fdbec8e35a1ec87b56c9747711a902cd1a31bb6cc320418155bba8c8c7df71f649e75114d730d75d172109bc99b99a3487 SHA512 9e25b2180fa198e078e52a171ce5cc87fe43eb275975d4b61736187e71004b2d0bdd7f2146357a247ceacd6f2fdafd545ab265370f427b40a74c8de9d494610f
 EBUILD xnec2c-4.4.7.ebuild 871 BLAKE2B f923008332242221b146c06e7ab9154c47f3751f6b0ad3c2e18da9e9b2eb5766301fe61dc84908d9e7e66d6ababad6a23610c7229cfda290a15d4b4837a273e5 SHA512 e4350e264abbfa90a71132a85cb5df9dbe132f3cef6403d04103ead85e37ab7557193d56ac769c61b4f265dac2803a1965392d806b33f1514ed0994459a63e01
 MISC metadata.xml 1635 BLAKE2B 97a6599a38ecf5914360b4e5376fcb6be56890a91e0274027c327d69fd41459a740a5ad4e2255e48c676bfabbc60a5fc3abd13fa7f9157ac3572e24fa11752a3 SHA512 7564946c202c11ab3be96071962e07870fe97433fae5a9998dbf0cc62de0c83885fadb71741a824aa45e643641baa77bb887ea70687fa15559119fd22d83eed3
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
index 3d142cf6f7a4..edc8563c6bd0 100644
--- a/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.xnec2c.org/releases/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc examples"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 648ed142f0eb..82955d2b5553 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gnome-maps/Manifest b/sci-geosciences/gnome-maps/Manifest
index 1fda9f3b4eeb..0ed23cccdfbc 100644
--- a/sci-geosciences/gnome-maps/Manifest
+++ b/sci-geosciences/gnome-maps/Manifest
@@ -1,7 +1,9 @@
 DIST gnome-maps-41.4.tar.xz 2187076 BLAKE2B bb35925d1b69d50c65e3ffe68386242b776c2089bea3b2bfe88383f1a8fba4045474a1c8fc1c5d07a5b207ad953396d3a76af77fbdf984d286b5e242f9eea78f SHA512 605de671f85ae38a8dc79e58594f2170215e8a070377b1d9ebded9891425898bb40613f6acee1c95f5ea2e0d95e6a8c25757665a5aa890831325701b1abbc8fa
 DIST gnome-maps-42.0.tar.xz 2315828 BLAKE2B dca0f7845b257780701186adf3408cf41797b235969dadf1fe73003b9e52b3ab26d39f8190336616d697bf87eafb2e1abd05a4da9de4837153237fd08e382854 SHA512 888caa6418a8afea6d334b90f28eb865e3955c0534df25d458e6b3a063944d09c46a3775a3d4953a968980446f2be69bd0c5c4183b3fc8419ed1f7bbb812429c
 DIST gnome-maps-42.1.tar.xz 2315924 BLAKE2B a2bf6eb8bef69c80febeffc29294840b701a207d5b6479dabae4daa13de4b5325319314bb755d44fa5ec41bae397af1e642950553b6c36be29f8a68109c15b3f SHA512 a01bf5eefa541542930e53750ac216cd93e4b409a171b57ed18525020cd2dc55db596ab68885ab9d607999c971f8e4ec2b746507157aab32b863a17a222a6fc2
+DIST gnome-maps-42.2.tar.xz 2317216 BLAKE2B 2a485c15ad203fb4518541a60231a0ed756ca3cf7abc524911a2294b3503077d0974ecc8690073e3967241a8769687a1524506a42bea8c473192128cd2ae9bb7 SHA512 87da3b6850d1a7ca4d90781089800f082026406555773ea1a9bac376b41e480eb4b5a10ec3f0a2f85de521e847489f4e761117a08e7125447aab7acf05720c1f
 EBUILD gnome-maps-41.4-r1.ebuild 1510 BLAKE2B 3a928ead826d4e54969b224c9f59da2239b542bf2f6e9f364e3bfc185717473aec4a1563174852fbefaec37fa20e3f8cee42eaf88e3a5ef25d80d7b7461c0f04 SHA512 f29d8940faa247f70ac479bf6dd3c968a5552c7e7a1d57831e9765e0716fa180794fec79932a3d5d46caed3c32d8a999ceb368fd9d1aee281a6fa988266fffcf
 EBUILD gnome-maps-42.0.ebuild 1513 BLAKE2B efa10f438002651620d1bdbeb8660de33491e3b888ea7bc8a0c253e2ca1d7d63544f7f9514d0602e34b2cf74b9a7591ee1a54631caf76e7a3c95887a07de77c0 SHA512 f4d5a4a18964f4548f9337b6d7b1ea6f10db9766a7966b8473d3c266d7bdbe3764a7ce1f80273c1c022dced4d388b74c0240f09ce593e94aab1372a4d26f70b4
-EBUILD gnome-maps-42.1.ebuild 1513 BLAKE2B ea65e2fd1c25a8ff539973e2e41a15934a269d357fdb17920bb96ec5307d62ec55754b1d00b62be454db5c1fd0d38e2463ec4b78e8209a27842fbd4fecd4fe4b SHA512 083dff1fed5296d3553b93bc7b3159ef8d8df61ee7eb932b4a081b41c2dc5972814b21e254a1205be5c0122fb7f22c0de17efd0454922c75d3803ed3757dd09e
+EBUILD gnome-maps-42.1.ebuild 1511 BLAKE2B c0edb29177474b6e13a7ca394e06e758bb75b07cb39a89a1dfddd3269b620b47574d05ddcdbb372ddc3f8bc449abb95e648ffe9f34b484570be1a2806e1c9ae8 SHA512 31c4e0a5883c18e4550d8e4aaa59fcfee2887dcf268f6e53fbc8ae1f2c059ae910f48d54860988a2e000bb32ceffe4862b3fdf37f5dd28a5609a703a61f884cd
+EBUILD gnome-maps-42.2.ebuild 1513 BLAKE2B 0cae9b16d9347a46f0c532e674ae8f4fdf1ae749bbd0c3d0cca2b3fe7d8101255d1fbc18b9e130f2bdfdfae6c57db251bcb3f80545eaff58bf52c46561fe13c4 SHA512 215014a6ef523fe778a1e7a49401b8b23d51f61e0e2378577bfe732c5945b7ddb4d97be3b823dd0f7cede2a350ee19898a7b7111cfef89fddffb5b0606c1a011
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild
index 6115d59c93ab..1a317dee669c 100644
--- a/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
 
 LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 # Pure introspection dependencies found by grepping imports.gi in ${S}
 RDEPEND="
diff --git a/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
new file mode 100644
index 000000000000..a8c7b50184bb
--- /dev/null
+++ b/sci-geosciences/gnome-maps/gnome-maps-42.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg
+
+DESCRIPTION="A map application for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Maps"
+
+LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+# Pure introspection dependencies found by grepping imports.gi in ${S}
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	x11-libs/pango[introspection]
+	>=dev-libs/gjs-1.66.0
+	>=dev-libs/gobject-introspection-0.10.1:=
+	>=x11-libs/gtk+-3.22:3[introspection]
+	>=app-misc/geoclue-0.12.99:2.0[introspection]
+	>=gui-libs/libhandy-1.5.0:1=
+	>=dev-libs/libgee-0.16:0.8[introspection]
+	>=dev-libs/folks-0.10:=
+	>=sci-geosciences/geocode-glib-3.15.2[introspection]
+	>=media-libs/libchamplain-0.12.14:0.12[gtk,introspection]
+	dev-libs/libxml2:2
+	>=net-libs/rest-0.7.90:0.7[introspection]
+
+	app-crypt/libsecret[introspection]
+	dev-libs/libgweather:4=[introspection]
+	media-libs/clutter-gtk:1.0[introspection]
+	media-libs/clutter:1.0[introspection]
+	net-libs/gnome-online-accounts[introspection]
+	net-libs/libgfbgraph[introspection]
+	net-libs/libsoup:2.4[introspection]
+	net-libs/webkit-gtk:4[introspection]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postinst() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 7144c0e390fd..c26973dc4147 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,8 +1,4 @@
 AUX gpxsee-7.33.patch 332 BLAKE2B c0ccd7e75c0d99533fcc3a1ce582b59c739e36c203434ab5c491c5c70953adadec7beae0340aaecb76f0b92c10052f8398ff2597a226426c8b9f7222c2d812f3 SHA512 ff3e78d30793784ffc147f89c7558bc9b470935293416e961db744d6edd42bf096499e3aa199908614d547e48ef893b28c886cc61e4e5ee182abddabffd660fc
-DIST gpxsee-10.5.tar.gz 5123489 BLAKE2B 9e7155adc340d3e8af708563cf2aba2e03a47c4180a144d79521913339020f20be416bd14d95b33041653135167d8123899f6008474beef8e1665924eaa0c339 SHA512 ee24a1555fc18f2aa21307e4fe255312d5e166b107bf0a9e10104cb977cb5d59888e7ec99aad83adf5fc36e7a9eb04a039450d96b4248ad52c08fce0dd76c035
-DIST gpxsee-10.6.tar.gz 5122274 BLAKE2B bf76c9928267b3d6f07fcdc807512a9ab3b2ba2bdcef0294414c3aadf7d2b89b8f5fbb7a793ff04976ec16afdc5f33fcb54f5cc5c19bd1bdac97ebce7e4edc48 SHA512 143340f31863c82d3336fd4bd03e99edfdb0324ccf80ccd7a423f5a815ecda8b5220766f02e53b9f4d5098fabaad33f9da5d4a3de250711214c6923821008e76
 DIST gpxsee-10.7.tar.gz 5122383 BLAKE2B 5625f40b799e67ac7b4801e358021657b2ef4f2279e8ac94f8c85724b9e27dad2d0e244f931b6c2f7204abfb45a8dde1a07dcbbbfba780c8a07aa541ba944473 SHA512 0cb4a3e71c8141d8b0a039cd51ddbfb159c28dc9d6f724dc8605f52aaf90379b9fa3d21741993fbf754bd329d835118b3b67c87673ee97fdc29f61440c3e8624
-EBUILD gpxsee-10.5.ebuild 1168 BLAKE2B 62157c1b485abad4017a83ada065c88bcf6aa58338c68e7d612623eb2821afef4901077806f2f02b8ae31f6d42d53393f3941082313289f47cd41b89cb1a1de2 SHA512 085eb752f90d58a3b16555a378eb109a2bfd864bfb3cc91613623ebebc9c2e52d1448ce5986ed48096c97162258d961c8658b1fdcbb09db618132ef103e8cc6f
-EBUILD gpxsee-10.6.ebuild 1170 BLAKE2B bcf8ac93a22ada88f988bdff316d6d5af22e67589cde8c97df987323892fd2c6e653e38165ee8d75ec1824308dd054ebe49e07cb4972707fd9fa5372207ace30 SHA512 306deb433881654925d9c519e8f48c2e6eb863c7c1731ef6fa90797512c2dd451a33c7a795c83f3e7df2e78e29329a5321635dcdd82a1c039f3d908368d97db7
-EBUILD gpxsee-10.7.ebuild 1162 BLAKE2B 3410c6bfa0a2ac3a41778b8dbcdeb93f133e9b1846e0abadff9b494e0ee6eb166935dddb5873aa1ebd6c5fee99bfb6ffff00ed74a94c06bc3c8a88c74484ebfd SHA512 d5c23a3c90c0a309abc238dddb0aec7fe6a1fc14b50e309cd27819cecb76327c5c3692d8ed8b7f67de1662f7d7f8644b246d24246fd8d25feb9f259598f7e9f1
+EBUILD gpxsee-10.7.ebuild 1160 BLAKE2B fd51e2104bcc34cf1f450e0fecb1703e6dc15b45afc7ff07b16a5f841d82fc3f25c195aeef53d7cd611a337652fb75adc2a5f44b5ccde3119eb8f1c30e7873c6 SHA512 08988262203c5e2819206f61e38f6264562dd36d1193d8dd3d0bd4cce3eb77ae64905aa26cdbf149ee2ce47f70798f1821e9c34014402003f3495a615a17f4e1
 MISC metadata.xml 508 BLAKE2B da581bc3330fcebff61893ddcc75762fa4987f959cf6eaddb49a2f67a3071caf5e1aa5e1f9722fc493c13091146a70bbf5f7051d2961e4456c1aaf025182a77a SHA512 e895fdb3e558a75c1506206c5b0cf797f4ee14aa83c4e0853bec71c48298301cd7cc052853df64fc62c253543882cf878e03be864a93643456f5f117816faaa3
diff --git a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild b/sci-geosciences/gpxsee/gpxsee-10.5.ebuild
deleted file mode 100644
index 8777e1588391..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-10.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh"
-inherit desktop plocale qmake-utils xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtpositioning:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale rm_ts
-}
-
-src_compile() {
-	$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-10.6.ebuild b/sci-geosciences/gpxsee/gpxsee-10.6.ebuild
deleted file mode 100644
index f37db04afe41..000000000000
--- a/sci-geosciences/gpxsee/gpxsee-10.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en eo es fi fr hu it nb pl pt_BR ru sv tr uk zh"
-inherit desktop plocale qmake-utils xdg
-
-MY_PN="GPXSee"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
-HOMEPAGE="https://www.gpxsee.org/"
-SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsql:5
-	dev-qt/qtpositioning:5"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${PN}-7.33.patch )
-
-src_prepare() {
-	default
-
-	plocale_find_changes lang "${PN}_" '.ts'
-
-	rm_ts() {
-		sed -e "s|lang/gpxsee_${1}.ts||" -i gpxsee.pro
-	}
-
-	plocale_for_each_disabled_locale rm_ts
-}
-
-src_compile() {
-	$(qt5_get_bindir)/lrelease gpxsee.pro || die "lrelease failed"
-	eqmake5 gpxsee.pro
-	emake
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	dodoc README.md
-}
diff --git a/sci-geosciences/gpxsee/gpxsee-10.7.ebuild b/sci-geosciences/gpxsee/gpxsee-10.7.ebuild
index 60edf5a4c3e5..fe887204a934 100644
--- a/sci-geosciences/gpxsee/gpxsee-10.7.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-10.7.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gpxsee.org/"
 SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 RDEPEND="dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 2e584731a8d3..690f2596b850 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/cgnslib/Manifest b/sci-libs/cgnslib/Manifest
index 77fa6848460f..fb8fdc57c844 100644
--- a/sci-libs/cgnslib/Manifest
+++ b/sci-libs/cgnslib/Manifest
@@ -1,3 +1,5 @@
 DIST cgnslib-3.4.0.tar.gz 3393312 BLAKE2B 279d4502ff70701df6a266495ccc7750e9c51ac14bd3d5072ae8e1448b4f1e4afaefaaf254cf0afe1cc984e4d9fc7d5c161f7696f62726aaf567990ded3c9056 SHA512 e26cfb0d9f3061242d327a6c18fe40ed51bf63b61ae0d6b5cce7e6b4aa623b00e1c3fd9fe240d993323c6f4eec043fde5296a82b1f9108027f945300eec541ec
+DIST cgnslib-4.3.0.tar.gz 1472044 BLAKE2B 8fa59eb2c13b163553c03991af1886d2162295367094937c3b7bbbc687f098e736a927fb6835fabb43ecfbe59edcf0e58e8977e89eeb1ef12b26568fbdc78e2c SHA512 5db97b8df8cb5b108a65513e20774881c1dfa790dd96bec46119883d934db18e3f88450d287690cb785e0875af87a3ec32b6c4665c54edb623161122ee85aa93
 EBUILD cgnslib-3.4.0.ebuild 2084 BLAKE2B 51a8a6dd325255f70d60ce55ddc4870f6bee34cc30f7c98672626288be4ac17ae2a274ff31f80ec4262b6dd92cc4ac0513d26863177432674c7edf66a43771c8 SHA512 21b14ae07d64569ae4db22afb03b0623948beb190a99486e00a6565c10ca2adc77345acc75dfb2cde5c1adf9be27f21e34a117bbcfd4741f43ae5cfb59c0fa6f
-MISC metadata.xml 1127 BLAKE2B d9a24b01673d8f575e34aa978d76a225359ff04383cf713d9829389e55c926b77822ec1863358bb2f5f03382fc14e51dfdb941170b8392eff045f6bd9585d1ba SHA512 534402d03a0d0e530412888fd47275b8bcec951a3f91b3bfe0b3f5ef5439e26a4ff01f30657f69b7f4eb8ce1ea6a8bd5263a289c42e95ad2d1c9be2346fe39f5
+EBUILD cgnslib-4.3.0.ebuild 1923 BLAKE2B ccd9af332478c5410cbbecf56205bd3c542faf90bc5b39c356912ee5d9818927ed7230e456f0a84c0dc738d207cfb6366979b90a355a406ff4593df7976adb35 SHA512 b5d6c60df6fee3be87574eb2c725b635d03944fb9043bd0d88818d6dd8a9a4e0ad0edbefb4863979e272fbb65e60b876257f29e19f1516804ff39c26377c502e
+MISC metadata.xml 1273 BLAKE2B 05b98760182f6ab2586a969e7cd49a56b077f3c0f208460967b5b240cde12c3b62655223947646d48c743cb706b81e59693c693fbcdf703c75642958491d5902 SHA512 af36842f7cefc358474fd6b3646dda0974c0ee443d56babc48955340be64719b1c4548e952c93898265d6950f32bfb7db87472ca196b290ca13a8c20ed2244c2
diff --git a/sci-libs/cgnslib/cgnslib-4.3.0.ebuild b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
new file mode 100644
index 000000000000..dc10ae0dc1ec
--- /dev/null
+++ b/sci-libs/cgnslib/cgnslib-4.3.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEEDED="fortran"
+FORTRAN_STANDARD="90 2003"
+
+inherit cmake fortran-2
+
+DESCRIPTION="CFD General Notation System standard library"
+HOMEPAGE="
+	https://cgns.github.io/
+	https://github.com/CGNS/CGNS
+"
+SRC_URI="https://github.com/CGNS/CGNS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/CGNS-${PV}"
+
+LICENSE="ZLIB"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="base-scope debug examples fortran hdf5 legacy mpi scoping szip test tools"
+
+RDEPEND="
+	hdf5? ( sci-libs/hdf5:=[mpi=,szip=] )
+	tools? (
+		dev-lang/tcl:=
+		dev-lang/tk:=
+		x11-libs/libXmu:=
+		virtual/glu
+		virtual/opengl
+	)
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="
+	fortran? ( test )
+	!test? ( test )
+"
+REQUIRED_USE="
+	mpi? ( hdf5 )
+	szip? ( hdf5 )
+"
+
+pkg_setup() {
+	use fortran && fortran-2_pkg_setup
+}
+
+src_prepare() {
+	# gentoo libdir
+	sed \
+		-e 's|/lib|/'$(get_libdir)'|' \
+		-e '/DESTINATION/s|lib|'$(get_libdir)'|g' \
+		-i src/CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGNS_BUILD_SHARED=ON
+		-DCGNS_USE_SHARED=ON
+
+		-DCGNS_BUILD_CGNSTOOLS="$(usex tools)"
+		-DCGNS_ENABLE_BASE_SCOPE="$(usex base-scope)"
+		-DCGNS_ENABLE_FORTRAN="$(usex fortran)"
+		-DCGNS_ENABLE_HDF5="$(usex hdf5)"
+		-DCGNS_ENABLE_LEGACY="$(usex legacy)"
+		-DCGNS_ENABLE_SCOPING="$(usex scoping)"
+		-DCGNS_ENABLE_MEM_DEBUG="$(usex debug)"
+		-DCGNS_ENABLE_TESTS="$(usex test)"
+	)
+
+	if use mpi; then
+		mycmakeargs+=(
+			-DHDF5_NEED_MPI="$(usex mpi)"
+			-DHDF5_NEED_SZIP="$(usex szip)"
+			-DHDF5_NEED_ZLIB="$(usex szip)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README.md release_docs/{HISTORY,RELEASE,changes_from_2.5}.txt
+	rm "${ED}/usr/$(get_libdir)/libcgns.a" || die
+	dodoc release_docs/*.pdf
+	docompress -x /usr/share/doc/${PF}/examples
+	use examples && dodoc -r src/examples
+}
diff --git a/sci-libs/cgnslib/metadata.xml b/sci-libs/cgnslib/metadata.xml
index c797f2727eb4..978347af49e6 100644
--- a/sci-libs/cgnslib/metadata.xml
+++ b/sci-libs/cgnslib/metadata.xml
@@ -10,7 +10,9 @@
 		an international steering committee.
 	</longdescription>
 	<use>
+		<flag name="base-scope">Enable base scoped families or connectivities</flag>
 		<flag name="legacy">Enable or disable building legacy code (3.0 compatible)</flag>
+		<flag name="scoping">Enable scoping of enumeration values</flag>
 		<flag name="tools">
 			A number of utility programs:
 			cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
diff --git a/sci-libs/libqalculate/Manifest b/sci-libs/libqalculate/Manifest
index 87707425025e..5e39d45c2446 100644
--- a/sci-libs/libqalculate/Manifest
+++ b/sci-libs/libqalculate/Manifest
@@ -1,7 +1,9 @@
 DIST libqalculate-3.21.0.tar.gz 2117414 BLAKE2B eaf8b886e716a6f8e9631dbda6533906cc7c5ed986233d75b9384aefb4123479914715d37268db5e1d403d1ee1835cde77314abe5380768fce5c266d1c253ca3 SHA512 7ca876ffe359ab2c6c6ae266007f489f9cd26f6650d6ace4e1d80cc660d16294cce601ed81046baca25cc4ec41668498af0a555fddc47c4118241e72af039614
 DIST libqalculate-3.22.0.tar.gz 2150167 BLAKE2B 2023dc00e516f26d93e6acae66acb6211fb4dd234fba7e1e012c29ea224276040e75552b923b275e0cbe3e168ed419849f7f204aac3952a872ad0f1916470358 SHA512 2fc7e9e2edda0dfa221865050068eead29f9fecfef8eb8817bacc7493ed03215c60931b40e69165f565fc0574e370131ebebd9b247fedafc5821aae35b71dac9
 DIST libqalculate-4.1.1.tar.gz 2172017 BLAKE2B e9dcc22ad2d102572610ddc103afc5a279cf4f63681750c6165dac40225c7e29ebb4ccdc4f54cb97031ca8684ef17e08e99478c6b200870c7858e832a7588f18 SHA512 7a0f2fac6c96247b40565bdd015f8b52dc250fa74a8d8ed4a52a6f2134fb2b628e469c0253723f22b433a8f575590a28be8c0d4aa6cfb473b58f1b2c63707956
+DIST libqalculate-4.2.0.tar.gz 2215812 BLAKE2B 393bab0d9cf5d4a3158d93bf676805d829a2103ec1dc733e3d98fd7a54ab0c42d3797dadb1cde72b1df2e13cfb691430982f5fbd886ac9f0a906b3884f912202 SHA512 105f567a3b24a1c396df0eb85f299d18228f489e4d989f0fa09cf97321494030e9a85d9cd9fe4b5dd8cc233b4329025788275ba168546929e912598dee8ef6b8
 EBUILD libqalculate-3.21.0.ebuild 1654 BLAKE2B c5b306253cf8573552a4317a2472933b38356c174d47e609f4cdb8c44345563c385844c634153c884c16d6e67f8c069d9f3f4e7af751b65f02eec38c6d58391b SHA512 3ef1a0e55ccf8b9457c3a5bd1d40d34196f201faad18e7085b1af42c8ef27f4b9fd8d2f83ae5cdc2ce698f696b200bc85e23f2b575f42d26af78ace024504cd6
 EBUILD libqalculate-3.22.0.ebuild 1774 BLAKE2B 6722314fab7a62696124df0e3813b9d3f4309900c34dff7ef30dee9b0184e8cab34131ca45d3b26bb7137d53b5761347c1e80efd5fa1f2cc6294c6ea2bea49f4 SHA512 7a14d2b32fd478eb11a597a08bb7c7e9a5f0035c94ab7b2b5b36f3a0086807d4b4c6e844a91c8176ddf8cb2be574d031c54c8cc652ead9ad2c9d25e441a67e23
 EBUILD libqalculate-4.1.1.ebuild 1774 BLAKE2B 23f655bbecef591ab2fe8b12c0c4590c5e5bbe9465e7813207561fb8b94d4a042fd9901304e12ab324bbcfdc046ac3e5682d04224eed57e88046e6193058b5dc SHA512 2c45e268d85005c089d34c2f5e6dd76c44b182ceeca3d3a0267fb739cc721d9d49471362fa119d65a8e2e13daadc439273caf2a7e4017a2f02ebb94fa89576f8
+EBUILD libqalculate-4.2.0.ebuild 1774 BLAKE2B 23f655bbecef591ab2fe8b12c0c4590c5e5bbe9465e7813207561fb8b94d4a042fd9901304e12ab324bbcfdc046ac3e5682d04224eed57e88046e6193058b5dc SHA512 2c45e268d85005c089d34c2f5e6dd76c44b182ceeca3d3a0267fb739cc721d9d49471362fa119d65a8e2e13daadc439273caf2a7e4017a2f02ebb94fa89576f8
 MISC metadata.xml 413 BLAKE2B 40f271cbe3f5ca30aa6ec6320d382faef0864e064ae57599a6da937da85b4de9d57eeec6f8b737698ede76d663149b13247d1edf8b5b291de19ac3d6b5266492 SHA512 053e75b77c4ff628535db22d9763e27c32cee904f0b268d2d507f367c938aff5bdd75a66e3f4c2316dc1d3db579d721564d3a12e139740a3a0d50c36f8d52e94
diff --git a/sci-libs/libqalculate/libqalculate-4.2.0.ebuild b/sci-libs/libqalculate/libqalculate-4.2.0.ebuild
new file mode 100644
index 000000000000..793186d66e2e
--- /dev/null
+++ b/sci-libs/libqalculate/libqalculate-4.2.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Bump with sci-calculators/qalculate-gtk!
+
+inherit toolchain-funcs
+
+DESCRIPTION="A modern multi-purpose calculator library"
+HOMEPAGE="https://qalculate.github.io/"
+SRC_URI="https://github.com/Qalculate/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+# SONAME changes pretty often on bumps. Check!
+SLOT="0/22"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="curl icu gnuplot readline test"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/gmp:=
+	dev-libs/libxml2:2
+	dev-libs/mpfr:=
+	virtual/libiconv
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	readline? ( sys-libs/readline:= )"
+RDEPEND="${DEPEND}
+	gnuplot? ( >=sci-visualization/gnuplot-3.7 )"
+BDEPEND="dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF || die
+		# Required by make check
+		data/currencies.xml.in
+		data/datasets.xml.in
+		data/elements.xml.in
+		data/functions.xml.in
+		data/planets.xml.in
+		data/prefixes.xml.in
+		data/units.xml.in
+		data/variables.xml.in
+		src/defs2doc.cc
+	EOF
+}
+
+src_configure() {
+	# Needed for po-defs/Makefile
+	export CXX_FOR_BUILD="$(tc-getBUILD_CXX)"
+	export CXXCPP_FOR_BUILD="$(tc-getBUILD_CXX) -E"
+
+	# bug #792027
+	tc-export CC
+
+	econf \
+		$(use_enable test tests) \
+		$(use_enable test unittests) \
+		$(use_with curl libcurl) \
+		$(use_with gnuplot gnuplot-call) \
+		$(use_with icu) \
+		$(use_with readline)
+}
+
+src_install() {
+	# docs/reference/Makefile.am -> referencedir=
+	emake \
+		DESTDIR="${D}" \
+		referencedir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+
+	einstalldocs
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sci-libs/symmetrica/Manifest b/sci-libs/symmetrica/Manifest
index b3c5a4746fcd..905ab97f2cdd 100644
--- a/sci-libs/symmetrica/Manifest
+++ b/sci-libs/symmetrica/Manifest
@@ -1,3 +1,3 @@
 DIST symmetrica-3.0.1.tar.xz 789336 BLAKE2B 88521356bdc006413e0922b49b23f345da96bbe8cb2a4a6ae12bf53fe46150078f086e6d1f6e514817453f2a868b6eb578b716c05f5459397ed8d766d321ec24 SHA512 1e4c42e1ae9fcdf246dff1c1f01522d6cd416c12302363f82356018847df2f64d2f5ea6256459832d195e8e333ae14743794d5a53346e92d8ba1bb1c0949c271
 EBUILD symmetrica-3.0.1.ebuild 530 BLAKE2B b9a3cd7f3edacb76e66acceae8385a7c86bdb353cc460c22b7ea3a955c24e3f45dc4dda3ef571b6b11975917d598f9419c89f30601bc20eb6c9de807e3dbdd49 SHA512 7915db0df900b3cd85c0633beaa280fefd9556a59c3a9917120edf4301dc480da1887c9242a2f015a576e3582e5de08539aada45ed54cda60550e15201c40649
-MISC metadata.xml 789 BLAKE2B 3c2a8e6deffce4bf791da0e2a0009b42a5e9ae94e7311fce239c53faae0c60b71f862ae39d3d4201bcde0438c493dfb82ea4a9e5f736c92a2ba3f901b178ed8d SHA512 b2ea369de62bcdf7b2e10ab69a25dee1b278ef88a3bf921bace29301ca94a954d61ad5d2d45631469a4e648df8173d80d1a29b8682c231235ebc1b41c4f8deb9
+MISC metadata.xml 770 BLAKE2B 6a6035b830992a2d990f2bc0de458622f15c2d423f270ee542d6af9af128032f41108a9b9c3d40360e6847c0fe4c5bb10ca68564246a2c8ee2f2a96b3bb79d4e SHA512 aa5e5ea606826363afe447924f02f7800197dce9ef928558ff9a3b6f95bb3229747e42c4e004bcb76fd0faea34f9d807c6b720ffdd16b9b35e394f1330386f09
diff --git a/sci-libs/symmetrica/metadata.xml b/sci-libs/symmetrica/metadata.xml
index 478938a9d0fc..dd46d20f6c33 100644
--- a/sci-libs/symmetrica/metadata.xml
+++ b/sci-libs/symmetrica/metadata.xml
@@ -19,6 +19,6 @@
   </maintainer>
 
   <upstream>
-    <remote-id type="gitlab">https://gitlab.com/sagemath/symmetrica</remote-id>
+    <remote-id type="gitlab">sagemath/symmetrica</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ba7f4f8560de..2bc19fcdc42e 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/singular/Manifest b/sci-mathematics/singular/Manifest
index cb84ff2ba5ec..bc1ee5862fc8 100644
--- a/sci-mathematics/singular/Manifest
+++ b/sci-mathematics/singular/Manifest
@@ -5,16 +5,15 @@ AUX singular-4.2.0-doc_install-v2.patch 2918 BLAKE2B 9b844a51165425e696db1270dcb
 AUX singular-4.2.0-gfan_linking.patch 1849 BLAKE2B 11a4ed33cab5265a3b5650270511ff38cd36422fea07ad0ae5f229761e31229d8ed61fa278d47b1326abc0919c85522d80f8085d3f2019463ae50fa48589c837 SHA512 bc1635cc592c5b624c87bfffbafb8d1c1cc094e2e629027c89255552ec15918bbdc3275605f8612cc418d4efc58efa46465d286cd9118cdf06a079ba40ff52ae
 AUX singular-4.2.0-no-static.patch 2644 BLAKE2B 466705130179efe13cd4bdccb09e0bc2a5a0efaf36536009054235f6a44af932c359cee366eef860235739c480fea84e9ca48947597d2c3aaf2e26bdb3fada88 SHA512 53dd7045d717f62817b0fd03963a8cf2ba4e88387b89e854a1cc6a2817bf975fd7e16852e948b64182d049b8c184459d4e071bbb5f8c6ca5998c4c1b964deef5
 AUX singular-4.2.1-htmldoc.patch 2086 BLAKE2B 28ab2e8ef9ad2ff1343d3efd33917503c00fb74428f35b1ab0fb1475368d3760d3c915668d4fb008ccc618e2aa1c13a35f66d3a62f8c3abe93b5275f1648c8e7 SHA512 5c28c31bc51a937ddff4e52da3ed93f20516b64ac6abfc05031d09e708e557268e757c55e625abfd77c19600f64a7f284903de619c113a57194367e23148ff82
-AUX singular-4.3.0-includes.patch 764 BLAKE2B 19c83711d2f7eb0d0971a7259f4b0ed9234204bd2ee45d0f3ffd6de18de8d71bccd00b186edae1af180a36a24fef8e72a4a8bc8371eaef1059ec51dcfec0c116 SHA512 dc775f69280f2194f6fca2a7005ab9363a8feabad3d66d0e285cd76a70da5fd9ad6cbb3e95732cf32f9c55b30a0c201260e4bef56830f498016b6554a7230f53
-AUX singular-4.3.0-slibtool.patch 1511 BLAKE2B 495d226fdd4114468364bdbee0add287d70c3d7c991e81a86c03023c2b73c85936365ebfe254b9a3e45f2043d4f9a6e385d40d4546437f34b4c6478f4f02ada3 SHA512 e62f40e51879709c1d5a409d2ff5fea49ac5b37d73b6e5fc6041756143882fd9ab2bdc4e5ec68ab1626109a27d4b8c7e361e88080ed2a3c62c7f0a1e591c69cf
+AUX singular-4.3.0_p1-gcc12.patch 2670 BLAKE2B a7dcbe6a6b93baa53ffddf5f25fbf2cea54be1fa453854ddec7b177a132ab38ec5b8cb93078c2183e43896f342231866095dbf2e453fa1952e4215abfdf82baa SHA512 7d3f80e6e2a4980872f5bbc2a41c7925f6fac7dd6184df372375bb959c098203d5551f8c5e0bcaae2bb8ff498515135c8ca2859f43b86eeb5b950e64a6d8d2fd
 DIST singular-4.2.0p1.tar.gz 14155171 BLAKE2B 444553f87d7ca8d6a62e4519c9857a6892757e92285df7c3b686913a9b51c9ae8d802c41382b0b2b6e37dc2dc496d4a10f262c98407470219cdce131e8baf127 SHA512 2ecd8940c9e8d70a93dbdb4df6da313c00151e5cb959f8eed5856e8df99089b5a03e514fbcdc70903c77df8b59fa7ef9f3b134f1de510b795fa6ea0341089bd8
 DIST singular-4.2.0p3.tar.gz 16641923 BLAKE2B 4dd7e1a42c71bbba625e171aee656580b443656f50458909ffae1af81b1413d5330aa032656032ea365225eb088491fe2a48997895e37bc89eea5f17b8fbebb8 SHA512 b9833389b648ec4ba2bd09253f00254b9ae3dc61313fc81c9003b283fc413caab4274e55750de1c342ef24a8fc0ce817643cd31eabbb2999de7f5017dfa1411f
 DIST singular-4.2.1.tar.gz 16643430 BLAKE2B 2cfc33bd59a5e8756c7ce022ad2b38477a0d7a6747b3c4fd4b1b168cfd179ace52121506cda2c4d5f318abca72231c74f649ede349b17b5f138083428d9da766 SHA512 48bebbe9c886ee56bb2f7bdd9e356bd33e357a2d707c976b8496200f422a2ba25d7c9bba22a261574428abf73a8b6b111d35236fca647e32619659059e861916
 DIST singular-4.2.1p3.tar.gz 15042102 BLAKE2B 9958c1c432f8a3516387cfe7b258d2e22e8e9fdf3874de53a803b34e353088a3ce246a90b78db43f186717985b503d2355f524ee80784e63b186d53217fdeead SHA512 1e6533fcf966499e9ad145b640e7e5878eb9738bd65535aaa517c5e98dedb09bc99bf832359e9b6dca2fff615237f855bd861820e592a885341aa82e7a9a9168
-DIST singular-4.3.0.tar.gz 15098830 BLAKE2B 9d99683c23e0fe031866807a7f24888d8e759b93ce8f454db702fee2b5200942957360edb1563f832715837f7908dbc3f37aa2a3bd1224dcf7eaa8594fc0a51f SHA512 b765536fc929f2445a3f7bea73a6a351ff98fe3326b9f3ba99c5b1cec3bfb494ed957725aad548e349a2a3f8a4058ef350ab11e7153091c9b0233f201008bbb2
+DIST singular-4.3.0p1.tar.gz 15097535 BLAKE2B 0afc8adea054ccdf68f276b3c4c25e55f938ef9cf9c85fbab86163c6d6839dcfb3d8e1632c135d4d3c978477f165d58727d35c6aaac2f39b4b6f942ca8bbb062 SHA512 af4d3377e9ea8f0b5f34db42c36817e8cf47717accba40c151b68213d8e0832bee71e480e22c60fcc6ced619f6117c24f6d18b87cf66406a175b38e3a7aece69
 EBUILD singular-4.2.0_p1.ebuild 2259 BLAKE2B 2237245fe2550f398a20a14ae599bcc668288aa6312925cee725e2571dc53f8f62f88bdff0cdf8cd303c72baaf2861a2c560ce54978da720e93cbe459769b7d1 SHA512 2a6b8e478f32ff9e3df96e0188cd137b16d9be1a8c18c9f5367a81b96dc8b0cc01d34771246001eee9e8ec9832f8832539e921879ec56fe8a51ebb42c0d29389
 EBUILD singular-4.2.0_p3-r1.ebuild 2428 BLAKE2B af72aae39de23df410fe1d6dfe475c3179f6355fffe1775d4d408bec6fe80aa37022e6a9838a45014488666b56cfaa627f1fc1d007d360fbbe6987f4b3ead197 SHA512 0921b4991019b449054fb7c7c60a9bd39ec6434a19321b79f63470f2e15889945f24bc15f48e12ba16a24ff23c368a73b0b062d0150104d39aa715511766bc55
 EBUILD singular-4.2.1.ebuild 2571 BLAKE2B 7ccf61735ce3bfd5472b646dceb77239430d44bff9816ea2c1a5cd1cd4807c0138ec2396a193c98b7c3b456a36ee72c6351ff95f949f3afa318b5955a14a014b SHA512 1aad8be5aee15235c8f4a865ec8e3e19c3cac61ae6c8db39e7a7f614119fa2dfc1869a7ce9cc6fb896a5ffb455c65e90b2fc91cf98d5b0a3e193941deadc807c
 EBUILD singular-4.2.1_p3-r1.ebuild 2628 BLAKE2B 5ff968e3c06d722d2f1c0c872ea4c541e9e5e90bda4e8af8e54ba38aba21464ed8f7cfea727883de0ed34831f12c780ed45dd2a038856a19d142200d0073688e SHA512 8d0e74684f138c08288ac642ad0450a364c5b0deb6f805680289408d54fee563cadd32a81297a48e8148679b537903190e8abba069a60e38e06cb8bc10b6ee75
-EBUILD singular-4.3.0.ebuild 2499 BLAKE2B b03d3c8a01eeeafea83d23c3cd6979239b2be9febabd42b81774676ae44d8df64144f734e3d202e2f916d1a186e9ce1b5e38ce844358d373cd56cd68ac73245d SHA512 27bf7a713bbbb23046a05961e91c2249c7a3240ef37925b4d9873f2def8ec8d9ac5f92f92d893ea9cbb036c0de462347d20c262be1e3bc6a6412a3442d101aee
-MISC metadata.xml 510 BLAKE2B 54fa3549c356ab3cb45b859dda337a25959bee37acf1210704b79de849e5b9861b9f0d85639d11db461995074ca00c91fb0dce8459231ef42f76257c8f0a6e51 SHA512 d2f4ec93fe340097a9a09845fffcd4a385434fb267350bb8dce9eae9248487b87cb3b68e0e1e05a1c78ad956a48548f47663a2f4db84af0d68ade02327df1268
+EBUILD singular-4.3.0_p1.ebuild 2442 BLAKE2B 414fb3fe1752c58e0eb776e337ce3c8fb1f36488856a1f103d71a52495b9200b83bf73c3bca369681584ba65642cb54ba7996c0362f54791d242077ef5cb14e8 SHA512 e9d0287082cfcd5143858033dff722ec98d48091cb21145b7bbc5cfd66c4eca745e73033134a3c23e3a7c9081a9b489aac1c0ef8d1cea7d52403fc7f27a3e2ee
+MISC metadata.xml 782 BLAKE2B 7f10704c78b5a55cff9d07ffc3456a57aba4001ffd337dfbbb712e32608446ab9ae8039d14143939ad41710dcc6d4725992db2c80bcd1678397e563fefa929b4 SHA512 3c4904a4a8f63ff073745409caf9a9a68aa5d46861b8e8d77a538716a7a6a099d87137d604e52a3b8ce4ab81b7333f95389cd888ccbabe52017b6e8b1e4a77d0
diff --git a/sci-mathematics/singular/files/singular-4.3.0-includes.patch b/sci-mathematics/singular/files/singular-4.3.0-includes.patch
deleted file mode 100644
index 07df5c0cc068..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From bbc293564bf76fcdfdc37354d406b7ca77bc780f Mon Sep 17 00:00:00 2001
-From: Hans Schoenemann <hannes@mathematik.uni-kl.de>
-Date: Wed, 19 Jan 2022 15:02:14 +0100
-Subject: [PATCH] fix: missing includes
-
----
- kernel/oswrapper/feread.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/kernel/oswrapper/feread.cc b/kernel/oswrapper/feread.cc
-index ccdd272285..5491007478 100644
---- a/kernel/oswrapper/feread.cc
-+++ b/kernel/oswrapper/feread.cc
-@@ -7,6 +7,7 @@
- 
- #include "kernel/mod2.h"
- #include <errno.h>
-+#include <stdio.h>
- 
- // ----------------------------------------
- // system settings:
-@@ -21,6 +22,7 @@
- #include "misc/options.h"
- 
- #include "kernel/oswrapper/feread.h"
-+#include "reporter/reporter.h"
- 
- #if defined(HAVE_DYN_RL)
- #include <unistd.h>
diff --git a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch b/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
deleted file mode 100644
index 72d88979e870..000000000000
--- a/sci-mathematics/singular/files/singular-4.3.0-slibtool.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/libpolys/configure.ac b/libpolys/configure.ac
-index ba7d911..346602f 100644
---- a/libpolys/configure.ac
-+++ b/libpolys/configure.ac
-@@ -88,6 +88,7 @@ AC_CANONICAL_HOST
- 
- case $host_os in
-   *cygwin* ) AX_APPEND_LINK_FLAGS([-Wl,-Bdynamic]);;
-+  *) AX_APPEND_LINK_FLAGS([-shared -dynamic -export-dynamic -avoid-version -flat_namespace],[P_PROCS_MODULE_LDFLAGS]);;
- esac
- 
- dnl INCLUDES=""
-diff --git a/libpolys/polys/Makefile.am b/libpolys/polys/Makefile.am
-index 23f216e..119c4ef 100644
---- a/libpolys/polys/Makefile.am
-+++ b/libpolys/polys/Makefile.am
-@@ -69,12 +69,10 @@ p_Procs_FieldIndep_la_CPPFLAGS = -Dp_Procs_FieldIndep ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldQ_la_CPPFLAGS = -Dp_Procs_FieldQ ${P_PROCS_CPPFLAGS_COMMON}
- p_Procs_FieldZp_la_CPPFLAGS = -Dp_Procs_FieldZp ${P_PROCS_CPPFLAGS_COMMON}
- 
--P_PROCS_MODULE_LDFLAGS = -shared -module -dynamic -export-dynamic -avoid-version -weak_reference_mismatches weak -undefined dynamic_lookup -flat_namespace
--
--p_Procs_FieldGeneral_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldIndep_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldQ_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
--p_Procs_FieldZp_la_LDFLAGS = ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldGeneral_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldIndep_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldQ_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
-+p_Procs_FieldZp_la_LDFLAGS = -module ${P_PROCS_MODULE_LDFLAGS}
- 
- P_PROCS = templates/p_Procs_Lib.cc
- 
diff --git a/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
new file mode 100644
index 000000000000..570d0be87a29
--- /dev/null
+++ b/sci-mathematics/singular/files/singular-4.3.0_p1-gcc12.patch
@@ -0,0 +1,76 @@
+diff --git a/kernel/oswrapper/vspace.cc b/kernel/oswrapper/vspace.cc
+index fa42bf5e28..aefa661600 100644
+--- a/kernel/oswrapper/vspace.cc
++++ b/kernel/oswrapper/vspace.cc
+@@ -197,7 +197,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -245,7 +249,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size + (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -275,7 +283,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
+@@ -751,7 +763,11 @@ static void print_freelists() {
+ 
+ void vmem_free(vaddr_t vaddr) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr -= (sizeof(vaddr_t)*2);
++  #else
+   vaddr -= offsetof(Block, data);
++  #endif
+   vmem.ensure_is_mapped(vaddr);
+   size_t segno = vmem.segment_no(vaddr);
+   VSeg seg = vmem.segment(vaddr);
+@@ -799,7 +815,11 @@ void vmem_free(vaddr_t vaddr) {
+ 
+ vaddr_t vmem_alloc(size_t size) {
+   lock_allocator();
++  #if defined(__GNUC__) && (__GNUC__>11)
++  size_t alloc_size = size +  (sizeof(vaddr_t)*2);
++  #else
+   size_t alloc_size = size + offsetof(Block, data);
++  #endif
+   int level = find_level(alloc_size);
+   int flevel = level;
+   while (flevel < LOG2_SEGMENT_SIZE && vmem.freelist[flevel] == VADDR_NULL)
+@@ -829,7 +849,11 @@ vaddr_t vmem_alloc(size_t size) {
+   assert(vmem.freelist[level] != VADDR_NULL);
+   Block *block = vmem.block_ptr(vmem.freelist[level]);
+   vaddr_t vaddr = vmem.freelist[level];
++  #if defined(__GNUC__) && (__GNUC__>11)
++  vaddr_t result = vaddr + (sizeof(vaddr_t)*2);
++  #else
+   vaddr_t result = vaddr + offsetof(Block, data);
++  #endif
+   vmem.freelist[level] = block->next;
+   if (block->next != VADDR_NULL)
+     vmem.block_ptr(block->next)->prev = VADDR_NULL;
diff --git a/sci-mathematics/singular/metadata.xml b/sci-mathematics/singular/metadata.xml
index 0477525e4c04..0deaba87eadc 100644
--- a/sci-mathematics/singular/metadata.xml
+++ b/sci-mathematics/singular/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>frp.bissey@gmail.com</email>
+    <name>François Bissey</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="project">
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
diff --git a/sci-mathematics/singular/singular-4.3.0.ebuild b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
similarity index 93%
rename from sci-mathematics/singular/singular-4.3.0.ebuild
rename to sci-mathematics/singular/singular-4.3.0_p1.ebuild
index e2ccc7d6e9a3..f46ae019c973 100644
--- a/sci-mathematics/singular/singular-4.3.0.ebuild
+++ b/sci-mathematics/singular/singular-4.3.0_p1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools elisp-common flag-o-matic
+inherit autotools elisp-common
 
 MY_PN=Singular
 MY_PV=$(ver_rs 3 '')
@@ -14,7 +14,7 @@ MY_DIR=$(ver_rs 1- '-' ${MY_DIR2})
 DESCRIPTION="Computer algebra system for polynomial computations"
 HOMEPAGE="https://www.singular.uni-kl.de/ https://github.com/Singular/Singular"
 SRC_URI="ftp://jim.mathematik.uni-kl.de/pub/Math/${MY_PN}/SOURCES/${MY_DIR}/${PN}-${MY_PV}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_DIR2}"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD GPL-2 GPL-3"
 SLOT="0"
@@ -37,8 +37,7 @@ SITEFILE=60${PN}-gentoo.el
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.1-htmldoc.patch"
-	"${FILESDIR}/${PN}-4.3.0-slibtool.patch"
-	"${FILESDIR}/${PN}-4.3.0-includes.patch"
+	"${FILESDIR}/${PN}-4.3.0_p1-gcc12.patch"
 )
 
 src_prepare() {
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7d5da506d893..18952b4f87df 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 0fcbd1bdecad..23a701297da1 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -2,5 +2,5 @@ AUX accountsservice-22.04.62-gentoo-system-users.patch 1318 BLAKE2B 69c74ad620ce
 DIST accountsservice-22.07.5.tar.xz 101688 BLAKE2B db8e5001f0b81b89c105d15557d5c62251ca58e4fad08f3cbfd52881b05980ccbb693766347c5cde640dcf3823a59f667fe15ec0c8e04cdd226915f91cea90a6 SHA512 9099abc9d8db58672db01e6ba9b23ba7bc8ed910ac001499d2a241089f55eafac47a482811cba80b1d6ee11df03a384e8ef2fd87df3b1125a8cf97c580177534
 DIST accountsservice-22.08.8.tar.xz 102672 BLAKE2B 7c9436d3845fc1883772b434c4f9e2fba934d17e6d4452a6be65e1d790a23b331eaaa64b0e6eff6fefe79587a40cf1749a0f3de09f323b10740046bd9d145c9d SHA512 2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8
 EBUILD accountsservice-22.07.5.ebuild 2014 BLAKE2B fe0b88fdd68bcce8774090c8c043e61aea1cbfc85b02dac1f85b08d54d3d89c2ec45d337eb357e9e53762c6e01ef4c9a258775c9de0f76837011074904b5ba30 SHA512 43b7f3e683bbafacf13ff0a87f372b3c4372091545431601558ea40ef3af91f59b1e7f66e866bfc04eba0ed47e19e551fca959efad2dc9febac2bf2b9da7c128
-EBUILD accountsservice-22.08.8.ebuild 2020 BLAKE2B 778e776279e9aaef2f96ef85f9e9f1e540090d7c9db2130a216019716d08bee5eda49d051f3744e27b3c5baafc4dbbc4325a09182b97fe409ccb2d3d0cf67190 SHA512 254de9eff3009c5cf7b37497623d7437d1b5002bedce233efc8fb59afd6650c79256a9f4a56febdf66390a50afd31967b2a69c6ed720cf3fbf697cf82ae75096
+EBUILD accountsservice-22.08.8.ebuild 2015 BLAKE2B 0a0f418ca38aa615d2e8387460205d4f2a9f893e257e308eedcbb279b0b4d67e130197eb361f58a3b1ed7c35daaceedddedf4db93d1614f7393999389e857eb8 SHA512 644a468ce68535d6135bade7e94c69332dd39b7c690f8d84b4b0388415e92e508f9fb17386264a69fc21b8ff1be8dd6f90468f5553eba7cde6f9c3d31b94e81b
 MISC metadata.xml 435 BLAKE2B 15950bf42bdf008f146f8bb89c9b8f29734eb244c7c8f664d6b9cfef3999b241de1fbec5bec7ed9cd874875a49b814001662122b488e5137a83f4ae6c8eef7aa SHA512 a5c93f2a4ab9453a20e6a6f9de924f5eff56a3e16a994c6ff09892a4739dbddc4d422bf4ad4d20c0772433932542b797277c2109bd39695588c1c02ef3d172dd
diff --git a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
index cc2ca7bb4783..b131b531bc21 100644
--- a/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
+++ b/sys-apps/accountsservice/accountsservice-22.08.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="doc elogind gtk-doc +introspection selinux systemd test"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 370c96f14d16..6f7a7a2b3182 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,5 +1,5 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
 DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
 EBUILD baobab-41.0.ebuild 854 BLAKE2B 6e723adedb979773babe606eb4ed3052d84219d787b770048811f2740219ed5404860ee7e91d4cd97a963168e3a313d3f9135c4190e43d44a6c141fbfb2bc005 SHA512 b38a58f149cd86dbf2b34a9c541cc5d1c0dc310895792a6f86e25cf651c15667f279610826e56d7289313b46a561061af102d2392d65946abd1065a6e4956f03
-EBUILD baobab-42.0.ebuild 862 BLAKE2B a0e7c8ba6fd7a53131830ab981c83339504ac8b3f6805c9b3396e915deb38152adece0603d3a3b81aa8b4e179ffb0f85d6c8b552423871497a49a347b0d66564 SHA512 eac035f55e9f18f6a00661ee8fcbc98ae55a436b43f4a9bf689ea16f5bef65f9ebb167bb4f6e9617912ee11b31a00e3b59a21c812321287c9ce7a5133b813722
+EBUILD baobab-42.0.ebuild 859 BLAKE2B 0f3863b0420f9e26de47c5df7196485275b5f7d43f77796552d4593362f029c3a6f7681754d4152b33c8b61ef869153ef013be8ab3efc0709620b5b7eddb4287 SHA512 96a67fd627c121803c1ed8d272c4b1821ca9fac7dcaed8f4358b37c27f6802e0e2ad1abb65e0455c65ff830c82442922d201366553a3a327d983d2af90f40d05
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/baobab/baobab-42.0.ebuild b/sys-apps/baobab/baobab-42.0.ebuild
index cc4663c4af8f..4f8edab65309 100644
--- a/sys-apps/baobab/baobab-42.0.ebuild
+++ b/sys-apps/baobab/baobab-42.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 49fd620ddc91..f08911ba223a 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,9 +1,6 @@
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 DIST baselayout-2.8.tar.bz2 30236 BLAKE2B 0bac62dd5585f1f550da8c99d06a7f8ab6cdd473b0499a8f0ac58a5c43e3883b42adb7f80c172d894fae93a6ddb6fec7a65cad9897f4a2532b481c82065ed96b SHA512 506d7cc8399b530eabc9ba2d16cbb6c024350f9487a2a9168c670cee9876f62e5a716942f698c4883013d6ccc9591c2d7fc2ac9d782f0ce8d724371ca94c739a
-EBUILD baselayout-2.7-r1.ebuild 10142 BLAKE2B d5fcfe38f93a7b021d8f47d2ca9b486d82c2185409a3ea97383dd7db6e4e88efdbd8f07f6a3429461f0af6d12fa2dfb3c607c2f7d9c5caf1fe34373daac2cf67 SHA512 67156fe954f8331b6ad3512ecaea06b2bb53b58088b66ed477e0dfab23f17775d88c99ebbc80fc20cb49799949a34aabef383020567a6a007d94aa368638e1fe
-EBUILD baselayout-2.7-r2.ebuild 10129 BLAKE2B a0686d516c4cdb93d71fd7fe31608ed876e7151b260a67f7632fded30249480466719cdd4b6b47b7089e85b08e4397de77cbc1dfe13b495aaab89c9af2adb2c2 SHA512 c7eab722aa5b3772fff5b6b3afcfc1895401d380a91cc2dbd27a392397efa43baa1ced9bcf195bb05c2fa990ac7b1113df5f6af094189105a7ec2692ef19ade5
 EBUILD baselayout-2.7-r3.ebuild 11228 BLAKE2B 347ce18e044de38deea4d85f5409bb6987a81abea68f1cf0a4fc6374c698f4b2ffebd1fbb5becb0ac0c7c1f8572be908bde71600008246c59450e07fe5d9fe28 SHA512 768412405896189e96a4ac59303bc6e96208c04d0518e0f980714d07db25389b97c4b84c2b070623765c3be6e6e609989267a306389d32da4c420dc3d329203c
-EBUILD baselayout-2.7.ebuild 9969 BLAKE2B 36c160b617b7cc4ee7e71d193dae0af3728533c5500e02f3278946932fdbbbee7c7f613ac681fa8abb8f249f7b4b4589e531ebf550002735acc7f08a23175c78 SHA512 e9c61341751b7fd67e49e4d4dbd9317ff606b15f143be1e40ba571a36ec2fb029ef3166b50f5b5da58ed2140718f23287709a950000ee151724d4914440fc1fb
-EBUILD baselayout-2.8.ebuild 10856 BLAKE2B 5a48e3831d7127d7f9ad7e02547f29dd7b37f970a6ce72a395acec62c29b67863ef0a9a0b84cea456f07213bdcb2e6c65b1b4aecff3bbbc57ca1b923c793bc99 SHA512 d8e720850b97ab53c6576e1b554c6ee41b4b42fdda1bb550092392b8d4042abdec8736ccfc3101578b13def0d6ba191f2a4d97f82cab35d4448649eab52db16b
+EBUILD baselayout-2.8.ebuild 10848 BLAKE2B 26d38e365dbf423731b1cf35fcd2efe208961ccccdafc184b2fecc78eee79a1d73f3393cde33ea4c95baa8b834514f08d936c321d7e872372c981656c6172801 SHA512 c995e87684b5fd1c66553aeb60623d713b3eeaf6719af0d237ae4f26b3ad2e3422fb27dcb0c89d6f2b4b0e03be40985804181a045457ff4178e06d910e464102
 EBUILD baselayout-9999.ebuild 10849 BLAKE2B e9cb3a4a05c4f128886fb7a0a10fbc0e1cc8f57ee9da1473b5560f664f5ad561103c5e08ad9979e10865cfbf0c9a136dce84a4ed224831a22df86666ce8406e6 SHA512 10fcfaffff8ce37bcd0a6385d2e3efcdbd7bd476571d09c75877aab384ad0af7e8cdeffcf79096b28bc62b101b7b71199e791f765c0968ee6cf796b746b75a88
 MISC metadata.xml 383 BLAKE2B 58d0d7a9d2b0e355ca13061b798db482b1894cb805e4c7f70d9b64f301f34aa784ec56783cb670e3c35a69ad383feb3c29d0b8f8164e5e05e24908127759a4aa SHA512 49775deed8635ddd8492a86887c85043e2a16ec46508c08c9eb669eee0aa29db1974c20a338fa09703bfc73fbff29c56d043b2749c0e7046347eb8186da59193
diff --git a/sys-apps/baselayout/baselayout-2.7-r1.ebuild b/sys-apps/baselayout/baselayout-2.7-r1.ebuild
deleted file mode 100644
index 69b7db6825d2..000000000000
--- a/sys-apps/baselayout/baselayout-2.7-r1.ebuild
+++ /dev/null
@@ -1,317 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib versionator prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die " Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/bin:/bin >> etc/env.d/99host
-		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr; then
-		sed \
-			-e 's|/usr/local/sbin:||g' \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README || die
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	# This is needed for https://bugs.gentoo.org/732142
-	dodir /usr/lib
-	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
-	dosym ../usr/lib/os-release /etc/os-release
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}etc/${x}" ] && continue
-		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.4 ${x}; then
-			ewarn "After updating ${EROOT}etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ! version_is_at_least 2.6 ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
-		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.7-r2.ebuild b/sys-apps/baselayout/baselayout-2.7-r2.ebuild
deleted file mode 100644
index 3e57665e1bf2..000000000000
--- a/sys-apps/baselayout/baselayout-2.7-r2.ebuild
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
-					libdir="${libdir%%/*}"
-					dir="${prefix}${libdir}"
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die "Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die "Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/bin:/bin >> etc/env.d/99host
-		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr; then
-		sed \
-			-e 's|/usr/local/sbin:||g' \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README || die
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	# This is needed for https://bugs.gentoo.org/732142
-	dodir /usr/lib
-	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
-	dosym ../usr/lib/os-release /etc/os-release
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}/etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}/etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test 2.4 -lt ${x}; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ver_test 2.6 -lt ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}/{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
deleted file mode 100644
index b9c1e7df5282..000000000000
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ /dev/null
@@ -1,312 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib versionator prefix
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build +split-usr"
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in "${prefix_lst[@]}"; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep || die
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" || die #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep || die
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
-					die " Unable to make ${EROOT}${libdir} symlink"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile || die
-}
-
-src_prepare() {
-	default
-	if use prefix; then
-		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
-		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
-		echo PATH=/usr/bin:/bin >> etc/env.d/99host
-		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
-	fi
-
-	# don't want symlinked directories in PATH on systems with usr-merge
-	if ! use split-usr; then
-		sed \
-			-e 's|/usr/local/sbin:||g' \
-			-e 's|:/usr/sbin:|:|g' \
-			-e 's|:/sbin:|:|g' \
-			-e 's|:/bin:|:|g' \
-			-i etc/env.d/50baselayout || die
-	fi
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
-}
-
-src_install() {
-	emake \
-		OS=Linux \
-		DESTDIR="${ED}" \
-		install
-	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README || die
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}etc/${x}" ] && continue
-		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		if [ -e "${EROOT}etc/${x}" ] ; then
-			chmod o-rwx "${EROOT}etc/${x}" || die
-		fi
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"run || die
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 2.4 ${x}; then
-			ewarn "After updating ${EROOT}etc/profile, please run"
-			ewarn "env-update && . /etc/profile"
-		fi
-
-		if ! version_is_at_least 2.6 ${x}; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr" || die
-		fi
-	done
-
-	if [[ -e "${EROOT}"etc/env.d/00basic ]]; then
-		ewarn "${EROOT}etc/env.d/00basic is now ${EROOT}etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.8.ebuild b/sys-apps/baselayout/baselayout-2.8.ebuild
index d237814a2a9d..5767ed31ca80 100644
--- a/sys-apps/baselayout/baselayout-2.8.ebuild
+++ b/sys-apps/baselayout/baselayout-2.8.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 2c32a5918cb9..4f111d49a98b 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -3,6 +3,6 @@ DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a8
 DIST bubblewrap-0.6.1.tar.xz 145500 BLAKE2B 8f8f69c5314843be1ac8c52d462ce2b17fc88760274b71837793a3e8dbf87623b80b7ae094131cee896644b53f4761388638d21b1575d1887eb755880bb05845 SHA512 68e07812ff5e01de2b7a0ce66e8386ca3662fd071d4e9b4c4afa611c1589c0ed116e0ebb4c03eae3f707f908d86945e157f8b26ff872c2814889dde92df9c60b
 DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 EBUILD bubblewrap-0.5.0.ebuild 1062 BLAKE2B 9ba535294ccb822020fbf22e435ca43cc5634e3da93e7075d243a6cc5d9635d4a153a45bddfb222a43b225cc2d1f8371882e5fb69002a0155836ded53122b87f SHA512 80325583f448ead83579c1c76daa25532066c6596ca0b3b75636e30323093aa751fe12e682c440c71d0521ef68a6ed0365a9123b0bc0b721eb59cff43c04f550
-EBUILD bubblewrap-0.6.1.ebuild 1221 BLAKE2B 5e8c71cb6940903495fab06e9aaf0695bac8d90a2d6faf502f1579fe826c9b1f6fa1bf713fc4889e3adcff5867ec3b8f50fea23a02dbc8c30f92e1736e14ae70 SHA512 fb0ce3dc2d2f2f6f659f4c2daf337bd052de4dfa3885063783da97b985a17bf3b9e024b72c207fc2cba6f9b996bd5a5d7a51995c581a7d2f865e4843a6615400
+EBUILD bubblewrap-0.6.1.ebuild 1216 BLAKE2B 58ad8eaa458d9c15dfce0325719800bbc82dea919b913a234cfef71d27cc5871b2416a68734e463cf5e6825a522e8f5cc16beecbc2859d4eb7fd718632af61ca SHA512 62d509881ce5bddfa415ad1a12b642531a706845d31393fdb9fe3940d84f955e2e3ca7268173237c7bdf1d27bd3c29d79898fd97cce735a7aab80ab7e7cf75ae
 EBUILD bubblewrap-0.6.2.ebuild 1165 BLAKE2B 17f32d614d714566ef84a67c8dab74c32ae93ef741d7c4be9315bc906f4530e87c9f75fbde89a34cd5a6fc9f24ee2aa4dde2a9200f829a73229fc0d2eda00e27 SHA512 072b5c5ddca147b3e5e30e865d5590762e9e53f67fd8bfc73757a797685307e32c76791b4fe197d042a7f8c1e7f570c87ecf2d341d90de7e3ce9330448992775
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
index 388a422db4d4..92ac0547965b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index 30b4796f2543..c5c76f4153af 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -2,5 +2,5 @@ AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692
 AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
-EBUILD dstat-0.7.4-r2.ebuild 1302 BLAKE2B 780501a45604b7a4201662fa4e4ba0474ac9c4677c86ccca0bcc064e3c39697214d59f743c4aa01d145319e2149f852ef8ab69b26263f53f6f9d56ed060c7a43 SHA512 4ff2b59b7ac8d6d5f55ad0740ef964cfc8fba7b8ce13a044aabd8efd0cbd4ba41077f8ead34a2e2ea11b2e45957d461980509ea281cad66c6882e16a4a78b433
+EBUILD dstat-0.7.4-r2.ebuild 1303 BLAKE2B f433402a14aff70eebd763aac320c6faa98f61e35886ca90b84f0f203d877f7c8739e8d9d882f283cacf16021fc3a73be74e3d27d9e1e30f06e48e4885bf809a SHA512 3bf82d8be5981235010132fb6958fd709701da271fb2ebb7450dc4d046f3e014fb9daaf556448498aea7813bb1bd0c277d3c3043421b501bcabd6fb900296dfa
 MISC metadata.xml 897 BLAKE2B 23501d288b9bd4cd5fbd432bcf441ea433156717f1f940407e2dc3c1e3b7a4858fb9002d794b1acd44a5549ad9a477f506a0ac2d5cd3ec94f6959ee76c6d142b SHA512 12c6151da673209b4d679df4e47d99dbe8163462d1410e4f2f177e944f944e72aea751b07c1d105b8f7e235928a4ea690cc140b41ebf58095677fca4c652ff23
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
index bdaa4b1c23aa..323a3d46c5d9 100644
--- a/sys-apps/dstat/dstat-0.7.4-r2.ebuild
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit python-r1
 
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index beaea7259e83..3b80955d49bd 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,8 +3,10 @@ DIST fakeroot_1.25.3.orig.tar.gz 126884 BLAKE2B a6a860a8714bb2a43f2820bc586cac38
 DIST fakeroot_1.26.orig.tar.gz 549685 BLAKE2B d9177403d9c2be88c0949c891cde5742a405027714b07ca2c7e72813dba049157c3d994f30b9c634016a74c74745f8391ee51035cbf385ef63364d0a31291d43 SHA512 dad193b283b48a25806c5bcd06d1f5bbd183ccd40a3fc25f3e7bb88fd6579024f958321f8336654348a1d0a547d4ad19ed11aab5ec9441d6ef493ee6e4c78081
 DIST fakeroot_1.27.orig.tar.gz 544301 BLAKE2B 5e887d43c8bedaecbe51eb7f606d6bace3a9f191a7cf4be32362e1ba97e438413f04ed644532d3a386a46f3a569bf0104c4f38272e5ff46e3705c17896fef972 SHA512 cd98b8cd1064a5a11c6f25bc1d9cb1fb1bf0787f50772fead301470d1769c08a89a1510402b099af334d9f126cea5d3bd5d73e27fb91b5afc1ceebeb9ec3f926
 DIST fakeroot_1.28.orig.tar.gz 546234 BLAKE2B 1182ce0d382511c92bd0d414fc43150db86753ade8ca09a371fce404afc271458626b89c5df329a5aa8911a97cac9eb4132a8f20c9ab2e4e8196c92c8f42c08e SHA512 cd55007014da5741ff336d005a80633a2f1ed856e075162acb9a4a1edd5c6d17ec74457c8a1e31edb02ae70920904c53e69365d55bd9beb7e8c6211aa8cfca8b
+DIST fakeroot_1.29.orig.tar.gz 549383 BLAKE2B ccdc5e793ce6a6adc9ffdb9346045e144dcd802ca8ffcbd188010ab759861d0e0ae81b3baa256546398c2ddab31d1f795f327130cb1f7bb1c3eee07e7282e94b SHA512 d0f02c36cfe4e24f1588894bd732ff5a6fc0e921695236311019a63280efdca8568f2e974672145eb7c4d57f64a15a77d23658fd4aeef2ca24901fc66259e4dc
 EBUILD fakeroot-1.25.3-r1.ebuild 1414 BLAKE2B 91a267692babc8b0abbe427e4134da68568b4cb80394d56137e344279f372b652124d42a6f5ac62ee044588ba676a6d31f11a4d239ef67b6476eb7d3490d47f5 SHA512 64abe5083b325ee134758a0b51e25a3371757523317daffcded913024eec4b702d7c886bff4c7780605ef82d1b6ebdc005949b24780c4f3103a25d1cb9a037a6
 EBUILD fakeroot-1.26-r1.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
 EBUILD fakeroot-1.27.ebuild 1879 BLAKE2B 2e9df91ce0cbbe00cb6db58fcdbe40002d52b0e9078f1fe227d708d77a96a92e8444d5bde975705f14df0ab2ab86b4fd857dffe959b89879fd59530fa65d0166 SHA512 2aa0caf2cdcf10e1cfda448825800738d50682a2f52b86090638f1833e01245d79e47493787a3e0e0f49f7b6da4b218d2144f752704346af0da4387b10485d77
 EBUILD fakeroot-1.28.ebuild 1878 BLAKE2B c554e13742632e7e9daceeb6ee876237cca103913f2bd1c20c63df96b5c7bf48a192a8688ccc612c47ae39ba1f39d048e2e400bfe9a1da27eec879f5dfdaee8b SHA512 8a7527b6cb32ae88345b479fbfa8daf3a673b73c3d79cd980eac7871a6eded926f5925c2a90d04a90441fbe93a8f96e3a332de431efb584bd78dffae1a4f075e
+EBUILD fakeroot-1.29.ebuild 1878 BLAKE2B c554e13742632e7e9daceeb6ee876237cca103913f2bd1c20c63df96b5c7bf48a192a8688ccc612c47ae39ba1f39d048e2e400bfe9a1da27eec879f5dfdaee8b SHA512 8a7527b6cb32ae88345b479fbfa8daf3a673b73c3d79cd980eac7871a6eded926f5925c2a90d04a90441fbe93a8f96e3a332de431efb584bd78dffae1a4f075e
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/sys-apps/fakeroot/fakeroot-1.29.ebuild b/sys-apps/fakeroot/fakeroot-1.29.ebuild
new file mode 100644
index 000000000000..8d511343efba
--- /dev/null
+++ b/sys-apps/fakeroot/fakeroot-1.29.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="de es fr nl pt sv"
+inherit autotools flag-o-matic plocale
+
+DESCRIPTION="A fake root environment by means of LD_PRELOAD and SysV IPC (or TCP) trickery"
+HOMEPAGE="https://packages.qa.debian.org/f/fakeroot.html"
+SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug nls test"
+RESTRICT="!test? ( test )"
+
+DEPEND="sys-libs/libcap
+	acl? ( sys-apps/acl )
+	test? ( app-arch/sharutils )"
+BDEPEND="nls? ( app-text/po4a )"
+
+DOCS=( AUTHORS BUGS DEBUG README doc/README.saving )
+
+src_prepare() {
+	default
+
+	disable_locale() {
+		local locale=${1}
+
+		sed -i -e "s: ${locale}::" doc/po4a/po4a.cfg doc/Makefile.am || die
+	}
+
+	plocale_find_changes doc/po4a/po '' '.po'
+	plocale_for_each_disabled_locale disable_locale
+
+	# We could make this conditional and disable the autodependency in
+	# autotools.eclass but it'd make it too easy for NLS builds to be broken
+	# and us not realise.
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_sys_acl_h=$(usex acl)
+	use acl || export ac_cv_search_acl_get_fd=no # bug 759568
+	use debug && append-cppflags -DLIBFAKEROOT_DEBUGGING
+
+	# https://bugs.gentoo.org/834445
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101270
+	filter-flags -fno-semantic-interposition
+
+	econf --disable-static
+}
+
+src_compile() {
+	local enabled_locales=$(plocale_get_locales)
+
+	if use nls && [[ -n ${enabled_locales} ]] ; then
+		# Create translated man pages
+		pushd doc >/dev/null || die
+		po4a -v -k 0 --variable "srcdir=${S}/doc/" po4a/po4a.cfg || die
+		popd >/dev/null || die
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 3f9f032738b6..10d4bb8a6e4b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,7 +2,9 @@ AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c61
 DIST fwupd-1.7.5.tar.gz 4014523 BLAKE2B b7297bbf3358209464691b928b928fa029c68ae6a3bc413d514409e4382bf8a3b0d57f4febc29a24d6351481474dd8111406ffdcb11125139fbc04a33ea00321 SHA512 1c2d99d905f76ebfce65db310ba0f6c1305ecf662b58bd9f6f6597ccc79cbabed126c97f2142207c99d8373ed42575363a58d9f053f390780b7c9a19c614fb31
 DIST fwupd-1.7.7.tar.gz 4057638 BLAKE2B 197d7b8a8de64094d267bb4e2de30101373bcc52fd54d12dc2590a50f2bcebbcfe00847d19c0088d2c778743d219ee73c0237db711ad27e36f7126f7c615ccf7 SHA512 a787ffdff93f483ad97547d335c50a4db7b61bce1bc27d737b077bbedfa4676c8d6d37db94ac24083c50e3bfde8aefd4d1adb3d0e473303f454a46dde136df0a
 DIST fwupd-1.8.0.tar.gz 4103239 BLAKE2B 15d06a261be1f529573a0f3b21a54066b1b286e1d1c68ac24f3862f7e3a8855661775b369016d67fbc9797fd13dea88000e78d1a6973e489ecaa6f7f6855b3cf SHA512 8977e0b0878e46480565a32935cc008d57d3978609c01877e3a90dc594b122bed0c94613a53f0f2d3f50d8a039b09cb93787aaf7e0b5d8cf1ec1a6247fe1610b
+DIST fwupd-1.8.1.tar.gz 4143691 BLAKE2B 1606bc35e0bf15efe202ec906161e5c526d4fdd1ef1469da6aeb141539c3196cbdd603b124e805c4eb43c020fed5049b1813d6301211fa02fa4c0c2c2b8222b3 SHA512 9f3e15b977b335058d1430049f19de8a17260cdbc4e84aa728ff4e6db3deebc8725f532e9b3edb7d51a0ddc9cc9f8272449417e7345009d447b9f4b3378a4819
 EBUILD fwupd-1.7.5.ebuild 4666 BLAKE2B 947d030a4e6e65f90ce120d7c8f1b74c2096eeea9ea522da715e4ffa5359e2dc23315a79b823f016723b3f68507bf272fca29a8471e5c2388b1a1f1c6146231b SHA512 1899b4041033e23d658cc7991aed0c94252186a737616baa8d09595e97cf4cf16369478286ab2947441b81779227f48bf10b490ce3faae821e489f29a25053c2
-EBUILD fwupd-1.7.7-r2.ebuild 4686 BLAKE2B 91d1fc46a6e98eef134dc5e461ac120082720b32d2e01850ccd17f97862d74a0cfd794c82b2c57f901a746634d4755e0f87209e94fc9ac33ce12162a81aefd7a SHA512 d656fec93da9c68f998a6577be04bb88449dacf8ba5e43b805b16fe6e9d46d4b7bf36f1d1a2201fd7d1081fc6314ffa09c83c4e728a3293335b0e1a07592406d
+EBUILD fwupd-1.7.7-r2.ebuild 4684 BLAKE2B 2febf3c31449381b94a4c46589017fd7ba00f262a9fb22c9dfd660018ce2acdff582116984e5e21f8f7181345c013b8eb88f14df1052633a3c29a9cb6546af50 SHA512 677ee8f9c19fc7bcc016b301d0abc9277c3ec20f8fe21cf407f68acab52f2067bb6a3366afc8dfe175ebfdd71c5c701c27d8fc8f75e47a4544f5e7ce5cee2b1a
 EBUILD fwupd-1.8.0-r1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
+EBUILD fwupd-1.8.1.ebuild 4784 BLAKE2B eec6be280d70d15750bf9c15f875bcd5e09f4d77cb4c3b7f7f21707d45d935554cfd531dcb416fb9480849c6ce3534a31b1b78463b4bfed7f2fd79b197ea8ca1 SHA512 c1e21ddb6d20e994a7720bbcc546f1a84dfda34a813cd408ac96ba379a9d3cc2a77c5c447bc1733771dcf5553172b532fda48a9cfc2d002436c3fdf735c48588
 MISC metadata.xml 1532 BLAKE2B 0b3409cd11a20e2e2d18b42bef7fee3e14b5a8c20574345ae99de9e188b91226bf07f0fd44a7e538d07750ab6b6cf2da30df2b54729d0eb405ee280aa3816f5c SHA512 36cc547eeaaf7dc325ac5c609d48f11949650353a4d4cf7b37454cdd849d58de324f718514665ff47e6d4775a318b6142a958e1de243e43ea5446f82971a4c87
diff --git a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
index ad22abe7fcd1..dc4a17a94fad 100644
--- a/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 IUSE="amt archive bash-completion bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
diff --git a/sys-apps/fwupd/fwupd-1.8.1.ebuild b/sys-apps/fwupd/fwupd-1.8.1.ebuild
new file mode 100644
index 000000000000..cc9c6194035c
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.8.1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 linux-info meson python-single-r1 vala xdg
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="amt archive bash-completion bluetooth cbor dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi +sqlite synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	fastboot? ( gusb )
+	logitech? ( gusb )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	>=dev-util/meson-0.60.0
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/xz-utils
+	>=dev-libs/glib-2.58:2
+	dev-libs/json-glib
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.4[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=[introspection?]
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	net-misc/curl
+	archive? ( app-arch/libarchive:= )
+	cbor? ( dev-libs/libcbor )
+	dell? (
+		>=app-crypt/tpm2-tss-2.0
+		>=sys-libs/libsmbios-2.4.0
+	)
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	logitech? ( dev-libs/protobuf-c:= )
+	lzma? ( app-arch/xz-utils )
+	modemmanager? ( net-misc/modemmanager[qmi] )
+	policykit? ( >=sys-auth/polkit-0.114 )
+	sqlite? ( dev-db/sqlite )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss:= )
+	uefi? (
+		sys-apps/fwupd-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	vala_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+
+	sed -e '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+
+	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
+		-i data/builder/meson.build || die
+}
+
+src_configure() {
+	local plugins=(
+		-Dplugin_gpio="enabled"
+		$(meson_feature amt plugin_amt)
+		$(meson_feature dell plugin_dell)
+		$(meson_feature fastboot plugin_fastboot)
+		$(meson_feature flashrom plugin_flashrom)
+		$(meson_feature gusb plugin_uf2)
+		$(meson_feature logitech plugin_logitech_bulkcontroller)
+		$(meson_feature modemmanager plugin_modem_manager)
+		$(meson_feature nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_feature synaptics plugin_synaptics_mst)
+		$(meson_feature synaptics plugin_synaptics_rmi)
+		$(meson_feature thunderbolt plugin_thunderbolt)
+		$(meson_feature tpm plugin_tpm)
+		$(meson_feature uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_feature uefi plugin_uefi_pk)
+	)
+	if use ppc64 || use riscv ; then
+		plugins+=( -Dplugin_msr="disabled" )
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="disabled"
+		-Dcurl="enabled"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="enabled"
+		$(meson_feature archive libarchive)
+		$(meson_use bash-completion bash_completion)
+		$(meson_feature bluetooth bluez)
+		$(meson_feature cbor)
+		$(meson_feature elogind)
+		$(meson_feature gnutls)
+		$(meson_feature gusb)
+		$(meson_feature lzma)
+		$(meson_use man)
+		$(meson_feature introspection)
+		$(meson_feature policykit polkit)
+		$(meson_feature sqlite)
+		$(meson_feature systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 45c037c9a6af..68046c42657e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,4 +1,4 @@
 DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43
 DIST gawk-5.1.1.tar.xz.sig 488 BLAKE2B 1c7813753f3e982e1ef31efc7a1d78da4b977064b395e7b138ce09e68c1b9cb9a7b7de0d0b36afd6d39a2e62d5563cf7ceac6fcc73e9124ab07eceb56c0aa040 SHA512 71ecfa1b3a9e3005f033e83a75abce5c576c7941c62ed571cb6124032426db0e220bcdd577395d1af00a53c13dd1c8e6de71702cbe9c71960d3a3ff76dc026bd
-EBUILD gawk-5.1.1-r2.ebuild 2726 BLAKE2B ed5ccf5cea50c5255e7ed2485a0d7659a96148d369acf55825394e8c0fde6ca814720de9753ce2cab15bce210dd4f1b2d86fe679754eda57147fe772973f4459 SHA512 c27d728e5e07e461ddcd1644f8dfd94d08fce898d58e98668f1b484075f5775315d01e61101e39fa46e30acb15224833ef219c36271528462f2d2fc6e65014e9
+EBUILD gawk-5.1.1-r2.ebuild 2761 BLAKE2B 74c1bb46202545d260d5212e17f281d762e39fb6c687b75577f8ff776e77a4d759df71ad8b153bb27554522caa84de29044a9e49a4494a42a4189c2c064c8fa6 SHA512 f61fd217de6d8b5b1083839c5d4cc4656c7ca7fe26a3d4c4ecfd414ed2ebca3ade5621bc5076ed682d52c478b453b03ee6aa5db623910928bc1ed3426b6edbba
 MISC metadata.xml 348 BLAKE2B dd212d42a4218147703b0dd20699b3040aa7fa6e214d26b7919e7e547a71d4ba22f827aa952952ad97314f90444fb27dbd79da73988f33084c457e1a358b5d1c SHA512 8a6da25157316d3caf69f2a2f68c93d98ba76e89304237b2df04032db39849349c1911e69037da4d8789d8c284792de1071e7eda66e62f2be5523806c6f13223
diff --git a/sys-apps/gawk/gawk-5.1.1-r2.ebuild b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
index 6e6db23f870b..396c6f8f74f2 100644
--- a/sys-apps/gawk/gawk-5.1.1-r2.ebuild
+++ b/sys-apps/gawk/gawk-5.1.1-r2.ebuild
@@ -62,6 +62,7 @@ src_configure() {
 	export ac_cv_libsigsegv=no
 
 	local myeconfargs=(
+		--cache-file="${S}"/config.cache
 		--libexec='$(libdir)/misc'
 		$(use_with mpfr)
 		$(use_enable nls)
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 933fe647b85d..78447249a0c8 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
-EBUILD gentoo-systemd-integration-9.ebuild 996 BLAKE2B 3fe80e57015215ef155469eea4f04e0f39e591c01de4c39b8467403f297a2405b9dfa048d9d758bd06ad35e94f8e4c74ad62d600139e28d20a60aba9b57e174e SHA512 d79403ec5660909178922527969d3bd208e4855941b96c967e9cb45fd9752845e4f4877688b2e9fdd61494886bd11042c5206d2aeb5ad71174e7bbb6b42a13b9
-EBUILD gentoo-systemd-integration-9999.ebuild 997 BLAKE2B 59f86cbadc59b56a60d4c1ef7ccfd6a8983559f10f22bd2effeb4eebd63b257e2d721c4983279635093cfe0c52190390aa4eace1a9d7dc7cc62ef4193a4e162f SHA512 880bb3bc76d866afbaaa724dd9d208a06e81cb88ea8e0be5962529ccbe547cf5d02fc3b70ffa4d010a184f7adc85aebe658112a0a984005822b65a603cf2f4a8
+EBUILD gentoo-systemd-integration-9.ebuild 1002 BLAKE2B 7fb4bb0c606f5bdf1ac5f00636518ee3b987179d15cc10477b6aea687a3466764af1a6b6a069a42daaf26ae6f266fe448a9dbdedc75cc1c42a25c88b0d18dac6 SHA512 4151bdfa598c9ae80dfa1531a109defd8c367ab1f04129dccdb2f0ea381b3a6ef5ff8e9ecff18bc45998fa2aac6358dc12f745a6ad67766e454523e2d6329daa
+EBUILD gentoo-systemd-integration-9999.ebuild 1003 BLAKE2B e3b623391925b2f628ae48bb8b66d60d056d977ceb1219641e5e8e19f6b0d627826a1e851bd674b589c603a2ccfa64a191b9899e5dc8051a26939316a7bf6fb1 SHA512 447214da6d0bf9fc07fbfdc2e5a2f841e5f17d626f19500dd4cca5e7de259c581fac1b69ace46e2441a76763a43c13095085f8096defaa7c95bcdd87d256a88e
 MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index 4f9913230625..ff0712f83a44 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 619ddbf5835c..0332820fef8a 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 79f797e1f593..2ba42d5132d1 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -2,5 +2,5 @@ AUX gnome-disk-utility-41.0-meson-0.61-build.patch 763 BLAKE2B e4e2732bd634635c4
 DIST gnome-disk-utility-41.0.tar.xz 1401088 BLAKE2B 78769a714a8e5ee5596da3502562a7a136f54c7b832f44b8b70bae60de42af9dda433c4acd3b74ca31f71e53a633f2888c4e21d6ce9d9ccf2a03485903b3985f SHA512 a78dd281c078046abef5c0986777c6a87bc27d9b1bd6e798b5be058a3352b33dead8f5fea6e8f30e8c61bdd21996ee7d784838d953a33973243faabd7b713895
 DIST gnome-disk-utility-42.0.tar.xz 1740332 BLAKE2B 4d05876364a475d1e16651569862fe3e9bb97549463146e69722c55922c0609069334e198eff91208448dc0baf7fcefe6bab56612e89fd7412fea42ba20549d2 SHA512 c47c37262295ba455b483a7ebe7799e92f94b97d177327817bb088cddcc3ff1f5840c3e270651287ff6a88257ec7cfcd1abe4167bf7454bbf55e145c8f1dc7c9
 EBUILD gnome-disk-utility-41.0.ebuild 1477 BLAKE2B 4b6f5ea10814add8853d45cc956d7e2e383eaa9b69132b0ff395d449916412707f4ecc7f2c60ee379d4ae46ab786d8a0f0a9d21969b87525e74e335a444eac4f SHA512 072fb731ccf0ae6378e655649feac807b69bef10dfc74aac417629d0ac37672910b2d32ebca3680305ce275973a2e90c1c313d95152d9368bd3abd5cc19b0060
-EBUILD gnome-disk-utility-42.0.ebuild 1423 BLAKE2B d54e6d71bf98ab4fac38d1dcd127ef75cc46ed4084fef036fbfd51f41505e48f7d26322326c066c55c71d1bea67a481dceddfd32938afd8424ec16665877b55b SHA512 0ad5522f194530223695358dc03926035df7cffe81bd60fa122a291c316da16dfd87689bec62bdaa67427b01150bfa60e7c7c11175d7f425506e26d8d8c19881
+EBUILD gnome-disk-utility-42.0.ebuild 1420 BLAKE2B f49175cccf7b980232eead9e9d9c8bb88c89c6b1fbd9e80d54f1d1d74505757995c40d50c70e6cf1b70866306ebf8d138f86c9d27aa8d0f630e676a72ca1c8d1 SHA512 07e8d01b90398ec739b4a2d1d421e7b340fde1b437707312e71b0572663c91a2d4881dc7fbd95cbe44819f77d383a1c6a9f6da0d0f56ebb77282680d832cd769
 MISC metadata.xml 598 BLAKE2B e9bd803739e63d5667cf9d84b27af2efeeac8e31591d022cfce00fa147f4ee267ea2c03624f43c2d822c00b853b1606f6663814a731182aaf557be259ab2fe45 SHA512 fa5f53e258f9db1447b28979f655b6794491af9eafd0d6f113d43fd2073d36fcedc126fef7fde4a21b99e2ad11e4442c7c333d9dfaeee92064b0de23c071c23e
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
index fb3a0a790e86..40d5fcad3ceb 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-42.0.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=media-libs/libdvdread-4.2.0:0=
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index cc531cba7543..95f89b9f549f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,7 +4,9 @@ AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb79790188
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.15.0.tar.xz 858068 BLAKE2B bca20ac53e1b2b3ae06186f655ad5073a0e691ed7b3aab25c4fbc118847b72a8a522175732cd22d8ec27480d1ab142319e80a5c3628434bec21260e585e1591d SHA512 e94918fa10e523224b965c7cb5303a101745e89c90d149d2d9876a002b2a894b1c689c519dc22168f3d334c3ee0810c59ec43223baab3d5f4c56f017d6281f22
 DIST iproute2-5.17.0.tar.xz 870908 BLAKE2B 4310829ebbde7fd21ecc28856deddabfa93f26bf7937b3ef3c0e05e4e0bf925a9b167334efaefe3e275d196e7370a290679739ae8d8397dc6511f4da25dfd459 SHA512 fcffe96fb4819305ddf5c3764b100bd1d204069cf53a6bd776c2716144f574b4fc17963fc231a83ad253cce6a563814556eeb60b211ba9b0b87330186259b34d
+DIST iproute2-5.18.0.tar.xz 880456 BLAKE2B 21b15d84b07199d4ddd12cbf14d94806a073f4eda659958a8459ef2ca8becbef8638dac2550cc53893cd147888b6a3b738256dac074307b37ebec8dbb460e600 SHA512 7b43c89741a8ffe8fd529ac4ee19c8eab7dce2f064de494c160c75456ffb960fb5f1e78c868ab98360dafde28d5e2c4d58177135b6d380e80e06eba9e3eaf068
 EBUILD iproute2-5.15.0.ebuild 4994 BLAKE2B bc73ac11db47b0d52926149af6546fe81fd94354ca48aad8f452c5fedeebc1629d847ba653175bdb18172a3d74c9e8c6026ffd8f3436130985929e38f4e0dec6 SHA512 5737c4bd54bc283c1c50c9b2f5e7c87f8b40d2665e15d72a05893d890427d1c389d2f6c857bd8ca0db2d38996dadea810b5a11f061e95830347ff7f864bd7f7e
 EBUILD iproute2-5.17.0.ebuild 4933 BLAKE2B 7ef77ee3b1725b8c7b428e6ed97e9fc218f6956824e2b723c06aee7bf66e7e02901f05b2dca4099ddbfd4901a51c16198ba34410fdeac4280220dda94e3086c8 SHA512 56dd4e89a9ac6733ad4c8b2fc09368f2ad7c02f399d6fba7794b3a7b715fad743b1270f7d02a95b96979634e31d91596f3f64a84498e51bfb44247f71ba7a39e
-EBUILD iproute2-9999.ebuild 4926 BLAKE2B b10bd40a6acb0ca3345a5ca66349e70fb170e53471249021655ca073efb72bf335ad12a9b4ba44c339657e69212083fed886b92f0bc998ffa0f34ffffa68b5e9 SHA512 1a7faee630ec6735e49ddf30bf902f7e781114fbf0ea0f14c61aa7d074a4ef871f9b3f51648f766f27a49d087c2efc314eb054147eb5bc4346c5266851b5853b
-MISC metadata.xml 814 BLAKE2B a74c3bee84fc81acfeee405c22b84ca9a10f2daf4be9d496202cbc5a2595f7222b864f4105f5dd46ec45e7de57b6ffff991f907da6378293267209b9eafe91d5 SHA512 74936295cae7e84f39ea6dd8e6bee613bed9e9716c6a96aa8f497be96b14367a2d8829db3ed108b760afdd196c5dbc9f32b14f29f5a0939e47b15d7a68aeca4a
+EBUILD iproute2-5.18.0-r1.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
+EBUILD iproute2-9999.ebuild 5803 BLAKE2B 5be3d8f2c91cb5d1e8d6b13d9a736e75d6066922caacaae94881b37e4cb963ed14eb185a68e745e484ec29fbd66c33a0deeccee75065af8fa292bfea945406fd SHA512 e42d7f42d7cab34838b1cc3984083d143ccf2d02743ed0ad14e091ae0fd4a3c4d8c82113cd813a1e517c527dac7915c5908e2503ddf8fedb2f46eb65675bb266
+MISC metadata.xml 898 BLAKE2B f3c281e448846b5fa0e4cabec04767fe7217bd0d77a2baba7c1524ebdc1df4cc4c7d38ff441617959281c3a08b564d3cc6b7a89f846041f2416441b82079318d SHA512 404bd3aa523554bd78da7eb90bd3c53c146f71da92116115c238e1b186e971bf6d49161c33e58d6116af1616688bc00eb7d96f0fa5afb300a703cbdf6fdfe4ed
diff --git a/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
new file mode 100644
index 000000000000..c0e45a9ec79e
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.18.0-r1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym edo toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl:= )
+	atm? ( net-dialup/linux-atm )
+	berkdb? ( sys-libs/db:= )
+	bpf? ( dev-libs/libbpf:= )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf:= )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	libbsd? ( dev-libs/libbsd )
+	nfs? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch # bug #291907
+	"${FILESDIR}"/${PN}-5.12.0-configure-nomagic.patch # bug #643722
+	#"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix version if necessary
+	local versionfile="include/version.h"
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+		einfo "Fixing version string"
+		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
+			-i ${versionfile} || die
+	fi
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly. Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null || die
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
+	popd >/dev/null || die
+
+	# run "configure" script first which will create "config.mk"...
+	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
+	edo ./configure --libbpf_force $(usex bpf on off)
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
+
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	if ! use libbsd ; then
+		sed -i -e '/HAVE_LIBBSD/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers, bug #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, bug #144265, bug #293709
+	IPT_LIB_DIR   := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	HAVE_LIBBSD   := $(usex libbsd y n)
+	EOF
+}
+
+src_compile() {
+	emake V=1 NETNS_RUN_DIR=/run/netns
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die # bug #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+
+	if use split-usr ; then
+		# Can remove compatibility symlink in a year: 2023-05-28.
+		# bug #547264
+		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+		dosym8 -r /bin/ss /sbin/ss
+	fi
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug #47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	elif [[ -d "${ED}"/var/lib/arpd ]]; then
+		rmdir --ignore-fail-on-non-empty -p "${ED}"/var/lib/arpd || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 11dfd239d1a7..c0e45a9ec79e 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit eapi8-dosym edo toolchain-funcs
 
-if [[ ${PV} == "9999" ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb bpf caps elf +iptables libbsd minimal selinux"
+IUSE="atm berkdb bpf caps elf +iptables libbsd minimal nfs selinux split-usr"
 
 # We could make libmnl optional, but it's tiny, so eh
 RDEPEND="
@@ -31,9 +31,10 @@ RDEPEND="
 	elf? ( virtual/libelf:= )
 	iptables? ( >=net-firewall/iptables-1.4.20:= )
 	libbsd? ( dev-libs/libbsd )
+	nfs? ( net-libs/libtirpc:= )
 	selinux? ( sys-libs/libselinux )
 "
-# We require newer linux-headers for ipset support #549948 and some defines #553876
+# We require newer linux-headers for ipset support (bug #549948) and some defines (bug #553876)
 DEPEND="
 	${RDEPEND}
 	>=sys-kernel/linux-headers-3.16
@@ -52,17 +53,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
 
-doecho() {
-	echo "${@}"
-	"${@}" || die
-}
-
 src_prepare() {
 	default
 
 	# Fix version if necessary
 	local versionfile="include/version.h"
-	if [[ "${PV}" != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
+	if [[ ${PV} != 9999 ]] && ! grep -Fq "${PV}" ${versionfile} ; then
 		einfo "Fixing version string"
 		sed "s@\"[[:digit:]\.]\+\"@\"${PV}\"@" \
 			-i ${versionfile} || die
@@ -91,21 +87,62 @@ src_prepare() {
 src_configure() {
 	tc-export AR CC PKG_CONFIG
 
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	# This sure is ugly. Should probably move into toolchain-funcs at some point.
 	local setns
 	pushd "${T}" >/dev/null || die
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c || die
+	if ${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null ; then
+		setns=y
+	else
+		setns=n
+	fi
+
+	echo 'int main(){return 0;}' > test.c || die
+	if ! ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null ; then
+		sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile || die
+	fi
 	popd >/dev/null || die
 
 	# run "configure" script first which will create "config.mk"...
 	# Using econf breaks since 5.14.0 (a9c3d70d902a0473ee5c13336317006a52ce8242)
-	doecho ./configure --libbpf_force $(usex bpf on off)
+	edo ./configure --libbpf_force $(usex bpf on off)
+
+	# Remove the definitions made by configure and allow them to be overridden
+	# by USE flags below.
+	# We have to do the cheesy only-sed-if-disabled because otherwise
+	# the *_FLAGS etc stuff found by configure will be used but result
+	# in a broken build.
+	if ! use berkdb ; then
+		sed -i -e '/HAVE_BERKELEY_DB/d' config.mk || die
+	fi
+
+	if ! use caps ; then
+		sed -i -e '/HAVE_CAP/d' config.mk || die
+	fi
+
+	if use minimal ; then
+		sed -i -e '/HAVE_MNL/d' config.mk || die
+	fi
 
-	# ...now switch on/off requested features via USE flags
+	if ! use elf ; then
+		sed -i -e '/HAVE_ELF/d' config.mk || die
+	fi
+
+	if ! use nfs ; then
+		sed -i -e '/HAVE_RPC/d' config.mk || die
+	fi
+
+	if ! use selinux ; then
+		sed -i -e '/HAVE_SELINUX/d' config.mk || die
+	fi
+
+	if ! use libbsd ; then
+		sed -i -e '/HAVE_LIBBSD/d' config.mk || die
+	fi
+
+	# ...Now switch on/off requested features via USE flags
 	# this is only useful if the test did not set other things, per bug #643722
+	# Keep in sync with ifs above, or refactor to be unified.
 	cat <<-EOF >> config.mk
 	TC_CONFIG_ATM := $(usex atm y n)
 	TC_CONFIG_XT  := $(usex iptables y n)
@@ -116,6 +153,7 @@ src_configure() {
 	HAVE_CAP      := $(usex caps y n)
 	HAVE_MNL      := $(usex minimal n y)
 	HAVE_ELF      := $(usex elf y n)
+	HAVE_RPC      := $(usex nfs y n)
 	HAVE_SELINUX  := $(usex selinux y n)
 	IP_CONFIG_SETNS := ${setns}
 	# Use correct iptables dir, bug #144265, bug #293709
@@ -153,10 +191,13 @@ src_install() {
 	dolib.a lib/libnetlink.a
 	insinto /usr/include
 	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable. # bug #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use split-usr ; then
+		# Can remove compatibility symlink in a year: 2023-05-28.
+		# bug #547264
+		mv "${ED}"/sbin/ss "${ED}"/bin/ss || die
+		dosym8 -r /bin/ss /sbin/ss
+	fi
 
 	if use berkdb ; then
 		keepdir /var/lib/arpd
diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index ab92eca64ca4..10e4c7acb786 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="iptables">include support for iptables filtering</flag>
 	<flag name="libbsd">Use <pkg>dev-libs/libbsd</pkg> instead of internal funcs</flag>
 	<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
+	<flag name="nfs">Support RPC lookups via <pkg>net-libs/libtirpc</pkg> in ss</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:iproute2_project:iproute2</remote-id>
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index b49085f8f55a..4af8db2d4d1b 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,7 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
+DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
 EBUILD irqbalance-1.8.0-r1.ebuild 1334 BLAKE2B 74900103bf0167ae4d3dc4fe0d73de353ccc818f29b9edddffe9c163f47f46d3baee119b403ceb24058598739c9c691a69bd4a896f47a591687435c22ab32124 SHA512 03363872eae5a613833a7e1b6506f5440cc40b1bdce4aafbb891e5091f1c1815848c3df8f0b578a3742b25b5f3a0dd3f22100fb1c2068882a3affb4fbfa625ad
+EBUILD irqbalance-1.9.0.ebuild 1340 BLAKE2B 72a6182edb1bfc1fe75a892445e98b9a0e9a2a265af8ab40f622c7318d2ef695ffd71f7af029dcad18cde2614fc07d85cd96e464b71db969779a700dd468b50d SHA512 d2e5bb9000f8f88ca12d6bde375f293012794546521e68435aa1219d928417524e6242abc68324681218b4fc0b6c1e668ddf3b8d028f9edfdc96954de35b2750
 MISC metadata.xml 547 BLAKE2B 0a83f459995622fe247317aa9f045c0696f888712e9e5b56ac4eedb12862772044aaf407e25181ac84d64b9fced0e950b74c9dfcfa7a44e2451356dbab03461a SHA512 90b145e0e3fd1519eb1e6a412fc06700eed8bd27bea262e3d0bed02b0140586c0a9a01b9e301d3c0ec464c2cfbc6f80118c48eead3c830ba13dfd3b1588f6c9f
diff --git a/sys-apps/irqbalance/irqbalance-1.9.0.ebuild b/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
new file mode 100644
index 000000000000..b2eda8368949
--- /dev/null
+++ b/sys-apps/irqbalance/irqbalance-1.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd linux-info
+
+DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
+HOMEPAGE="https://github.com/Irqbalance/irqbalance"
+SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~x86"
+IUSE="caps +numa selinux tui"
+
+DEPEND="
+	dev-libs/glib:2
+	caps? ( sys-libs/libcap-ng )
+	numa? ( sys-process/numactl )
+	tui? ( sys-libs/ncurses:=[unicode(+)] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-irqbalance )
+"
+
+pkg_setup() {
+	CONFIG_CHECK="~PCI_MSI"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	# Follow systemd policies
+	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
+	sed \
+		-e 's/ $IRQBALANCE_ARGS//' \
+		-e '/EnvironmentFile/d' \
+		-i misc/irqbalance.service || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with caps libcap-ng)
+		$(use_enable numa)
+		$(use_with tui irqbalance-ui)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
+	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
+	systemd_dounit misc/irqbalance.service
+}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index c83c00985273..63805e1b04cc 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -13,5 +13,5 @@ EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d
 EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
 EBUILD pcsc-lite-1.9.4.ebuild 3182 BLAKE2B d1f81f1ff0e2b317847aaf59e32afcb17a813fff04a7326b6d5c1cc4f91b6775de01674e15f3a773d565d986caa7c585df7e807ff3e450e6c17d62a62172e376 SHA512 0b1d4de95dfabcbbc958e38f5e07551cf0fd59674a23027c0dbeb8d237356d4dd928bcc444aea8dc7fd090d6beea6fb321b9eea9883b28d4ac658c7d3a3151b6
 EBUILD pcsc-lite-1.9.5.ebuild 3230 BLAKE2B 78aed73e849af2ae4fc4a0d0167e7ea3b456100414191b7bebe798fe7b1f9a968ec2e178ddfc8ed6930583f5e0a73f5cc2f814215af21bf7cdd31d7e8b0eff72 SHA512 3972d7bae4d6d5622296a29c83477eebf50511af235516610f09326b944859a3ac23bc2acf73c08247b3bf3deab098c04e320a6372899f33be55b31bb73ee68a
-EBUILD pcsc-lite-1.9.7.ebuild 3180 BLAKE2B 31e588f692f2bef8373df940ca2b4d449758f3def6aaed4bfe527f07da76dd4097cad715d4d046603ce8014259bcb04bfd704632cacf1ee542499c25d8ad09cd SHA512 bb8c21258633a2f051df539e20adad7c0074a21b39606efb9dcf7a3b2858e4311715dd1f1f274d803b55a6e221e07e7815a57a6793b813a3040c09b27a6a7cee
+EBUILD pcsc-lite-1.9.7.ebuild 3179 BLAKE2B b395ce444a3978c6dec214f19c5e6bed86ae2f6965ae7a1c09cb3d6f8c340c5703fa3eefb1952cf4ce4b21e932b5ceb5e8721f7c0ebe1b09245acfae605aa053 SHA512 e1abf9cf6208fb6d3b528e50401b520b76627d5b4ca0e3f150c094a8ff066418970099d4bd88d598085ae13bb571ae2579a6cb4f4b3e952d0e1fd1108d8d16b6
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
index cd43824ff740..efb05ff63385 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 16c259860aa9..5e34875e70c2 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -8,5 +8,5 @@ DIST systemd-stable-249.7.tar.gz 10608252 BLAKE2B a5597c4973b24c962779622cae47db
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 EBUILD systemd-tmpfiles-249.7.ebuild 6091 BLAKE2B 63064cd496f780af754185f05a47551804f05d2b21c58d4b173d2a2ec82b7ba986c947ca1fc15cfc793f411caebf2b7586315ef7e741c534e00649c26c5d5bcf SHA512 e56de86404b80d686e233a17761adfd7f7f59afd1a8f90c2a50658d1fd04e8d1a8b62acbc4cc1d882d094fac10ed5964a03edc1f182c00b3821c856245e33eb3
 EBUILD systemd-tmpfiles-249.9.ebuild 5989 BLAKE2B 3aef19d9a002b4a697e778073d0ad59bb50150f5b5a4a2277f3d1fbb26098934ce1c84610943ad0219053a348c8c3c5e3ed0eeba4d0c47fbd267a890868213c4 SHA512 201c85c33567feb6dacde41f69c5e25f1f412fcf37af99fc211b161f55293b41cee199a3ae437f5b056d40e25218e5e985c145c9416c799c060b1102039b5afd
-EBUILD systemd-tmpfiles-250.ebuild 379 BLAKE2B f7b4cd861020c8b3a46f7b266b8ead19b22674c71bf1a84775729c1ea6a54a907cfb3295e81cbfc5015d64069edaae781465d480d398dafc04ca6589e0c218e2 SHA512 229ca3e4b7ed1ff2d1e04193b50151c583de4aa7e4f610d4b820aa7b9e8bdadc87ba5ded0d90e8cdf24519721caef035be8fd72f2fc1aaf21e079435f2c8e02e
+EBUILD systemd-tmpfiles-250.ebuild 378 BLAKE2B d65742e679d6212c72d624598f3ead7ce3cad3a2822f7e2406f4641d49860fa83daf0cc97df6045a48c242c61806970fa7df7523b610dfae14fab51f040e1a00 SHA512 aba084f6b00ecbfba9fb6eb5d180785cad6c171e67df63ffd43d956d12d14077b0c8c24bb406178a74a9a4dc702317d4d659f48b92cb517f961ff8040d8fbfbc
 MISC metadata.xml 220 BLAKE2B f37e1abb12c69fa1b4b3bf9ad39205355a3d1f1921479546d7e41d6874f2b36176c35f662a9d4c972f0d949faeff8aec17ad7c76350c37fae1a9c9f76063b424 SHA512 c75e34a124cc02a9537bee3f0966d3372b9ab12ac62e590784f9ca4f0c07a43c5949c22055e202321f97b38f4e7c0e09e670511008b6692141339335a3821ccc
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
index 97da597ebea3..a3093d60016e 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-250.ebuild
@@ -8,6 +8,6 @@ HOMEPAGE="https://systemd.io/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="sys-apps/systemd-utils[tmpfiles]"
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index 5485b02c1e5b..46bd68e3075a 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -5,6 +5,8 @@ AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3
 DIST systemd-musl-patches-250.4.tar.gz 28065 BLAKE2B b8366c4bb29705e3f41f07d0105c4d252d543aaac178e968663660eeb573da034813aa50a96c74ac78ae5efeea379e00df33c5a039ec828cf93450ed23786252 SHA512 66e41fab1873021913c32e3f43300ea7babd18a36e6543838ab7fab4c44f5590c6a7414dd50c7ee81e5513b0e5aa01cb6df4231e8e06c609d63011a32b524213
 DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
 DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 EBUILD systemd-utils-250.4-r3.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
 EBUILD systemd-utils-250.5.ebuild 10521 BLAKE2B 2c0df60cc2cd254986f5258f529f2ab23ffd891aabfc135f0c58806a99848498c5f120df3c6116867f07a8be10c6919cd96f5f434d6c4bd5a548796b3c203f4e SHA512 47e6f1670d49a6bd9ef5e5228cbcf61db156524a5e54e24859fb0b2d7302ceb55851bc56cb11d371399e6d4cc77e9fc600b5e21fe2fb93994e59424416b57d90
+EBUILD systemd-utils-250.6.ebuild 11312 BLAKE2B dc8f059137fe69be87fc760a5156f59f02a967c742885a49171a467a5e46e400869a00bdea348d8ff20e145b7a198ee7998e46b84b549566e9db6958151f819f SHA512 eab36e7ce8061064cd202c4282c52c2758ff2d60fad409fb3752f4ea3f9f9c48b5858d315c5052fb41212c615c4b81affa95c007db8185f125dd82fc0cb45400
 MISC metadata.xml 571 BLAKE2B 6b3a69524c5fd3fa0bbe534ccbf3598cedcbe51542d738237ca13b465fd342555f35b2ebd1d784b7a81664c58125e01404434ca48a07502343a24dd395618c4c SHA512 8184f6d8107be83d7411f63e86a8469c4b86c96bf4738ebfda8d654e4ecedf334b4319c9d442832c8373a34e7c35ca14b879e75eb4e006d48fa3d667be0a66e4
diff --git a/sys-apps/systemd-utils/systemd-utils-250.6.ebuild b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
new file mode 100644
index 000000000000..fd0c93da4bf8
--- /dev/null
+++ b/sys-apps/systemd-utils/systemd-utils-250.6.ebuild
@@ -0,0 +1,497 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+QA_PKGCONFIG_VERSION=$(ver_cut 1)
+
+inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Utilities split out from systemd for OpenRC users"
+HOMEPAGE="https://systemd.io/"
+
+if [[ ${PV} == *.* ]]; then
+	MY_P="systemd-stable-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+else
+	MY_P="systemd-${PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+fi
+
+MUSL_PATCHSET="systemd-musl-patches-250.4"
+SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+acl boot +kmod selinux sysusers +tmpfiles test +udev"
+REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	selinux? ( sys-libs/libselinux:0= )
+	tmpfiles? (
+		acl? ( sys-apps/acl:0= )
+	)
+	udev? (
+		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+		virtual/libcrypt:=[${MULTILIB_USEDEP}]
+		acl? ( sys-apps/acl:0= )
+		kmod? ( >=sys-apps/kmod-15:0= )
+	)
+	!udev? (
+		>=sys-apps/util-linux-2.30:0=
+		sys-libs/libcap:0=
+		virtual/libcrypt:=
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	boot? (
+		>=sys-boot/gnu-efi-3.0.2
+	)
+	>=sys-kernel/linux-headers-3.11
+"
+RDEPEND="${COMMON_DEPEND}
+	boot? ( !<sys-boot/systemd-boot-250 )
+	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
+	udev? (
+		acct-group/audio
+		acct-group/cdrom
+		acct-group/dialout
+		acct-group/disk
+		acct-group/input
+		acct-group/kmem
+		acct-group/kvm
+		acct-group/lp
+		acct-group/render
+		acct-group/sgx
+		acct-group/tape
+		acct-group/tty
+		acct-group/video
+		!sys-apps/gentoo-systemd-integration
+		!sys-apps/hwids[udev]
+		!<sys-fs/udev-250
+		!sys-fs/eudev
+	)
+	!sys-apps/systemd
+"
+PDEPEND="
+	udev? ( >=sys-fs/udev-init-scripts-34 )
+"
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gperf
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch"
+	)
+	if use elibc_musl; then
+		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
+	fi
+	default
+
+	# Remove install_rpath; we link statically
+	local rpath_pattern="install_rpath : rootlibexecdir,"
+	grep -q -e "${rpath_pattern}" meson.build || die
+	sed -i -e "/${rpath_pattern}/d" meson.build || die
+}
+
+multilib_src_configure() {
+	# When bumping to 251, please keep this, but add the revert patch
+	# like in sys-apps/systemd!
+	#
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
+		-Dsysvinit-path=
+		$(meson_native_use_bool boot efi)
+		$(meson_native_use_bool boot gnu-efi)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool sysusers)
+		$(meson_use test tests)
+		$(meson_native_use_bool tmpfiles)
+		$(meson_use udev hwdb)
+
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+
+		# Link staticly with libsystemd-shared
+		-Dlink-boot-shared=false
+		-Dlink-udev-shared=false
+
+		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
+		-Dstandalone-binaries=true
+
+		# Disable all optional features
+		-Dadm-group=false
+		-Danalyze=false
+		-Dapparmor=false
+		-Daudit=false
+		-Dbacklight=false
+		-Dbinfmt=false
+		-Dbzip2=false
+		-Dcoredump=false
+		-Ddbus=false
+		-Delfutils=false
+		-Denvironment-d=false
+		-Dfdisk=false
+		-Dgcrypt=false
+		-Dglib=false
+		-Dgshadow=false
+		-Dgnutls=false
+		-Dhibernate=false
+		-Dhostnamed=false
+		-Didn=false
+		-Dima=false
+		-Dinitrd=false
+		-Dfirstboot=false
+		-Dkernel-install=false
+		-Dldconfig=false
+		-Dlibcryptsetup=false
+		-Dlibcurl=false
+		-Dlibfido2=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dlocaled=false
+		-Dlogind=false
+		-Dlz4=false
+		-Dmachined=false
+		-Dmicrohttpd=false
+		-Dnetworkd=false
+		-Dnscd=false
+		-Dnss-myhostname=false
+		-Dnss-resolve=false
+		-Dnss-systemd=false
+		-Doomd=false
+		-Dopenssl=false
+		-Dp11kit=false
+		-Dpam=false
+		-Dpcre2=false
+		-Dpolkit=false
+		-Dportabled=false
+		-Dpstore=false
+		-Dpwquality=false
+		-Drandomseed=false
+		-Dresolve=false
+		-Drfkill=false
+		-Dseccomp=false
+		-Dsmack=false
+		-Dsysext=false
+		-Dtimedated=false
+		-Dtimesyncd=false
+		-Dtpm=false
+		-Dqrencode=false
+		-Dquotacheck=false
+		-Duserdb=false
+		-Dutmp=false
+		-Dvconsole=false
+		-Dwheel-group=false
+		-Dxdg-autostart=false
+		-Dxkbcommon=false
+		-Dxz=false
+		-Dzlib=false
+		-Dzstd=false
+	)
+
+	if use tmpfiles || use udev; then
+		emesonargs+=( $(meson_native_use_bool acl) )
+	else
+		emesonargs+=( -Dacl=false )
+	fi
+
+	if use udev; then
+		emesonargs+=( $(meson_native_use_bool kmod) )
+	else
+		emesonargs+=( -Dkmod=false )
+	fi
+
+	if use elibc_musl; then
+		# Avoid redefinition of struct ethhdr.
+		append-cppflags -D__UAPI_DEF_ETHHDR=0
+	fi
+
+	if multilib_is_native_abi || use udev; then
+		meson_src_configure
+	fi
+}
+
+efi_arch() {
+	case "$(tc-arch)" in
+		amd64) echo x64 ;;
+		arm)   echo arm ;;
+		arm64) echo aa64 ;;
+		x86)   echo x86 ;;
+	esac
+}
+
+multilib_src_compile() {
+	local targets=()
+	if multilib_is_native_abi; then
+		if use boot; then
+			targets+=(
+				bootctl
+				man/bootctl.1
+				man/kernel-install.8
+				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
+				src/boot/efi/systemd-boot$(efi_arch).efi
+			)
+		fi
+		if use sysusers; then
+			targets+=(
+				systemd-sysusers.standalone
+				man/sysusers.d.5
+				man/systemd-sysusers.8
+			)
+			if use test; then
+				targets+=(
+					systemd-runtest.env
+				)
+			fi
+		fi
+		if use tmpfiles; then
+			targets+=(
+				systemd-tmpfiles.standalone
+				man/tmpfiles.d.5
+				man/systemd-tmpfiles.8
+			)
+			if use test; then
+				targets+=( test-tmpfiles )
+			fi
+		fi
+		if use udev; then
+			targets+=(
+				udevadm
+				systemd-hwdb
+				src/udev/ata_id
+				src/udev/cdrom_id
+				src/udev/fido_id
+				src/udev/mtd_probe
+				src/udev/scsi_id
+				src/udev/udev.pc
+				src/udev/v4l_id
+				man/udev.conf.5
+				man/systemd.link.5
+				man/hwdb.7
+				man/udev.7
+				man/systemd-hwdb.8
+				man/systemd-udevd.service.8
+				man/udevadm.8
+				hwdb.d/60-autosuspend-chromiumos.hwdb
+				rules.d/50-udev-default.rules
+				rules.d/64-btrfs.rules
+			)
+			if use test; then
+				targets+=(
+					# Used by udev-test.pl
+					systemd-detect-virt
+					test/sys
+					test-udev
+
+					test-fido-id-desc
+					test-udev-builtin
+					test-udev-event
+					test-udev-netlink
+					test-udev-node
+					test-udev-util
+				)
+			fi
+		fi
+	fi
+	if use udev; then
+		targets+=(
+			udev:shared_library
+			src/libudev/libudev.pc
+		)
+		if use test; then
+			targets+=(
+				test-libudev
+				test-libudev-sym
+				test-udev-device-thread
+			)
+		fi
+	fi
+	if multilib_is_native_abi || use udev; then
+		meson_src_compile "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	local tests=()
+	if multilib_is_native_abi; then
+		if use sysusers; then
+			tests+=(
+				test-sysusers.standalone
+			)
+		fi
+		if use tmpfiles; then
+			tests+=(
+				test-systemd-tmpfiles.standalone
+				test-tmpfiles
+			)
+		fi
+		if use udev; then
+			tests+=(
+				rule-syntax-check
+				test-fido-id-desc
+				test-udev-builtin
+				test-udev-event
+				test-udev-netlink
+				test-udev-node
+				test-udev-util
+			)
+			if [[ -w /dev ]]; then
+				tests+=( udev-test )
+			else
+				ewarn "Skipping udev-test (needs write access to /dev)"
+			fi
+		fi
+	fi
+	if use udev; then
+		tests+=(
+			test-libudev
+			test-libudev-sym
+			test-udev-device-thread
+		)
+	fi
+	if [[ ${#tests[@]} -ne 0 ]]; then
+		meson_src_test "${tests[@]}"
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		if use boot; then
+			into /usr
+			dobin bootctl
+			doman man/{bootctl.1,kernel-install.8}
+			insinto usr/lib/systemd/boot/efi
+			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
+		fi
+		if use sysusers; then
+			into /
+			newbin systemd-sysusers{.standalone,}
+			doman man/{systemd-sysusers.8,sysusers.d.5}
+		fi
+		if use tmpfiles; then
+			into /
+			newbin systemd-tmpfiles{.standalone,}
+			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
+		fi
+		if use udev; then
+			into /
+			dobin udevadm systemd-hwdb
+			dosym ../../bin/udevadm /lib/systemd/systemd-udevd
+			exeinto /lib/udev
+			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
+			insinto /lib/udev/rules.d
+			doins rules.d/*.rules
+			insinto /lib/udev/hwdb.d
+			doins hwdb.d/*.hwdb
+			insinto /usr/share/pkgconfig
+			doins src/udev/udev.pc
+			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
+			newman man/systemd-udevd.service.8 systemd-udevd.8
+
+		fi
+	fi
+	if use udev; then
+		into /usr
+		dolib.so "$(readlink libudev.so.1)" libudev.so{.1,}
+		gen_usr_ldscript -a udev
+		insinto "/usr/$(get_libdir)/pkgconfig"
+		doins src/libudev/libudev.pc
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	if use boot; then
+		into /usr
+		dobin src/kernel-install/kernel-install
+		exeinto usr/lib/kernel/install.d
+		doexe src/kernel-install/*.install
+		dobashcomp shell-completion/bash/bootctl
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/{_bootctl,_kernel-install}
+	fi
+	if use tmpfiles; then
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
+		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_systemd-tmpfiles
+	fi
+	if use udev; then
+		doheader src/libudev/libudev.h
+		insinto /etc/udev
+		doins src/udev/udev.conf
+		keepdir /etc/udev/{hwdb.d,rules.d}
+		insinto /lib/systemd/network
+		doins network/99-default.link
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+		doins "${FILESDIR}"/40-gentoo.rules
+		insinto /lib/udev/hwdb.d
+		doins hwdb.d/*.hwdb
+		dobashcomp shell-completion/bash/udevadm
+		insinto /usr/share/zsh/site-functions
+		doins shell-completion/zsh/_udevadm
+	fi
+}
+
+add_service() {
+	local initd=$1
+	local runlevel=$2
+
+	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
+	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	eend $?
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		add_service systemd-tmpfiles-setup-dev sysinit
+		add_service systemd-tmpfiles-setup boot
+	fi
+	if use udev; then
+		ebegin "Updating hwdb"
+		systemd-hwdb --root="${ROOT}" update
+		eend $?
+		udev_reload
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c3048cc96f0a..8786da6d9f0e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,10 +11,12 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821
 DIST systemd-251.tar.gz 11431104 BLAKE2B da783d815adf244defc3c1ec8a788fffdff45215f5c2449c457e872ad89b8270caa3e48ecb696fa79eb1d79578ded3d098802fed0fc69a191ba2d7d6b120e068 SHA512 5a7116cfd99f7875334a1ce55a76ba1840a28b6500b02de82b879629768e10457efd8278024aa1ffefd43defe657284c4d51ab502ed3c7e6b63d5b6e0cc1f642
 DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0
 DIST systemd-stable-250.5.tar.gz 11212059 BLAKE2B b7dbcb9e82c51e966db20a92ccd59ac19309702c481dd575c4e6367ca5ade10fe4b689925416ce1169682380cbf22d7d692b2378ef091f3007c16891992e3f92 SHA512 ad864b67bd5e2f5fd5705b636467827e4735142cefba150d24bb8e51ac0263650b2b0e53d4426eb509d1db59b83dc3b4c4bf157cc355fc2b7524db6bc4a9b5cd
+DIST systemd-stable-250.6.tar.gz 11212534 BLAKE2B faf065dbe5c02d9d3311202f93b9ad8984c4c9d127d32c17f305b81046f9e29cfc731cdd4abbd073965f448f4e1dff81d80313896b346548d2640939ad509365 SHA512 b625d5fb419370d238cf72f2e59c8fa6782972d94746835bde3a64a7746edd1d5fad901bbb01311f858b7dbdff6d759518b615708bb835a81964c16878d5644e
 DIST systemd-stable-251.1.tar.gz 11431880 BLAKE2B 0442489242b2fbfb316f207c7c8c718322a1ea2af8176378fb39bea441fdd8bbb36ea840af9bdec257b714f5f3099daa1139bc6df6ca6f0c2f467c59013fba92 SHA512 6fc72197b684abc343480acb66b8f749c186bd7a031ddd757c4a0e5fd8fdeda0cde9c9e634fd3d9e2b2d1ed96019c5f8e7119ad10a7f51d5dc13fac2571c6c70
 EBUILD systemd-250.4-r2.ebuild 15727 BLAKE2B 693d157b9b961f5a241bcd541a43b5a89adcba3e4a747cbb6675fc6ec2c3d34fc6601f8c090b6600ce3c898996db3cc151d68dfa0ce1750df4000fb46104ae06 SHA512 e25b31b1b39ddf5e7b0090e4d06742b4b2302efeb6ff66b4842e910000a239de9ac264a5872eea850f8e94024062d3d52074df756d232c9979359fddc9e097b4
 EBUILD systemd-250.5-r1.ebuild 15696 BLAKE2B 58ff718bb9f4ff49bad81368e30b61b56861045fdbd6cea37200ffcde8f82ed48fbcf4e96775aaec77875013a3abcadbe7f3671e7e63f36b5fac90d3454e8c0f SHA512 6ceb96af28898526937555723a5b4b0eeb76330149ec03a12285f8ae23021ed0a8997e50ff806d769e93f47ab5c7b6dd6d2c576bda5d3cdf7212c4290804587c
-EBUILD systemd-251.1.ebuild 15604 BLAKE2B e6662fa0dc6b6dfbded273601cb49c3ee285665c67d6e91cca339d4935a053bcd3b800b061dbcf1a9fe1a6c9385c3e17ecbe517b38709b454d24d6a6b72b52f0 SHA512 91ac04b5e8f0140a0a61175dbebe9d2af949c2764e9e0345d6f2a14104d0697c21a5f33d28153f332c42ebe63dc29254fcc05405c19640bd1ec4eef4a32fda90
-EBUILD systemd-251.ebuild 14819 BLAKE2B f493394cdb4888327b0840d71d8bd9a42614cacbf62187e1562ecfcfa2fab79632d94baaabc2c13b6a28aaa1e8d3fb753ad639069fbed140c48a04e764e51c0f SHA512 73f030cc8bcd2db91fe949694857d2af3b25faeb5ef9df7d2adf6cd1a6dd0cd4805f685010f5889df9e6e2fc04dbc98965da797a9d2b4d8b35e5bfa612dc06b1
-EBUILD systemd-9999.ebuild 15564 BLAKE2B 8dab620d0d080c558175b680a47538769185c7d1a8b90b8708716f603df25c29eccb97dd8b0ce05efd6829f8322e053c39096a6059a4d8689292f1711b401a82 SHA512 fd93453333fed8c2cb98b4b5e73523abdf368c39cfb512e59292d79161a7f76426ac1588bd85f49507ef72014aeac3e0b7bf251be8a951ca3bd89c90d48defd4
+EBUILD systemd-250.6.ebuild 16295 BLAKE2B a3ef553e0f0ed64486d611df8cfbe2f9729950657badbc5858b8f34f60f444ebbe863c3d82d00c58d8ef581594939bfe202b98580b8310a26291d8825425930d SHA512 ef7f453f247e242e764300b7359ded437b43425dca02d1a59d49daa42a2c795526b46e7200cbf9fe90c9f2bd3b067a00694a5556109b63b18371ec35fb6d4755
+EBUILD systemd-251.1.ebuild 15579 BLAKE2B 8d33112fab5f44230fe2e579aba04fe2e594221c35c0e014087d5a947596026753b617f06a2bcafede4b748b911f75e7112fdd35fb1a015317cbd8bdcbce8237 SHA512 22da1c43db10b5da5d0103de7dce320f420b8683970f78da8f294a1c5b2fb410cbe6db85cd3135d8f5b50b19330c088ba435d5218505739b0f05b377b6812953
+EBUILD systemd-251.ebuild 14825 BLAKE2B f8f59199406971365ff9099b26bdabc5bc00a6013c686dfef00b0acb3721e55a9f80bd4ad9e8db25bb5cbc76c83536392db4e0a7d643f6bc2b01ed6b6051e923 SHA512 4ac7e88799d264d4808b87c415b6e031fc5cd999f93252d6577a0821ccecc007a3a6fada76221ee28672dc4b80a782599e597873dac31b0c8b74fa22b3dc00f5
+EBUILD systemd-9999.ebuild 15539 BLAKE2B a4c7dcd5b4d1fa011e4f19b13f3b300bb8ca76bd767557afb3f323b0df086437a6957fdb91ce0fb3e7076724c4116858e58349030be037202f58f478b3e4f39b SHA512 cec4b36a4945399d86cbac7bf857133461419a7492fe76f6d628643daa4722c277dd20d49981be54a7aa7592219b639af3b90386f5d7856ff6c0f09788dbea7f
 MISC metadata.xml 2594 BLAKE2B 9ef88b77dba5d66b6902cbc1a4f104e783fa530f7148f48692992dbe2edf8a88a3d96993f6ecc34708ff49f7e7b4d9bbcf001fad6ca5a8d097030bc83b9b3b57 SHA512 22bfbaaaa68142286b36005b685d6955c68b71df064e412f0edbd858c9610c6ad76b5d970292d30b06eb536a9a140af307a3b4fee897b7f281cee00083472430
diff --git a/sys-apps/systemd/systemd-250.6.ebuild b/sys-apps/systemd/systemd-250.6.ebuild
new file mode 100644
index 000000000000..ab9a5eb49932
--- /dev/null
+++ b/sys-apps/systemd/systemd-250.6.ebuild
@@ -0,0 +1,550 @@
+# Copyright 2011-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+# Avoid QA warnings
+TMPFILES_OPTIONAL=1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://systemd.io/"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="
+	acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
+	fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
+	+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
+	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
+"
+REQUIRED_USE="
+	dns-over-tls? ( || ( gnutls openssl ) )
+	homed? ( cryptsetup pam openssl )
+	importd? ( curl lzma || ( gcrypt openssl ) )
+	policykit? ( !hostnamed-fallback )
+	pwquality? ( homed )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	virtual/libcrypt:=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	fido2? ( dev-libs/libfido2:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
+	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	openssl? ( >=dev-libs/openssl-1.1.0:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	tpm? ( app-crypt/tpm2-tss:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=acct-group/adm-0-r1
+	>=acct-group/wheel-0-r1
+	>=acct-group/kmem-0-r1
+	>=acct-group/tty-0-r1
+	>=acct-group/utmp-0-r1
+	>=acct-group/audio-0-r1
+	>=acct-group/cdrom-0-r1
+	>=acct-group/dialout-0-r1
+	>=acct-group/disk-0-r1
+	>=acct-group/input-0-r1
+	>=acct-group/kvm-0-r1
+	>=acct-group/lp-0-r1
+	>=acct-group/render-0-r1
+	acct-group/sgx
+	>=acct-group/tape-0-r1
+	acct-group/users
+	>=acct-group/video-0-r1
+	>=acct-group/systemd-journal-0-r1
+	>=acct-user/root-0-r1
+	acct-user/nobody
+	>=acct-user/systemd-journal-remote-0-r1
+	>=acct-user/systemd-coredump-0-r1
+	>=acct-user/systemd-network-0-r1
+	acct-user/systemd-oom
+	>=acct-user/systemd-resolve-0-r1
+	>=acct-user/systemd-timesync-0-r1
+	>=sys-apps/baselayout-2.2
+	hostnamed-fallback? (
+		acct-group/systemd-hostname
+		sys-apps/dbus-broker
+	)
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? (
+		!sys-apps/openrc[sysv-utils(-)]
+		!sys-apps/sysvinit
+	)
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-apps/hwids[udev]
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? (
+		app-text/tree
+		dev-lang/perl
+		sys-apps/dbus
+	)
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
+QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
+			~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if kernel_is -ge 5 10 20; then
+			CONFIG_CHECK+=" ~KCMP"
+		else
+			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
+		fi
+
+		if kernel_is -ge 4 18; then
+			CONFIG_CHECK+=" ~AUTOFS_FS"
+		else
+			CONFIG_CHECK+=" ~AUTOFS4_FS"
+		fi
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
+	# wasn't backported to 250.x, but it turns out to break Clang
+	# anyway:  bug #841770.
+	#
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		$(meson_use split-usr)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_native_use_bool fido2 libfido2)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
+		$(meson_native_use_bool gnutls)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_native_use_bool openssl)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# https://bugs.gentoo.org/761763
+	rm -r "${ED}"/usr/lib/sysusers.d || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	keepdir /etc/udev/hwdb.d
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
+
+	if use pam; then
+		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	# workaround for https://github.com/systemd/systemd/issues/13501
+	if use hostnamed-fallback; then
+		# this file requires dbus-broker
+		insinto /usr/share/dbus-1/system.d/
+		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+		doins "${FILESDIR}/00-hostnamed-network-user.conf"
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_preinst() {
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required.
+	systemd-hwdb --root="${ROOT}" update
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respected, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if use hostnamed-fallback; then
+		if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then
+			ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run."
+			ewarn "To enable dbus-broker.service run the next command as root:"
+			ewarn "systemctl enable dbus-broker.service"
+		fi
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-251.1.ebuild b/sys-apps/systemd/systemd-251.1.ebuild
index 285ae73ff43f..a11dccb51ae7 100644
--- a/sys-apps/systemd/systemd-251.1.ebuild
+++ b/sys-apps/systemd/systemd-251.1.ebuild
@@ -22,13 +22,13 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+HOMEPAGE="http://systemd.io/"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
diff --git a/sys-apps/systemd/systemd-251.ebuild b/sys-apps/systemd/systemd-251.ebuild
index 697214806c4b..b0d9cb825629 100644
--- a/sys-apps/systemd/systemd-251.ebuild
+++ b/sys-apps/systemd/systemd-251.ebuild
@@ -20,7 +20,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 06de6c48675c..61120378152b 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -22,13 +22,13 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+HOMEPAGE="http://systemd.io/"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 61141d1ea0c5..824a55b20a51 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,4 +1,4 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-EBUILD texinfo-6.8.ebuild 1678 BLAKE2B c55d227aaf21a2855bd0d32ba623312d21987a9ebbbe79494fe3a63a8a43361382d533a53d7fa1c29453699edb21cf078302f78017fe0e4e078513e136a8f404 SHA512 f44742872a26edbc6d1051d980808c1d7daaa0f5a4d7763e1e249571631e327774998485767ccd2258fc939589014562daa79a8ec35a92332beed4a6dbac5386
+EBUILD texinfo-6.8.ebuild 1716 BLAKE2B 4194a080e1dfb4f405330b000838f461a4bd19a253249b41034595449e8ab8f75e075383a5e970506db9d8970f29e30f84611f81a6c032edcc930786898f6533 SHA512 55afd3cf0f842dc8894162940abe2ccd384b0491fcd4fe877255c509031002cd0e8c83f5a4348dbc2432f124d80e224a3e7f127f475e40af5eeb3c0febe1601c
 MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index be21633802a7..0935accde6c5 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -45,7 +45,10 @@ src_configure() {
 	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
 
 	use static && append-ldflags -static
-	local myeconfargs=( $(use_enable nls) )
+	local myeconfargs=(
+		--cache-file="${S}"/config.cache
+		$(use_enable nls)
+	)
 
 	if use standalone ; then
 		myeconfargs+=(
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index ed0125a10bba..e67c2cf662db 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,3 +1,3 @@
 DIST usbutils-014.tar.xz 165884 BLAKE2B aea4f8edd3c7d7bc400fd63a8702b6d0bb50b8ed07196c4a0ed20a615eacf6373794afb9e7d5d81408dc3382848e965ecf8bc1bbec20837e4d1f96ba47cc40b5 SHA512 43c9f6ed14f8d01e014ef39a5d50b3b09031c6bda8261e0945b4cb4287c9107104175b386c2adc61dc7f9f476afb30f9a647a6ece6dee26b4133a4f10af72792
-EBUILD usbutils-014-r1.ebuild 1338 BLAKE2B 45d226412d0951c0abeae34180a5da5cb4738077e3e98bd22633f44cc5530f18abc2f121be4eef5deed918d936e74470f7e985d56902441b5f99247f73a50444 SHA512 c3071487b62190151f6fe5a108637ed0285c6fc835982ae01e41c88897710fd3c262ff125c884e1add9129fc9b48fc73920fd0d07e13d82acf09664bfdc22df3
+EBUILD usbutils-014-r1.ebuild 1351 BLAKE2B 02d2753b401fa7c06e8a55783cb23fe93855c23116c85079ac875ce55f470bc36d2dce0e70274c75ea06ef09495ed5e6a174b2045239fd4313ebf810c73cac21 SHA512 bef29472eda89501af0d72679f92cbd41b5074c6e73d7d1d3afccb06b53371864175044ed80fc7820fd54867b17fa174880166d6d24aa061be19f64558129290
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/usbutils/usbutils-014-r1.ebuild b/sys-apps/usbutils/usbutils-014-r1.ebuild
index ccfe79ce3bab..e99096d69ad4 100644
--- a/sys-apps/usbutils/usbutils-014-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-014-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools python-single-r1
+inherit python-single-r1
 
 DESCRIPTION="USB enumeration utilities"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
@@ -36,12 +36,13 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	eautoreconf
+
 	use python && python_fix_shebang lsusb.py.in
 }
 
 src_configure() {
 	local myeconfargs=(
+		--cache-file="${S}"/config.cache
 		--datarootdir="${EPREFIX}/usr/share"
 		--datadir="${EPREFIX}/usr/share/hwdata"
 	)
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 231b803988a4..33e68a1ccc2c 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.12.1.tar.xz 484352 BLAKE2B afa14ab78f35cb1c0e66514f313f5dc297ceef88af1ca7b3028305faa8398bdae1b9e897289b18a93b1cda1a8290c0e51bf73e66c9dce231f57a58652fb9e120 SHA512 62df427e2d8d54acd9a34a02a77c26ae3911fbb4c5844eff4a253dc839775c929c6945401b93549ba200ba637d315146767e41f18a831d7627b35de880de0da1
 DIST xdg-desktop-portal-1.14.4.tar.xz 510492 BLAKE2B 32f71cbc74d6bb3010e31172972dd7bfc4c982691ef55f66c29d5cf4aa2abeed816f890800691e898f739c2c7aa13db1e04f322c89ce30e9ac8a69b87435a448 SHA512 23fa4f9fdf39f22d6eaa4f6020db5f81d272b85fe6051467c5e28a752c65b18a9b540fafe5b27725fafa29dffefcd113d873928cd78e3658895cd24d96b82f73
 EBUILD xdg-desktop-portal-1.12.1.ebuild 987 BLAKE2B 94bb8e58df78606aca537d7d824fa28624d1363ecbb851da6cf26c1c9c9df001c374700ce1927d9c8e21c4f9ba57f8f0401b67384b402955884b22e34f498323 SHA512 8364ffd4409b01f374b3e192bfb7e955f00e9c8fe056439b34ec5cc2b2ca750fb69ddef02469d5b542f6bee51f4de8885802acabccd6f112184920c9dcb814e4
-EBUILD xdg-desktop-portal-1.14.4.ebuild 1095 BLAKE2B 3fdb1e051b9a16a3fa939342324b3a3e97e9cea38ec09a04bdefde186ef7faa6ed8da7028e146c97fbadf94c11d35f8faf2923a570a055900e6208f743addee1 SHA512 4901a6c1c4f23b74c8428e18b691d5e0383ffb89adbf0879ca00b77d5330df8866d64349ca1103c9f6eda9ad623ce6292434966038b79419266fbe332c7be07b
+EBUILD xdg-desktop-portal-1.14.4.ebuild 1092 BLAKE2B 3ba584de28227ecc1de0b5195e7cbae54443738c336f5bff6780db45036349cba5408fc791546e1c9fbed0139d69e3109bb0bf7435de2ea4a1a6f90c34b3e2c9 SHA512 4d2720260e53a084e9a6047d318a3039d3d8e1d9b2ed251136bf30e622ea686c8f361e2f84260b9b9f13fbf366f2c6906aa3995d5d81f1b3ba5f8c6c9b695171
 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
index b3c3088512f7..88a0b170d6e9 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.14.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 IUSE="geolocation screencast systemd"
 
 DEPEND="
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 5b797fa9dd79..170d994d5ba0 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/gparted/Manifest b/sys-block/gparted/Manifest
index eb5cc1f87945..f502bd5561dd 100644
--- a/sys-block/gparted/Manifest
+++ b/sys-block/gparted/Manifest
@@ -4,5 +4,5 @@ DIST gparted-1.3.1.tar.gz 4169647 BLAKE2B 0e79ea51df79460ae70e15a0f4d5bb1158dd80
 DIST gparted-1.4.0.tar.gz 4308426 BLAKE2B 834782196e7cfe5c5553200743cbbaf700e59ef01076919d16138e736ebbbb16185ec68cd27546f1ff851ff742c51fc170a0f6596e9b014684b8be1d29acfea9 SHA512 20f94622fc1a2727f1fc9bb39ea9f04f14af06b0ff7e47c2149730d5eb339089b0d3c21cd3c9ce6f971e955a9f6ab89cc32fd5b7545a5e340b451297d87e8f39
 EBUILD gparted-1.3.1.ebuild 2808 BLAKE2B cc84d49cb77db5bf0b582e3bce8cf280c5cdffd378c7a5ae266930ec6fd1bf69dd2a41bc91bc403decab2638800f9a3dddc97be7e173a3842fe8d864bd063358 SHA512 4f4b19616bcc9e5158114e28a86452f0fd5a7d32dd0eb6144ae6a6b290de4ffcf614f916066df6adf916ad15fede72c0ba5de73ffb5b9715372144922de0e811
 EBUILD gparted-1.4.0-r1.ebuild 2866 BLAKE2B 406a2dbc84155dfd8ddf5edfa49c89cb7ee09eb51728310f480f277c9cbff23d2e52ce63bb14482bb42779e7c9dd423ec72538576f9f2e93d406348d9c968ebf SHA512 ee2815335403c399e173e976d39b9af84b2b9884325d62a5f9f4acc513f2ea83cf9ef99e04c2f9d638dd988809683a05791ade5a01f97967de2726d511bd7100
-EBUILD gparted-1.4.0.ebuild 2819 BLAKE2B 092bdc7b8c454344176701edb934ff556a40d480a8210f394e2246ba460cce2846fb32f97c3fdddda99f0cebe02dc25310b676bf7809e8c97c06a396d70ed38e SHA512 4fd82d8f29e739fe1b2874dc336b10153bcc8699785dc8441f7ca462b35dbaa9b3bdcc25ae4fab2cd2f9bc4b440d7fcaf81968cc800ce848112cb5470580f5d1
+EBUILD gparted-1.4.0.ebuild 2815 BLAKE2B 03acf37610fc4fe3e33c5aaefd2a8f963fca3c0b84d6562a43874f8a8eae4119d2c49278debc1dfbad6b0a5856e5c18bdb1f24bf6389f23985f9c99b8ebe682b SHA512 9568098e125de639f4bab0a155ffedd94678ba49e895d227f375f89552a41124c66f9eff50766789887b9269967ef23d16896c8833ba71e819ab46addae6ffdb
 MISC metadata.xml 915 BLAKE2B 0d1b9e847455a3920c9826b8f352481448aa08b6a7625db5d19da403b5d20dcf4dcc78a9b7a3925fe06915a5078979668028c7c1e8da869a3f9d493fed22d2cb SHA512 7df8fd771da273681728e142d7e6ef10b5434dd40ac96eb2da96c1331116dbc33c7a25be5ca69dd8a56d3eb4ed961d4a51d4f0c554b44e5752169b0f5b9d2e8a
diff --git a/sys-block/gparted/gparted-1.4.0.ebuild b/sys-block/gparted/gparted-1.4.0.ebuild
index a209f0a714db..f459c427b2ad 100644
--- a/sys-block/gparted/gparted-1.4.0.ebuild
+++ b/sys-block/gparted/gparted-1.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ FDL-1.2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="kde policykit wayland"
 
 DEPEND="
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 790313fb36d2..02f8a4b7798c 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/gnu-efi/Manifest b/sys-boot/gnu-efi/Manifest
index 36468ab0128a..dcecdd9e270a 100644
--- a/sys-boot/gnu-efi/Manifest
+++ b/sys-boot/gnu-efi/Manifest
@@ -2,5 +2,5 @@ AUX gnu-efi-3.0.9-fix-clang-build.patch 691 BLAKE2B 5b3f60e27982cd9e2cfb385851af
 DIST gnu-efi-3.0.12.tar.bz2 154575 BLAKE2B 264e04351cf1ef74956e65d209c00514c0f56c18427a87a894132e5a5b0b09b3ca992475a2f95aac42c8a26ff4977ec837ff473d76c1c766049e903f03bd9fff SHA512 cbec6f6e37271c22c71e3ce44d3579e48e7f3b797ec3946f56eb843ed3e472722763c566fc3b749f0c692ab6cb26e8909bb258cd164771a5b1eeff5c7cd51368
 DIST gnu-efi-3.0.14.tar.bz2 159295 BLAKE2B c7f9127d3bb7e5e2bc52f5fc7be3376ddc5076b262e5db5a30a997cf10bf10288da63ded64d11327fad09190a803ce26e82b32aea2d8525ee0d1e1a23ebadff2 SHA512 37420ba3804e8547451a7b143a689ceb6af0557234fa7801efdeba3c2fc581a5354fe34cbaacb338d7b394d913e7274098ebf07026b7c1d50b2236d7f86c470c
 EBUILD gnu-efi-3.0.12.ebuild 1893 BLAKE2B be5aa026b5aeadb8e39322013446277ea08bf96cbee08eeadea7a8392d56b1ad45f7d5963ef7f1baeef459e54fb68bc24ba5faaeef72f52e64dde1a1ef767d17 SHA512 be87d6720e42a9ff0334fb5e79b85d272339d332fa13bf8aa415badcb68bf3727b63ac241f44a1efcc1e44f869fa122350298837526d064d79931ade56e0cb3d
-EBUILD gnu-efi-3.0.14.ebuild 1794 BLAKE2B 43990bcd83b91d9872b469189ce929d46cd126d364a9fd1db773fbea4813acb0fa3284bfc28c5afc43b44c3be532eca76292670b401f5039e1755966de0135c2 SHA512 687a2206ece8adbaa40f38c64ab8819a55f575d91e5068e3420eeed5a7c30f4b2805013a5906a56507af265eccc8b0d6b748cb5843ee883121c05104a8b2ae1f
+EBUILD gnu-efi-3.0.14.ebuild 1914 BLAKE2B a56a217406b98741e472504df0e7e5ad33d6b3ba40cd1ea7f78378b6151e9134083d9b43635fd8b76855a717742a3553ddf94bbf89b648e65cebfa8b7d2fb3cf SHA512 a08046a2f8a309d692d3ec5b65f84cd35633ac2ba40b51024c69aa2e583bf2f99790566b92ccad993a289970384c814e536e505ae21cdfeaf31764802e1127c4
 MISC metadata.xml 324 BLAKE2B 7eff39b7405a7a2e574ca870890052a58dfcf612d2a5057dffda9aa7d674ead8884acac2bda143586d8d20000cb4e9e35f044fd2618386c7f4577d8014b899a2 SHA512 9ee2a23d2c9ac583a55b2e2d92652121f4ff11f8f40a0caa13d5a52fa61259814044ec106b46be0cc741cbdf68414c55c4da96b46328a96f5a1ec1d0e1fa11d6
diff --git a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
index 76d4ef4d4221..e3a8a8bf07f7 100644
--- a/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
+++ b/sys-boot/gnu-efi/gnu-efi-3.0.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Library for build EFI Applications"
 HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
@@ -18,6 +18,10 @@ LICENSE="GPL-2+ BSD BSD-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
 IUSE="abi_x86_32 abi_x86_64 custom-cflags"
+REQUIRED_USE="
+	amd64? ( || ( abi_x86_32 abi_x86_64 ) )
+	x86? ( || ( abi_x86_32 abi_x86_64 ) )
+"
 
 # These objects get run early boot (i.e. not inside of Linux),
 # so doing these QA checks on them doesn't make sense.
@@ -63,18 +67,18 @@ src_compile() {
 		unset CFLAGS CPPFLAGS LDFLAGS
 	fi
 
-	if [[ ${CHOST} == x86_64* ]]; then
+	if use amd64 || use x86; then
 		use abi_x86_32 && CHOST=i686 ABI=x86 efimake
-		use abi_x86_64 && efimake
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
 	else
 		efimake
 	fi
 }
 
 src_install() {
-	if [[ ${CHOST} == x86_64* ]]; then
+	if use amd64 || use x86; then
 		use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
-		use abi_x86_64 && efimake INSTALLROOT="${D}" install
+		use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
 	else
 		efimake INSTALLROOT="${D}" install
 	fi
diff --git a/sys-boot/os-prober/Manifest b/sys-boot/os-prober/Manifest
index ee8a65ab5dfe..823683478ddb 100644
--- a/sys-boot/os-prober/Manifest
+++ b/sys-boot/os-prober/Manifest
@@ -11,8 +11,10 @@ AUX os-prober-1.79-ntfs3.patch 909 BLAKE2B bcfd977f6ed5fb82503ffce6b02f54ce132df
 AUX os-prober-1.79-use-fstab-name.patch 1101 BLAKE2B 37353efa899fd72e68d297325218be5a81abc2eee50bda5607e87c0eb799924fff0f510b4f13c681213e5e4be864a62fec9d5c98e539a61e9cd4036315eeabc5 SHA512 25236c935559398a4c37cdec04c358787f6178a016a6d0d4780c7dcd9eb7e18f308f4a89a1ddbb37d6c7dd17d334d879961029afb4463cef5e9029eab58fdc5c
 DIST os-prober_1.78.tar.xz 26848 BLAKE2B eee68ab9be36807d86e8bda831cfd490a01d20d9cc3f84ca50d5e1143e5a2dd66e47d3bdf2b4780cf73cc692f0ffc9497c6cbf13ce7aa0057e996b13d706c8f7 SHA512 7a0425130d17ce8554e7d0797b53e3a984f63a2fdcf8e668c83d357418d8c68259ada25bc350b199adece2e683d9014f234e3a83ce5ab7485be2e69c45874640
 DIST os-prober_1.79.tar.xz 27028 BLAKE2B b3efacce9d7fce3708f5ec727a219e872e8d1de6dea15540cfbc0a0e8372c1033098230d3ddb9066fb5474d44e5584ee28631e0e5ab981e8fb1dc29ee3cbd89d SHA512 89b827b9b90a1d3bc11e0090ec04d808502cc1883ab10997b6d9edbe6005dcf8a0acdd7d200102c9dccde56297bda6087d68fb6dec419f0920090c2655c9c7d8
+DIST os-prober_1.80.tar.xz 27400 BLAKE2B 56883c7d3f4c5dde2904cffc77fdf6a2c1caf230f9e84197e8d976e446815838448bb42afd18d4c9526efac9907db3d2e77c6f54889011d2d03d284a44ff4cbd SHA512 51b4fefb784d5ecf34f5148157ef233e2979c4a679a54600144be473bb6ccaf263c9121701a1ecc7523c7e3bfc439a4e3a92a5eb92431ead99cbe666b0f0e6f5
 EBUILD os-prober-1.78-r1.ebuild 2233 BLAKE2B 7fa1535d0b90ec18c1ec2a49759915a786f35657a1bbed560239fed784e87d8517b2754c315017013f72398d6159faff5178f9976963443fd42ac52c6210f4db SHA512 54cb1e72251533af64b65675b1fb5833c699f9f91c6d20586268e5300a7977e2d95dcd3e8d32629ac6aaf45a9fecc434151aff4d7e656f577ae42f17c15b2f14
 EBUILD os-prober-1.79-r1.ebuild 2587 BLAKE2B fddd96476140557c8b703ed11d6a73c609d9c233f54eb8258356aed4a80f0724b8cebd8ff3b0ffab3d28608467a1ab013d268bae195a0f9834ef6802a474d8e1 SHA512 8b1715a9e321b84cce144715efb0856c174eb0e0a95b365cdadad0c16364fefe13571a2795e9f75d785acde07f695eaa7f3b5f5aba7244ff4200ec7276984535
 EBUILD os-prober-1.79-r2.ebuild 2579 BLAKE2B f53140ad6e45427bcde3a739dcbd603d22d0c9d767c604b3c8bd7918cd108f16fd21bebe8a468a8d1d29a0551423b992ad9099c5f646e886ade1339f85d05ad2 SHA512 52da1b381bb2e54cfa5f79085d4862298f821dc3c0dabb6a4e6e3139469ee594d4c9e4063188c47929cc5f8d07856d56488ad7a014ce198dc0ba49896251a9b2
-EBUILD os-prober-9999.ebuild 2482 BLAKE2B c59a755ba75807f6bdc3f9437ea319ee55600658997a23168f586eb19c4ea1012a9dfc0d637ae18bce2d972f8533e81360249c1af4157e67dad4de242c8dbe1b SHA512 62c4eb2541c01148e715eebf2b65d4ebaa0435a431839360e06509935706cfee3c1c5afc444333e94921f43d767d0964cedc118f9981bf4cb8cc01fcd7ed492c
+EBUILD os-prober-1.80.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58
+EBUILD os-prober-9999.ebuild 2460 BLAKE2B cc570bf47b84f1fa39d4873d5ef9fc5bc391eef35e588a695b23f96767e19efc174e835d21a7df4a9459cfcd19e6492b6ffe0962dc4465e37e418319d3622167 SHA512 518a0cb0f0fa09e4966b23969b9d6eeb2a404e913c3fb449dd6ceb62dc2afb4d61f5d1e55f4be81d11c3fc0dcb7a10eea0f5ccca05a2b39ca77c1d08eccb2e58
 MISC metadata.xml 384 BLAKE2B 98bf64680e61d1c0f0c9cbd73ce11be5a98fc7014517d263be8808064b1ab5b7ef200c243c472c3dedfad24176851007d9f4b03399e0970fd351f086b13d355c SHA512 dd391671666f17ce8e45093ff42c898c4bb0c685df9bb631c56089379d0825a15364656dedf4eec13c7652cfdbeb9c4f40f7bae0a8360cadd9b2cff136189bc3
diff --git a/sys-boot/os-prober/os-prober-1.80.ebuild b/sys-boot/os-prober/os-prober-1.80.ebuild
new file mode 100644
index 000000000000..60466c142031
--- /dev/null
+++ b/sys-boot/os-prober/os-prober-1.80.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Utility to detect other OSs on a set of drives"
+HOMEPAGE="https://salsa.debian.org/installer-team/os-prober"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://salsa.debian.org/installer-team/${PN}.git"
+else
+	SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+# grub-mount needed per bug #607518
+RDEPEND="sys-boot/grub:2[mount]"
+
+# bug 594250
+QA_MULTILIB_PATHS="usr/lib/os-prober/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.79-mdraid-detection.patch
+	"${FILESDIR}"/${PN}-1.79-btrfs-subvolume-detection.patch
+	"${FILESDIR}"/${PN}-1.79-use-fstab-name.patch
+	"${FILESDIR}"/${PN}-1.79-mounted-boot-partition-fix.patch
+	"${FILESDIR}"/${PN}-1.79-fix-busy-umount-message.patch
+	"${FILESDIR}"/${PN}-1.79-efi-chroot-blkid-fallback.patch
+)
+
+DOC_CONTENTS="
+	If you intend for os-prober to detect versions of Windows installed on
+	NTFS-formatted partitions, your system must be capable of reading the
+	NTFS filesystem. One way to do this is by installing sys-fs/ntfs3g.
+
+	NOTE: Since sys-boot/grub-2.06-rc1, grub-mkconfig disables os-prober by default.
+	To enable it, add GRUB_DISABLE_OS_PROBER=false to /etc/default/grub.
+"
+
+src_prepare() {
+	default
+	# use default GNU rules
+	rm Makefile || die 'rm Makefile failed'
+}
+
+src_compile() {
+	tc-export CC
+	emake newns
+}
+
+src_install() {
+	dobin os-prober linux-boot-prober
+
+	# Note: as no shared libraries are installed, /usr/lib is correct
+	exeinto /usr/lib/os-prober
+	doexe newns
+
+	insinto /usr/share/os-prober
+	doins common.sh
+
+	keepdir /var/lib/os-prober
+
+	local debarch=${ARCH%-*} dir
+
+	case ${debarch} in
+		amd64)		debarch=x86 ;;
+		ppc|ppc64)	debarch=powerpc ;;
+	esac
+
+	for dir in os-probes{,/mounted,/init} linux-boot-probes{,/mounted}; do
+		exeinto /usr/lib/${dir}
+		doexe ${dir}/common/*
+		if [[ -d ${dir}/${debarch} ]]; then
+			for exe in ${dir}/${debarch}/*; do
+				[[ ! -d "${exe}" ]] && doexe "${exe}"
+			done
+		fi
+		if [[ -d ${dir}/${debarch}/efi ]]; then
+			exeinto /usr/lib/${dir}/efi
+			doexe ${dir}/${debarch}/efi/*
+		fi
+	done
+
+	if use amd64 || use x86; then
+		exeinto /usr/lib/os-probes/mounted
+		doexe os-probes/mounted/powerpc/20macosx
+	fi
+
+	einstalldocs
+	dodoc debian/changelog
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-boot/os-prober/os-prober-9999.ebuild b/sys-boot/os-prober/os-prober-9999.ebuild
index c854d403e4f0..60466c142031 100644
--- a/sys-boot/os-prober/os-prober-9999.ebuild
+++ b/sys-boot/os-prober/os-prober-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=8
@@ -13,7 +13,6 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}"/${PN}
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index 2d385d8319e0..d220b5367473 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -1,6 +1,14 @@
+AUX 6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch 1406 BLAKE2B 6fac1d0e6c13aa9a9cbf782472c0b581c2837989185c2e8766d6699602203d94241b3593d673ecd0d5b2238421d7aea670272117fd1a744d8939e3ff07c5a83a SHA512 7ffbe3d9fb8a426d8aaed603c9907d0fee561f0a6983c099ae3e2aff64c5028814f7776d38336c40f68125ad2e492e459057787cda13ab11c5748adc06697113
+AUX 6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch 4873 BLAKE2B 851fb44f562d48cc30881d444c424ae6265d884e1ab63bcc41bc55e2fa687c47a208fe4431b57c4042fe8b56f5feb97b7e89d93b1138cf7ad66fb535df7e2115 SHA512 569ee1ccd0639bc79920f38a7d0865a62eee1e55511ec8a1a8e4e5d224de01ce422915cab75134ce836b6880722f9c152ed91ad9fab803a278e7449d5c6c907b
+AUX 6.04_pre1/0003-GCC-10-compatibility-patch.patch 3356 BLAKE2B 1ceb5ce12ae9e1ffd81c6c493f3bf3b357622f91b1080b6cfa2fda9ae5f12e46af242a53cbabc14cee2a5d53ee862ab587fd674fb4342bfdd4e6b3035dc536cd SHA512 4cf21b40dcdfc2f3abba5885fd47ca41def10feedee525a805da2a4a84015ef1f72005b1c75baec4cdae3871519c30d2ed6c215f23c8ddef0a3bf04d0f704ce5
+AUX 6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch 1446 BLAKE2B fbc9c08173f82a6d07cbe11673a61f97efc5e0a284ce029f1092776fd79dcbf0023f8157d94313fef81703350498cb85e2a97da4338be3b7ddaf33fe6a20fc4f SHA512 0e2d9a7ade52135c4d53c18aa2b674314784cb6ea74e3a55013686b8c4b70304f2400a1f9b8f6c7ddc17556a0982ace67e4e6f4f0cc76c97fe09e0f19e9a3c0b
+AUX 6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch 500 BLAKE2B ed3e0a623c18ecc6880d074397fd6509223e8da1954d09b12f1a6642ca096bcc8a4b9688fbcf239d024a5fe6228aca23dc2069124f3b47c629f67ae8f23e720f SHA512 6dde7d306684174dc68bf952c50f2991d0cbcef545fbc91e220bec620a3e4e2895ac64412b777538d302e2215f1f11e45b29d87918025e98c7e14cf13205eed4
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
 AUX syslinux-6.04_pre1-fcommon.patch 2111 BLAKE2B 6b0d047cc729e7e9c9658ccd6ecd1166eb1ff2be569132f94b0d2bdc71eb9412a05bf23aa287626949a6ea376b2a8d02877d72182d4ea50d54e445df9c38ac81 SHA512 50c58bc44c77a5a68910cd40370f4259afd1392fe8e1b5c6ac25f7e610d994ebc8d17434eb8d3f832a14f098e16b5b597c723f98ce8c12a89118f5b8d2c65529
 AUX syslinux-6.04_pre1-singleloadsegment.patch 4744 BLAKE2B a28ff29b9a4bdd2cb65a6700c96ff99ba1a045a401d50587efe59d703f12aca3e47a14a8e7a569c50f11d367545990d09c35f90362efe49d0c9d489802885879 SHA512 9585edfc8ab0e22d4d7757ccdc435c198c5457466fb4fdefc1829cbbe8951f3406b7b51eea56044cc297d29e45772e2154e5746e6d9b92310f17c880c950ff8a
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
+DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d
 EBUILD syslinux-6.04_pre1-r2.ebuild 3251 BLAKE2B 6a9d50d935e133a6937b55c05b5f06f53c01ea20427583b4cdf5d7d1976778d653fe77d083ac3df86d9c38ff10e01db9f735e878ebf26f99937174fe29b30b77 SHA512 621bafdbdca728e8c7abf3331e13eba7a0d672215adf7fab51225394c9ee4e433323751911a58984785a9a58d01dc393752632f3d3d28c46699201d364db20d2
-MISC metadata.xml 412 BLAKE2B 39ab77b79183df91d2bf410ef52f577fc39cc1f21e2f4a843bb8eec34629f3bb87770f8bd0c9461b7065560f2cb1acda57057063c1ab842980d581c52fa89ffd SHA512 55342602eddeca12ee6549fb7d753c19e005034f56f3dee93f09b4f74f3d6e7a99e01e3c56ae0e4d579872fad76e4b64a6b9d99ca064e53614e8491e1d318c64
+EBUILD syslinux-6.04_pre1-r3.ebuild 1746 BLAKE2B 4d38a809948cab9409fb967dd7bf1a9dfc90c0c79949f302c1a7a3647438524b8655a9ed734e9c012880c85302cd43d4e240d48bf5fbfcf35cb0e6cd2564480a SHA512 66903bac7048317a4545bed655e3de728665f6ddba37a3816274ba7d141f3871e78c953b9284146ce8befd01ba55b450934f06edb3825e2043106c739431a6ad
+EBUILD syslinux-6.04_pre3.ebuild 2029 BLAKE2B 7472de0020dbd1739c2bc7df47c240bd3c7ad5309ca1b6a40bec360b6c37402d63d34a49d06c1419fb5a9df057f9252976503ce0a33b104a8c3dfdc61defa33a SHA512 6d010ffbda45daa93e2ffc281499393a3c587a9f0d4f60320848cfc7f3c25314d9e9a0be7956738dd00fc73c5728de0d9dfaa87de9cb264c942775cd1d613654
+MISC metadata.xml 529 BLAKE2B 8d1614f7254b20836e2bc0f650ae2e3795fd665119bc2d1427e236a417c5c82699929c0291f4b12c04ba2ac387f9d6650682d0d95802fdf333b1267367b4e75c SHA512 e80e9ba96972111b3c5cdea98fb032c50bb7f94a445785ed54d236933768ae2734d248c71ecf54f36d6b3641a7e15abdb4ef4c0b968d59d20ee9259019d32e38
diff --git a/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch b/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
new file mode 100644
index 000000000000..5d823436bec8
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch
@@ -0,0 +1,47 @@
+From 60fef313164d1048cf11423656732953776e5e2f Mon Sep 17 00:00:00 2001
+From: Lukas Schwaighofer <lukas@schwaighofer.name>
+Date: Sat, 18 Aug 2018 12:48:21 +0200
+Subject: [PATCH 1/5] Strip the .note.gnu.property section for the mbr
+
+This section is added since binutils Debian version 2.31.1-2 and causes mbr.bin
+to grow in size beyond what can fit into the master boot record.
+
+Forwarded: https://www.syslinux.org/archives/2018-August/026168.html
+---
+ mbr/i386/mbr.ld   | 6 +++++-
+ mbr/x86_64/mbr.ld | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/mbr/i386/mbr.ld b/mbr/i386/mbr.ld
+index d14ba802..6d489904 100644
+--- a/mbr/i386/mbr.ld
++++ b/mbr/i386/mbr.ld
+@@ -69,5 +69,9 @@ SECTIONS
+   .debug_funcnames 0 : { *(.debug_funcnames) }
+   .debug_typenames 0 : { *(.debug_typenames) }
+   .debug_varnames  0 : { *(.debug_varnames) }
+-  /DISCARD/ : { *(.note.GNU-stack) }
++  /DISCARD/	  :
++  {
++    *(.note.GNU-stack)
++    *(.note.gnu.property)
++  }
+ }
+diff --git a/mbr/x86_64/mbr.ld b/mbr/x86_64/mbr.ld
+index ae27d49a..5b46db66 100644
+--- a/mbr/x86_64/mbr.ld
++++ b/mbr/x86_64/mbr.ld
+@@ -68,5 +68,9 @@ SECTIONS
+   .debug_funcnames 0 : { *(.debug_funcnames) }
+   .debug_typenames 0 : { *(.debug_typenames) }
+   .debug_varnames  0 : { *(.debug_varnames) }
+-  /DISCARD/ : { *(.note.GNU-stack) }
++  /DISCARD/	  :
++  {
++    *(.note.GNU-stack)
++    *(.note.gnu.property)
++  }
+ }
+-- 
+2.35.1
+
diff --git a/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch b/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
new file mode 100644
index 000000000000..33b6a36c63ea
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch
@@ -0,0 +1,311 @@
+From 0c646f067a6b766a5ce0434e5e4e7b839b511331 Mon Sep 17 00:00:00 2001
+From: Lukas Schwaighofer <lukas@schwaighofer.name>
+Date: Sat, 18 Aug 2018 16:56:35 +0200
+Subject: [PATCH 2/5] Force the linker to put all sections into a single
+ PT_LOAD segment
+
+This is required when using binutils >= 2.31 which writes two PT_LOAD segments
+by default. This is not supported by the wrapper.c script used to convert the
+shared object into an elf binary.
+
+Forwarded: https://www.syslinux.org/archives/2018-August/026167.html
+---
+ efi/i386/syslinux.ld   | 37 +++++++++++++++++++++----------------
+ efi/x86_64/syslinux.ld | 37 +++++++++++++++++++++----------------
+ 2 files changed, 42 insertions(+), 32 deletions(-)
+
+diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
+index bab3fc74..19c16479 100644
+--- a/efi/i386/syslinux.ld
++++ b/efi/i386/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+ OUTPUT_ARCH(i386)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
+diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
+index 450641c6..a2c124fd 100644
+--- a/efi/x86_64/syslinux.ld
++++ b/efi/x86_64/syslinux.ld
+@@ -19,6 +19,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")
+ OUTPUT_ARCH(i386:x86-64)
+ ENTRY(_start)
+ 
++PHDRS
++{
++	all PT_LOAD ;
++}
++
+ SECTIONS
+ {
+ 	. = 0;
+@@ -31,7 +36,7 @@ SECTIONS
+ 		*(.text)
+ 		*(.text.*)
+ 		__text_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -40,7 +45,7 @@ SECTIONS
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -49,14 +54,14 @@ SECTIONS
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+-	}
++	} :all
+ 
+ 	.dtors : {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4096);
+ 	.rel : {
+@@ -64,7 +69,7 @@ SECTIONS
+ 		*(.rel.data)
+ 		*(.rel.data.*)
+ 		*(.rel.ctors)
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -72,14 +77,14 @@ SECTIONS
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+-	}
++	} :all
+ 
+ 
+ 	.dynsym : {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -87,7 +92,7 @@ SECTIONS
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -104,7 +109,7 @@ SECTIONS
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(4);
+ 
+@@ -112,7 +117,7 @@ SECTIONS
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+-	}
++	} :all
+ 
+ 	. = ALIGN(16);
+ 
+@@ -122,19 +127,19 @@ SECTIONS
+ 		*(.data.*)
+ 		*(.lowmem)
+ 		__data_end = .;
+-	}
++	} :all
+ 
+ 	.reloc : {
+ 		*(.reloc)
+-	}
++	} :all
+ 
+ 	.symtab : {
+ 		*(.symtab)
+-	}
++	} :all
+ 
+ 	.strtab : {
+ 		*(.strtab)
+-	}
++	} :all
+ 
+ 	.bss (NOLOAD) : {
+ 		/* the EFI loader doesn't seem to like a .bss section,
+@@ -148,7 +153,7 @@ SECTIONS
+ 		__bss_end = .;
+ 		*(.sbss)
+ 		*(.scommon)
+-	}
++	} :all
+ 	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+ 	__bss_dwords = (__bss_len + 3) >> 2;
+ 
+@@ -161,7 +166,7 @@ SECTIONS
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+ 		__hugebss_end = .;
+-	}
++	} :all
+ 
+ 	_end = .;
+ 
+-- 
+2.35.1
+
diff --git a/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch b/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch
new file mode 100644
index 000000000000..6d60eab14bbb
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre1/0003-GCC-10-compatibility-patch.patch
@@ -0,0 +1,99 @@
+From b92e6e8f624c96acf2ce80192a893ee25de527a1 Mon Sep 17 00:00:00 2001
+From: Lukas Schwaighofer <lukas@schwaighofer.name>
+Date: Sun, 16 Aug 2020 15:23:21 +0200
+Subject: [PATCH 3/5] GCC-10 compatibility patch
+
+* Add `-fcommon` to most gcc invocations to allow duplicate definitions
+* __builtin_strlen is not really a "builtin" an implementation still
+  needs to be provided (source:
+  https://bugzilla.suse.com/show_bug.cgi?id=1166605#c5). Work around the
+  issue by supplying an inline function. The strlen function added to
+  dos/string.h was copied from com32/lib/strlen.c.
+---
+ dos/string.h   | 11 ++++++++++-
+ mk/efi.mk      |  1 +
+ mk/elf.mk      |  1 +
+ mk/embedded.mk |  2 +-
+ mk/lib.mk      |  2 +-
+ 5 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/dos/string.h b/dos/string.h
+index f648de2d..c4649f5f 100644
+--- a/dos/string.h
++++ b/dos/string.h
+@@ -5,12 +5,21 @@
+ #ifndef _STRING_H
+ #define _STRING_H
+ 
++#include <stddef.h>
++
+ /* Standard routines */
+ #define memcpy(a,b,c)	__builtin_memcpy(a,b,c)
+ #define memmove(a,b,c)	__builtin_memmove(a,b,c)
+ #define memset(a,b,c)	__builtin_memset(a,b,c)
+ #define strcpy(a,b)	__builtin_strcpy(a,b)
+-#define strlen(a)	__builtin_strlen(a)
++
++static inline size_t strlen(const char *s)
++{
++    const char *ss = s;
++    while (*ss)
++	ss++;
++    return ss - s;
++}
+ 
+ /* This only returns true or false */
+ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n)
+diff --git a/mk/efi.mk b/mk/efi.mk
+index f097ad22..407bc077 100644
+--- a/mk/efi.mk
++++ b/mk/efi.mk
+@@ -25,6 +25,7 @@ FORMAT=efi-app-$(EFI_SUBARCH)
+ 
+ CFLAGS = -I$(EFIINC) -I$(EFIINC)/$(EFI_SUBARCH) \
+ 		-DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \
++		-fcommon \
+ 		-Wall -I$(com32)/include -I$(com32)/include/sys \
+ 		-I$(core)/include -I$(core)/ $(ARCHOPT) \
+ 		-I$(com32)/lib/ -I$(com32)/libutil/include -std=gnu99 \
+diff --git a/mk/elf.mk b/mk/elf.mk
+index b46dbd06..dc265ce9 100644
+--- a/mk/elf.mk
++++ b/mk/elf.mk
+@@ -55,6 +55,7 @@ GPLINCLUDE =
+ endif
+ 
+ CFLAGS     = $(GCCOPT) $(GCCWARN) -W -Wall \
++	     -fcommon \
+ 	     -fomit-frame-pointer -D__COM32__ -D__FIRMWARE_$(FIRMWARE)__ -DDYNAMIC_MODULE \
+ 	     -nostdinc -iwithprefix include \
+ 	     -I$(com32)/libutil/include -I$(com32)/include \
+diff --git a/mk/embedded.mk b/mk/embedded.mk
+index 488dc0fc..fae13e20 100644
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -57,7 +57,7 @@ LIBGCC    := $(shell $(CC) $(GCCOPT) --print-libgcc)
+ LD        += -m elf_$(ARCH)
+ 
+ # Note: use += for CFLAGS and SFLAGS in case something is set in MCONFIG.local
+-CFLAGS    += $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare $(OPTFLAGS) $(INCLUDES)
++CFLAGS    += $(GCCOPT) -g $(GCCWARN) -Wno-sign-compare -fcommon $(OPTFLAGS) $(INCLUDES)
+ SFLAGS    += $(CFLAGS) -D__ASSEMBLY__
+ 
+ .SUFFIXES: .c .o .S .s .i .elf .com .bin .asm .lst .c32 .lss
+diff --git a/mk/lib.mk b/mk/lib.mk
+index f8591e56..6dd54295 100644
+--- a/mk/lib.mk
++++ b/mk/lib.mk
+@@ -49,7 +49,7 @@ OPTFLAGS  = -Os -march=$(MARCH) -falign-functions=0 -falign-jumps=0 \
+ 	    -falign-labels=0 -ffast-math -fomit-frame-pointer
+ WARNFLAGS = $(GCCWARN) -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Winline
+ 
+-CFLAGS  = $(OPTFLAGS) $(REQFLAGS) $(WARNFLAGS) $(LIBFLAGS)
++CFLAGS  = $(OPTFLAGS) $(REQFLAGS) -fcommon $(WARNFLAGS) $(LIBFLAGS)
+ 
+ ifeq ($(FWCLASS),EFI)
+ CFLAGS += -mno-red-zone
+-- 
+2.35.1
+
diff --git a/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch b/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch
new file mode 100644
index 000000000000..40784f9b2698
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch
@@ -0,0 +1,72 @@
+From 46d58e2b03e15a863aed8661b9ee922da4930a3e Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 30 May 2022 11:57:07 -0400
+Subject: [PATCH 4/5] Inherit toolchain vars from environment
+
+---
+ mk/syslinux.mk | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/mk/syslinux.mk b/mk/syslinux.mk
+index 593ff75f..91d984e8 100644
+--- a/mk/syslinux.mk
++++ b/mk/syslinux.mk
+@@ -37,7 +37,7 @@ ifdef DEBUG
+ DEBUGOPT = -DDEBUG=$(DEBUG)
+ endif
+ 
+-NASM	 = nasm
++NASM	 ?= nasm
+ NASMOPT  = -Ox $(DEBUGOPT)
+ 
+ PERL	 = perl
+@@ -46,29 +46,29 @@ UPX	 = upx
+ 
+ CHMOD	 = chmod
+ 
+-CC	 = gcc
++CC	 ?= gcc
+ gcc_ok   = $(shell tmpf=gcc_ok.$$$$.tmp; \
+ 		   if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \
+ 			-o $$tmpf 2>/dev/null ; \
+ 		   then echo '$(1)'; else echo '$(2)'; fi; \
+ 		   rm -f $$tmpf)
+ 
+-LD	 = ld
+-OBJDUMP	 = objdump
+-OBJCOPY  = objcopy
+-STRIP    = strip
+-AR       = ar
+-NM       = nm
+-RANLIB   = ranlib
+-STRIP	 = strip
+-GZIPPROG = gzip
+-XZ	 = xz
+-PNGTOPNM = pngtopnm
+-MCOPY    = mcopy
+-MFORMAT  = mformat
+-MKISOFS  = mkisofs
+-SED	 = sed
+-WGET	 = wget
++LD	 ?= ld
++OBJDUMP	 ?= objdump
++OBJCOPY  ?= objcopy
++STRIP    ?= strip
++AR       ?= ar
++NM       ?= nm
++RANLIB   ?= ranlib
++STRIP	 ?= strip
++GZIPPROG ?= gzip
++XZ	 ?= xz
++PNGTOPNM ?= pngtopnm
++MCOPY    ?= mcopy
++MFORMAT  ?= mformat
++MKISOFS  ?= mkisofs
++SED	 ?= sed
++WGET	 ?= wget
+ 
+ com32    = $(topdir)/com32
+ 
+-- 
+2.35.1
+
diff --git a/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch b/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch
new file mode 100644
index 000000000000..0d32d7167024
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch
@@ -0,0 +1,24 @@
+From 9889f441d006d11d0fb0b726b9f81396ce6fcfbd Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 30 May 2022 14:22:28 -0400
+Subject: [PATCH 5/5] Include efisetjmp.h from efi.h
+
+---
+ efi/efi.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/efi/efi.h b/efi/efi.h
+index c266532f..250c511e 100644
+--- a/efi/efi.h
++++ b/efi/efi.h
+@@ -22,6 +22,7 @@
+ 
+ #include <efi.h>
+ #include <efilib.h>
++#include <efisetjmp.h>
+ #include <efistdarg.h>
+ 
+ /* Delay for 100 ms */
+-- 
+2.35.1
+
diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index 423c8b85ac5e..ca6327ed17a2 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>chithanh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>chithanh@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="bios">Enable BIOS support</flag>
+		<flag name="efi">Enable EFI support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gentoo:syslinux</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
new file mode 100644
index 000000000000..4fba6cac1462
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://www.syslinux.org/"
+MY_P=${P/_/-}
+SRC_URI="https://www.kernel.org/pub/linux/utils/boot/syslinux/Testing/6.04/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 +bios +efi"
+REQUIRED_USE="|| ( bios efi )
+	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+
+BDEPEND="
+	dev-lang/perl
+	bios? (
+		app-arch/upx
+		app-text/asciidoc
+		dev-lang/nasm
+	)
+"
+RDEPEND="
+	sys-apps/util-linux
+	sys-fs/mtools
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/Digest-SHA1
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+S=${WORKDIR}/${MY_P}
+
+QA_EXECSTACK="usr/share/syslinux/*"
+QA_WX_LOAD="usr/share/syslinux/*"
+QA_PRESTRIPPED="usr/share/syslinux/.*"
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/syslinux-6.03-sysmacros.patch"
+		"${FILESDIR}/${PV}"
+	)
+	default
+}
+src_compile() {
+	local DATE=$(date -u -r NEWS +%Y%m%d)
+	local HEXDATE=$(printf '0x%08x' "${DATE}")
+
+	tc-export AR CC LD OBJCOPY RANLIB
+	unset LDFLAGS
+
+	if use bios; then
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+	fi
+	if use efi; then
+		if use abi_x86_32; then
+			emake efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
+		fi
+		if use abi_x86_64; then
+			emake efi64 DATE="${DATE}" HEXDATE="${HEXDATE}"
+		fi
+	fi
+}
+
+src_install() {
+	local firmware=( $(usev bios) )
+	if use efi; then
+		use abi_x86_32 && firmware+=( efi32 )
+		use abi_x86_64 && firmware+=( efi64 )
+	fi
+	local args=(
+		INSTALLROOT="${ED}"
+		MANDIR='$(DATADIR)/man'
+		"${firmware[@]}"
+		install
+	)
+	emake -j1 "${args[@]}"
+	einstalldocs
+	dostrip -x /usr/share/syslinux
+}
diff --git a/sys-boot/syslinux/syslinux-6.04_pre3.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
new file mode 100644
index 000000000000..f97f594ef776
--- /dev/null
+++ b/sys-boot/syslinux/syslinux-6.04_pre3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="SYSLINUX, PXELINUX, ISOLINUX, EXTLINUX and MEMDISK bootloaders"
+HOMEPAGE="https://www.syslinux.org/"
+MY_P=${P/_/-}
+SRC_URI="https://git.zytor.com/syslinux/syslinux.git/snapshot/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="-* ~amd64 ~x86"
+IUSE="abi_x86_32 abi_x86_64 +bios +efi"
+REQUIRED_USE="|| ( bios efi )
+	efi? ( || ( abi_x86_32 abi_x86_64 ) )"
+
+BDEPEND="
+	dev-lang/perl
+	bios? (
+		app-arch/upx
+		app-text/asciidoc
+		dev-lang/nasm
+	)
+"
+RDEPEND="
+	sys-apps/util-linux
+	sys-fs/mtools
+	dev-perl/Crypt-PasswdMD5
+	dev-perl/Digest-SHA1
+"
+DEPEND="${RDEPEND}
+	efi? ( sys-boot/gnu-efi[abi_x86_32(-)?,abi_x86_64(-)?] )
+	virtual/os-headers
+"
+
+S=${WORKDIR}/${MY_P}
+
+QA_EXECSTACK="usr/share/syslinux/*"
+QA_WX_LOAD="usr/share/syslinux/*"
+QA_PRESTRIPPED="usr/share/syslinux/.*"
+QA_FLAGS_IGNORED=".*"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/6.04_pre1"
+		"${FILESDIR}/6.04_pre3"
+	)
+	default
+}
+
+efimake() {
+	local ABI="${1}"
+	local libdir="$(get_libdir)"
+	shift
+	local args=(
+		EFIINC="${ESYSROOT}/usr/include/efi"
+		LIBDIR="${ESYSROOT}/usr/${libdir}"
+		LIBEFI="${ESYSROOT}/usr/${libdir}/libefi.a"
+		"${@}"
+	)
+	emake "${args[@]}"
+}
+
+src_compile() {
+	local DATE=$(date -u -r NEWS +%Y%m%d)
+	local HEXDATE=$(printf '0x%08x' "${DATE}")
+
+	tc-export AR CC LD OBJCOPY RANLIB
+	unset LDFLAGS
+
+	if use bios; then
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+	fi
+	if use efi; then
+		if use abi_x86_32; then
+			efimake x86 efi32 DATE="${DATE}" HEXDATE="${HEXDATE}"
+		fi
+		if use abi_x86_64; then
+			efimake amd64 efi64 DATE="${DATE}" HEXDATE="${HEXDATE}"
+		fi
+	fi
+}
+
+src_install() {
+	local firmware=( $(usev bios) )
+	if use efi; then
+		use abi_x86_32 && firmware+=( efi32 )
+		use abi_x86_64 && firmware+=( efi64 )
+	fi
+	local args=(
+		INSTALLROOT="${ED}"
+		MANDIR='$(DATADIR)/man'
+		"${firmware[@]}"
+		install
+	)
+	emake -j1 "${args[@]}"
+	einstalldocs
+	dostrip -x /usr/share/syslinux
+}
diff --git a/sys-boot/systemd-boot/Manifest b/sys-boot/systemd-boot/Manifest
index 718605c8653d..9619ac2136ee 100644
--- a/sys-boot/systemd-boot/Manifest
+++ b/sys-boot/systemd-boot/Manifest
@@ -1,8 +1,6 @@
 AUX 249-libshared-static.patch 881 BLAKE2B 436aa658b7f24cafad5126c5ce867508639e876a35168fa834591646dfbff6c8132348d33298d47627e1497d41be2ed1b73c288a2c0d504d2687dbdbc3f8a38b SHA512 5bb94984cddc26f35bec6edd02c7574ebd851e45efe551454d4372174ba2bca86c92c7be71936ddce4c2792886395467354e976a6a1f6e1505e95ba464a9466f
 AUX 249.9-cross-compile.patch 1070 BLAKE2B 45586e1d76f6eed0e6f4ae27c5c93f9495bfde2b2bb3b1853bdda22f341787747ea7d7a02a1d582e6ba7e113fd2aed94bfa72616a6a9139ec18c89f85d176646 SHA512 97e919c30fc5ff39f50908f63fee23371047223d12874e68fe74ae545acea7a1dd0d1f0147e2d8a95a49e1943a276148011294b33a8f7fcfa11c91f275e87194
-DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
-EBUILD systemd-boot-249.6.ebuild 2821 BLAKE2B aea61338aa4403de38db6527c74074519817f77df1dd2f1737767de7cb93e7084af9c8d11f7ae919e29f2aedd7ca00223561ce48b35d43a6544fe9cd009f06ad SHA512 efca3f4fbd43623e5d8033e32e6004576edca8d6b548c11568898d2eae7aabd05134bca8caf9732bb848dfa74cfe247d920a7b24672f4bd7a673af6b25b8dffd
 EBUILD systemd-boot-249.9.ebuild 2862 BLAKE2B 2ebe2d513f74ab4abc9b29e61ffcdb1a905469425a50c1304200baf2ce50690cba183614c879d2c759db040022680c86728d021cd1e138e6eb1287b5a2fcbd7e SHA512 4f54e310315e560d89ee10e35295139d95f52e84b217f269c3a9d9bddc7a67f44f87dc5670116903a8de10218a0e68bd5695894c554dce03397a0de5da205b32
 EBUILD systemd-boot-250-r1.ebuild 302 BLAKE2B 6d967192962d2235ae0a635eeee50babfdbb9d0a42f98d226904a1784d75fa67c6d13f0c401666e3d63c5d1fce035f8a557088cf2da39b21be81d0d5a85f0562 SHA512 44036cd593cceda8a87935747c4bfdc003bea875ec98817075546b311dcc431d69e1215e0f0c00becbe992cbf89509a31fac3cd2ce96abbfa17a63a9f49f3b7a
 MISC metadata.xml 327 BLAKE2B 5f7910324b62658e242e8c275ae78895683e8704ac19ede4153f4fa8a3b3e3e5149396826ee6975ad1ce904c4ea4041bdac1a883f8c3930495be74c6b77e1810 SHA512 c44c10b2bcda1989526cd935e87135171bb1825505367be255e308505d6774a4baaeb9a642bd7839b7950a3ec74a881d6288829596fc53a3e75e7a4cb2499ac8
diff --git a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild b/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
deleted file mode 100644
index 8ae443c2d75f..000000000000
--- a/sys-boot/systemd-boot/systemd-boot-249.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson python-any-r1 toolchain-funcs
-
-DESCRIPTION="UEFI boot manager from systemd (formerly gummiboot)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/"
-if [[ ${PV} == *.* ]]; then
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/v${PV}.tar.gz -> systemd-stable-${PV}.tar.gz"
-	S="${WORKDIR}/systemd-stable-${PV}"
-else
-	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	S="${WORKDIR}/systemd-${PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-RESTRICT="test"
-
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	sys-devel/gettext
-	dev-util/gperf
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-boot/gnu-efi-3.0.2
-	sys-libs/libcap
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-PATCHES=(
-	"${FILESDIR}/249-libshared-static.patch"
-)
-
-src_configure() {
-	# https://bugs.gentoo.org/725794
-	tc-export OBJCOPY
-
-	local emesonargs=(
-		-Dblkid=true
-		-Defi=true
-		-Dgnu-efi=true
-		-Defi-cc="$(tc-getCC)"
-		-Defi-ld="$(tc-getLD)"
-		-Defi-libdir="/usr/$(get_libdir)"
-		-Dsplit-usr=true
-		-Drootprefix="${EPREFIX:-/}"
-
-		-Dacl=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbzip2=false
-		-Delfutils=false
-		-Dgcrypt=false
-		-Dgnutls=false
-		-Dkmod=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlz4=false
-		-Dmicrohttpd=false
-		-Dpam=false
-		-Dqrencode=false
-		-Dseccomp=false
-		-Dselinux=false
-		-Dxkbcommon=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-set_efi_arch() {
-	case "$(tc-arch)" in
-		amd64) efi_arch=x64 ;;
-		arm)   efi_arch=arm ;;
-		arm64) efi_arch=aa64 ;;
-		x86)   efi_arch=x86 ;;
-	esac
-}
-
-src_compile() {
-	local efi_arch
-	set_efi_arch
-	local targets=(
-		bootctl
-		man/bootctl.1
-		man/kernel-install.8
-		src/boot/efi/linux${efi_arch}.{efi,elf}.stub
-		src/boot/efi/systemd-boot${efi_arch}.efi
-	)
-	meson_src_compile "${targets[@]}"
-}
-
-src_install() {
-	local efi_arch
-	set_efi_arch
-	dobin "${BUILD_DIR}"/bootctl src/kernel-install/kernel-install
-	doman "${BUILD_DIR}"/man/{bootctl.1,kernel-install.8}
-	exeinto usr/lib/kernel/install.d
-	doexe src/kernel-install/*.install
-	insinto usr/lib/systemd/boot/efi
-	doins "${BUILD_DIR}"/src/boot/efi/{linux${efi_arch}.{efi,elf}.stub,systemd-boot${efi_arch}.efi}
-	einstalldocs
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d987de13c9f6..0597b42e18b0 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/kube-apiserver/Manifest b/sys-cluster/kube-apiserver/Manifest
index 822ad778a61e..299fa274cdbc 100644
--- a/sys-cluster/kube-apiserver/Manifest
+++ b/sys-cluster/kube-apiserver/Manifest
@@ -3,12 +3,18 @@ AUX kube-apiserver.initd 541 BLAKE2B ddddc86735a9f90a0c232f2631ac21c028045783c73
 AUX kube-apiserver.logrotated 88 BLAKE2B e58f3f108f5f7dbbadacfcc1b401567ce79d511a4623f85f01830c5e40d4ad4e44fe0b3f90d4143042d82bd83b0a2b11517e89037755ef2ad7afeeb23401bb60 SHA512 1a4bcd54dafaedc614e34bbadc2a1163f003b5925d47552fb2c47049c033c147e612171e263d9659d189fc2d95688a0b7153322d8dba97c083c079fdef6c400e
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kube-apiserver-1.21.11.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.21.13.ebuild 1017 BLAKE2B f891662b03ea5bdcf7b0455c1013bf51ea916b8d100f16bea54a8734eb3bc3ddf86ea9f947c80be3dd997b713fa3e5b0f687d68ebfc807e6b80c562c1be6601c SHA512 1d2087cc96ad81c431dddb04a484ed2d3d5f10281b48d25f466f10474899780c35697a99bdb32c167182dcec2a5820ff8ead4138cb318aae967a25c39e701e5a
+EBUILD kube-apiserver-1.22.10.ebuild 1017 BLAKE2B f891662b03ea5bdcf7b0455c1013bf51ea916b8d100f16bea54a8734eb3bc3ddf86ea9f947c80be3dd997b713fa3e5b0f687d68ebfc807e6b80c562c1be6601c SHA512 1d2087cc96ad81c431dddb04a484ed2d3d5f10281b48d25f466f10474899780c35697a99bdb32c167182dcec2a5820ff8ead4138cb318aae967a25c39e701e5a
 EBUILD kube-apiserver-1.22.8.ebuild 1016 BLAKE2B 33a61cde7d8b70c868711c034d5d69af002f25cd3ff80b6ba12708618b8e0aa8fda2351d58b157e9ea68182c7932943bdac6d387c414551d9e799abc4abad8f8 SHA512 548b0b55ca6b094704e6f6b9a73ef6d5d0af8b9b03b2ed9f9ed692284e867439d1da6f9e412d11163d32ed58f99bdf57fa265e6791831cea8519bee46bb353a1
 EBUILD kube-apiserver-1.23.5.ebuild 991 BLAKE2B ee45da98c6c18e3bf3e979863e01c1401596cf21cf3cc79da20e6ccbdf2f7383b409f571f8cf6a245138dcfd481cf361a789284ef62e59bcb20938e1bdb5d148 SHA512 43091fd9e05355a4063d5133917ec5dade31ac326c0c332afae795b88648cdc3c96944305ff25553312a44ecb785361b1893310686a4e16bb82f218404592815
+EBUILD kube-apiserver-1.23.7.ebuild 992 BLAKE2B 78848d01aea6d0efb3c42f0af1ef60b6b80e8884fa1c0b3d811ade0dfe3d0552f2adda802eea4478b069323807a96ff915c329a1bd37d60b3d7d87cf63a6ac7a SHA512 13ef47a1f969ac0437f103e04825cbdf5a8951bed255b69199d8270a1f4b42324c2c9c84fdac7466d64f42682ef81fa90256921a58dcfecb5b03257e845498c7
 EBUILD kube-apiserver-1.24.0.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
+EBUILD kube-apiserver-1.24.1.ebuild 994 BLAKE2B 0365339fecbc58416819babbbb01b3dec184b7b34164c7b45005921f15a2f4a67216968572e48befcdd6b5f9359d77fabbc29c704642671439d0b52f53e44108 SHA512 4a6af8c8d24e26fecf865dc62786cd2bb44767ab247b9e56fe6a5792ff520303bddae25c7e6e82ae1d0eefb1400715171c7594d53ea7ccb39d74353be1fcf572
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.22.10.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.22.10.ebuild
new file mode 100644
index 000000000000..19b4da1a49f7
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.22.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.23.7.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.23.7.ebuild
new file mode 100644
index 000000000000..a7400f70bdbe
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.23.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-apiserver/kube-apiserver-1.24.1.ebuild b/sys-cluster/kube-apiserver/kube-apiserver-1.24.1.ebuild
new file mode 100644
index 000000000000..4010c16c51d5
--- /dev/null
+++ b/sys-cluster/kube-apiserver/kube-apiserver-1.24.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module systemd
+
+DESCRIPTION="Kubernetes API server"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="
+	acct-group/kube-apiserver
+	acct-user/kube-apiserver"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/Manifest b/sys-cluster/kube-controller-manager/Manifest
index b9365d859b95..825d1fe8e4f5 100644
--- a/sys-cluster/kube-controller-manager/Manifest
+++ b/sys-cluster/kube-controller-manager/Manifest
@@ -3,12 +3,18 @@ AUX kube-controller-manager.initd 566 BLAKE2B c632b9bc357aead53a2c181af50201b544
 AUX kube-controller-manager.logrotated 97 BLAKE2B 00827bf3c3c68c978dc30839318dcdd9ca73e64a38d377168cca75de4764dbd303cdae35fe2c5f6ddded23c7c72976d274e1def66f48a81548e0561411879984 SHA512 e00cd9297d8ac75fcd504a2bfb80d5c5e145e7d475dd15edf9361dc28721afdc069c5b6e79438b75a774e972028841a17e8f7842dcfb3d7835c436a3e503704c
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kube-controller-manager-1.21.11.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.21.13.ebuild 1014 BLAKE2B 97c377f2df93c70ff500772c031802d7d5cebbe23a38000829179f6dd35f4352b694a85c2f72d4e752862fe797a6cba8e2c143a7426c235a1a536297d30a6dae SHA512 ef4f30da99afb95c3574abf48c43ffeea20285a8ac9a48556156992df047e8e3480f9a9a9ce1503d720677db42ab754120abfdc43dd2fa01acbfba74c0ce8b11
+EBUILD kube-controller-manager-1.22.10.ebuild 1014 BLAKE2B 97c377f2df93c70ff500772c031802d7d5cebbe23a38000829179f6dd35f4352b694a85c2f72d4e752862fe797a6cba8e2c143a7426c235a1a536297d30a6dae SHA512 ef4f30da99afb95c3574abf48c43ffeea20285a8ac9a48556156992df047e8e3480f9a9a9ce1503d720677db42ab754120abfdc43dd2fa01acbfba74c0ce8b11
 EBUILD kube-controller-manager-1.22.8.ebuild 1013 BLAKE2B 124277c370f8b8238311ffecaac5d9f609bb620c9dccf9d929ec6b23c335b31d501b9e9f9db602a75d96fa330e8e9e6350cacb4125934146e6da7482911f34c5 SHA512 e2efacfeb452585f6d469aacee9bbe958cee567e437a7a6a438a7805dd46279089354cece61495241e4f75d0b02edd6cc425a12a24e533d784030ae6dca34cee
 EBUILD kube-controller-manager-1.23.5.ebuild 988 BLAKE2B 87d2477f6f3dcc1b9b44ced1d69e981fbd21e5cb3e44c10848d8c53c393d82312b26cab030e8afc55be8b01af13160c42f28a52751e69b70d44dc7d00e4bfe53 SHA512 aa70cb437ed4cebfe426c899a4c80d5426df0ff733e5e633ce1986b8a6fbad3453058f42655f0cd03284837adc8eae7951ccc3cb735c1faa449a63905b6a2477
+EBUILD kube-controller-manager-1.23.7.ebuild 989 BLAKE2B 6502e890aa70159eed88ed4d79d0ae176355ce33fea5e47fa87986769586abc5fc9d1a220b1b79116e25bc8f66bf1ae0765f18b731159c94ea7692913591127a SHA512 207f261358a494ce4d6a7b8d1805157fab087b6eadbd04122fbd40482112276e22e180314740e520707c176d5c2c1aaa57e8752a447ef5b35115d2da28941d17
 EBUILD kube-controller-manager-1.24.0.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
+EBUILD kube-controller-manager-1.24.1.ebuild 991 BLAKE2B 111b237cba0d979e2ab42e25dfcdd99c24f35aa7bdd34a8fa452721476c6d0a5efa4c20f41d6138a8514c02e96be6a75904a28a741f4ca75581138c9dff3ee5e SHA512 375680a8fa40c07fb906d2df6ba8463cf0bf2a2871b59666bb3df0b941ccf6038f6ff986aac31e82c514b98487649c1a802c662b89032ca1ed49807807fc7f66
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.10.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.10.ebuild
new file mode 100644
index 000000000000..3611bae7ae46
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.22.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.7.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.7.ebuild
new file mode 100644
index 000000000000..8a6411803c93
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.23.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.1.ebuild b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.1.ebuild
new file mode 100644
index 000000000000..492d28a5d90e
--- /dev/null
+++ b/sys-cluster/kube-controller-manager/kube-controller-manager-1.24.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 go-module
+
+DESCRIPTION="Kubernetes Controller Manager"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-controller-manager
+	acct-user/kube-controller-manager"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-proxy/Manifest b/sys-cluster/kube-proxy/Manifest
index 675f3ead9214..b75c5440d0fd 100644
--- a/sys-cluster/kube-proxy/Manifest
+++ b/sys-cluster/kube-proxy/Manifest
@@ -3,12 +3,18 @@ AUX kube-proxy.initd 507 BLAKE2B 96697ce13e03c0a541bd8e7a3dc28a1c5647067d3bffe46
 AUX kube-proxy.logrotated 84 BLAKE2B d1a37cac3891f131b605edfe569ed545445d6993528059b11b4a8d20d0c958abbab8d7c6acfc7a9e0f17c64ac7f19ef2b4954ff475bededf406e718d04261d59 SHA512 7842a4585aaf9b7be0fac89dca58874354453fc6f17f00223c04aad2211217531ae6a942424a8a112808dcf9e52a499c4879730e435d2ad08931516c66d5441d
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kube-proxy-1.21.11.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.21.13.ebuild 929 BLAKE2B e7cf539cc2ae4e8f47ad785b6c720f66ae3e1dee7fce5f93f104566ebff9ee012f3b6d0623ea56261ff2f923bebdf6f71cc14c68406c9643d5875fd305d3e4b5 SHA512 49859b7ddd88894471d9e58b98455af9f93469a03eb4c40a1e73f113deb684706d69eeb79e06316ee9968af584b558e2cf7a6b908831b71b341492b11889b7d3
+EBUILD kube-proxy-1.22.10.ebuild 929 BLAKE2B e7cf539cc2ae4e8f47ad785b6c720f66ae3e1dee7fce5f93f104566ebff9ee012f3b6d0623ea56261ff2f923bebdf6f71cc14c68406c9643d5875fd305d3e4b5 SHA512 49859b7ddd88894471d9e58b98455af9f93469a03eb4c40a1e73f113deb684706d69eeb79e06316ee9968af584b558e2cf7a6b908831b71b341492b11889b7d3
 EBUILD kube-proxy-1.22.8.ebuild 928 BLAKE2B c4a2ec947e91a35d0be81b534664205feb724cdede78fe09b8b30b8d024823b2544503adf2ff63772e25634fd2a859477039d7e9c7ebbc791a505f520aaa7f5b SHA512 57e22150df4378f562c852ec6db401467c94aa4cc953534fae8383919b4c4872952047e4461c3916adab8dd9490a54184fd2dad5defca262b351463ec5e46a13
 EBUILD kube-proxy-1.23.5.ebuild 903 BLAKE2B 6af6c1be968999dd8b76cd9a7036137d8be4c72c0516ce89f512f13eb3fc2186e34fc74d090fc5d34f285e2ca6f822382b6194ef1e80238ee23c7be1b10f6df9 SHA512 6f3a8e41e2505e752c4a0fbde6a93801db713a500903882f17c4001443a878c61087db361686a89afe529bb43d50e626343cac75c18f5c577b0e12ed582ab12a
+EBUILD kube-proxy-1.23.7.ebuild 904 BLAKE2B 3630914e093e3f07eaaaa9e7d9a2bb7706810d3fc9b13843d9caf7dae3baa29fe25b2d1b0fa97545cf074cc56bf59bcfdc2595926fd1785cb93efaa2f4743234 SHA512 1a1a893b9f33407cceecd7e5e06fc9f1baf6e76a2831029b3d7d6743b1090b6c73ab96061e74d54f0f4fd5771b65f6891c58f67ff737ffd52f349edb5ef5f155
 EBUILD kube-proxy-1.24.0.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
+EBUILD kube-proxy-1.24.1.ebuild 906 BLAKE2B b15e95243cd35fb900d792f9be7be136fed833eb8d09112cb71206ccde67cdd88c50a7c52cee398afaf3e902974a539ae73ac2029f56910d2b65f702fadfdf61 SHA512 5d0ec68ee23b1138ea859ba0db48902f65a7568e7ab99b3da59922ac7c428850373f82677a9948791f08802e14c1461c069c704643578dcb92114468a046e43e
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.22.10.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.22.10.ebuild
new file mode 100644
index 000000000000..866b8b777f1f
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.22.10.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.23.7.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.23.7.ebuild
new file mode 100644
index 000000000000..2193eb857e81
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.23.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-proxy/kube-proxy-1.24.1.ebuild b/sys-cluster/kube-proxy/kube-proxy-1.24.1.ebuild
new file mode 100644
index 000000000000..9073ae83aebc
--- /dev/null
+++ b/sys-cluster/kube-proxy/kube-proxy-1.24.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Proxy service"
+HOMEPAGE="https://github.com/kubernetes/kubernetes https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="net-firewall/conntrack-tools"
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /var/log/${PN} /var/lib/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+}
diff --git a/sys-cluster/kube-scheduler/Manifest b/sys-cluster/kube-scheduler/Manifest
index f25cd48968ed..38b095ce9cb6 100644
--- a/sys-cluster/kube-scheduler/Manifest
+++ b/sys-cluster/kube-scheduler/Manifest
@@ -3,12 +3,18 @@ AUX kube-scheduler.initd 548 BLAKE2B dd9373f659b87fcf12dca20527aebdb304a60ec559f
 AUX kube-scheduler.logrotated 88 BLAKE2B af29a5ba84cb29787b17368105c793868a2e61a28e9a5b02361cf4833982d4489364bd1291faa136df275988f02ce78c7b785c9209a54aec5eea6180b9041da0 SHA512 3692da349dd6ed0f5acc09d7b95ac562ffecb103e2270bebdfe4a7808d48dada9d2debff262d85b11c47f9ca3f0c20000712d03629ed813ff08a3e02d69267e6
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kube-scheduler-1.21.11.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.21.13.ebuild 987 BLAKE2B 152ac5b31334c12ca7a7cdcdae627ea8d00b8e1f118044b33bc59a430d64c9ed46d8231a2d6afcbae9ebf190730533cd405f1bda5661230689a4d1cbb264993f SHA512 ff649c406b4d0da1223c0b0e3611a1fc6570cf78901cd766352b3db0f430eea7a1471de6315b4ba1eabaa515deb4600800ad27ca04997706da4097c57d574e9b
+EBUILD kube-scheduler-1.22.10.ebuild 987 BLAKE2B 152ac5b31334c12ca7a7cdcdae627ea8d00b8e1f118044b33bc59a430d64c9ed46d8231a2d6afcbae9ebf190730533cd405f1bda5661230689a4d1cbb264993f SHA512 ff649c406b4d0da1223c0b0e3611a1fc6570cf78901cd766352b3db0f430eea7a1471de6315b4ba1eabaa515deb4600800ad27ca04997706da4097c57d574e9b
 EBUILD kube-scheduler-1.22.8.ebuild 986 BLAKE2B a4f7a53e19faa830536c7463c384db1ffde30248eee4ca26dfcde1bc6a82278159b6c5e830a885785d845ec429d83b8baaeef7097e9ff1501d99c5a72676cd52 SHA512 fb3775804affa077c9ed82f34169c25113bb9511708afdd3baf6a71aa801682c57833ddb5778603349f5b7f07d6fd0e655e8a8a7b57699fec9c40656d1423bca
 EBUILD kube-scheduler-1.23.5.ebuild 961 BLAKE2B 833f5fcd8ed332afd7e503ac7fde09828ce18565ebf9c98d43356790bf79d985d6f6de1d682e371cceca717a593a10bc85e266c141ea20725cb57f6c6e34b26f SHA512 6d9ad34d6bb8a1a3a3a88576ef3ffa6129317ce5f9ad3bf7a9574414d3ace6a207f92324387f8fd9a1506a15cdeae09d5a2d30c9138a0fcc555d70513c6da120
+EBUILD kube-scheduler-1.23.7.ebuild 962 BLAKE2B ebc2aeda907841925e5c217a07407dddac04b82f46271387b1403486b870d95d42d40c4107da9741a7325efa812efecf4cbe771697071ad3e6639f5136631d9a SHA512 0b9cef2e337d0c0af9bd3b2f2e4131d434423724f27fed7992df106bde8e7c788cc5a207b0ef97c7e6ae9d5c50e0fe54c06876a1b24d89e184beb90feca17fbe
 EBUILD kube-scheduler-1.24.0.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
+EBUILD kube-scheduler-1.24.1.ebuild 964 BLAKE2B c9d6ce2d76b582df1fe639d31a045ceac568478eb20ba1ddfdbab0449e9b53c8ed62855a5678367f3fb07079e5fbc18799d3271e60a37c7d10be2e8d8ba37f3f SHA512 82c646d2f5278f388c9269e384be9fc5ee59b6b432e2eb48445347e12fd48028c478940e9373aa555ccba1b702291671c7cdcbdb90e223154b92eb3cd90f6552
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.22.10.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.22.10.ebuild
new file mode 100644
index 000000000000..6deafd6db8c6
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.22.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.23.7.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.23.7.ebuild
new file mode 100644
index 000000000000..393cef8175ab
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.23.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kube-scheduler/kube-scheduler-1.24.1.ebuild b/sys-cluster/kube-scheduler/kube-scheduler-1.24.1.ebuild
new file mode 100644
index 000000000000..0644cbea3c98
--- /dev/null
+++ b/sys-cluster/kube-scheduler/kube-scheduler-1.24.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 go-module
+
+DESCRIPTION="Kubernetes Scheduler"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+COMMON_DEPEND="acct-group/kube-scheduler
+	acct-user/kube-scheduler"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/sys-cluster/kubeadm/Manifest b/sys-cluster/kubeadm/Manifest
index 18808ece53bd..2fe826da43fe 100644
--- a/sys-cluster/kubeadm/Manifest
+++ b/sys-cluster/kubeadm/Manifest
@@ -1,11 +1,17 @@
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kubeadm-1.21.11.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.21.13.ebuild 912 BLAKE2B 7548d6905fd17d946d2d4e974229257aac34a826728c50d113ebff6a5d9758fe2f92c1388b6ed344056435f1af1563311f0c3e185d0aef4318cb1ba3167276c1 SHA512 094215e91d4681b9be05d3c67426e99f3a7bd6e7ffb34ee5c7a3fac96907c06f34dcb492d09dbaec7a045b2c13a66aef699ed0308fdf12dc6d1196a7bf7b01d0
+EBUILD kubeadm-1.22.10.ebuild 912 BLAKE2B 7548d6905fd17d946d2d4e974229257aac34a826728c50d113ebff6a5d9758fe2f92c1388b6ed344056435f1af1563311f0c3e185d0aef4318cb1ba3167276c1 SHA512 094215e91d4681b9be05d3c67426e99f3a7bd6e7ffb34ee5c7a3fac96907c06f34dcb492d09dbaec7a045b2c13a66aef699ed0308fdf12dc6d1196a7bf7b01d0
 EBUILD kubeadm-1.22.8.ebuild 911 BLAKE2B 8d528e3a92f11884298862fa90dbc02621635d0e0677af3ff9e63c78b67564d34b99b5a6017f57cec32e8bc09e99996781b3a355dfb8a410562fe53d8c8472a0 SHA512 75a830c95e052946772ee92ea4bd11bb677ba5add4f1342dbbac0c7bef0d51167dc3e32f85dc94463b24835350d4475ce253b47f3087b5c3c7e6de1c1008fbda
 EBUILD kubeadm-1.23.5.ebuild 877 BLAKE2B 2c27ca601ccb9c9498cc2f3dcbc242e38946275232eaba4cc35d56a0edba48ecb7bdbd36d8de59a76bc36e5854c4f8f46957f2160bf96c41a80be731f104f00d SHA512 d02b2409d74052608b3150db41a3b77e8bf0cebb6398c2a4e51034304b28875ddb22bb7a21a61338bb09cacb930523444e5e25ae941a38ad6fb100cafb94397a
+EBUILD kubeadm-1.23.7.ebuild 878 BLAKE2B 2278f6ff3cd15b03d5fafd5d5e03e6a565666171533c849750fbabee73e9300e29a4b3b80d213e0ca05ed43854f3b3444579d4da6081c40f09aa7633cb3d97f7 SHA512 b9c84df0bac044457c6cc1db5e745955349b2e035ae49ec91ea7f2f478eb2d40e0d904238ca0f2a4307eea0c2e59410c26935b7f52c72a5f45a819983493e0ad
 EBUILD kubeadm-1.24.0.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
+EBUILD kubeadm-1.24.1.ebuild 880 BLAKE2B a13ac00b8f2141c0d9829cad0f519e30330b6ebdd58783ffeffcc3f9ba73f613fa5c083599c116fc048951c3e71f05fcaee0b01c064152b144a9a56cbfc471c0 SHA512 2f43c723dc4f8e99e690fdfb788293a197dce92017a7a2bfaaa29bea0b47ede3cd6a397d122fcb0c2cdb80059299920c1ca99c60e59d5b2ef6cb11d4031224b1
 MISC metadata.xml 918 BLAKE2B 487a711e9aebe9d4d8f2c3a03664990aa544a4c0b969dbb60d10ebf42ca64cb9b21f822f92e774f3a813b409d5df905c8ecf02f186218f925a69f70b2960d53c SHA512 392d1cdf4179bc2aa14598e41e38e364518f0c71c34d61280729ae2cdab37c247112b48fcea58c792f6f7148e3979dfbff174bac3a3a00b7084168332112f5d3
diff --git a/sys-cluster/kubeadm/kubeadm-1.22.10.ebuild b/sys-cluster/kubeadm/kubeadm-1.22.10.ebuild
new file mode 100644
index 000000000000..654b067fe403
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.22.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.23.7.ebuild b/sys-cluster/kubeadm/kubeadm-1.23.7.ebuild
new file mode 100644
index 000000000000..bcdb2bea7e7d
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.23.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubeadm/kubeadm-1.24.1.ebuild b/sys-cluster/kubeadm/kubeadm-1.24.1.ebuild
new file mode 100644
index 000000000000..0bc4d23fc42c
--- /dev/null
+++ b/sys-cluster/kubeadm/kubeadm-1.24.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to Easily bootstrap a secure Kubernetes cluster"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS=-v GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/Manifest b/sys-cluster/kubectl/Manifest
index 728414b53edc..70f68c69723a 100644
--- a/sys-cluster/kubectl/Manifest
+++ b/sys-cluster/kubectl/Manifest
@@ -1,11 +1,17 @@
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kubectl-1.21.11.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.21.13.ebuild 907 BLAKE2B 999827e20b71b48c7bd7b18a4a42e7c9fd3e518330e5a47341f3b0801989c2febc2118500fc4441c9cb4e7ba82bee6981b9a3c57e653e6ca83d13b459f5590d3 SHA512 3a37997bcbb018485e0d09c0236f95242092a0dfad1717d72cdc4a9ad65ee7290b31faf0d6e6b837476bc6f3c0cc73ce193e20ec2f3fdb2c112b35857a2b760e
+EBUILD kubectl-1.22.10.ebuild 907 BLAKE2B 999827e20b71b48c7bd7b18a4a42e7c9fd3e518330e5a47341f3b0801989c2febc2118500fc4441c9cb4e7ba82bee6981b9a3c57e653e6ca83d13b459f5590d3 SHA512 3a37997bcbb018485e0d09c0236f95242092a0dfad1717d72cdc4a9ad65ee7290b31faf0d6e6b837476bc6f3c0cc73ce193e20ec2f3fdb2c112b35857a2b760e
 EBUILD kubectl-1.22.8.ebuild 906 BLAKE2B fb1ae356bd2e4248ab3d3ba494a19dde26f915ed3086ce06eac4b3d1d2eb84a98098d6032d6b9ab9c027d94e288e9f3603163245d36df30671592131a4050c84 SHA512 6cab06510917581df5bde6c2eb9c46f411be9f0954c7be57ad1d63798777fba55d473a702b12a0e2214d35ed7318255c6e6dd27ce80ebfdbd57dcea3954a7516
 EBUILD kubectl-1.23.5.ebuild 873 BLAKE2B 92dd69326d788658c1c9d7ce0800f1762459ed06bda11aacbae11fb7e8babfa447f72d30749458630e44f0413d18f5e928799097cfb7585a97ffc52fd4b0f6ac SHA512 bdedaf5eaf161a6ee62aec1a2777d9b2a228b3ba6c2b232f4a1ecd9c11caa9b5b2ff65cf4c8fefc2f1afb146abb13501c42e148c02e44d695a734178aabe99a7
+EBUILD kubectl-1.23.7.ebuild 874 BLAKE2B f8edcff235a13dab9ff396b87d207ef4d829ac54213b312621f4f3d9da9e76828af7bbf2ba312ebc8255764568591775501478cdba4533cb6c3f3bbcd6ef47bd SHA512 21c7c81aa7ec98429c6cf6d993ee7ed90380e0f8a32799c66dc80e40d9a3a7b4d7a3612edb1673ce99f1fea6e9f04e0b9bbcffccb73f78f72f261127556cac9e
 EBUILD kubectl-1.24.0.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
+EBUILD kubectl-1.24.1.ebuild 876 BLAKE2B 6bd715af975a6a28bff9df5d3e28506d7309751d0031a7091f230d4e65de3d0a0cb7b6672f992d9fdf381a4c7354ce45331654fa79264c76366e9a6f371ac33e SHA512 9a2e3ae147f1643386e0d43362bd1876b374bca199c36cc890baeb111a7ca0af7e2c9098edffaeb2738e53322431b9635b94883f7fecdaad0ac29c2bd335f6e0
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubectl/kubectl-1.22.10.ebuild b/sys-cluster/kubectl/kubectl-1.22.10.ebuild
new file mode 100644
index 000000000000..f480c2f82844
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.22.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+DEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.23.7.ebuild b/sys-cluster/kubectl/kubectl-1.23.7.ebuild
new file mode 100644
index 000000000000..93befd485395
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.23.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubectl/kubectl-1.24.1.ebuild b/sys-cluster/kubectl/kubectl-1.24.1.ebuild
new file mode 100644
index 000000000000..375df35b0a71
--- /dev/null
+++ b/sys-cluster/kubectl/kubectl-1.24.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 go-module
+
+DESCRIPTION="CLI to run commands against Kubernetes clusters"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test"
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+		emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	_output/bin/${PN} completion bash > ${PN}.bash || die
+	_output/bin/${PN} completion zsh > ${PN}.zsh || die
+	newbashcomp ${PN}.bash ${PN}
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/sys-cluster/kubelet/Manifest b/sys-cluster/kubelet/Manifest
index b4446714d951..dba406ec2ee6 100644
--- a/sys-cluster/kubelet/Manifest
+++ b/sys-cluster/kubelet/Manifest
@@ -5,12 +5,18 @@ AUX kubelet.logrotated 84 BLAKE2B 269b78dfd4ef7d4dea37da9be9e4009cbf231dfaba8320
 AUX kubelet.service 642 BLAKE2B 9f0fa5db48c09c2525cbc556cd520660302408a43aceb6c11da3a191b4b21607e824e46d9805b12b57a0ac7878c7da94d0cb86c69cd949814c77bb217973c6f1 SHA512 770cadae6afb68f0556c7c5969643642bbf09b596ff49d969d31b8d9f0d8907d6931eb7fb14485c78a3f75682e44e2355c7e51973a0dfdd1e665816f04ba21ae
 DIST kubernetes-1.21.11.tar.gz 36183641 BLAKE2B 81683c0f3d9d36aa21fb0bd8d771019af621947c772a9121b453c0c836e991f0812ef4bb0296db7fd0fab0794bbc9af9dbd4801b44d3f6422fa908da03b7de8b SHA512 9b8c92f277c2621015fab67832b8d89a9b2c0227a5ca884a58b959de717af9a3c601acaa6522d758673a628943b93ae23b8a95819b5daf4e0419509ec99408a6
 DIST kubernetes-1.21.13.tar.gz 36157422 BLAKE2B 413ba3589efd724cd05ab9df76c9ba1f116539ec71c8cad8169095410704e1ab732171b2140b522a5f5cc641a18dd78150e67cd64bc16088f491379957756133 SHA512 cc6e9e71816c1fac4cba6cd6aab1919d7c956947b71260ac958015797a856e978bb2f122ad989527c285721e0a03c3327cbe50557cb6717e7a3aad68f2e02dfd
+DIST kubernetes-1.22.10.tar.gz 36075584 BLAKE2B e2d440070f8d573527359f4e59950af8c9b783da5e3f1914960b69e527411bf1aca98a1c23902e4e3d6b7c799233837676f02cc8469de130d8405800957b4cc1 SHA512 213629d3f71837318b3321b72cc08dcbf756be11ff927893154ec207cb6747a2a36c198cdbeb0f0bf9b1c0d0284f4bca8a43129f538ca1b763570fa4fe0e2ac8
 DIST kubernetes-1.22.8.tar.gz 36060758 BLAKE2B 8a9bb933aa7ecb07170065fb0b33805332cea5c4f8194d288c83ca907539dc207b878a03aa23ac62545ddbbc46d8896ce27dfd49791c01ef5d619e00c6564dbc SHA512 b55e1ca89349ab9d17a83b662ed9ea94f425bfad2fbbbff5918f48d831d5151036a44fc86c9eda1452a200abf5b39a9ebbba3560a8e90f49bbebb06597529a4a
 DIST kubernetes-1.23.5.tar.gz 38204715 BLAKE2B d42d9826704e923f4a25d788656909c641e77de19f483721436c6760d8d9b44c1805da5522c5a850fcbb0d86114057cf690607ff958536ef6af21e21a1d7b089 SHA512 4df849fcdf0d4ffd9552706600b43b9b248f9039ce05384fef859ce7479a9aa74b4a54a9a147b8be3db1c5c02274e71b31ae34700777fe010fb147cd132d80a2
+DIST kubernetes-1.23.7.tar.gz 38210779 BLAKE2B 7b664b22491b19697ab596a2eacab5f4f907b7053f40e54bec48f807c273ec673f0e3f09107539d496ce2efbcfc0d649792d604aa6ea29ed938fc2b732b0cace SHA512 f871d8e4d9e41f829e8f6b5bc563ce7c2a060a3b23e9e8a76e3af49be4e2278422f2e8edff275730b690cc60127e334058f2b08d20c3befc6572431d08a8c0b4
 DIST kubernetes-1.24.0.tar.gz 39810384 BLAKE2B eede08b189d42f3835da844510d27ce79ce6d7d2c5cff53e4a0b87f5622e16954390ec723caa6b2960fc63fab2c28fc2007e9227c9ba1e94f4bf5771160d0915 SHA512 7a52d789164928d98e687356b191d59fc69e9a36bade05b5a9a93f02f675a859a17a01ec0f6c5472d05783312cb07ed3acfec82dc79ed9a777ee80721b46eef0
+DIST kubernetes-1.24.1.tar.gz 37940937 BLAKE2B f5076a5ec36cf108b363645b7e39dd9e9b7d56c26457a3a740f30fad29db2bf66877f71ec33c4f545f9e5cdf736cfa6f752cb4d04ca917e2d78da1abfa233f83 SHA512 cdd85c10d931367e29d2cf3e99fd7eb0561e14a8c4a73c57cd3e497ecbd4ae4c0b30bac649ab75af241df63c715ca8ccc4cc67a51736fe2b01d182cd3a3ee104
 EBUILD kubelet-1.21.11.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.21.13.ebuild 1004 BLAKE2B 3df4d1079ca82c4e80a182230735e807b741bcf0cba6ceb9277c4126b62378e49ee6acb40145553b61f773139c0427a0078d516d56752ad6320716418177bf7f SHA512 7719010c913ef05977a61e1e5bad258eb1f891a1c511a39d8d89e15df2a31c2e718c695d2e6864fdd4a1e6513587f025fc2dddae40ef32cf050b8c7370de48b8
+EBUILD kubelet-1.22.10.ebuild 1004 BLAKE2B 3df4d1079ca82c4e80a182230735e807b741bcf0cba6ceb9277c4126b62378e49ee6acb40145553b61f773139c0427a0078d516d56752ad6320716418177bf7f SHA512 7719010c913ef05977a61e1e5bad258eb1f891a1c511a39d8d89e15df2a31c2e718c695d2e6864fdd4a1e6513587f025fc2dddae40ef32cf050b8c7370de48b8
 EBUILD kubelet-1.22.8.ebuild 1003 BLAKE2B f7d967573c1558befc261e742472a7bf2d8ffb2279bf90bae5ef1316990abe0f5a542160ab06db9e195e0039e85b78b198163dcab5c393126df97262e5a81094 SHA512 03093d1134618415982e162a88452487654681be9f8be3312b3935d9f6b7efa2aa8cef3240367a9371b2f6b21fe4bdc8f0327e97ee655dc6bb5ffc84113777e0
 EBUILD kubelet-1.23.5.ebuild 969 BLAKE2B 1aa00967d2b13a6607ca139498c8772385c8fae93c086c9128ea1968bb3ad61b40a63831f27718a7fe43eff8d5f52dc8001a5c7301d0146f327918fa05f53d2a SHA512 2a483fe573fa549b7a1886e2757e368b874d602027a7ed844602bad71b64c4ccb9171a74343e1950049d3640bc78f698c6c6063b75b7912927b02e69ca6aa9e6
+EBUILD kubelet-1.23.7.ebuild 970 BLAKE2B fc431b0d0543d2a6d8a0a38aea43443a218437dea52c2e5719e9b21266a648137a27acaf4dacc4ca3ff1e575e62f13b80a0d67c17e80a12135e0685c99ada902 SHA512 b868d712bfa9a549eac6b3836c6d6c6f8fee039fd74b735bb37dbd0dc2d49987ac40b927f93b08425a9b67b710a4bc38a062a1472e5334cd4ad7cc63294d51ac
 EBUILD kubelet-1.24.0.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
+EBUILD kubelet-1.24.1.ebuild 972 BLAKE2B d073eb7e7f1009b5c1ceb372bc6e40c84805d633a543154f04e6f56fbfc1f641e678ced0711ad35467df86fe0ad2d41b7b7199ee7345df19c303350cfa9800ec SHA512 ce266a3e4b72b5a0ed6ebfe120c323e9489cb6ba95888edeb3e447c0d5a7c4fb124b6397f922dd8f441c55c96cf76f651808cfc16dceda2d8b9c210f64f66834
 MISC metadata.xml 335 BLAKE2B d43f79bc4ff9bad895fc1c0617329cbc07e05d0e7eb8d251688c1f46c61e3360639e43d92f72e9eef0ba5b235f33f2b3ad1bf0f783854b5f9426af43d81c3502 SHA512 de4bf01133d4a117ea2bd21936d670598a30b89dca290a867c3ec4e8ed739aec4867c42504210291ed84add21e1aa100d7d2b565e4351c43bdf2fa906b72a4cb
diff --git a/sys-cluster/kubelet/kubelet-1.22.10.ebuild b/sys-cluster/kubelet/kubelet-1.22.10.ebuild
new file mode 100644
index 000000000000..3dc412ebab17
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.22.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+RDEPEND="!sys-cluster/kubernetes"
+BDEPEND=">=dev-lang/go-1.16"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.23.7.ebuild b/sys-cluster/kubelet/kubelet-1.23.7.ebuild
new file mode 100644
index 000000000000..ecbeff2f53f1
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.23.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.17"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-cluster/kubelet/kubelet-1.24.1.ebuild b/sys-cluster/kubelet/kubelet-1.24.1.ebuild
new file mode 100644
index 000000000000..e4341ebfaa6b
--- /dev/null
+++ b/sys-cluster/kubelet/kubelet-1.24.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module systemd
+
+DESCRIPTION="Kubernetes Node Agent"
+HOMEPAGE="https://kubernetes.io"
+SRC_URI="https://github.com/kubernetes/kubernetes/archive/v${PV}.tar.gz -> kubernetes-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="hardened"
+
+BDEPEND=">=dev-lang/go-1.18.1"
+
+RESTRICT+=" test "
+S="${WORKDIR}/kubernetes-${PV}"
+
+src_compile() {
+	CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" \
+	emake -j1 GOFLAGS="" GOLDFLAGS="" LDFLAGS="" WHAT=cmd/${PN}
+}
+
+src_install() {
+	dobin _output/bin/${PN}
+	keepdir /etc/kubernetes/manifests /var/log/kubelet /var/lib/kubelet
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotated ${PN}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc/kubernetes
+	newins "${FILESDIR}"/${PN}.env ${PN}.env
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 634b68d19d44..1a913938d97e 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-hppa64/Manifest b/sys-devel/binutils-hppa64/Manifest
index 2d0fbba98bc3..90cde651d822 100644
--- a/sys-devel/binutils-hppa64/Manifest
+++ b/sys-devel/binutils-hppa64/Manifest
@@ -11,5 +11,5 @@ EBUILD binutils-hppa64-2.35.2.ebuild 12162 BLAKE2B 0c0b6f56cda46ce66d72b6afe5a07
 EBUILD binutils-hppa64-2.36.1-r2.ebuild 12162 BLAKE2B 0be8fbdc32821f9e71da05ab285a0ebc6d680c7fd700487bf54e8ddc4d3db76a39e2f64456fb7d2f98e21d120cd2e19e4f7d7dd48088dd490815ce0f71f758bb SHA512 7259ac98a908f2ae5c5230e2963bb1b53659e404fcbad0b8f985fb3fc6a2d3fec59609d0a227e9c2e8c836ad50744cb16a30c2f6e304a46724d96d1e434d1387
 EBUILD binutils-hppa64-2.37_p1-r2.ebuild 13250 BLAKE2B f212de7136a4ca923843729776d978b8cb3c1b4b8b860724e90082096562675b90f1a28cc7ca0795107b01e1d3b4a71fab0904d8d24b449bd2de0773acc99e45 SHA512 0f13f09a88dadc7de1e1063bb28dc487fae6fafcdf21bb4be0fd002d8fed1557981334bf5885a21d612b5908044811692e1b3106d0ff4d5d7ff937585704f6d2
 EBUILD binutils-hppa64-2.38-r1.ebuild 13251 BLAKE2B 37f26207f3a9f27716fd877d48595e2d2c1cbd6b757db14e209a4b371b225b140966abeee6b8b69554b5354bcb207724fcbd51bc497c8cf56ea4dd55861c819a SHA512 ad70ede4ee3a0e9fe9f056f5ba56326726f49659a7e2ce885dffa8b58da19f2d1d9ea628ed016568e1657c1d8e99771910a21a71a5abbd1e0115b0610b00e3ec
-EBUILD binutils-hppa64-2.38-r2.ebuild 13052 BLAKE2B 54a4ac2ef21214ae96fa020bfc3048add0bec03cd960a6920be4ff452b7a357bf67ed544089f074d31331fd9998aaa13b243cbd181e7674ad4e1471f12591945 SHA512 3f2368a08f400c49e08e3280e3ea87a7810149afdb70c0061b72dee36cd1c23ef9935e9e924aaf5b8d91e273918af21f7e096904ab52e11400a9d6f7b48b5700
+EBUILD binutils-hppa64-2.38-r2.ebuild 13278 BLAKE2B 2cc1fb2b74e46669acf21b9d926b49857e8ff43fe98f66377e7df8d95bd3d960d224cdfc8c87cbdc258cea46198d405943f00d12bf9bc2d0a7408816b08d94e7 SHA512 ff6511563043703d74fcfd3084b5fa6d5956473d890b5793d8f3e415915be6c88181305fe963ec393f2bf3e4f255a574fa3c63b0290cdb178c2465e385ae798f
 MISC metadata.xml 856 BLAKE2B 0c54f8023d390c9716ebfe7271c510f63cb34971b5ebc0862325b109673d7d9fa5a8804aec64245f2e1ce00ff407a9743e680291d2d3ed952c8b4d74ad1d9a0e SHA512 21477678fefb698e4e67e6244d9222ac65b668857a5cc99b27a893238f34f44a3ea087d387571e50561c7014851d66e52e978694a7afc3a16c60d6f798e9cfcc
diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
index cfb3450416da..b6e72448d384 100644
--- a/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
+++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.38-r2.ebuild
@@ -151,6 +151,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
 	# Setup some paths
 	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
 	INCPATH=${LIBPATH}/include
@@ -294,11 +299,11 @@ src_compile() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
-		emake info
+		emake V=1 info
 	fi
 
 	# we nuke the manpages when we're left with junk
@@ -312,7 +317,7 @@ src_test() {
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	emake -k V=1 check
 }
 
 src_install() {
@@ -321,7 +326,7 @@ src_install() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
 	rm -rf "${ED}"/${LIBPATH}/bin || die
 	use static-libs || find "${ED}" -name '*.la' -delete
 
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 14f8cd610fb6..49787d807dd9 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -26,6 +26,6 @@ EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39c
 EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
 EBUILD binutils-2.37_p1-r2.ebuild 13024 BLAKE2B e67ed4a55a9f07ebd064c82901bc6b5e23933f562c8b6258d32649571f38cbc81061fcb886feaa70619d46d47c52cd701745c173ccf060e47c5cfef2d202a8ca SHA512 480b1921ff344b943b1cf2c1ea9960cd5252f8055a4bffc109f096b038d4d1fc2dd670d696ce7217fd1d827eef5c07cc81c7d0886fc554d939535582d5300f26
 EBUILD binutils-2.38-r1.ebuild 13032 BLAKE2B 23dcf886c2fc5837ad09a69fb5671b65e57cedd0b1275242da32d6fa07ca198ebfc08875f0675193651f33a39b4f872cea46de2953bff94246d5f0db22e20abc SHA512 9fcd78ef633f16e1ecdd5c5ffe68f182e93ad8c2fbbcda8a80d00870b102c4801a65781251ecc623a6f7d42a20d60cb29e88d074d7b8b9a0736e63f252420603
-EBUILD binutils-2.38-r2.ebuild 13039 BLAKE2B 3cdb3f950fa3655e6d780dc719e6138c8e30e50c900c6ef8d14aab8a8cab236b3dfdb7f223e5e77df34d4fce5906e762bc9c06b61cf38eb9833d87f2e65aa122 SHA512 c38d454684725143884edc109f6f93a7b36af8bc33e8b7780e259a36a02b3c6da44d04e9e2719d0033b5d7744e78c83570e40df9caaff4428736576666a20d2f
-EBUILD binutils-9999.ebuild 13068 BLAKE2B e6768ddf4b370fd9549ecf343fbeba3e939fff43d38861d5739211a0455ec8ebdeb9839a32288b1dce53e865d53cbcd3eab493f9d37f430b8ead98cedcf96c3f SHA512 a8b6b697a44b69724db329e7502c54a6979b5748bfc59b3220899b939626c392028a2df0df818bf9d0fdbeb5aa90dd80c6cd27cf09ff79d4124b2a03ca5a40cf
+EBUILD binutils-2.38-r2.ebuild 13410 BLAKE2B 2aadf421e6be88cd7988bd7220b16f465f4503457161886a7a8d4bb922fe673a4e061648c1a16529e0ef9901ad962a77591d8a5ca90f0a21a4ef5ce6e38dcacf SHA512 686d9d74b708f752bdd5028fac45bef48d565b39253f7fb46721dbffed6228e100561af0ab6c2d138813983f580a582a5823481b7ddeaa0bc348e79ad875a4e6
+EBUILD binutils-9999.ebuild 13294 BLAKE2B 79f45745d587339ee51310dcc288b4f80ef7a3b84ea19903addbff9cfca2f2482e9f24120c6c13f50b599588ebcf1dd629d14fc8c32bfa22446777581792c35d SHA512 16c45b6796846fe12b583f43eb6e9ad0b5058e5b2564a2b87d135516c540f2d3fc656daaad8b6dba948efde004c94a685b0fd3300bb79503aecce31317a43b18
 MISC metadata.xml 815 BLAKE2B 0d866827f8a6d0244be472dea595d5784ea60464ba361cde9bd062473b5eb19ccecc99bb58729acadd2cfe7dc017cdb2107fc282a31be6ed96c757954e6c9ac0 SHA512 8996f29b159ba483293b8d80eb62372ee0016e817d9ac55b7de9c211aca770b5a05135e705aac108099181d879daf5e22df1facab64bc7765966b3d7e3274e16
diff --git a/sys-devel/binutils/binutils-2.38-r2.ebuild b/sys-devel/binutils/binutils-2.38-r2.ebuild
index 4a491aa88c86..dcf30dbb65a6 100644
--- a/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -152,6 +152,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
 	# Setup some paths
 	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
 	INCPATH=${LIBPATH}/include
@@ -228,6 +233,9 @@ src_configure() {
 	fi
 
 	myconf+=(
+		# (--disable-silent-rules should get passed automatically w/ econf which we use
+		# in >= 2.39, so can drop it then.)
+		--disable-silent-rules
 		--prefix="${EPREFIX}"/usr
 		--host=${CHOST}
 		--target=${CTARGET}
@@ -296,11 +304,11 @@ src_configure() {
 src_compile() {
 	cd "${MY_BUILDDIR}"
 	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
-		emake info
+		emake V=1 info
 	fi
 
 	# we nuke the manpages when we're left with junk
@@ -314,7 +322,7 @@ src_test() {
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	emake -k V=1 check
 }
 
 src_install() {
@@ -322,7 +330,7 @@ src_install() {
 
 	cd "${MY_BUILDDIR}"
 	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
 	rm -rf "${ED}"/${LIBPATH}/bin
 	use static-libs || find "${ED}" -name '*.la' -delete
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 8a2d54bd59b9..ec3589ae100a 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -148,6 +148,11 @@ toolchain-binutils_pkgversion() {
 }
 
 src_configure() {
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
 	# Setup some paths
 	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
 	INCPATH=${LIBPATH}/include
@@ -303,11 +308,11 @@ src_compile() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake tooldir="${EPREFIX}${TOOLPATH}" all
+	emake V=1 tooldir="${EPREFIX}${TOOLPATH}" all
 
 	# only build info pages if the user wants them
 	if use doc ; then
-		emake info
+		emake V=1 info
 	fi
 
 	# we nuke the manpages when we're left with junk
@@ -321,7 +326,7 @@ src_test() {
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
-	emake -k check
+	emake -k V=1 check
 }
 
 src_install() {
@@ -330,7 +335,7 @@ src_install() {
 	cd "${MY_BUILDDIR}" || die
 
 	# see Note [tooldir hack for ldscripts]
-	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	emake V=1 DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
 	rm -rf "${ED}"/${LIBPATH}/bin || die
 	use static-libs || find "${ED}" -name '*.la' -delete
 
diff --git a/sys-devel/bmake/Manifest b/sys-devel/bmake/Manifest
index 0007871bcc54..76dea7e1c334 100644
--- a/sys-devel/bmake/Manifest
+++ b/sys-devel/bmake/Manifest
@@ -1,9 +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-20220330.tar.gz 804133 BLAKE2B 2d8064c0af0fc5d18660e59fe6d08af055dcf1a387974ecdcf346e2c28926dab5266141f037c037a4ddc00e40977cd437bb24f776e37ca09b7308104eafb8e52 SHA512 211cf9f70449921a9ddaf2e0ef23dd170f04005231451d229a0f2bd03e0f60fc1f239d9946d4e46985092cafe987d858ea265207066cf55da2cb5a483e1a31ab
 DIST bmake-20220418.tar.gz 805986 BLAKE2B 6569956d81a9c67cc95756831ec086b392af69cb2b068f11d3beb237ca3f62059b9102695f28aa4093b589af52c512545bd86d91a410d681f3835a99b8270f6f SHA512 89fa5cb6e35ee1cd6a32acf291bda33b3a7272c4ef25d38412b8caa7e092210c8fa04a11d19d3c19b7e60dee2cf0a5049cf393be6e25b6e28bab2eea50e03204
 DIST mk-20210330.tar.gz 107380 BLAKE2B 9ac30a117d9ba31635cf8d8d29fdba76f148611f47628403ca8f807081c32509f10498d3c30fd24985e5420af4710fe59fc6315d71f2d0c1cfed93263a06553a SHA512 6acd3ee911442934082f4f877d795b07c5e23022eaa9c0874799d97e92a2f5a663cb45f94b7f9745c49cbbce6b7e755a29e381ccfb9e68a0be1eedbd22fd5d3b
-EBUILD bmake-20220330.ebuild 1265 BLAKE2B 4bdad1c6658247d849daa6322218c31a88f8af7c0a6d358698974da14a6b7260654e764cdfafe8e5bd1e91c8e38296fd0c5c1ba4d053dfb4b1aa163f3cdfb509 SHA512 8af6400720cdc5da9b157f82ef67fc3931e6e3c478eac903c04f26ae1413ed831ea3bb1e418a1471614c63bc20269659825c909982b5388cfdc6027f3060b8e9
-EBUILD bmake-20220418.ebuild 1312 BLAKE2B a51d77327b89fa4526245c8949883c79ed3091b0c62aaa45be1e266d363178948cd3d46c3e94ef6cdbec8231480561dbfdd166d6434d95c98e6e87f2061bd616 SHA512 3c24aeb474b64a3b28093ba26b21ca6b2e9f34ec012c9bc87b6e40048d268ddb48e1feab0ce7f3a640da514aa47899fc8560aac09deacda9b88c7ec93d6b0554
+EBUILD bmake-20220418.ebuild 1311 BLAKE2B 13a2cf3f6fcee46da66355e45a95f37bca25e6b50dbff3d9e9d6c519645f2b79b6a337eb7b637b484131d41e65f85043a7f0742bb0e9d15bc3e8710f4e147843 SHA512 03c1a7df80c9dc2162fd4ad16c543ab5d96e4aa6bb19d7df3b6a75c9dbd518e35b3c209d21bc6eb7b37356f8b888a82f1fd610d694c11f55deeda5b6a30c3b76
 MISC metadata.xml 353 BLAKE2B 70bd5eb274c4693a005986471e5a5c29a162bd0a080a7ba590c64171f2aa171bf9670093419f0b3e9ef304e5478f71df4899082e3dc76b4b0cedfe782a6625df SHA512 ade70c57a7ae5165c432d2024ec685609971347a94ecd69ab73142ff602f4cafb49df880d4dd1cee5695f1ea11c2c0ccc837d9a1ad38e50c61d0d27049279bc5
diff --git a/sys-devel/bmake/bmake-20220330.ebuild b/sys-devel/bmake/bmake-20220330.ebuild
deleted file mode 100644
index a69c0ea95fc0..000000000000
--- a/sys-devel/bmake/bmake-20220330.ebuild
+++ /dev/null
@@ -1,55 +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 )
-
-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-20220418.ebuild b/sys-devel/bmake/bmake-20220418.ebuild
index 5505e007c65a..7e0fdf7ced79 100644
--- a/sys-devel/bmake/bmake-20220418.ebuild
+++ b/sys-devel/bmake/bmake-20220418.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 # Skip failing test (sandbox and csh)
 PATCHES=(
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 3221ca50cc65..853884c71ff6 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-common-12.0.1.ebuild 593 BLAKE2B b67b21c9d61f523ab9f32d53114763ce95348100e985d96c9ccbae2b9d5ad698fbc174001091c4f9184ecdf904a4d00a9449c28cd09a1e173d885dd1e7759949 SHA512 707eca3a5b53a104c3350cc42f5fe01df9ef17ba4863dbd00093b685a052da67825b7e837820ecd23087759fe2057ae1fbb00b391c79653dacf2c94fd1261342
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.1.ebuild 598 BLAKE2B 2f8544b82c215c7c39037a65fee3e2ec5ca193d3bf76431a0ac39fb0dbcaee0d41a037a5d75ca5fd046d0515b82fff4cdcc4adb01fb6c28fbda5cf702be2728e SHA512 5afb93b24bee955bea103434f6f31c9643e8aef379fafaa4cfcb7728effbc264a1b6691632d64576333fc7c6049b8a60099e2b3753a37752d8aecf1c8795fcc6
 EBUILD clang-common-14.0.3.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
+EBUILD clang-common-14.0.4.ebuild 547 BLAKE2B bb30fa507d6383b92417c55f10a7233e0d48ab7a3ff07b811e135e5f828a2332eafdbee2ee738050a7536b6f956cf8285f0e6d8f40511891580278b2434414d6 SHA512 e70dbbf7bb64ef672de7349d423c41b9ef88471c22be0e3ae326ee1506f3c764f3ca0e695a9953273411c70e4f7ec903533749d030ec37c381819b1850679dd8
 EBUILD clang-common-15.0.0.9999.ebuild 463 BLAKE2B 78e3106b33b6a5b776a1ae91541ec295e08f284b9017684ea1481097be14084bea03013103163b9a1d059dcd261f85469e34f9e730b34cc957078fa645886f9a SHA512 94970664f46768b3373443c17a1cbdfccc6a75d5343f6effee228284931997129214bf0cc9ffcaa386878e7b405dfd7c876ca303bd1686e72197027ede6d37c8
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/clang-common/clang-common-14.0.4.ebuild b/sys-devel/clang-common/clang-common-14.0.4.ebuild
new file mode 100644
index 000000000000..798f9e9fb858
--- /dev/null
+++ b/sys-devel/clang-common/clang-common-14.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of clang"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+PDEPEND="
+	sys-devel/clang:*
+"
+
+LLVM_COMPONENTS=( clang/utils )
+llvm.org_set_globals
+
+src_install() {
+	newbashcomp bash-autocomplete.sh clang
+}
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index b6959f1aea27..55971add58d0 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -2,5 +2,6 @@ EBUILD clang-runtime-12.0.1.ebuild 704 BLAKE2B 5d728bf389420018e991091d36e5d289d
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.1.ebuild 776 BLAKE2B c0abdf45df4a1fcabc55e9a6bc0c39ab8752c169f6e397b4bd156b86ad0efc74047c53f5366fb5ad6a4d7cb70601157f877546ad5f56bdb5959699641386ed85 SHA512 c024027bebd30844b333cd79b67dbc32a181ccc4cddbf748c4df7ac9cb4ac6b1eda2968fdb15ef64f54d8f21740137250165c90faf846399da9e865b54f7ddec
 EBUILD clang-runtime-14.0.3.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
+EBUILD clang-runtime-14.0.4.ebuild 766 BLAKE2B db9c38e5d06c9e20d002696b879f61cf79cfe43059224f4a30d9e472a0ecd4a9298d03767e82ac29abcfba283754cb06c1b460e759763dcad130446323af4ff8 SHA512 475cd0538899a4d2a0132f79efbe7fd928a41e7e11798a35b5ba10b3bfcb9bff01b471af5a611f40d3981d2b9d9902fa1bc223199429685de475c38396ffa53e
 EBUILD clang-runtime-15.0.0.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 MISC metadata.xml 579 BLAKE2B bedb10265d687b5c8c6af5ff9a9612076e7c17c3ddd479c8fe9eccf6e13e74d55b182b4bcb17d213aaa55a57f4b29ee8f90287d6f08e7ebc20b9c4724773f376 SHA512 d872f42ab248387aeb61a42a9858ef80e0c278079e472ccd9d3099515d3c6acc6b38ea2e992ff58df31798a71baea2df19834523bcb64c609a842b8f0abad532
diff --git a/sys-devel/clang-runtime/clang-runtime-14.0.4.ebuild b/sys-devel/clang-runtime/clang-runtime-14.0.4.ebuild
new file mode 100644
index 000000000000..f0ec98510540
--- /dev/null
+++ b/sys-devel/clang-runtime/clang-runtime-14.0.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Meta-ebuild for clang runtime libraries"
+HOMEPAGE="https://clang.llvm.org/"
+
+LICENSE="metapackage"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+compiler-rt libcxx openmp +sanitize"
+REQUIRED_USE="sanitize? ( compiler-rt )"
+
+RDEPEND="
+	compiler-rt? (
+		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		sanitize? (
+			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
+		)
+	)
+	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
+	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
+"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 6ccf77dea211..8ce82dc401ca 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -2,18 +2,22 @@ DIST llvm-12.0.1-manpages.tar.bz2 191582 BLAKE2B a049cd305c257875d47e92d703c51ae
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.1-manpages.tar.bz2 86273 BLAKE2B 174b412568565bdd4c3db34b1b2f2482a18ca45a0a6269ca381fe5c77da21b85dafabad29551b262d593006e9b68e6f7fdf43c2ec626204970d1280dd87a5f3d SHA512 49c58094eebecfadff97d62b4e6b0129e07c52ad7fe3ea4ce5c955e6fc9c73ac443b6a6e0f8322cf25e1d88b059c4231c4798d8da04340a46f6f84fb1b386f29
 DIST llvm-14.0.3-manpages.tar.bz2 217443 BLAKE2B ebea48d9015bb0b53e8b799d8d79ac7a8d03f55440e5d3a08a9ce6c8f106c3f37e597c46aaf824dfee87c222775630299a5c277b4b29d43e831116c12932675a SHA512 db762ff7bfde28147276cacb5c5753a1bb4dd08dc8840423d6fc073629cd97bc3c7f54402cb17aa00cfc06f9f775f7ac9478c2661cacf86d5517a968d290beb3
+DIST llvm-14.0.4-manpages.tar.bz2 214161 BLAKE2B 9e8a0a78cce26b0e5235750a2af99542a496d34726046fbfa3274a22a55a75b3210c4af49e768130515c636ae3d6350f909ccb601888c276ce8cbd6b029b7172 SHA512 793dcbac320d26d26c637f2d38de0a55f5a91d13c93fa1aa2753103a07720248ffc16e8f1914ce81e8c291f02797360c052c23b027d773ac05a5563744313828
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.1-r1.tar.xz 6132 BLAKE2B c99f57a09f214361f2728938ec587e3ef0b473363919058e39fb75c012cc94771b9116b1820f1bd001151eb5f49cc6beaa7572e60e4095811fffb12717a8c5a8 SHA512 af9eca93c9ba91429b0bb07290dce1c9742338dd0635423bc59ebead91a7493a49b66bd36a7ce4cf715fa660678218f64e0ba85824a0869b8e31b81be9f0bb3d
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
+DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD clang-12.0.1.ebuild 11726 BLAKE2B 2dca51da0a8683bac8cf7b0d3a45cbe97e829b6699b25c477245fa7c891b899ae2cdc40a0e628f4f3830fb18bfeb2ce5b9493651c6498c841986018f5ded69b6 SHA512 c7e81f72c28ea11e698ecfab7bc3075002503105df65d938a87079b1d28ced24dbce23fdb9acfbc7c2972d9dca69205f102635f5cba62110c02c8ac8bc8b8764
 EBUILD clang-13.0.1.ebuild 11302 BLAKE2B 5781312f1b71fa90446c01434579ef43c4aa131cdf1d896d08957d5a54ca5c884ffaa49a0cbe8f868fdec95c017b704c0e951d2afe8d828d04329aea77fdb874 SHA512 c4da7cbd4c9e0e242f57584e750252e976949daf996f03da01aec578e741f4e4c7bd688aaac27fda70e82c217cfca98199b89cac68a40f1e8101be1275f31b78
 EBUILD clang-14.0.1-r1.ebuild 11726 BLAKE2B a7a7ec628cec5c8d4c4cce7eb82b8a6908889ff9e357a462abcec4303d5d2368a4c4c17ccbd45d18a63212373fb624ddd5c47b5d186404b3a39d4fcabdcd5d6b SHA512 0638728b3dd63d14c138bea1272ae0008583ee23b9fc98fe220228776462bcace91887e2304fefb0abbd867a4011dac80791b7a80fad463098b9e3276164e610
 EBUILD clang-14.0.3.ebuild 11730 BLAKE2B b40139d3712b05ab6d9723e48bf7370ded5a205a6278ada440537a4995441273855877caec6f80f3ea1735224a9ace035593c83ade1a27db992b6873393b1ae4 SHA512 bafeeefb9115341b556194e220dad1eb8c6520520b0d86a04adb25e66cb6cd345127eb2d28d48548d329cfb04d7d1d71df68712bb1ca22927428ba04541f4b7a
+EBUILD clang-14.0.4.ebuild 11730 BLAKE2B b40139d3712b05ab6d9723e48bf7370ded5a205a6278ada440537a4995441273855877caec6f80f3ea1735224a9ace035593c83ade1a27db992b6873393b1ae4 SHA512 bafeeefb9115341b556194e220dad1eb8c6520520b0d86a04adb25e66cb6cd345127eb2d28d48548d329cfb04d7d1d71df68712bb1ca22927428ba04541f4b7a
 EBUILD clang-15.0.0.9999.ebuild 11652 BLAKE2B 9d28da0a7493476e611a53d5de964c3fb8a26ea6affc37c8cfee33e21594c7367ccdde443e4c73243c5a4b9c44f0064abd450b365ebf0fa28a40676bec30b74b SHA512 45507f89b8de6b8cf4709ced8d2484eafba3d23db2ec2fdcbfab5cf8ab3a275565a18f6506ed675f0d64fd03b469b27f693d86895b7ee30ed97bbce770df712d
 MISC metadata.xml 1337 BLAKE2B 5e4f7d63cd9f3b03600801cbe3b2963a1e6b2fb48e36fdb12862f467829222c182f5958d35b535d8fa8467ebaad05c9641cd645294706e3a0f4a078dc9c2f8cf SHA512 50c1a7c33414f9d6294873478f1017dfb21311b36c916e15a8b068cf2a968fe8d774b51515f61c3632d2b204f103cc7ae6853b14d582291087a0fb8e15c0b35a
diff --git a/sys-devel/clang/clang-14.0.4.ebuild b/sys-devel/clang/clang-14.0.4.ebuild
new file mode 100644
index 000000000000..19d50597423e
--- /dev/null
+++ b/sys-devel/clang/clang-14.0.4.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm llvm.org multilib multilib-minimal \
+	prefix python-single-r1 toolchain-funcs
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="https://llvm.org/"
+
+# MSVCSetupApi.h: MIT
+# sorttable.js: MIT
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	debug default-compiler-rt default-libcxx default-lld doc
+	llvm-libunwind +pie +static-analyzer test xml
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${MULTILIB_USEDEP}]
+	static-analyzer? ( dev-lang/perl:* )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	${DEPEND}
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-util/cmake-3.16
+	doc? ( $(python_gen_cond_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	xml? ( virtual/pkgconfig )
+"
+PDEPEND="
+	sys-devel/clang-common
+	~sys-devel/clang-runtime-${PV}
+	default-compiler-rt? (
+		=sys-libs/compiler-rt-${PV%_*}*
+		llvm-libunwind? ( sys-libs/llvm-libunwind )
+		!llvm-libunwind? ( sys-libs/libunwind )
+	)
+	default-libcxx? ( >=sys-libs/libcxx-${PV} )
+	default-lld? ( sys-devel/lld )
+"
+
+LLVM_COMPONENTS=(
+	clang clang-tools-extra cmake
+	llvm/lib/Transforms/Hello
+)
+LLVM_MANPAGES=pregenerated
+LLVM_TEST_COMPONENTS=(
+	llvm/lib/Testing/Support
+	llvm/utils/{lit,llvm-lit,unittest}
+	llvm/utils/{UpdateTestChecks,update_cc_test_checks.py}
+)
+LLVM_PATCHSET=${PV}
+LLVM_USE_TARGETS=llvm
+llvm.org_set_globals
+
+# Multilib notes:
+# 1. ABI_* flags control ABIs libclang* is built for only.
+# 2. clang is always capable of compiling code for all ABIs for enabled
+#    target. However, you will need appropriate crt* files (installed
+#    e.g. by sys-devel/gcc and sys-libs/glibc).
+# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
+#    in the current profile (i.e. alike supported by sys-devel/gcc).
+#
+# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
+# multilib clang* libraries (not runtime, not wrappers).
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# create extra parent dir for relative CLANG_RESOURCE_DIR access
+	mkdir -p x/y || die
+	BUILD_DIR=${WORKDIR}/x/y/clang
+
+	llvm.org_src_prepare
+
+	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
+	eprefixify \
+		lib/Lex/InitHeaderSearch.cpp \
+		lib/Driver/ToolChains/Darwin.cpp || die
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# meta-targets
+					clang-libraries|distribution)
+						continue
+						;;
+					# tools
+					clang|clangd|clang-*)
+						;;
+					# static libraries
+					clang*|findAllSymbols)
+						continue
+						;;
+					# conditional to USE=doc
+					docs-clang-html|docs-clang-tools-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# common stuff
+		clang-cmake-exports
+		clang-headers
+		clang-resource-headers
+		libclang-headers
+
+		# libs
+		clang-cpp
+		libclang
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# common stuff
+			bash-autocomplete
+			libclang-python-bindings
+
+			# tools
+			c-index-test
+			clang
+			clang-format
+			clang-offload-bundler
+			clang-offload-wrapper
+			clang-refactor
+			clang-repl
+			clang-rename
+			clang-scan-deps
+			diagtool
+			hmaptool
+
+			# extra tools
+			clang-apply-replacements
+			clang-change-namespace
+			clang-doc
+			clang-include-fixer
+			clang-move
+			clang-query
+			clang-reorder-fields
+			clang-tidy
+			clang-tidy-headers
+			clangd
+			find-all-symbols
+			modularize
+			pp-trace
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-clang-man
+				docs-clang-tools-man
+			)
+		fi
+
+		use doc && out+=(
+			docs-clang-html
+			docs-clang-tools-html
+		)
+
+		use static-analyzer && out+=(
+			clang-check
+			clang-extdef-mapping
+			scan-build
+			scan-build-py
+			scan-view
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1-3 "${llvm_version}")
+
+	local mycmakeargs=(
+		-DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		# relative to bindir
+		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DCLANG_LINK_CLANG_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		# these are not propagated reliably, so redefine them
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
+		# libgomp support fails to find headers without explicit -I
+		# furthermore, it provides only syntax checking
+		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
+
+		# disable using CUDA to autodetect GPU, just build for all
+		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+
+		# override default stdlib and rtlib
+		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
+		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
+		-DCLANG_DEFAULT_LINKER=$(usex default-lld lld "")
+		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
+		-DCLANG_DEFAULT_UNWINDLIB=$(usex default-compiler-rt libunwind "")
+
+		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${BUILD_DIR}/bin/llvm-lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DLLVM_BUILD_DOCS=ON
+				-DLLVM_ENABLE_SPHINX=ON
+				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
+			-DCLANG_INCLUDE_DOCS=${build_docs}
+			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
+		)
+	else
+		mycmakeargs+=(
+			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
+		)
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		mycmakeargs+=(
+			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		[[ -x "/usr/bin/clang-tblgen" ]] \
+			|| die "/usr/bin/clang-tblgen not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+		)
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	# provide a symlink for tests
+	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
+		mkdir -p "${WORKDIR}"/lib || die
+		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-clang
+	multilib_is_native_abi &&
+		cmake_build check-clang-tools check-clangd
+}
+
+src_install() {
+	MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/clang/Config/config.h
+	)
+
+	multilib-minimal_src_install
+
+	# Move runtime headers to /usr/lib/clang, where they belong
+	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
+	# move (remaining) wrapped headers back
+	mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+
+	# Apply CHOST and version suffix to clang tools
+	# note: we use two version components here (vs 3 in runtime path)
+	local llvm_version=$(llvm-config --version) || die
+	local clang_version=$(ver_cut 1 "${llvm_version}")
+	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
+	local clang_tools=( clang clang++ clang-cl clang-cpp )
+	local abi i
+
+	# cmake gives us:
+	# - clang-X
+	# - clang -> clang-X
+	# - clang++, clang-cl, clang-cpp -> clang
+	# we want to have:
+	# - clang-X
+	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
+	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
+	# also in CHOST variant
+	for i in "${clang_tools[@]:1}"; do
+		rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die
+		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
+		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
+	done
+
+	# now create target symlinks for all supported ABIs
+	for abi in $(get_all_abis); do
+		local abi_chost=$(get_abi_CHOST "${abi}")
+		for i in "${clang_tools[@]}"; do
+			dosym "${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
+			dosym "${abi_chost}-${i}-${clang_version}" \
+				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
+		done
+	done
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping & ABI mismatch checks
+	# (also drop the version suffix from runtime headers)
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
+	if multilib_is_native_abi; then
+		# don't wrap clang-tidy headers, the list is too long
+		# (they're fine for non-native ABI but enabling the targets is problematic)
+		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
+	fi
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"
+	if use static-analyzer; then
+		python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view
+	fi
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+	# match 'html' non-compression
+	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
+	# +x for some reason; TODO: investigate
+	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	elog "You can find additional utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/clang"
+	elog "Some of them are vim integration scripts (with instructions inside)."
+	elog "The run-clang-tidy.py script requires the following additional package:"
+	elog "  dev-python/pyyaml"
+}
+
+pkg_postrm() {
+	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow clean all
+	fi
+}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e35de551d7d2..ae48237b1302 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -2,7 +2,7 @@ AUX gcc-11.2.0-cross-compile-include.patch 875 BLAKE2B 92ed84f2b75dd88c73ca115a9
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20211126.tar.xz 71674848 BLAKE2B 81f4a572e973db7a3701601e66ea58c8e535a55d4d4ac164de00bdb06f7f265585f45d46171cf40d42ebcd3fb02ac81b643398c560912698eb6c008ac6e09518 SHA512 db887184c649ebeede5a1b9f13c00fe425012434cb93ec960c3ca50c0bcdeab04a1cc13b20de21b940e5d6a09c3b1c7fc415110a0e990ec1d938627bf97b9342
-DIST gcc-10-20220519.tar.xz 71731312 BLAKE2B b48dff68befda25ab43202d460c369731543e3f3432ab6cab235cb4338132adf2dc0f7f7bcb91f07824a8596196b90c2ee902a8ccb9f9a072a87891b936b644c SHA512 4eae421e51e8cced46e34efda29a3395c2ca72cc456d8c15ec32182e95eb29a120697c1dda65862676014366c6bec4728d4f0b7060624bf5c141133b28a177c8
+DIST gcc-10-20220526.tar.xz 71732684 BLAKE2B 88bb09a7ccc82ecbc52a748065809d06b9441a6d619281cb7a2fff96f3c06644f8b1292d19444f1f044010ce00eab446d00e0c6065f434715fb8b8ff458699f0 SHA512 ef9b1c58bf187042ec85c6a780a9c001495eec0cc8cf57a378372e16a22428783c5281ef9204d6ab275acbf8fb02cb5fb66e991323812304fe6ed4714bb39e2b
 DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
@@ -10,7 +10,7 @@ DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498e
 DIST gcc-10.4.0-patches-0.tar.bz2 15231 BLAKE2B f64a2e7f317acf9416da69c129ea869116be2780828f9d3cda59f7ea8d39634df7f0347f745275bb167f95aae2a3b8e97ec7c78f775d9002718dd67cb9429f68 SHA512 d1497930ccf4d6ee8700faeb676945e65b3aa2ba3a580a3564575fad1590ad076741f2ecad778ab48d0c4e8ed7723b84b0a660cb67cc4530495691702159a43a
 DIST gcc-10.4.0-patches-1.tar.xz 14392 BLAKE2B 76cc16bb611f1ac2020f0f430fc3f038e8ad29827e000b7aeca2a3143e91a674dee18b9530451fe37110c20dd3548ece387c323b460199e911e8195fc88eddf4 SHA512 f574ad66025eccb824e5901ef14f38268fc1fb26d9fc4fc9d04c8652c7bcee78ea196bdda88dbf891f167a6d7d75a74fb5776592dc25971c5902ba9d5d721266
 DIST gcc-11-20220115.tar.xz 75676672 BLAKE2B 12171fd97731dbca67f13cc2a3a3a3989c22d628b289cbd3d46080f77a8d951f15c1e54e83a2e62ab41b69221f9784e970799a11a9ed5b224a77ba4b1b081f07 SHA512 7455b3b29d3c64df9123afef82faf922d97e08a3ea30fbc2d9286d4f6ed2fafbfc0f9d94ae1b9eee45329e95a27bd642b3aa679d83a0c27a3e30967d49e0728c
-DIST gcc-11-20220520.tar.xz 75766972 BLAKE2B 514eb7cd629a430167efe53c9f3d3967f0891759d9302e524a7ffda10dda964f7f9f4314d845bb8814f8cab6858dc2b19fd59db6abc95beb3a81e5e4915f6b6d SHA512 a4a3a1f47f513cffd2d2a33a0f389ca6f12dfc776a510e03607825332537c8e5df90c545d74bedbf9298ab6647df30bb72909e008a52ed69be9bb837bd75f1c4
+DIST gcc-11-20220527.tar.xz 75770720 BLAKE2B 60b5457c022ba61615ae9ffd930ad19d96cb925713c0c883c44c9eb7b687ba1f9ac3c7bee0b50e43d6130fdd079696e9baf8bcac2584663fee695dd642f00a18 SHA512 74cdece429fa90ceb1c12dcae5241a53c4f222b14e4b5e50be8cf1b1a37582c9b63485492c1a3adb969c3a51964e8090182f6bf709390fb14002199a6d444005
 DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf
@@ -19,35 +19,32 @@ DIST gcc-11.3.0-patches-4.tar.bz2 14030 BLAKE2B cdd555f329c7c0b993cd3527489681bf
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-0.tar.xz 13404 BLAKE2B a384e6604befe306e6ee444b886c1aed1ef469299f5c7903da8314d73fd06463fb4f24be24d3d03df4883eaa8eb24beb477d881c5a1886d5913fee110b11a35c SHA512 f46f971f87deceaa8bc60eaa815aa1625f1cae01d2cccaeb6ff87f518198a756a1f7b496bd5bad004d713a4e8e6138f0b9a832e4df344fcb3009def840f9f6b9
-DIST gcc-12-20220514.tar.xz 79083160 BLAKE2B aeb6002f1137413564d24e65f4e6c79f8c2e12225ecaaf1cee601f4a584f3778b6cfc98b519d731ccf811075a7ec3e469128dd8a5e1885f480261b08c03c7a47 SHA512 15af7d5dcddd91bda7db7855956ba85983d95c63a6193785f4c5e8827f120352c731b9652d814bc461aecb9ae8b609689b500e6c8265594b31e5ec962256bee0
-DIST gcc-12-20220521.tar.xz 79087572 BLAKE2B 835b5b28c9e29fc3ab94ee732188325f216b4b54285a62c602280d2c3b0bcaaf779d2874402268b49a0aa57f0a23783e0b71fa4e37c1da05eedb5aa91f782ef3 SHA512 92f6c7cbe3b301ed7361c097dd37e11df8d504bcb0c62a363d710eb09091248a43db3466ae6d61042ce3733714efb81eec80f2e50d8761fc7a742be2c8bb5f53
+DIST gcc-12-20220528.tar.xz 79096228 BLAKE2B 9c06ce85c6302bd43e06d35d5d5cc9e81268d368484bd60af707e6dbbe791d85ec2a177fe7deae1379d313269fcaea2ff5245e20e54ca667f452c27efb738c13 SHA512 498be61fcae7e4ec55e1f270e1d02fadfe9069692afab6442dac0b7ab480ad7112121f4728a9f99c7868e7373b2c770ad4833a3b4a1a8a43b3417e79f286c28c
 DIST gcc-12.0.0-musl-patches-4.tar.xz 4456 BLAKE2B 80ae755b52c31d57eb737b3ec5e70d96e7e20f6720664cd94573b1c6cd079a0e29f73277c27b2f2570706da5239006dabd44f834824c515f6615ed5dc39c273f SHA512 cf917f40133d2b8090e98880e6c87d38129f44bcb454f4d707ef57967635a6fb571d7b85b7cb854421bc9aa88e48767a47aad99c767f9415899f97922d61c497
 DIST gcc-12.0.0-patches-5.tar.xz 9820 BLAKE2B cdebb6fa59e594f95cc4b028d329c0fed3ffa1731a4ca1a2954b7760f4a674e773cfe5888fb2c63a619d5d80ec464d98a94870bfe2e3ea34370afce7f67526bb SHA512 a9c27b0188fd842e88d6a831cdf1f9c6d0cada4ec260b5f7e67f3d8fe0f439fb0d2c82469de9fecebd657043babf3e63a24ee53776be2617bb90e1d3dd3f521e
+DIST gcc-12.1.0-musl-patches-4.tar.xz 4448 BLAKE2B ddad7bccea7474a0552e069df25e66b4af68470da655aaf7669c2ceca7d0588cebb171e8a949c8935eeadff23af4d3de41d44245c06d48044cfc1d1fadc6540a SHA512 bb3b9e4a81efd2d0ceb405220a9c15453d780d8bc01ed5ebf4837a318e0f8ad8cc36d6ad3f2eed5051bb6dc82f223d8b61321b8f602890a770eefd69c0c144b9
+DIST gcc-12.1.0-patches-6.tar.xz 10264 BLAKE2B 8ae3f1d0a943551717ea2f5a04253728c97bc3e0583028d6213a030864591b8cc7942e4e1782e7114b9482f9406309deba1d140130d08bbe8bfd2d78581274a1 SHA512 4b20a02034a7847965b451167e201bab31d666e9d0a452a0036076f540c8e4ad8b905fff99e47ea07e074052cf2e52fe022b423d182b73b7ad7f085d21696060
 DIST gcc-12.1.0.tar.xz 82701928 BLAKE2B dca5df8fea680dbeda721742cce5c97de7eb4be490a32a158e06b88e2b9dd092150b7cfe490bb69e48e2f75d8bba231c8a54cd46b48ddcdc01bf9553ab57019d SHA512 2121d295292814a6761edf1fba08c5f633ebe16f52b80e7b73a91050e71e1d2ed98bf17eebad263e191879561c02b48906c53faa4c4670c486a26fc75df23900
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
-DIST gcc-9-20220317.tar.xz 67699876 BLAKE2B 0cca8137afd427ca1f48e3b4869b3de6fc347bf121d83e4170f09657d79a7a3d6b59b7e4c242002db5c47c7f5253f4297122cf6e02b3227f9e69364594bcf706 SHA512 31e90b0f1dd1db18038793d5409b503a01554e4dd9b1f5412e6b3d8be12f42cf4eab7fa97e409960464eceaeddf81bd1e541aab4d283a87c39e33e119a22196f
 DIST gcc-9.4.0-musl-patches-1.tar.bz2 2337 BLAKE2B 7bddc631c9f0e68884acb2bb603e2867e1f65e44f3bd519844341984fa17f323a953bca21cfc05a0f84f7da943c83f2f5341899c917ab88891ac33ccafeb8f75 SHA512 b2cf463613011892b07d1a932f402d7606aa3fce4e059c342996c4ef6aa37f20159812a81fa82897b2caf658853644c5075d23c81d04c4c98e06a72bd9680488
 DIST gcc-9.4.0-patches-1.tar.bz2 14012 BLAKE2B d5fbfd73d9c3a5b66be5b124d981fe5a7468363c83784989a50731f87931435f4b6302e4c20a64b20680581ed40005eff7bdd5855526a093f73a04c3c1ddab31 SHA512 b84884c7d2197cb14229d3321b98cd66c783cf9ebf7e5d1b1186e6cf32ee9e47d004ebad26118f9c848f9bc0a3783ceb23d9b65101d98c3bfa99874e66ee7cbc
 DIST gcc-9.4.0.tar.xz 72411232 BLAKE2B 4bb000d33d6bd2d6cc91c040713f27f79dcf726ef8ab1542c711e0c25651507628510b1373bc73aef71ffb660afddb2eb8d8c8540f5f1498ee243cfff6c0be67 SHA512 dfd3500bf21784b8351a522d53463cf362ede66b0bc302edf350bb44e94418497a8b4b797b6af8ca9b2eeb746b3b115d9c3698381b989546e9151b4496415624
-DIST gcc-9.5.0-RC-20220520.tar.xz 72549960 BLAKE2B 78dbb1c90d5966498ebc07fdcbb27bf487f92e3dacbcbac82e7b535596a30d06f3d7c58638cceaaf2db09799731e4faa3f8c9259a5be1ea46bf29f63c530a5a5 SHA512 6dd2472a9d949bdd8beec63a73b5626903621e8d66f4df6b3e90cd8b7e1aa8535889c3a6ca9257f23ca13114c99418789a745d1d8094ce4172abcf485d08c48f
+DIST gcc-9.5.0.tar.xz 72462752 BLAKE2B 69e39314ee6bb46e3be491ba9c3cbc4914cb716f732c6d3f2b14d9382750b40c4f14b5d3051225b81f936ef8297b0ba8cb5439512e961dae5815d3bee2b0bfdb SHA512 cdd144ce4f747e051480410afc8506c90a57cb45da89071ddae377b1453bca3014422455ade9fe4563ebe51f4b6348cbc0c61905a9b8801cd597d51ad0ec62b3
 EBUILD gcc-10.3.0-r2.ebuild 473 BLAKE2B c9061341ddfa8d143fed0ac5794db4a872527f479b2243e5a939d9e6b1837a2ad9badd6a77ff771aeb4801c1223b625d6e6348a5675191d36708b186400c9b84 SHA512 75e667562d45b1cd7ac48fab95e390131eb6530daa858b450f3d5530c7fc6dbab112e4bcb20f21fcf1c41a0169c8d3483d744b826b12b685a8603340963540d7
 EBUILD gcc-10.3.1_p20211126.ebuild 516 BLAKE2B c7e586e91d1da8b25b10eb84bc36e01d3797aa51b1f0134a1547f7ce9edb021f45c4550a3af96d6a4536d260537552743e3af70d325507efa742dcedc61a58c8 SHA512 2d5ae44da23c8962ddef3f8b0f27923c2ce6df0fc4849e022de0e45945f2a973a5c5cb27f49341b5344ee0f934e5967a9a4260ec456a77bf0555cbfe867bf3c6
-EBUILD gcc-10.3.1_p20220519.ebuild 553 BLAKE2B 745bf65f1dfb94a03de72ff0140180de778b0c97d911db30789516b230163a0708a6d63858b3e479ca94e6d3fa545edcd388a785b885aff0a2986ccd8ef7069d SHA512 92f71de06618c457372be336232c8a4ecccb871cf1d6744860d0e41e65fe1527bacb470933e4fc2e1fde2e4cb52c866904485c4d06692754caf59371ce4cf0dc
+EBUILD gcc-10.3.1_p20220526.ebuild 1048 BLAKE2B 6676640c20eebd4a92d2661f4027b33ebbb1e8e3dfb0e16081e11f5fa611311c328ebdc2c7f78462a1bede94b51ffcb0916654cb47ada15f71c59f1bc368f993 SHA512 02049ab2b0bb20c1af8453ab983a6fdf243de23190eb15df9104c9a68b6c8e0ee99974698142cfc0884fd4e207465b696de9e81bd2592bb807ea379efcdb76fc
 EBUILD gcc-10.4.9999.ebuild 1048 BLAKE2B 6676640c20eebd4a92d2661f4027b33ebbb1e8e3dfb0e16081e11f5fa611311c328ebdc2c7f78462a1bede94b51ffcb0916654cb47ada15f71c59f1bc368f993 SHA512 02049ab2b0bb20c1af8453ab983a6fdf243de23190eb15df9104c9a68b6c8e0ee99974698142cfc0884fd4e207465b696de9e81bd2592bb807ea379efcdb76fc
 EBUILD gcc-11.2.0.ebuild 466 BLAKE2B 9897dc608217b7fbfd44fc14446638d23f18c0516a19b73e317aaeb328f82ea89452bf93888628a7d22d0892f6ca0a959cfc6e620a5afb9b8ee7063a4a6a173d SHA512 425b789e1c7f495b2581e9aa6a435fa7c1c23b0e167c44e81451ef2e7896b35bdbe9772bdff7b78c9deb0e4f6357f956f28151072b35fbb233ec5f9e771bf458
-EBUILD gcc-11.2.1_p20220115.ebuild 655 BLAKE2B 3cba25775eba16e17d9df7d4664561d518d4569abd51b44fc9f2a48eee4ad87c5c355e6ee76fc1e617e3abab797589f5906b81548e4eaa956509f9b86d0a2ae6 SHA512 bfdfdfbf5124318fa42cb1b603c61a9c550e679e62e5186266d2896e6a5dc7703441f0d90864302afa072f1156ac45c73398d86c7dbdef88e3cefbc3eb44e088
-EBUILD gcc-11.3.0.ebuild 662 BLAKE2B 88bedc1957ab7a229c3af32c6269ac1efce57263f54dbe82054e008cd1cc6fc6dc5a6f0edffcd0f5f30ee6f189e9d37cbc46a42665f1a5c02c56c9a75297ebf7 SHA512 0412a4bb430d80554875d8eb1ab865c86cfc10168b9e62f35eb3df618fbaafe951ea8430e64df40ce2a90fb4bb4a122ecf6b7d7e0b61b4855565eb8e59d9787c
-EBUILD gcc-11.3.1_p20220520.ebuild 1165 BLAKE2B 2f8252f8bf1853d0d52fd45e58590b33ca6afa19f992a987364eea448e7067f09129eaa4eaea6e5b98958dbb644bb389759a073b1293d7f27328eede5fc196a4 SHA512 ee40b62d303a6e463d8f26531a1487c1b2c1f058f06abcc05df13eba9d6e11590b00e39599f5133aa1fa4f7c108c122d414e6c4fc259a0f4d96465b30f5046dc
-EBUILD gcc-11.4.9999.ebuild 1165 BLAKE2B 2f8252f8bf1853d0d52fd45e58590b33ca6afa19f992a987364eea448e7067f09129eaa4eaea6e5b98958dbb644bb389759a073b1293d7f27328eede5fc196a4 SHA512 ee40b62d303a6e463d8f26531a1487c1b2c1f058f06abcc05df13eba9d6e11590b00e39599f5133aa1fa4f7c108c122d414e6c4fc259a0f4d96465b30f5046dc
-EBUILD gcc-12.1.0.ebuild 681 BLAKE2B be79231a2d027e89fe239abddf6f349ab0cd3c7b0a32b79605bb615cb663858730a68bda79dd38976b493bd8ab621f001ea416a44a61dd3774c67e52754460b3 SHA512 75b7b3b6c4dbc64129c1f4dd32cb938f7ce13b5edfd6f854f6901170ece097aef956816f8473fde448dfbded420a6ba22d87b07a8a6047fcf1f2a5742b696151
-EBUILD gcc-12.1.1_p20220514.ebuild 682 BLAKE2B f1b261a66aa81fbef280c2585e7068f0d7ad6155821bd09cae0f306f1cff843e6eea441847b0d1e99398a85a36b807c988069aa140f7fb324df66cd01c2811bc SHA512 3805d22b9fbc3f6b7458e65c2213ece05df2b3c033ae15b5faf5a33c9b0b36215030760ebf2e9225fa6da083f69826eec17d5c41c7849ea3f1bcd5a969042708
-EBUILD gcc-12.1.1_p20220521.ebuild 682 BLAKE2B f1b261a66aa81fbef280c2585e7068f0d7ad6155821bd09cae0f306f1cff843e6eea441847b0d1e99398a85a36b807c988069aa140f7fb324df66cd01c2811bc SHA512 3805d22b9fbc3f6b7458e65c2213ece05df2b3c033ae15b5faf5a33c9b0b36215030760ebf2e9225fa6da083f69826eec17d5c41c7849ea3f1bcd5a969042708
-EBUILD gcc-12.2.9999.ebuild 1170 BLAKE2B a3854bda64d4de5b5ff44777a3b17515b001d6d82c0e44b2983fe19fd739cc38ffe429a29f9cdbd1378a5064c03a79f30597597e0fc64108c998eb38ca6149e5 SHA512 03a6207dc5621adb450b7964daf0ca5939905730ea51cbbb41b2b0ea4e72c4abd08f33b4fd0aae57175e77f03311122dcb8824036027596a05b624c389d61ef8
+EBUILD gcc-11.2.1_p20220115.ebuild 662 BLAKE2B 98b18d2f5dabd9e5f7ba353def9ffe5f23e355de1488f1f262709fdd5839d3edc9359ee94d1f703e71aee19c3db2db692d23e7e9a257d7e1a1fad27cc83f2496 SHA512 dc0a0c4b20ec9303832d9ea0e738957f4d73805c66157120c899a8bccce8236a3680f2af9b2904ebf078f967ca60ddf63fa28f4f8676a5339cbfa7c785770aa7
+EBUILD gcc-11.3.0.ebuild 668 BLAKE2B 02fb74992f0b574ca41897c9d4cd95990d8b23cf9c4233b27051f0e799636228c9b009815177263079ce89d1dc4e04132c118e7ba54d73053dd268950431c950 SHA512 163f866d1e18b19253bdbf853813e023631b3e95b25896d6e3d53dcb57c984f82f268441b6187ab741f43c928f337e076cf84ef2e4a421a5c28e4a17718c47ab
+EBUILD gcc-11.3.1_p20220527.ebuild 1172 BLAKE2B 759ad73e3af817aab26a44ef8e93e51e2d3c005db5be92bfdff55bcd0e84e4964d77f55435ba72527d16a17511e64109d3930106cd80e031ccf29a9c4c4ed45e SHA512 5a4f5cfecebfc2471b52303256f1b5c92cf3a51653445c6e2360f270fb198ebb0a06fc205508b91c7c0e7217aeb4c75360a9f83acbadbddfababdcab76c81594
+EBUILD gcc-11.4.9999.ebuild 1172 BLAKE2B 759ad73e3af817aab26a44ef8e93e51e2d3c005db5be92bfdff55bcd0e84e4964d77f55435ba72527d16a17511e64109d3930106cd80e031ccf29a9c4c4ed45e SHA512 5a4f5cfecebfc2471b52303256f1b5c92cf3a51653445c6e2360f270fb198ebb0a06fc205508b91c7c0e7217aeb4c75360a9f83acbadbddfababdcab76c81594
+EBUILD gcc-12.1.0.ebuild 688 BLAKE2B 70f80bcc0e2a83eb5a09a94318ba926163aaddeee2ba40c7116e3c9fa88be1da412649dd21db31f1a0c1fa6c25dcbadad989bc3e824f3869b981c2f483985ceb SHA512 1af8727a9d2d4411c4d0d56cc2c331c2f018143b55cce408ad37dc98480bd5c67212a9a88c693c9d88864c9bc5b6e6996736e23e3db740af9b7f6ca1b32d4878
+EBUILD gcc-12.1.1_p20220528.ebuild 689 BLAKE2B efc85eb9fd95fdb5944ac23b466c25fb31a539dfb213e4f3b399ada254a9e5667ad98607bafffc9db40c4a3521870e2536b02a5bf446338f91415997e9ca77bd SHA512 6acb4a6e40db6d8b3ae49d230b99267133f97658df6f04f399e30d1e68583ace1a72e7176fa6bb08c9e8954b6afaa27dc57c84d0daa02fa444cfb921185ff8c3
+EBUILD gcc-12.2.9999.ebuild 1177 BLAKE2B b4c3e947850a187aa5cd9aa7aba452d7bed3fe5e95698762592d0aa1967cd1b7ea1d5c75a0fa37265f45eaef7843d8fc08ddf3ea4d4949a9aecedcbd3e6a7d2f SHA512 37a7b5d5e6d6a683f4ced921fcb158bbf5853371ae5d5bab632c6099d57cb7f622888000f2b04b2ee28bb5ad11ecfaabf8267bfcffaadf9033671fd712864ae4
 EBUILD gcc-13.0.9999.ebuild 1183 BLAKE2B 474017b05d7b5777f60678c5e487e3855d597114cf33615e7ae5249d7b8505e8b91d3c91d40873dda7354d57a2e8fa43fcf7455f86d7704e28b331f6764ac1ec SHA512 44de0a645216ca9078b944a4d7af4c9c7b7d9cf5a8176663964bbfe60b5ad4d1ece1dd87e282710dd58ef6e581fdb56e8afeef9bc759422ec3f95e30986e3a49
 EBUILD gcc-8.5.0-r1.ebuild 444 BLAKE2B 9ccc45a2aee8c0a692f7b56efbdd817d5a9202a531de95dfc09a283dc67494df97843146bca9aca701522c22932036a9236ea678f3d643d049faa05bec53ae22 SHA512 d2fefd74e875ce17e2f4bf8e4135bb36a45cfbb1ab7c7ff4847eaf53a368656c8e5a1eba039a909623cc4bd4f4905249da6b291c7327b791a25dbab0008c4f5c
 EBUILD gcc-9.4.0.ebuild 456 BLAKE2B 78681cf7e30cd621999659ba2135376d6e8992f97af71e1af0dcb37fd3abea88fb4c2b896a19f41917941a8cc5c14e870cd25ecff2947df648094e1ff9ed7ea5 SHA512 c16c17ff9978df1c945b2ad868cd720a46a4a5a1c610f66204add36d98460e92843409b4a4caeb196f53c278cd7475767b810cc806a77db29297dbf61e37477c
-EBUILD gcc-9.4.1_p20220317.ebuild 484 BLAKE2B 8e21719a761c933e4524746257e5983146df3a3eff2de0fe88d54b7d098d13acaf5bcf1c69bb61101ea65777d681785a42698e0b0e021a8901a08c172d4f7441 SHA512 0be016720b29bcda158a8d042d0447afbc31485d991c24728955deb57e0c27c4d80486ece97d8d57564d670c225cf6d1ebcf4590d0f7de25419f69e9c7d88b62
-EBUILD gcc-9.4.1_p20220520.ebuild 738 BLAKE2B 6255040e628b9b1696f1fa47779c937bf40fcab9d0a9bdc347aa1ff89fb474bfa3dd72f6c5c66a4352130a1247f19ca297bb5ff9671daa4a8e6da248262ffdf3 SHA512 ba8d4189155500ed7443a0e3add85a1cfddd7e4a658337c23f2f40179d8dd728900941b44ac6d19bd652c727cf3a364397641f57ba501ce97086a8a6b6620163
-EBUILD gcc-9.5.9999.ebuild 862 BLAKE2B 3b4280a8ac7132d1ecc9ae29cb780b2fc36e4dd79a2b00976862baa90e16bb3c80081979e68bebca45b4be6b4206babb69ecf62ff5b2ff344327f11b7a82c80d SHA512 d9ec8fc2dc85bd13129a5d2db0e3fa043484ee78a9bb641a908c4c02986560bb3a09850c9addf50c2cfc6f2d1c8591949283576b80be243b43ed764d0022219a
+EBUILD gcc-9.5.0.ebuild 857 BLAKE2B aa2143fe2648f1f771ee72c25aacfc1492c96d60f0b09fd70a13ce4bd72b49468ceb55f782dc31810115ffbfe9f838ea02619b4ca60f5d27af8ed9b92e659873 SHA512 3bd45cc60d78024376f530e92922f50e2745efd045c42a8dbafbefa12f43078c248bffdcbab011e32c1b5b89fc861f2d5fb5909a7c549843de0bafbc4c9928d2
 MISC metadata.xml 2437 BLAKE2B 331a9ec42d67451d97facafd1a763d6236a24d0026bf37034b8e0bc41be94ae0e722e2c1c3b7032951a7d89666103242a6fecb4db78f4e26bea1d99f4a366700 SHA512 e67a929205828d4b5290299a3bb31f05f5024765ed3470d789f9d41b8a343d278a9c6348711ba4f6cb654285feac91edc9ec4bd426b177d500eee4cfc122cb03
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220519.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220519.ebuild
deleted file mode 100644
index d482adf13a97..000000000000
--- a/sys-devel/gcc/gcc-10.3.1_p20220519.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-PATCH_VER="1"
-PATCH_GCC_VER="10.4.0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.4.0"
-
-inherit toolchain
-
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
new file mode 100644
index 000000000000..a9a6b60d6846
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.3.1_p20220526.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+PATCH_GCC_VER="10.4.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="10.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.2.1_p20220115.ebuild b/sys-devel/gcc/gcc-11.2.1_p20220115.ebuild
index bcaa58794f83..45cb04b1750b 100644
--- a/sys-devel/gcc/gcc-11.2.1_p20220115.ebuild
+++ b/sys-devel/gcc/gcc-11.2.1_p20220115.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-11.3.0.ebuild b/sys-devel/gcc/gcc-11.3.0.ebuild
index 6d5f17550bd3..595588a4d590 100644
--- a/sys-devel/gcc/gcc-11.3.0.ebuild
+++ b/sys-devel/gcc/gcc-11.3.0.ebuild
@@ -10,14 +10,14 @@ MUSL_GCC_VER="11.3.0"
 
 inherit toolchain
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # Technically only if USE=hardened *too* right now, but no point in complicating it further.
 # If GCC is enabling CET by default, we need glibc to be built with support for it.
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220520.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
similarity index 95%
rename from sys-devel/gcc/gcc-11.3.1_p20220520.ebuild
rename to sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
index 06ce76b748df..5724c677922d 100644
--- a/sys-devel/gcc/gcc-11.3.1_p20220520.ebuild
+++ b/sys-devel/gcc/gcc-11.3.1_p20220527.ebuild
@@ -32,7 +32,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-11.4.9999.ebuild b/sys-devel/gcc/gcc-11.4.9999.ebuild
index 06ce76b748df..5724c677922d 100644
--- a/sys-devel/gcc/gcc-11.4.9999.ebuild
+++ b/sys-devel/gcc/gcc-11.4.9999.ebuild
@@ -32,7 +32,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-12.1.0.ebuild b/sys-devel/gcc/gcc-12.1.0.ebuild
index e3c575c899ae..e63decd47c55 100644
--- a/sys-devel/gcc/gcc-12.1.0.ebuild
+++ b/sys-devel/gcc/gcc-12.1.0.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~loong"
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220514.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220514.ebuild
deleted file mode 100644
index b9019e18fc82..000000000000
--- a/sys-devel/gcc/gcc-12.1.1_p20220514.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCH_VER="5"
-PATCH_GCC_VER="12.0.0"
-MUSL_VER="4"
-MUSL_GCC_VER="12.0.0"
-
-inherit toolchain
-
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#KEYWORDS="~loong"
-
-# Technically only if USE=hardened *too* right now, but no point in complicating it further.
-# If GCC is enabling CET by default, we need glibc to be built with support for it.
-# bug #830454
-RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
-DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
-
-src_prepare() {
-	toolchain_src_prepare
-
-	eapply_user
-}
diff --git a/sys-devel/gcc/gcc-12.1.1_p20220521.ebuild b/sys-devel/gcc/gcc-12.1.1_p20220528.ebuild
similarity index 84%
rename from sys-devel/gcc/gcc-12.1.1_p20220521.ebuild
rename to sys-devel/gcc/gcc-12.1.1_p20220528.ebuild
index b9019e18fc82..c6fdb7bcbf1d 100644
--- a/sys-devel/gcc/gcc-12.1.1_p20220521.ebuild
+++ b/sys-devel/gcc/gcc-12.1.1_p20220528.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PATCH_VER="5"
-PATCH_GCC_VER="12.0.0"
+PATCH_VER="6"
+PATCH_GCC_VER="12.1.0"
 MUSL_VER="4"
-MUSL_GCC_VER="12.0.0"
+MUSL_GCC_VER="12.1.0"
 
 inherit toolchain
 
@@ -18,7 +18,7 @@ inherit toolchain
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	toolchain_src_prepare
diff --git a/sys-devel/gcc/gcc-12.2.9999.ebuild b/sys-devel/gcc/gcc-12.2.9999.ebuild
index c03514a0890c..99622738e51d 100644
--- a/sys-devel/gcc/gcc-12.2.9999.ebuild
+++ b/sys-devel/gcc/gcc-12.2.9999.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=8
 
-PATCH_VER="5"
-PATCH_GCC_VER="12.0.0"
+PATCH_VER="6"
+PATCH_GCC_VER="12.1.0"
 MUSL_VER="4"
-MUSL_GCC_VER="12.0.0"
+MUSL_GCC_VER="12.1.0"
 
 if [[ $(ver_cut 3) == 9999 ]] ; then
 	MY_PV_2=$(ver_cut 2)
@@ -32,7 +32,7 @@ EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 # bug #830454
 RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
 DEPEND="${RDEPEND}"
-BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
 
 src_prepare() {
 	local p upstreamed_patches=(
diff --git a/sys-devel/gcc/gcc-9.4.1_p20220317.ebuild b/sys-devel/gcc/gcc-9.4.1_p20220317.ebuild
deleted file mode 100644
index 977d60836aef..000000000000
--- a/sys-devel/gcc/gcc-9.4.1_p20220317.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_GCC_VER="9.4.0"
-PATCH_VER="1"
-MUSL_VER="1"
-inherit toolchain
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.4.1_p20220520.ebuild b/sys-devel/gcc/gcc-9.4.1_p20220520.ebuild
deleted file mode 100644
index 893ff1d039b1..000000000000
--- a/sys-devel/gcc/gcc-9.4.1_p20220520.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCH_GCC_VER="9.4.0"
-PATCH_VER="1"
-MUSL_VER="1"
-
-# Cheesy hack for RCs
-MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
-MY_P=${PN}-${MY_PV}
-GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
-TOOLCHAIN_SET_S=no
-S="${WORKDIR}"/${MY_P}
-
-inherit toolchain
-
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.13 )
-	>=${CATEGORY}/binutils-2.20"
-
-if [[ ${CATEGORY} != cross-* ]] ; then
-	PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-fi
diff --git a/sys-devel/gcc/gcc-9.5.9999.ebuild b/sys-devel/gcc/gcc-9.5.0.ebuild
similarity index 88%
rename from sys-devel/gcc/gcc-9.5.9999.ebuild
rename to sys-devel/gcc/gcc-9.5.0.ebuild
index 471a68b351e1..e6b946217759 100644
--- a/sys-devel/gcc/gcc-9.5.9999.ebuild
+++ b/sys-devel/gcc/gcc-9.5.0.ebuild
@@ -23,7 +23,7 @@ inherit toolchain
 EGIT_BRANCH=releases/gcc-$(ver_cut 1)
 
 # Don't keyword live ebuilds
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 0044c919e16f..7146570126ba 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD lld-12.0.1.ebuild 1666 BLAKE2B fd1f8a4601c74d8507996e8804663812816c161ebf9351cd2fd262fb3cf1894013b3059800dd856bc0e896af7fc75b381bf353e1d22d43fe36d5859a2086b983 SHA512 6d1ba9cf7ab959da15975b4d1c3117f0a235618bfbf0bb743d73447105ab6672b25e839cadc34415b721c8755eb28abb2ddadb8c4793d3d7f4506f032e4d868b
 EBUILD lld-13.0.1.ebuild 1871 BLAKE2B b6acf1ff04dd34f58e6113c318d1dfd991f60df2dbcbe02ebf2cad37be07cf676b36113fec0d8d6c3752eb98ec9a459dc214a0f28a4244dacfdaf8ff762ea405 SHA512 c3991a3e337477cbefadd221fa3ee640abe21b6fb51521051e387fb29314ca8f0d83dff5bd35f93e01b80e05823527d6b20c8223f86be9d0d879dba9fbe9d055
 EBUILD lld-14.0.1.ebuild 1882 BLAKE2B a1368fef8cf1bf6d9992ee4e02dc1997c7146db0a58d084f304b1d1b9dddb7543c91165d50bfd314371ac320623318c0b9879814ab7757546510558f9ae1bd65 SHA512 71c8c4e7d54edf807f183eeda354dd264d883a69575a08bd8d2c493ca2665e591b4635563387348fa3957856d6413099c7b09c9877c5c1bd24795be2417c65c9
 EBUILD lld-14.0.3.ebuild 1888 BLAKE2B 9f1e293f57783d8950a3f15494f1063eb831f32e8b4b91eecbfc09e4d99fd322fe9d40f368ab9e7bd016cc55626d00d1c0666a47958a8c161854d79baacd61da SHA512 970885cdbeb7b14dd4ea979c2ff7713159ddaef8a6e576c911a3f7fb2818cfe745ff1c842804233cdba7508a4c8f402f0850052d1376ceefc205e287202a818a
+EBUILD lld-14.0.4.ebuild 1888 BLAKE2B 9f1e293f57783d8950a3f15494f1063eb831f32e8b4b91eecbfc09e4d99fd322fe9d40f368ab9e7bd016cc55626d00d1c0666a47958a8c161854d79baacd61da SHA512 970885cdbeb7b14dd4ea979c2ff7713159ddaef8a6e576c911a3f7fb2818cfe745ff1c842804233cdba7508a4c8f402f0850052d1376ceefc205e287202a818a
 EBUILD lld-15.0.0.9999.ebuild 1846 BLAKE2B 4178207264c3ca1328c4f160affa40e76ae232a3188eaa538ce3a5cfdabf82252e2b67bbbe311ac5ac9917bb2f046d2a6804b8510be08e1200cc795a2b7c46ac SHA512 2b875165bcd1c9814e47822120adc646dcdd739dfed5c9723d866be593d99c67fd1ee88f58a95ea0c7c593619913516f16b25ec94d60590e6928358f1f8cd5f5
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/lld/lld-14.0.4.ebuild b/sys-devel/lld/lld-14.0.4.ebuild
new file mode 100644
index 000000000000..461302a580e7
--- /dev/null
+++ b/sys-devel/lld/lld-14.0.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="The LLVM linker (link editor)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~sys-devel/llvm-${PV}
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	test? (
+		>=dev-util/cmake-3.16
+		$(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
+	)
+"
+
+LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
+LLVM_TEST_COMPONENTS=( llvm/utils/{lit,unittest} )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version -b "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	llvm.org_src_unpack
+
+	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
+	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
+	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
+	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
+	# to existent directory ${WORKDIR}/libunwind/include.
+	mkdir -p "${WORKDIR}/llvm" || die
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DLLVM_INCLUDE_TESTS=$(usex test)
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=ON
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-lld
+}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index b614f7f1445f..db0fc61927c9 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-common-12.0.1.ebuild 608 BLAKE2B e34ba1cdf1c8522f3622106a88a56dc7c6cd5bd227db31dd610d1879f39842052feec45235a197fe63f8834c8bb77a410632895746b448e50931abe31275b49d SHA512 83df951b72eb186aa705ffdc3b688df2d0bba4884f76c526e1ae4b4f7acf5afc4ec420038bdb89eed41938d84ed1feb52df8bcf4454fe9d72e5cdd0d48788253
 EBUILD llvm-common-13.0.1.ebuild 608 BLAKE2B 1dfa0b25955f1f044b9980fb80f9d38eb9732a15f9bc1b352a0e75b809ad6d43db16fde3718c569b9152bfbbe2b0f71b7f9ff5306d5ae4b57a380ba003c98c86 SHA512 0702b3222f9733532ddd115f37268713ec2ebbb187b6a02e3423c1e966e594373e38c3c6f6f8eda549afae52922a3decb3126850ca0861cc3d4c8e7c0bdc5921
 EBUILD llvm-common-14.0.1.ebuild 613 BLAKE2B 4d0308c12985232c155bf35c4ed1d596ffbb765f7672b31a11f8e0d6346984e3d1b3898c61707f2f38df571a45f4ee949fa6cc86b06f71d48c94dbdaff848dd0 SHA512 592449ee083f16a562028ab523ffe56291044f2e3f0e030b6f333da8353112cdca7fdacad58665db77cce50e9eef3c9f08ee7d28eaf19f7b485c4549ae60cb74
 EBUILD llvm-common-14.0.3.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
+EBUILD llvm-common-14.0.4.ebuild 608 BLAKE2B 020a3c91ad189fe674f9b5c24b22365b087b4875114dd8928d38f4ed0bbfaf4fcfab2a07f2154c70d9ad137ed41daf6eca5adbdb31802fb40218893898629fa5 SHA512 5fab7e184f76587ab37f878d8c6a103740c43e29c4b6c533da6856e8656ac49e297c885477f0b0e37efa49cf1f232f39a4084741405bb71acb8e6745c0edda33
 EBUILD llvm-common-15.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 MISC metadata.xml 217 BLAKE2B 23799663344acc2d532fc6fa7dd798813aef7293fcab616d6300b15a6e603b6d17ca63d5153eb8da1b976215d8e3775e8d3a67026bacc9693993d48ec1cb69a9 SHA512 e13d0436d3a3a449723277a37ae4c5a673139b6da818adf7ad7654d94d3948ed8607b1c27e83e963bf450bd2d5a650c985e27ff5a531db9813cb4ab10b985dd6
diff --git a/sys-devel/llvm-common/llvm-common-14.0.4.ebuild b/sys-devel/llvm-common/llvm-common-14.0.4.ebuild
new file mode 100644
index 000000000000..104c8747bbee
--- /dev/null
+++ b/sys-devel/llvm-common/llvm-common-14.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit llvm.org
+
+DESCRIPTION="Common files shared between multiple slots of LLVM"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+
+RDEPEND="
+	!sys-devel/llvm:0
+"
+
+LLVM_COMPONENTS=( llvm/utils/vim )
+llvm.org_set_globals
+
+src_install() {
+	insinto /usr/share/vim/vimfiles
+	doins -r */
+	# some users may find it useful
+	newdoc README README.vim
+	dodoc vimrc
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 11ac356f75bf..1f41dfbcdf95 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -2,18 +2,22 @@ DIST llvm-12.0.1-manpages.tar.bz2 191582 BLAKE2B a049cd305c257875d47e92d703c51ae
 DIST llvm-13.0.1-manpages.tar.bz2 202187 BLAKE2B 32a761426dbe4c3c355d30660254305cd88b6d513faee04c78e370cea9d38761108a9be4c4b4ac39b6a74400af1f9d37ffd11ab05acd7340175c8d66845ae7d9 SHA512 9495e1daf588540fdb8b9ee905a9b6be4693bd70b7f42c8e8a0d667242fc24dc853c45918d3bc09d02f0761ad61541bc9749c1498e312da129abdab638a0d572
 DIST llvm-14.0.1-manpages.tar.bz2 86273 BLAKE2B 174b412568565bdd4c3db34b1b2f2482a18ca45a0a6269ca381fe5c77da21b85dafabad29551b262d593006e9b68e6f7fdf43c2ec626204970d1280dd87a5f3d SHA512 49c58094eebecfadff97d62b4e6b0129e07c52ad7fe3ea4ce5c955e6fc9c73ac443b6a6e0f8322cf25e1d88b059c4231c4798d8da04340a46f6f84fb1b386f29
 DIST llvm-14.0.3-manpages.tar.bz2 217443 BLAKE2B ebea48d9015bb0b53e8b799d8d79ac7a8d03f55440e5d3a08a9ce6c8f106c3f37e597c46aaf824dfee87c222775630299a5c277b4b29d43e831116c12932675a SHA512 db762ff7bfde28147276cacb5c5753a1bb4dd08dc8840423d6fc073629cd97bc3c7f54402cb17aa00cfc06f9f775f7ac9478c2661cacf86d5517a968d290beb3
+DIST llvm-14.0.4-manpages.tar.bz2 214161 BLAKE2B 9e8a0a78cce26b0e5235750a2af99542a496d34726046fbfa3274a22a55a75b3210c4af49e768130515c636ae3d6350f909ccb601888c276ce8cbd6b029b7172 SHA512 793dcbac320d26d26c637f2d38de0a55f5a91d13c93fa1aa2753103a07720248ffc16e8f1914ce81e8c291f02797360c052c23b027d773ac05a5563744313828
 DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841ac5bcaeb927538cc7de27683167111a17d6496677c7517de2ecfaf14b5d8ac22bad357be490b8a2ed9aba502fd5f447ecc99e9 SHA512 fc7c38e671555751650299c3a8bee44d5c7f26e11b68d5538c507fb7fe9ff2d349bdcd43bce90a448a747f082d523b3849d6bcda5e3ae2e998edcb926d6aa249
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc248c00ff6778f1a14e3e7999e5d52a1b0b9c3b2e66e8c008e27c62c6c3c08009dc7d9d083ca53698138258ac972e4ad03c042 SHA512 a9f071ad0a792f558105a64790f9e470d8aaed05bd1baabbe86539760c881f772602a03265e0962d8599f991f7fd44d14a49e2ef9d74bb5eb283f473f4084d32
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
+DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-9999-r3.tar.xz 4076 BLAKE2B 30bdf740606a1718ae45d850803385d425b656fbbe0250f587cad54f55272e3617d5ee0d04f534a58f87408b0a2dea322ebf1bb8cd653a2beba21d0bc5778c62 SHA512 2c7080ffd09d7dcf4c72a97044a5c63ab895250721d60270bc51c2095aef5f9039781892b4c0d14e942611686153f874a1f52a1c854bb8ca093383c08bdc005a
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-12.0.1.ebuild 12606 BLAKE2B 58c112a32620c890d2c7d88d8d6d8fcac961adad27033d23bb78b3b2e68497fddb9c0be1400c318ccc95a0d54a4aedaee1130fa45a389a98b2c00d29cfe60905 SHA512 283685e0186ccf6bcf40ce96165fe6ff52fdeed156da4d87f760c9c4ed5dffdee143a72363e133941898b2ebe5ef78359051b7af4bf138620cb207a19beae9b2
 EBUILD llvm-13.0.1.ebuild 12267 BLAKE2B 9b2988880763c9ad0edcf0cd61652fd866e76f14a561db8f47970ec5eee7b01d984f700aa3cc422f47a122995c2b25dc5ca2cb79c9fb4d48a2805323036ff05c SHA512 e9afe8133e23f82018b61d8959ce517cc905ba24e26c2faec6ccc32bf003f472d8129ce2b389a812ec96421c488057b2f05c73573fd876d3f56a984a641c124f
 EBUILD llvm-14.0.1.ebuild 12450 BLAKE2B 19cea0b68ff0f129e5041d1fbf5ac8f38a58a5e9560e2370407c119c12213b877fde4935e32d678b75da07e3e3e9193a9328eafda0844fc6fd38d1a6d487b6f5 SHA512 9ced55daaf16489310c62b0ce5925805dabdd63c57dba1ad904a47af820748f85a24f16131929d250fb18a95ff94aa6b77f10eaba36905be0cb515746238eaf2
 EBUILD llvm-14.0.3.ebuild 12489 BLAKE2B f50fb35a8ab46b1e705c5df288973951eddb1719d14c5539830e12bd8a1b2ff167fc190ca2b2915eaba19f6e9dfdc4a0971dfc8e83bb837d66a1c4eb2fca40b8 SHA512 b267e3f2d28b95312c237c99dd9cd73f0afcfa086b137062dc24c4e3d0c42e65ac19bdd6f2879211e887f75240cb7a548460d3eb4933ee9f9dda773595575388
+EBUILD llvm-14.0.4.ebuild 12638 BLAKE2B ab6163240f1a212c43a4c4fdb148c7e5885f5bda7a3fb7189e04df28d5d449188de62c7c1c511225614fe596faa082e471f76e76751272247c95e6bf33072ba8 SHA512 2b50c81bbdd333c5842a04d0c9526e8c842ca7b1b88f8622742fab9689ea84d724690fbadb5aa8d37a0871c7f581042ba68131458b96b22da2e312734d147828
 EBUILD llvm-15.0.0.9999.ebuild 12396 BLAKE2B 2c57ee5432a75fabd8f070cc46626a06f66f26ca85a6af7914a0963c10975f931d41b25868d200f1092f1dcb179b9f046fda7212d83060fb038a71da66c275ba SHA512 48268befa41ac11590ef54378c893b569984dca2af8e62cf62429518cf8b7b4f6bde304d3a3d3841f8515afafddaefa1fe835dd34849845b41d9564e037ec88b
 MISC metadata.xml 2625 BLAKE2B 1017e4672b3ccd5a4f83d9df6a9db3661f548da9d75ad2c5b63e9843bfd737ff1fb64624678704f632544ac403efd8dbb35a006542023153733a6d4037b7245d SHA512 130444ec537891dc43754057c5a68666f52cb2959f351ee5be076ed41e39d49d8fafa2d0dca78d1a751b3a3190db81910b4472e75f9bad571ae42da51a5b25dd
diff --git a/sys-devel/llvm/llvm-14.0.4.ebuild b/sys-devel/llvm/llvm-14.0.4.ebuild
new file mode 100644
index 000000000000..164c0299aa8e
--- /dev/null
+++ b/sys-devel/llvm/llvm-14.0.4.ebuild
@@ -0,0 +1,530 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
+	toolchain-funcs
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="https://llvm.org/"
+
+# Additional licenses:
+# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
+# 2. xxhash: BSD.
+# 3. MD5 code: public-domain.
+# 4. ConvertUTF.h: TODO.
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
+	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
+	exegesis? ( dev-libs/libpfm:= )
+	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+	xar? ( app-arch/xar )
+	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	binutils-plugin? ( sys-libs/binutils-libs )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	>=dev-util/cmake-3.16
+	sys-devel/gnuconfig
+	kernel_Darwin? (
+		<sys-libs/libcxx-$(ver_cut 1-3).9999
+		>=sys-devel/binutils-apple-5.1
+	)
+	doc? ( $(python_gen_any_dep '
+		dev-python/recommonmark[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	libffi? ( virtual/pkgconfig )
+	test? (
+		sys-apps/which
+	)
+"
+# There are no file collisions between these versions but having :0
+# installed means llvm-config there will take precedence.
+RDEPEND="
+	${RDEPEND}
+	!sys-devel/llvm:0
+"
+PDEPEND="
+	sys-devel/llvm-common
+	binutils-plugin? ( >=sys-devel/llvmgold-${SLOT} )
+"
+
+LLVM_COMPONENTS=( llvm cmake third-party )
+LLVM_MANPAGES=pregenerated
+LLVM_PATCHSET=${PV}
+LLVM_USE_TARGETS=provide
+llvm.org_set_globals
+
+python_check_deps() {
+	use doc || return 0
+
+	has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+check_live_ebuild() {
+	local prod_targets=(
+		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
+			| tail -n +2 | head -n -1)
+	)
+	local all_targets=(
+		lib/Target/*/
+	)
+	all_targets=( "${all_targets[@]#lib/Target/}" )
+	all_targets=( "${all_targets[@]%/}" )
+
+	local exp_targets=() i
+	for i in "${all_targets[@]}"; do
+		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
+	done
+
+	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
+		eqawarn "Expected: ${exp_targets[*]}"
+		eqawarn
+	fi
+
+	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
+		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
+		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
+		eqawarn "Expected: ${prod_targets[*]}"
+	fi
+}
+
+check_distribution_components() {
+	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
+		local all_targets=() my_targets=() l
+		cd "${BUILD_DIR}" || die
+
+		while read -r l; do
+			if [[ ${l} == install-*-stripped:* ]]; then
+				l=${l#install-}
+				l=${l%%-stripped*}
+
+				case ${l} in
+					# shared libs
+					LLVM|LLVMgold)
+						;;
+					# TableGen lib + deps
+					LLVMDemangle|LLVMSupport|LLVMTableGen)
+						;;
+					# static libs
+					LLVM*)
+						continue
+						;;
+					# meta-targets
+					distribution|llvm-libraries)
+						continue
+						;;
+					# used only w/ USE=doc
+					docs-llvm-html)
+						use doc || continue
+						;;
+				esac
+
+				all_targets+=( "${l}" )
+			fi
+		done < <(ninja -t targets all)
+
+		while read -r l; do
+			my_targets+=( "${l}" )
+		done < <(get_distribution_components $"\n")
+
+		local add=() remove=()
+		for l in "${all_targets[@]}"; do
+			if ! has "${l}" "${my_targets[@]}"; then
+				add+=( "${l}" )
+			fi
+		done
+		for l in "${my_targets[@]}"; do
+			if ! has "${l}" "${all_targets[@]}"; then
+				remove+=( "${l}" )
+			fi
+		done
+
+		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
+			eqawarn "get_distribution_components() is outdated!"
+			eqawarn "   Add: ${add[*]}"
+			eqawarn "Remove: ${remove[*]}"
+		fi
+		cd - >/dev/null || die
+	fi
+}
+
+src_prepare() {
+	# disable use of SDK on OSX, bug #568758
+	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
+
+	# Update config.guess to support more systems
+	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
+
+	# Verify that the live ebuild is up-to-date
+	check_live_ebuild
+
+	llvm.org_src_prepare
+
+	# remove regressing test
+	# https://github.com/llvm/llvm-project/issues/55761
+	rm test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll || die
+}
+
+# Is LLVM being linked against libc++?
+is_libcxx_linked() {
+	local code='#include <ciso646>
+#if defined(_LIBCPP_VERSION)
+	HAVE_LIBCXX
+#endif
+'
+	local out=$($(tc-getCXX) ${CXXFLAGS} ${CPPFLAGS} -x c++ -E -P - <<<"${code}") || return 1
+
+	[[ ${out} == *HAVE_LIBCXX* ]]
+}
+
+get_distribution_components() {
+	local sep=${1-;}
+
+	local out=(
+		# shared libs
+		LLVM
+		LTO
+		Remarks
+
+		# tools
+		llvm-config
+
+		# common stuff
+		cmake-exports
+		llvm-headers
+
+		# libraries needed for clang-tblgen
+		LLVMDemangle
+		LLVMSupport
+		LLVMTableGen
+	)
+
+	if multilib_is_native_abi; then
+		out+=(
+			# utilities
+			llvm-tblgen
+			FileCheck
+			llvm-PerfectShuffle
+			count
+			not
+			yaml-bench
+
+			# tools
+			bugpoint
+			dsymutil
+			llc
+			lli
+			lli-child-target
+			llvm-addr2line
+			llvm-ar
+			llvm-as
+			llvm-bcanalyzer
+			llvm-bitcode-strip
+			llvm-c-test
+			llvm-cat
+			llvm-cfi-verify
+			llvm-config
+			llvm-cov
+			llvm-cvtres
+			llvm-cxxdump
+			llvm-cxxfilt
+			llvm-cxxmap
+			llvm-debuginfod-find
+			llvm-diff
+			llvm-dis
+			llvm-dlltool
+			llvm-dwarfdump
+			llvm-dwp
+			llvm-exegesis
+			llvm-extract
+			llvm-gsymutil
+			llvm-ifs
+			llvm-install-name-tool
+			llvm-jitlink
+			llvm-jitlink-executor
+			llvm-lib
+			llvm-libtool-darwin
+			llvm-link
+			llvm-lipo
+			llvm-lto
+			llvm-lto2
+			llvm-mc
+			llvm-mca
+			llvm-ml
+			llvm-modextract
+			llvm-mt
+			llvm-nm
+			llvm-objcopy
+			llvm-objdump
+			llvm-opt-report
+			llvm-otool
+			llvm-pdbutil
+			llvm-profdata
+			llvm-profgen
+			llvm-ranlib
+			llvm-rc
+			llvm-readelf
+			llvm-readobj
+			llvm-reduce
+			llvm-rtdyld
+			llvm-sim
+			llvm-size
+			llvm-split
+			llvm-stress
+			llvm-strings
+			llvm-strip
+			llvm-symbolizer
+			llvm-tapi-diff
+			llvm-tli-checker
+			llvm-undname
+			llvm-windres
+			llvm-xray
+			obj2yaml
+			opt
+			sancov
+			sanstats
+			split-file
+			verify-uselistorder
+			yaml2obj
+
+			# python modules
+			opt-viewer
+		)
+
+		if llvm_are_manpages_built; then
+			out+=(
+				# manpages
+				docs-dsymutil-man
+				docs-llvm-dwarfdump-man
+				docs-llvm-man
+			)
+		fi
+		use doc && out+=(
+			docs-llvm-html
+		)
+
+		use binutils-plugin && out+=(
+			LLVMgold
+		)
+	fi
+
+	printf "%s${sep}" "${out[@]}"
+}
+
+multilib_src_configure() {
+	local ffi_cflags ffi_ldflags
+	if use libffi; then
+		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		# disable appending VCS revision to the version to improve
+		# direct cache hit ratio
+		-DLLVM_APPEND_VC_REV=OFF
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DBUILD_SHARED_LIBS=OFF
+		-DLLVM_BUILD_LLVM_DYLIB=ON
+		-DLLVM_LINK_LLVM_DYLIB=ON
+		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
+
+		# cheap hack: LLVM combines both anyway, and the only difference
+		# is that the former list is explicitly verified at cmake time
+		-DLLVM_TARGETS_TO_BUILD=""
+		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
+		-DLLVM_BUILD_TESTS=$(usex test)
+
+		-DLLVM_ENABLE_FFI=$(usex libffi)
+		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+		-DLLVM_ENABLE_LIBXML2=$(usex xml)
+		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
+		-DLLVM_ENABLE_EH=ON
+		-DLLVM_ENABLE_RTTI=ON
+		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
+
+		-DLLVM_HOST_TRIPLE="${CHOST}"
+
+		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+		# used only for llvm-objdump tool
+		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+
+		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
+		-DOCAMLFIND=NO
+	)
+
+	if is_libcxx_linked; then
+		# Smart hack: alter version suffix -> SOVERSION when linking
+		# against libc++. This way we won't end up mixing LLVM libc++
+		# libraries with libstdc++ clang, and the other way around.
+		mycmakeargs+=(
+			-DLLVM_VERSION_SUFFIX="libcxx"
+			-DLLVM_ENABLE_LIBCXX=ON
+		)
+	fi
+
+#	Note: go bindings have no CMake rules at the moment
+#	but let's kill the check in case they are introduced
+#	if ! multilib_is_native_abi || ! use go; then
+		mycmakeargs+=(
+			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+		)
+#	fi
+
+	use test && mycmakeargs+=(
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
+	)
+
+	if multilib_is_native_abi; then
+		local build_docs=OFF
+		if llvm_are_manpages_built; then
+			build_docs=ON
+			mycmakeargs+=(
+				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+				-DSPHINX_WARNINGS_AS_ERRORS=OFF
+			)
+		fi
+
+		mycmakeargs+=(
+			-DLLVM_BUILD_DOCS=${build_docs}
+			-DLLVM_ENABLE_OCAMLDOC=OFF
+			-DLLVM_ENABLE_SPHINX=${build_docs}
+			-DLLVM_ENABLE_DOXYGEN=OFF
+			-DLLVM_INSTALL_UTILS=ON
+		)
+		use binutils-plugin && mycmakeargs+=(
+			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+		)
+	fi
+
+	if tc-is-cross-compiler; then
+		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
+		[[ -x "${tblgen}" ]] \
+			|| die "${tblgen} not found or usable"
+		mycmakeargs+=(
+			-DCMAKE_CROSSCOMPILING=ON
+			-DLLVM_TABLEGEN="${tblgen}"
+		)
+	fi
+
+	# workaround BMI bug in gcc-7 (fixed in 7.4)
+	# https://bugs.gentoo.org/649880
+	# apply only to x86, https://bugs.gentoo.org/650506
+	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
+			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
+	then
+		local CFLAGS="${CFLAGS} -mno-bmi"
+		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
+	fi
+
+	# LLVM can have very high memory consumption while linking,
+	# exhausting the limit on 32-bit linker executable
+	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
+
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+	cmake_src_configure
+
+	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=$(ver_cut 1)$" \
+			CMakeCache.txt ||
+		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
+	multilib_is_native_abi && check_distribution_components
+}
+
+multilib_src_compile() {
+	cmake_build distribution
+
+	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+	pax-mark m "${BUILD_DIR}"/bin/lli
+	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+	if use test; then
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+	fi
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check
+}
+
+src_install() {
+	local MULTILIB_CHOST_TOOLS=(
+		/usr/lib/llvm/${SLOT}/bin/llvm-config
+	)
+
+	local MULTILIB_WRAPPED_HEADERS=(
+		/usr/include/llvm/Config/llvm-config.h
+	)
+
+	local LLVM_LDPATHS=()
+	multilib-minimal_src_install
+
+	# move wrapped headers back
+	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${SLOT}/include || die
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-distribution
+
+	# move headers to /usr/include for wrapping
+	rm -rf "${ED}"/usr/include || die
+	mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die
+
+	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
+}
+
+multilib_src_install_all() {
+	local revord=$(( 9999 - ${SLOT} ))
+	newenvd - "60llvm-${revord}" <<-_EOF_
+		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		# we need to duplicate it in ROOTPATH for Portage to respect...
+		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
+		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
+		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
+	_EOF_
+
+	docompress "/usr/lib/llvm/${SLOT}/share/man"
+	llvm_install_manpages
+}
+
+pkg_postinst() {
+	elog "You can find additional opt-viewer utility scripts in:"
+	elog "  ${EROOT}/usr/lib/llvm/${SLOT}/share/opt-viewer"
+	elog "To use these scripts, you will need Python along with the following"
+	elog "packages:"
+	elog "  dev-python/pygments (for opt-viewer)"
+	elog "  dev-python/pyyaml (for all of them)"
+}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0c54ddfabd92..8de97e15ba0a 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 478b1284af46..3095ebdb853d 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,5 +1,7 @@
 AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc
 DIST bees-0.6.5.tar.gz 125987 BLAKE2B 459cec5f3c706045ee12a6efe2e32315d71ca16c966bbdb4d6c813f726a7cc411cf4bd272c082ba0bbfc33e9ec4c715a6be773ba929c2b5b31f1731e10ad137c SHA512 db4cf6bc8c7709ee9aa1e2faa2ac1c6323fb8c7407470cec0c370a0f910ec4a1f3cf6ebe695d16383aaec00b62b3de77aa5bbdd47502bdb564e247b3b8879e0b
+DIST bees-0.7.tar.gz 164311 BLAKE2B b0b7f1bc24257e385b6201f473bf9377021d542a257b341c5c8ba5372fa604697e717bb65329d57abf2d2ac4311325e3242c481430629c911fcee3e42e1ea55e SHA512 beee7563ae0ea43247465941ef15f7bab2d86d5d164ccb280c378678b0bf61a67a4718881b94a5f3a72d4d0296eda92bfd7464dae0faeaa72b0e2a4ebef39a53
 EBUILD bees-0.6.5-r1.ebuild 3403 BLAKE2B 751cfa80fbe49cab4eab2b3071c936ad589c93cbf373d82458375a2995a1d9e64be72bd1b1ca1bc17325778753ac8455d3d33eb7d40fd709fe5860b96af18bc6 SHA512 49bcf89cd12b0d11617c8d4f88287fa318afeed13ad92408908b6e019513e4403a69e434b72fd0955363eb85d001d0ef8dfee199e2803f2a9977cb52e5977465
+EBUILD bees-0.7.ebuild 3217 BLAKE2B 077a8c4697ef966cef8f6d0c6c47fed0495a2f9efd600308884b86390796af3ae46f96c46831752e326073c4c68e896fae192863083bf33be728f403475d57a6 SHA512 8835095a1acb44d75ac5e4d1e93117fe1ec61a682058ca488f6b2a09901a914d0beb805561d9aa8dbc8d935262e1df507adf243b6ae794dc488266180149b7a5
 EBUILD bees-9999.ebuild 3217 BLAKE2B f91c2f9529d2afb81a1b1f5634d8975bc54f75e27a13b86cd03888be6c9deb573d98d5cabff450c9faf385e1c04e4b9e4c4b92f0f4f398e6927633b61f48e1a5 SHA512 67096a3444e35be517e9001698466c763fb8668f56532edc2340bc1175c7259ec1eb7c5acbca941214dadd74cb865efe0280cc06c601ddab714206f7c8046dc3
 MISC metadata.xml 622 BLAKE2B fc27438101691a12742484547df8b94fc3d22822cc3aefe81468e435a917373c25c5736506bfa2cf637bc265a3686c7f03d7431eaf54e5405f7ad2738390e872 SHA512 382ea31887a310f375bed14aa88d433831964b080faf3c7fb209a0d73b1d0d3da38a8e222ceda267b4ada4e81fa36cad94d4ddf180e7a2f39dfe3e9439b60321
diff --git a/sys-fs/bees/bees-0.7.ebuild b/sys-fs/bees/bees-0.7.ebuild
new file mode 100644
index 000000000000..a37916aa1764
--- /dev/null
+++ b/sys-fs/bees/bees-0.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
+HOMEPAGE="https://github.com/Zygo/bees"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+else
+	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="tools"
+
+DEPEND="
+	>=sys-apps/util-linux-2.30.2
+	>=sys-fs/btrfs-progs-4.20.2
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~BTRFS_FS"
+ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt 4 11; then
+			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
+			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
+			ewarn "running, it's recommended to run at least kernel 4.11."
+			ewarn
+		elif kernel_is -lt 4 14 29; then
+			ewarn "With kernel versions below 4.14.29, bees may generate a lot of bogus WARN_ON()"
+			ewarn "messages in the kernel log. These messages can be ignored and this is fixed"
+			ewarn "with more recent kernels:"
+			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
+			ewarn
+		fi
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+		if kernel_is -lt 5 3 4; then
+			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+
+		elog "Bees recommends running the latest current kernel for performance and"
+		elog "reliability reasons, see README.md."
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
+src_configure() {
+	tc-export CC CXX AR
+	cat >localconf <<-EOF || die
+		ETC_PREFIX="${EPREFIX}/etc"
+		LIBEXEC_PREFIX="${EPREFIX}/usr/libexec"
+		PREFIX="${EPREFIX}/usr"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
+		DEFAULT_MAKE_TARGET=all
+	EOF
+	if [[ ${PV} != "9999" ]] ; then
+		echo BEES_VERSION=v${PV} >>localconf || die
+	fi
+	if use tools; then
+		echo OPTIONAL_INSTALL_TARGETS=install_tools >>localconf || die
+	fi
+}
+
+src_compile() {
+	default
+	# localconf quotes leak in the systemd unit but are still needed for spaces
+	sed -i 's/"//g' scripts/beesd@.service || die
+}
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 472cc21e95f3..46505594208b 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
+DIST f2fs-tools-1.15.0.tar.gz 387663 BLAKE2B 1e55f87c839cee6431d9a83e9786201e9b6b872be27c8b92854b30b0fd1c651a9b7235ce93e70c530bfa7a4e9f4dfd309c72702b3338a4aa96e365b29424fb1d SHA512 61e40f16296091b55cec2dbdc6306af6abc2d3f854f39ef03a741b7f6f47348f915498375789f017f8da27fa7d27c79c905dd047693518adde503ea7ebf89387
 EBUILD f2fs-tools-1.14.0.ebuild 837 BLAKE2B 2ea6e841526daf9f2bb0ab59edd35e60d811b4b57af64053046c8590ce3f0dedd093c58ac88ed2db1b6d192364589385817c6f37b4d4ae5ac297d5dbb6dade21 SHA512 3eefc0bccc21238919659c197a6083097711e4c2f77dc8d0914b542782be4a54e816a7f986d2fa214b160779bc94568fd957571c3ea0cf170a7c61713714459c
+EBUILD f2fs-tools-1.15.0.ebuild 858 BLAKE2B 38d592734707b89008aea86847cbc5ee35defc6ddacbeeb33b99b755bc70f679d59d333a4c1ef40383e72cf72ac5fbe7aeb900fb0063f5d11fc457a2d2d249b5 SHA512 ea4a2f01496e3dba4ce7c2f60b32f1f4cf4a801623508ae7e6c4a6b6e584baf0586c254b4e24e2fa1640256d881bfc31ad26cbd138cb50913b8b4771541ca5d3
 MISC metadata.xml 439 BLAKE2B c7c467cc754472343e7e4473b79e8a70ed5f2f34c94292db772c93ce8018373dd8fa2ffadb26c93febece4c5b5faa1e7eb1338dbd7f516c208f1e2e17bfea82f SHA512 8045798ff0308394ee5cdc172e13776291089d63769007d2b5c13a4d50f27fa1a1fec3eda3642cadd068d91780788d0d504faa6a17e754521d3f7e02934eb41b
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
new file mode 100644
index 000000000000..5cda3fe17880
--- /dev/null
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.15.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/9"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="selinux"
+
+RDEPEND="
+	selinux? ( sys-libs/libselinux )
+	elibc_musl? ( sys-libs/queue-standalone )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	#This is required to install to /sbin, bug #481110
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--disable-static \
+		$(use_with selinux)
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index c172562f1d9a..7070ea8be0cd 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,3 +1,3 @@
-DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
-EBUILD ntfs3g-2021.8.22-r4.ebuild 2006 BLAKE2B e54935c6dcc13a41288cb2be1dbfc336155e26ded05ad214e41bca121e0a17267305937b1acdb7afd78cebca89256b3905d2159f2fcae660dc4536801efbb77a SHA512 93e0aba291e03cf385cf615fb4fa41a9b94fcf848082dcff405644ebacb5e3db7050b6b5836ba984a0997dd6c4cb52a8d05d582c95e5cf2b9ceba4239c917f55
+DIST ntfs-3g_ntfsprogs-2022.5.17.tgz 1318476 BLAKE2B 0f3d5b3ca6186886b1a4f1fc59242a1f4ccdc842cbe53b0869f707c1dbebdd58058d40b265dae663b71a2a611f7ce5392c63afa3053dc075155759c10499d529 SHA512 25e6d3412958576b0cd614f5d93201c0d7e8bbee78fbaf956718a3825c1435b3f0c3631ea1cc60b5b1be6e9ae7d58c0c03b0bebb69edee3bf181a966734336df
+EBUILD ntfs3g-2022.5.17.ebuild 2006 BLAKE2B 44312725439784318f5f4bee38f610668068633b0675146c7d7a34922dc9e6f51ec9c1fa1ce898d874eb4affb7577a3cc540505a9b498dfa401ed10e9842181f SHA512 d65b6c6adb5894c52945ff3bd4f177247d09e54172b1f8fb7d35e317b8a6ea33fd2c12a9d6cb9da1077d60df76315f7a2232868fd6f8cf7120859e165171a471
 MISC metadata.xml 1164 BLAKE2B 276dcf2d0cccad4b91a84390949ff8a81b76e54c22d7bfbe4b778c97917224f3d0603079fb74e4b3ff0e058580f4ac6540aef3bae4fdc6ae9b2fb54b831e22ea SHA512 63391014c4dc8ba722c8f90d6fe1952b5f4386d44b1bb2af195e907e5027ede0f4063e4390679b6b521b892fcc12194914b4f40a09c6bc08a300a90bdd250390
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild b/sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild
similarity index 99%
rename from sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild
rename to sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild
index ed009c764089..63ccf4800e83 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22-r4.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2022.5.17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2006-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index bdcf0ad463f0..bc915816b50e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,6 +5,6 @@ DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6d
 DIST systemd-stable-249.9.tar.gz 10613893 BLAKE2B fc7a14fa3b0cc3d05fa9f20fde2efedd3ef0f011d9dce53b0a418994b4257cf753b228cf98f749fb2028d81db55ef30a6e3d9b138d86239cad4fc730d845f9e2 SHA512 ce57bc6c522082e55649fc1886c4dc818c89607e175df2c92feffe288dbd38757f36b30abeebe153f5be6b664a49d729405040a952473cb2133a2e39cf9cc164
 EBUILD udev-249.6-r2.ebuild 7917 BLAKE2B 8b48f9aa00ca2eddd0aa921d4adda3e8e506d0a895753ca9e6c64037f3cefb7b0a65c62e370a9064e3f2668524e21ac89bec18907b7e575cdab16791ca997726 SHA512 238b0daa2283b89b0b6c970e53c677073b851c1672fea1734393cd00e7a30af6ac0084583f41af733cf848101a3c091b1d0cfaff375d9a4910896177100fab0f
 EBUILD udev-249.9.ebuild 7967 BLAKE2B a614c5ca69ad160379683911434291bb6ffa8e1ff57d965e33564a1d8f8ee3093af5ea59c5fc393faa0c352d275b3025f14a6ff557d55aa22d377f4e2642ebb4 SHA512 e78178c206def095cd392c5952b74cc3f4d869cc8683dc8ee6fb09a188d8c3cda370a968113a3ea9a89591ff729e622acabefd78574703caf0ff29cc568a05ee
-EBUILD udev-250.ebuild 418 BLAKE2B 2eaf0219c33be1eed4c4e9117130a9e1058c503f7c25f610e29461128a6bc39790910339c0a265dc4476a59e2a4aa2a7601ff9badbacf7f0e52b2e147d0a945b SHA512 017a8bd1f702ec6df58b1ed16121a0120b10bd0f636e62cc3bbf7a2376e3912545f31e815a7c6b0da9acbb487430237a6ca669bed58de15dfed58aab63af87e6
+EBUILD udev-250.ebuild 417 BLAKE2B e2e680f56738c9f9fde3a86375b0dc1f55d04d3a28847f7dd352061aa6da2bf05c20a953e6eadaa367d08e62d5ef3e2798ab5025c9497074d7f806a9c6e12ba6 SHA512 eb529f739feff8583b41aabafa30784538b408981cf1bd27ae7d5f0fb2d8f15b8f35f41badca6e46a20c67809b39ebfbd268e27a5b91c0bafc9daeb02e70b307
 EBUILD udev-9999.ebuild 7921 BLAKE2B 6005fae7b9012a23f0a6c398d0381f725bf9afdb7469397ba887b37b290f3686c0f6dd5f9925b221d3d3fc333efd37fe5fa7d069c0635c1eb630ce78903b9ccc SHA512 8d55530628495ff6566575d0942380db6512cf307d74141c3af8a1738b30d8f34a20fc1d56161779a5654045929984d76b233aa499ac5e583ef93bc5c69ccdfc
 MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e
diff --git a/sys-fs/udev/udev-250.ebuild b/sys-fs/udev/udev-250.ebuild
index 0a984b4284a1..6e26d2464aed 100644
--- a/sys-fs/udev/udev-250.ebuild
+++ b/sys-fs/udev/udev-250.ebuild
@@ -10,6 +10,6 @@ HOMEPAGE="https://systemd.io/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="sys-apps/systemd-utils[udev,${MULTILIB_USEDEP}]"
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index c9d5742438e2..0848732b9ce3 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 97a7d11f1e75..2413fa3b8284 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -4,11 +4,14 @@ AUX 055-fix-base-do-not-quote-initargs-for-switch_root.patch 1095 BLAKE2B 35e2fb
 AUX 055-fix-crypt-remove-quotes-from-cryptsetupopts.patch 1404 BLAKE2B 4956f8df0b76c204279032fdf545f230f063fd7ea5393e3ade80587e10eb50dfba2e0677da04e641da17d1ce79564b3084274c739b3af59dab2226852b0835b2 SHA512 11243e311aeae6b9f1b6481521a92e4fd962e5fd24b1bd279e04f1f1618ba4ae0c4243d94274dda8e16d0311c377e0fbf2bae5c64c508e29caaf64d123c365a3
 AUX 055-fix-usrmount-do-not-empty-_dev-variable.patch 1358 BLAKE2B 9a0b5e698884eb4e333ff3d519245bbe7bb909247ff999edac7bfce4b37a384f7b6ab7d0a4ffc14d638c46b137430d44d50de41193f46ba799b070bd2031e138 SHA512 1d9d01a6df6c0d9e77e2b0e4ca0881e33abbf3430817416660122960575d428f832a64c6925a2588d56bd042a32a2a68da7cf173f62b4cd23e12ea2e1b49d588
 AUX 055-tpm2-tss-typo.patch 836 BLAKE2B 8a6382a9b979e23e54e4160e6492bfc588520b859b6305d7dca196ef22703229b2a95819e85f82ed8b5ed98408a8f154b2e9bd13878c41f01b91d2395dd83a56 SHA512 593093a63df073bd1f22d8f4242496fab9e13b74ac470123101ddbf9a781c1ad5c8edade5a2d8691b6708ff7d4f5b773f4a6beb7c100bc7683240ccd3ea0b10f
+AUX 056-musl.patch 845 BLAKE2B 5609cc74225907c90e2945a380b56720891e9fac1ffaa627ce58408bf2860a83e5a176e85d84cca994d1928730a1cf189dabe002d30c90e6764891590624df0e SHA512 d877c22078f2deed382002cdfb116f3985e65961cbd4c3e24f0f2c1696fbfdf7ecb5ccaab38e82659bc6037d44e24996bfb8b5d89cf7bc36bc46f8bbd495ed06
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a
 DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
 DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
+DIST dracut-056.tar.xz 384196 BLAKE2B e3e4fa3024b401cc954ba6069c54e95912691ff68a838e3c43bfc6a5b284bdee1669c782b30503c0246b7146c545ee8825febefcff93bae76ec46067cb7b87e1 SHA512 19268763e128984d20cab766bbdf2de12fe534ce2562fc688203099ef9b4cf83d0ccd2129499c70cdc6dd4ad53f0ffc2f3378eff5b8a15fda27c23b20f903df2
 EBUILD dracut-053-r1.ebuild 4521 BLAKE2B bfd4df6329b2d0bfc7178dbd7a31194d10a89613aa71bd5233e13638a1f2c6b67d3bc96b9299bd0dd70695749532435640e76097bc51911ad434389636a38202 SHA512 70a9f084a8b163481aeca5a5610c0553c1634de083cf7fd2c5ea014989e32ad624c2f212bd57f5f60c51dd67dbcfec2e749b4b0ed69150b9c5cc4aa828bb74bd
 EBUILD dracut-055-r4.ebuild 5089 BLAKE2B bcdf9a840712e55d4044149e4a7765f6e2e860c763fdc81772d1b5afc68aeab2362314fe8080f5efaee2b101d8063f062868d7c5db29f1080826fb1bbae79f8d SHA512 eb602e5efba982c7b4284e6e84d25b25ea9586d29e02858f819b3d8b6dee3e9766ee4b8ae00b895de898c9f021c7a7be459c3750ec5d355a3c6bc37a395c87ca
-EBUILD dracut-9999.ebuild 4799 BLAKE2B 8ac60db4d292f4b3d67fca97caf3d2665b65f7ad0a6b67af483032c99f2b3b746a6b19cda039333abacb0eb84da2e608d2b152b843d3e0076b6e8411ce625e2b SHA512 007993d8c8bc6fcb703ca575de111f1a5a9613a32a6abafa4db2c2be97abc09e58ef02146c04791921ab107a3ec560bcea9c23e4e41d5c347201eceaf53cbec4
+EBUILD dracut-056.ebuild 4842 BLAKE2B 2951edde97ac637ccb936f039ead56d25afee2379917718dd1afa2c22c2517de53135441e707464aaf8ace2786601b93970e21b8b5e572a7fe40ce06fa024846 SHA512 7c56b8dc1a337dd742bfc50b0d68f897d96728d8ef10121e0fc49b767d72d2b65b6d0b236451d8bb267742b09d73890ef42b43c2aaeccc54a6df4b0c0432e67d
+EBUILD dracut-9999.ebuild 4812 BLAKE2B e43b1226e398b677a8f3db80acc05b69dbbb56c1d04ea78cfa031e070d7020621654ee5a1d79ce949ddfccd05df0e1337f975cbcdd3df5ee996e8bb7407fdf24 SHA512 f5c6c58d1ad4bd94cb7f16722b4078c92d8f95018602adda301dc6705bc1074d8923164cae3501065bbe191760a7f1e895fa77cd109cba5d218a05a663a49ef7
 MISC metadata.xml 479 BLAKE2B 76b6d6da8d9ee65fac81f1a30999f3a095a9cbd8c91fbee63edaad61c0a429d5ba43f18979e10cd73ba6a87d89213397a9ee6621f61168c1bd461bb866c4f02b SHA512 e4b9f639c157b0104058c0e124be1d3d1f01e836e7182f0c8ec6852133ed36a52b5cfe0ec83142f185ad3f9b20192c719b83e2ee405b874420bb4e09ec01a38b
diff --git a/sys-kernel/dracut/dracut-056.ebuild b/sys-kernel/dracut/dracut-056.ebuild
new file mode 100644
index 000000000000..2b3d51d97aec
--- /dev/null
+++ b/sys-kernel/dracut/dracut-056.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
+fi
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/cpio
+	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
+	>=sys-apps/kmod-23[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/openrc[sysv-utils(-),selinux?]
+		sys-apps/systemd[sysv-utils]
+	)
+	>=sys-apps/util-linux-2.21
+	virtual/pkgconfig
+	virtual/udev
+
+	elibc_musl? ( sys-libs/fts-standalone )
+	selinux? (
+		sec-policy/selinux-dracut
+		sys-libs/libselinux
+		sys-libs/libsepol
+	)
+"
+DEPEND="
+	>=sys-apps/kmod-23
+	elibc_musl? ( sys-libs/fts-standalone )
+"
+
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+	"${FILESDIR}"/056-musl.patch
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+
+	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
+		# Source tarball from github doesn't include this file
+		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		# Tests need root privileges, bug #298014
+		ewarn "Skipping tests: Not running as root."
+	elif [[ ! -w /dev/kvm ]]; then
+		ewarn "Skipping tests: Unable to access /dev/kvm."
+	else
+		emake -C test check
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		NEWS.md
+		README.md
+		docs/README.cross
+		docs/README.generic
+		docs/README.kernel
+		docs/SECURITY.md
+	)
+
+	default
+
+	docinto html
+	dodoc dracut.html
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	optfeature "Networking support" net-misc/networkmanager
+	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with rsyslog" app-admin/rsyslog
+	optfeature \
+		"Enable rngd service to help generating entropy early during boot" \
+		sys-apps/rng-tools
+}
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index b760a2f92747..35a294f43e10 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit bash-completion-r1 linux-info optfeature systemd toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
 fi
 
diff --git a/sys-kernel/dracut/files/056-musl.patch b/sys-kernel/dracut/files/056-musl.patch
new file mode 100644
index 000000000000..ded188889755
--- /dev/null
+++ b/sys-kernel/dracut/files/056-musl.patch
@@ -0,0 +1,33 @@
+From ce55a85ed5d902c19d75895508856f96ec2ceb1a Mon Sep 17 00:00:00 2001
+From: Laszlo Gombos <laszlo.gombos@gmail.com>
+Date: Sun, 20 Feb 2022 22:23:49 -0500
+Subject: [PATCH] fix(install): restore musl support
+
+__GLIBC_PREREQ is only defined in glibc.
+---
+ src/install/util.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/install/util.c b/src/install/util.c
+index 5721de89e..0af387c27 100644
+--- a/src/install/util.c
++++ b/src/install/util.c
+@@ -24,17 +24,15 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/syscall.h>
+ 
+ #include "util.h"
+ 
+-#if __GLIBC_PREREQ(2, 30) == 0
+-#include <sys/syscall.h>
+ #ifndef SYS_gettid
+ #error "SYS_gettid unavailable on this system"
+ #endif
+ 
+ #define gettid()    ((pid_t) syscall(SYS_gettid))
+-#endif /*__GLIBC_PREREQ */
+ 
+ size_t page_size(void)
+ {
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 7ab22201ff5c..11ba2d8d24cb 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -2,14 +2,20 @@ DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fb
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
 DIST genpatches-5.10-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedbc10d20f685f1da6a93dff79e68a5c485e67d59d67ab7e5a26931ee31ea1a9f9c79b006a7c4943a6ce04951d74872387146996 SHA512 6df4bf911eebb05b2102e3f636bca18b17181efefb0891db2734ae65b87ba3b20ea63a313368aa4752cd9fa2483263b85ef8dd2438ba50ac2cbcf681b2ff203f
 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
+DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
+DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
 DIST genpatches-5.15-47.extras.tar.xz 3932 BLAKE2B 37fad5be81ce4ff7e0ddb17772893055c06789e02e7b5043c205bb94c483704aea802822964f89d0f90deb4a02070d9e6c1f9924059a8ff2920367cc9fb5e007 SHA512 0a680400cfa7043efb47dac7642675f327ebae2409da95468c1fa2b70ea0de6ec50c1e1325aea7796a1cce641994b29d209cf69e9ae4e8df7f228b38e6e302d5
+DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee913682488db12cb6cdd5587ea96d4a2bdde0db2c1bddd26ba0e9ebff3632c3cf4f26ed8695043179ea1e3f160bc84b721b73282b9 SHA512 57102597ad1f18e7b94666b431db5ecf96011d14ad76754792793f98bd57811a16f52358ca28728d33c60f5d08203f77003d1312f6092617bc3c804fa4d8d839
+DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
 DIST genpatches-5.17-15.extras.tar.xz 3932 BLAKE2B 8084ec2b3be0e27280efc68d58db4fdbbdd0441fdc6fe89eca6e422d84d8c306122c5fc235c58b8ca3f2af58f5923ab7102a3c157b06e321a4f3c84b5fd951e9 SHA512 bf20e023296469cb4767dd7088fb0772142deec3adac89fe581153dacff74ed4517e8a121aad70004b1f1b21dad40fe0c072817c4043e7d3d8ac0ff3c551ea31
+DIST genpatches-5.17-16.base.tar.xz 803164 BLAKE2B 5a5d96e856476fc0fbab018db9276b770d30521d5878c0390098ae4654bb915aa33959da66c3b7bdcd05427b2870527bbd806a8926ff05de9b53b5cf9d0a2bf7 SHA512 66d0978276021e392fef20476e0056bfcab76a55cfbbb1fe84e913a70347db8fe8c8c0b6c7b50f24da4a192517156aaf88449aaa495133f6d933f24b3b7b8d6a
+DIST genpatches-5.17-16.extras.tar.xz 3932 BLAKE2B a0f7e32a2f67d3fdfbc1706207f17b18ac2e55932bf7a969762674afb9d4b506e9d3095f811e72ab47addb439cc29c3e98ad16e09f0fbd3e8724477d74baed1a SHA512 07475d9cb94147449765b98acedb9709a707dcadbf293e3cfc927a338e716a45ee40ec26ee942d356ec8461a1bc20ca4eb93d589187759aa52305f27e67bc951
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
@@ -22,6 +28,10 @@ DIST gentoo-kernel-5.10.118-1.amd64.xpak 65760199 BLAKE2B cd034b1a1e4b78b9b0ad52
 DIST gentoo-kernel-5.10.118-1.arm64.xpak 61094230 BLAKE2B ba60fa527b67ee2d0d93b408dbf38cfc6b51b921b38ce1be150bad48d60fa03c801e73059df302a017602f1809bdc77f6cd73b2f530486a9c524b50946db10a7 SHA512 bf3895e4cc5ad9ba054a8a12ca0afe3c69d63fe048d8f73ccb6672d705a633e7e55c78f94a31bb43a37ceab5f053f57783fb65a2786bb9358963cb004e1ad77f
 DIST gentoo-kernel-5.10.118-1.ppc64le.xpak 55780294 BLAKE2B a032cd3bab92d582ce8c169361603059acf1d5dca059dfa565560295a15b70e3479fa3f16db31d31d6bf3e7ac0f78b560a6d82439ad8365529e4c46de6ee5810 SHA512 d2bee46bc0fa73f907648c40ffbff70559892054c35f7a0095729bc4c08000411ba84faa5ad67651ecffd2d8363823e7a99832e5fb75c8635e294725cf6e2c78
 DIST gentoo-kernel-5.10.118-1.x86.xpak 57399760 BLAKE2B 0fc7db31961e45812f0aefa670d902c0b8a8329c98326b1c2108144dc180d495d8dff5ae2496146b8cc715a9dff4d0e3d0739defefc21346a41e56c55b6a5e40 SHA512 1833dad4b3f8c2d57a69a80b5148ba4a3be239d29fec2f333ce587e0c1594c7487268baffc7f3e6e8de88e722b970e49eefd1c2e73183ea0f2153c6f0514de4f
+DIST gentoo-kernel-5.10.119-1.amd64.xpak 65749709 BLAKE2B 8af5b2b74712c01c35fadb87c435268bd969fe6ca58e00f3e7163ac683fd0cd71b67d9ab3a3a780c62120377db75b03ed11b4ecf33403d90709a05b2e10efbb6 SHA512 a8754e2cc701477d03ec5f34e48680e97eaa4e759a94457856d4b47f55db1d4ff8438244e90b6fdfb182ae6d71c93f62e3801a3e05a26e946ee7a59cce0cf1aa
+DIST gentoo-kernel-5.10.119-1.arm64.xpak 61049055 BLAKE2B d9b5acb3ba5eaf5eea6c6dabccf28ed1ec17de91fe326160354ba123ad7c0ca34ab0b1a597d5d9534c15e536795ef740cdc8ae8092cfae1b5b7e04807f8959a6 SHA512 43968617b0d8e53937a9b4994854c0365ed6299c069426cececd0de138e4dec20781c8d820467e19bc19d879d67f87089aa18afb6d9575d8602089089c241760
+DIST gentoo-kernel-5.10.119-1.ppc64le.xpak 55844669 BLAKE2B 36cf5c837d27c66c8fe9937b11998b43271cc7a9e47e12d228780bc4f42e5f2589e375fefa3b70ae6fada9ff9441506d2fb24cda6ce2d4f3e77970b87c036d58 SHA512 f6d01065b01014699acdbbbed9a4ba4dc1bc480234aeb4233b23cd5eeafc1b53d6e0c87f870c0d54b84b09f01ea937a008a3657c4da2b9362d970ecbc09a7533
+DIST gentoo-kernel-5.10.119-1.x86.xpak 57397446 BLAKE2B 8c241c5479ef923753675a680f499e19a9a7204649a034e8aea523c048be836901f994c4783ece6466b24147d8686316c974f3b75b6fb2ebcf9dd2538ff26a87 SHA512 a0ed711557c2b96a217a0c78efc819030cdc09ab645ff5f365578641107864e4d777196a08d38cd5b5571f5c4e7e12b53d0173af4ba7a71d99527dc11c0fbb45
 DIST gentoo-kernel-5.15.41-1.amd64.xpak 69349403 BLAKE2B 37462257c705fdf3600bc45d4b6b5564346457105ae7f7ba4fb655a8a2b7ff91422063052ccf1047cf0883977d4e3407b11d0cc604b68cc9ffd500503dc1f017 SHA512 f480c67532576e5dac934aac7418e3eae3b23b9ff73645ba9243d67412897307ebbd798edc1b195112cbc5f84545915dcc8a9004754e70c4ff56b9ff94f9716c
 DIST gentoo-kernel-5.15.41-1.arm64.xpak 64219270 BLAKE2B 0daf5fb63aabd71a4e37c1c8ac0f101957366ada93143355fbc4924bd67611f6c6c02cbf37eefa4524f5957c5374ce548bf754f701bdd8543112e3ae25a58c90 SHA512 d1cd5f83f7a759dc4263f3fc524e1cb01f2ac025eaa22c18ff803491a5a599c3f67ca8e06610fe1d7dff11b48f95abd599d729f53f77107b7560b2a1b4d67221
 DIST gentoo-kernel-5.15.41-1.ppc64le.xpak 57887862 BLAKE2B 6311a4bcb222baeb0a9d0a4d52ee33c6b06098119e0b154ba2829fb88fe12a1085b753738ff0adaf7b4d4bda9aa119e3fa599eb2be85d3a8a3ae6da2bdf29b4d SHA512 fb2a8e31f39c7282b7b01161ba6823ed96a8662bd741e8960bdef2940302bd8354973185406f10d20df3f3a9dbb1b8b04e44d6d6ae3cf85351654c34fda3d273
@@ -30,10 +40,18 @@ DIST gentoo-kernel-5.15.43-1.amd64.xpak 69301097 BLAKE2B 5d56815f4421afb75974c36
 DIST gentoo-kernel-5.15.43-1.arm64.xpak 64221919 BLAKE2B cbb29dc2ae0817402dd8b06350fe5161a275e2203d2c92cc9c7863149405186294a44d4a03fd4d259d38be86cf6b4db31d9d5906d8aac1c60eee88e88da3a801 SHA512 f693a453ef90394c7e6af1ba10803e93d72d4675a16db4acf31296552f113bdfe9deb3d4729104668af6c58e5913a11f2635e054fc68e1e9a087152064ada3ca
 DIST gentoo-kernel-5.15.43-1.ppc64le.xpak 57921217 BLAKE2B 82314b6dbb017fbcdc54d39993faec8a9153b2506e505cf8df61e78a4495da7070eba069a9e4b63f24624473e4122ac3e1491fb9599d28f29f491840833875d5 SHA512 917f672fa2421a0ed6fee93e41670233bc2f324b4c146b1e0e21bf57bb404a37fa4f67d6b9d8319d8036b98c01ddd28ed94bec3a4c3dbd8027a212f34c0ac743
 DIST gentoo-kernel-5.15.43-1.x86.xpak 60028294 BLAKE2B e08cd541fc79f2d59ec814a769483103c64dbdd88f093febbd18cef3be9d8fde97e757c880069929d2b4def0a7a763a17a01fc9cded297a2f82ef97f455a295b SHA512 b7d44cf33050c250989baeed7d83b88fd65e62680fe90388589c66464cd285417014331327e53e6995fee8736e87205633252c818c4adbfd5df170cbe149a3ce
+DIST gentoo-kernel-5.15.44-1.amd64.xpak 69338858 BLAKE2B 5d272f9b4f03ea40903e2465408c85278a6f2c18db475681d7353436ab1501b401666e290597d3e99145896ca99d67c4dd47c0ca29d80b6a0fd0eb50021a8761 SHA512 b939684b60fd5ce867496810852624dbcf61a70efb40bc81a94719f0b8a924fab8eabd971f10ad67da9eaa5f3c7166814c7695c6bae79674c38e31e1c7029e3a
+DIST gentoo-kernel-5.15.44-1.arm64.xpak 64235463 BLAKE2B 5e22a209a0776b8a3ad96e709f3eaf3df074c411764065e18f77d4fcfe45703f26aad5c4b5f226fdb4b6d2021bec8bcc4c08b504d2fb4e03c2d808b235bb5589 SHA512 e73519c883b8bada4fe60e78074739bad13abb1806d37e5a475fd50284714087acfc562f411d2d767dd2b04f343d76d556bff24b07361a9dcfaad125565e797a
+DIST gentoo-kernel-5.15.44-1.ppc64le.xpak 57988582 BLAKE2B 72a78861279f195dd95eeab20df5ec9f8fd7abda437990cd6faee31434da7d48bdaf5e81e0e40bdfbb6d86929ccab9c5f06404204c53f6135f08221847c9655b SHA512 52691050ca1a30b3c08a020a461bb46a8702818b93a906b02004a314ce407e20ab03fc0ed7c934e937db7f0299bfcbaeaa06d97847748129fd1193cd11a52d0b
+DIST gentoo-kernel-5.15.44-1.x86.xpak 60022582 BLAKE2B 8b87258a199dbad3e4597c9dff615bb920d6baffe9039ded5635e288f47e7bada859e0daa1195f7faccfa078674566e3cc487b438aa8b49aa94a6dd3f1d6b8d2 SHA512 df625e91a53a0d95fc97e224dfb5d1486120d717655c3925619319beb4a00f3a67c117d5bf40c854aa2f7ceec560b994654e2ca39dc86898435d221a04b6c2c2
 DIST gentoo-kernel-5.17.11-1.amd64.xpak 70396924 BLAKE2B 55c9baa3d8048dfe4ca5b384eb96820ef29ab00adea2f19ec40342af80dd1f5a87cdfff8e9f48e74c3cae72e35f810c37e7ea11d4b9e4250fc2304884f4ad7bd SHA512 7e73f9a63d4da4311a544b3f35dddbbe5b06d2483a462441b479faaa3513d02362a27266da93d577c43b972c38b9e8ff838db228802d1212e3036ef6cdd68815
 DIST gentoo-kernel-5.17.11-1.arm64.xpak 65832464 BLAKE2B d03ed7cdb970c02814f903d1ab728138bbc55d0ee39dfed1d797ef5d8cb097f2d4501aecbd582ccd6ad0fa678bb6392163205e7ec488b5899dff5159080168f1 SHA512 1de69d8db852aad7aa62f8ae9190038ed1ee0c337bcd7ee74a0882ec0abc8813eb37a8ab43d1a0379b94c1f2b60ab47740cc9a85971bb09aff20f7cb5c3f5eb5
 DIST gentoo-kernel-5.17.11-1.ppc64le.xpak 58784154 BLAKE2B 6694c16997f231c8bb236988d6476405d581a0c2401c6c8a2c5806194da679d78d3ec059b6308f32cd0da570c91acce3441ac8329c340fa2d494e6765ac9944e SHA512 aabffde89bdf2e39a45b49cfcabe47469df80ae1b2652248b89d47cf8a735f3b59f8274b494dce1fba35ae66ed45216146cbcff53fb13d99cc33323d86466a2d
 DIST gentoo-kernel-5.17.11-1.x86.xpak 61112763 BLAKE2B d94381d85cf4d454aec78a1f5a8a88f9be142966d8fddc1ea68407855fc2b419d9836545626bbbb090a31d1c0ac6d85c2d2b34a19ae03c209321a527f298b318 SHA512 dce1bb55344bdc175edb2a51dc5d7893358c46f15690eb46ba6309247826e04e895ea62eb6e4448c9b4c1d5a0beab1a214c982a51372c9dd385edd4d2b3d67f8
+DIST gentoo-kernel-5.17.12-1.amd64.xpak 70371512 BLAKE2B 18ff154d6fb9547db9f81b236876523e618f39e3f90173e1e3269563dd21701af137bf80158a1cf269280770cd5e2984c447e79e9c7c33d805db97054a4f63f0 SHA512 674b4a95fd5720101047fd94a53505725bae4a481bf726ab6819bc90e0263cd102f4670944614bcb6ece95c45d194de633e78af9913614135dbcb9fa8f795add
+DIST gentoo-kernel-5.17.12-1.arm64.xpak 65894363 BLAKE2B 1a7157f133581a7fa420e619d4f8ab7c411b34f19fdacc8d594f729ee74bcc54d03d1b5be8ceb3611be518626b94c6674693ea91946ecd1a86df9d9635157568 SHA512 e228d63c23348063b03922da51402b93b85ec892dac743611880b7d23e46d4a38d57a4699583ac287137c5de29c741373949efc327cc5e108cf247a901c3602b
+DIST gentoo-kernel-5.17.12-1.ppc64le.xpak 58892144 BLAKE2B 8899d09b95989ee9ccf411fa855fe077cc70559bd0581284e2c4c21a2f0b56062455b30dcbacf45d00240e5d5f603025c42912d0e0944eda4c87304ecdc1016f SHA512 14bd19a7371c0e818a98e2aecc352c00616890a222d099a539cce6cf5b9c2f9c503b7b172a6f4223055ab528427df7c6d7048d681b12e3f3b6dafbd604da95ae
+DIST gentoo-kernel-5.17.12-1.x86.xpak 61114450 BLAKE2B 4818fdb599bb493d8592afbca09c6d610cc9a7f3e8d05a6fdac7e1f64718f03d66bd422f907f5d377bbd450063dd3f03b92150620d7b47bfbe0a6ab3ae75811e SHA512 2d676f179aba5a66caf342b327544df97bad2bcb9c2ef89cd7b54d34b136a99f0b94a2b0253a63fd9ccf27816ea3db6b46fca9890aacbb54a7d55946a528ed26
 DIST gentoo-kernel-5.17.9-1.amd64.xpak 70359753 BLAKE2B 42994479de1aa72a97f73207406cd47986c7d0c545d681b00ab3edb380fda1d34fe032360868dea6099eb69507ea4ee9a4401e37139460ce4859359372627c62 SHA512 3521ee3fc95d7ce6e6cfc1f68bd46956df598b416be176d97b01f914843f9071635e21cb7e7b3d29fe29426aa5ee50ee124430830e64b6f670ecadaf8f58b957
 DIST gentoo-kernel-5.17.9-1.arm64.xpak 65823951 BLAKE2B 648ca1341d90acecc50e1d021df9665a8ade52e6f77e8480638c9b411e835f3a2c5c50089d42cb560a19e2c3f0777097330867a6f15e21aa8a282669895e8ad9 SHA512 d36d663220171939fbc6eb25b99375c2ae8bfeb06ab3dd8f61ad864591a555f287e687261e9b31c6d180399ea5fbec6ca5690f8d894bc0f8266ed7cfc9b192e2
 DIST gentoo-kernel-5.17.9-1.ppc64le.xpak 58892612 BLAKE2B 0d64511f201af38dea549e22526f9cc87069dd6e2d32be5153bb258cbc3d71bdc8b399e73367070c046c33a6ed6636ff89822b0e7ecbb2f97a7541370a7eb4c3 SHA512 4e8e1f35828d44dea9bd93b46b923137bf61049454720f8778ccb9d0d8495f14806738591b7765ff4c0b033f94e9b866ab91f845c91cfe9c414d235eae306b99
@@ -52,9 +70,12 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-bin-5.10.117.ebuild 3177 BLAKE2B 5e9cfaf3d6870519944876ac6339ff8feb192331a2f32518c70c78970f3ba72b653e8531c2b8eeca4cf8940d2aceee77845020aff6832fb43d3f1bd0b460a85a SHA512 afd4cb42bdec8ae814780273f84f73e3e7dbb9c4d0be890d829afbb4ec8e72a6e642f6c1b852e76c36f0c910d61a69f6b66cc7424e395efc88c7983ccea59034
 EBUILD gentoo-kernel-bin-5.10.118.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
+EBUILD gentoo-kernel-bin-5.10.119.ebuild 3181 BLAKE2B df517998c1165deede98f869bfd2851a1b797a6a5f8b70cb3c02401f703c77abfd379ed0f3f846ddec463eb0ca3bb21186b44cb9b722720b8f6c463bb0df0626 SHA512 7eba790dea41d43118ff3991b8fa2e65cc3f4c2b7075df992a1cfbcf312ba5cbdbc1fffd631851ca3698bbba565a211026c8c28e87e0fc5191f60e55fdc8ffc0
 EBUILD gentoo-kernel-bin-5.15.41.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
 EBUILD gentoo-kernel-bin-5.15.43.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.15.44.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.11.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
+EBUILD gentoo-kernel-bin-5.17.12.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.17.9.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
 EBUILD gentoo-kernel-bin-5.4.195.ebuild 3177 BLAKE2B 201c1a0c3a7495f64a85ffe689bb561b5c1005b1b90fb3cb89081f578e669c54c89c0175f14cb8be1b079b16936c8f47a8f080d7c48f558327235d2a053b2483 SHA512 0b94554822df70fbf22eb2cd314d77d989f063ea7954f350fab0af068cbe0f1954bc254616c6be2ed8bbfc1e2bbc72a1b995871f069cd4d6e5b5fa1c4edb306a
 EBUILD gentoo-kernel-bin-5.4.196.ebuild 3181 BLAKE2B acde6c67fffa096bf28ca6fc3efb99c05ccfa657c2cb13abd96e7f9a05bfa3271d839ea791e98a2906714418fd7897ea54408bfe28edad8d64e686a3873fcd38 SHA512 9557e38f9fa538002dc4331f05e5892a05c948be73e40095bbadb8bd548aefdc0a39c0bdf179c96b0e86c6768171a3676dc763f610ed9b6b1eb8f74b0fc0b8ca
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.119.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.119.ebuild
new file mode 100644
index 000000000000..da84e07f808e
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.119.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.44.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.44.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.44.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.12.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.12.ebuild
new file mode 100644
index 000000000000..0787e9b25ee5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.17.12.ebuild
@@ -0,0 +1,135 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.amd64.xpak
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.arm64.xpak
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.ppc64le.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+			-> ${BINPKG}.x86.xpak
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	virtual/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+	default
+	# ARCH=ppc64, but tarball is ppc64le. Update if we ever introduce ppc64be binpkg.
+	ebegin "Unpacking ${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH/%ppc64/ppc64le}.xpak")
+	eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"lib/modules/${KPV}"
+}
+
+src_install() {
+	mv lib usr "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d boot/dtbs ]]; then
+		mv boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 97e3f27d60d5..612109e4484b 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -2,14 +2,20 @@ DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fb
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
 DIST genpatches-5.10-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedbc10d20f685f1da6a93dff79e68a5c485e67d59d67ab7e5a26931ee31ea1a9f9c79b006a7c4943a6ce04951d74872387146996 SHA512 6df4bf911eebb05b2102e3f636bca18b17181efefb0891db2734ae65b87ba3b20ea63a313368aa4752cd9fa2483263b85ef8dd2438ba50ac2cbcf681b2ff203f
 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
+DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
+DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
 DIST genpatches-5.15-47.extras.tar.xz 3932 BLAKE2B 37fad5be81ce4ff7e0ddb17772893055c06789e02e7b5043c205bb94c483704aea802822964f89d0f90deb4a02070d9e6c1f9924059a8ff2920367cc9fb5e007 SHA512 0a680400cfa7043efb47dac7642675f327ebae2409da95468c1fa2b70ea0de6ec50c1e1325aea7796a1cce641994b29d209cf69e9ae4e8df7f228b38e6e302d5
+DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee913682488db12cb6cdd5587ea96d4a2bdde0db2c1bddd26ba0e9ebff3632c3cf4f26ed8695043179ea1e3f160bc84b721b73282b9 SHA512 57102597ad1f18e7b94666b431db5ecf96011d14ad76754792793f98bd57811a16f52358ca28728d33c60f5d08203f77003d1312f6092617bc3c804fa4d8d839
+DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
 DIST genpatches-5.17-13.base.tar.xz 713196 BLAKE2B ecba47430d0aeaae2d09d586a9ea016b0b602e2005ae7bf04ffaea7967a7542660dd4bed6cbd5268f187416896c046fdcb7e1aeeccbf293012d11c7473c4d6aa SHA512 fad3e0c53a5bf450dd9dec4146233e322553e110c8b3bd93c53cdb664859aeeb3e5c861f5e04cfbd550014288b7dda9b5740e5d970c443c140c8bfe0559ab82c
 DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855a8f1949d795fd435f0334d89de5240238cdf5fd14b964236973d3178172db2aff98989bc3626f9ca6d9f9878711fc6bc581 SHA512 1cea0fe9035f02f8099768608bcc1d896234058af984db268bd03cd27e3f12c2ad108b3f6d90be11b7edd53983d19d7ae3a00de87f62c3e80f1eace1cb5660d7
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
 DIST genpatches-5.17-15.extras.tar.xz 3932 BLAKE2B 8084ec2b3be0e27280efc68d58db4fdbbdd0441fdc6fe89eca6e422d84d8c306122c5fc235c58b8ca3f2af58f5923ab7102a3c157b06e321a4f3c84b5fd951e9 SHA512 bf20e023296469cb4767dd7088fb0772142deec3adac89fe581153dacff74ed4517e8a121aad70004b1f1b21dad40fe0c072817c4043e7d3d8ac0ff3c551ea31
+DIST genpatches-5.17-16.base.tar.xz 803164 BLAKE2B 5a5d96e856476fc0fbab018db9276b770d30521d5878c0390098ae4654bb915aa33959da66c3b7bdcd05427b2870527bbd806a8926ff05de9b53b5cf9d0a2bf7 SHA512 66d0978276021e392fef20476e0056bfcab76a55cfbbb1fe84e913a70347db8fe8c8c0b6c7b50f24da4a192517156aaf88449aaa495133f6d933f24b3b7b8d6a
+DIST genpatches-5.17-16.extras.tar.xz 3932 BLAKE2B a0f7e32a2f67d3fdfbc1706207f17b18ac2e55932bf7a969762674afb9d4b506e9d3095f811e72ab47addb439cc29c3e98ad16e09f0fbd3e8724477d74baed1a SHA512 07475d9cb94147449765b98acedb9709a707dcadbf293e3cfc927a338e716a45ee40ec26ee942d356ec8461a1bc20ca4eb93d589187759aa52305f27e67bc951
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
 DIST genpatches-5.4-200.base.tar.xz 4700404 BLAKE2B 8420d667947cf912a8d6419581377b5d7daea5a3c03e333403a4c0d0d55200afe4bd7f379c786ff5904c8f1cd1d7735cb7df95a5a5aad93fcb8b90a8750683d3 SHA512 771883d2b15e92dd5e2ea31e9566d3e1d210389323521be5af32fbea75c168d17e947bf004eb515c54f7b0880fa12fde236045bdeb35e08aec8b54465cb253d9
@@ -17,18 +23,22 @@ DIST genpatches-5.4-200.extras.tar.xz 1812 BLAKE2B f9d3d87c5aad19869ae7d1c82e130
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
+DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B 7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48 SHA512 08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
 DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
+DIST kernel-i686-fedora.config.5.17.11-gentoo 218149 BLAKE2B a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c SHA512 9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
 DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
+DIST kernel-ppc64le-fedora.config.5.17.11-gentoo 209309 BLAKE2B 4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d SHA512 72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
 DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
+DIST kernel-x86_64-fedora.config.5.17.11-gentoo 219087 BLAKE2B cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417 SHA512 c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -37,9 +47,12 @@ DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c3695441549
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 EBUILD gentoo-kernel-5.10.117.ebuild 3598 BLAKE2B 2d58b845b166e504cd5e4b9244920a2d5fa8210af5d1b5c698024c86c62fef955f69e8ea5d60941b1eba40bc5099bf1b4e38b886f6082ad71639452087c1fb4b SHA512 96e3cdae110a1f6aba5b85f2577f8cacdf24d2eab7d92c40700ccc0034f0ed5ce37924ee354ee99bc03288489cfaf17f7a0b38c5020a720a9330f3c60faa09b7
 EBUILD gentoo-kernel-5.10.118.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
+EBUILD gentoo-kernel-5.10.119.ebuild 3602 BLAKE2B 96f51a1768637f8c570d4dee63cef59613d752604ad10527d45579296d639d01653228038b834dd9ff3514f01f64aebc828e978460ca4ddd1578c86412edb9c8 SHA512 9f7832e9f3ff018b75a2372e6f1e721949ac09e511c41219b230802894cb23ad0e635eb0f9bd793ede93946f11853835173f7fab9c14f07e423afc550c06835e
 EBUILD gentoo-kernel-5.15.41.ebuild 3595 BLAKE2B a20863e70f3ad319f36acd163c232939bef6b8336174211c3268cfe86b734c096be052728dbe5760d07674e2d73521a362f7efc248b0ab988e9b663da2fa75e6 SHA512 18bf9037ac3aa860a82e18e63108109a1d80c3c71fb07e39fce8b9782255525c7449412b1c81c89aebcb56ffdb258d8bd1382ce6c80abac720c34a40b00ec861
 EBUILD gentoo-kernel-5.15.43.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
+EBUILD gentoo-kernel-5.15.44.ebuild 3599 BLAKE2B 166a462972d13245f59f4806e490d5d753a7f92e424aaf0c749f1cfe2d5767027ed0259862cbaff715800081b7c289a49703968602e663eae7971342fd1c5a6c SHA512 37b83b8e617ee511971e2ac9e911479b6db1f089a4d99e04f5dc3eb80ca08d7557b29b8b21cc91d91613da18182ffac048691eb33b689890f45828253ecfe010
 EBUILD gentoo-kernel-5.17.11.ebuild 3859 BLAKE2B b32c08d83f499520e7dbdf4d3bfc3b7142beea7fe2c166ef7c39a7323a902ee17ab10ac320f1bc04dad1188d3d465be7a0cf7c3fee29bdab6b418fb2edfa59cd SHA512 f9793681a4bca6d320134edab31e2fec6ea93894bdc145f30cec87263d20f54ace39a53c0988d7e364e570bd8c82e4ed21a8636d91d57e4cd30383d3b6f73441
+EBUILD gentoo-kernel-5.17.12.ebuild 3860 BLAKE2B 6f50bafe75001be53ed0b756c7ab680a55f9172abb8d4f3cc5e0efb8c304ed65e141be4ce827ddd086f7ede81d62087e1e30c85d7ee73c2eb9f6846375528369 SHA512 557a7bc16d954a0274920f8cd062ba4ca44fc9cbaebec6474434a3ba0eb2071e85f13d5c78089200bed7b0afd93b7ee93670f39350fbaecc115c90c86c52d8fe
 EBUILD gentoo-kernel-5.17.9.ebuild 3859 BLAKE2B b32c08d83f499520e7dbdf4d3bfc3b7142beea7fe2c166ef7c39a7323a902ee17ab10ac320f1bc04dad1188d3d465be7a0cf7c3fee29bdab6b418fb2edfa59cd SHA512 f9793681a4bca6d320134edab31e2fec6ea93894bdc145f30cec87263d20f54ace39a53c0988d7e364e570bd8c82e4ed21a8636d91d57e4cd30383d3b6f73441
 EBUILD gentoo-kernel-5.4.195.ebuild 2799 BLAKE2B 65c1618e3b44df28bd60944cdae55aa5364a2b4a51553ecb4e398513155fe5e43ab2c3fbc6479f3374c219bb5c2f1bfe53322c551aba15d22c580e0479e6d278 SHA512 74cc32e6e52e1a2fac22513b1e0bae80d72410445567f70e3d0760ad43fb4d234a961abdf59f2c0731371290233dd248ceb1827c4453486fcc16cb1bd7bf894e
 EBUILD gentoo-kernel-5.4.196.ebuild 2803 BLAKE2B c547f3ecda2b5fa1d5e44e96b2fc1321e43affc6eb21dc5b87d5d09551c4f0af3c3f7e22d040d09bfb1d3d364304ca93b3e6934c3a5e9550abb6a86626b17c0b SHA512 3b59a4b0331c00469de1bf0a519119dba1f640c9bfff7a4c42d8de2fd67575a6bb24a6eb721251b96b821d265f60aae0f2787464b2c402fa33291106a99b9b9e
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild
new file mode 100644
index 000000000000..161f70398d65
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.119.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44.ebuild
new file mode 100644
index 000000000000..3e9875ab5936
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.44.ebuild
@@ -0,0 +1,131 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12.ebuild
new file mode 100644
index 000000000000..3f44c735cfff
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.17.12.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.11-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 24a83c189cef..8f75a88811b7 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,6 +1,3 @@
-DIST genpatches-4.14-290.base.tar.xz 5655376 BLAKE2B a27e920ccb65098380880abf3176c3a1b706720a1a3cc34659717c912fb41fc54941d8eb38ba0d886c6295372ea8dd9fc8709d05aa9b27e4255987b496ce5b57 SHA512 231328cf7dfbf87bf0564cd748cd68d60a206dc822df7cf03f4cefca40fe61a2c35f59bd8f3165d60dc1eff2a815a7a389db8e686d338aa9d3effb3af00ac014
-DIST genpatches-4.14-290.experimental.tar.xz 5708 BLAKE2B 35318b1271c48c1d64455bee66d6064d32845640e36c1758a1e4a431bc5cc9d25003c5529371f03e37a34effb96d64866c144eef47044ced16a236800eba40ce SHA512 45234519589e6e211cb52278c266f7a6f9103d5ea9c5050e564dd023e9a78c0052feac821031fc93a67d0e952b510b5e718ceec21826fdf2331ba7c9625b6310
-DIST genpatches-4.14-290.extras.tar.xz 3652 BLAKE2B c60a4feaf62c3e439abb6780f404d8c61a33336e9c4697fbace51b2208250fde7453d9893dd36c214b56e227b39908090c088e92083b1295ccdd78b716f84d4d SHA512 aa160d55ea6470e55ef91e2e624ecae1f00facc37eceb02da74edbcef1f7358daddca1c2ce352e9de00384f1962f92f8a398df6b97d74d5b03ee8ebee4937b0f
 DIST genpatches-4.14-291.base.tar.xz 5658836 BLAKE2B 30ab73fe0546c890f448cfe25e886d357992cf0f249ac2198dd31f1aff877f22a1e0a2a5feb0a3f3498037adbe902fc5b7a67b7522433e67ba3b01db41530f57 SHA512 39a7ed30a8684956afa404437883a7340bdfb99c0c12960a1734c6ef4b489920db6449c15026db2bda829b6a63ca206985d2b46f4214c92f3011bc06d276b907
 DIST genpatches-4.14-291.experimental.tar.xz 5712 BLAKE2B ea121af4612118e390e45cad5eccd87ca6f783aeec0d260923910bc40beccd03e632e11cf76bf6f693827290a04656cb6b17b25582ac7e510edde4371c6f1ff7 SHA512 8420f540b938cea77ad5c4e56eef553818669c1760b9ac66c5c31ce4d8abad4d1bac8b025b6f7bbaba1b29a647860156935d6988d86043f4a5cb9a7d3dc76a0b
 DIST genpatches-4.14-291.extras.tar.xz 3656 BLAKE2B f1a6222bc8f824b75987c3c06c9dd322dcae28f6eb6a67cd23c839c2c840d6cfda3936b5160c90dac183844308efd06ef406c18fdc21744a56ca923253bba1cb SHA512 0bedbe1d9f163913b06b115349df12f83aa72f5b1d20436b54331077f0ad4c03a5f5d623bf392219bdf04098265c878d1cb69a0cc16053e93a4c4408901f09e2
@@ -16,45 +13,33 @@ DIST genpatches-4.19-243.extras.tar.xz 3664 BLAKE2B 0201e661888c86275319aaf3c9e6
 DIST genpatches-4.19-244.base.tar.xz 5466456 BLAKE2B 2cf42429df05d476e5ddaa0b20aa9534e4147f8ca0e520f60b3cf5b47a10c6f79bd9de44fc7364c51e403a713eb57df7c24eebaf435ad7f8d2c2a09582ac8a8c SHA512 d8771756cea1a75e4a85facb1657d1035936a48c9c52b447b0777e0c94c6220d8ee2f2e6d9b3cb4eb5a65b346c509e98774280ba7dbd374a681c4eb54a0626da
 DIST genpatches-4.19-244.experimental.tar.xz 5468 BLAKE2B 70c87b900fcca806997b4bc2db3897c97eb37c201b4219e10ae497b5b7ec4fa2dba6b7a1ee8e3457bfc807edf3c63660d392d57b7dbf2ca34fc0204287851727 SHA512 d65e296c391232865edbfa60082a6de9d432dcd90ae1cc72e19da215d8ec99eb8d0c6dbbac7026cee9972a80da7aa91f9a2ec77ec70ec20ce10b353df6bab947
 DIST genpatches-4.19-244.extras.tar.xz 3664 BLAKE2B 995eb931851352da59db6c9a54771853a4300b42ab3079ffe80996906ef06d3272d45dfd3bd4f5826240a98cb311aee734bd95fb0909154c7273db366307f001 SHA512 efd0bcedc41bc8e00eec04d7581072b6b2d1bd6b2cc690cc88d9f39ac3679682f675d312df0612e56250bc8c02455b60ad0e9f08e647af7108eafb82a3cf1ad0
-DIST genpatches-4.9-317.base.tar.xz 5148664 BLAKE2B 984163c0a74b5924b0982a4e1f3193c259be092f39ad7169f3ef8e98b1fff570034d2378ffc06a2d3ade23b70a63920c6dfdfc8f95b6dd7e6e0a64732e80de33 SHA512 81a7af635eadb8efd69e634241a28da42bb746269348ccc5f8e332a47459777e6f55a78ad4883ab72636def9e48f2250257edd7c85f87c96188f807b0c6602fa
-DIST genpatches-4.9-317.experimental.tar.xz 106424 BLAKE2B d845406cd485b63eee2c786edd49f2ca37f1ddf331035854ffeee52f516dcd93655689b537805445ceebbc56b18a220fdb0523ee6b34d38bba7a8dd4410126ea SHA512 ca4ab5a504855fd3ef403e3bcf012c8faf9953ed94a155b42dd4860b46a39ae58ede6ccc74c8a72129107c144898d10e6ca27f4ca6f42e2d1b8c4ae1c1b86b3d
-DIST genpatches-4.9-317.extras.tar.xz 3672 BLAKE2B aed19f1cfb5451db77bfe273f7c35114205ddd0a36b4b64b2761a1b9a32d5723a23bae5f9d1b8e55ef8c25f154c6a94de40e64a006e2c4e0ad61894f79b4a94f SHA512 038c9e480870c292ff1bc7d22d642b9ba5186ddce40922ca43de2a466e479d682c808304ce318d05d57450c98cd46201879600e11fc90951fc3b5aeb007f577a
 DIST genpatches-4.9-318.base.tar.xz 5151300 BLAKE2B 568a51692657549568ce2d4332f9e0035dc55b86a4aedf9ce28451cf027504359e108ce187ad9f10908126014288a46aa78016e8d52703b8e3f51b9272442c34 SHA512 32f9802e78c54360cae4349611f58c8e5f9c5e8452721802c315fe75b216e2fe2f7d5808e2ad2e915aea0f20ce65ee667fa3db366d0e9b49fa7fca54304bc6e1
 DIST genpatches-4.9-318.experimental.tar.xz 106368 BLAKE2B ee253ba8f55728c546720dbe206a3c70de95f1e15693950254505173a5721d1d682007a9988ea956533e4cef1b615b3da28b79d7c282a2099af66ee20c539296 SHA512 56453356ad599543dd9cace88ed59399556eb4f8e8d56fb150f08c2532d1a8765b4d7005d96aee4a4c9e5871869ce96f590d86d26f0792c7c8c99f0e643e2676
 DIST genpatches-4.9-318.extras.tar.xz 3676 BLAKE2B f8d266992b4fff6a3668347fccffb6573c1a0af85adda7f622d346244aaaaa8123bfa518527dbbb088f804d6f177362f5d7999cca807c5dc69e46acc7707b71a SHA512 52124e1245b3749039e7e2013ac9c30ff6b2dc6d3ffbc37c306483901f1916b0bf0ec5f5064452f7dd5729ef9da8f94ae7b5dc084ddf81b55078948988deb3b0
 DIST genpatches-4.9-319.base.tar.xz 5155768 BLAKE2B aaeff202f66718323527c46c5f2cecd4b4085e4d25ab08597318c8a590c896897e812f0d88c2cb14fdd7c2a82a23ff8e0fbb6a55fccbfac285ae68c68d09eb2d SHA512 164d070179e6c1cf1a1ea13cc89d5560e04666b9d87a0e88fe7f3ac9291c2345fc4d8a8d1c812f419d16abb793d4c8ecbfbaf76bb1d3b485ede195976a99c5e3
 DIST genpatches-4.9-319.experimental.tar.xz 106368 BLAKE2B 0279c3e83de8aaa6f10f3949830ebb515cf9b2a4ec40643ed7e3c2e0a63fd499a75c07aa7acd931598acfc6728753705a6da70746d04fa92e25aa35ff8e4c649 SHA512 35a16fc10bf554f24f145ada007a77a936e7575bdb11126c3ad582c3f3dfd5dc61a4c8ee9fc0d1c556d4cbdc46dbf7de58fd3d696ef1caac6d0fcc0e2cd4a013
 DIST genpatches-4.9-319.extras.tar.xz 3676 BLAKE2B 175063bce5fc92d1534fdbebe39eb38d367b1d0f32cea952ad3e8ffa28bbd6a109db38372c30ec71335eb882de63024cff4c70b3e16fdf85fde3bc0ba3fe325c SHA512 d296abae152fbd24f54f0b30564ecbb6fc53ae8f1fa6f6f1c9326993beea9ad5a630cb4bb6fb3b36e412140f3266d6df79e24e5e56f65125fb2c0c1ae30dc8b9
-DIST genpatches-5.10-118.base.tar.xz 3302340 BLAKE2B fbaffbc3b7d0bb3ce303fd721ad703a267b028f4fd1b12edeb0bdf8f9317b58a58716243d536f7db0e35501d801ee283b983aa598488df518a535e349e0e7a1e SHA512 d13dfd90332b7b4ea8184b2fa0b76b4de6d966ccff68c1eaabbaca806f79ad26549fe4ad7a69228139c9f97fe0fa6b11c2949b97ba9f7b82c25d9cb7942efcc8
-DIST genpatches-5.10-118.experimental.tar.xz 16880 BLAKE2B 255a2cc9d5d7d5bf97b6ef485d07a62998a1de5c2b10f58d00269bf138f455c808ebf4deb68bcea12ec76945ed60842271534325fc7a9417201abd0810da4d64 SHA512 01837a8959c15f997b8640251070da3859aa62d3d65f4d739faa938261c5cc9bc8085a5d936fdfe76f1c973fe832a50a44c345985d8759a1489ce905817003b1
-DIST genpatches-5.10-118.extras.tar.xz 3876 BLAKE2B 221613b83c1b7b4a98076c5b515efa90f18ba07cd9918de4b1018156a9dfcab0c3efd2a736a00db9a32ae23c1d2afec9abd5c2c575d85a8f27f9248b0e8d8c87 SHA512 33a175b16c82f910c13c800504cd13d7c2f41e6bea652325b0665081628018fa20cfa3fd62139e7aecd3f7701e56c1939473d4aa3e1f764ae0c3af8829b4b568
-DIST genpatches-5.10-125.base.tar.xz 3432388 BLAKE2B ee59bacf1a5393e048ff955ac339e87e70f4a176ba97afb47cc22f25338893af63b5710e7efc755c47794db36f6c5e1f6c08b6514203d34d40cfc4950c5c2767 SHA512 2105b342869256ff9bec49b567ae252e1349b39e8a818178a7824638b06db569a21b4a39d0626849f6e4dd2a62e1dae4defbc3e642ff3d6200d609010ae301e5
-DIST genpatches-5.10-125.experimental.tar.xz 16868 BLAKE2B 4a93ff3ff7cbcab53edf1d25fb5510bd370f2e1f8b0e293eeab1ef9c7298cf5611efdef472f6f84ae2e9b4b5e58c1792b2ef30b267f872bb7ae5a13be9ef381d SHA512 f90a669fff10c0a4abe335ec129501be48f31d7c8d502bf3224678389e1436572d1e802628ee553db950fc608aff7def726ac3481bc0d45c148fdfa91d157c5d
-DIST genpatches-5.10-125.extras.tar.xz 3868 BLAKE2B 5d2c0d1197b3387f5c4b90e5e5e2a480e7b762fdb2f58fa3a2732a2c00f55033611868b01915a5a27bee67e83c3a959bcf3f1a943df8ad0cf11b6a3ffad02ae3 SHA512 0607da11b9b0d10f792f71c455b2fb77155af3b4a456668b5750eea96e9464ff83d1d8d0b7a81065101a77ac33b2e37ac3a0a3458261b797c29b3a19ee0dd540
 DIST genpatches-5.10-126.base.tar.xz 3445148 BLAKE2B f21381f177a1c3de8e9be21c3fbf2b5ffd43dd12a7726fbcbec2e259a44e353fe63a98cc29b3e207d67cdf2642aaf142a69f438c395b0e928b13159e8fcc9fa0 SHA512 fce3451abb11c22afc8ab0ccfa6483ef2ba23916e2ebcd3191af775f1286716f90167a0bb835ecc0738d4e8a13326bd0644f46fbff19edbaa9df6c33fa5bafd0
 DIST genpatches-5.10-126.experimental.tar.xz 16872 BLAKE2B 9a963dc0eaf7170318a18fe8b6f7385e08c5e986428997d2ed6b95c027fa3bcc32b67afbf1ded290ae3f2b70fae3c9e2e902d9723707fc731e5c57f039d61668 SHA512 2be758896ac79b8a4d2bd1c8cf4c6edaa87d1e8b30938af9d26c496b26ec2180700c607dc40d72324859965b097f459be0d3037c1f25b74fddc7290b11c294ab
 DIST genpatches-5.10-126.extras.tar.xz 3868 BLAKE2B b08b05b945fef23421cf8a0f18c7b6c23e86edd4717ad80b24f4109d199373477c0bb16cb2a370a540c2d97bc99c1bb4d9feb7a9c964e9e80b9505cf51ae0ab6 SHA512 57e81535f7cbbeba031c03d0bf634035789266d1be7c7254d44a6777e554b5b6b14649c04e2a910ecc16f8e53f122b6bd0c9657cb5c9bb1fca56ab4d73f1f259
 DIST genpatches-5.10-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedbc10d20f685f1da6a93dff79e68a5c485e67d59d67ab7e5a26931ee31ea1a9f9c79b006a7c4943a6ce04951d74872387146996 SHA512 6df4bf911eebb05b2102e3f636bca18b17181efefb0891db2734ae65b87ba3b20ea63a313368aa4752cd9fa2483263b85ef8dd2438ba50ac2cbcf681b2ff203f
 DIST genpatches-5.10-127.experimental.tar.xz 16868 BLAKE2B 8b3c2022c7b38ef3ddbfc31d80fb3e17f905552843a0893c59d41301b035cf19bbff31a2bea696b90bfc9d8f03f3cfffeec3d92c7bef1d62eae6d2911feb01b4 SHA512 709d86a459dec524037a66d41535edaf62f6f8a09b6455cfd839a0fe3aa49d5b18712cd21a9ec12cfed5b5c89235c5d28c7b2848f3339a62902ff9fe4eed8972
 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
+DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
+DIST genpatches-5.10-128.experimental.tar.xz 16868 BLAKE2B 0a5306e64cd8c03d6497cbd7a6dca0a55221866007db3773099f7ce8e269a1abfcb601ef05dbd3b1843988141e9f93fa53ea7d75c8f95dab29163746747b469f SHA512 03a9754339dd34739b3b2a08174243ea97bc54dfe1d8595e7cf1d3f2fa4a3988e0dddfdfe84edea0ef7faa6bcf6f8d23b07fa10d6a88182a2c6b2af5046c8969
+DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
 DIST genpatches-5.15-35.experimental.tar.xz 5416 BLAKE2B b412d648afa7f6095c127eb4a04a1f70243b84aab111fcf25ee201b782193a12a7427742626385f7775bfa974b629841cc7ccf7a602fdba8fc11d2194dca1e1e SHA512 8cad75c5af41317c98881a13936e20e84538c75489349670e34a45f11dc57006bc04a1aee76876fb846c66e205f9298a4607eb02d71f6e6c3f70d1d4eef12312
 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
-DIST genpatches-5.15-44.base.tar.xz 1805920 BLAKE2B c29bc5dce61deb71cce45dce36ef12f72674b9d04af57fcaa0a78da936334709e84a0660ff9e80951bc73e22dd9a803e942ca88a0f72a38debbb64909fe9b126 SHA512 e71b0088ce398102baf6a80d41af8662e9c712ecb8eea67db1fc83cd75c82943ea444671b43482ba445e0b4aff3ef38ddac10d90fcb7f48f09ad7ae4806155de
-DIST genpatches-5.15-44.experimental.tar.xz 5420 BLAKE2B 1967da7d93976419d384dd260a31cea94837b6a8284376d52019a2fd27a94232ed18e9e3b2e062321dfd3f9024865e4528eb5352c8c765fc6407e234b619a808 SHA512 4eb94344ed8f804199aec183ad08dd6978db62e513a11ac2060ed65554884e217069d375156e94a4a956644a2d5a85c2780a5fb69a67d6eb5f7bd0fe68904ba4
-DIST genpatches-5.15-44.extras.tar.xz 3932 BLAKE2B 47d98e8b5fb0362cbb565cbde17c740c55909cef9958865593e312d47c52a7a21becda8bf7414482423732422118efaee87e741ccaa2f8b5231b111f5150a6fc SHA512 092e7143107fb37a83fb0658729c1ee5621a0c63d3e8a38325db598b65579d84089115f37e65d7fed45da3b3181b3edd32d5e1f01cc2e7835668251394b434bd
 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
 DIST genpatches-5.15-45.experimental.tar.xz 5420 BLAKE2B 984a3e683708e1a1ec4e77fcacc592caca20d134a994e3922548b2cce0aea6b69e0dd3ae93899182b147e42a171b2dc5b230e601cb3b06b09ee6c8ca88bf489f SHA512 7305e4777e3001ea5526b059ed1684c16879e07f83f54536d1326c03a495915cd1f9776865d0bff024053312d9e9f4a94d27e4c047fffaff831995a5aa69561d
 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
 DIST genpatches-5.15-47.experimental.tar.xz 5424 BLAKE2B 8bf430a19f94483b0660e9f865f885936162b0dfdea51e8c5c263ea1220446467cd202cbd2f15e7f021db5ece7b9d333f81abe8bac6a14b26592234855cda757 SHA512 79288849e9151cb04d093cf74e05be6ade9b1c5b64e3646fdae08d2056dc0dbe55b13b4c41bce16921f25043a10ea657b2defaf3cbb5750577edf145f3fdd6d3
 DIST genpatches-5.15-47.extras.tar.xz 3932 BLAKE2B 37fad5be81ce4ff7e0ddb17772893055c06789e02e7b5043c205bb94c483704aea802822964f89d0f90deb4a02070d9e6c1f9924059a8ff2920367cc9fb5e007 SHA512 0a680400cfa7043efb47dac7642675f327ebae2409da95468c1fa2b70ea0de6ec50c1e1325aea7796a1cce641994b29d209cf69e9ae4e8df7f228b38e6e302d5
-DIST genpatches-5.17-10.base.tar.xz 649500 BLAKE2B f92a3b4880da7a922694efc984e9dd711288decd2c3e20476036e59a09179b99250ce03a3471acc69d03d361ace416688280c5577ded2188575fdf731504b625 SHA512 b068dad762faf36618a06f245097b4f3752af2ac983afe73b673e7d34e39cf4cfd6c2a1afaef4178317c199731b522bb3037be01b737db9e6ba344551f7f9dd3
-DIST genpatches-5.17-10.experimental.tar.xz 5404 BLAKE2B cdc67deaed363679e06cf6128aa61258d3b48a90856d4d5d591bbc6beccbe345281c6533c24be03b003dc71ceec312a843d7f41a2fb8a69dae76c5ece9362f2b SHA512 b21919fe11fb8625123ef7635cceffa2fd2444ce95808f55f33df1f0a799d5051e3f3ee14f1d17130f8e0c740d2db901f200c9532aa0874e05e2443c9514f3e8
-DIST genpatches-5.17-10.extras.tar.xz 3800 BLAKE2B 547c378d7326c7a3f5f8f748ea440e5f8d822e36fceb7966d9b8a2dd6370c645231c9b6b73f6a92d60324cd0fa1b523f7a3beb88701f4424c4d89abd669a054f SHA512 0290d3ca272624ed230ae5418cf31bc846a59cbb9c0657209f7f2de4af447265aeea58c08d2f0b4ab2f25624230eb4f64f82723f4019c903484fab141ba12b46
-DIST genpatches-5.17-11.base.tar.xz 684208 BLAKE2B 1c1f7a450a1f30d18f8e3eb7cb2db8b170f503a1b17343b25130408725f08c6ce0db7fe91eddb1b8d562bee0b6e60360baca4429aa09ffc1e7257b531ea6ed4e SHA512 5e0f2c89b93bd492c49d36627e6c6ded98e49f210e4c4880f84717e4248b711b5bce3d0db04ae78a29a01a47b3a2ae3ae5949cc02d755a22d63e6b7117477398
-DIST genpatches-5.17-11.experimental.tar.xz 5400 BLAKE2B 503278b3fa559c808b03b4c510051080f0910d2859b9e7b03ebe4ddd3d464c53ae1a3982bc9cff48a42d1892785fdfa3e783d5a8dfc9c7a216ad5df416e0c3fb SHA512 75e4f06eed8f8eca62b41f48d48e08c9049879d8b87e0fb46d9ab3642da4c5ec98663ff30150958404834d56e66f753cd0aa563cae3026d6d60fbcd40f12767a
-DIST genpatches-5.17-11.extras.tar.xz 3932 BLAKE2B 8f65276ac101924b918379e84da046a8fc56ba293ebf5c9ace449917e58400ef8ed5cd947d9de558ed95735996eba42e01053c8e71f1a3782696e1ddccfe22fc SHA512 d7baa2bbcf982ede22dbc06dd1a452759c876357ee65750b21bf5a6b22939e5a924311c6e2315f222a65386ec028399d5c82eb0a1b8a215757bcaad1d83b001a
+DIST genpatches-5.15-48.base.tar.xz 1909116 BLAKE2B f3b0a3234a30ca102daceee913682488db12cb6cdd5587ea96d4a2bdde0db2c1bddd26ba0e9ebff3632c3cf4f26ed8695043179ea1e3f160bc84b721b73282b9 SHA512 57102597ad1f18e7b94666b431db5ecf96011d14ad76754792793f98bd57811a16f52358ca28728d33c60f5d08203f77003d1312f6092617bc3c804fa4d8d839
+DIST genpatches-5.15-48.experimental.tar.xz 5424 BLAKE2B 8349ba33982dcd4cf2e8aa6970327d363bb51d3afab18aefe8c06836731aeab73227075820f2231254306cdaec9d68d63380e9c146ed53df018f0ee33ca80d31 SHA512 5205cd884d26839d2f4ce7a38358c343e5efdb5bb3fbdb46fcf3c7164f91a396b3cc746b2c32b676d4030ab7bdf6b9f559538e0286b031f55f3a2e6444de079b
+DIST genpatches-5.15-48.extras.tar.xz 3936 BLAKE2B 9b4063e107540bc974fab302dd638f468c461780f35bf23e885037bea7fa8a521db5071a40560b9739b042609376f9d703c38bc943bd85987c95d2b0a87636a6 SHA512 f32559fc7935bc4d8059f7a806d5b3153f3f3248b6b8f60a4b746eef04028d0aa7526eab6e41ae25e2f07a8388fd5a1f89648e9ed83c123d2f259911efefbb09
 DIST genpatches-5.17-12.base.tar.xz 685640 BLAKE2B 3a662f399b18c9ecf54feb6688b706e2d2529d8c6ff763767d0539475ee23d11bdd76dd236da639f70600c2669b1e6796580a5dfd3d4c5c9491d79e5fd199b48 SHA512 2f360dae9c7f5d298224364fe02dbdc99006308a476b989715111b77710c4c805c018ae95c8c699db34776f74b24e326b5dcb90f4795d0696cf1c40e8d4cbcc3
 DIST genpatches-5.17-12.experimental.tar.xz 5400 BLAKE2B 3a83fba28d1dec3fd9b59eee0255034af165bc2c4e64c1af2a963169ab77d649e2ba2249de5383d75cd87cd1bc73821c38a14941c8a6752a0b2d5d982c4bada8 SHA512 8fcb480b404a844c8fbfa3604acd5a31f4e7182e60ef54f80a444e50a9c35a0c2324c64243a31c5427d6ea02fa56416e9ffb36219b3d670b66de998099ce00a1
 DIST genpatches-5.17-12.extras.tar.xz 3932 BLAKE2B 3c0b16365f2ddce7aa5323413a19ca1b37fce7cef2d0ce15e47b54dc3450f6cd62ec64d5913ae2817c302ee4fc2556f9e6316a7272aafcd558fc309b3c00e369 SHA512 4eeb7ee2649edf630e70f82584c278b4f6758e2937c3b067575286a3353883baedbbbe578222bfa187674d953b036ee2f1c89d001030efb1db6057f6d264f9ee
@@ -64,12 +49,15 @@ DIST genpatches-5.17-13.extras.tar.xz 3932 BLAKE2B 9aa42ee7af3c16e41f6bfffa91855
 DIST genpatches-5.17-15.base.tar.xz 769140 BLAKE2B dface984138a5b7f75911c7d6a4b7fcc67349f8adfcf863aa960fdddfb0e426fb0e408cd2f725db8df17cc9d742a68f85e24c91c644b3f0c7ff142fc105fcf24 SHA512 8fed293b503b150507ecdca6d19011083cc1e3e5caa9ec4bc8527e282892c2dd35d24b746403d2b6a746586b526ee07c2fb50e97024ac409d03aefc50c372aad
 DIST genpatches-5.17-15.experimental.tar.xz 5396 BLAKE2B 77e967a164f5557a1deb10ece6ba9d0eb37ab33e8fba429cd9d501806166f8098cd02f488f4cb4ae67e15c10c0adeedd1fa04da8ee9595d7965eac0bad8d75b6 SHA512 7c99ae7e8a54780c5185a2d9ab8fff9fc609c9ef51b6527ebaab4e3960c322cd2dfea2971f556edac714432b86ab955b501108225342315aff1c07b1cb552d33
 DIST genpatches-5.17-15.extras.tar.xz 3932 BLAKE2B 8084ec2b3be0e27280efc68d58db4fdbbdd0441fdc6fe89eca6e422d84d8c306122c5fc235c58b8ca3f2af58f5923ab7102a3c157b06e321a4f3c84b5fd951e9 SHA512 bf20e023296469cb4767dd7088fb0772142deec3adac89fe581153dacff74ed4517e8a121aad70004b1f1b21dad40fe0c072817c4043e7d3d8ac0ff3c551ea31
+DIST genpatches-5.17-16.base.tar.xz 803164 BLAKE2B 5a5d96e856476fc0fbab018db9276b770d30521d5878c0390098ae4654bb915aa33959da66c3b7bdcd05427b2870527bbd806a8926ff05de9b53b5cf9d0a2bf7 SHA512 66d0978276021e392fef20476e0056bfcab76a55cfbbb1fe84e913a70347db8fe8c8c0b6c7b50f24da4a192517156aaf88449aaa495133f6d933f24b3b7b8d6a
+DIST genpatches-5.17-16.experimental.tar.xz 5404 BLAKE2B a2d7c5b1d84e9241baa8da5ac71f73f2b92dd33952ec0fdaf2540e975d5a4b93675efcfbaf120dcc2553cfbcd0d8737ffb8ae2da78e9ec9ec4e31cf6b21dd75a SHA512 73344585ddcc34b33e6852e6483ae4c0577f4750ab658ac5529d9120b45e047ba2e3d75b5a1adb3f3a74c58c6fdaf5a7d5d773fc4d4c4f576481b3e6a4adad92
+DIST genpatches-5.17-16.extras.tar.xz 3932 BLAKE2B a0f7e32a2f67d3fdfbc1706207f17b18ac2e55932bf7a969762674afb9d4b506e9d3095f811e72ab47addb439cc29c3e98ad16e09f0fbd3e8724477d74baed1a SHA512 07475d9cb94147449765b98acedb9709a707dcadbf293e3cfc927a338e716a45ee40ec26ee942d356ec8461a1bc20ca4eb93d589187759aa52305f27e67bc951
 DIST genpatches-5.18-1.base.tar.xz 3800 BLAKE2B 52cf33aea903e8783b554127936ebde68b1c2655567a27a6dff8b94df675cde779f940735824766d2267c7d09df970522ed3721b3fe661dc12e64c4b105b4c99 SHA512 461037cb2fc9246f1e778123a9fd58682ed2749c95acd8d30dddc1a31a66cc4961bb5b133a05fd6fb19aea1a83bf0be8a76f9e6422fb4d696010d248609534a7
 DIST genpatches-5.18-1.experimental.tar.xz 5404 BLAKE2B 5bcf5a103157f1c3573d0fa9f346331a91e4e097652a845186d13f0f461227b139e86775b27892552f342f8fbcb40d379b6b4949b37a1d62570b042c60a31eca SHA512 e19855f666a11434ff2dbcac38ed01ffbf5094d17cece8e3d78bc62f913f81395216c681dd0ca858d3efe7a186a7f1392e114fc096fc203698c5b2047daba3a9
 DIST genpatches-5.18-1.extras.tar.xz 3924 BLAKE2B b4c7e29f0237ae9e4e3300c8be75c0def63969e5c4dec52d4d5259a6b3b6d27406883e45d2ad4d0fe576a1285121037fb88fcdeab58a5fabbb58d4847cbfbbfe SHA512 0182a96feca475471d1dde2e8326067e98f8f43a6e9122e29635a52ae4ca56eaf6ac349b189a0198704c9adee62cbdbd2def7e90d2dad564c72bec2f8ff32ec9
-DIST genpatches-5.4-198.base.tar.xz 4675164 BLAKE2B df3392747e2aa0cecbfda049c124731bfb16b4ef2cdd3f973128c0f9b8c1160e941738f48092a0dc5a11f917fd6c3becd73dce6150c6d1ff17014b2c4c8197b4 SHA512 1e1a8dbe948b8a765b5ae4d98954a721586e5f7e0d4ad4bf579fd72002d78dd7074f535dc3c4a039c94c1c18506a2d000ef251318fd49913fc2fc56f710b6e59
-DIST genpatches-5.4-198.experimental.tar.xz 16912 BLAKE2B 5e7208440a2db50892ff7c9474c4d1c1b60de64a57e86a17d2df4118c1147d9202a86d6c3727d32934dc119645d11ee8f1ba0cd5af6d77cfed24d88db48c6155 SHA512 47e4c357c0383029d67d016139d8b25a349d9d5fb39dcfa654d44df1e85fe88360a7dfd496815a2f160bb76f318ad3f687a209de4823c6032fb1a8154c15fdeb
-DIST genpatches-5.4-198.extras.tar.xz 1812 BLAKE2B 4512e1007841a16ddc3ec986778def8ccb1b144758c0edbfe004e547332c18266e38e016d8b098985d2344ab0c9c516b663c8af35f0d5896f2ffac01cda3a94b SHA512 ad74a36ebf4b5eb734f896718ee7e3f25a493904b30717819218638beeead2a8853bc64c0d368aae8f2c5957bc222ca2a296153aa492ef001ce9abc247b507a8
+DIST genpatches-5.18-2.base.tar.xz 27960 BLAKE2B 9462e304d0b098ba8e4134f4a000a9777298216f25934976bbad2e5be77b6b198257f7875d835afd16b70346c3c8b5ac7cdf70db369ee9ddd2ac41ae40bcdb30 SHA512 a7be617581e97bc0afacc3e94a96f37ecc119395dfb27f9bbc3a5d5a61b7eb8a0992ca9d1f778b90c662395e3c5d17cf10a48b56e8e7760977a89a23380f0fd3
+DIST genpatches-5.18-2.experimental.tar.xz 70008 BLAKE2B 841b94a39134cfa27c8696d38d3d4fb95170e3d976e102db1ebca8880ddf57d30a43e78a128f53a368f9352e01081b67e7525e426146d13455cfdb265e337b06 SHA512 012a8b20ab9b37a582d1f346f90927ae64771b06d50b285d2a5c315f117bee94936d067cd417461f933e2243e1ecd290cd729e75e981f9345b14b71b87143416
+DIST genpatches-5.18-2.extras.tar.xz 3924 BLAKE2B 9c0f1da6167f1636f2f68d93ee4cce6e60d4005b42ea536a75574bdad41d8130d759d99539be18bc67345dd2e1be64fed63d92cf56803d04486c8781c85534a4 SHA512 313064e8f017ac907fef0fdae133a9cb362ac2e53292cdd7a82cd5bed38ebcf3e24bc80dddd4f4c85a8509c76e1509d4c4b8949deb25f4c4108052eaee13a004
 DIST genpatches-5.4-199.base.tar.xz 4683396 BLAKE2B e1e66ce10c436bb196a5890e08d5beb8d0a1ece7f19f8fb3b1027747509cc7b6102ace634abdbd299dd48fbc8750f3bc127abe55014410b1d558b4aec497f475 SHA512 8a16d67794e864749fdcdbf413ec0fe996d3c4fb5f04f8c8a2d3001377c8b5d4d7007a96efaa3590fd4b595cccdea36d83c6dc292629566e5398f322658d80f4
 DIST genpatches-5.4-199.experimental.tar.xz 16904 BLAKE2B 496602e26da272a8b58a61402eba0fc9871a96e78005014bd49b4e4354336269e17eeb6828a393c74f0d0cded080247f561a1bae7f6ed22c22d575cc12659ed6 SHA512 fb23e903b297b7660df9aed9aa3a7c94e100c2aa8061e7591823b4abbca82c898f2775b42e319908e4380bec45138acb44972e1f2d09927c96c141a4ba6deff6
 DIST genpatches-5.4-199.extras.tar.xz 1812 BLAKE2B 03b9ebf9d306256e58c895006038f4bb3d908590ef2f603487d9b970963c24acfbe78fbe862b2b493ab477e6e901aba332dc69916eb881fc42a79a62d7f81da4 SHA512 d100e876a9b64d662331d4a78b8531a71144bb70b789e0ab0b76e6957c368ee3a88025e040cd622dd4cf6e4da358a3636571ddf55b94e42dbc250a62a629baee
@@ -84,30 +72,27 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.17.tar.xz 128399340 BLAKE2B 82dc4a45cc25c781ac67aa6ed1e4c369544154960f41c4634d47621f381159687a227054976d078524cda28884d395a15f7542fe44ca74ce98ca6ff54a81d6d0 SHA512 89f0a7ca69d20a539d4b612a7028a30a5e98b402e4b6b88516f14237e5da4b626d7929eab8b40fccc90766e8f3bae87e9858a19077ffad20d8204acf18794f5b
 DIST linux-5.18.tar.xz 129790264 BLAKE2B e2745a69eb70169e90505a9318a3993046eab3020496eecde7d8352ecda0eb71a25b21becf7ce93fc593507dce7d1cd61b94ddcdf82b3094d79c0d3d48508eeb SHA512 dbbc9d1395898a498fa4947fceda1781344fa5d360240f753810daa4fa88e519833e2186c4e582a8f1836e6413e9e85f6563c7770523b704e8702d67622f98b5
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
-EBUILD gentoo-sources-4.14.279.ebuild 742 BLAKE2B dbfd0ebb2182148240dff200bf1344972154b00f85821dbdf384a226e42c8f36ab8fdd7bd4af5060227052b856820321e7ef134c60021a65fdc7b3ca8c0b5598 SHA512 2407473329c63fb72ab9909b7557ebb5653aff1698768e2705da666a799d7dcc1c053935d5d40b36a9d9f57ee87ff3dfa7d1e9784e2691eccb891eff1994a2f5
 EBUILD gentoo-sources-4.14.280.ebuild 735 BLAKE2B 1911ccdbb6b7653fd8fe85a5bb0703641799d82338990ad99ef4e3ab7f1c4903703bf94da0b32a479e46150fa1eadca4c0fd99a0c25eebfdafc00d751753d5aa SHA512 43421c752cd3ae8bd3cbb4ee4786b46d68b949b3bcff7f4fcb21ae8f77ba4631c6d2c3e35531c5ba92b11dd8d9b911cdccce2d06fc879c83a7582ba29aa7bff7
 EBUILD gentoo-sources-4.14.281.ebuild 742 BLAKE2B 2b5fb41c6b563e63ba6b0d0c272d3618acb08b6d3e7be9f95c510a747694da817efbd94f6c3f2e4910ea348dfbf16ac4d58b2e95ed27a6155ddc0e0af487a35c SHA512 64a2e25e00dc975969b560892cf8dd5dad093e887eb0d0fc8d593990fdccbd0669d10178077d5eaa75ebec30f7c2353f1bd1408c9c7a66ec212c2f4532c1bee2
 EBUILD gentoo-sources-4.19.243.ebuild 742 BLAKE2B 8daf193410ffa40bbb966c15dffca709d526bd814d3207ba0f13d19180536b20549a931bd57d2f54ea6ba12f14f6b11d19a1ce164c45e677ef7a065df9c051c9 SHA512 26950d2bb98b1489688a17f8ae97661ce00e8058b7385c8fcb21aa74caf362367ab210656caa2cac65b5934537d74e2cb49c5cd164760810ea355ae8f8b076ac
 EBUILD gentoo-sources-4.19.244.ebuild 735 BLAKE2B e10b923fea7c12356248c643f319e622dc82b47143c26208330e904e5a26830966ce5c65f225b2885e1bbbb011cd544743afc6d0bd51d21b62904f294d861f63 SHA512 42a3a586f7f904a7e2abb83cc31eb0b0dd9b3d8a385e6af8b537781ce15fa4b2b4a3516f28a60b7e11d0360922dff036e22bc8c33ebf438701d3572ebfee1efb
 EBUILD gentoo-sources-4.19.245.ebuild 742 BLAKE2B a21296d5fd193ed90b032e94009d5655d0ea6551bf20d7a0a738c39a542143fadf6475cda9dccae252e00984c0518857da8b4f93965478f7692e2198a8332f38 SHA512 e3de8d1eb790f41330534ddef3e6e6b1b28043787902aa1e641800b2ddb9c9fd1df03501f44936e957b14702c8b8eb27ed21655a64469e27319d4cd1714e9055
-EBUILD gentoo-sources-4.9.314.ebuild 742 BLAKE2B 5d08198a9f2e53d39fa5f5e48ae98ce07cf812fc9cc35e727f1693ca144c2c5ecf3c9028d2f2f8732a4710d53ea5cfdd0d9a88074a515ba1b3042d06155195a4 SHA512 98247a08b5e2566301e6492c4d5fcff62d4b4555ee66e27f81721b5122734f7ebe89393da98a370cc29268ffbbfb3c25a5bd02544e0256ae490291aa78039f96
 EBUILD gentoo-sources-4.9.315.ebuild 735 BLAKE2B 78dc0f46a2255d86426496c0d87a834ba37a2de77bf8216cc042bec83f342310484220436a10366800ddb88cdbc246d246c23a753f034b5bab93da6904c14130 SHA512 70b63f5183d3670f4a5594121624d116e4e63fe9ec7e2dd080b00877ac287b39b31e5b0749e52dd96148136ced9e6804774dc16a9e56db200e0b5daeef47d148
 EBUILD gentoo-sources-4.9.316.ebuild 742 BLAKE2B 50b39e1107cbd7810cb5458044e3920433d70e411a56dcf816cdd46df6785774382ef992a92d8afc1c3b2895e0e5ed2b64992d09a6fd880d02d920da567e527a SHA512 a8fe8a73edf09704f1abb60049bfef3ed4846eb835c21cfe3408b451362c850fe1efd6646dc39afe5d036c584060852ef8d2730f4f5ac8ef7f6cf29a571f4c9f
-EBUILD gentoo-sources-5.10.110.ebuild 749 BLAKE2B 57d43afbe1e1bef24b7b7c84fa2fae44fab4f4a7921e900c1ef9396975a29669f36febbfdde66f290a2065fb6a396d84abda70a56ccb12a7da04cebcc3b80361 SHA512 109bd8d7ee09af63f3b57ea2bd9d200e282c6bf305a288b40a72971dcb0bc395eb6feded844a128892ad8174295de96c287b6f6801793f35e6fea7d8780edced
-EBUILD gentoo-sources-5.10.116.ebuild 749 BLAKE2B 612aad2391c82cde4151079f7f0650fa0beea104806d821529a55a33f0a91ba422a92976021321ff5eb17525512efc1bb5fe1bded63759accc0e403840224049 SHA512 c27bed2af6c68e23d9c02922af3440a72bfe9e26818e791f86500df6bc76b5d7e241970cfdc6519e2eef145b9e372a78a54793a0f0605b45d587a99ac17ee74e
 EBUILD gentoo-sources-5.10.117.ebuild 742 BLAKE2B 3728594f63b8e523c3db2c37043aea82745b8f6e2676389721a9b861ce9aa9a3c40991fe9b9c5b7c5fe66d9849008150b624123e5a01905665da9204ad555411 SHA512 fd5e164f3a4fdc930d594ce1699dcebd89fc3f43d1f52e461f7b67b740cd042487320e148731b18c48d58a6f21d6da20eb74352f290af3b1e51a2ea2ef3bf03c
 EBUILD gentoo-sources-5.10.118.ebuild 749 BLAKE2B 9ec82baf368d13189c7c3b7f0c49b7d285347350f6dc7d08fe9a4b44fba317b441fcf9fd3235d3820eb82909e364b040904b386d7eba515c6f99aaf87f868776 SHA512 c536e413f759a6a26ccfd50fb8a0ce85bff9eb5dfcfa00c2947ef7cbd91c48b1fdbbf69e2a0e2529a9fb833efbbaa91e8ce29817b9526a5dc9aaadcf63eb46c4
+EBUILD gentoo-sources-5.10.119.ebuild 749 BLAKE2B 1297b64e79dc516934870238a509945e5fde59ce97aaef511eda8f7bf92004b6836c374af1568ebc115b1ddc8b312c2540c61b528c189af11cdcc6bbae861c76 SHA512 90e22775b5ddfd9fa6884c94bdd7dc7c0d5fb8adf730399ad61d01f52bcff44192863f6bbf0931bba5f37e2501147414e43d8bf63d5571b22f8f303713a29bf7
 EBUILD gentoo-sources-5.15.32-r1.ebuild 740 BLAKE2B fd78a88ab05cb40abf077b47fac83f14f13626e90ce825ba772ebc0d42257657bcca5d5f3fcaa9b6b4ca72fe9f39b76246330c8c00747c87406c383a5646b3b3 SHA512 7908dfbae677ae46fe3e1395d403f7ce12684b8db59cfa64458290abe47d8494e25c5b9b7f5f25af8c0705bee192dc6cdad1d48ee05fcd96cd1b8c7f118835b8
-EBUILD gentoo-sources-5.15.40.ebuild 748 BLAKE2B b5f3e9f6ee86371f5ae7ed2e7c99e5aefe96c0577c334bc285746b0bdcdbbff9a33c59bd9d3e352f8734aaa03aef72143f762096fdeb95bf32bad92b140cfa09 SHA512 9d80372dbaacc7b2482f42fabc113e679015f6b0e785b943dbd9618786829779c06aafabf3120ead57ee1cbd4078c7989c96c4924c9b4279762f56611d039435
 EBUILD gentoo-sources-5.15.41.ebuild 741 BLAKE2B 690491bdfe930ac15382e45ff4ca78af3c9cfb79dcdff15120f670c081ffef5fe58de384363db3edc95e5730f128351ed4a1c6ea5a131604e0cc4fe83ab65b74 SHA512 3b2de79318417b06973a98f5e7f887ae0a6b4bc551a1dce5bfcd3d0ea3c70d292d78506a688445ec620898ee63808df714f2ff31e6defd917d5da38676273eb5
 EBUILD gentoo-sources-5.15.43.ebuild 748 BLAKE2B 1f73b214afba99304c363b99ff11cd577022b30398a01152eb84c34db22c2ade59331d2d44f66407f14dbef819ae85159c89576f4db2a92e126726de3bd4c5d6 SHA512 50d2ecbd58c791bdc847b58acec4eb75c828e32af5507fdd51ef58a7b71fe1f0ccdbf3312ee7a3ba4c04878a30af43fcd61a3bee01368d876868ddc4d995f60f
+EBUILD gentoo-sources-5.15.44.ebuild 748 BLAKE2B 6069f62aab539948a55c29b828cb686222e9dcd54c9f9186de2abcbd5417cdda94261b515777a00b7cf38aa7fa1eb9eed08d8c40ef0e3894868cd385687046f2 SHA512 c7056d856e448ee0f7a9a4595db34c151e8ea5f8a0ca89ccb39166de6767e7ccb7b3b3ae8b889f104724c5f75bf1a8906d8c4b3649606d98c00a92e0555e26b7
 EBUILD gentoo-sources-5.17.11.ebuild 742 BLAKE2B 63381debe04b3b6a2550c64d745c5124c311a8f3372d32c7d1e3dde4134d1980f7b5223ccc40396ec2e93e82fb49cdee9eb72af33906e84507be8f62b0a199be SHA512 4f868b2a033fc7c1bf7f22fb03b01d6aa75c85615c4bd29c11df250d27fdfe2e9cb1ca675683e2172ab37e1b1b1fdb2ed51f0e439c58464b0c2e4380fc06c122
-EBUILD gentoo-sources-5.17.6.ebuild 742 BLAKE2B f06a94809b2e5669f8369824e058d99c6138e08fd43472c36ceadb5c451713bf959889aa5489f88215aacd2ed1bbbc0bce38dce3cceb613ce8b5434c9474df6f SHA512 ba8a37da374218267ee70835aed2b00dc38f82309448ed4a10c2387ba34e3b1ae518ee37499bc42c3edd74e69cf70a3fb17e29b83ebed29c04605afeacc2e52d
-EBUILD gentoo-sources-5.17.7.ebuild 742 BLAKE2B 227a639a956829c3fdd0cdd4529ff974db99c58b36a50bdf6b81a162cd14f33fa3032815d4e16ac9abaa8e46e86c13825370a27550806b0687e45b302c7f040f SHA512 77657c173f204d57907181881139b199ed7e81939987cbc10254f7df31414df49d60f451d80e423558909e9a99ec80b7a07337a860128eec389987050bd808a4
+EBUILD gentoo-sources-5.17.12.ebuild 742 BLAKE2B 4156dd6298aacff8389672358ef446d023a937dff53dad32cf4ddfd200f70d97b10511d073d3208ae1dd2ab8a68e84723ae4217ddbc2b5f5b8650d90d570d8b3 SHA512 d5319327891a906c2176b76cc22c55c3631a8c11786b2c35c70035c01b4f9c634f61e227c35c0632dd2da8854970ba765ea6e85ad3d684788a49662677787594
 EBUILD gentoo-sources-5.17.8.ebuild 742 BLAKE2B 95e0f99a778f310f85ff86fd862bb4d418aa40a0c0230800f9a417c9e89827791a8e0d87a17d3d607a777172ad00650f8dbb62de1dbd98a47b3aa0c2de21b1db SHA512 3dd8b4a3c88451fbe76b85742c870d491ebac0a1bb0e9a1b28c10254b596abc79ac201f043d4e258322257a55290096c97dce2c8c1f926b35af8b25b8f287f6a
 EBUILD gentoo-sources-5.17.9.ebuild 742 BLAKE2B a776c8acf62c71990205444dbcc91ee6497b129f0cffe91a46a656ce9d376299985831d32da405790c53f8bf332560fd10c2a5a389e8fb0bc076292d6835fa3a SHA512 7eeb9ffbb469c44d42769beda98c1afa022475b7fc55690b4d76b64acbe0ad884a288bce5b4da4e8baa9f67ccd762eb79c738218886bdf59440491995e8233be
 EBUILD gentoo-sources-5.18.0.ebuild 741 BLAKE2B 173a99711cf7e2f80832dead06826d0a5196bf35d364b5445b0da5f60901cde8c4f71757c68780a2768d344dd516fc77a6136a0f3c8ab1639fcfec24b8ef49a7 SHA512 fab36547339b5d28de0b9553b1997a4159099a9b2959539d842e3afe88ff3bde955b4babbcf566ec0baffd06fb636b553aca59cf9f7aad5d0a4d5c4a687c466d
-EBUILD gentoo-sources-5.4.194.ebuild 742 BLAKE2B 880c5e6617f72cb6b5fb5fec8a856531eba9ef5247ad67c9422eb4d62c11d48ff3499297296a3a8c884d6ec3d327632213ea729c49e668d226b5557a3ceaf7b6 SHA512 3afd111b0f6e38ea5a61b95c74b2dbead437a26cf9fdd5beb119ff5de02f8f373703b56b6c6493e8fb2cdf6088e45d57685d342849d2ffd82a0ef9837d839995
+EBUILD gentoo-sources-5.18.1-r1.ebuild 741 BLAKE2B 850fb58340c7bda3854cc22131fa1c3e294255fe09dced4b9d7a177c2b451ee7a447ec397d05c15d86592a58c59ed3e83c45870b7c85391064dd03f77c11b672 SHA512 557b739782cff1984ffdac9a947f15bbfac6d5e8e455ab92635ad9d40ad8b5d2fefd6c47777e9aa93af35cdaae2a69106498776ac6c33d1de4161200560e51d5
+EBUILD gentoo-sources-5.18.1.ebuild 741 BLAKE2B 850fb58340c7bda3854cc22131fa1c3e294255fe09dced4b9d7a177c2b451ee7a447ec397d05c15d86592a58c59ed3e83c45870b7c85391064dd03f77c11b672 SHA512 557b739782cff1984ffdac9a947f15bbfac6d5e8e455ab92635ad9d40ad8b5d2fefd6c47777e9aa93af35cdaae2a69106498776ac6c33d1de4161200560e51d5
 EBUILD gentoo-sources-5.4.195.ebuild 735 BLAKE2B 33928af7ddd457fdc76886872d1234904f2ead922f2e8d8cc0a51c6cec16f023be91d305fb392593bddf29c6b3aeb7c91e4c5fea1a9655ee66774cae7e4015ac SHA512 387c694a592f3bed7577f72e1f3b7f6901eb0e83489eb96109e9a8edfd984c30a67bd28e027585d00b50f6641f469cd02c821ab87c8b3306da3422237a58da46
 EBUILD gentoo-sources-5.4.196.ebuild 742 BLAKE2B c1e8d47f9c7ba339701decf9502c9815931a9a4b6c7c4c609b9b597cd3e86c6a807471b2bc0e4fca842839fe69ddb42f075cadd7d7f2fd8a64f8e99c89cb944a SHA512 ad296b7fa72affcc5f424f69182bc91af92858abf737ca806da2afce92c6dd624dbe94d21dfc1c149fde4fe9b577d974a57bde52ff3650b2a23ce89f789f7183
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.314.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.314.ebuild
deleted file mode 100644
index 540b5936cb3f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.314.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="317"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.116.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.116.ebuild
deleted file mode 100644
index fc277076c5b8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.116.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="125"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.110.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.119.ebuild
similarity index 96%
rename from sys-kernel/gentoo-sources/gentoo-sources-5.10.110.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.10.119.ebuild
index 5cb5e4f58102..bbf236ebdd1f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.110.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.119.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="118"
+K_GENPATCHES_VER="128"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.40.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.44.ebuild
similarity index 97%
rename from sys-kernel/gentoo-sources/gentoo-sources-5.15.40.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.15.44.ebuild
index a140d0cc2697..ad38f8ce4022 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.40.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.44.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="44"
+K_GENPATCHES_VER="48"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.17.7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.17.12.ebuild
similarity index 97%
rename from sys-kernel/gentoo-sources/gentoo-sources-5.17.7.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.17.12.ebuild
index 6f21e009336a..b1fa09213065 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.17.7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.17.12.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="11"
+K_GENPATCHES_VER="16"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.17.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.1-r1.ebuild
similarity index 97%
rename from sys-kernel/gentoo-sources/gentoo-sources-5.17.6.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.18.1-r1.ebuild
index 0fa8387686d0..350db901ae85 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.17.6.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="10"
+K_GENPATCHES_VER="2"
 
 inherit kernel-2
 detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.279.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.18.1.ebuild
similarity index 84%
rename from sys-kernel/gentoo-sources/gentoo-sources-4.14.279.ebuild
rename to sys-kernel/gentoo-sources/gentoo-sources-5.18.1.ebuild
index 73d223190060..350db901ae85 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.279.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.18.1.ebuild
@@ -4,13 +4,13 @@
 EAPI="8"
 ETYPE="sources"
 K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="290"
+K_GENPATCHES_VER="2"
 
 inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.194.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.194.ebuild
deleted file mode 100644
index 91b408acdd47..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.194.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="198"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
-	kernel-2_pkg_postrm
-}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index c48954301bc3..b67c4fe3a887 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -1,4 +1,3 @@
-AUX pf-sources-5.17.2-sched-uclamp-fix-functions.patch 1267 BLAKE2B 0f6d3b6f9b88fdfe0e7ebc20a49cdd2933e6fa65afbc954f97436c216651b23808f76931e26ce5d3cdd7eeadbb3b5e637a32afb0f3e0732650a621f66c2f3f7a SHA512 a85fadd02572666c7111bbd0041f78972d437ed5355a4674f370c7a1536dc8560fe6b45bb7b309755f8f9dd1a98dceda025aa046ab7cb3ae8c625bb1f562bf00
 DIST 5021_BMQ-and-PDS-gentoo-defaults-5.15.patch 348 BLAKE2B 50ac91380b7221aa30ead9e842f038117b0f4ef4b6538b8f083a9f4467db23ab2f74643e65197dd9201da9b6cde17b192ed09e7d544ad095391c2cde6d9f2b8f SHA512 166a73397b133e20b92c37b72ae1edfe4cce017293b978b523980e28526950dfedf1081252191ff95462896a16ee790dadf55cda2edc49452b960079d89a6a9b
 DIST genpatches-5.16-1.base.tar.xz 3920 BLAKE2B e5749033cbb870b0fb43733b388a7b34a92c91cd4414587d9a6fe9cdd0352f4edb775ce2ae44af339f1bc773998c6df51ebc04d7e66714b19bec1a76ed9c88fc SHA512 9ec28a2171d1e28bc33cb28ba4b7250a02c052cb0b45bafc57d400202862dbffdb183880e5843424dd55d4026af3ddf6fc8dce16c4d4c4595f6a9f22963527ca
 DIST genpatches-5.16-1.extras.tar.xz 3780 BLAKE2B 59d482903c1eab9800ca9e9dad75bf4cc54d5676e44693f23a48e138bba8dea157f1ca9eb23fb081f8287fc62cc74746ec73504456d544958ef8d1f992fe9a33 SHA512 1271830d5c99c17ad7b00b9305f0cc9b02aafd3c798b8d1cee8eafd755191b30530f75207108b50429410ed581a1327cea5b866b150725399fba63eab9972235
diff --git a/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch b/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch
deleted file mode 100644
index 24404669add6..000000000000
--- a/sys-kernel/pf-sources/files/pf-sources-5.17.2-sched-uclamp-fix-functions.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 170a1f1454a4453c0053f87723fd15634c863e05 Mon Sep 17 00:00:00 2001
-From: Tor Vic <torvic9@mailbox.org>
-Date: Thu, 7 Apr 2022 14:54:10 +0200
-Subject: [PATCH] sched/alt: [Sync] sched/uclamp: Add dummy functions to
- sched_alt.h
-
-Syncup of the following 5.17.2 commits:
-  sched/uclamp: Fix iowait boost escaping uclamp restriction
-  sched/sugov: Ignore 'busy' filter when rq is capped by uclamp_max
-
-Link: https://gitlab.com/alfredchen/linux-prjc/-/issues/56
----
- kernel/sched/alt_sched.h | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/kernel/sched/alt_sched.h b/kernel/sched/alt_sched.h
-index f2b9e686d6a6..55c2a4c0cb84 100644
---- a/kernel/sched/alt_sched.h
-+++ b/kernel/sched/alt_sched.h
-@@ -654,6 +654,20 @@ static inline int sched_numa_find_closest(const struct cpumask *cpus, int cpu)
- }
- #endif
- 
-+static inline
-+unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long boost,
-+				  struct task_struct *p)
-+{
-+	return boost;
-+}
-+
-+static inline bool uclamp_rq_is_capped(struct rq *rq) { return false; }
-+
-+static inline bool uclamp_is_used(void)
-+{
-+	return false;
-+}
-+
- extern void swake_up_all_locked(struct swait_queue_head *q);
- extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
- 
--- 
-GitLab
-
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 97a14626f040..0e2e94933635 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,30 +1,40 @@
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
+DIST kernel-aarch64-fedora.config.5.17.11-gentoo 239036 BLAKE2B 7b4cfd0cb29d5a79f7af585ae019723da74de58eb0e756ebb783ca0e17a79b68ea751f9c7eb7f31f16adb334e2b746228b55bdebafe31195cde4a379aa865b48 SHA512 08de60599905b032d09ad263670f1501513366d89fc224e21c1689fef97f6ed28db9149becf7363f28f2983587cbefcb20ef99f6b5dab8ad24ad9320ee829790
 DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2 SHA512 4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
+DIST kernel-i686-fedora.config.5.17.11-gentoo 218149 BLAKE2B a1a4946185e678b9c42f8e524de25efea1a049714e07f8f64bc9482680fe4668bed2b6a91a7e63d4142cda50f3d3a05c64b62e4477d2411e0251546b6774b12c SHA512 9ad7a0a213637d9818b95ea86f5abb2c6d2fdd0929ddd15db32a0ab4c71c2ff808a066846bfd054a27dce4056942db98117414399484e1688c6dc7d7d8edd0b7
 DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6 SHA512 2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
+DIST kernel-ppc64le-fedora.config.5.17.11-gentoo 209309 BLAKE2B 4b94a9ebac017c2cd4240eef9bea7b65c0e0fb75e1f02d2e6585c0f352f91e1113e0fd8f527cb3d3f96e93c50eeee74186ba6c2574dd45bee515e031ed2bad9d SHA512 72c05e6e64ef8e2430ac2fe592dfcb0c5c8def60f2d53a9f2f7bc1e9f5a98faab2ace7ab73758c008bf004eb99bd91eb11be90198178b27636d7873e38ca6943
 DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6 SHA512 f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
+DIST kernel-x86_64-fedora.config.5.17.11-gentoo 219087 BLAKE2B cec0c1948960ec5363830ece7be7d3060c74eb689e801af229017a9d9804cf9ef546168669d65598d33fd5b2f4ac9aaceeeafd33f92ddeb8f185cb507f56b417 SHA512 c1602e8a8401311ca82972278476916f634dc8ae810a0902bfe0d415d2670b3bceba59f016ed90669eb73b1a9dfaab35cba4a1b4428e0fbaa6ccd2701871af39
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2 SHA512 8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.117.tar.sign 993 BLAKE2B a4365bbb057db936510aa6f1e50b136a4e35c601d6003c3f78f0dbc2e5c18daeecba040e621c0c14ca25319da406c94b8dc469cc7c8d5003bbe94e1a90749e0a SHA512 dd63b7be79912d46945f5017bd00c45ef73ea36cd8549aa38bfdb7ac9bc71b1c9d1b3c83794c38239b2b4beb17e83ba3fc8f8fa3921721519ca0577af9d59765
 DIST linux-5.10.117.tar.xz 120409348 BLAKE2B 8258d709d637891dcbb8523c6d9c8c007a44b7f7a109ffa9cd48f9fd9b4e7dfba170f9ed97828f4beabe6c6ed34ac69b287ee489321569adb282c7d0745d3750 SHA512 3f9488c55a6e9458cf53e06992ff56054cd4c933eb0e87a5122b6b7367d6ca7aa3587572e8f5362cd3264104f839102f87f40ac98476f666c44488b9422fc39f
 DIST linux-5.10.118.tar.sign 993 BLAKE2B d449666a55dc6befeaeac7a851c88eb04c6abe131e9a1b8bb015c41ff2ed5612c9890bd3c11bb1a1439fd726c454ea669a5b96c8f8936dfed2a84fda997b5334 SHA512 88d7f89d4b289f79f073a9f807f10dc08ad256a6df48952dc7f80c38aa455c9918050acaaf8c4619f973e7a02a9d6848ff93ebc2a8283a1b10381dbb88df27e3
 DIST linux-5.10.118.tar.xz 120395788 BLAKE2B 19550892ca372803456947a8b1a6f774c04c6383262273855235d40fa1005df6ccd93638abe9e9f0b52fd0692863f07fd18901a7cf113b16af80a2030b2e9ce4 SHA512 5ce0746c3b519abe9e20d1c80264a6a8e49bc18907cc0712fd0520f8e74806028a1b3929da636d6ab88b195895f1873122122b1506b7047c37ba30ed22b357f1
+DIST linux-5.10.119.tar.sign 993 BLAKE2B accdf3bcefbde0f75a8647910dfd71ff2656c1366c37716690b23b6d0f72d2898211ca5908e78a28bbedb6e0035cfab90a2ad321bc43a26a2c22fd9cf6338c2d SHA512 14cd205d86b7670c9c64a4615b2a7e99c55359374474032efa42f1e2f7aaca81437a3dafb5405047d42057964e0a924af5565767705e2eda79620a512d801315
+DIST linux-5.10.119.tar.xz 120405928 BLAKE2B a21d2ecf3d779d80a83d4788e8043811967aa6456e072f25833a94769326b1ee818e3042691b3a6581d5ed1cf3afa2180ba4252ec78eb6cb5a64efa4023c0ce8 SHA512 6a067963e9fdac0289a70e2d713e65376be4058063c332ffadb5daf33134bc0342dd9d2864118820af2d06b27b75148d9c624d5039b36c2bfdcc96aa37934580
 DIST linux-5.15.41.tar.sign 991 BLAKE2B a5ffcbc8a9127288f6ec5d640178a286114343643d91d218a85e9ad9feddcb3d1febaf0d36f6ec230a732cdad0f8bc41967308049b3c7a4bece24c70ab546552 SHA512 e8420f18f3ea201669fb1ba3f6565d41ddb3c6063b81ea27de5ae51501e01a1fc73283d0fd55255f74003857ed9b07645eee7ed8a6322e986356d7b5685b10ce
 DIST linux-5.15.41.tar.xz 126321620 BLAKE2B c92592a3994c607242053cde655ebc7ba837e2a8d06594fd14c54c63e227fab42eb9ed3e1c452a76e7258c3f46cfed447306f9cbde62c5cd96f04a334edffafc SHA512 f93bddc7c7890c5014c0b506884bd5487cddac462f74e965e869538f97e22428739e5f71badfcb6ccb5b20f642dd66b53286d85036d239245cca9865d826044b
 DIST linux-5.15.43.tar.sign 991 BLAKE2B 6ee0c91a3c9fbd24dc3e00ba6ab379c4763179d66cf15609bfacac2255facc76ec5f3b1d5468706f22eedda9913d7f7e6acc65eed3bd45d45cbb51c38dac6432 SHA512 7ff83540856cd84bdc1961308f8a44efbc12b9653febf404044c42cde6e5fe0ccc3e6ef8121497a59013c48e5090cc8eea0df250934b3adf35e7e0fbf9adf974
 DIST linux-5.15.43.tar.xz 126315992 BLAKE2B 361e41f62c614e7c8bfd92bc300c06028b77312ecb67b3a3c6d241f076150b1f66fd755cd6795f929de6576919756d503e887c773f88e8f9900381fb4e28c88d SHA512 4b2ec6ae113d69290279857def9f772d96949ba2cdb9f5b4ed2f21a5c8174a71b42d54309f608bbe674fd1157a8f742871fe4d2b54fb1a93625427b03d19a8dd
+DIST linux-5.15.44.tar.sign 991 BLAKE2B 24fb4c7cfda2f74f08473d7a1a922f98f44c540f9a660810042350a5f48716ef89623e6f9b312d1f69d62f97479c5211a2974f71436b489312298b3d09945dfc SHA512 375fcf0f292c7f1a8faa3abd21d7bd3ef6fefd45f23332fdf5d2326633add504f73d2aba859e0489f0f0057361b71f9f8adef0a3f686de30f0c736d32879ecf0
+DIST linux-5.15.44.tar.xz 126324232 BLAKE2B bad291ee99c73ca99aac9dc99872373ad6a6eedd53e6a9d059e800a20b4c6b6573c3d9e7465454381a5d23a1067a256fd24ba459a674b8927abe19070fd24c76 SHA512 79a477dac536355b2a6c6de14ede675311d6ec179917c3f2acdadea16c81e706b1f9686fa3868a4a36a57441c2d25113632534ad8359a3544207e7068d0e177b
 DIST linux-5.17.11.tar.sign 991 BLAKE2B 3f734e77a1f91684b02bcf8f612ebd3feb0f21039b4df551a369f0e1f86af342ff4e287aa067f8489075e2e4eddf4598f4f3ced15cb6e73ce7530218f48fab66 SHA512 980fffb64dc560882e9e9d9e6bd09e92ec802592554df95412138c4b414915912abe6691f7979beb555e4a23a2214e0f32b409ce988b5b8d8584bb763d84c21e
 DIST linux-5.17.11.tar.xz 128457724 BLAKE2B eac40fbd6589b315983d30e3711c5a71065e8447df607f6ad02a2b430f8f47bdef6ad5cbb7e43c94b2016e9d045955593657dd7e2498f1a04c6272307a579d2f SHA512 cabe2594aa188c7dcea842e9bd31015a851d3ab3f7122b595c5c81701eca42fd223e2cc3667783a1a1f852c61b6e1045f6e361a642aaf60b545498bd1acadef2
+DIST linux-5.17.12.tar.sign 991 BLAKE2B df6f52a15ec4c2dc4bbd5e644f6a9c8d99b28eda652ceccdf7f2f6a292b7cc0b98a8e454b1fd43195e946965b9604a4c106752009b1b92693d4a269b93bff52d SHA512 d3fe3aad151850e8dcebbf4c9d8190870fe0378edbeb9a026e1c64c0793af2e5fa20865a77218a6d94b516d3f4ad6587fe7d23b7edb158cad941aafe60b3dd30
+DIST linux-5.17.12.tar.xz 128447528 BLAKE2B 217b3815a1438b19fb157ce45b15beb227adff636d3376a4e44baff6e2175a62fa579c13cbda8d52689aefdeb046f433430dcec3b9b1e2251e8f3f36b5fec7b7 SHA512 dd83f61fa981cffffaa7dae3d9c020a0e060e5d523f9d5b363314e9e70aa680a2d33e6c5b64746b51c2f961047583ec490722ed1c625572b93f89ac402558406
 DIST linux-5.17.9.tar.sign 989 BLAKE2B a078037dddf7634cf5e854b79a873cb743a3809a4be3d6fc4c8d9ea2340ed61d118dcb58edecadcdc653ded2e4c552d44b56d5d962d833b6b37234726ac35b5c SHA512 07c2d483e0b02ed17b27d774513cca9be47b7d163964e7f2b14f0be273e8d67747a164274ee1fcdf67abf39f7141297322eb5f39cf9cf4df89bd03f48fc95143
 DIST linux-5.17.9.tar.xz 128449736 BLAKE2B 83dc3cf66933f42a3cdce0015716017ed7fd7810a380a9374bac495b9f0a96b1b95b05bd012332c4156189f6a02d8a9b8b33c9391458adb9909a75bf661d8547 SHA512 8866b6f0ab8cbc122bbed0083ee9b351193780143259b818a15cdde1581222ee728a60344ea9267d7f3e6b1563b24a23100f46e6bd185fdc1e169b804e48cc2e
 DIST linux-5.4.195.tar.sign 991 BLAKE2B c80a3a547d82b7d394155f396e3beb66df61272dd5f57be00fcf3b8b6bcc419914fde3488b950f29f6c235210e8f777e28199a4126530963749ed3107c49a249 SHA512 a770e02e59031a8bc74c832c1f9947d0f2edd397de23eef234f18b7070128c8adb1836ca4297dce1afa9f5ddbdb97fa4404e2c90faa81d5502d8856dca4112fb
@@ -33,9 +43,12 @@ DIST linux-5.4.196.tar.sign 991 BLAKE2B 8da70a3f1f7a4bd7e9a312146bf891c160625126
 DIST linux-5.4.196.tar.xz 112910488 BLAKE2B 89262970ae146b9c8882a816c8e619072a42912f0cc51df6ad892c383672682cc852cd441e0f0ba7fb0735317aa1e4906a4337dcce4a19a5c34ffeafba139c41 SHA512 d3b5393e929c5686b394bf66b21e92baa82999185259e198c2cb8a49a257d36268468c30a513ec00b08bf1fa885772ea149dd3e67c4e6c1474097735ea074b0a
 EBUILD vanilla-kernel-5.10.117.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.10.118.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
+EBUILD vanilla-kernel-5.10.119.ebuild 3715 BLAKE2B 95be9c325f8b9a36f89e9650e56bdea2068345a1e9ffe868f19f72499e6427d7727583558027544e83dfaa179d32976d08747d71633644424e8079ed25b9a958 SHA512 3db02eab7261107e1dc9182b6b2f7591ad203ae57a6e27ae589a7fe4b3c5e38070f21ec0ac62c0ada48aefcf61b858099837661d66149eefd87639dd8a49285d
 EBUILD vanilla-kernel-5.15.41.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.15.43.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
+EBUILD vanilla-kernel-5.15.44.ebuild 3715 BLAKE2B d8110213454c54cc858db8eee5b84584b4c4aa135fd514cbb8bacba1d6b7899e3c89c8e7faa08eb00fa35b19605d05fa175ae2bc405ebcc1e0fddb51ee910de2 SHA512 65b728344d395668b2662556c4949b86d1253b35ee3075e929a48b12461214bcd6c0141d0fd07ec5cba87079880092b84acbd0e2163e23bd303d3fd8d7050112
 EBUILD vanilla-kernel-5.17.11.ebuild 3834 BLAKE2B 96e35e9617f82d38106724d4cab64a3d0b87d07feb954eb2ccbe17761a35cd6ac1e7839d14296b784a63300686fefca8315c348972e54d66f28b1621cc7f5d6e SHA512 69ebcaf1d64014bd059f0b7419f0bc2bd01c6f1de7925e7f02bd54e99cb493275a2057c3eb29c3689e6f4c45dd5538dbdcc3c5dda1d94346d38d2cc48890eab3
+EBUILD vanilla-kernel-5.17.12.ebuild 3835 BLAKE2B 105facabbabfc69467f389ffbbe66cee709dc1dd28baab4d811ca343b3093abbd5ece7d01baa7dba2e5edb3070d7171af78430ce6c47d44a809e07df6252794d SHA512 fa3996d7fc56342e31f37516113334694aa7ed7d0c934c7fb4a2725e4f42e4999fc3d3b11f6b21dec768e74ba99fb1fce77676845ee93596038d6a2b65df4b0c
 EBUILD vanilla-kernel-5.17.9.ebuild 3834 BLAKE2B 96e35e9617f82d38106724d4cab64a3d0b87d07feb954eb2ccbe17761a35cd6ac1e7839d14296b784a63300686fefca8315c348972e54d66f28b1621cc7f5d6e SHA512 69ebcaf1d64014bd059f0b7419f0bc2bd01c6f1de7925e7f02bd54e99cb493275a2057c3eb29c3689e6f4c45dd5538dbdcc3c5dda1d94346d38d2cc48890eab3
 EBUILD vanilla-kernel-5.4.195.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
 EBUILD vanilla-kernel-5.4.196.ebuild 3001 BLAKE2B 5c228a2307a9c32d2af3baecf92de59034512358a8e3f3942fc770fa80143465b145d80166c48c967439091894c3d4793c7f5a559881092b0b8b49afbbce9837 SHA512 e997a0389a227ab93c2d67723795e4250e82301c50dec1bf15b2a35fda941e9d32a21d8c277bd9f535872d4268b0ee03a1120f28899217717fd55df2d11370f2
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild
new file mode 100644
index 000000000000..96cb3e86fc4b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.119.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.44.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.44.ebuild
new file mode 100644
index 000000000000..0ef902726d5d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.44.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.12.ebuild
new file mode 100644
index 000000000000..bb3171ba9be9
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.17.12.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.17.11-gentoo
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 7b06b90f2a74..839f9877e935 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -9,16 +9,17 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST patch-4.14.281.xz 4732732 BLAKE2B 60db5d0fe5675a3fd794af5d68b4aad9970fd9816e6e0e67a0f34957012d7041af502c97ca540fa38a5446e8aa388bde630d9e99c76a00e07e130e486e99fb1e SHA512 c41f5837f8f6fa72694210bb4e16b9c37dc03932fd95813ddd4016337e10de6faa3480c54350cfbcd13c8467f5243491e1223116401513573ae852db3da01c68
 DIST patch-4.19.245.xz 4637388 BLAKE2B 9f8acc867a9c147babfb5475065ef3b58a2b993c126f4143843ea6f1b118a9d316bd303562797f6c278582610a87b2af7b016fb701ab03e2f48426c471e0287c SHA512 6c38156d583bde226fe06b91b08bc5d8c0d3601adc24d421d797319ec0db05e7266ab6d9c4fcedfefa4a6ce349ca4b68c5454640263fbf1436045e239fe7f5cc
 DIST patch-4.9.316.xz 310897 BLAKE2B 7ece59590d0b16833e394e655dc4466588f360622628610fddc9f8585482b9279d7d6ab9b95ae0db100caae87c3f12ac9cd31aebece63c6ee1fc090ed91cecf5 SHA512 ccef25de5039b92ec279de0721267709a130c793579e994f45bb040acaeb62cf0589c4e6a0006ee4ed9922a028e993fa61fc1897311519fa221ea011b139f6ba
-DIST patch-5.10.118.xz 3125740 BLAKE2B e023a5298649beb60b9b0704a04e37d4957ebba802dc8e2e48ed3d09ffc7cff6bfd07b2f8aaa0d401dae68196cc6ce4c1a97a07d0cb257b75ac07d6082a97eeb SHA512 d7ca67818437b685773a7e595aa1b6fc1fab172bd5d22217532af587df2e610a6144f5ec2bbad0478ff9f849ae6e6d7348e6ac9a6389f53080af01017ba87314
-DIST patch-5.15.43.xz 1763688 BLAKE2B 38b279dfc4ac9a80e9a2705dcc51e481f2040787fb241d1abce6ebc136635b81aa4271a24f4fab1aefe5db94c875f2480343d9d47cd43f8abe46ed03ca32cc14 SHA512 70c674983f00613615c927c90378ffcd1f0fadd8ac8622cd08633da74f7978972912cbd7020d4304e6fa9e3d41f3683c551d82615d095dcdd32be61498323e3b
-DIST patch-5.17.11.xz 748028 BLAKE2B a6cc1c3b8ce2aa4ea75b436ef10d607e91600b716d91273efacbe23ee0c687dd2f53ca0d21ea7ff50a7f0059eab5d5a07eefc72d03ce01db43427c7547638792 SHA512 59023e87e038f5bebf95f2a4149651090614868ab89c75ceb8c39952f367a98dc40fce406a6b0b7cab92400b8e575878cec3ef933ff77f8004a12fb52f5b68c5
+DIST patch-5.10.119.xz 3165400 BLAKE2B 480c8c1c61bca44b5ca9d51b208259e0f79298dd2f7a24a827be94ecf480adf81a1d503d67d6e158d99cca00221dc6effb2f9595c60a590bcf3e8b6fcfe691a7 SHA512 f21bb65fd71b1e7da2e945c4e3a5d8732dfa79a067cc070c072bac17f0195acdb162572c0996153041a1f3632380ea82e42607a24a97f9cc4ff186d936ddb372
+DIST patch-5.15.44.xz 1800820 BLAKE2B 2cf6bd8bbe0ca4052a8c0534c7b1e6cc6c0b9fe97db93495af8499badfed72492f91d48b58e4aacc0406e4612786cd34629c77b7f0fda5e87fb014c5e1ecca60 SHA512 fb8fdce86d51de27f8b3dc3f902e345bd824d21b419ec065420323cff099bb3dad0042f63ad7419f4cd0ea9a96a1654e39d92441c3162c32af0aeb134a752381
+DIST patch-5.17.12.xz 781212 BLAKE2B 87013768587e0b1de076e4f80055078700b7e9c3bb9181000138c90aa82c517024a9d5ae1e3c3e09c9673c3d1fb82e3b281dab893ff20ee0d7a60e806af39a04 SHA512 805f759b8d1a68bb72bf290375a6ae566d7f880aa4daf6ef02ca4cf2869fc67b7d6e15a78f7bd911be6b3ee832bda958e760aa0c0fda3b28e319b8254009c3f2
+DIST patch-5.18.1.xz 24248 BLAKE2B 099b4185f9c7606c0b1d5aa1081651e3856ae9eee297e91c3e02c96e02d2f0b99f645fd998c02f4fd12c2fc2bda1c566c37f3525fcd6663de1607fa3b021097e SHA512 d8f105b34b4a0f933cddc631f8f54ca2e50f055365c864f33c389972df03cb2cdf415eb47a2b2fbc0d43af6679fe21e3bb459d79d02103a2db8782146473910e
 DIST patch-5.4.196.xz 3934356 BLAKE2B 6e214b1999a51de5d6b27c38c526668e724201eca32c2aeb7cf0c90c9c5a3283b7e518716ce3ccd8e0ac7060b3a4445bbb71bdd806bfb3cd4bcfb036435a9ce0 SHA512 adf2d68abff20b806cd0d18c0017fa6b66aabf10b630cbfd63b3b9d4d1c8b8b2993f7fbe2582e888047f43e2a9f61b17fef3c37d52bdc635d7ae39f372efc07d
 EBUILD vanilla-sources-4.14.281.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.19.245.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-4.9.316.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.10.118.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.15.43.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.17.11.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
-EBUILD vanilla-sources-5.18.0.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.10.119.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.15.44.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.17.12.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
+EBUILD vanilla-sources-5.18.1.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 EBUILD vanilla-sources-5.4.196.ebuild 432 BLAKE2B dda6f8423db373ff759a5e27c8f6cf326e02492808a2988a5951c341b6fe1a04c0227177d5ee976407105283f373dc2873b17ee9d9f8f5932a0543e1fcab2b5f SHA512 db937cc0131f564666e60b413339241c1281b4a4be7dd6cf8191f4738ada75890caa09f25bdb6ff9ac6b4ff01afb21837eeb86ae632448525f5aab560380f942
 MISC metadata.xml 517 BLAKE2B 2871be490050fb99de129f0abf368bddb5e2604d2e1b63fed36ed19a07987f88a82c5aec08854f36755f017a4a5a961b5d247e15ded1900e40a4ad913b6233a5 SHA512 1bb6d299efadf5d251395a0c57a27e254e80ea193fe2b9bcf29c582f32e9067f9fe263c24853a0b653d0365957aa0268cc7150a6727e1e199af487d951959a1e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.10.118.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.10.119.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.10.118.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.10.119.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.43.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.44.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.15.43.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.15.44.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.17.11.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.17.12.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.17.11.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.17.12.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.18.0.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.18.1.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.18.0.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.18.1.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1abe533c2f5d..1770f6af1956 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/argp-standalone/Manifest b/sys-libs/argp-standalone/Manifest
index 82bef5752f46..dea77bc5db5c 100644
--- a/sys-libs/argp-standalone/Manifest
+++ b/sys-libs/argp-standalone/Manifest
@@ -1,7 +1,10 @@
 AUX argp-standalone-1.3-shared.patch 1711 BLAKE2B a1a4df243b805b889f03df0a35362ae065bb93c0846257038582f8202ee4f827d627fcbbe452491f5d0fc10ad53a7a1c8f54dde3867a4aef775655807fe8899a SHA512 080a214bb372df8bfefbceef106bd6a773ef3d722feab05e21d8d24bfad9a3da6598be03cafcde20f197ff4ea73c77abc4032fb446dbd358f98855e8842390b8
 AUX argp-standalone-1.3-throw-in-funcdef.patch 2500 BLAKE2B 050476f7dec2ff8d79e09f717eada121bc07ef26e0567c2d89ed18d44a4905741494d660ce82df8fb39f19020cf529b513d0e21b651197066d781250a921177e SHA512 5e4cdeeb16e6a4fb46a00ab95f3da9276ee554eec00bb2a05da7467961234ba3f9a630aafa7ceb5feb429a84ece8bf03b869fa996b86468f4716935a914c79a4
+AUX argp-standalone-1.5.0-shared.patch 1708 BLAKE2B e4be456d7ca598d1fba57ffb34745b2d103b17b065c320d557571f4df62696ed96fcc89c1a4cfc6301fa866ca1327aac54fc2730d759566d0a63c9b645fb4726 SHA512 8f0e1d9cfa1a6b76b7784c6353acb5bc82de3be0f69dc83270fb95d2aa118aa18328e32f9d6848493d7e6ce0cb52f7df36f1f15dce9d4d1ff1eaa9d56c06a744
 DIST argp-standalone-1.3.tar.gz 130255 BLAKE2B 0848a0e7a98cfa09de52fa152eb9a793a9bf25c1edfc7401851ef134b62c051ad6ef2134d6f528e167046be582be23f311e74614c5511d659060addc14de6b2f SHA512 58c3feb8852b90248fff39e49b5019bd0dcf646790c3eaf70c3262eb81dda31a61dc0a45963c7b4a010e80fc14b37288dcb3b3ef48d02f2d33dd72c1c62e62d9
 DIST argp-standalone-1.4.1.tar.gz 58158 BLAKE2B aa55965d6c4a9d61e82a5f3af7a62bf1a35b82ad91c87b4b31a6fa314ba0bcf30667137b420ccae5fbe24301c994971ef48c8dfa4db48620e56edc4300fbd961 SHA512 c5f07e88434589a13a2e88e66d1142b581f19aa82da28507f3c31ea782e080a13a4504d8108c003b5d3c8a3aa20f52ea5e81f337c11a4b1342b16361d4877c1c
+DIST argp-standalone-1.5.0.tar.gz 65889 BLAKE2B 01f4ceb3ad18be534605db09db708f17ab5df6bfd8fc0259451a70163c8e9bda92c4f9445e98d6b6cc0bc19bc61b8b122eddacf96bd026fc2ed0db00dda318f3 SHA512 fa2eb61ea00f7a13385e5c1e579dd88471d6ba3a13b6353e924fe71914b90b40688b42a9f1789bc246e03417fee1788b1990753cda8c8d4a544e85f26b63f9e2
 EBUILD argp-standalone-1.3-r2.ebuild 798 BLAKE2B 5ae6cbd67e575f2f43bb34812bc9db103e2a1562b688c72fafb84ab23df3c4a3b8e087c7c4f37624779656184660357925942be7775b8e793c2034792cf319e9 SHA512 9e71d722741aeae44aaf89e70df7932ec0336487dc8d06334d495cb478ca2e537f5ee3f75c14a366a38d5865c8d4472460a9fed4d8abb589c14a941f3fa2d3f5
 EBUILD argp-standalone-1.4.1-r1.ebuild 818 BLAKE2B 29f5058db3a21d18d413343f9076fdd4824041ecb40998d7cde05fe8282ec0714b113ed404fc68dd8ebcf3f79bb446ccd3a976393c61ecf2c3e6efb63ed56208 SHA512 87182b6412c9c85c205cf1df8f2e9ad644ec6f0bc1dbcb87a3f404a8e378ddc1d21ff50d1bf770b50459ed004bcca28e93baa9793270842a1484769de4b88646
+EBUILD argp-standalone-1.5.0.ebuild 819 BLAKE2B b196558123aa03f730b046c83cd08d3c01c0bd12e4eca2ebd44d46258fc4a4a08800e32d354dcae0eb978cd86198b861682a5fed62b01975fcc2f223d87fdf3e SHA512 31f31b911c2b871b15d6af9f6e1da50e7d535009dd90498db53c403b22a9311bad83fbda804bcd67f80277865edb9bdfd9af93a9067e97a16977af0e7f6cb618
 MISC metadata.xml 330 BLAKE2B b4dbb8cb3424140a3286bd442dc4996da5678ead43e08ce02fe8f86e6b7540c2c76f2221776e09e49f9b5e8e2ded3cc45f9b85c430cee0dc03e5d0e3c5f08b33 SHA512 aa460753f6f9537cb67f2d83a98108f9904e9bf1d50e030fe04822aa1f16b89cb91538fee54581aae1d05d8de070565113cecefe61a6078db1fb1eba69047e09
diff --git a/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
new file mode 100644
index 000000000000..29f3f326a366
--- /dev/null
+++ b/sys-libs/argp-standalone/argp-standalone-1.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Standalone argp library for use with musl"
+HOMEPAGE="https://github.com/argp-standalone/argp-standalone"
+SRC_URI="https://github.com/argp-standalone/argp-standalone/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain GPL-2 GPL-3 XC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~x86"
+IUSE="static-libs"
+
+DEPEND="!sys-libs/glibc"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-shared.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cflags "-fgnu89-inline"
+
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	insinto /usr/include
+	doins argp.h
+}
diff --git a/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
new file mode 100644
index 000000000000..1c6c599942c8
--- /dev/null
+++ b/sys-libs/argp-standalone/files/argp-standalone-1.5.0-shared.patch
@@ -0,0 +1,53 @@
+Initially added in https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb196546c62e9894a46900e8078f753388d4cc1a.
+Commit mentions it being from Debian but not found any other references yet.
+
+We use -largp fairly extensively across the tree which this patch
+accommodates (easier than forcing includes?).
+--- a/Makefile.am	2022-05-03 03:41:05.000000000 -0400
++++ b/Makefile.am	2022-05-30 12:28:33.850249380 -0400
+@@ -21,19 +21,19 @@
+ AUTOMAKE_OPTIONS = foreign
+ SUBDIRS = . testsuite
+ 
+-LIBOBJS = @LIBOBJS@
++LTLIBOBJS = @LTLIBOBJS@
+ 
+-noinst_LIBRARIES = libargp.a
++lib_LTLIBRARIES = libargp.la
+ noinst_PROGRAMS = argp-test
+ noinst_HEADERS = argp.h argp-fmtstream.h argp-namefrob.h # argp-comp.h
+ 
+ EXTRA_DIST = mempcpy.c strchrnul.c strndup.c Versions
+ 
+ # Leaves out argp-fs-xinl.c and argp-xinl.c
+-libargp_a_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
++libargp_la_SOURCES = argp-ba.c argp-eexst.c argp-fmtstream.c \
+ 		    argp-help.c argp-parse.c argp-pv.c \
+ 		    argp-pvh.c
+ 
+-libargp_a_LIBADD = $(LIBOBJS)
++libargp_la_LIBADD = $(LTLIBOBJS)
+ 
+-argp_test_LDADD = libargp.a
++argp_test_LDADD = libargp.la
+--- a/configure.ac	2022-05-03 03:41:05.000000000 -0400
++++ b/configure.ac	2022-05-30 12:27:08.688735341 -0400
+@@ -17,6 +17,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_RANLIB
+ AM_PROG_CC_STDC
++AC_PROG_LIBTOOL
+ 
+ if test "x$am_cv_prog_cc_stdc" = xno ; then
+   AC_ERROR([the C compiler doesn't handle ANSI-C])
+--- a/testsuite/Makefile.am	2022-05-03 03:41:05.000000000 -0400
++++ b/testsuite/Makefile.am	2022-05-30 12:27:08.688735341 -0400
+@@ -5,7 +5,7 @@
+ 
+ noinst_PROGRAMS = $(TS_PROGS) ex1 ex3 ex4
+ 
+-LDADD = ../libargp.a
++LDADD = -L../.libs -largp
+ 
+ EXTRA_DIST = $(TS_SH) run-tests
+ CLEANFILES = test.out
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 3e92711dfcd9..620c55fe67bf 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -2,14 +2,17 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841a
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc248c00ff6778f1a14e3e7999e5d52a1b0b9c3b2e66e8c008e27c62c6c3c08009dc7d9d083ca53698138258ac972e4ad03c042 SHA512 a9f071ad0a792f558105a64790f9e470d8aaed05bd1baabbe86539760c881f772602a03265e0962d8599f991f7fd44d14a49e2ef9d74bb5eb283f473f4084d32
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
+DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD compiler-rt-sanitizers-12.0.1.ebuild 5959 BLAKE2B acfa1240b3ffa450fe5ede50a6d8bc9d32b06bea46da57f82c004fbde8e69693242037f9571bf885f56d16d3ead4711402f1c3a2bf65fb42741ea95b12a1baff SHA512 cf095eeaf547d431d60b11f147e5e8a03e3659a3b56ec98be4af3fdbd4cb3ed16891eb8066187bff27613f0c6a37d30d08725df95419b515f1038087c149ad82
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6337 BLAKE2B 67f5e39af19ab6e4dccb2989d044a1f148a7e3cafd7134ea7ccdc75481416158613137e3cc7204d32b3c868d00e5047c9d378f09814b8fc1e46ad876d5214423 SHA512 c49b998f5f990103e53253f22f19313e3b8e884818bdc5b651ee976957f8fa10d36ce6146b1db65336c60e4f22f67c435c5841e0f8cea48901724790d3c6738f
 EBUILD compiler-rt-sanitizers-14.0.1.ebuild 6348 BLAKE2B b5af3a1463dbd380734be4ac8bfca915433b6211d2c4a4c1d72d78a9fed3ad6019af27acd3ae35ad2b5c08c1c79dc474fcd4ef61081486db7287ebebbb0aefd2 SHA512 2c20d2182c590f03eab7a59861da8ae324446df3d5a4a4d6b23f49ae9090645c494fc9673f43b2648b201ac330dab9fb104823435763713772e1bffd7e46f44b
 EBUILD compiler-rt-sanitizers-14.0.3.ebuild 6351 BLAKE2B 635b4e58dcd3469c586bd54327640759fc33ea17e86974fc40cdde02a7df22626e4d9e1a7462076fd9d7511a66f0124daf000e3af3ae0206d8080fbe337e63a5 SHA512 8bc9ac8fa1d2eea753b9de57bd27c66903723f4fefeb35781820f80eb2166de6d336240836dca0557e7df8c934aba8f9275f470d1b8129a8bef7122a092db857
+EBUILD compiler-rt-sanitizers-14.0.4.ebuild 6351 BLAKE2B 635b4e58dcd3469c586bd54327640759fc33ea17e86974fc40cdde02a7df22626e4d9e1a7462076fd9d7511a66f0124daf000e3af3ae0206d8080fbe337e63a5 SHA512 8bc9ac8fa1d2eea753b9de57bd27c66903723f4fefeb35781820f80eb2166de6d336240836dca0557e7df8c934aba8f9275f470d1b8129a8bef7122a092db857
 EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6281 BLAKE2B 1535547da34623ff67d497136d5757a5ff788622e8077fa78c64a388637a27954e0aa39873abfb5f014029bf88d4f0349536a33194d11089137e843cb9fadc9e SHA512 9d79e661e825e3f4670efcbf6efe40c6051ab5100b0fdb2ae4bc761665b8dbcfb795e7147836044d0eb1d57cd9c2eec228004bcb13bc303d919e2d3912c58f7f
 MISC metadata.xml 1330 BLAKE2B 8381c36fb0ee37358cebacf512ee2a0ff6f2c0fc8e05544d9dc1bb1e11bc53f4196c2ecc6c8eb66c833f266c8d12da2c92a5f0b94cb3404397f925f9ebfc2a72 SHA512 6ea6159eb0929dc9f009ab326295549db329f7594dd5ff82e255238ed1fb17e3e8909079c915c6ae4829bb853666456772d17fa2078a332f6340807d6cd4f20e
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
new file mode 100644
index 000000000000..433da0366bd7
--- /dev/null
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.4.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
+
+DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+# base targets
+IUSE+=" +libfuzzer +memprof +orc +profile +xray"
+# sanitizer targets, keep in sync with config-ix.cmake
+# NB: ubsan, scudo deliberately match two entries
+SANITIZER_FLAGS=(
+	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
+	shadowcallstack gwp-asan
+)
+IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
+REQUIRED_USE="
+	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
+	test? (
+		cfi? ( ubsan )
+		gwp-asan? ( scudo )
+	)
+"
+RESTRICT="
+	!clang? ( test )
+	!test? ( test )
+"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	elibc_glibc? ( net-libs/libtirpc )
+	test? (
+		!<sys-apps/sandbox-2.13
+		$(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+		sys-libs/compiler-rt:${SLOT}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake )
+LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
+LLVM_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+check_space() {
+	if use test; then
+		local CHECKREQS_DISK_BUILD=11G
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	check_space
+}
+
+pkg_setup() {
+	check_space
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
+
+	local flag
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if ! use "${flag}"; then
+			local cmake_flag=${flag/-/_}
+			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
+				cmake/config-ix.cmake || die
+		fi
+	done
+
+	# TODO: fix these tests to be skipped upstream
+	if use asan && ! use profile; then
+		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
+	fi
+	if use ubsan && ! use cfi; then
+		> test/cfi/CMakeLists.txt || die
+	fi
+
+	llvm.org_src_prepare
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/compiler-rt_build
+
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+	fi
+
+	local flag want_sanitizer=OFF
+	for flag in "${SANITIZER_FLAGS[@]}"; do
+		if use "${flag}"; then
+			want_sanitizer=ON
+			break
+		fi
+	done
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+		# use a build dir structure consistent with install
+		# this makes it possible to easily deploy test-friendly clang
+		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		# builtins & crt installed by sys-libs/compiler-rt
+		-DCOMPILER_RT_BUILD_BUILTINS=OFF
+		-DCOMPILER_RT_BUILD_CRT=OFF
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
+		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			# they are created during src_test()
+			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+
+		# same flags are passed for build & tests, so we need to strip
+		# them down to a subset supported by clang
+		CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
+		CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
+		strip-unsupported-flags
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX
+			# This disables i386 for SDK >= 10.15
+			# Will error if has_use tsan and SDK < 10.12
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
+		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
+		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
+
+		# copy clang over since resource_dir is located relatively to binary
+		# therefore, we can put our new libraries in it
+		mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
+		cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
+			"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
+		cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
+			"${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
+		cp "${sys_dir}"/*builtins*.a \
+			"${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
+		# we also need LLVMgold.so for gold-based tests
+		if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
+			ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
+				"${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
+		fi
+	fi
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+	# disable sandbox to have it stop clobbering LD_PRELOAD
+	local -x SANDBOX_ON=0
+	# wipe LD_PRELOAD to make ASAN happy
+	local -x LD_PRELOAD=
+
+	cmake_build check-all
+}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index e6e31f372bec..67be9315e380 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -2,14 +2,17 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841a
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc248c00ff6778f1a14e3e7999e5d52a1b0b9c3b2e66e8c008e27c62c6c3c08009dc7d9d083ca53698138258ac972e4ad03c042 SHA512 a9f071ad0a792f558105a64790f9e470d8aaed05bd1baabbe86539760c881f772602a03265e0962d8599f991f7fd44d14a49e2ef9d74bb5eb283f473f4084d32
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
+DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD compiler-rt-12.0.1.ebuild 3539 BLAKE2B 7d6bd0a7be4fec1b8427aa9d81eacf69d3338490c70f097910ad0bb4a67f0313ea8fd6bae15a5e05b8805cad6a789124d94ee91577a58beb96f471a1bf49c3b3 SHA512 bd671f1896182a00ade3b53252ba6b7cb8a6f65eec3d806bbfc7bd4e2b9253a8bc2bd497c018705f34fb30ad1897693af268c6e4cc39e044c788807042d7b55e
 EBUILD compiler-rt-13.0.1.ebuild 3868 BLAKE2B b2b643b850023513b69076bc791b22b74aa54445250cba334a2d3dfdc26a1ea11d30d1ce9df6cb2d1c813b66eaa59a130821470b3a3076237f9ef93d2919a124 SHA512 334a2609ae6882dbbb9caca5bb3bc7ba0a668f9a8f337570d54bde926d7ebfaa87fe4e53dddc73ea602b2d52e7537b9490f8936736480f1ddac6c9caf7b6832d
 EBUILD compiler-rt-14.0.1.ebuild 3879 BLAKE2B f67b9247bb931ef6fe9de922e98842a2df8271e17eba634a34bab201670a8e0ada3a252b378e4a5584ac8d40a32b254a2970a1294dfc75a9198757f4164f403e SHA512 2cd68cecd5e1207086f99d469234fb147e3b64fc65a111260e18b1668efcbe1caa2ce3852a528433bc8c27d0f3575e8089c4d8b118f0ed86ac8941c9a9f9b3c3
 EBUILD compiler-rt-14.0.3.ebuild 3877 BLAKE2B f86d43aa88361017a82b659262e9d997c4a3520b446836fa4ab48510060d19e246443d1acc0f717f256ecf6dad6f8c93a7c55b9e8373f3d837515c12ea26f168 SHA512 ec4ebd8a3343d28b41bf991a0b00d4df058ef0b53204cbcd786e83f659eadea377822c7ad8043f0fda381255ebd7386c32ebd4a87d3c60bc774e682cbb069807
+EBUILD compiler-rt-14.0.4.ebuild 3877 BLAKE2B f86d43aa88361017a82b659262e9d997c4a3520b446836fa4ab48510060d19e246443d1acc0f717f256ecf6dad6f8c93a7c55b9e8373f3d837515c12ea26f168 SHA512 ec4ebd8a3343d28b41bf991a0b00d4df058ef0b53204cbcd786e83f659eadea377822c7ad8043f0fda381255ebd7386c32ebd4a87d3c60bc774e682cbb069807
 EBUILD compiler-rt-15.0.0.9999.ebuild 3803 BLAKE2B 8b63b280b28c95627852a737b9a5838d57682dff031eda2f436c2c624eeab2a76f809a1687f24fddc81ff8d22c50877077f6aeec0e649951bf0338952582872b SHA512 889b8d1d835fb9717511b042399946f1afbc0beb7b1468a347d90ec185e98caf5eba7093b823e16f90939764cd2781fb0141135ccbd3ec73047cb9f38371323c
 MISC metadata.xml 334 BLAKE2B e52ad011edc624e8b4c6449a9c77d0972222c4e3ecad01ea24eb9f3175053b191df6267886a186bc3e169581b86b624b6c77f37fac763a12129a1dd8cd6ee285 SHA512 1bf0f62c12690e6596650e8872405fc53bc3c4bbddcf80e02b3bcce9b762f0aa02d462949b9b54c0c930ca6cce5518333e79951ae57378def8eb9719463a9297
diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.4.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.4.ebuild
new file mode 100644
index 000000000000..dcbada06ccf0
--- /dev/null
+++ b/sys-libs/compiler-rt/compiler-rt-14.0.4.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Compiler runtime library for clang (built-in part)"
+HOMEPAGE="https://llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
+RESTRICT="!test? ( test ) !clang? ( test )"
+
+CLANG_SLOT=${SLOT%%.*}
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	>=dev-util/cmake-3.16
+	clang? ( sys-devel/clang )
+	test? (
+		$(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]")
+		=sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
+	)
+	!test? (
+		${PYTHON_DEPS}
+	)
+"
+
+LLVM_COMPONENTS=( compiler-rt cmake )
+LLVM_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if ! use clang && ! tc-is-clang; then
+		ewarn "Building using a compiler other than clang may result in broken atomics"
+		ewarn "library. Enable USE=clang unless you have a very good reason not to."
+	fi
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+test_compiler() {
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	# pre-set since we need to pass it to cmake
+	BUILD_DIR=${WORKDIR}/${P}_build
+
+	local nolib_flags=( -nodefaultlibs -lc )
+	if use clang; then
+		local -x CC=${CHOST}-clang
+		local -x CXX=${CHOST}-clang++
+		strip-unsupported-flags
+		# ensure we can use clang before installing compiler-rt
+		local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+	elif ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
+
+		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
+		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
+		-DCOMPILER_RT_BUILD_MEMPROF=OFF
+		-DCOMPILER_RT_BUILD_ORC=OFF
+		-DCOMPILER_RT_BUILD_PROFILE=OFF
+		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
+		-DCOMPILER_RT_BUILD_XRAY=OFF
+
+		-DPython3_EXECUTABLE="${PYTHON}"
+	)
+
+	if use amd64; then
+		mycmakeargs+=(
+			-DCAN_TARGET_i386=$(usex abi_x86_32)
+			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
+		)
+	fi
+
+	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
+		mycmakeargs+=(
+			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
+			# this allows adding arm64 support using SDK in EPREFIX
+			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
+			# Set version based on the SDK in EPREFIX.
+			# This disables i386 for SDK >= 10.15
+			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
+			# Use our libtool instead of looking it up with xcrun
+			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
+		)
+	fi
+
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+
+			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
+			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-builtins
+}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 67a892955f1f..59a5f1883ffa 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -2,14 +2,17 @@ DIST llvm-gentoo-patchset-12.0.1.tar.xz 5280 BLAKE2B 963d005bc7b636570be90eb841a
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d SHA512 b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvm-gentoo-patchset-14.0.1.tar.xz 4724 BLAKE2B 2689298c687fa8b5fa2545afccc248c00ff6778f1a14e3e7999e5d52a1b0b9c3b2e66e8c008e27c62c6c3c08009dc7d9d083ca53698138258ac972e4ad03c042 SHA512 a9f071ad0a792f558105a64790f9e470d8aaed05bd1baabbe86539760c881f772602a03265e0962d8599f991f7fd44d14a49e2ef9d74bb5eb283f473f4084d32
 DIST llvm-gentoo-patchset-14.0.3.tar.xz 5492 BLAKE2B 48a46d50a81c5572d1573c6923bc404b198f74ee8587a928e0858553dac37f7fa39cc969d72b938ef3d2f04f6872f9e2e2478821ab90c657ecbbacb3f7d99d7a SHA512 b917b549de6d46cd7aab3e59b888b5e5ffb955435b33d6538be2f31dc30217a24740a673cb6bb661087c245121edb079052b179badaf70b86b985ca69b3652a6
+DIST llvm-gentoo-patchset-14.0.4.tar.xz 4072 BLAKE2B cbd8804e33069ca2709503931545a57cfd33c06f28696d876d499285e9add9487a069495b756bbb94d29a162c39ece651defddd302e3ac523c5484c09fb3d2ea SHA512 db00268d01e7ec99b907321384c02468a53020386ee4fc819fabfc1cd0784323044931dac42437968d5fd37190da1b9f8f847af553a65a0595c33cecfd82c293
 DIST llvm-gentoo-patchset-9999-1.tar.xz 4032 BLAKE2B b9413484dafed8ae0c68c2c164b45fd07bb8d5d0898f03abe118fd2120ffcb1fb6c949de9649a97c2e8105f24b9d131a725c67c0a502ca4d4d192c1a0d65f49d SHA512 e64449eeaf756c5bd945109937b84ba4bd8a015222bd792d39cf3947871e87571a4ca57814790e51544cb05ad4c2d1f044e818e4caaac7c2e2a02cb1aa290fcc
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d SHA512 6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libcxx-12.0.1.ebuild 6677 BLAKE2B 32a2f3bbff395d3c129cd4d168a8cb0ee1074c3fc164bf9a33f3287852c07af3e7443018b3fa31036f851cf5544bf80db0579ba2dfa2a3420801a6aef0dd6b05 SHA512 3820b6a249a36cf12ba72b4c4a3847ec035265ce23388dcdbc0547c5708737eee4cf449b14370badc13be3f79ecda2f3c788ac6c7f2f8063c3dd53b1e7b1bf62
 EBUILD libcxx-13.0.1.ebuild 6780 BLAKE2B 575c9089d74bddc871e97147c53f7c298cd1683b989eba6b50601b45693c11d0647e3bd6f70c0a75caaea7ee3fea2f88f1bbad444d7f1785a62175337659e2e3 SHA512 f0ff78e48acca25cb925aee5106fba0d547ab8522ccfd65e2198d4f481f83abbadc415ac3808e45387fc945980f9892fdbda3b6a26d54163cebfa4f12fa17172
 EBUILD libcxx-14.0.1.ebuild 6937 BLAKE2B 04722fb717fcf971cfad08599681619a1f003ef487ba73dded68aa1661a8ad64369f30844379750045e81df0959d5d3b2416e9fbe4b2f7faf7043456ed913abe SHA512 ae21926685648e200c8ad649d7172c70962b17fc447a6c5b0d7979d31a7fd3428f54ed43efb24ee1af1868ef059d7519a886b427b5cd18ce0489d7b3dee3cd04
 EBUILD libcxx-14.0.3.ebuild 6955 BLAKE2B ae137995613e1805f7ebbb2240e7b925ba8571c28a023294134e3609e7bb721839d96680bdff63ee7ae1ab03ca82b3bb19e291b33d16493fb73e490ba170ce79 SHA512 ef1a30de8f760b53f6aacc9f09a7bf69142868b5df59e095b728ca334c7153122be581bd9b0c96c2e36cedbdc6d017eb7ea4caee86c21cdf711aa37d929a2caf
+EBUILD libcxx-14.0.4.ebuild 6955 BLAKE2B ae137995613e1805f7ebbb2240e7b925ba8571c28a023294134e3609e7bb721839d96680bdff63ee7ae1ab03ca82b3bb19e291b33d16493fb73e490ba170ce79 SHA512 ef1a30de8f760b53f6aacc9f09a7bf69142868b5df59e095b728ca334c7153122be581bd9b0c96c2e36cedbdc6d017eb7ea4caee86c21cdf711aa37d929a2caf
 EBUILD libcxx-15.0.0.9999.ebuild 6915 BLAKE2B 57856c3d8585b4661c87e41f73d033d6060ea8d9ee8adf6f0892bd88ed0d4aa5600f71fa59f4f4094103d8ed58a67ced6b245d11aefbc8c8d68b066fabde40c7 SHA512 c373d2052b681063a7939066866a2d52213626f588c022876dc8f36da5d37f0ddb87a31ae93708043d8a95b88a9e8f101e9c2a507a606b82fe507d1adc8f20ae
 MISC metadata.xml 622 BLAKE2B 33ff3f89844694f08cdcdb12d7098ad937041c31aa6f453fbd887bfebec688bc05552f9a39431daccd2b309a58c2fb75b04a6350410f90beb96f32c14ab3ca95 SHA512 8b3d12f8904c336cc35f31352014ffe247dd4475f143921cdd56e5396590ebd64fb700df64f76e83aece127d8ed39af5f45da086fa75fca841c9a5ad767cbed2
diff --git a/sys-libs/libcxx/libcxx-14.0.4.ebuild b/sys-libs/libcxx/libcxx-14.0.4.ebuild
new file mode 100644
index 000000000000..4d6be5bcc7f2
--- /dev/null
+++ b/sys-libs/libcxx/libcxx-14.0.4.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
+HOMEPAGE="https://libcxx.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="+libcxxabi +libunwind static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="libunwind? ( libcxxabi )"
+
+RDEPEND="
+	libcxxabi? (
+		~sys-libs/libcxxabi-${PV}[libunwind=,static-libs?,${MULTILIB_USEDEP}]
+	)
+	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
+"
+# llvm-6 for new lit options
+# clang-3.9.0 installs necessary target symlinks unconditionally
+# which removes the need for MULTILIB_USEDEP
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=dev-util/cmake-3.16
+		>=sys-devel/clang-3.9.0
+		sys-devel/gdb[python]
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
+LLVM_PATCHSET=${PV}
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# Darwin Prefix builds do not have llvm installed yet, so rely on
+	# bootstrap-prefix to set the appropriate path vars to LLVM instead
+	# of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+
+	if ! use libcxxabi && ! tc-is-gcc ; then
+		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
+		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
+		eerror "and try again."
+		die
+	fi
+}
+
+test_compiler() {
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
+		<<<'int main() { return 0; }' &>/dev/null
+}
+
+src_configure() {
+	# note: we need to do this before multilib kicks in since it will
+	# alter the CHOST
+	local cxxabi cxxabi_incs
+	if use libcxxabi; then
+		cxxabi=system-libcxxabi
+		cxxabi_incs="${EPREFIX}/usr/include/libcxxabi"
+	else
+		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
+		cxxabi=libsupc++
+		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	# we want -lgcc_s for unwinder, and for compiler runtime when using
+	# gcc, clang with gcc runtime (or any unknown compiler)
+	local extra_libs=() want_gcc_s=ON want_compiler_rt=OFF
+	if use libunwind; then
+		# work-around missing -lunwind upstream
+		extra_libs+=( -lunwind )
+		# if we're using libunwind and clang with compiler-rt, we want
+		# to link to compiler-rt instead of -lgcc_s
+		if tc-is-clang; then
+			local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			   ${LDFLAGS} -print-libgcc-file-name)
+			if [[ ${compiler_rt} == *libclang_rt* ]]; then
+				want_gcc_s=OFF
+				want_compiler_rt=ON
+				extra_libs+=( "${compiler_rt}" )
+			fi
+		fi
+	elif [[ ${CHOST} == *-darwin* ]] && tc-is-clang; then
+		# clang-based darwin prefix disables libunwind useflag during
+		# bootstrap, because libunwind is not in the prefix yet.
+		# override the default, though, because clang based libcxx
+		# should never use gcc_s on Darwin.
+		want_gcc_s=OFF
+		# compiler_rt is not available in EPREFIX during bootstrap,
+		# so we cannot link to it yet anyway, so keep the defaults
+		# of want_compiler_rt=OFF and extra_libs=()
+	fi
+
+	# bootstrap: cmake is unhappy if compiler can't link to stdlib
+	local nolib_flags=( -nodefaultlibs -lc )
+	if ! test_compiler; then
+		if test_compiler "${nolib_flags[@]}"; then
+			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
+			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES=libcxx
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXX_CXX_ABI=${cxxabi}
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
+		# we're using our own mechanism for generating linker scripts
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=${want_gcc_s}
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=$(usex test)
+		-DLIBCXX_USE_COMPILER_RT=${want_compiler_rt}
+		-DLIBCXX_HAS_ATOMIC_LIB=${want_gcc_s}
+		-DLIBCXX_TARGET_TRIPLE="${CHOST}"
+		-DCMAKE_SHARED_LINKER_FLAGS="${extra_libs[*]} ${LDFLAGS}"
+	)
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DLIBCXX_LINK_TESTS_WITH_SHARED_LIBCXXABI=ON
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxx
+}
+
+# Usage: deps
+gen_ldscript() {
+	local output_format
+	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
+	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
+
+	cat <<-END_LDSCRIPT
+/* GNU ld script
+   Include missing dependencies
+*/
+${output_format}
+GROUP ( $@ )
+END_LDSCRIPT
+}
+
+gen_static_ldscript() {
+	local libdir=$(get_libdir)
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.a" "libsupc++.a")
+
+	# Move it first.
+	mv "${ED}/usr/${libdir}/libc++.a" "${ED}/usr/${libdir}/libc++_static.a" || die
+	# Generate libc++.a ldscript for inclusion of its dependencies so that
+	# clang++ -stdlib=libc++ -static works out of the box.
+	local deps="libc++_static.a ${cxxabi_lib} $(usex libunwind libunwind.a libgcc_eh.a)"
+	# On Linux/glibc it does not link without libpthread or libdl. It is
+	# fine on FreeBSD.
+	use elibc_glibc && deps+=" libpthread.a libdl.a"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.a" || die
+}
+
+gen_shared_ldscript() {
+	local libdir=$(get_libdir)
+	# libsupc++ doesn't have a shared version
+	local cxxabi_lib=$(usex libcxxabi "libc++abi.so" "libsupc++.a")
+
+	mv "${ED}/usr/${libdir}/libc++.so" "${ED}/usr/${libdir}/libc++_shared.so" || die
+	local deps="libc++_shared.so ${cxxabi_lib} $(usex libunwind libunwind.so libgcc_s.so)"
+
+	gen_ldscript "${deps}" > "${ED}/usr/${libdir}/libc++.so" || die
+}
+
+multilib_src_install() {
+	cmake_src_install
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		gen_shared_ldscript
+		use static-libs && gen_static_ldscript
+	fi
+}
+
+pkg_postinst() {
+	elog "This package (${PN}) is mainly intended as a replacement for the C++"
+	elog "standard library when using clang."
+	elog "To use it, instead of libstdc++, use:"
+	elog "    clang++ -stdlib=libc++"
+	elog "to compile your C++ programs."
+}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 9104ad483782..12a2c0ea45af 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -2,9 +2,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libcxxabi-12.0.1.ebuild 3532 BLAKE2B 87f97e6d1d5c222b1a421bc7ee0fb1e9f0156c5f34888456dc265356fd2ae5e1b22343cd8970acf2820852f9be12d48006dee1d9493972b5761781156393735d SHA512 6369fbc69360eb0bb25e49d4fc554b897a86c7ac081c99cdc97bf61ddfa6cfe75c297afb91fa3c8fb6f24db67cc326a5ee3de74e10fdab1702d1894b3a5ba8a3
 EBUILD libcxxabi-13.0.1.ebuild 3605 BLAKE2B 7bdc8ecd9c35cdc247f08f9d5687d7362013be7c9c5afe006817cb5a384d4dd272bc686c6fe2ddf2a9bde5be8d1fa185ae60da940fded833a356f76e6105feb8 SHA512 69c4564fc68e3037620de0ce0cda29093bff9eb919f48f4760558edd1031c0d198991e6346774244701679aa0619d6afd814ec80d0d66265418408416621d9d0
 EBUILD libcxxabi-14.0.1.ebuild 3500 BLAKE2B ae2784bce2de92f63f5a0c30a74738ec77e80c69b59d976deca43442a70fa3b0c82eb1d3ea0ece17e317806c8a3f5a88729ed4fe8e7eb4af1602874d848e9400 SHA512 80b46ae415783bb1b64613d144530d0dda03114fb732ccbe3cce10996ca29fb11418f9c06912f64ba4657ff123ebe22d94acadf0628e6f19cb25a42b80b752b7
 EBUILD libcxxabi-14.0.3.ebuild 3519 BLAKE2B a697541ba82ecf955b816ee75be0f1607cbe37d7cb8372aca749b0c42f6e3a247591cace54ab010de166a1167ba5448c5e3ae1f8d585a8b6080fa0adaaedd243 SHA512 0f296a7b432f6e5a657ad54b5062b8aeb9a814da36021a4b5a0b7455f3d5c2fd69dc854203a388d016bff89e063426fea7b81f6b5d0f57bfa1f09cf9d48c3665
+EBUILD libcxxabi-14.0.4.ebuild 3519 BLAKE2B a697541ba82ecf955b816ee75be0f1607cbe37d7cb8372aca749b0c42f6e3a247591cace54ab010de166a1167ba5448c5e3ae1f8d585a8b6080fa0adaaedd243 SHA512 0f296a7b432f6e5a657ad54b5062b8aeb9a814da36021a4b5a0b7455f3d5c2fd69dc854203a388d016bff89e063426fea7b81f6b5d0f57bfa1f09cf9d48c3665
 EBUILD libcxxabi-15.0.0.9999.ebuild 3478 BLAKE2B 4a9508f17dbf7f1587915b565d9a572b20762c75dd1d89472df2ff4c01cb06b02c9d48bfa0a636b187d943fce1cfe3c826445ebd34657dcbe3b2314287fafc2d SHA512 79d6e8b143d1d4f8e08634eea94c5c02f175aca3f330ef008a95377dc03dc33fe8a9c36a77e7e636f74a365954020a57853a241b52ee246681703ae61f4bcadb
 MISC metadata.xml 351 BLAKE2B 9071a2cbb0eee25e4396bd720f39cd09b011e70fa4a2a87bab63801fa54d307304219a6bddc9b6fb8d0e3b32b07ea09d0419b8ea74af25d601505c3b577c656a SHA512 096b95417b8cdaeed177108ac27e54cd44c4488e8dd3b6ca0aa07f2c70fc59d42343c926d44adf54349e3f9791b9151293383e471df1282678a3c60031184d13
diff --git a/sys-libs/libcxxabi/libcxxabi-14.0.4.ebuild b/sys-libs/libcxxabi/libcxxabi-14.0.4.ebuild
new file mode 100644
index 000000000000..7d864cba3621
--- /dev/null
+++ b/sys-libs/libcxxabi/libcxxabi-14.0.4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="Low level support for a standard C++ library"
+HOMEPAGE="https://libcxxabi.llvm.org/"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+IUSE="+libunwind static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libunwind? (
+		|| (
+			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
+		)
+	)
+"
+# llvm-6 for new lit options
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
+	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
+	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
+		llvm_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# link against compiler-rt instead of libgcc if we are using clang with libunwind
+	local want_compiler_rt=OFF
+	if use libunwind && tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+			${LDFLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			want_compiler_rt=ON
+		fi
+	fi
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLIBCXXABI_ENABLE_SHARED=ON
+		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
+		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
+		-DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind)
+		-DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt}
+
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		-DLIBCXXABI_TARGET_TRIPLE="${CHOST}"
+
+		-DLIBCXX_LIBDIR_SUFFIX=
+		-DLIBCXX_ENABLE_SHARED=ON
+		-DLIBCXX_ENABLE_STATIC=OFF
+		-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+		-DLIBCXX_CXX_ABI=libcxxabi
+		-DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
+		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+		-DLIBCXX_HAS_GCC_S_LIB=OFF
+		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		-DLIBCXX_INCLUDE_TESTS=OFF
+		-DLIBCXX_TARGET_TRIPLE="${CHOST}"
+	)
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		mycmakeargs+=(
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
+			-DPython3_EXECUTABLE="${PYTHON}"
+		)
+	fi
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	cmake_build cxxabi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-cxxabi
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" cmake_build install-cxxabi
+}
+
+multilib_src_install_all() {
+	insinto /usr/include/libcxxabi
+	doins -r "${WORKDIR}"/libcxxabi/include/.
+}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index d2d91badefba..7d3ae38dfc2f 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -4,9 +4,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD libomp-12.0.1.ebuild 2955 BLAKE2B 731a206c38d7c982b1b746517061de539c64e1d3bd5afd24c2e1d441bbcd7e91d80e6b20920d64eabaf0c3de85d5e269ef59c17ebdbe30c8808f1deeff495b88 SHA512 0d27c7374062a9831edcadbbea0787998184fca979637da1bab9b8848b3c7165e5e558fc9ef388a1f8d9e20e913b61e7fd19c3e9f2ecf885990a041a0f436156
 EBUILD libomp-13.0.1.ebuild 3836 BLAKE2B bfecc3ecb5928ba0c4f1e79baf7108705b33b654631ebc05a52bebab494eebefe6ec1f7403170f5e0b541942618a88ebad52f5ba80bf185a2544170df3c84bcc SHA512 97a257c4e40440c83dc72d76f67d5b4b49ea74b138e541163c3bc938a50052fae3ae988c60a290c1b0051efc623f9be464c1801b5b7569a8cbb446724fe8267b
 EBUILD libomp-14.0.1.ebuild 3817 BLAKE2B 7f5c80c1a8e6995b58576911a3ab73a3dd1b66338889ab5b6396589aae574aae1cd85529ff9a5baa1dd565f2c260964445062a7575e3bfb8ff74b8f1b92a57e7 SHA512 2bc2897f6e6863d9a4d1e18d09b253d918fe8353e2af094995bef4d86880d1b85377d882782c6e84223ca19ebe93108f380ac602e3b6680d2927f6874bb3e1b5
 EBUILD libomp-14.0.3.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
+EBUILD libomp-14.0.4.ebuild 3828 BLAKE2B 0887d1ac8543821e06bb09a1c3b3331c7d727fc9101232893f19270a7bdc0092c9be0c85e5a9976450e7c131fff8918346515fbf880c700ebd113a5c399948a8 SHA512 d82f5e9129e7515cbf2d836519de4b7ddecc14ed9948584f3a49ea58d6dbd27a0b90a88d5329a9bc568e4063daf0c9ce8755c6c9ddcadad1a56a1f7142511721
 EBUILD libomp-15.0.0.9999.ebuild 3762 BLAKE2B ec449c1019da76ad9d1835e9a86f776e97a83740da240a2e98221d3f5d5eff7911b894584bb37da8fe2375670d5a6a67e41a5523f957694cd3e138543b5ba925 SHA512 643d3c43a9fba97ea44b94d3edd07ffbb487aa8260856fed8a158646873a7e45797c11aed020b224642db7e90da0fb705cd10f69fd0da5139d42b9560b9f2542
 MISC metadata.xml 826 BLAKE2B 94bad2982b52156c2755f4fcdc534648e30b45b514f486028d7beba9af050c3c6847a33fdc11cbf26195794b8e8a7cbeb4e110b8b4398f784c7b7c3edeea02ca SHA512 60de2890b1edc3d60feb5b04dbce840b17e0812ff301f00fd7c12242d3b81cdb3b8ad7afeb3624d70526a93cf8285c96a65b5fcd0384dd093b722c1ae645fa2f
diff --git a/sys-libs/libomp/libomp-14.0.4.ebuild b/sys-libs/libomp/libomp-14.0.4.ebuild
new file mode 100644
index 000000000000..987d01113d97
--- /dev/null
+++ b/sys-libs/libomp/libomp-14.0.4.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib linux-info llvm llvm.org python-any-r1
+
+DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
+HOMEPAGE="https://openmp.llvm.org"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+IUSE="
+	cuda debug hwloc offload ompt test
+	llvm_targets_AMDGPU llvm_targets_NVPTX
+"
+RESTRICT="!test? ( test )"
+# CUDA works only with the x86_64 ABI
+REQUIRED_USE="
+	cuda? ( llvm_targets_NVPTX )
+	offload? ( cuda? ( abi_x86_64 ) )
+"
+
+RDEPEND="
+	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
+	offload? (
+		virtual/libelf:=[${MULTILIB_USEDEP}]
+		dev-libs/libffi:=[${MULTILIB_USEDEP}]
+		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
+		cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	)
+"
+# tests:
+# - dev-python/lit provides the test runner
+# - sys-devel/llvm provide test utils (e.g. FileCheck)
+# - sys-devel/clang provides the compiler to run tests
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	dev-lang/perl
+	offload? (
+		llvm_targets_AMDGPU? ( sys-devel/clang )
+		llvm_targets_NVPTX? ( sys-devel/clang )
+		virtual/pkgconfig
+	)
+	test? (
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+		sys-devel/clang
+	)
+"
+
+LLVM_COMPONENTS=( openmp llvm/include )
+llvm.org_set_globals
+
+python_check_deps() {
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+kernel_pds_check() {
+	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
+		local CONFIG_CHECK="~!SCHED_PDS"
+		local ERROR_SCHED_PDS="\
+PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
+< 4.14-pf9) do not implement sched_yield() call which may result in horrible
+performance problems with libomp. If you are using one of the specified
+kernel versions, you may want to disable the PDS scheduler."
+
+		check_extra_config
+	fi
+}
+
+pkg_pretend() {
+	kernel_pds_check
+}
+
+pkg_setup() {
+	use offload && LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
+
+		-DLIBOMP_USE_HWLOC=$(usex hwloc)
+		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
+
+		-DOPENMP_ENABLE_LIBOMPTARGET=$(usex offload)
+
+		# do not install libgomp.so & libiomp5.so aliases
+		-DLIBOMP_INSTALL_ALIASES=OFF
+		# disable unnecessary hack copying stuff back to srcdir
+		-DLIBOMP_COPY_EXPORTS=OFF
+	)
+
+	if use offload; then
+		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
+			mycmakeargs+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=$(usex !cuda)
+				-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=$(usex llvm_targets_AMDGPU)
+				-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=$(usex llvm_targets_NVPTX)
+				# a cheap hack to force clang
+				-DLIBOMPTARGET_NVPTX_CUDA_COMPILER="$(type -P "${CHOST}-clang")"
+				# upstream defaults to looking for it in clang dir
+				# this fails when ccache is being used
+				-DLIBOMPTARGET_NVPTX_BC_LINKER="$(type -P llvm-link)"
+			)
+		else
+			mycmakeargs+=(
+				-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
+				-DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF
+				-DLIBOMPTARGET_BUILD_NVPTX_BCLIB=OFF
+			)
+		fi
+	fi
+
+	use test && mycmakeargs+=(
+		# this project does not use standard LLVM cmake macros
+		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
+		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
+
+		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
+		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
+	)
+	addpredict /dev/nvidiactl
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	# respect TMPDIR!
+	local -x LIT_PRESERVES_TMP=1
+
+	cmake_build check-libomp
+}
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 6315cf0cdab4..016ed73cc414 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,9 +3,11 @@ DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B f41de787bc73ff2edfda1b22cc8602be6f6
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92 SHA512 0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2
 DIST llvmorg-14.0.3.tar.gz 158092596 BLAKE2B ef901df510ec6bc1242595ec330e9c9ee76e696b077d67a8d62b53608c3d18b2f2d7ea3150864e13d9b37a8ce899ebca946ebe72cbc4538700176e20859ddec2 SHA512 511e93fd9b1c414c38fe9e2649679ac0b16cb04f7f7838569d187b04c542a185e364d6db73e96465026e3b2533649eb75ac95507d12514af32b28bdfb66f2646
+DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d2499577f80d38b97600749c91a498c69dfbbe818cee35e4a76370795e55da7037543ea341ad7567a6f548893c67dce9e64 SHA512 e14e6c3a1915a96e9ddc609f16ca3a398ca6f7fd0a691dadaa24490078a661340e845cb2d18f3679de4f47300bb822c33ae69548af6a0370d55737831a28b959
 EBUILD llvm-libunwind-12.0.1.ebuild 3656 BLAKE2B cdf5e4e4f39ce47ac57ac43f287b5d6a42a61a79d988cdcd52823aadb0c1950abc85f5c1ba8276198e46357fc27f3ab7d06c0e7e9279a9a40e4dc7f4b936aac5 SHA512 c6477d4837e8e0d3ee6c035e0462e0a817752af214ff20ace3b8c3e377c749351cf78bf2ffec3d95085334f6b9a0a23e311f5a50109c390ad5bec60a0bef2dd5
 EBUILD llvm-libunwind-13.0.1.ebuild 3810 BLAKE2B c215ba47340bda6a466f6ffcdf978d0d3ab4f4f1f456114f854f53dd3dd04d197ee235c4623d0a3d6e0f26022fef909be2ad04e93679ce357c396c94dc7d3a49 SHA512 96827c5f5838898ac368b79677b6e17fb0545a6a5239f8262622034843777ad4f071f9f80e3c33e0e1a2df334abcefbd7e867c5957d2bf72a1b8416b5b7ac714
 EBUILD llvm-libunwind-14.0.1.ebuild 3186 BLAKE2B e5412e6d38ce37d72640805ee3befc88ea3c0f8ae58e5f2dd2a779ac02cd51e55efe2392d3f7fc9ff1f9b2f135018527fa8e24504910c42e47d2186fa70375fb SHA512 7dc577c803526d2b6180bd1e2364789cf8ace3a7c121be1c38053f8505372b76ede20b97649aafd7ad1ebbc06c0dea405c40b0e39cb5dab139a045e047959e5d
 EBUILD llvm-libunwind-14.0.3.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6
+EBUILD llvm-libunwind-14.0.4.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6
 EBUILD llvm-libunwind-15.0.0.9999.ebuild 3145 BLAKE2B 37362f37ade47d59ebee5c65337768677a280379541c8468fdd7b31927b4eb93c2576a46838bb320bd526aa2191828cd8f7ae502adafec594b172065f5b90c35 SHA512 132b91d72b419267ef51ef5be15393a882897587f6190d62a3c39b091ef97eaef06e8f1fe62e3d8303c0f23581604357a10bc7b958b5b71ec3316c1a1dcc5e54
 MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.4.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.4.ebuild
new file mode 100644
index 000000000000..b1b3c2dc140d
--- /dev/null
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_ECLASS=cmake
+PYTHON_COMPAT=( python3_{8..10} )
+inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
+
+DESCRIPTION="C++ runtime stack unwinder from LLVM"
+HOMEPAGE="https://github.com/llvm-mirror/libunwind"
+
+LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	!sys-libs/libunwind
+"
+# llvm-6 for new lit options
+DEPEND="
+	>=sys-devel/llvm-6
+"
+BDEPEND="
+	!test? (
+		${PYTHON_DEPS}
+	)
+	test? (
+		>=sys-devel/clang-3.9.0
+		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
+	)
+"
+
+LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
+LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
+llvm.org_set_globals
+
+python_check_deps() {
+	use test || return 0
+	has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+	local use_compiler_rt=OFF
+	local libdir=$(get_libdir)
+
+	# link to compiler-rt
+	# https://github.com/gentoo/gentoo/pull/21516
+	if tc-is-clang; then
+		local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
+		   ${LD_FLAGS} -print-libgcc-file-name)
+		if [[ ${compiler_rt} == *libclang_rt* ]]; then
+			use_compiler_rt=ON
+		fi
+	fi
+
+	local mycmakeargs=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DLLVM_ENABLE_RUNTIMES="libunwind"
+		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+		-DLLVM_INCLUDE_TESTS=OFF
+		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
+		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
+		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
+		-DLIBUNWIND_INSTALL_HEADERS=ON
+		-DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
+
+		# support non-native unwinding; given it's small enough,
+		# enable it unconditionally
+		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
+
+		# avoid dependency on libgcc_s if compiler-rt is used
+		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
+	)
+	if use test; then
+		mycmakeargs+=(
+			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
+			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+			-DLLVM_LIT_ARGS="$(get_lit_flags)"
+			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
+
+			-DLIBCXXABI_LIBDIR_SUFFIX=
+			-DLIBCXXABI_ENABLE_SHARED=OFF
+			-DLIBCXXABI_ENABLE_STATIC=ON
+			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
+			-DLIBCXXABI_INCLUDE_TESTS=OFF
+
+			-DLIBCXX_LIBDIR_SUFFIX=
+			-DLIBCXX_ENABLE_SHARED=OFF
+			-DLIBCXX_ENABLE_STATIC=ON
+			-DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
+			-DLIBCXX_CXX_ABI=libcxxabi
+			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
+			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
+			-DLIBCXX_HAS_GCC_S_LIB=OFF
+			-DLIBCXX_INCLUDE_TESTS=OFF
+			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
+		)
+	fi
+
+	cmake_src_configure
+
+	if use test; then
+		local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null)
+		[[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests"
+
+		# meh, we need to override the compiler explicitly
+		sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \
+			-i "${BUILD_DIR}"/libunwind/test/lit.site.cfg || die
+	fi
+}
+
+multilib_src_test() {
+	local -x LIT_PRESERVES_TMP=1
+	cmake_build check-unwind
+}
+
+multilib_src_install() {
+	DESTDIR=${D} cmake_build install-unwind
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index c47450a5ce00..7ab5b89423c0 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/bbswitch/Manifest b/sys-power/bbswitch/Manifest
index 0eeb3ce2d94b..98f4e95a9e15 100644
--- a/sys-power/bbswitch/Manifest
+++ b/sys-power/bbswitch/Manifest
@@ -1,7 +1,5 @@
+AUX bbswitch-kernel-5.18.patch 627 BLAKE2B 2b7673a82e5d90192667aba1d741353cdc8d9566636a28045b44e5fc130dc0c413a182a2c9b57e07337433fb447efec7b756b68fa94cc0e11eed02f42cf88706 SHA512 c658e0e8de95c678d1a3ea5659344fff9fce14a93e0f8da3f21f79dc9c820feb3c540e1892ffc10a444c96a768d6d3fecd684315988da5f401f5c6ef6f37be79
 AUX bbswitch.modprobe 46 BLAKE2B e76506e79adc57bedd68f038293257e7c70f1f3bc924776741e152b7c95c691f5241066b742583af063a4bdde90134005949ce28715d0b8f0c51f59c582223c8 SHA512 a4fa992d66b401e039c995b64ac5f3b2491c3ccf4412e211d50d1e514253f9341dc77a6d8da808f03988735e44a97bb973f3303ed3c0eeed6f4e21794d3545b6
-DIST bbswitch-0.8_p20200526.tar.gz 15869 BLAKE2B cdeaf539a0996f53d3add215fca1127321b7183526a248340177f4320171b92a5ce531eeedfb1da2f0d9f07c6b61e8cfb635a457406e477640f2e7090b29b655 SHA512 487bcd845d1f462e77b5b9e3f304cd28d0ddfd391ecc36de530a3d18d9d4932bc895ed29972e27006b6f3eeb50c37b523ef786a26b6ee75c19fa55288a496d4a
 DIST bbswitch-0.8_p20211129.tar.gz 15889 BLAKE2B f81343529957603734bc29453ae9513eb5e19a87425adb8975c621357c7caa0f353e06367cc186230adb28f75ae48330a58ba904854415bc118c8573f71566a0 SHA512 e7873ae34aed13e8f4d5709fede763552c28528e853ad02ee4a4377c043f1ce2ae5f7fc3e831ea1dc65f5a1c0a5ddded93b451258b539ed72b0e1c196676a677
-EBUILD bbswitch-0.8_p20200526.ebuild 1155 BLAKE2B cf4f4914b11e0d132d7f333bad291e12df6109efbae5a569e20994ea5c8936a4e71754d8e3fffade9d1bd761f4f0a11064e17a9eaf98e2f3ba6127b276f36fbf SHA512 028378100271cf8cbbb61b1cedd1d196e1de3927147c874be16fb6bb69ba8beebb676a93449f354f1f3f4c1e8186c567ebc4d08c30005dc7b3599fdc06c7ec9e
-EBUILD bbswitch-0.8_p20211129.ebuild 1155 BLAKE2B d733c3ddcc48ffea5c62076a5d2ba13d876565ba7b9973c5e454d9168084434d135c5e46d2541f3d534675fb0db2cd2b2cbba2408a7631e08e8b8df6dc9d51ed SHA512 e7bf7f08da153a5c6b8b672144ef1ce0cfa3a1178d027d1be6e2f52643632895c33923b1cc37af9f033bbbadf8300c82775863fea0dffbb4fd2f6fb26484c473
-EBUILD bbswitch-9999.ebuild 1157 BLAKE2B b6b77f0ecaf7ac94cc370d498929a8597572c9ecabcda1b817d9e4ceb01d5028d2e7d79f3ee0f5020fbe1d7d7a6fedba9e9daa16cbcf48e60b4a062eaa65e800 SHA512 3c7484b57111e6a78236e75a480472f68a68222e02dd763462197424812d301d0d2ada87290f0b226f2f9825fdc3e583809adceac348a8e6c49dd5816fe10e92
+EBUILD bbswitch-0.8_p20211129.ebuild 1206 BLAKE2B d6c99e136626d00018743ad9a9e23e4eab3a24d7a9f088e8f8877fc76837dadc381b8b4a2537ca3bd64c00a6c6e76c6138d59780471480313dd47077153699d1 SHA512 2f20f9c0009c3d5fa1c578f83f9223e7d33cb7cf60295dd19e8ad69f0ddb74854195f5668377f088303dae73e52bbdf87a2b0b8e7152718cb231166752c46a7b
 MISC metadata.xml 999 BLAKE2B 9d2751b5928195f96c509147b5f6093a0fb3fd39762fb2c4b4509cde94258f35bada1009dae271b06f376e80a544f976495b8a4610ff9044d7cbd3658d942bde SHA512 d715f175dff0e5d5e34b23c5633469f2cdfbc64796cfb2c88c2fa02c39c6ab23b17d93b727ec900a0edc3bd8dccb09a27e598e8705d30b12e4c0a4ed423c9d42
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
deleted file mode 100644
index 62367166d15b..000000000000
--- a/sys-power/bbswitch/bbswitch-0.8_p20200526.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
-	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	S="${WORKDIR}/bbswitch-${COMMIT}"
-fi
-
-DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-
-SLOT="0"
-LICENSE="GPL-3+"
-IUSE=""
-
-DEPEND="
-	virtual/linux-sources
-	sys-kernel/linux-headers
-"
-RDEPEND=""
-
-MODULE_NAMES="bbswitch(acpi)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_TARGETS="default"
-	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
-}
-
-src_prepare() {
-	# Fix build failure, bug #513542 and bug #761370
-	sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-
-	linux-mod_src_install
-}
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
index 63147964328f..2aa21af88733 100644
--- a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit linux-mod toolchain-funcs
 
@@ -31,6 +31,8 @@ RDEPEND=""
 
 MODULE_NAMES="bbswitch(acpi)"
 
+PATCHES=( "${FILESDIR}/${PN}-kernel-5.18.patch" )
+
 pkg_setup() {
 	linux-mod_pkg_setup
 
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
deleted file mode 100644
index 1c9b2ba061f9..000000000000
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
-	EGIT_BRANCH="develop"
-else
-	COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
-	SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/bbswitch-${COMMIT}"
-fi
-
-DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-
-SLOT="0"
-LICENSE="GPL-3+"
-IUSE=""
-
-DEPEND="
-	virtual/linux-sources
-	sys-kernel/linux-headers
-"
-RDEPEND=""
-
-MODULE_NAMES="bbswitch(acpi)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-
-	BUILD_TARGETS="default"
-	BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
-}
-
-src_prepare() {
-	# Fix build failure, bug #513542 and bug #761370
-	sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
-
-	default
-}
-
-src_install() {
-	einstalldocs
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-
-	linux-mod_src_install
-}
diff --git a/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
new file mode 100644
index 000000000000..07cecd4cdf41
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
@@ -0,0 +1,19 @@
+diff -u -r bbswitch-0.8/bbswitch.c bbswitch-0.8-5.18/bbswitch.c
+--- bbswitch-0.8/bbswitch.c	2022-05-24 20:26:22.184553495 +0000
++++ bbswitch-0.8-5.18/bbswitch.c	2022-05-24 20:29:00.797008130 +0000
+@@ -264,10 +264,15 @@
+     pci_disable_device(dis_dev);
+     do {
+         struct acpi_device *ad = NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++        ad = acpi_fetch_acpi_dev(dis_handle);
++        if (!ad) {
++#else
+         int r;
+ 
+         r = acpi_bus_get_device(dis_handle, &ad);
+         if (r || !ad) {
++#endif
+             pr_warn("Cannot get ACPI device for PCI device\n");
+             break;
+         }
diff --git a/sys-power/upower/Manifest b/sys-power/upower/Manifest
index 96537360d24f..e608bcc6b75c 100644
--- a/sys-power/upower/Manifest
+++ b/sys-power/upower/Manifest
@@ -1,7 +1,10 @@
+AUX 0.99.18-meson-Allow-unittest-inspector-to-fail.patch 998 BLAKE2B ac9e7f5ebeb3afee70fe94738300b389d9531f7f21a091200169c6d32252c2302873ae5e1bf57680e50dc80bff896341793aa3fa4c9db6b3a801bad43d73eb73 SHA512 fc72d4f9e1913bf24d28ce7a5972172ae690baf995d0e7fd75d74f0289d5feb740a704d234745138bb78230a9bedd285b5032cb8bcd79978bf6b18b55fbacbbe
 AUX upower-0.99.12-fix-power_now-energy_rate-readings.patch 1636 BLAKE2B e61167d5a1f6b65cdb611f6cf7b9b5879de58d692176079041a785ca6ecf799b728b32a37e0e3ed7cb0ad06e03db2f16c3eac84d3879398f9be8d9f4fff22d72 SHA512 7aa880a8fd6887a0a9e7d118ef7fa2cde59f9d9b1f16dec17ac7ac013346f9e06f9ae55c343b7830b370f500da201cd2b107f8f586f90d4f7b5695fd33389565
 AUX upower-0.99.17-meson-Don-t-search-for-gtk-doc-if-disabled.patch 1656 BLAKE2B 6fe3a2bbd6d61a034b6787fc394b74c5d76e414e207e37ebd9921f2f681b8aab145a53dc072565b581e6cc5bdd9f9972d6036dfed5f70edad8a4db4996f4c4f3 SHA512 ee36f0fa1ac75ba01c7c6829d5b29f868a746243f33e5513795a090659cea8f2a7085967c0a7832a979adce490d169ed7c4a79860c228ec07f3e06f90dff0dc1
 DIST upower-0.99.12.tar.xz 423640 BLAKE2B 4c5c6357f0a2f8d721ebae9736912b1871a898c7ce65708626f9a9465cde87036ba6ab8050d97f5b9074d92e2700d8ed1e71b67f43cd6305eb4e89336f1b628f SHA512 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
 DIST upower-v0.99.17.tar.bz2 139108 BLAKE2B de48a8058752f3e2bcefe83fe049ae9181517276f6d2930c402089291d935ecbdc6f7759d811467c537801c422f5d32a02366f3e3d57bea9e73e311b13df046a SHA512 fcb2f344e82f04af85eee3a4ef42a4d119f7b55fd4e1c6bc2633845135bf524957b54c849bf6501d89cfbd285a7e1fbeecb8e846aa108e2b36d1550347150c04
+DIST upower-v0.99.18.tar.bz2 141140 BLAKE2B 2e6acfaf58f6e0031326c269ad58bfcdac84a25f952ef3169e6ee85889696c5c83d10aaf67b8244a2378150fd591ddbd3101d21d1e7534e5d7f2f69ee070a174 SHA512 f33a2ca35209d69fa7ddf614c6a390973c998c6473448acb00ca86114f7bfc05beb8f904010ed7b5a440209fe503e759682459893fdc9690c4b79d516e7f9de1
 EBUILD upower-0.99.12-r1.ebuild 2705 BLAKE2B 4da66afcf8ad299b2cbe201d9f54b514bd912fdadd2c616e061d89d571834c2e71fa5a32258268ecfcf02984c4727edafb122f470f9140bb260c734c14513bd8 SHA512 f5961f9aba9d120646c643641a49fcf8e670543bbeee3670f36b06e41a3a675baaa6b426274ba9801ca446f67d7f39588955a877c225c2b98cf1144b1b21b366
 EBUILD upower-0.99.17.ebuild 2890 BLAKE2B 7cbb2e63443639c494b2e98d1ff64ac7c08d0c2775ca86382f53794196e8f02ac8598aa989c0e6f734f2889d8637f8586932fb5c5d12b757861bce8dec20f562 SHA512 738c340c727c4d57603c25bca273b1a06de64357d04f55089f0eb97369cedbe06804c67639f31a50ab76145774a5257fec4bff95c81d0c291019cc15206f1cff
+EBUILD upower-0.99.18.ebuild 2894 BLAKE2B 4e1d7b4aa402aee936ad2bf9b8ea57b6e2e1984418d1fdd2deecb34665ae0fbcf553915bc30ee9a0560ff54ab5dbd23793544c6aa155bf15c1e87927fe379e25 SHA512 9c6c534afa3878febf6d4c29442e71f587e40653fb48a1336358402a22c4129b621a01282a7faf96a7b5a69e1b42b2d6d5da35eab6885116f972f350388fadee
 MISC metadata.xml 229 BLAKE2B 35bd897953d3051382021de0742162ed1a166c98224fec04fc54dc467dfe5492289b1da910ae9213259b20a0bd5bbffc041624ccb3aacc23b56de2c397861d7d SHA512 7340f6b8c0a938920b7940a288c212e868ae0d8cb18b97c028e6e959f72f94e35f37a2d864bb662fc1d01b43bd7b72efdcbcc5d48e700aaf8c845eb6b9d67fed
diff --git a/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
new file mode 100644
index 000000000000..feafa87e9705
--- /dev/null
+++ b/sys-power/upower/files/0.99.18-meson-Allow-unittest-inspector-to-fail.patch
@@ -0,0 +1,31 @@
+Bug: https://bugs.gentoo.org/848525
+
+From aa646fa0ca3e164b09949c546796ec50433b748d Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 17 May 2022 16:02:49 +0200
+Subject: [PATCH] meson: Allow unittest inspector to fail
+
+It is only used to make the test output nicer, and it is completely fine
+to fail.
+
+Closes: #187
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index b49d5f0..2e1edd1 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -124,7 +124,7 @@ if os_backend == 'linux' and gobject_introspection.found()
+ 
+     python3 = find_program('python3')
+     unittest_inspector = find_program('linux/unittest_inspector.py')
+-    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: true)
++    r = run_command(unittest_inspector, files('linux/integration-test.py'), check: false)
+     unit_tests = r.stdout().strip().split('\n')
+ 
+     foreach ut: unit_tests
+-- 
+2.35.1
+
diff --git a/sys-power/upower/upower-0.99.18.ebuild b/sys-power/upower/upower-0.99.18.ebuild
new file mode 100644
index 000000000000..760dcd025ded
--- /dev/null
+++ b/sys-power/upower/upower-0.99.18.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit meson python-any-r1 systemd udev xdg-utils
+
+DESCRIPTION="D-Bus abstraction for enumerating power devices, querying history and statistics"
+HOMEPAGE="https://upower.freedesktop.org/"
+SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/3" # based on SONAME of libupower-glib.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# gtk-doc files are not available as prebuilt in the tarball
+IUSE="doc +introspection ios selinux test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.58:2
+	sys-apps/dbus:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	kernel_linux? (
+		>=dev-libs/libgudev-236:=
+		virtual/udev
+		ios? (
+			>=app-pda/libimobiledevice-1:=
+			>=app-pda/libplist-2:=
+		)
+	)
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-devicekit )
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		dev-util/umockdev
+	)
+"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+QA_MULTILIB_PATHS="usr/lib/${PN}/.*"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-Allow-unittest-inspector-to-fail.patch
+)
+
+python_check_deps() {
+	python_has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local backend
+
+	if use kernel_linux ; then
+		backend=linux
+	else
+		backend=dummy
+	fi
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+
+		-Dman=true
+		$(meson_use doc gtk-doc)
+		$(meson_feature introspection)
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Dos_backend="${backend}"
+		$(meson_feature ios idevice)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	keepdir /var/lib/upower #383091
+}
+
+pkg_postinst() {
+	udev_reload
+
+	if [[ ${REPLACING_VERSIONS} ]] && ver_test ${REPLACING_VERSIONS} -lt 0.99.12; then
+		elog "Support for Logitech Unifying Receiver battery state readout was"
+		elog "removed in version 0.99.12, these devices have been directly"
+		elog "supported by the Linux kernel since version >=3.2."
+		elog
+		elog "Support for CSR devices battery state was removed from udev rules"
+		elog "in version 0.99.12. This concerns the following Logitech products"
+		elog "from the mid 2000s:"
+		elog "Mouse/Dual/Keyboard+Mouse Receiver, Freedom Optical, Elite Duo,"
+		elog "MX700/MX1000, Optical TrackMan, Click! Mouse, Presenter."
+	fi
+}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ce3c3e2f4888..e77acf173906 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index 63d51f2cc7fd..83aa80066828 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -3,5 +3,5 @@ DIST parallel-20220322.tar.bz2.sig 2080 BLAKE2B 7b405bdb8db02428fd644cafc3fc7976
 DIST parallel-20220422.tar.bz2 2367837 BLAKE2B 5630c58a15cc6ce0dac0346188afa9916b18545a9da91854f3cae604fc3c2ced33fd3a5f17a2967693a2e28cbddb198a3e63372125721a8dc67af80cbf03e940 SHA512 b4179c5ad936ed01753d91d75a012d6985dd8fb24f1e0d06fa7806352bfc59aeeedd42b15fd31b8294d25671aa474f885362c887875e79b32b613bfe1f9a262e
 DIST parallel-20220422.tar.bz2.sig 2080 BLAKE2B ae87bf4bee2cdd6952e30bb2b65498ca3f4d51452ff8736ac4c8cfbc9bf940eebad48c0c08d474d02d269eb459cb62441067b0c6f6ad69f8beedad40710637a3 SHA512 a8d023d856722fb7528fa67ff1615643e9bf3036c903665ca94e5c7366b402b1bc1b25defd4d3c9dbacc5178a9c584249639e45d3713c991c21da01158fa85da
 EBUILD parallel-20220322.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
-EBUILD parallel-20220422.ebuild 906 BLAKE2B af571f66edbf4862b52358703185552643605d6c2925f248ea545769713e062ab844661f3f456ae39fd0b3d1b886e5ee33e5feb206173ce01df0b8bb1936b3b9 SHA512 81112dbb5ce40a983a49f6ef5aff7613919929cd67ad5acde9e9822b19adfa464e3925bf7431112ae4063eeac42b9c6c8fdc6ccd271d1786c6c0eac50ba688e5
+EBUILD parallel-20220422.ebuild 902 BLAKE2B a4512917d2f84af15c20c017823678ad5d9ee8218fa7562428baca03bd7de0b2c05f42f004848c8cb2e00b4e2763525d4cc1a8e5097423bf6bd7c44c6d5be0e1 SHA512 0d8150b78add55c45b6a47be0435af29a451056dc2c0e749cc27dcaeb7bce4292cb6ad2c1986fa65ecc88d6736f8e43200222aeac21de0e39d32d6ec68f8beb9
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20220422.ebuild b/sys-process/parallel/parallel-20220422.ebuild
index b107cc8a44e1..98ebb581b101 100644
--- a/sys-process/parallel/parallel-20220422.ebuild
+++ b/sys-process/parallel/parallel-20220422.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="dev-lang/perl:=
 	dev-perl/Devel-Size
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index 00fc67ff7e2d..8d96a6d63d8a 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,5 +1,5 @@
 DIST systemd-cron-1.5.17.tar.gz 32319 BLAKE2B 763cccebcaf98998d0e787352b4d3f2bc28a7e6ef0e800fe937fb2971a5dd8af2d9880076eadb5c3eddc23957d9b6b824b87a7a8be59c241f402ad78abed248e SHA512 20f93c108689efef5a72976509ffd567ed85dd1fada5074030018b5d560cc49f60337bdf888d1d75f6ce8b9b72e6314d754c78c19fa79d584740430e44240ef3
 DIST systemd-cron-1.5.18.tar.gz 33056 BLAKE2B a400d0169c2dcb68c91358bd2af70dca133749dab801dc87b4cdf05b8ccebe5e250466bfce93938e575aa2d832af9a4977be2f02767d2d808e45b11888277c95 SHA512 7de6a5d05ee1d73c5348ecedf6029b498b26e8cdeecce87b58f206a1719c4a90fba853eb99b860734174469c99c75a4a6fa33c13b4aac45fdc71de7f3231b9e3
 EBUILD systemd-cron-1.5.17.ebuild 2429 BLAKE2B 01a13af8cc15f2f7a4342e6b3a1eedd149c3dba7f24d111f5bc87568a878c7ba0e91caf8e24a45adbb0fc7a41542128eaf40f29dc6aeea2e3069587285929d26 SHA512 caeae5414e3bcada0c619eaac8afea254711c76608d57015dc736bbb596a781e7d17768f928603506e088007cdf458671a99be281b883d955d34c58a4bac8837
-EBUILD systemd-cron-1.5.18.ebuild 2473 BLAKE2B d16cfa3ab57b21a8fe404f0d976468780ae75864fa5777e7e23de28d71ce50590d2f0fd361b9f29a28d73830d913e33129f19566ffd56ac9651d5b1ca30933e5 SHA512 ed189e9f9d91a7bc4ae1a0f9cea1cc4e3f1ee4d9494d150cdb2c8ed3e03853deaca25906587d2c49c3646594a8c87df8276c2d2bbd10f57776abf19af1810453
+EBUILD systemd-cron-1.5.18.ebuild 2479 BLAKE2B 2bd2cc450af257417dae73d04503b2d22a9cbc64adbee2567da774a5faf13bc631316ce6b77402ebacca741c2c6b326747194c446fe724c8e78018004e9f1f5d SHA512 e45580fa478a60eb8b4b03e950f509804476beba7bc6827ab3d0809154734f34d72f8f8fc640accf8901b9cc771735bd1ef57e63154964ce737444b694332a6a
 MISC metadata.xml 801 BLAKE2B 8ac1580d5dae701d11c893bc7d9990b8a0c023c148b9fb7a945ba7f12429dd4a2abc78331f659831fa26b5f5c570919156848c3ebcd4df7ea050fdc50272f43c SHA512 1c7e77f04d294fc51de86b07f63c9163468dcb321d14c8447c61a4a0a7f99efc438d6ae1ffe315cf148377c2ac5e038afcc93f68516b11ca5eb066f8b186bcef
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.18.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.18.ebuild
index 0aafe93f288b..5d07a1a175e7 100644
--- a/sys-process/systemd-cron/systemd-cron-1.5.18.ebuild
+++ b/sys-process/systemd-cron/systemd-cron-1.5.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${MY_PV}.tar.gz -> syste
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="cron-boot etc-crontab-systemd minutely +runparts setgid test yearly"
 RESTRICT="!test? ( test )"
 
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 9a47006d0bcc..60d759852c55 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 4ca410817a69..4ab12ec06eba 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,8 +1,11 @@
 EBUILD dist-kernel-5.10.117.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.10.118.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.10.119.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.15.41.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.15.43.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
+EBUILD dist-kernel-5.15.44.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
 EBUILD dist-kernel-5.17.11.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.17.12.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.17.9.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 EBUILD dist-kernel-5.4.195.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
 EBUILD dist-kernel-5.4.196.ebuild 392 BLAKE2B 0a46c1101b608049d3edf3c20d36e290ca8592cc5255a06f23c32f2635ef78d68ecbc7f9c6d640b86fc5b338de2eff99791996c22494418f923b3e67eb924eb6 SHA512 54ca8c680a499e7331c1de1e49f0b9e0ac684027362af4c7c62acae82ce82d93e656e922ddc64dbe7b989524b87dcc3aa769bfd9dec587ed1565c14ba2151462
diff --git a/virtual/dist-kernel/dist-kernel-5.10.119.ebuild b/virtual/dist-kernel/dist-kernel-5.10.119.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.119.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.44.ebuild b/virtual/dist-kernel/dist-kernel-5.15.44.ebuild
new file mode 100644
index 000000000000..5594b4186dc8
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.44.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.17.12.ebuild b/virtual/dist-kernel/dist-kernel-5.17.12.ebuild
new file mode 100644
index 000000000000..c2caefd6cfca
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.17.12.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/libudev/Manifest b/virtual/libudev/Manifest
index 8fa8fbc253d9..b55b1aad202c 100644
--- a/virtual/libudev/Manifest
+++ b/virtual/libudev/Manifest
@@ -1,3 +1,3 @@
 EBUILD libudev-232-r5.ebuild 486 BLAKE2B 571930d5e1cf0207a994389db3c8a62ca593cfc8e7bb079ca7d63f5e586dca0bb7c927e1ce3dda4b063d1f9f51b95815cde9e041d8ceac00077f29bdf766e4cc SHA512 e540112b2556638b86e93560b5c0c5c72a99914348e018f2c234e8818c776cff62cdab3850589d8c7e0eb24a2f59de608cf0284b733aeff5b7d8b6c7f186c1db
-EBUILD libudev-232-r7.ebuild 541 BLAKE2B 1e2b740167e9189dfad641ac86fce0e27ad4840d3c67e83c695a94f4dcc826faf9461721076f18428a7c3797629b15076f041ae3629a46f93abebac37ed79d06 SHA512 0c0360a380e50406fdbfbe1f0165112db75ff9252ae060b53f3bb25fba8e1947ee646977b6e3dc651ebc88e32b31a7ecfb02dced7bcff7855248e89eefd6c163
+EBUILD libudev-232-r7.ebuild 540 BLAKE2B 29eae95b3e37c137ed882dd463152701f01f74f0f29ff3a3fa03cd832f9416a66269289c9247212b96ce40f804412580cb9087409ae211fbe97b3e970f0375fc SHA512 0c80eb9b2779f98255c388153fa0eae9367a86a63f0f300ba8fcb34a76c1207fd4e9d26aa3a2407060f1855c63cc9707c273425e8ca5efb60e1f8f8df6454f4d
 MISC metadata.xml 322 BLAKE2B 974312e3d51dfdefe0a216044b7bd6366ba1f7077ce3aa6129b7dd0befef0898a0c53186e97cb2a950fe436408490c346a558b829e38a670034ae8afaf8dcf1c SHA512 43abbe0769a99d3064a9727d9d730adef57e958c03aa3dc9220adc7cdc84898282a8c600d0892c47de0b0391db58caa901a8a809718fd20eee88dbb5efb08890
diff --git a/virtual/libudev/libudev-232-r7.ebuild b/virtual/libudev/libudev-232-r7.ebuild
index b430cb829b20..7420a448428f 100644
--- a/virtual/libudev/libudev-232-r7.ebuild
+++ b/virtual/libudev/libudev-232-r7.ebuild
@@ -8,7 +8,7 @@ inherit multilib-build
 DESCRIPTION="Virtual for libudev providers"
 
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/virtual/perl-Module-CoreList/Manifest b/virtual/perl-Module-CoreList/Manifest
index a74de61f3bc5..f67279833d15 100644
--- a/virtual/perl-Module-CoreList/Manifest
+++ b/virtual/perl-Module-CoreList/Manifest
@@ -1,4 +1,4 @@
 EBUILD perl-Module-CoreList-5.202.105.200.ebuild 643 BLAKE2B 61ffb8d64b14d242d084417e8f6da66ec3feb7e4411f14793597087a05ceb18ec368729af4fabba6e36c70cb85291715d54e7decb5d364bc7b5e258002d7750f SHA512 2d07a943e6b9ccaecc505271a3865e44854ca4ba7b98a351a22863d0a631e7a66bdefc25e2165614a8cb72c6a871208de9d5c8ee6302509a17df2f3aa5f0bee2
 EBUILD perl-Module-CoreList-5.202.203.130.ebuild 658 BLAKE2B 72f9badfddfc647c1afddbbe7979afda5704430c557b2813bddbb7ca17002a5e4be8e8eb2b0479064040499ed3392e3d1ad46d2c8a9617d6edb67b49cc3e23b1 SHA512 f72f05031405d4371fdf957877d378e46b00ab5e0652e4b90087906f2f7547c6d7f6a4be6b6120808a047cf7cf855cd8ef15bb16802e987885ff4926cc0869cb
-EBUILD perl-Module-CoreList-5.202.205.200.ebuild 662 BLAKE2B dd16986feeccca94d62fadc8a5fa1c2d9428b6510488b5fa936f3f552d2454f70ae39ba3d4f7dd07479d132ef356f4d7d680efd8fca864a363f43ac48871076f SHA512 5b8c2590753ae1b946183384e0cfe9c3bcbeea1b90b78bec66bf3f86ccbedba9f20586c0152e8718cf45b45d8a4679ff800c415ac8d60fdbac68d33097b468e2
+EBUILD perl-Module-CoreList-5.202.205.200-r1.ebuild 658 BLAKE2B a32ce62d26445c067433a4b7395e0745340f9327cfed0ac9c97f5902691bbbf23f5b15e416e88dca2594910a9280282a2f064f943c2f7b55d0ef922f24e3f187 SHA512 67901c39979662959626eda8898b6ed9b160760de9292161988b4c367ff7928803b6bdaff3dfa38bd4eefbdb6762d0aacc7a2227b74b062e874fd7befaf59914
 MISC metadata.xml 276 BLAKE2B bf414e300df778aefa3427c1942fd63f8c3a574bb68a2fad8d7ae8e94ff33dde4652be01c1441d9c8e7599689bb6dbac313a9c862d90778de833b52b4b763595 SHA512 9362f9f7415ad3662ca05bdf27721dc2c41c0d4ef89a9da86e3e86fab6d1684b1f87de47eef6de4314ef4548dfdedaf1849cd165d94da412f96a3d2e4fcb4a9f
diff --git a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200.ebuild b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200-r1.ebuild
similarity index 90%
rename from virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200.ebuild
rename to virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200-r1.ebuild
index 825b2e6fc2ae..34bcc33b18b9 100644
--- a/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200.ebuild
+++ b/virtual/perl-Module-CoreList/perl-Module-CoreList-5.202.205.200-r1.ebuild
@@ -10,7 +10,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~
 # Check https://wiki.gentoo.org/wiki/Project:Perl/maint-notes/virtual/perl-Module-CoreList
 # When bumping this package.
 RDEPEND="
-	|| ( =dev-lang/perl-5.36.0_rc3* ~perl-core/${PN#perl-}-${PV} )
+	|| ( =dev-lang/perl-5.36.0* ~perl-core/${PN#perl-}-${PV} )
 	dev-lang/perl:=
 	!<perl-core/${PN#perl-}-${PV}
 	!>perl-core/${PN#perl-}-${PV}-r999
diff --git a/virtual/tmpfiles/Manifest b/virtual/tmpfiles/Manifest
index 51bba8b3962e..004178e9fbcc 100644
--- a/virtual/tmpfiles/Manifest
+++ b/virtual/tmpfiles/Manifest
@@ -1,3 +1,3 @@
 EBUILD tmpfiles-0-r1.ebuild 516 BLAKE2B ffa20ba4b90a3b829d3003f3cf211927bdc779dde0d3d5876361bcc7b26fcfddfc97939871bca227802c9b94ad337b0a979d058c1ed3d1014c071eba5fbf7010 SHA512 c8076d46d454795dd008bcd5364d6d50ebb033b4792b0515871482e9746558c0e334ec55a6551dbc01ae9c0764dcc98864977dc0bdbc22fc7d3316cc5d53750b
-EBUILD tmpfiles-0-r3.ebuild 542 BLAKE2B 0f40273fdb97a50d6bde9800da7d10ebbafc3d7fe55575ad71d9491aa2e8bdff5d3fd2f9b9398dae8cff29f3ed09e777f9262f79b8c6ea9d1b2886ff23a26c79 SHA512 419fccb2e9628256339116797faab6aa5682c50193a7f134f1aa12363c528338274149236cfd935ae4d4fadc9e9a3305961a7ed2ae0e2e5491076bc4b2f67887
+EBUILD tmpfiles-0-r3.ebuild 541 BLAKE2B 64372628a86ee3dbea951993819b46e9956ef1912b0ae83056d182b6bc22d1b24ff81ead0df1729affa566c3f265b8122a3e8f46b6eb3c8ba3221ebe4238e2ae SHA512 988a1d86f5d25115f4f1ad4dabecc90a6ac80bd27da9423e8251f3e358c57a8bb7570e8b9b0ad155cebcffe84aa42266cb7a9d8022f2c9b13e375816d3026b58
 MISC metadata.xml 385 BLAKE2B 17b9cb463c3b44c7a167ce12c5d6515526e21a429a0b491d8af1f7d2e1afa6c612919e8c6474e8b99d9020553e05329e266d3cf6457c11dda2cae77c9f56e1fc SHA512 4b8010308dc81ce291c716823f7283ec2927b7b080d250c5f98288dc0db5f1da0b63f880a44db48e8f69455a52c5a5120ef8eceb7e775bdbf8779a86a21965d1
diff --git a/virtual/tmpfiles/tmpfiles-0-r3.ebuild b/virtual/tmpfiles/tmpfiles-0-r3.ebuild
index 4b7f1ac6a0f2..64ff8e3aebce 100644
--- a/virtual/tmpfiles/tmpfiles-0-r3.ebuild
+++ b/virtual/tmpfiles/tmpfiles-0-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to select between different tmpfiles.d handlers"
 SLOT="0"
-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"
 
 RDEPEND="
 	!prefix-guest? (
diff --git a/virtual/udev/Manifest b/virtual/udev/Manifest
index e73c198c88f7..80f3a5bf1fd6 100644
--- a/virtual/udev/Manifest
+++ b/virtual/udev/Manifest
@@ -1,3 +1,3 @@
 EBUILD udev-217-r3.ebuild 374 BLAKE2B d7ca53008a8e87905cdd0c8bc71335579766c026cccb7d7beb2a1e49f3d03da2e97e15d7077b2f9b34e1b5ab95ca4a8175a6275ae0d78dfbd47e8b4128c646f7 SHA512 3ea5de6fbe3c7328dba301c2796e1841f9bd821b680632f7bea5f16c69deaa48a1f521e3ccb89b5e062df53e8456b403ca23163cfc69d7ff424146b9c75e6793
-EBUILD udev-217-r5.ebuild 414 BLAKE2B 89e4335bd5d342fefc69ad5d150af722b839b2be01afd7b4a1ec0dc171455c2bbccb751e1f53030325112f808e16bf3b355a06e71773d93c3181513b31a8a37b SHA512 68f8c2c85ef6595077a9f085920f0ea961ab89b9b376cea71cb77daecada328938e1077f291f88136a60c59dc24e2b47bb084a15219c4d8cd02abca503bc4dad
+EBUILD udev-217-r5.ebuild 413 BLAKE2B b7a2bb35145ec6b14c5825096878b17ee407ef5d2dc3524805a1afdbb190c15490a48369e88e181d7c0c1ffa22e5dcbfd011970bf1ae0df7fdb22a480eaf38c5 SHA512 d5f9239ba1ba6ebd8b095e2d0c3c6e35a4ee3f98b92ff95440ad3733add0a4a8fbbcf6c34235f30101c8a1171fa88290ce77a35b410be6d4f687713bd21eb3ac
 MISC metadata.xml 322 BLAKE2B 974312e3d51dfdefe0a216044b7bd6366ba1f7077ce3aa6129b7dd0befef0898a0c53186e97cb2a950fe436408490c346a558b829e38a670034ae8afaf8dcf1c SHA512 43abbe0769a99d3064a9727d9d730adef57e958c03aa3dc9220adc7cdc84898282a8c600d0892c47de0b0391db58caa901a8a809718fd20eee88dbb5efb08890
diff --git a/virtual/udev/udev-217-r5.ebuild b/virtual/udev/udev-217-r5.ebuild
index 075f0e2678ac..57ce5e8abd11 100644
--- a/virtual/udev/udev-217-r5.ebuild
+++ b/virtual/udev/udev-217-r5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DESCRIPTION="Virtual to select between different udev daemon providers"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	|| (
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 7a395108cb3c..6be431f16cf1 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 649d505d4485..30ccfc8dfb11 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,5 +2,5 @@ AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r3 732 BLAKE2B 8227349f9ffe5dbf7c59efc3b1e250bf8184a72d37958c0ce0a2d8affabaadcb6aaf271b1402c7ac127b80d534f4f72b888ccdce7aa5f7a7cf86a0efe0e719e0 SHA512 7c8aa33dcea56b6fccac23095f7b84225f1c85541cd5eb3536d2901e638c391e025bd9db28bd10c26ef91e5a8fe2d12a878040cf21d4b983858a19f2cac7d1b0
 DIST gitea-1.16.7.tar.gz 53657579 BLAKE2B ae9d67fa633bcc5156036f033a4ed084b5b6ac0d71ec6a1ec0d0c88848233f3f0f0c22ca1c33289dc0e9950a8b299e26a88417e03643972f6721f94097b37d85 SHA512 7a31330e46078e215eecfbb2ec28373be1a176790720afbcf9674f3530d66f300d8ef9e47b9b9124cda9ce585d26d40c975e4897e5a3477dcec28b6f2b16735c
-EBUILD gitea-1.16.7.ebuild 3176 BLAKE2B ca0c1c6304f65462ed54022c43b5a3688a9dfec26c1b5f9e2d4ed43dc273065aca37b0963fdccee443a7a35ae4a7733002abd5c60780d4bacf63650036c50cd4 SHA512 8612865a06fb84aaf2ca749214b32faf1750541060b0e2b146d303d14a0b5a5673e7887444da12913bf09ebdeb51ffc9ce0fde6aaf92c418c84fb2993daa353f
+EBUILD gitea-1.16.7.ebuild 3181 BLAKE2B aaf07de11af3784fc352f787542e09604950292704cb283d9474d6cec568f91a5df5104c5aa2da29f22d1324f8d4d29357ea3880a8c9d2ee29dbc685f5b83086 SHA512 a2e84529629afc73aa6649bdf3d97f5e356a97c13262dab767e1c8aaadf7c7d26ca35f201f1ae999c50d39d8ca39f62fba00e59fbcb25f01cdc52b8e08b261aa
 MISC metadata.xml 339 BLAKE2B 6117542b37ffbb9dc5aa2420c5846c95864b632cb35e1c69acea24d0eaed05767b0c3607a58bc9ab8e54596927072f1c7c5cb795ee44d076b7ac027d0ee65a58 SHA512 9b05184ccba06361a7dfdecced7ad53d887065763bbbc736aedc791d9089f146f99fbbd6a483bdaf47a6ee5d4965dfc2a66e6990bea1beb599baf621c2c16471
diff --git a/www-apps/gitea/gitea-1.16.7.ebuild b/www-apps/gitea/gitea-1.16.7.ebuild
index f81eddf452ee..eda894a4cb53 100644
--- a/www-apps/gitea/gitea-1.16.7.ebuild
+++ b/www-apps/gitea/gitea-1.16.7.ebuild
@@ -8,7 +8,7 @@ inherit fcaps go-module tmpfiles systemd flag-o-matic
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
 SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 S="${WORKDIR}"
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
diff --git a/www-apps/miniflux/Manifest b/www-apps/miniflux/Manifest
index b6f532decab7..558f4e7579c5 100644
--- a/www-apps/miniflux/Manifest
+++ b/www-apps/miniflux/Manifest
@@ -5,5 +5,8 @@ AUX miniflux.initd 504 BLAKE2B d43cc0323161fc3723063f07fb5d8da4f762b420dedbcab28
 AUX miniflux.service 463 BLAKE2B e6f1a3717e985f3ddae4224472b753f293a73ab015acbe80ddf20d2d9e505aa9fd47e2fca2c86749067288a1f10787e16179a41e5c30d3f37f53e83f798719b8 SHA512 c38fe3f19162be02a44a353281690d40e90cb8ac8126ea4f9aab1218e128da0be3d1152cf260fdfd19ecfed2ea4396ae4a6c645088a1b212b58a3cba8387ce60
 DIST miniflux-2.0.36-deps.tar.xz 151007452 BLAKE2B b21e2a96e9c19341ff1435deb41558b6a1061d7ed136f4164e577949519582e003bfc0ac7f1d60453dbde89d807fbf2707c878dc3c5e0da874ce8f3b6e6682d9 SHA512 f7708d45ad1ed72faf4a32420c990fdeea25258d7caa2a332781590b169bbaa4ead53baaf1024e2e399921182551876a63a3e516a94fdc074995b5cb1d35b9d1
 DIST miniflux-2.0.36.tar.gz 548596 BLAKE2B b3f6a85d635eb095f41852d3e618e7e2e2b97e83c776f16b4da9a22a0bb03e9c1815c4ea1a9b841ee8132087067fb7e00a084536f99e004c0863adaf6bbc64b0 SHA512 0c3f1b68e1cb9c4cf5e543847abf3cb34bb56152991a3cd257f4886c7573d17fc177f928574040c2d5b339bf8fe39f9504952f234babe1dcd3b824f8ec95c75a
+DIST miniflux-2.0.37-deps.tar.xz 154048036 BLAKE2B 88eaba31505c4d1ace55428a8e29dac8449776e1f9cd9a9fe5a54f21dee65df8ddb9c8cfc88968ec4476cc5e3d7670f47ffc98d41ea5a6fe1ae9e23bb6b09807 SHA512 c499964a174a0cef1ec09824e8b6f9fbe3ff8eb77e2f5f9f4aedd73f95c569338afd4ec5c9c312556c9435863c8a4398b63a5f24a55c61d0d8a5afd63a83f31b
+DIST miniflux-2.0.37.tar.gz 555360 BLAKE2B 64188e03583dd011261c2d69c30e105af65d61ed996c4c2785621aa74d6b0602eaeed312750a089dfb1c4f5bc00c26f79549f2df27714cdca44506439b2ba6af SHA512 6944e638cdec6d0d5e92362ad4849028d0260780919eff8d6b6999327f9a482a1b3b09f1479b3c8c4b2727ced524caa13a6c7ac655b230ff244519cfe095cbd5
 EBUILD miniflux-2.0.36.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
+EBUILD miniflux-2.0.37.ebuild 2578 BLAKE2B 555cce45ceea4f96b75638128b60ee946532bb329f3bd4a6f93fffed8a28f8a8547331bd8c1cc73fb1bcca1234a5c8e71fce63e745294e6f9c55ad2fc6a964eb SHA512 1d5c77e1f8699ea710d38760d624f1bbd6286c4d42d1f827df516ac13a6d977ade246c0150e7de2f4509f5d31e706b6175e7b8df4b30175bf68b14f1c70c1ccd
 MISC metadata.xml 329 BLAKE2B 50e914926db603f0d6e89f009847cab4ed7e771c33779da94e71d78dd4322457a19c8b1f4d9a27670fcde68ffd4480582c8def09973b84cc69bcf670fabfae19 SHA512 c00ceaf0e7d32f4395cdba01ce2af24ce7ab2d50baa250abe035f78d905b864fc1e0947226fce655adb5b0355030b30adabd6c64d306b83a5b8f6aae70dcdbcf
diff --git a/www-apps/miniflux/miniflux-2.0.37.ebuild b/www-apps/miniflux/miniflux-2.0.37.ebuild
new file mode 100644
index 000000000000..005822d6132c
--- /dev/null
+++ b/www-apps/miniflux/miniflux-2.0.37.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module systemd
+
+DESCRIPTION="Minimalist and opinionated feed reader"
+HOMEPAGE="https://miniflux.app https://github.com/miniflux/v2"
+SRC_URI="https://github.com/${PN}/v2/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT="test" # requires network access
+
+DEPEND="acct-user/miniflux"
+RDEPEND="${DEPEND}
+	>=dev-db/postgresql-9.5
+"
+
+S="${WORKDIR}/v2-${PV}"
+
+src_compile() {
+	ego build -ldflags="-s -w -X 'miniflux.app/version.Version=${PV}' " -o miniflux main.go
+}
+
+src_install() {
+	dobin miniflux
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	fowners miniflux:root /etc/${PN}.conf
+	fperms o-rwx /etc/${PN}.conf
+
+	local DOCS=(
+		ChangeLog
+		README.md
+		"${FILESDIR}"/README.gentoo
+	)
+
+	# Makefile has no install target, so call einstalldocs directly
+	einstalldocs
+
+	doman "${PN}".1
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		echo
+		elog "Before using miniflux, you must first create and initialize the database"
+		elog "and enable the hstore extension for it."
+		elog ""
+		elog "Afterwards, create your first admin user by running:"
+		elog "  miniflux -create-admin"
+	else
+		# This is an existing installation
+
+		echo
+		elog "If you are upgrading from a previous version, schema migrations must be performed."
+		elog "To perform the migrations, stop the daemon, backup your database, and run:"
+		elog "  emerge --config =${PF}"
+	fi
+
+	echo
+	elog "Please read"
+	elog ""
+	elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+	elog ""
+	elog "for more information."
+}
+
+pkg_config() {
+	# To be safe, avoid doing migrations if miniflux is running
+	if pgrep miniflux; then
+		die "miniflux appears to be running, refusing to continue."
+	fi
+
+	# Extract the database URL variable instead of just sourcing the config file
+	# because miniflux itself may interpret quotes as part of the URL
+	local DATABASE_URL="$(sed -n 's/^DATABASE_URL=\(.*\)/\1/p' ${EROOT}/etc/${PN}.conf)"
+	[[ -n "${DATABASE_URL}" ]] || die "Failed getting DATABASE_URL from config file"
+
+	DATABASE_URL="${DATABASE_URL}" "${EROOT}"/usr/bin/miniflux -migrate || die "miniflux -migrate failed. Please check the above output for errors."
+
+	echo
+	elog "Database migrations complete."
+}
diff --git a/www-apps/nanoc-checking/Manifest b/www-apps/nanoc-checking/Manifest
index 78554d1f222b..818e9949761f 100644
--- a/www-apps/nanoc-checking/Manifest
+++ b/www-apps/nanoc-checking/Manifest
@@ -1,5 +1,5 @@
 DIST nanoc-checking-1.0.1.gem 10752 BLAKE2B 6f6f10cf97ab17cc328d827ab19490fa6e9d6f744594c167b4d9bf050c1288a7d5657d290402efbfa8d61d8e81550feae5022720464814e27af06d5025dfde96 SHA512 ef2b5a9c044f9bef19e4c75cc9ee99747a2ff0f8bece23c56d763f59c622488ccd980a19a3563207948fdb0d9edb91e86703778f7233bc0de76adf385c5694b0
 DIST nanoc-checking-1.0.2.gem 11264 BLAKE2B 5ac338624bd85decb52ad4d59cff466ba849bd03c4b27534db34528db3fa768c1c198461bd35614203f352426105ea541c3dd0da2dff27a8430aa600a756f1fc SHA512 29fcd816f908bd7fdc2895e549d4cd0834ac53f8fc1bf8a9cf12e385cc9a1cabcca87178014beffe6b1b9f63b68d4bfe89096234ec72d3abc37dc8cc906eff24
 EBUILD nanoc-checking-1.0.1.ebuild 589 BLAKE2B 87f1d0b73aeaf813b51eb42f2cf81ce9d53060af52eb729be73b75db8a29a603373f4a9aeab65309c6547b78ee6d5899ee108d4282f9d933cf4eee2bc4895a51 SHA512 d9f7b4cd2fd45c7b4b50fb2373afb625d0bb883bbbff88db5cb1ff742bbd37df0ac2c02cb6ba925a18ab8dbcbf8944d42525a208aba247131944e6d6d4b79893
-EBUILD nanoc-checking-1.0.2.ebuild 587 BLAKE2B a82ccafe5ba20782621f624c4f4b5fe517437f76153898c30660b35c1074863c75ac194cbe4c5dc83975d777c258b070afab12eca8f5e009f1d3a4ebd6cb2fa7 SHA512 32ed0c487f1559c84d4bc34257e775fd2afd8f497a49a9624ee1116069f97520cbed65c401dcc4c81ffa2989d8a50ba17d0fb2008b194d9a65e6a05bd8fa4e37
+EBUILD nanoc-checking-1.0.2.ebuild 594 BLAKE2B 4b2869a51d06a4156127ee494aa90d985ce238f83a48bedcae078ff962c4b7744f980a180b6c6e5f79380b3a6e79ad853159716bba68852e3925fd09955874da SHA512 572af1709b96d939f11172b0881e63cf8ff35c8da00685b5e2e8d0da924bbdfbc27fe0e183ffb5c66546c9db673d21e40f673fcd97a033f2d2ec1e21d2d6be39
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
index b82ea09aba08..125b020adb9f 100644
--- a/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
+++ b/www-apps/nanoc-checking/nanoc-checking-1.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # Upstream has specs but they are not available in the gem and the
 # repository upstream is not tagged for this.
diff --git a/www-apps/nanoc-cli/Manifest b/www-apps/nanoc-cli/Manifest
index 783701fa9a98..647852665b05 100644
--- a/www-apps/nanoc-cli/Manifest
+++ b/www-apps/nanoc-cli/Manifest
@@ -1,7 +1,9 @@
 DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
+DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 EBUILD nanoc-cli-4.12.2.ebuild 2029 BLAKE2B fda269aacc8243a30aebe529c8b0d8cadb2db6f06408c47dd9cfe11714cbebf11ba83d646f5d4319776636add2c24dec403864ae4a49b990bc5a82aecd8b6d12 SHA512 ca60a110fa12c27a43ff232785db3a94c9121b6a86b5e6508f06ffcf3f96fffe8db077030b691e0e238099c838acbe1a049042b04ab97e5a81d98fbf2e6fc33c
 EBUILD nanoc-cli-4.12.3.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
 EBUILD nanoc-cli-4.12.5.ebuild 2036 BLAKE2B e621d893406f3d5140b434e8a015117265352ead95b9f5659db812dd3e5342f36ab5c4579b828a716876e7dfd7f2ff3a992e6dc4e3d1d9e681bbff17c39c4f80 SHA512 32f48b02456d3b31c716ef2cd155cc8868c89cf3c64b204c19dd9549c0b15d083d234f7565c7985028a340ec9410a4d38bdada505440504b56c86a4a3369f252
+EBUILD nanoc-cli-4.12.6.ebuild 2043 BLAKE2B 1885ff99301bde74b7fc5c7819e59ab8fa584d7275e11f731029c603c9c795ba1175aa3ba353fa73960567331fd5e3ab81aae5faa9ded36c2a54a01b0ac31c67 SHA512 2406ffaaa872e8846f48720db03521132eb2f90892c1af67e5060dde5a5a6d59aec3c8cbfb360ba7b4e3439b1a60233d6e40feaca0bf288ed6f96f8eb8120890
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild b/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
new file mode 100644
index 000000000000..878387af78c7
--- /dev/null
+++ b/www-apps/nanoc-cli/nanoc-cli-4.12.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> nanoc-${PV}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+RUBY_S="nanoc-${PV}/nanoc-cli"
+
+ruby_add_rdepend "
+	>=dev-ruby/cri-2.15:0
+	>=dev-ruby/diff-lcs-1.3:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '2i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid error handler specs failing due to different (rubygems?)
+	# output, meta_spec is affected by this.
+	rm -f spec/nanoc/cli/error_handler_spec.rb spec/meta_spec.rb || die
+
+	# Avoid test requiring a network interface
+	sed -i -e '/does not listen on non-local interfaces/askip "Needs network"' spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests requiring an additional dependency on nanoc-live
+	sed -i -e '/--live-reload is given/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "Unpackaged nanoc-live"' spec/nanoc/cli/commands/compile_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index 216c26ddc3ac..a849b5082b03 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -3,8 +3,10 @@ DIST nanoc-core-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f9
 DIST nanoc-core-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 DIST nanoc-core-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-core-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
+DIST nanoc-core-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 EBUILD nanoc-core-4.11.12.ebuild 1601 BLAKE2B ab3a233a247f06871d20933a6bb29a6068eda5ae147b0c6dc26ac3bcdb42a1fb81c7bfe4d15c986fc46f7be10067d798f69a63dd2d840c9dc8dfb24924b29202 SHA512 6d11d1cbbb7465dab60af40b2c83887397ca5948b138bbe169753c5a6d5e189127cb9662c064731d555757b792a0e4351aaa062b46e3602e34ccadfd5211f665
 EBUILD nanoc-core-4.12.2.ebuild 1920 BLAKE2B 54f3f3f9651061564e236ebd37a5d48d84f3dfb37849d4c2872454ee376e478132baeddf2d78488507633ac16ffbdcb440e3e3a414f4a31c17c1ca509586a9f8 SHA512 98dff23360020f0d0ef1e351f15f4c9270b9d4d6a77b5e5fbad019c2b1134b5a795d34c9b71339fb02244c2e654b6252365ab65f485c9a6e8319fbfdca192fc9
 EBUILD nanoc-core-4.12.3.ebuild 1935 BLAKE2B e41f23641b20bbd234c59981df1bdb968764fea169c48e058886c3f81d32684f8fa09e2f1aa7a92194d936c8807cd5494b71ad06122984f0e61dbd0a055f8b52 SHA512 6f076de31c575e20d9b71703ad99bdd080adb9b3e103655ff11591a766461a36d20085c7acd37a8afe846a4365ea23b58d3f467755ef5696548d66c178c4e977
 EBUILD nanoc-core-4.12.5.ebuild 1941 BLAKE2B 703e9b630a575007537b6060daa44e1f3a6505a324d1106fc5cfabc68e61a39c420ab888d6434e6a78c2a08152a436ee79ffce9b63efd8a29f35060d8c0b638f SHA512 b6b4afb7493fc4631754f9b7fa70ca78cee405e5958cdb5c8decb22ac5544a2d8f61798c640d87267adfecad47699fc137606459b083feb2bbc36affba166f85
+EBUILD nanoc-core-4.12.6.ebuild 1948 BLAKE2B 2c4dbfba45b230a1b5c4178e8c568cdc6e0fe6d77b0f43438ded6fdbf88806ef66d179737751ce7bb9d6e33ed742697a0662ce490272b4fd10f901b52cd7b638 SHA512 208d52ca383c3cedf47272243c7855bd0dd111d705c4a554d088eb0bdf532fe38bd666706b298fc2b527f2ec7b577828afd8bb8f693e6d31881fa6a0f0cb3d59
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
new file mode 100644
index 000000000000..8ae89b598904
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.12.6.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	>=dev-ruby/concurrent-ruby-1.1:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/memo_wise-1.5:1
+	dev-ruby/slow_enumerator_tools:1
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/tty-command
+	dev-ruby/yard
+	www-apps/nanoc-spec
+)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.12.2-contracts.patch" )
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+
+	# Avoid circular dependency on www-apps/nanoc
+	sed -i -e '/.all_outdated/,/^  end/ s:^:#:' spec/nanoc/core/feature_spec.rb || die
+	rm -f spec/nanoc/core_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc-deploying/Manifest b/www-apps/nanoc-deploying/Manifest
index 3693589e5354..320a954584f0 100644
--- a/www-apps/nanoc-deploying/Manifest
+++ b/www-apps/nanoc-deploying/Manifest
@@ -1,3 +1,5 @@
 DIST nanoc-deploying-1.0.1.gem 9728 BLAKE2B d646f56eada30fc5059069627f6b07fc6620cc952605086100e954aa9b79e7f696ecfe87ad85f1951fca1de75482943af869a28f6f4465fffc3497af9db36b7f SHA512 78e4247021b9e0ba717cf4b41bb913bbbafd7e0b149d16e681d7312f60cd0d2277de5e957f938c3194a521036da21b38696fe4ced5cd0b14cdce01aee207a744
+DIST nanoc-deploying-1.0.2.gem 9728 BLAKE2B 6f06a33c08105e59a928277efccf48371d0c93f0cb4427951431462afc4b9d88c677ac17a2627f7511a7675a7b350c2887f62b88112c2d10e1e203a44252a387 SHA512 2ef340742926584ef5112d5c281ac469520d6fd30d60bfcf502ac993256020f85de03d957d61bff0613d3e8d9bda22256cc565feffe80411e3f024c5d8a74b2c
 EBUILD nanoc-deploying-1.0.1.ebuild 617 BLAKE2B 137a627e44b9771d1a6ee38582172a8e7190bbd56ce396222540313ad421ecd7b9575a346bba23a7fe3d803bf8efae69ea8a986ee6606a1aa2b47024f108ebe4 SHA512 a443c4a542a4466f7504842e6822cd7f7c988b96faea4a19ac2da50f7c4ee302e3ae8cb4d2ddc62b436328806dd90c833af5a3d276376cfba38f0402b14b46c3
+EBUILD nanoc-deploying-1.0.2.ebuild 624 BLAKE2B 755a66802b419540f7d1352c9ef5c6c56edee4ce5ce3178ab4d9b4ea679a08cbb9b9b9763d72e1dd9bf70b0416962e1adbc24a7fe8bec93081fd3e62982f095f SHA512 975546e78e1ad29cb6c94fb2e77dab2d14d8803c23a734ab36ca4ad3f518617b1a74bbecd08c1862d52fbc33286ded3366a1b0f0d0a650e48f1a5c95f5c0ae4a
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild b/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
new file mode 100644
index 000000000000..ac61113398df
--- /dev/null
+++ b/www-apps/nanoc-deploying/nanoc-deploying-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+# Upstream has specs but they are not available in the gem and the
+# repository upstream is not tagged for this.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides deploying functionality for Nanoc"
+HOMEPAGE="https://nanoc.ws/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~riscv"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	www-apps/nanoc-checking:1
+	>=www-apps/nanoc-cli-4.11.15:0
+	>=www-apps/nanoc-core-4.11.15:0
+"
diff --git a/www-apps/nanoc-spec/Manifest b/www-apps/nanoc-spec/Manifest
index 192555a43c58..fda0ab0ea998 100644
--- a/www-apps/nanoc-spec/Manifest
+++ b/www-apps/nanoc-spec/Manifest
@@ -1,3 +1,3 @@
 DIST nanoc-spec-0.0.2.gem 6656 BLAKE2B de90b2f63a15a7168d491cd33f8994a9ef8f7b13b23f6e32d50c2bdf8467a68e4205c24c9ca79efccc1a5076d2af25cf1a31c49c946e2ff0e7add9d5bcb99d1f SHA512 78202adfcc1e9b414a1b2f8d85bf5a0ab3e52473cc490145d0b63f5c6cbd4c29c1c56b06b343ad6bd6ba2818f464abc7ece3c3a0ccd9c2dd38771110ef573d7c
-EBUILD nanoc-spec-0.0.2.ebuild 481 BLAKE2B ff84566ded98aac97358d193981a171a2ec74b1dbb3e4e981b4dce5bd7109be117d1f15aa91d05fcf8db5cfb1393c7548240cf4b5d5205e05328b15178b1252c SHA512 c8760e7d4b86f230f9a395d6bee02061b6bf347f73892dc1909dba7dab9a3a06cd4430bc4fe6c56efd0e12a65de9dd3b85fc857b314d1ffebd7f9c23252a6ed3
+EBUILD nanoc-spec-0.0.2.ebuild 488 BLAKE2B b4ca198f00a0927295460c94a43c2ec3e882a05c8dcec62d086d9cca8de2dafa4fecda02b1987ddb21fe3f41daca8b0ca763f121e3db015cc7973d6bfab3a3c0 SHA512 8be782c4e90d8376d5bc59dcc67668485c43e064ebdb551019e94ba12901449da63b8976a458b8d619f00389207960473de73b56a112e293480fb13cd785f535
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
index de408edaee8e..1644eabc99b8 100644
--- a/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
+++ b/www-apps/nanoc-spec/nanoc-spec-0.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index f08ec7172b5a..cea4606adda0 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -2,8 +2,10 @@ DIST nanoc-4.11.12.tar.gz 310160 BLAKE2B ef34bf6d28d5a9287053a939ef14bc59f99bde0
 DIST nanoc-4.12.2.tar.gz 331400 BLAKE2B f7a22b05a4805f15a8e93601ae21bffdc19fe17c6550378465d85e63c498c5773c1dcd49d685b7d4367488300394c2f5bf9e6a6dc6aea589617a27fe1bd6ed4a SHA512 3fe574c061d8d0dd034137800c88a34844d246e6ab9a7816aadb03cd2c43b5fe6d614f42e6b41bcd4df98be551edc69e35ca992f2d5ee8158f9c7eb3c7635750
 DIST nanoc-4.12.3.tar.gz 332692 BLAKE2B 8ae106366c66500ed06be841382bc1cc52c68ebc7ebec47a3f9dab278c7e17f886d0ce18c81ff73a83ec672353503155b447dfff5ba46f16bc2bfe891bb028a5 SHA512 737ce993c529643440d74e5072e2d63c2ce970d4d7637e7f225a79d3ac38907ced84928340d7bf5f11bcd02188b5cb1df0d4b03a8e000878ed924ab943db33a2
 DIST nanoc-4.12.5.tar.gz 333312 BLAKE2B bdc50ba2868313f7b427a8292c8614230e9dcf472c5290e8fff39917cd5cedad217acbc36ef8524254c9839d965d824a98c99f9effa1e8cfb549e387d69f1032 SHA512 2e533076f62605a701275fd7813b6dbe09c2530ad38fb86db3a5d999bccd8f5ac93cf684ac882f00d81bbe1ec8cce69d45ecef1488efe3caf22f6a6ffca300e2
+DIST nanoc-4.12.6.tar.gz 333932 BLAKE2B f5ff12ddd583c4a672c34a63b7f325a3ef6c18713f4e351482eb3c2a3dd5999b67ee0e1b7e8ab85899591824d8c47f19f3aa074790ae15f4616d589f762f2bb8 SHA512 343ec620d96ca086612c4babcadf33c4edcc39a02082f762568feaf226566c6d9b5441f53355ea03544b285e9a5ddc32aae0e67cc321b28336665d453f47b070
 EBUILD nanoc-4.11.12.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 EBUILD nanoc-4.12.2.ebuild 2602 BLAKE2B 3d4ea73021b5fbff30c9ace8db0419a47be7017fd7770ea8e3596c1ff8408fabf45b5998bd3f86553a9d24393b75ffbc96363ed6981c80f2c0fd4bb8c7d68dd7 SHA512 55c25a24e2c0593cf8c18fcb574648cdf03e9f2470ab899b68dfaa4b5b3d36c3e7bbe526b43756863da5e90451129e7d55cd7b3dd69d40b5a4116cc71e648a14
 EBUILD nanoc-4.12.3.ebuild 2526 BLAKE2B 7d4e688c97a6128c88998e58cea369c2c477758abf1e14c46e181784789ba7aecee6e73f46eed152dad0b874193cc0f614d0ef037d12a82f14b062efd1ec10ea SHA512 01ef7a2360d5911ea712c5cb6ad037f322803669de85495c5bb18fbaad00f5b8957f6105b7e8a80d5b4705092bf1f3bf2ead1ce9c18dd1186fd14f74a8959a59
 EBUILD nanoc-4.12.5.ebuild 2534 BLAKE2B b050122de47295ece8340b901d0c5659af8d21fb8ca1c8c82e7177de75817ac0dbbae5b44531ce48719439e96e9b44442757961381464171102b071a95bfae42 SHA512 6254cd60fd6c6cdf4bc50e2f46540f7cd61d699f3f50012a0081320f1463899d9ce24765d1775238febdae83388a9e0198273b9c375ebd7a0658111880b556e1
+EBUILD nanoc-4.12.6.ebuild 2556 BLAKE2B a7fdfdc2dcf4363155c13a07cad0c1d2330d4847b209aa39f353eadf086321cc42e92abf2490ce2d95e31d2f39b757163a0119d04ba78a49ae87cecab09a6b95 SHA512 37d42b65c527a777c7877d730b1d84cbdd94d150f695863493d3f098624570236342744c727cc211ccebf3b06c604df76420ce852b38120e07aa5e481c090039
 MISC metadata.xml 318 BLAKE2B 62f33f86cd5bcb675e9ac02fef339514b88000be788a7037416bf6594e3f27bb07c5f7b49adbc39aa6aae4fdc7f076ebbb7f0fe897807a8e4a0b2252d5238546 SHA512 1098cd34add4d21c0c10aa42a539cec14c56b1835701b73346a57cac7ea3964b776b95d76cdffd6300577682e3a29976d9b65a0e2b8f984ee1bfb7601f2d7ef2
diff --git a/www-apps/nanoc/nanoc-4.12.6.ebuild b/www-apps/nanoc/nanoc-4.12.6.ebuild
new file mode 100644
index 000000000000..0e4fee9a9436
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.12.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/colored-1.2:0
+	>=www-apps/nanoc-checking-1.0.2:1
+	~www-apps/nanoc-cli-${PV}
+	~www-apps/nanoc-core-${PV}
+	www-apps/nanoc-deploying:1
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/haml
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/mustache
+	dev-ruby/pry
+	dev-ruby/rdoc
+	>=dev-ruby/rouge-3.5.1:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' test/helper.rb ../common/spec/spec_helper_head_core.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests requiring a network connection or make assumptions
+	# about the local network environment.
+	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	#sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	#sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index f242437a2dfd..bec65d4c3c52 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 7610c246868f..c5702b75695d 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -15,7 +15,11 @@ DIST chromium-102-patchset-6.tar.xz 4780 BLAKE2B c59d23779fd769176e1cd92884dd259
 DIST chromium-102.0.5005.61.tar.xz 1433350708 BLAKE2B 7130b2c9dbc67783499003fd98f95e050bac3580e9dd6c9f4fee320e9eed876cd8c3ec29d9e9f23c78c159b1b622fbe0511750baeb6f8117f176612e1571747f SHA512 4b5d48debafef0a38105e259f97eac6e25eae1147ce67e357c3ce1e8e7700950af63117ff104b71cfbdfcaa0b31925d1b686ab1be6c52b32dad819c7e38f1846
 DIST chromium-103-patchset-4.tar.xz 7220 BLAKE2B 3dc9670be01d4bbfd24e8d305ea72e6bd911062a9a012c7548fca76ec34998b54ff31ef0118be5db9fdde3839365103cb06b29ff2ab167ad4313b4b64cba3a63 SHA512 54fb3600bb42ffcd6168f9741432879877bb5d206c11b3874249faaaff13288bffd4e7336f055c0c619efba02aa694de6abde394a6964c0ff6b33d9e3aed1691
 DIST chromium-103.0.5060.24.tar.xz 1442066428 BLAKE2B dc2cb67bf8aec50f22ae14ca36ffde555c076f197895e9da759e4292b83b15e24ddf5888af409afde273699fa1e15f3ca95f0663b7c8dbef9db74f44d361c671 SHA512 23c34f634ca890467de44efc25caa0e55d2668643ace19e6759a45b3c6119a98ddd885cab6b1a9a665613958abcc28c3b5439f36ce6c1bcb47547c56047e4c7c
+DIST chromium-104-patchset-1.tar.xz 5792 BLAKE2B 7febe80c63c598812c86196fb0279132dfb3fec827841e51aafdc8e24e3eb04834578d351b049275688d1b0ae7e17fcbf47b5ec4905b943cbb7570f4d4c1ec3f SHA512 ff87c1150c74a97f4d08da2af4266861503df45061b57283a098225078a118e240c3ef7ad0e943d6bb56d3b73a4d839109b1344dec833d4acd0ed5f07230dff5
+DIST chromium-104.0.5083.0.tar.xz 1443051464 BLAKE2B 9746f6a0fb058e12507565c59b2e582efb9188bf6faeaaf17c45a1b52269b780a54f507bc6377c6790e7f37ddb8333e193ab5190352d3eb74c39cd80756ea4c3 SHA512 d8a88805710934fed80ce00a144f1e7517149a6ee495df5a2f9fa4095de6125a59d261041c72f45bd1087060899cc1afc437f32373a74ba7bb3a8c378b9d7503
+DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
 EBUILD chromium-101.0.4951.64.ebuild 32792 BLAKE2B 3c78c778a6d11a07fc5c51934f2cedd966796c69d61855cb4d0dccd69e5151522d9ecc0f9d283ed33d10bc48ad02d0131e7efa6d185f2659e771cebb218d52b0 SHA512 4a1d1fed80fe316ee32e395e3eb7fba4a31a8eb4f65dc1053432d44e4fc202c2540425b5c06285fe13fe8865d4d26060ff82cdc86d0221eb32f2f0d34a5e9b7b
 EBUILD chromium-102.0.5005.61.ebuild 32947 BLAKE2B 6654047c669d54c1ac716b54735a188c5a305998f24f51aefbc035ae05a44fb8d5f3a238d15591e935270284f35d1d1bde8510f8772a07bff63990532eb6adc3 SHA512 e04760b90c8fdc506cf2cddd12d7c518de43343a4924bcf4c0b17dd899ed2b16d3ea0a42d12cdd2cbac551bd36c155813bccb28451ba23dc20b7e2a903e474bb
-EBUILD chromium-103.0.5060.24.ebuild 34584 BLAKE2B 9570559f4e8d43e321d41d82ac7c479b9c03c6524aac4e4746ec1fa6546270f8fff1e15103ed52d157e24b10d315e2a293442c149f0d9691a94117ac40d44b4f SHA512 cc8adde61e94a7f933b3638e896aa8e84b3af488371434018bbb8a46d652bd6812c43d27a2238558c95d8ae4490e8c7b0bfdd872b88c290d0d4d592448699dca
-MISC metadata.xml 2072 BLAKE2B a7786ca1577bb74860cbbebd9c6b4a2a0d72fa0962efd001067b5e3db3cf686dd1013f16da5b42bde863471cce2fd10519fc846997662e14ee24b5c57fcae522 SHA512 8a2ba7daa0569d4e296823459fe7635edc9c03913417eec06d97b4978c92db48f65ea0d81de9cd38179a2e0c30064416de854851da481073baf0558fd22b9410
+EBUILD chromium-103.0.5060.24.ebuild 34585 BLAKE2B beaaf461feaea3e361be4f9b9dab49c7b59648de783631c46cd7fc12153470b166c7d5678991da9d38043e6bae38f4f5e520ffe98fa301aa53eeb74e2066b0ff SHA512 a299da5768896e6ee6c946f3a69ae8ee5cc8bf717ad1451539dd7ad18760d1128b8244937939723d2853287cb3a335c4990fdadaf464ba42e14d14b2766c38c0
+EBUILD chromium-104.0.5083.0.ebuild 36624 BLAKE2B 994a8e8dea85d5ca0910496831dafd6bd37f70d25969f2db2ad5ffb30cda47d18d4f432a3f72ebb1048b1139f1bba5e6b84c2ee4828926ce23bb5ca78624ef04 SHA512 b8085c3f69526198fc223b0339505af2c686481d7477a1a8532486c274199a2097218c7b4dbd3891958b24f72aeb0bb6e28b0acd19923bb4566f976614f8c9d8
+MISC metadata.xml 2160 BLAKE2B 6ba2745b6d55ceda8ba586615cdf41afbfabe18ed828581332ad8f691632b8e67b364ff8edd5cc42331fcb257a4d8a370de9ad5a7f49d2f5b2f43dffceb294a0 SHA512 2858b94efa5b3b8d68deccbc9dc32e732756e4f5356297e22cb6fec16a9b7437acd3d351b5c89074b47d23b16ccc194a0a45631797a2df8a8fbed5b8051478ab
diff --git a/www-client/chromium/chromium-103.0.5060.24.ebuild b/www-client/chromium/chromium-103.0.5060.24.ebuild
index 3e57f344f8c0..ffeca13f66fd 100644
--- a/www-client/chromium/chromium-103.0.5060.24.ebuild
+++ b/www-client/chromium/chromium-103.0.5060.24.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
 
 LICENSE="BSD"
-SLOT="0/dev"
+SLOT="0/beta"
 KEYWORDS="~amd64 ~arm64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
diff --git a/www-client/chromium/chromium-104.0.5083.0.ebuild b/www-client/chromium/chromium-104.0.5083.0.ebuild
new file mode 100644
index 000000000000..394904049912
--- /dev/null
+++ b/www-client/chromium/chromium-104.0.5083.0.ebuild
@@ -0,0 +1,1182 @@
+# Copyright 2009-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml"
+LLVM_MAX_SLOT=14
+
+CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk ur vi zh-CN zh-TW"
+
+VIRTUALX_REQUIRED="pgo"
+
+inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="https://chromium.org/"
+PATCHSET="1"
+PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
+	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
+	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
+
+LICENSE="BSD"
+SLOT="0/dev"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+REQUIRED_USE="
+	component-build? ( !suid !libcxx )
+	screencast? ( wayland )
+	!headless? ( || ( X wayland ) )
+	pgo? ( X !wayland )
+"
+
+COMMON_X_DEPEND="
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXtst:=
+	x11-libs/libxshmfence:=
+"
+
+COMMON_SNAPSHOT_DEPEND="
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
+	dev-libs/libxslt:=
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2.11.0-r1:=
+	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
+	media-libs/libjpeg-turbo:=
+	system-png? ( media-libs/libpng:=[-apng] )
+	>=media-libs/libwebp-0.4.0:=
+	media-libs/mesa:=[gbm(+)]
+	>=media-libs/openh264-1.6.0:=
+	sys-libs/zlib:=
+	x11-libs/libdrm:=
+	!headless? (
+		dev-libs/glib:2
+		>=media-libs/alsa-lib-1.0.19:=
+		pulseaudio? ( media-sound/pulseaudio:= )
+		sys-apps/pciutils:=
+		kerberos? ( virtual/krb5 )
+		vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
+		X? (
+			x11-libs/libX11:=
+			x11-libs/libXext:=
+			x11-libs/libxcb:=
+		)
+		x11-libs/libxkbcommon:=
+		wayland? (
+			dev-libs/wayland:=
+			screencast? ( media-video/pipewire:= )
+		)
+	)
+"
+
+COMMON_DEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	app-arch/bzip2:=
+	dev-libs/expat:=
+	system-ffmpeg? (
+		>=media-video/ffmpeg-4.3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		>=media-libs/opus-1.3.1:=
+	)
+	net-misc/curl[ssl]
+	sys-apps/dbus:=
+	media-libs/flac:=
+	sys-libs/zlib:=[minizip]
+	!headless? (
+		X? ( ${COMMON_X_DEPEND} )
+		>=app-accessibility/at-spi2-atk-2.26:2
+		>=app-accessibility/at-spi2-core-2.26:2
+		>=dev-libs/atk-2.26
+		media-libs/mesa:=[X?,wayland?]
+		cups? ( >=net-print/cups-1.3.11:= )
+		virtual/udev
+		x11-libs/cairo:=
+		x11-libs/gdk-pixbuf:2
+		x11-libs/pango:=
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	!headless? (
+		|| (
+			x11-libs/gtk+:3[X?,wayland?]
+			gui-libs/gtk:4[X?,wayland?]
+		)
+		x11-misc/xdg-utils
+	)
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+"
+DEPEND="${COMMON_DEPEND}
+	!headless? (
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
+		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
+	)
+"
+
+depend_clang_llvm_version() {
+	echo "sys-devel/clang:$1"
+	echo "sys-devel/llvm:$1"
+	echo "=sys-devel/lld-$1*"
+}
+
+depend_clang_llvm_versions() {
+	local _v
+	if [[ $# -gt 1 ]]; then
+		echo "|| ("
+		for _v in "$@"; do
+			echo "("
+			depend_clang_llvm_version "${_v}"
+			echo ")"
+		done
+		echo ")"
+	elif [[ $# -eq 1 ]]; then
+		depend_clang_llvm_version "$1"
+	fi
+}
+
+BDEPEND="
+	${COMMON_SNAPSHOT_DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
+	>=app-arch/gzip-1.7
+	libcxx? ( >=sys-devel/clang-12 )
+	lto? ( $(depend_clang_llvm_versions 12 13 14) )
+	pgo? (
+		>=dev-python/selenium-3.141.0
+		>=dev-util/web_page_replay_go-20220314
+		$(depend_clang_llvm_versions 12 13 14)
+	)
+	dev-lang/perl
+	>=dev-util/gn-0.1807
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	dev-vcs/git
+	>=net-libs/nodejs-7.6.0[inspector]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	js-type-check? ( virtual/jre )
+"
+
+# These are intended for ebuild maintainer use to force clang if GCC is broken.
+: ${CHROMIUM_FORCE_CLANG=no}
+
+if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
+	BDEPEND+=" >=sys-devel/clang-12"
+fi
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+
+For native file dialogs in KDE, install kde-apps/kdialog.
+
+To make password storage work with your desktop environment you may
+have install one of the supported credentials management applications:
+- app-crypt/libsecret (GNOME)
+- kde-frameworks/kwallet (KDE)
+If you have one of above packages installed, but don't want to use
+them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
+in /etc/chromium/default.
+"
+
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
+needs_clang() {
+	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
+}
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
+		einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		( use lto || use pgo ) && llvm_pkg_setup
+
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
+			die "At least gcc 9.2 is required"
+		fi
+		if use pgo && tc-is-cross-compiler; then
+			die "The pgo USE flag cannot be used when cross-compiling"
+		fi
+		if needs_clang || tc-is-clang; then
+			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
+			CPP+=" -E"
+			if ! ver_test "$(clang-major-version)" -ge 12; then
+				die "At least clang 12 is required"
+			fi
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="4G"
+	CHECKREQS_DISK_BUILD="10G"
+	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="13G"
+	if use lto || use pgo; then
+		CHECKREQS_MEMORY="9G"
+		CHECKREQS_DISK_BUILD="12G"
+		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
+		use pgo && CHECKREQS_DISK_BUILD="19G"
+	fi
+	if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
+		if use custom-cflags || use component-build; then
+			CHECKREQS_DISK_BUILD="25G"
+		fi
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+
+	if use headless; then
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
+		for myiuse in ${headless_unused_flags[@]}; do
+			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
+		done
+	fi
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+
+	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
+	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
+		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
+		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
+	fi
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-98-gtk4-build.patch"
+		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
+		"${FILESDIR}/chromium-shim_headers.patch"
+		"${FILESDIR}/chromium-cross-compile.patch"
+	)
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	# adjust python interpreter version
+	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
+
+	local keeplibs=(
+		base/third_party/cityhash
+		base/third_party/double_conversion
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		buildtools/third_party/libc++
+		buildtools/third_party/libc++abi
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		net/third_party/quic
+		net/third_party/uri_template
+		third_party/abseil-cpp
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/common/third_party/xxhash
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/angle/src/third_party/volk
+		third_party/apple_apsl
+		third_party/axe-core
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/beautifulsoup4-4.9.3
+		third_party/catapult/third_party/html5lib-1.1
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/six
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jpeg-js
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/closure_compiler
+		third_party/cpuinfo
+		third_party/crashpad
+		third_party/crashpad/crashpad/third_party/lss
+		third_party/crashpad/crashpad/third_party/zlib
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/dav1d
+		third_party/dawn
+		third_party/dawn/third_party/gn/webgpu-cts
+		third_party/dawn/third_party/khronos
+		third_party/depot_tools
+		third_party/devscripts
+		third_party/devtools-frontend
+		third_party/devtools-frontend/src/front_end/third_party/acorn
+		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
+		third_party/devtools-frontend/src/front_end/third_party/axe-core
+		third_party/devtools-frontend/src/front_end/third_party/chromium
+		third_party/devtools-frontend/src/front_end/third_party/codemirror
+		third_party/devtools-frontend/src/front_end/third_party/diff
+		third_party/devtools-frontend/src/front_end/third_party/i18n
+		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
+		third_party/devtools-frontend/src/front_end/third_party/lighthouse
+		third_party/devtools-frontend/src/front_end/third_party/lit-html
+		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
+		third_party/devtools-frontend/src/front_end/third_party/marked
+		third_party/devtools-frontend/src/front_end/third_party/puppeteer
+		third_party/devtools-frontend/src/front_end/third_party/wasmparser
+		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
+		third_party/devtools-frontend/src/third_party
+		third_party/distributed_point_functions
+		third_party/dom_distiller_js
+		third_party/eigen3
+		third_party/emoji-segmenter
+		third_party/farmhash
+		third_party/fdlibm
+		third_party/fft2d
+		third_party/flatbuffers
+		third_party/fp16
+		third_party/freetype
+		third_party/fusejs
+		third_party/fxdiv
+		third_party/highway
+		third_party/libgifcodec
+		third_party/liburlpattern
+		third_party/libzip
+		third_party/gemmlowp
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jsoncpp
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/fastfeat
+		third_party/libaom/source/libaom/third_party/vector
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libavif
+		third_party/libgav1
+		third_party/libjingle
+		third_party/libjxl
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libsync
+		third_party/libudev
+		third_party/libva_protected_content
+		third_party/libvpx
+		third_party/libvpx/source/libvpx/third_party/x86inc
+		third_party/libwebm
+		third_party/libx11
+		third_party/libxcb-keysyms
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/llvm
+		third_party/lottie
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/mako
+		third_party/maldoca
+		third_party/maldoca/src/third_party/tensorflow_protos
+		third_party/maldoca/src/third_party/zlibwrapper
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/minigbm
+		third_party/modp_b64
+		third_party/nasm
+		third_party/nearby
+		third_party/neon_2_sse
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/one_euro_filter
+		third_party/openscreen
+		third_party/openscreen/src/third_party/mozilla
+		third_party/openscreen/src/third_party/tinycbor/src/src
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/skia_shared
+		third_party/perfetto
+		third_party/perfetto/protos/third_party/chromium
+		third_party/pffft
+		third_party/ply
+		third_party/polymer
+		third_party/private-join-and-compute
+		third_party/private_membership
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/pthreadpool
+		third_party/pyjson5
+		third_party/qcms
+		third_party/rnnoise
+		third_party/s2cellid
+		third_party/securemessage
+		third_party/shell-encryption
+		third_party/simplejson
+		third_party/skia
+		third_party/skia/include/third_party/skcms
+		third_party/skia/include/third_party/vulkan
+		third_party/skia/third_party/skcms
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/snappy
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/astc-encoder
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/marl
+		third_party/swiftshader/third_party/subzero
+		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
+		third_party/swiftshader/third_party/SPIRV-Tools
+		third_party/tensorflow-text
+		third_party/tflite
+		third_party/tflite/src/third_party/eigen3
+		third_party/tflite/src/third_party/fft2d
+		third_party/ruy
+		third_party/six
+		third_party/ukey2
+		third_party/unrar
+		third_party/utf
+		third_party/vulkan
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webgpu-cts
+		third_party/webrtc
+		third_party/webrtc/common_audio/third_party/ooura
+		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
+		third_party/webrtc/modules/third_party/fft
+		third_party/webrtc/modules/third_party/g711
+		third_party/webrtc/modules/third_party/g722
+		third_party/webrtc/rtc_base/third_party/base64
+		third_party/webrtc/rtc_base/third_party/sigslot
+		third_party/widevine
+		third_party/woff2
+		third_party/wuffs
+		third_party/x11proto
+		third_party/xcbproto
+		third_party/xnnpack
+		third_party/zxcvbn-cpp
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/siphash
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+		v8/third_party/v8
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-png; then
+		keeplibs+=( third_party/libpng )
+	fi
+	if use libcxx; then
+		keeplibs+=( third_party/re2 )
+	fi
+	if use system-harfbuzz; then
+		keeplibs+=( third_party/harfbuzz-ng/utils )
+	else
+		keeplibs+=( third_party/harfbuzz-ng )
+	fi
+	if use wayland && ! use headless ; then
+		keeplibs+=( third_party/wayland )
+	fi
+	if use arm64 || use ppc64 ; then
+		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
+	fi
+	# we need to generate ppc64 stuff because upstream does not ship it yet
+	# it has to be done before unbundling.
+	if use ppc64; then
+		pushd third_party/libvpx >/dev/null || die
+		mkdir -p source/config/linux/ppc64 || die
+		# requires git and clang, bug #832803
+		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
+			generate_gni.sh || die
+		./generate_gni.sh || die
+		popd >/dev/null || die
+
+		pushd third_party/ffmpeg >/dev/null || die
+		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
+		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
+		popd >/dev/null || die
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+
+	if use js-type-check; then
+		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
+	fi
+
+	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
+	mkdir -p buildtools/third_party/eu-strip/bin || die
+	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
+}
+
+chromium_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	if needs_clang && ! tc-is-clang; then
+		# Force clang since gcc is either broken or build is using libcxx.
+		if tc-is-cross-compiler; then
+			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
+			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
+			BUILD_CC=${CBUILD}-clang
+			BUILD_CXX=${CBUILD}-clang++
+		else
+			CC=${CHOST}-clang
+			CXX=${CHOST}-clang++
+		fi
+		strip-unsupported-flags
+	fi
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
+	if use lto || use pgo; then
+		myconf_gn+=" use_lld=true"
+	else
+		myconf_gn+=" use_lld=false"
+	fi
+
+	if use lto || use pgo; then
+		AR=llvm-ar
+		NM=llvm-nm
+		if tc-is-cross-compiler; then
+			BUILD_AR=llvm-ar
+			BUILD_NM=llvm-nm
+		fi
+	fi
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
+		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
+
+		# setup cups-config, build system only uses --libs option
+		if use cups; then
+			mkdir "${T}/cups-config" || die
+			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
+			export PATH="${PATH}:${T}/cups-config"
+		fi
+
+		# Don't inherit PKG_CONFIG_PATH from environment
+		local -x PKG_CONFIG_PATH=
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
+	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
+	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
+	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libwebp
+		libxml
+		libxslt
+		openh264
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-png; then
+		gn_system_libraries+=( libpng )
+	fi
+	# re2 library interface relies on std::string and std::vector
+	if ! use libcxx; then
+		gn_system_libraries+=( re2 )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
+
+	# Disable deprecated libgnome-keyring dependency, bug #713012
+	myconf_gn+=" use_gnome_keyring=false"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+
+	if use headless; then
+		myconf_gn+=" use_cups=false"
+		myconf_gn+=" use_kerberos=false"
+		myconf_gn+=" use_pulseaudio=false"
+		myconf_gn+=" use_vaapi=false"
+		myconf_gn+=" rtc_use_pipewire=false"
+	else
+		myconf_gn+=" use_cups=$(usex cups true false)"
+		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
+		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
+		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+	fi
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" disable_fieldtrial_testing_config=true"
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false"
+	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
+
+	# Disable pseudolocales, only used for testing
+	myconf_gn+=" enable_pseudolocales=false"
+
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info. The OAuth2 credentials, however, have been left out.
+	# Those OAuth2 credentials have been broken for quite some time anyway.
+	# Instead we apply a patch to use the --oauth2-client-id= and
+	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
+	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
+	# Chromium without baked-in values.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	local myarch="$(tc-arch)"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Debug info section overflows without component build
+		# Prevent linker from running out of address space, bug #471810 .
+		if ! use component-build || use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4
+		fi
+	fi
+
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+
+		# This is normally defined by compiler_cpu_abi in
+		# build/config/compiler/BUILD.gn, but we patch that part out.
+		append-flags -msse2 -mfpmath=sse -mmmx
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
+	elif [[ $myarch = ppc64 ]] ; then
+		myconf_gn+=" target_cpu=\"ppc64\""
+		ffmpeg_target_arch=ppc64
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Disable external code space for V8 for ppc64. It is disabled for ppc64
+	# by default, but cross-compiling on amd64 enables it again.
+	if tc-is-cross-compiler; then
+		if ! use amd64 && ! use arm64; then
+			myconf_gn+=" v8_enable_external_code_space=false"
+		fi
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	# https://bugs.gentoo.org/654216
+	addpredict /dev/dri/ #nowarn
+
+	#if ! use system-ffmpeg; then
+	if false; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	# Disable unknown warning message from clang.
+	if tc-is-clang; then
+		append-flags -Wno-unknown-warning-option
+		if tc-is-cross-compiler; then
+			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
+			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
+		fi
+	fi
+
+	# Disable opaque pointers, https://crbug.com/1316298
+	if tc-is-clang; then
+		if test-flag-CXX -Xclang -no-opaque-pointers; then
+			append-flags -Xclang -no-opaque-pointers
+			if tc-is-cross-compiler; then
+				export BUILD_CXXFLAGS+=" -Xclang -no-opaque-pointers"
+				export BUILD_CFLAGS+=" -Xclang -no-opaque-pointers"
+			fi
+		fi
+	fi
+
+	# Explicitly disable ICU data file support for system-icu/headless builds.
+	if use system-icu || use headless; then
+		myconf_gn+=" icu_use_data_file=false"
+	fi
+
+	# Enable ozone wayland and/or headless support
+	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
+	myconf_gn+=" ozone_platform_headless=true"
+	if use headless; then
+		myconf_gn+=" ozone_platform=\"headless\""
+		myconf_gn+=" use_xkbcommon=false use_gtk=false"
+		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
+	else
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
+	fi
+
+	# Enable official builds
+	myconf_gn+=" is_official_build=$(usex official true false)"
+	myconf_gn+=" use_thin_lto=$(usex lto true false)"
+	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
+	if use official; then
+		# Allow building against system libraries in official builds
+		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+			tools/generate_shim_headers/generate_shim_headers.py || die
+		# Disable CFI: unsupported for GCC, requires clang+lto+lld
+		myconf_gn+=" is_cfi=false"
+		# Don't add symbols to build
+		myconf_gn+=" symbol_level=0"
+	fi
+
+	if use pgo; then
+		myconf_gn+=" chrome_pgo_phase=${1}"
+		if [[ "$1" == "2" ]]; then
+			myconf_gn+=" pgo_data_path=\"${2}\""
+		fi
+	else
+		# Disable PGO, because profile data is only compatible with >=clang-11
+		myconf_gn+=" chrome_pgo_phase=0"
+	fi
+
+	einfo "Configuring Chromium..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	chromium_configure $(usex pgo 1 0)
+}
+
+chromium_compile() {
+	# Final link uses lots of file descriptors.
+	ulimit -n 2048
+
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
+	local -x PYTHONPATH=
+
+	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+# This function is called from virtx, and must always return so that Xvfb
+# session isn't left running. If we return 1, virtx will call die().
+chromium_profile() {
+	einfo "Profiling for PGO"
+
+	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
+
+	# Remove old profdata in case profiling was interrupted.
+	rm -rf "${1}" || return 1
+
+	if ! "${EPYTHON}" ./chromium_profiler.py \
+	     --chrome-executable "${S}/out/Release/chrome" \
+	     --chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
+	     --add-arg no-sandbox --add-arg disable-dev-shm-usage \
+	     --profile-output "${1}"; then
+		eerror "Profiling failed"
+		return 1
+	fi
+
+	popd >/dev/null || return 1
+}
+
+src_compile() {
+	if use pgo; then
+		local profdata
+
+		profdata="${WORKDIR}/chromium.profdata"
+
+		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
+			chromium_compile
+			virtx chromium_profile "$profdata"
+
+			touch "${WORKDIR}/.pgo-profiled" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
+			# Remove phase 1 output
+			rm -r out/Release || die
+
+			chromium_configure 2 "$profdata"
+
+			touch "${WORKDIR}/.pgo-phase-2-configured" || die
+		fi
+
+		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
+			chromium_compile
+			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
+		fi
+	else
+		chromium_compile
+	fi
+
+	mv out/Release/chromedriver{.unstripped,} || die
+
+	# Build manpage; bug #684550
+	sed -e 's|@@PACKAGE@@|chromium-browser|g;
+		s|@@MENUNAME@@|Chromium|g;' \
+		chrome/app/resources/manpage.1.in > \
+		out/Release/chromium-browser.1 || die
+
+	# Build desktop file; bug #706786
+	sed -e 's|@@MENUNAME@@|Chromium|g;
+		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
+		s|@@PACKAGE@@|chromium-browser|g;
+		s|\(^Exec=\)/usr/bin/|\1|g;' \
+		chrome/installer/linux/common/desktop.template > \
+		out/Release/chromium-browser-chromium.desktop || die
+
+	# Build vk_swiftshader_icd.json; bug #827861
+	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
+		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
+		out/Release/vk_swiftshader_icd.json || die
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+	doexe out/Release/chrome_crashpad_handler
+
+	ozone_auto_session () {
+		use X && use wayland && ! use headless && echo true || echo false
+	}
+	local sedargs=( -e
+			"s:/usr/lib/:/usr/$(get_libdir)/:g;
+			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
+	)
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	(
+		shopt -s nullglob
+		local files=(out/Release/*.so out/Release/*.so.[0-9])
+		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
+	)
+
+	if ! use system-icu && ! use headless; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/MEIPreload
+
+	# Install vk_swiftshader_icd.json; bug #827861
+	doins out/Release/vk_swiftshader_icd.json
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons
+	local branding size
+	for size in 16 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	# Install desktop entry
+	domenu out/Release/chromium-browser-chromium.desktop
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	# Install manpage; bug #684550
+	doman out/Release/chromium-browser.1
+	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+
+	if ! use headless; then
+		if use vaapi; then
+			elog "VA-API is disabled by default at runtime. You have to enable it"
+			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
+			elog "in /etc/chromium/default."
+		fi
+		if use screencast; then
+			elog "Screencast is disabled by default at runtime. Either enable it"
+			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
+			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+		if use gtk4; then
+			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
+			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
+			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
+		fi
+	fi
+}
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index d941cc3a7e28..8cfa20f11dce 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="libcxx">Use bundled libc++ instead of libstdc++ for building.</flag>
 		<flag name="lto">Build with Link Time Optimizations (via clang's ThinLTO)</flag>
 		<flag name="official">Enable Official build instead of Developer build.</flag>
+		<flag name="pgo">Build with Profile Guided Optimizations (2-stage compilation)</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable codecs for patent-encumbered audio and video formats.</flag>
 		<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 3460ecd22aaf..0347467e8b98 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -7,5 +7,5 @@ DIST epiphany-42.2.tar.xz 6101892 BLAKE2B 81553836de2518b2aa490c34b238afe7dd71f6
 EBUILD epiphany-41.3.ebuild 1994 BLAKE2B 98573353317a56cab47f0f419f1e0f19ea485ae68813e9058eb2b5dac1ca3576607406b33cc3809ff5216999423aa69f65eabb526aa7d1dd54887c5829fca8c9 SHA512 789a4c0338db5ddd26768a3496f576ece86d298c3d682f1b4144ed61a72e0336c49a4646b979aaf439b46d4d927cdf67ecd310b11edd2c5f7d2dffbe1abe9917
 EBUILD epiphany-42.0.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6
 EBUILD epiphany-42.1.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6
-EBUILD epiphany-42.2.ebuild 1942 BLAKE2B 219ae729fd9d23a48a3370d1b9d486a24eae6fb085e822280f52210db87631cd2117fdd9ac25f8c8d27514e2f355c17017c0a628c46d6b2faccf24f13c5732e9 SHA512 4b8429e5aaf18541fa05775bb1bfcfb3efba6d1e31d8c435ad5559bb5e8736f8217a07a1205fbed09ed4774da2cb5f4ad4fc542a0f1c6fbaa5ced55443313ac6
+EBUILD epiphany-42.2.ebuild 1939 BLAKE2B d190df9f7eae141ad1d96540a0796c24eb7ac5878c8f2a33ada4f794b3c3a1d925f26581998932e55d9f5e6bfc93686f593b9dc6a8253f128908e5670528f94a SHA512 ca7e3d82176e3957a57b1707aba92295c411cc4f76e282473d23fbcee8f7e99ea9ee103c45d51952fbcf307c7470858d00fe77c3a13051cf29ff1d3179057508
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/www-client/epiphany/epiphany-42.2.ebuild b/www-client/epiphany/epiphany-42.2.ebuild
index cdecea5a8e9f..19e7f2c4789c 100644
--- a/www-client/epiphany/epiphany-42.2.ebuild
+++ b/www-client/epiphany/epiphany-42.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 
 DEPEND="
 	>=dev-libs/glib-2.67.4:2
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 2cc09d183562..a3cc3723ee84 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -8,201 +8,6 @@ AUX icon/firefox-r2.desktop 8137 BLAKE2B 5d0ce737c0e0969cb1a61de7989f5ca1ca0dff4
 AUX icon/firefox-r3.desktop 8116 BLAKE2B 50b476a1be87bcca0bd6175b7a7f5e67ac5d3f40b0a5a99c2244036a9eea53fb518f59c1d87b18723c4ae6c261bfb692ef0b52c6714402b0a98da4b6867ab977 SHA512 07c9d89babe20fba9531396c9aa2b692aae77606be2b8a750481b6b8f9b3eab320fef313d1ed4b15d3fbc4cd94dfb56b62ce1a3e89ba7143c6aa9acc0f919bf8
 AUX icon/firefox-symbolic.svg 7432 BLAKE2B 33a552ffb9850f6b9cd3cb8d9f7f80268ac08f00a0bd5eb15d892c6fbb950f8cacf6058b9c838f5be1ae1b53541f143a1ec0c1302ae85b49100b166fcbccdce6 SHA512 ba7db9a7c95a051bcd84e4c09c802fc55ee3c0d1d06ec1b169b04e414259b75bbe92fe584aee41a1e3f71e71c160df8bedf5393449e5024110ed27dbc0579ea8
 DIST firefox-100-patches-02j.tar.xz 18916 BLAKE2B a85a390ef40c2a321fae99b649b9df5ce9e3d226206f67a37d797154e4bb627574d0ec80055c218c2ab323b860a770a6d7ae5722d3ef1fff79c15c190ad85338 SHA512 f027c5a43c798964fdcb6ab7c32acbe4e03ece5870e3b619d2d3013fd3091706c144478ed70a86082dd7ea9818adaf9c769995e9630bf5d246196522b37a3b6f
-DIST firefox-100.0-ach.xpi 448897 BLAKE2B 43cabf49051eeb439dd0d1726f198f57671ac7a7871b877c938e263675468bb522c139cb024e63a71125d2567e1588906a3a5103e7d54ec1e49e9791d978260f SHA512 bfcf45a0fc2ecb6bf80d90b20e627900832e9b270c5a330f76e9fedef2dae723c3f1fcee8056e2718c95f87ce5d23b8aba3535941165fe066dbb7c9218697bae
-DIST firefox-100.0-af.xpi 415226 BLAKE2B 6c04b00b3551e88af1b4e2b6764180678c5cbabb85124d9a9e4f5ee6668e973967c18eac9a8c9dcc8d15e577bdffebc0b19f0ed67feecbf38fe03918cd90c730 SHA512 0cdaae26ac25bd1760a87d723620ca01fbb6c859c1d3759842734f2dd540555d1e5b8248b66dc35aeef62ff3e6abd12eb881c7931a5cfffdfa343fbbe3744d09
-DIST firefox-100.0-an.xpi 495500 BLAKE2B 02ed9d05350e38abe199b8373f59e4f14bcc45ba736517a3ffc5e3924da4183634e4ca163b09994eeba6b7a73dcea776d5c734f2f09fa3106ba06227a26f56c5 SHA512 01cb2d0da1f3ed9571156c708eb3d853cbf3196a7f7a90b1f3cdf3a392a893a2f2263b80f7f09fde23e23958df77a760695b15bee4f34bb4af42a8656348078d
-DIST firefox-100.0-ar.xpi 564886 BLAKE2B 84937d45a0d8daf36fbcaf0d184dcf6033e868b150ece264546cc37fd61477a2810a231896103857359cf3a3ca4ad2cf5c867129115ac0db73fd6e40e55c73c0 SHA512 aad8936ce43af08aa19a375e0d3be9f04d6f78e8232eaad2d3e5936a36cd2aee5529b4a1abf93edf34dd5f46578b3f8f90afd403e87bcc66f61d35851cf12eab
-DIST firefox-100.0-ast.xpi 493304 BLAKE2B b6c1046ae573e60414da042e6076462e102480a65bc98403344ae573d10e8c6b029304d48013594130eb3eeb08079dca195eb14269cb8f5b11e90e9dfb854514 SHA512 4e00aa27314529c4eb2897827fad42d037688224db5223c4e0a5c49b571a61ba8acbab8c55cbb7c6df501ef77688451641bebe86a599c7bbecdca2e9cc2168b9
-DIST firefox-100.0-az.xpi 484092 BLAKE2B 67a6a0c76ebbfd3ba4a6d9651693be6afba812162cdcdf9207d00d3cde9bb2c7a28df7bd6c03048bc6ae5cab7a3d1fc76bf6a21250ba8fd2707494d8af515247 SHA512 fabd11253fb255f46633612959b5b97981d8ef67b2ad4fb5e54bec4f6e6ac13ee6bf317081db2454c810a7e842c4b437a899f16d89bcb53c1d20da1a1c3aa5de
-DIST firefox-100.0-be.xpi 628696 BLAKE2B 04c28384dbb313e5302f67b16a9effd7479c055b5f445ce5934d918b2a354600917463c3b10e5df504797ea10334b4b44175512571fc4e4bd9b0c192d7bf8dfd SHA512 2c7030822c1be57200fdc670a7b74e225cdc092522d6f77b6047cebad9a8077054ea47edfcfd86bfc0091e5c540a8833aadf8b605dca0988c99d1cf2cf6e1d2b
-DIST firefox-100.0-bg.xpi 566785 BLAKE2B edd742fa43bb7e5098ceb5dec684e0f7921c0295bd461bb0eab1ffc9157bf83a725c5385c9e23bbf62e8403ae46054441d59f130b67b67f8feb9dc05548c2318 SHA512 29c7da2b92793481b8f1a0e81e7639cab51e1f1bab9ca4b9a4b788a679d4fd91f7d42c65bff122d0404ca8006579f3d503467df5e76cf6113ed3e805c01d1d74
-DIST firefox-100.0-bn.xpi 554540 BLAKE2B 89a1c26e62f2e80f4802fc9cfa23b94d672374316d813c9be022dfeaa9aeafe4ef8dcbe2951bc77fd0df59d5d1a246ab8e94fc8d310bca4e6bd4038dcca9a142 SHA512 107f23f8b82778a068c57e93512346c75a645ef47dba17e76794ca88affb649e79c5434fe547f79b5e68739174a272e011fa75582ef544df45cfd16f44907638
-DIST firefox-100.0-br.xpi 530611 BLAKE2B 201640add757a1dca171c0351e1845d91d9653bbd7a44f812be0fef1e811b7c3a30b3984a4208095db64bd23850c4858427c68139ee36bf77529ace065fba836 SHA512 bf1ecd65cac7a7a65f0b9f52ba128f77983fdc0a2f091a76ee20695527d6a93b431d177e923e35c144f4e29feccd60ee1e828d1ff0c3bad140cb22472e0ebc40
-DIST firefox-100.0-bs.xpi 459035 BLAKE2B cf2f09a31a150477adf5c9cf4810dcc1bda3d36ae2fe0a5a778c4b2915fcba18be129b9976fe449424e5e0dfc407149360b3954e4ffe69790cce50c3c68da7c6 SHA512 57d2fc336efa1c93b27d3712dcdee8a0046376c4011fe5f5d020044f26c97b49b5036c4e80609be5aabe90851f2031b1e2f7b1ecb6c25d3816da7c02ae086656
-DIST firefox-100.0-ca-valencia.xpi 536445 BLAKE2B 61320a337973d562ea601e28ac73af2cac27ad9eabe67c3a30bc51ac71979fe5857d9a1d1a62d3e411b0b4de422be37d9147427bff5496681ebdb9c02c689593 SHA512 4fad1577b9ff61d3956d52dcc2cd672a256d18616b8530b67c052d5e025f777cfd72242aec66416dc5fada74a8a97611c94111d3720c352f78ac3c0437a10954
-DIST firefox-100.0-ca.xpi 530200 BLAKE2B df66c1b672b8bd23d0c713d1689c05a76480cc18425476f7d2b0cea91113a8c442bce02a56ea1efd98fc1c262f25ea749181c960c8cdb55c63b65e6787fe399d SHA512 1c0052db74e50bcdeb394d57f33289a75d1bb495c78ea6d1483ddb1b0f18c4bd25018e76dfabedc501ee3303f426cb51358ef091ff64fd8715bfab68666959de
-DIST firefox-100.0-cak.xpi 553417 BLAKE2B c13b19acb4dab04e76963bbc3ea813889a03236660229be3ba0e522e961229d8f8c123b0dcc140c2d783b08dea9351ad5be4ab27183c70188c93658caf7dda44 SHA512 f106e6b8d898f2046a0edfc41eb2782d8436fd14b1489442e6eb78c855128f37b4dd2de826462a9c44502fe3c795308511d97085912ef90e1f66309636dc67a5
-DIST firefox-100.0-cs.xpi 570159 BLAKE2B b39239d57eabe01940c01c51a01045b5eba6910c141e5b0f99a0ee5e539026cbd328a48a2539c2c2fa7d01132655757108313409a131aad567619943526387c1 SHA512 8c922e0433fd28f3e912be552ee93b25dfb3cb054237a9220a6523c9e765a97c7b5bb0dd4ef801bca773b47be31f777bdf103491776307e89e453453fbe7eff5
-DIST firefox-100.0-cy.xpi 546995 BLAKE2B 9250a3edafb95ddb60bade4c3d4e1e76659e08d01b0352288d2184e747e59c6763a514bbb464373fa998520ae0951bec17ef2ddef057e23d779def91e640c022 SHA512 8b975b20a7c422dc798382f83c0ca5217640e4deb5c9a0a64c3e578fff4afa1373c67e7dd32c5d5e8704741df44a00c9eaca83b61291613061775a3d9c9ff659
-DIST firefox-100.0-da.xpi 538817 BLAKE2B 6577ab7f419a3ccb1be856c497fe4ca0fab5f1cf05134de4a36b45e33fabfc0ccf5f5a3b931bbebd20c87eb54c87452df42026ecd3d40aafbe92abb513b89b43 SHA512 98d9ae3974f1fb1f9b720a2a11d2405e5a3a84162a028a74982a98b9c3a9485851074489f8e1ef254891e399c0b403924c9672bea30f69647de21a6c9d99736e
-DIST firefox-100.0-de.xpi 558692 BLAKE2B 3eff85104794a5bb7ab0dca3c0ea549b23f129842d0198eb906763107706417560c2cf7585622b236b59891a4d9b1e48f2d42eac9af75de173e54b8dab4ed567 SHA512 f95b347b6d127c81402e706c02100a51a22a2a4ecde33a0cc267ba6831fc5c58e875b20a3f986cb11c23f90d9036d3ac56341d028f27a92363f311c652d89afe
-DIST firefox-100.0-dsb.xpi 571795 BLAKE2B 9f5152d37d995bd54d328b519b0732fe22b1a27c26312775edeb795786865097bc86a739bc6cca8bd4235564681d104a6bfeae2efce551b09ae58d7dfa2a92d5 SHA512 a00a95f3381f401505c30e7a7f5536b98a7014029d06922cf1eb69d03215610b7d946cfa95ba47184908909a0e15821711ca0b13dfabb6db646dbd63583dc87a
-DIST firefox-100.0-el.xpi 645056 BLAKE2B 3ba131bdee7a67293de875821b08e001fad2fccd4f20a5ce93f1f98d8833406152fa669b48c5aaf1a4cd283397dabb1dad64a367d472daba800307c364a71e92 SHA512 474e36968fee9a21fde283a8ec1185ed0f458e750c393e54f5bdead72138eeea3f7f4ea4775897332cd8b109e4fc8fa14f2b28a984571c7afaa15585e55adcee
-DIST firefox-100.0-en-CA.xpi 514207 BLAKE2B 649d11c78c7ce395b967fe4bcd6d77f51f50ac1702a8b4113a011ccd183cca75c49e23021f9746ae0bd3b3196da69a44e95ec4525eb3ae35438998495413266f SHA512 27755999431373341c4ab049aad1745f8158232266c78a87b9b8f4d2b0c78bcc2eea61b6dee9ebb7e48ef687d73002bcf37d656112cca295a471aebacaae905f
-DIST firefox-100.0-en-GB.xpi 514698 BLAKE2B 55486e15a07ab6548dc6136da12497182de2e7a8d441ff952f9b2ddc792d6fbebaf8e4019eb0d4a8660702224b33e97f1989d298b4f55ea6ac9a6524a7f55769 SHA512 4af7681303d437ee94ae0574c18929710925589a7be8e3034a01760518d7d5a6bbda68bf9a5bb081bc93af821a1d242e07bb5235fd559a970e59862e1012f82a
-DIST firefox-100.0-eo.xpi 540865 BLAKE2B 2e030878522f1246be92c8e6db076979bfa1bc03e188213af536942f337622a950e957ea14a76d436c81ef9d2556d69caf3d06611278595822dce95e3d962de5 SHA512 0344de8764cc14e2b21e97e3e9e82312e592f95bf057481d25229d41504f9ffdbe2f0c18db47259830efdf0a47905f50fcd52be5e4deb9e6185c1e879e4a1d4a
-DIST firefox-100.0-es-AR.xpi 551765 BLAKE2B e02ae9937d342a3922794717b3573dbe4f95fed2596a356ce78b24d7509ad2ad53254507a790766b01b3e21aa3181e5c41a795b0a8cd73478420b88cfb588837 SHA512 f3c5fe155f02639bdad39c6592920b8c343e9500d3a801a8715785add45f3058e5bba8aa67265eb69a6550eae77c57da32b30bdbce326c4021fbd42603829e9e
-DIST firefox-100.0-es-CL.xpi 550976 BLAKE2B b67fe6a05c002b8fc5e474d5da19b67839239854df147a425d1e810020ab688e018f86a33397775ed37c424df8dd33f1b6767bca9897c1a230de51a1a8e1a806 SHA512 6400b5a47d01d5a4e0b6170ea86b1f8540b0bbb321368699a0bfb779e977e98ea11fc33edb3d7220af97eae7fedd0307b16a3925ddcaff95c5575b61e136fe0a
-DIST firefox-100.0-es-ES.xpi 542252 BLAKE2B 41480f2db9bbc89c1ddc686c96da7bec59c173428822eec3995e77a56d695b3b28658f49211b7ea437c91c75f53a14d1c18287869965c460721b9a1ba59ff8e7 SHA512 7cfb1bdb53401e50f2f657d916b63750f55643ccc315da56f3aee60b0a6e22927b715014a91b288651f100461cddd32ad7f4f7974d4e7d5d4a94a86f0bee033c
-DIST firefox-100.0-es-MX.xpi 555131 BLAKE2B e6ab92e7eda6167e65f8102b36f501ab3d800423e4596c16c4f5c4a08bff8944cffa19ac3e3dbc7f71601f0de7e40c524499aaf1748707ca3d6299083b3cfaa7 SHA512 0d3ead5dc58485ae41d7300e19bb25bc7cf04a1d7a0c15acdfc97aca4db326b513dea8583397f999392a24aa6a48f696c396340df0f80232f7f53703e0c2b43d
-DIST firefox-100.0-et.xpi 532701 BLAKE2B 4db053beb173633dec2ab293a91f0501a8b10dad1d4c785d8b476ef021038870b5389a1069fbbd50f457c8f4279a3c45ae33f11536044a74cc4ccb2888e37985 SHA512 b4195ce5e0aea78e03bb9f56a84fe0427ca0b04d651e486bedd869a83f58a69eecc555e947bbaa91ec4496b3d57773c526b388b394f303499915cc07f8bcdccf
-DIST firefox-100.0-eu.xpi 541413 BLAKE2B c48c3ba9107fdf626c4e8efb6609aaecd6e6d497577e8e459f136bfca50ae9b986a385bb435a7bb0273752a0a2a6805ecbe1faa45915a467a77de89b5b314d3a SHA512 cf587cf27280ec80ed4bea965451a3b4f67c2509fca8bdf1985787ccd870944d72d52059b7777e52fc7e8a7ae07f1a0759c8bf73ed778e42e9db5b62c2362ce0
-DIST firefox-100.0-fa.xpi 561338 BLAKE2B 91037614671d8dd6a0d6a23fd57a87a51e23a16d641a48454e015eeea6059bc9af6b7b146152207ad34effd4dad9978eb841ea62351d3690127a3909716bcce9 SHA512 b4909bad5a4c4dd692ca6ab2e106152dbfd5b059deb3119c328ebf8232705e4a577ff8a7865189ff54763605feab2adde2232ba2d5a41ea87920fd057a149d67
-DIST firefox-100.0-ff.xpi 468200 BLAKE2B a49e6011dee9e2131f6225d02e54fd2b397913880382c738c1b1483ca6c2407b7fe80bbf6394b6300e29b1f81f9fcd9c3839ceba95308614f52a4f656b20a003 SHA512 a39efa94171d7dbb7938cf10c791a3dd039a6cc06753a3ab55fb31c0c6dbc27b33905f31116f0601c2609741e19660afe703382e0d77d0031d1c7887127c63bb
-DIST firefox-100.0-fi.xpi 535250 BLAKE2B b72c99ef47d263ca7ac3a64d5c547f3fe9fb877ea1696b6850692b557644c58f7f8349eeeb9da880ffce7c9bdc6f0090990163ab0f79ac14f5efec815d430738 SHA512 5410b5d02ebe44f2edd58fc66d067996dd2df5b56284ebe9ab8464672fcf651643c76f8e8952047d8217205103590151af4f978987fa9926a01c5091788c68fb
-DIST firefox-100.0-fr.xpi 562950 BLAKE2B 5f8d105f8294c23ac98737dbfbd505e866385f4855e9ab960f2cb9bdc9ca19c9a8dc11b3a06ca79829bdd8ccf3a127fbd1803c05e8045079e8690a6cb5f77b4c SHA512 9dd9658d6fb25835e4a36b0bd2100f3a5acd2ebcc2305c2477e1736a3d960acec5f60bcd14d389071d6c9adb3ea2fc2f5f93753c420350eedbfcd95e3efc4961
-DIST firefox-100.0-fy-NL.xpi 548097 BLAKE2B 810393c73168e6ef13f15171da0f1d8f2049985c3572cf772851d598f75b0826379a87e57bfb8c25240239353dce308d4abb752a331e549c5e4a2e97b0977482 SHA512 9d646abaa1e0fe5db8b3ff6870c403fcf7e00cf8c67ec9a79da4e81deb4bf2e6171fdb831c3ff18e0b93646e2a880e671f104d0146040aa24a07fbad830ae163
-DIST firefox-100.0-ga-IE.xpi 465449 BLAKE2B 2d42b84c70ddbad25ed4bb1bf438dfe41a1e4a19b9122769e8eb103a037ec010e647a4376cc35878a460cff4dd6feb92b42d73069db417f854f0740b0a05b5b9 SHA512 f8c7eb7221bcd35b40d558e8707a62e6badb6090c99c4f1733ddb97699063ce41dcbaae5dd4c0bb41ecb25dd9fdc6590c70a2917bcbc5b1c4fbbc90f93ad4615
-DIST firefox-100.0-gd.xpi 528984 BLAKE2B 0b579a8147de2753aaef7a6cc741ed8f3f7b55c4d7426e4077d1018414b5b83fcf8de94606117e2356e01b4ab6a76b606db83d74840964f048e400868dfce643 SHA512 4fb28a6d64a3d72d2c2347900696663b311e31fc05072ddd9ff135becb9ffcb1ac94caeb63696a251028c675695dd1fe17ae2511b1f78ae4a9fd3300f14d8d05
-DIST firefox-100.0-gl.xpi 542249 BLAKE2B 8f4d96068a2153182cbd3db33452af93b0563fe73a23dfe7c6dd6f8be21e70e2565c31288e114eb760418df7353c5460645c344d7405ed70c34779d5bed75927 SHA512 df29d8e60e4fa0a9ba2f8fd98ae4970c070c45818cf77e961b4490e6e86349efae02f62a21a5460086b6a765b7081110726283f1c0dfad259da27fa469d2e534
-DIST firefox-100.0-gn.xpi 563265 BLAKE2B dc8b25cd8500c3ee9e90a2cba89641bf20f19c19a062368468116d3bb9cffb5f28e927fa105bedb1ae62d9246678b6ea765e37ec66551dd6f22b4eed89daf74c SHA512 7c14a4fdbcfd721901036bdc3fa226c48d4305c8f7c851932591abf0a39af1290c6e78202964fe736e2a23fe79d05d6ccb1f29ad7b4d051a8594c841b643fbde
-DIST firefox-100.0-gu-IN.xpi 525537 BLAKE2B 460dd621f0e2f28dcb16b1e2c355fc4d75e4c2775bed6474c3befefdbfcf06d0fc902509a01c94738f33b0c243477ea55d97c996d79b733f9f5b632ec4e012c1 SHA512 7fb5dc80b162bbec6f90c39da0e464ae28f29fb94c084a09683d481e161225febbaa5c67c5084d80df90f0d03738d76009438e83ad4a17dd51e59b6e958e6582
-DIST firefox-100.0-he.xpi 561896 BLAKE2B af7c2fa448e29f7fa7f16f6047a0f65bdcc306b9d54fa31d7438d7265b0aaf40ddf25447d0f480419e4c051ebc63c8fa0e9f42479494fa40bf9604d6b9af9e6a SHA512 2f79b605243a7d9a988891e8fdb24b4e8d9f5bf0e355b35d2ccd7037756ebc6cf9f7736c77022719008a535bdbe7d1f6150e738c1f0c8a2e119a6b96d47d8b2d
-DIST firefox-100.0-hi-IN.xpi 556335 BLAKE2B 05c937e34da03d00d92e9dc013b75e437df633a417389c6741c811aa1432c4d012829cdf8c28ebc30edd02228045ebcca5b7ddeb99317f5408d4900317255c1c SHA512 d633285dd480d8913d365c875e16b98b417bdd827e97edba176d86f35676f5821093a6b6a7a67096d4cb29e1930fa188f7bb7df8b11ebf5fa111db89e9d1d2c0
-DIST firefox-100.0-hr.xpi 530205 BLAKE2B 601f514da2e27d503a88d179b45d682278cb3a075dd5d16b5b085efde983128c1eb87b27e8dda590ea24709390c6e77d8e8a1e613dd15d61b6e84e0e4ea085ac SHA512 7a2290d9e7509684f2c5ba3f08a6e7e49301de3721d3e29899c1d7c29dd49a822556c686506bd90009555832823a097a4ee527121210e97b7691d79af863d25a
-DIST firefox-100.0-hsb.xpi 567858 BLAKE2B 69e19bf61918492aaf6f091dac2de419722adb40517066309e07e7e78ddf858ea8e59bdf190ad30d877972fe4b5ad7535a891a63a49df2987bbfddb008f44dbf SHA512 8859d3aa9235e9f51e8b6e07b11166150ac9a31f36f127ada992766f8f730d1761bb516762506d7bffced68584e1e043eb6a6b6dd408e4ff406069152a028425
-DIST firefox-100.0-hu.xpi 571161 BLAKE2B 1a872e852584be7d55cebd19f12b17ffbcd72d8740a15b4a8af30fc16fb172936d73e5a3fca1fa21f92675402752f26d349df2fc29fb56a8d6b3e52746354b14 SHA512 a3c61eac82b44ea7a261a30e82c46559a15baff5aab5d02cb63a335238c5c0880ec22dd9e952335cc8081d528d3dc5c6c86d7c4337ac62cde81fe21f10ff3aba
-DIST firefox-100.0-hy-AM.xpi 580138 BLAKE2B 1577ed5bd4434c674c602ed2458d944f89dfbc40a2eb5ac79cb10bcf587849031258fd063005ea90b8700edea3091dff2b1519a553acdc38182008819c7733ee SHA512 c5a805fe798939397c5727dca69b4112ecc21218307f5333275b3e144ff784bd85264a779d73e7bca46b1b8100ac2eb5dd71f5007525ebc61f68e6774862099f
-DIST firefox-100.0-ia.xpi 537112 BLAKE2B c4f942bb79dfda4f2ebd2faba480ea5f9f4dfcb23bc7fc2c9219f51f0f2f49d9f200893f9785795aa3d7a2e002be740c681f95c596b5391ee8607cb6d9f47217 SHA512 46d8427096bc8e002e42977d5f00fd90a6b56dbe1059c0704744abcd3a0dddb571f8d2bd7c5af331fb8c42c3ac6fd33ead4bbef46150704e4eb677e4e8d924e7
-DIST firefox-100.0-id.xpi 533688 BLAKE2B 9846c9f64342c6cd9b7fd91646859d02387ca00d2dbb2308c167600652a0f18e4b80f7c9fc70295e5371faf3f54112c63f19e87c492463b3926a79f8caed57c6 SHA512 3b5f350f833d73010ae1dd7decc73b1c4262aac28c90a82478b7a93a368aa4149ed25d78f02fe2c1f25bda3de7a06468f87c6a50dd15ba1171930cf32599be70
-DIST firefox-100.0-is.xpi 540509 BLAKE2B 4739fd1d00e4fc479c757c9d20aa89d35f98f892591cd4504211169bb98cca38b463d3cb587d7e8090b1a035bb460ed28901a09b9e875e6417b579cee256d0e4 SHA512 06a5fc83219ba165bb39e15bb1abf0eca61cc374570bae32db141d2b63e49a1f816c3fdc5a472b26731bcd91fdabbf65a53b266d3d93ddeaa7bcbd65cb5abd27
-DIST firefox-100.0-it.xpi 464283 BLAKE2B 8b74c18bbd969556f907446c008d4dc04a65577d9f280a8a85614bd0d8033761c0aee284bb7ed1a7f1e054d343e35cc746cbe1a08216a92b949f43818540783c SHA512 2a61e5cec4f5abe10857f1634373aa85e12208e37b5581e9b71d61f8f53ee936b0bb5e538611046995348ddcc41f689f3fab9fccfaf8726a9f7d05ddeebc952a
-DIST firefox-100.0-ja.xpi 593327 BLAKE2B 00a4a647bb84cbad92fef60f0cecab050b201f8ea0e383ca1e1d2ba370b74039817f95aa777fd8804326cdaf8f7900b2cb515401b202881e71fb8bd5d9f21954 SHA512 ec31ec41e8e84edbaf8d4aed3ec283252b9ed781a6e91937e5a4fee92bd03488b2a1982f459abe16d95d2742c684e663fc82ff8e54ee01844db85c7d5578a15a
-DIST firefox-100.0-ka.xpi 596389 BLAKE2B f141998cc0babd4e2c1ed3c5be525c35e992d08e71af7051a51455d63c09c4acc593afcc2af0c6e1a6fd9cc2545914573ae7c79e2afcd0f51d904483e175070b SHA512 7d167bcbeff718c948b565de814890de76d0b39d302319a9f4f6c75955a216ac98e4ce9d1834cc99b30916c1e4be2f9af55e98def1a2857c2464f6ad006ee4df
-DIST firefox-100.0-kab.xpi 556388 BLAKE2B 05c2483131fc9ebda5672ae07619c0a696fa79ed3b986712284ffc720e1f0004a588e09c90c93f09220be55cb84d82fcf3f609c7ec9e0f20546af8d0010539f5 SHA512 a27f73bedec56fa021b36ce02e312a8b376900d2c6ad83a2bafef9e6d0f2a98eeb459b8b1844b5b666ea52e5a2f943a28acf3d40592e95943929cdb7a71df59b
-DIST firefox-100.0-kk.xpi 619239 BLAKE2B 33e1a4fa15560079cbd88f5c1c013d0f7cd4819f25ed8191ffdac0b8a3d3050d65ac85cb294e5969a330f0deb863670ba44ac658464fbbfba68fd98993dec746 SHA512 0e2d3f417038dfec89b74a868352fc460150bac1cb42ecfdf140eec09dc7760d43cd9fe637e6c224318addaf805baf902e8fcecfeff1a8562fa03ed22c5d3b0b
-DIST firefox-100.0-km.xpi 525496 BLAKE2B 743298451ce750ab4f4c40a840849e284618367d5a6807179ff5eb487790784462ae039252efd9025eb8e4a7bd9a264399bb45aa17d0b705ffec1c7fd700314e SHA512 978a0eaae3fb66a34e63088e897977536143549a5af4b3519bd5ae71bc6848f279b4091fb6dfca9ce566ce93dd724f1566f75b7a45a241535e1b2f600eb55388
-DIST firefox-100.0-kn.xpi 491374 BLAKE2B 813f9228430c903c6cf2bad09f20e5e627dff063ab5f056378bb555b0dc292ef871debfa6bd319e650cb3667ce392b94ac56afb5f6c2d72aab0131e65245a12d SHA512 737fcdb7db76901bc7d82785e4895b0de0e010751c624cf366487aa1479ef679c741eec6757a9c9c2a5ef57ef710cdfa7b7d076f419958a2efc707e8998f7b8f
-DIST firefox-100.0-ko.xpi 584519 BLAKE2B dba5a25440f936b5b9d829f1ac4840bc4b8e004cd6955a801bfc0196c1334a7c3d7450767614ac735061340b65ca12f332f1c26c39f74acd0d58af2c18907cb4 SHA512 1a193190a9832f083f1cd99a39376cbff70a891a85bceddd8ea8b6fc46a263c1125731934ff5055db042a2bf716a1003fe631ec75b3b3bc576a6b0d0228901f2
-DIST firefox-100.0-lij.xpi 466987 BLAKE2B 2d200187691b39c2b30d8959fcbe1d1f0a4a397a1602bf083fb0917c99da0dec8c551f86b98f2793a6ff8098f3e88a045ce919dd013594c2ab1d13b763cb2270 SHA512 cdb6e50f3e79179e05649072b3883f003f8bc47cdbbd89ece73d2aa5bb0d7ae64e0a80d396ebe0fe2af66e305685e7e8496d3701f80c0ad75a799c018e205918
-DIST firefox-100.0-lt.xpi 560142 BLAKE2B 0edbc1d0de5820351aab2e301bbe63806da9fbc7dadc5a805d533b1557befa200c7b065ef821b0bf9c296aec5bc6a581792313394fc5286d5e43bb5f33ed29fc SHA512 be40fecd9f6f69653e3ae2d72f949be6bfd0bcac87c2ffe4924715273d59ba419364111e8f7b18c6567178b2d2190cdcc928028c816307c31837f7c60b205927
-DIST firefox-100.0-lv.xpi 459192 BLAKE2B 85cc891cf90b21a109e1e00d453b3f03d770f3bef9176e7ca7b5345616bef6808d1eefaccbd20122c6869da988e76699db868ab44566c48fb574fd52ea1a1cc2 SHA512 ac93ca577072dacf28ae7d24284a0048201daf9637e3afaa4804e89c5fbec05c7503aa3376fb1a18285b176cb8830bcc57e0b863bde79e06250c2f821b00938b
-DIST firefox-100.0-mk.xpi 468292 BLAKE2B 76ea89fffd80b24b3ccdc24dde4f5f89ba78ffa3a00d210e270ce32f707c7871fd186e3a992b786450ea503849454b3d2b0898819f6a7252ebd6db250097f888 SHA512 7da54a68bbea90114008b74ff4fb251ca5ba495568574cd8e63402258a687310ad46561715a09e1a8b55481bb3648e2f8956fd82cedf0aaf54639bc0dbdbf48c
-DIST firefox-100.0-mr.xpi 528155 BLAKE2B eec04374cc9179eaaab52250f0594aec41354c9a0a072b5b13212003b4604e45f81b3d0d91c761b97e0a8f84b6a78c84ef0c4785c3c3e378678bedfaece6d30b SHA512 699748ec01d494e63566caf55b481387b6e1ec3662db5c7e8c804bcac5f21fdbb4b4962ba4bd200f83e04854cd13d1a57029c18e89c34562096c2514b10c09ff
-DIST firefox-100.0-ms.xpi 444154 BLAKE2B de3e2b1cc9d0089cf92bb66120231786858898e0bddcffca930d2acae1b9fd7e2a010a7cfa931b386a678f4ad50a7730ea9bd2151d9202bcc85a2d89c621fe7c SHA512 03e91cd8b4d89d8b79f938be0ed3fca3ee656ea8b0f723028a737c1ee5e8db507b526bbfa1cbb9dbac9c8c130831e6fe72bc4f09e656037cec95f2b358844b29
-DIST firefox-100.0-my.xpi 507353 BLAKE2B 12207baf0ac2241591c5ba843a1d35b7edeb80cc035238d52cf90dddffc856c0396424b0671915dd08f9fd6be322550e027520da5c1bcad61122ef01df74ecbf SHA512 c45402e3486a438cdea1f48b79d1f569edcf10554da0fff12f49a9ec8220767ccbb28444eeba237899ae5a6cf3ee29257c00093fcf6b44d3f88f6f7a22fe0daa
-DIST firefox-100.0-nb-NO.xpi 533774 BLAKE2B a34a394e75c7afa85ace6d73ac0531a88d1ff150052fb6198de4295b68a5e5c82498e8c3692afbc558d180b0d47901241e630c8b8d70e8ec86c4a1cfbe76450c SHA512 0c9c87cb189b5f24c4ebf60543df0fbc57f25293ec20de114306946cb4fd55268c334929a3713a26765d502ee5c4dcea5d45f88d4ae2c0ac92963022a8bde7b8
-DIST firefox-100.0-ne-NP.xpi 482563 BLAKE2B 320ac0d6c4853cf8f2167fb49d8fbe877e16f938caef116b3c1d60860b54820ee822e6249c4785b9740000455850949f54efdf9afcfcca8d57d3d656d2eea7d7 SHA512 be6f9da98f5760562ec301571843ec8e45ed4f1eb9ef5c4c56e7e2c0a9ae3dbb1964fc1927bc38bbb408b0f1e1830ec764fec9f13941b79cd940cfaf66f10a02
-DIST firefox-100.0-nl.xpi 542303 BLAKE2B 1d291d93790e41b8c477fd4dcbff7d20ca62c100e4d6e2ecc4e9797788d5e409903ed79d54c05654e96b1698a13359fb959759dea90c2df5be3e2b2e48169d40 SHA512 fa6eaec795c58df8b2953bcc1a1c4fd6729871ccbe9d0350dc4c2502cb50d705d8082a900fbb710be70144d6458006fb99edfe055ce7912df3366cfe87b60662
-DIST firefox-100.0-nn-NO.xpi 536149 BLAKE2B a97a81cbd5c59d91b58860e2a0c3d505628e65be21629a346b41ce83652c7ead65b124c31fa7862a4567bbad74f8eaca6ba0519d10452a2ffca4f3dc6dff5dc5 SHA512 4c85500ca8151f05f6042d173f4c85545d93992f36e888c4620da82302f6903c39b15d64aef34e939d83ff26aac25e734da558875b9e7050592a4b26e02af277
-DIST firefox-100.0-oc.xpi 556893 BLAKE2B 81939644afefe4c2900b06565ff0eff8ae8eb179da7508c2edb608ea11ae4b8c540f94f13012ec4a3cfbf3e5128a544c16c7ea02b1516414d388882d2b146cc9 SHA512 29990f7e2faae9759eb230bc805d1084f5107813ac71d93aac7186fd5cda29095b2761a0319792b6c3fdb6714c44a53e80fb73918d830c771ec8dd14c8197b8e
-DIST firefox-100.0-pa-IN.xpi 600276 BLAKE2B 683051787ddf3b54d9f8e23903c2154096c1b1ca2161f392352086817225db5acb87a2d1ebf2efcfedbfb3c73fb71c77430a1ec2147a0b93f5fa290a482016a9 SHA512 88e16d3402961bd4673a16e66702e6a6a09c5fdbcec6e915020c575c9b717a3de333cab8eb03878a824befd6cf70aef10c773dfc361a06dc6a919c15ce56268c
-DIST firefox-100.0-pl.xpi 562524 BLAKE2B b2da4fe2137175c0b18437256e1be9e5e45365b50d03f33f0e725a12dc4412c3268cef3927b9ec96326d970951cd82e418199aaf2067db9c489ef40eeeb49c9d SHA512 7d927beb70872050f905c09ed2b9ec70147b38248404d3101121bc5340b40a2cb49f7a0d4b3470a812a062628f92b0b6bfabe35cec8182a8fcbc500779a8c8f5
-DIST firefox-100.0-pt-BR.xpi 547573 BLAKE2B 9325ce7901214bfe872e92917346495282a4d80b837025dc50f32fcf3c7d2c8c9130bc222f60b01c2e25580efb1b1a68db2473a2448d62cc8e49b86711f29c46 SHA512 117e58296cc1294e25c1f1a414fb277f5f3a1ce688de7079a4bf7d30b4be026f1243a17085ee653c4d2dea689b32c5dfbce47b4eafe7e5b63e462a86a0c90289
-DIST firefox-100.0-pt-PT.xpi 551062 BLAKE2B cac57eba1fc66f8530dc922850c6dab6c0204f107c00da23ae867d9a26042dd0f9f51947aaaf1aa5e5a3747b2db3af0d8b2efa59716da63c5825f5eb532179dd SHA512 c72548abd4dde8c9dfd4df77d135c037d85a146b5dbd33b7bd4ca9e42cfb2cded5e428c3d466ed59c0309b59be333e0307abbb361f5f4876e8c0305a5a07648d
-DIST firefox-100.0-rm.xpi 541902 BLAKE2B ec70fee31e1d553eb5719a56a7b1a0714454fa2868187225c4a4be5394edc3dc960ae960484913fd2eb2c244d0d92b4feddea0e6a99bcdd0828a09d692f53c3b SHA512 8955138c2de27f20936f6a6e868b442702792eb5d0fefda1964826734b3b7727cdf8504d74252445179e9e06d4af1e2b8425c01b2dadc5f9d88a449ec109c1e3
-DIST firefox-100.0-ro.xpi 528000 BLAKE2B 63207ed81a28332c8f3144c142e61ae968b20f696bae7f43d05c62ff64f723b7282c0ee66e1e849fdfbf7e091f6dcd7e1bab0edeec12e997d756a68b95c08197 SHA512 f972ac411443c2b7b5f51a3965cc3172adddf6fc4c251ae933c4354d6320aa1d2b43c30d5e0935a5b8d520794fb989e39b681e0fd2c13b11b664f16b069af187
-DIST firefox-100.0-ru.xpi 633342 BLAKE2B 72a7043f83bfbc0485340c7ee50d79c4bf3f91be94018ef4b9d61ff9847dd4deaa045394d979b8264d25096aaaeb00aa293c91650ac1c1db38346b50783317eb SHA512 afd9d8ec466e29f8a5e440fbb011393424319585719434535013d90322816f441bdaa8ca9706b85c8757bd16461ad1055ae555b7209f0c92aa7ca685b768ac9e
-DIST firefox-100.0-sco.xpi 500184 BLAKE2B 634c95a01a766bc786f25cdf5957ffab8b09279dbc523f450afc712083e9468ba08b66bc0b4e8a3e3184a3bb0cad3ab9f8903b49914df7081f1cdd337274b439 SHA512 cb04dea130946a9b072813714f9aab0bd542ec52296a129f497c9b1778bb5781da53fb4f6cc228dac4205d4f9b3da4953c7db0f898b013183d2d59a36824daa0
-DIST firefox-100.0-si.xpi 480906 BLAKE2B b7d8fc68cdc9a106dc9e1c217af3e1997a7d67f60880ebd92bdcccfb41f3a95b2426ec549a83c913dd87ea10134bacb7309bd17350ea425326e96f0668402a00 SHA512 c53548edca6b46707e3653863125731a616d3bbedbc02915c4f49306d737c9dae5f008a40e1759c383e664ea991c5da8a719201545d4ff362d4dea731fa45f09
-DIST firefox-100.0-sk.xpi 571980 BLAKE2B 33e03eca7f545148967671eea16ec863b46f430755a258f98b3fd25124e43e212da379b1ec52f8ae2daa7c1d25b852bfd9e818076d346df2c4cebc113fcb0e4f SHA512 177b02195968228bd3567de47bba145d5206a158dadcf4c151c1438b4cadedd2e9b6b569ac724ea4b98b2f54a642629588df0ae8e737831050e2a98fd0c7484d
-DIST firefox-100.0-sl.xpi 543730 BLAKE2B 7bb736bd256018cc4a88d681984f762e3600946be5cf939d1f47752c46435566150e61d0d8199a2fd995b42348c089c676928ab348e11d0168419586a7836dee SHA512 f2011198bde31bc644d5c780cd402164a3c6cb897e8c897adb4328a25c5c84078204c4794fbdd40fd9f28c016fc5fdda33586582ad063eef90ae8b86ee5b535d
-DIST firefox-100.0-son.xpi 417301 BLAKE2B 64fc6f27cc774582ee4b219cef53cf7d7311ebcc7358c446d3006a36d2e091e63b218e44af18eca425f31e367618056181c79bcd4ef9e7501d21dac1c848a5aa SHA512 361549aaee1d50650ba451336f15ad74ad83dc2f2dbe9bfe6d4ff2dcbc9e1b4ee926b1607a7f0f36a424956940039e441b5c0ff6a96ea01e8a8415cf1c978567
-DIST firefox-100.0-sq.xpi 560514 BLAKE2B 646e3fd5b69cd35732c2c1bd9193d7a69a7cef30e6d235f88e928d0d5203cafcbc2ecdf65f6a9b92b86781ae20a66d09b9c0a7c292141e67d3dc92e4cc136bd1 SHA512 493509ed1811ddc0026ea9950bdb49bc95dd749761c5c63c1b996694af31ede095686868340efd6fcd3ef2fbfe4fc3ce68bac386e8558133b3fc94fbb66e52bd
-DIST firefox-100.0-sr.xpi 585620 BLAKE2B b69959dd87eaad8720ec6cdabd544974e1567e6a845403700df9c983592902b84107202f0a143cdc51144088332716d9e0de58c5302352b6c569ff1ea31fb520 SHA512 e2695dc5705b0c4f3d7897870fbe6cd3ac43108450be2ef0b4cf03707ad88af539b103dcda05cbc6217e3f39a12350d24c5d32845cbd94b047269dab24a80ab0
-DIST firefox-100.0-sv-SE.xpi 544804 BLAKE2B d84dbe16ce2dd215dc58b40a387def80789135907fd027f6126e61253468ee1db2c1bd6a6fad093925122f0e6cbbae7165de8ba85ac8b2eeaccb995c16e3861e SHA512 53e5c085bd60b1184665fa8bf75144fc2bdd892f4e3acec699dd5266d53a2a94ab53606c3083e1306429e6d9a883dfb953ee82a92f36ac3606b048e84438c8a5
-DIST firefox-100.0-szl.xpi 503463 BLAKE2B da737c7bb20459857281033fdb1688d369666b5831d4da038a964b676047fa56a22e8ebe605f9f2f83a6ffbf3436e676c67479741e2dc51e8071a7c8ed0f7f91 SHA512 3c4c26ff1651ee98f1714966349a8b2a0dcccf0ea89b8a3b81763e1e84d60f0ba37855f26619324637acfeca0f7c866e2584ba93acf9a21602fb825061278060
-DIST firefox-100.0-ta.xpi 508207 BLAKE2B 230c7c70ce2df9fe11e4f3128d822b8e36f3155b247ec820bb7eb3f56b70ecc4a85c16cfdaf21785ef27ff48e4d6d0c880ebbda727e207d48a68743e0706877e SHA512 1098241ade5b7555cafc8dd5e8fd46e0fbab1e63baeed7033449fbcb88c428d3f6a0d4e336c60ac2c6620e8ed21a63c69269c0cb7942a6b57478a99eab593448
-DIST firefox-100.0-te.xpi 546711 BLAKE2B fde724a074af4a5945ab46cab2ea584c55ff323a9fc631847e163c4b45d9a209e1a8605bbd32a920319d4653bad35d350e98876ff80d59cd97b1c188cf10da6f SHA512 0ff5d8e1ba1b661b03d5028550c25c60458ff2d0d0e1e2c97a9eb55ca9152aee2705f9fa48081bdc507e6b3d9caddff7cf7a1700925761a13c01f5068fda1ca8
-DIST firefox-100.0-th.xpi 610742 BLAKE2B b2e4efad8af458302fd229469d9abceedfadd3c1a3357124c59901b685ab89027569e9271203dc8b0ebbf5721022f647c02649a88a3bf5220b765fc567e5a9ee SHA512 cbd162e297989abe2d6da802cb1e60d67704949bebfe16785dda5e567952579f7ed833bb30dfe2081842beecac00d921972481dd893960e352affc489e45ecc4
-DIST firefox-100.0-tl.xpi 518035 BLAKE2B f08e079756835f918dbdfe758589b7b187ab92ce17bd9ddbfdde976bf7d323ad1f97dd795a50f9b4cf8abdf73aa3e88f186dedd29d3ae4a3e01e9fee01861c20 SHA512 ebc0d2ef6aabb423a348692b019dab446e4b302bd511520343831d80c6a76031a0cd866ad65c9254d1ebda7ba1262f842ad2e3380670aee2f9c84ba8b6a85c36
-DIST firefox-100.0-tr.xpi 558389 BLAKE2B f642500b2e5730762eaf50d350a93fb44463e9f2ab79858e1b1bcae9e646194ba1856496d7de077036dc15919de96fe2779188d93a5a910b0fcd0cfb26f578b5 SHA512 98370ebfc6e893a2a392b24bd63951b2f528d224bb93829a5536d6113200a147d0a2bddd5e45ae8b4ef0e596db6b6521c5ddeb34eb4e43ee4ab3c8c17b0d654b
-DIST firefox-100.0-trs.xpi 486846 BLAKE2B 31418b590c60f83a676f8a4e22c54cf6c13664b6a3b009fcc08844345f73ad92f117b8ef63fe4e29a1b5c6e23cd46a96fe9155e41e7d9dcfc105a443203d3db9 SHA512 10d5ca6203f16569785ab57ac174caeb6af3502460faf709e5a570f60ffdebfc004d0999bfe256302abfc5601057cc43dcdffc4c08eec151d56d9c1e0643ed4d
-DIST firefox-100.0-uk.xpi 627006 BLAKE2B ee7d840b610a54b7b1396299ef29361f34dfb705d1398ca014de88b1eee6b7dcb98befeea3de26c3157e326d47cb18eef5104ebf59455ce40ae197de3fbb8500 SHA512 f994269dbd221c20ba1f8c35f3befcac40549c00fdcf689c2f51899db39ce98565b06b7c7e182f699053c459b05c8f4d7e2557abffd9912e4a4a78f03a16692a
-DIST firefox-100.0-ur.xpi 556888 BLAKE2B 10b254e7602dc97f50c5f684beda9aff07fa37ec68fccb20edb9ff81749e4d9ddaec48de54749aa0789e1a419b88a8e6d0aee89c24ec0ef4d5dd01e175d54b5c SHA512 8f82357d4ec869aca4e830850b0f6341365941a75f822f75aa0cf908837bec23dfc8560774d3d77d2a1a16a336f6a55f66c13d70ccdfac8826976d116802607b
-DIST firefox-100.0-uz.xpi 473713 BLAKE2B 0ef11ededef92bf4318056b5a5810ae1b879d4b0d351e1d5511c78f44b6f21d1666a91bcd43a8ff425694c3e14f1dd117f1ac3137bfebeb942403f12856f3df2 SHA512 73c845d8d1f786735842b8461645b323ebcce7a93e66b69a26dd9b092c6b734f9d1277a2701c45a10e3faed31f77ca68805c25de7052d82253ec2a2711ddfcb7
-DIST firefox-100.0-vi.xpi 578677 BLAKE2B 664bdc925b884ba6b15fc8c0f1f3eb8d94ef8b0424d40a8d4d172fa574e8a318634fa62b114c0c696ff9146e0f41f843d20fdd30ec25df8fd16bb68c4f884222 SHA512 760cfc847137ca7d93e2fcac72bea0d7eb4dbfb99ed8a36fef00ea5452d8d7f6e28885e980151defec06f8a8beccb49ba86de7283b6f3d4791043ed1a21da4a1
-DIST firefox-100.0-xh.xpi 419487 BLAKE2B 275284e39d91b8b636f37d22fcafa49d3038e3d7455c420660267b3feaf52f0c0fce335ec127a479a78e2fe6215cb59f682f1cf2d50b10dd9059f64c86f1a8c2 SHA512 df1b85b4b938670cdf6c6fc9e10df2315618ab4de95a0e4362ee0ee060b52ea8e24bfae7f2cff56787e0b206a966c8c8eb02637f6205a11de3a42184eea8e4e0
-DIST firefox-100.0-zh-CN.xpi 580538 BLAKE2B 734b191a32cea0e7e70c52c5dcbc6be38535321698dc4be6c2c7e5fe31aaa3e1e0abec07636f3033b3710e4064570a41689413460831bcf88dfc5a309bdfaf2e SHA512 f94787e44614dea3cef9230f7811aadee01b5312cc4a24cbeffc1b20c61dbf914b0b3ad33f3dc5f245ec891bf2c134ca22c9a4d23ec5529e2a20a0c873aa5026
-DIST firefox-100.0-zh-TW.xpi 581629 BLAKE2B 4de41a914983af7ee59e7fd2d3ad53770d9ecea2c496785cdaa24f20b0bf1b786e725e3c4ef1fddc5bc2a2b07d85e2fb22771ef9608dbd64be98afe3ad7edab6 SHA512 b90f5fea05243612b327180a0ce13211464acd4dc02377a11386d0a1075aa9ec2265a511c0471193d9cf9dc8c3e1afb82d4908bddbb1d665511d84eae697b8a1
-DIST firefox-100.0.1-ach.xpi 448914 BLAKE2B 71179d20b6d15bbbb80cfa65d4f477a0a7f10ab16923a8c0d848e6cd1b24580876bdfbe8aaa372c980d9cf0c43c2d28a4ffcb9db0dd54e9be5dd612fa422683c SHA512 3ac2e2f4890184ce17aaf347d8eb1483393f580832f51bdc263698026ccf27c3d5b8ebc0a6ba9919328a2dde0a65a20f57f8d389566ca85f6898afde2d70f071
-DIST firefox-100.0.1-af.xpi 415232 BLAKE2B 01c2eeb8d091fef19be1a40efa5a079475e0a44911dfa0564b70533c6972aad29534dc508449394e7191affb8b21837392a7b8e0f776f72d5e7eca2fb25a4aa6 SHA512 cbd94aee597bd5f86953f0fb0cc98f87eb8d2fe037f40d4e12d39fb75dd641211609fd3454ebe51ee8536e0e21325b85cb877e2bef58a983791e4eff5a9e8897
-DIST firefox-100.0.1-an.xpi 495515 BLAKE2B 2677b7ba82bbe7b8213fb2912734d0dca22eb2964c85a14957c54f2715296f44b0b368302e26937dc8b158604451a9c551c245f925ef1bbca4d1441d74d3f683 SHA512 3c87d650a8196cfaf51fb4b1a52f086420e97e2c51e1c18ef845f4cbce5e8a5fd2cfd5a4be37706cd4e9960142330b6268d679a156e2ef1758f7358aa33dee7d
-DIST firefox-100.0.1-ar.xpi 564889 BLAKE2B 4e6d5d8b61a4b58fef20a91284a3a6e23cd8c952cc8d02e0e2e6a44bb8e9596c84c8e1e12bf885e060517f98a868719c9cee2dd03cd645cc4837566729f3701a SHA512 fd34038c7a312db4682a81ecb42217728e509712923a550f4845a54ca1910f40c98f30be4df3482f5d9f33cc7ada35839d603adbde577354460708393c32a153
-DIST firefox-100.0.1-ast.xpi 493296 BLAKE2B 1ee127d6816007fb34aec36d0fb77a510aa9b2464f86e0251a0c9206bd9de780d606f7003beb95dd1c8502f33825e108334b920358f033d40ae94cc84c74255c SHA512 99ab6208787fde0b3ae627c205268aa2e5cad8d677dcb4485a3f1bccb850a138c26719056eb2949644455ff93fdf884fd449fc0b1f408968f3028bc56bc29c21
-DIST firefox-100.0.1-az.xpi 484101 BLAKE2B ccb030dfff35771af76ce3913e9022d9a4f61d6253e883bea8c468e739558032324006c96005a5787e5a8938d16a330db70639c745333508c0800dc9139095d3 SHA512 c03da56f18275bb75e0cd058c7d156210c64629576150f2ac90956a3983c95e67b8d3c3dfa5baacb95516cf9f29103c77594f1950c55b34f4df0d99a84ca74da
-DIST firefox-100.0.1-be.xpi 628707 BLAKE2B f035ea3645aa3afa02a736f440c02a433e5eeff64bab5d8b48eb9c19028e4cfd784035d720cc121ec7085ec2f7a182ed28a72af5a14cc5ea6c92447bfd279b9c SHA512 9fae77717553f0a3dcf228c9868dcb3ca75073b4d77e2d7fbf276643e7e0af29cbd4a09be01c382f1aabf3f4fd828f6dd9d2e09f2a74869c8452ee79ceb5be82
-DIST firefox-100.0.1-bg.xpi 566784 BLAKE2B 74d710b1a65cbef87fcd14a01334fb3861768e9361a9100d16f0949554a88e31fabae40bce95c4b72ec5d2721acb7f321f91b237509087ed9a4a0e765578df28 SHA512 f2cbb02093ae1fd33c3caa87f9e45b2e8d2037a5e9658e3320b944aa398fbafbbe0e45bcdf51676d73da33a140fe237e3cd4e04a1c78698159f3993d427a1cec
-DIST firefox-100.0.1-bn.xpi 554553 BLAKE2B 70d35e49354e67a3e9a9a563c68feb648179ba3d33f62872cf0881c2c8cd1b5a1fd8020d1654bdc62f56f4aee296f073861ebbef4b48b2afead69291145d2ef5 SHA512 52f152581eb9915b49749e6a6cd962b4aa481cfe46a8ff188185d8e6954b54f614f08fee0ebd3ec20f0f19232452731c2e87bc4d7b4f13eb942a129337e1f7b8
-DIST firefox-100.0.1-br.xpi 530622 BLAKE2B 0a820982f2e51cdfa2adf82220b265c037286f76c368d021671a3088e97d72cde7fda9e00eff79d2dee18d026056045ef2f9b322667d60c26a8795d625d79592 SHA512 8e71181ac21a1b5c0bd4d180f10c1cdc538e4b6f1335b8651b6b3253dcebbb05c27a7e0fb32550bfd15e12fbd9ea409f6efbee0fd4f2ec0e196d7399fadb4e2c
-DIST firefox-100.0.1-bs.xpi 459039 BLAKE2B 2818a6329bbe84830ee38094ea04f6d49794e03c0dc45bf0c5439fe5e66c272b5ee872a0bfe710572b5edff0e5f18cf33a91ff8ab5cbf7d4aa48e57c0fe707ca SHA512 f20bdeeee7460df729a94501b8590b8bd7b66f55290a832a4799dc881cb2dead450298b0783158140e94a27d58585265032e6c9e47fd17a1c203c630ad23e204
-DIST firefox-100.0.1-ca-valencia.xpi 536447 BLAKE2B 9f2d65febdd13f1420a66ac711cd70ab1576603b4c0c4f00a525b9353bbdc7fa2179f748186090e977c6724e41cdacff3c7756e4e7c8ecc7871774a546304017 SHA512 78ef0c7354728a6c3e253d69d75a8cea292a41974ff2c3c9809c3fdaa9f3f4183750754a65067321a99fcdaacf885d40e0f63b8728b2939524473355171159e0
-DIST firefox-100.0.1-ca.xpi 530207 BLAKE2B f57a3a0a1fb1134aa344657fdc295de5e6a499536baa8481ec83ea9c3c23604012ccc27fa4d0c46b13d42c3cc19fb7149770834533383028f9b137a4630a4c64 SHA512 571b1c7a37e8eb82e5a6081643469817680c16b91940b453a6641f3b699a74cfac6898af8ffac157732e23c2ac52bd3f63b261eaefcbc2c74440fdb2ce560c9a
-DIST firefox-100.0.1-cak.xpi 553426 BLAKE2B 106fd30b0e7258870185e12fb754b715d14e322e801c878687a7dc11baffc7ed4b1e25c32c0beebad3b0462e23311a4a0e40854fd65804b27cc1d26021bc6b4d SHA512 0d1bcc8100ad925abe5812e1600f56cfadb889ef317dc1351e4319385e1dfe17f568e6a2106865873c02f969fa4f2fdbb82172a78ccb05e71e142757a6c275ce
-DIST firefox-100.0.1-cs.xpi 570159 BLAKE2B a8d0c979d4cbfdab443826afa3ebfe34c8eee481a77a75617a0961f5b44d9b66f8f5319b8b6299bb02225031fdafa16e83ae029643dbfa9df9add82e9f27c4e5 SHA512 5deca713b7d98938e1e9020d15018eca1d098f2dbed57a42b92b342e123c3a04df97ea76d84ef37cb765a329f18d57a2c1cda0d2fb81a4dd481f124e5c33b6c0
-DIST firefox-100.0.1-cy.xpi 547001 BLAKE2B 68c97305b02be53d916da094ee9982e12b1f64c2367d4403d740ac3bc8e3b91fd5d93147423df56df083109cebebb6835a4452ce2656e1195e693ed5e4a17f04 SHA512 715c43495119282faa589f9d0b414de386c7e49947a18c4f4395feecd80d95f11e9e8be3b7fc5ab92fa1904ed08b23653ae0cfbc63f760565508f2ef5b4778c7
-DIST firefox-100.0.1-da.xpi 538823 BLAKE2B 31a7bb7549460f7de6b4b488e7f529ba21ef79ce2b47ad947de96867238a7d442f5084a5c106176ce5babcf3a4d42351127c0bd780e6111c259c5f293e390f57 SHA512 dd061a3a9e0f76d84d376d7c700efe0da003504014c066aab484f955395de67042469e9c980dc53d577422fb0bf597bec091cf772fa10ad4aaafc8b38b7e0f4e
-DIST firefox-100.0.1-de.xpi 558685 BLAKE2B 5957818ea74069e2d46f93e9ebb969c53777518413611b052520a43204ea237a0744fac3118cb10ceba638a43a7bf9785e026a5638f1f91dee401e7a05d8367b SHA512 063a7c6b1af71e1e73b3261bb3c042bb3ca04f1e4f587fe77e32117ff93815afe96a3ce0fe911412d8157feadd61f999dcf042034a739d14cd2f7f41491b95dc
-DIST firefox-100.0.1-dsb.xpi 571805 BLAKE2B 574cfde6d41458cbb83eae2cebfb625dcae8e4ebf9cafd8c2f48c3d8b8c3d244dd314ad388e8ac329975daf299f178f3ab5c81de06d753e7a87c60b6344aa24a SHA512 9847e12779fb38250deb4e2d98bd743d3eba2012a6a4271647cfcc422bae326681e86969237fdd5b9067460158c9262cee60bb95581446920231727a0896bae9
-DIST firefox-100.0.1-el.xpi 645052 BLAKE2B cbfc0c883c56a6639f34c11d3ce3f76bd98ea188a9a2fd3f1657cc4ae79181ee6c1c98d79bbaa517f515b9f29fce19367486e236c3b00de52fbe0dacf857a728 SHA512 42e8c0b981ed40f9c96dacf292991646f5a4fbbfd8fdd42cebdf22863b998d4ddc23478f12270ad889940666d5dc46b7eeb1d01b483142fa1aee8813840734c1
-DIST firefox-100.0.1-en-CA.xpi 514203 BLAKE2B a89620c86fcb9b7c39c03110377e275ec0c0022b2a7d6927363905d96b5ea528be35e3093e1343b8da5cfdd22023a72b26f10366e546ac3a85480e08c0915a94 SHA512 a6ee8020cd88e0253fdc00d7deb9cf19901fc8692c883109b3bd276f1af2085a950d5e74e297d560683c3a86a5b287b9974283232f4a2b6f97508ebc6a01846a
-DIST firefox-100.0.1-en-GB.xpi 514709 BLAKE2B e6f0a437c193ec49ab673dfc0857d6cf3357a25ed8c7ae23e85a20504b017a5a1e12ffb02106f0a104a07475e56e0bb0f9c2f3721ba475257acac7525b6e13b9 SHA512 f8a69db62fc316ae7445b8c7597a576be5ae325ab784b10911d5b8cd3564d70d8bd8292f1db3a8bb250005b39dc1a9ef26eb155afc469f68fda5d643fbb68ff0
-DIST firefox-100.0.1-eo.xpi 540863 BLAKE2B b2586ba6111aba6db948be179de796f47e43e40acf40b60a00d42db69fe11654a11ec93ad475e1fef450ed3d06295958820f3777895f1c6d25f4ba5231eb8a69 SHA512 75716a7ad3d9f4264b875ec5e3764715b4bce4c10a239a6d52b0f86839da3c768ad04e2a023be204079e7acc574fb80e09ba0d84a25d5840df27fb584573c7bc
-DIST firefox-100.0.1-es-AR.xpi 551771 BLAKE2B 79a459f68c06b5d8cc465e13718b2b2e433bf9ad41523c429db691bd3930d81cb4570d4657cc9996b364b408e2804d4a7a02814d30cd513ad28e88fce0941d3a SHA512 89b52a5cde5f03bb78c8ad0e899e3ff934657317e6030b2f56563782c07a30f9bd764a8bfaf53c199cc3957fe5abed0eb691d56ba76853f23b58d3dd59790f01
-DIST firefox-100.0.1-es-CL.xpi 550968 BLAKE2B 678b896f459854fca8f079c584d853ae1b7e9af33cd8dbefbf355579d036f9fcda6143bd4560aa7cf2f9d6ac1cfefc1aa8bd5c4e5ad0aa856aa92d7e71ec900c SHA512 5bac26ed6cfa7b4ad5f92e52081040b5c4122973bfb5438f9eedf2db7bffe6086043ddf103acc9598203287649a6fcdbbf60c1d2a048f00e30c07e63c3c9f499
-DIST firefox-100.0.1-es-ES.xpi 542268 BLAKE2B 260d6debd8d6fdbce0fda12d6449e400303b100e937be3a41f8853925932ca49e8c6407044f2a7eaa39c1e653ddb02aa288144ecf6a64c46011ae3c354194fe8 SHA512 b6f568346778a3f99c0795d436e73f8011758d77035bbea34f5a92a00d8fb8ce14df6a117aa63e211ff3ee0d62951ddbd7433994cde0494f716ad4baeb54dc7b
-DIST firefox-100.0.1-es-MX.xpi 555143 BLAKE2B 94e944bc2a99a655e32eca8c03d75961a74eba284ee60f4bc47b31e3f409866cce350909839c3ea1dd4c32d545ecb9fdc8c08c9cf363182158735e25c5d2beb3 SHA512 7757fd268992d638f444bbe5d6896a59fda63c29e303f16db3ef2629079b8e0a0f730d58f0f1ee2dc3cc4fc5be9c6a900f8fde8d863cc3cb9f1acf261d84884e
-DIST firefox-100.0.1-et.xpi 532709 BLAKE2B 2cb8fc164ea435c7ce0dfcc080356840f6656ec8ef205e37a858acc8276e342c7f06b9bd939819af60e22ba56b24ce40e5e5e58269973b25ec36ab60cc0c6539 SHA512 92519438b158f6c8e897575c29502186b1c27091cc9bde0f216c21abf404b857faaac83ac69500e5293f79ad51020a87277b07a7349f21772de6895c0ab899c1
-DIST firefox-100.0.1-eu.xpi 541418 BLAKE2B bcf9b7754f454e185febe699109993cc7ec409a73d436dc1c69ebe4dce387f49a52f75bf10571b9ec8250b3655ffc66f3f35a0a55dbac52116e51e9037c0bc9c SHA512 4e986392103185a980e6b6189493e0c183f0baca57404e8d6b4fe9cf7ded5c6b5b5fd0ccdd352be89c85f07911491f3e83183edf6378b9d2735e90ebc832bd21
-DIST firefox-100.0.1-fa.xpi 561338 BLAKE2B 1d1182eeecdf1df9a70516d57837e18c110a975ffceccab879c5ca49db3d0aeec24808b42d5e34921cce6dc3764d9e3f6d4189d78a34aef81b36010cfed0b9d3 SHA512 9615342e7a805a80b884242a936dde545ef478594867ac47af9fba36bf1885a2ce499cfd3ea52bc358a09ece54fbfb59edded5dbba06c482e3b84ad903a1fc0d
-DIST firefox-100.0.1-ff.xpi 468204 BLAKE2B cb537e17f2a15e2326e51eda646c94c127b33c13dcced8e022aa49d1a84e3f1ec5acf3eee42f0f4257c796065993c55ecd4ab1bab0e7350194f9b423e7764fbd SHA512 547db832e3e1f906e674579e9a4d6b271b1f6e798808f4ea1324e9ffae5cdc99fe9d75e011af6b6c0c495f27452b09c0df4a2f16287f477192508e93ce13a886
-DIST firefox-100.0.1-fi.xpi 535251 BLAKE2B 0550fd61ad2262506cf78cd44fac81d28c2716f0025391ec1ec940dcebc60fb37562103c66c946ed0672d77e9bc74276a3e1faf6249840001fe918a8f3611c13 SHA512 c77eda0d27c45a8345150f39190ed7192a1d90d7857792e8caf3413ffb5afd9b69432a3ff1e28968df48fcd10e2b54e9f1cf5dff6d352e5726bd76883bf0a7d1
-DIST firefox-100.0.1-fr.xpi 562951 BLAKE2B ffa14896b72372e6c1c6deebacbe20410571a45929df939b0b6b7b6a57fcbcfb9ec307dd136682d9f53425dbdeeceb45e7426b24797ac0c05b39023faa576e82 SHA512 c8d56a83811f53c18ae68ddfb40ca0d20a6143503f160bcf8947d4c701c09bd3b0ca858f273aab3f92e3d74bfa14ef01d333e60c844d945ebe2cc6809bd302c5
-DIST firefox-100.0.1-fy-NL.xpi 548084 BLAKE2B 2d5a06d5213cd93c1d430594c110f966e33d9019aca64768eaaa61782f203d3e39b783bae0dfff33129a9e5c08f463d2f49b394a899f91aeb59e1b2c4edfaa77 SHA512 5591d0cfe9d6020ba6c922f94a8610b89f98886ec23367f47a6505c6ce159f4626f3a70e1b8f7f98f49de8bee824e9612bbbf70485b82b1b46fc6cbe79ebdd30
-DIST firefox-100.0.1-ga-IE.xpi 465458 BLAKE2B 1ea80ae6a0d7cf4191ef3d8855265f281796237d67b135ad910c2d2a0c71a81eb647feaead724ac42d980c4bb7aa5b552edea0535fa149486fb36ac8b175633c SHA512 dade4586e1ae4eb0e91b5c6496e9f49da3769d51a465dce84076b5c2144fd7b2c7ecd96c0983fd4976c0346133e82565457b5a1e0ee7debc45818f710dc6a90a
-DIST firefox-100.0.1-gd.xpi 528984 BLAKE2B 09e0efa84887baa00aead5161dc519513eba53a016ba6bfb04fa1855ff816f2d7fe992ff2567b6acf71e65f252379e7f837e8c0c08b4ea051971483f842c21bf SHA512 95cd8f6e5a10cf663179e1d80e4ccb2f954acf668556f807523bd7b8c655cf7e2508dc7bd657f7ac55b5d70b723e88c7a4aad9da5e81158d97ef147af25efcb8
-DIST firefox-100.0.1-gl.xpi 542254 BLAKE2B 002a4518e6f831be1b941da310de35740c1f5b80aa11788fae98109e726e28eae4cf7ee0a51c4bc1a1aa29bf9700b6ce6aae6661cce13d50fd22253baae85d7f SHA512 c603eb33652135816498fb4a411e07c69efaf054276252fec4880801ebad61040263203f8c0b7f11442cfff4dd9c747e6b69ed34ba38eb573c6635111b3aa906
-DIST firefox-100.0.1-gn.xpi 563271 BLAKE2B 80f0309803d98eedaca8f73b69b73bf867bec848763d20cade2fbcc8731dddeed7dc8f17a499c42384d4dcf1f253e8530e379b966d408c9bbe0924f1dfc97049 SHA512 01588e56827e9c915f4394887ad62904185484cbfd17ce5e9dfe445af7e18bb9989de5f557ffe465fd4ae1334f61bc4effbb02641a6a79b374b17ff17309cee7
-DIST firefox-100.0.1-gu-IN.xpi 525533 BLAKE2B f5b4b5cd91d6b61ba9ff937380baa976fc989e17e16493bfa99ec55e54b2ab1c87525a17b3aaf094208cf8dbc251d1b45476bf1ca2a9ba19ecb39c146062b6b0 SHA512 8cb2f39280b855064633ea03e32932edd12a4bdefaaa06c2725839d3f778e550cd04dc7b1e8f6a72fecf198c9052d14d8c618fa5561d5552adf903ebc5776a17
-DIST firefox-100.0.1-he.xpi 561897 BLAKE2B 016e50d08812a8e5a55ae75383b83164e9a4d7c27c15c103da18bd9eaf4c53acee68ed1ee8e5191280985be46449197505053557946da3f978a7c5ba6e09d1e3 SHA512 adf0c6732e49991e9945b09998351afb5e257a1acee727bb4686fe74bd1da99eecebf697b79dbca6df23dedbcfb31b8beabd0baffd7ea9b23131b19e517a4e59
-DIST firefox-100.0.1-hi-IN.xpi 556336 BLAKE2B 91f4719af1ac06deb961ed00e04425ad8bb892e8e0a648ed60582defdaf88305ef2f31909b771f0c6acd1f9d76a9591ea31e574c038e3bdf863ceb977c711387 SHA512 29fd3185c3760a6264904264e5a4cb9cf64aabae2f5d6d6acdde30943e49987282141928d00fdd856cae24fde6fad821478adcb6f629ebfe094a0daf39453007
-DIST firefox-100.0.1-hr.xpi 530210 BLAKE2B b2c520515f6aaa63c7c157aefff2b38a9c109d0ad9fd91018d9e27a0decf10586027deb956991b108f9eb02a81e360fec732c031323381e85ab4c90c12119d30 SHA512 f6759b5933f8af9c43c6b29c3e1896fc7cbebe4d45a53c21428d5db72c98c778a120c6a66a10c4ded172b3f3565f37fe0bcecbae23b4baef2ce336c5ced3cad1
-DIST firefox-100.0.1-hsb.xpi 567859 BLAKE2B 1708030bbc115771a10648d37cc27d83be9fb31d2bb402681dab3abf34f78fbc81e22c5837df95b3184fce3331e5d369ee6a056d4f9509687478b05a9c4a196c SHA512 0fa4dfc20f8d9f739af2fa328ea560d511f754210a4b1fe5c06a659312d05ebfce7e9567449c711fce855ca138c0ddc60ed14be41129afe5c2e4635c6f4bf7e9
-DIST firefox-100.0.1-hu.xpi 571152 BLAKE2B 8a960a41b04944d10f741b3226ad7641e10b681472cbfe3b11f29c4e99b184cb31849545b345526f099501a22d5e28ba40b5bfb595876eede104af4c6e3c8067 SHA512 ae2ebdb19e704a19b9458ba5aa0dc56324192886c86c6131b61fee10a9b56184fe0b54bcb7479cf42277100fc325c8413eb7924985134fee1a4d5d5505efee5d
-DIST firefox-100.0.1-hy-AM.xpi 580147 BLAKE2B 4d51d78165ecfb89d1d9aa8fb83b3437defaef7839d1f5007de4661ac330e4ab091876d98f7c822b2316fda7cc2691a18688662485271e6526e84b2d31e78fad SHA512 bf46e0fd3e3d8c1ec0e2e78143df32ed6b62ee3aa9d07c6d09b8d9e59ab21c5ba4bc66e65a599e27e8bb68339d480de497f9d98df25832585d413e2552499924
-DIST firefox-100.0.1-ia.xpi 537115 BLAKE2B ee244c493bfbef18268dee2b56c03f5b2a6698316c3477723e41c1684fec167b4b166949f1a3c53bb8055063c3012b1bf42e94fb9b5f21e6e8876152c16ecf20 SHA512 eb7c530912654eb48db3ab5e05ce2e6649e96d8c9a9fc6b602ff69463f3865e126bf9f4ec8c7e108040311c1f83133ee709a816f4ca620f82acae891710e33d1
-DIST firefox-100.0.1-id.xpi 533678 BLAKE2B f2f2634be017343217d217fb8edc560b4f6bfb80d402ea6e132b0d09bb8ae12cae1618cb8b039c75fc623c2a0c5c191781744e0533a0fa2eff8a929ffaa65670 SHA512 d67d179f2fd0f2f90a8d3e0969553acd04abcbc22415c318eb756b06849674159cd7336ed0deb82140f675957b82aae501bc74c8cccddd69f0fae73f38568440
-DIST firefox-100.0.1-is.xpi 540515 BLAKE2B 7ae748f2114f3191fc8fc9dc1e5812bd7790bdcfdaa899a32f55a81fd3080d64d76b5ecdd3ebb96ec28e4a84921b8337e9e6309d2d33e9526c99b73986e94a60 SHA512 5c361cd7ff38483fdc45759ec730ae5e4914cba5bd45b0a62ae463aacd3eb427f93c1661465f529cb39fb94b554b3f6793f30d4b9c49e64c62dbab7c6653312f
-DIST firefox-100.0.1-it.xpi 464281 BLAKE2B 2bfeee08e9a357f29f99b55fb5d3ce86fb8e313af5323019098ddcf61ca9f3c5f94b9a21770d2ddd67bf424360239456592bd36a786dc3940cf1406259e7f90d SHA512 4e0516aa9608526ec2e6999a367e5c250573a3f96d177de4a13212cb328adef58902d2d17db88178639101ff803e6e91c9d0db3c62decdea4bafe0ce3528a686
-DIST firefox-100.0.1-ja.xpi 593319 BLAKE2B 84b89e2e7238295e11d90b80672affcd272f1f01fb38dfc65eb9e75c37f0f958268c98273a53dd6f1c50a821b6a074fbcbc7a4c47a37d0325e6413f223c5272e SHA512 4d18f06a4cc6b4e8429303d3b6a437c21681e1ad6280cc8c27b630a82e7a2875fed2d87850e188f111819c29aa9c5a9281189bf94097d0ead5035f1419c33332
-DIST firefox-100.0.1-ka.xpi 596399 BLAKE2B f0af3c05d57bc8598798038d6ab22d0b2ff0a7d58dd4ef446093bea215d3859c741b1eb3c079e0ca1b0b6fcada4ec8afc517e47cd6f1188da7f6c03be84e8d0b SHA512 3752ec1c9e2e0182bd5fb360997114a4315767325324063783b3153e4ffb7b7998dfc1fa2e9efe4aa487b0cd29e4a268a2238d04a9c523cc5deff980bbe50efd
-DIST firefox-100.0.1-kab.xpi 556377 BLAKE2B e7f7b5a3498f06c86f2a7e848fa7e4c5fe2f2aec3f824f7f305ffd7f7f0861f45faee9e644797b4e543a4c9b88ab8e8204e98ad07d61f40cbb7cc3d618c9ccbe SHA512 a51cfc0e10aebdb2048ed784a809bd7df9dbd4b42296098587ab1a2dd53222db19cabe726f1796f7daf07a5d18c0d3c288c4fb7b3b82bf246a18b9d3942fc097
-DIST firefox-100.0.1-kk.xpi 619240 BLAKE2B d8e4f14e5214b7a1abcd3d90355b0216250ff6eefcce468ebf4a301028b943af66047c6f2f8915e1d8a63802ef7959744c7470560898765b3f4d6e2a9772fc65 SHA512 76d0e6391dd01edba0bd1f1177f562d8f15a741e116db274e408b20613e708b40085820ff5f8ca94e757ec87db04fd7386205cb12bbf2d5592b7e3e6a9abb96d
-DIST firefox-100.0.1-km.xpi 525489 BLAKE2B 5193d1b1767afc0c84838aa990895ce068f8bc7f9462af6e12ef0bc00808f7e3ae3e79f7f8afe0986f713095ec1a6c4503d3ff10db649d078c645252fbf7b81e SHA512 8b1bac66b7ef6492dc51025fed8076a84d113c36867e7230eaa563289718e38c479a4ddfaceb24d6bf59f5359071955ed7b363e98bff97371847cbf439f38277
-DIST firefox-100.0.1-kn.xpi 491376 BLAKE2B fa756b85b7f2e975ba2b3cceb5615dc54d5b54c772e3d25ad1005323df7ef321458379cb1b044e92c493d123d531ea4510138d1c65ebbc378f60fb9e442f1efa SHA512 ad15e604b9136feb06ca7a4e4a74ca6537a0f26b6ad2839d35df3ba985bf2cae50a934ce604abe549ae6ad68e13b51078dc6e6be1c0e0cec9df7656eed69a515
-DIST firefox-100.0.1-ko.xpi 584524 BLAKE2B 13f5bc81b0f1392b8b511e7c075a725729b8c0337fbefca893867ab8ddb69ad42e9337e758ebe3ed6abbbdd8745ed3fb0f6a2bc4dd6901dd6015b3d8e20a5bd1 SHA512 9f73a949cd2ede088de4b0933509e9b0f235191c4edbe3a183ca206a74aecfb578090c0a3a49b81244a7afba1d009e7542b1001f4c409feb881cfbdd5e0c9617
-DIST firefox-100.0.1-lij.xpi 466997 BLAKE2B 2e886097075f3626bb11a6ece77ccc8da404e4151bd72659bf8156c8aa77d194de8f36396065efdc0f4686b28c1ad25d4cf6125ea07bcf708a774c771410a092 SHA512 20fd6790f1b7a6d93ada00403d07d9a90b086fcebc7814c4b7b638ca6a704ed4df70ac1209ef856119d4198beabb87abb631c4fab455a4021164ffb52a193856
-DIST firefox-100.0.1-lt.xpi 560149 BLAKE2B 89e1ace9c3b713c43df7af5c1c698ac49ef2ecf5c2a9fcce2670099efeecf7c48fdb3a1ebd369c097bcecc09fbc6eae7b93c45733e2729885c708c65f69c82be SHA512 0e0c8c812c4c9abca78c2f5a3e330610f67da74037f9027e092357fc0648ba72e1fbc7bd057e48882c4867792948cedd8ace725ead77d991a2ab12de5a628c0d
-DIST firefox-100.0.1-lv.xpi 459193 BLAKE2B f48811353541e3b873f04beb2a073ba794100989d7c41a7779402f72083d7f6a699c19e0a02edca0e8d13a6de159e08631b0f8dbea42de3c37a5571535c0bee1 SHA512 d134ce462e3443c687bfdbdfa3f0a135d9004264386d29a001bd71124714d0d22154f6aee1dabba434ef5e7b8703c280da7bab735b872c9ffd65320b0abaef49
-DIST firefox-100.0.1-mk.xpi 468292 BLAKE2B 8378eb6501fcac7a421c492b273a4badc01db881be094c27ed38aaf7fdc4e7443aad00cb283955ea451b4c851f2626b7119c2b1220c5ad89f3c6134f1b70a304 SHA512 13e4e44cf776f9d42b0b286e7661a7480e77d0a8ac7fc1abfff37e187ce7fea0759c585b2f5c6a9f3288fe27febb04e1d06292318a0c9a53ef7cf335576dbb8f
-DIST firefox-100.0.1-mr.xpi 528154 BLAKE2B f33cb8dc3cc43614075b4637ff50249dee3a8c2689dd67e41de3d18cdc6f818d6ccefb0f310a045af692f533753a25164e11f184b97260144680b9ef81905353 SHA512 7c9cff06e6bcf5a97edcd3d3b88bfc90f5766e6e888651679d88c07e9df5df7cc50ab628c453bfa6e87dfb54f6a120ef65edc23698087c6d4d0491e9211ba7f3
-DIST firefox-100.0.1-ms.xpi 444145 BLAKE2B db7478c9be89c1a8dfe15223738f0bf0b929db87d4f0cc0226d7f60eb675debbd03ca6fef55c7623936b61441eb7d424e2fb17d95cc603c43467a6f4d6ee8926 SHA512 53a35c2d51212107c8c05d55af0ead3383ce08238d3d82e516cb45a63624a093575a7b62ed639314eb942a20ae4fffefbf9fb28856b625a68208aa7a4143627f
-DIST firefox-100.0.1-my.xpi 507354 BLAKE2B f767cb5a76f1b4bd507a169af4546d4863fead44f820d54026e5b583dd551443f4a532701eb4a412fc3ef989994b205167c75e8d05c755d91da8238ea6da060d SHA512 0113112257865d79882a46d28f2824091eb16710062d8430e106e6a2cca11b6ff5bdfb6b079de897afc3e2b5375a9b9de05b9d449a1d2a4d7236b503d2c5925c
-DIST firefox-100.0.1-nb-NO.xpi 533774 BLAKE2B 8afe883f580ca2808ea04951328dd7f1552284b4089759134b164b99dc99cc9b7fd478d4183c5358d2f58c7efd89dbdce4bd2ce4a6abb1dfa493ed64874aa43d SHA512 5b46bfc1bcfd8dea5d99eab44464588b8d46d313201a1b7aa1455bb055a4a3d157e9eed16de9d7fbef826afb8098044c8265009653495ca22a5d75c1bdc69e91
-DIST firefox-100.0.1-ne-NP.xpi 482568 BLAKE2B 9458ba74a4a506c2b8275fec3e9143ec383c596e57042d24644bb3dbc526d8be4607c0528a8a768eed6c3a414530892c83647ef61bd4a7ff882246b82cdbe16f SHA512 4d263a3df99e8b0d5bdfec1323680510a8e2b46f9ef483c0a49b3f846a85df5ed592176230933a91f5238e1c4bbb6a0f61f1b8321bed1f109bb2d543bdc355c2
-DIST firefox-100.0.1-nl.xpi 542307 BLAKE2B e647fc28d4cb13b6431dd370464dffc7407261a3ce55de68827ae64da8dbdbf10c80083637a65e980432d5a13244f42f9ce89ea2d4a07f50ca4a0a19d6605fdb SHA512 7bc6aa25b9c1e3f762e8c0b9f4d1a90d2c6d5f65b7027c6ae263c8e9089d50abc5cecde65cee7502a15f65cd53f0fcc2ec914ab3f9668eabb1408a5a4fa9eb97
-DIST firefox-100.0.1-nn-NO.xpi 536159 BLAKE2B 172497b87d5501a6bdbba2479962eca2fc57cc33277409d751fbc43e1cc3b73837f91b1f638c9fc413132317a1d755feb0c0d87678ab2951635b8a17bc78341f SHA512 04942e033d9b0d1da4c29113127a6005ca7abd6811e6fc233cbab45fc4e7713f6007d9335c1e22923a02735a657e8def89722e334522d8b984962cf7e3312725
-DIST firefox-100.0.1-oc.xpi 556906 BLAKE2B 824b9169206d224aa6d09346b0c68f3db25aed874d79a2f832f87a363d2d79661bb049a35ac2468fe8240fbe339e864026e3e99ab39955aa0ad200140b3b446a SHA512 06f033e3b69ca334f08cf8b93499b1b06c72e9c973020215331f50be7a8b3d94273a062e3e1be88d6c3b4ae419bd8c2c5b246e037a4830ddbf19acfe34e2ece3
-DIST firefox-100.0.1-pa-IN.xpi 600278 BLAKE2B 93099b141196896c1339da6e2c196c1df7ec2e65990d906bb66c6b8485ed59ef5a734b4839c8ca162f08344708f342390ffa5f0a7da17958aa4a033cf09a28da SHA512 5ec3d57baf1c68d755ae1c7ff910704a370f0a23d48c832442065a6bb24a908917c38a8b4a68e94daa128e8fdf0377a6439edb4a201d59a0f19ba48ed517a7a8
-DIST firefox-100.0.1-pl.xpi 562526 BLAKE2B e3fa3b0eda814ce7c87fd82730768de4fc35141d1a94a39670cf6cb62ed1d0f6e0f26df10658a7ea2abdba66b646b1e02c4d0f1c96b619b5a7727eb2af85e9b7 SHA512 13a00ac200e6d990575842bd6e2eecbb0a7acd3c0612bdd1b944343ecab9f6f676cde265f5f0b2c2b1a2b0c887472a0b594cc67c10755dd3202d0f019747c45e
-DIST firefox-100.0.1-pt-BR.xpi 547578 BLAKE2B 68a7a3400a2360716fa31e8cf15663ac3f082424d041ecd07a77e68722c29d965468af6def26451e6c3a6e3ed3603a06f4b3ddc8d6adc0bb818b5f1575404e58 SHA512 8126410e146ec1156422de78be172ef2075acf41aec91a453b86c1894c8ff54b308958e69f20fdb47a6c52d8776f5bbacb6f088cf85543dc3aab4851d65ddf5b
-DIST firefox-100.0.1-pt-PT.xpi 551055 BLAKE2B bc9fe06994bb1d457c5dbe2d84810b432eac45cc5a1418590969585438beb56ab1ab79b492d7aa7f50dc737a5314e95fd0715f7bb8e47f65457a2f1b6b279eb9 SHA512 031a95e6579b54ba969162140b3c5148fd7f7caae836f52be8ed975009099c45a6b9983cf1e772208c90cb11860ab6d75118d7ca789c47a0b7a666cc620612d9
-DIST firefox-100.0.1-rm.xpi 541904 BLAKE2B 556a669fe09a6bed70853d73f698e363624119c937dc6ed758ab543842094e774ab2e1454107f3b298f1265fe4ee4b14ea00c53eab6a8fdeb31402af11605929 SHA512 427b8dbe4f2acb2ae727d30a5ad73d22c9321401d35b74a103d4a9e5e55f77793ebd8c55e5f073eba038ced31c4013f0ccc49aae2c6a7130a455342dc9f8f7e3
-DIST firefox-100.0.1-ro.xpi 528004 BLAKE2B 36dfc836061d00ee9d14ef8f57911a5e7ccea94a339e9232aa4d3b9686dad256a05983b913275d20f2a6fa231852411e6456c50665ea9b6aebcf1e37a4fc7376 SHA512 3b54b0e25cc7ac164555b5d70b7c7675bca6d0b7969f0bcae32aeb6bd70bac0d7db3a3be970e5d68882d7b68e5915c973f535f2c657a133a18861e41bc5acd51
-DIST firefox-100.0.1-ru.xpi 633361 BLAKE2B 20c5c3f0cb28c8156686900eef9bd825b46c2c4d2adb319dc1acdaca5c721f259005bd89c71c2fe2e48ac9857c6ba46b518da39d8cb4968fa644a12592fda774 SHA512 c3a6abd3e1fc53e987429a12ff7d32df00a4dcc8b320f2e1ddb3ab9097ecb1f608bace25fae964375c9d05700e7a301696ea16556e40df6611ca047c20ca8443
-DIST firefox-100.0.1-sco.xpi 500186 BLAKE2B ff06c618918c28d964f363ea44ce26b1b8bf4fcaea3568a7f68a41c9733074f0dcc2a9d96b98366e4273fdfc65a84025832ff4e5a78fe4a00acad2e0d0dccc32 SHA512 746d2dc557728a1e47290715748048884480db75e071859c3a94021443dde1174ebcafd395d76605ca6febd7bd7ba1f7dc733fbc52df5eea081593539501b7be
-DIST firefox-100.0.1-si.xpi 480899 BLAKE2B e7e0e972f2cecf3ba274f513622295929dac5899301eb091edd673421fa350b521e2d5c40760655963e12f5d46f82b0b038ce44640a2f874b0e76146e6b6f127 SHA512 203051b051c144eb7bdb13c45433c5a6f82efb3f714eb4ef176678dc75c1c7ad74edeca2c6e52aa2a4c25d8a6914dafaa4662b5f5604ef7f7e56d99d92b54d7f
-DIST firefox-100.0.1-sk.xpi 571978 BLAKE2B 127584243b47631ab51f1ab9c708865474fd5115a4bbf06da62129d454924b669b092578f1e9ddaeb2c24fd9ab5e8452bad49e7ddf770b35df70df3403d2a79e SHA512 0765f06d0a00f2f7a76c9b925ea6bd9a501b3905518f8de8e0ce135bfabec6e0424483e195506cb20d05c330ae5582c1fd849b91b9b81b52db1f5e9fab83d35d
-DIST firefox-100.0.1-sl.xpi 543730 BLAKE2B 37f7073b02c804f540bc2e35e50dce3ea1c26811c82af8c8a442c44602c43d0627cb903d056e7fede7dbab6253fd4ecf31787089c52f6a381bb215c1517c488f SHA512 7091b83293da1dcec814419e659648a191861b277b72aa1b2e676dab01a6122ffe2ba448794db99c52785810c59ac4c91e379df1bbc05611684863ccff858f6e
-DIST firefox-100.0.1-son.xpi 417299 BLAKE2B ea85fae90e8f96b83dbe7b03f60be300bcc5d74148ed88a78614d8e129956485ad01eafffc5eb03fdf11332d0052afedcd78020dbabe4a71a26a8cd473559764 SHA512 a83c371770aaab6cfca1e2a6fa972bb14541c1383863f17f00dfb8990c745e7da71e28d7c3a050952aceff8ed6c2af6ff04fa20989f8dc61af5cde5af3c46c06
-DIST firefox-100.0.1-sq.xpi 560521 BLAKE2B 1dd9a62276cf59a24f0a736876f22c710cf890a1a2fabd682c8808a704d29eee6dd178349a7d6620bb483f525b50a0aa7fdc53d9e5e6b22ebb55528de81f2e98 SHA512 66192d58a901a2b65a37fda83256556dbd22c5d6ff8b75ae9c5f62b3d2ebf97120f322d3077654c146a7748396dc0ea1d8e0a5ec6d9c912639eb168dad7f0751
-DIST firefox-100.0.1-sr.xpi 585621 BLAKE2B a06c7543e39f3544b56f1ca2e4530cf1c7721c7daa560cfc1ea6b1105ccbf704573b4367306e2aa996beb7c10028f55e0f0e94034e942070b5624877656524bc SHA512 a4f14c9cbfe3dac8648b0411c323a1d0acb29220ef92ce2a0180895bc17e245ee41ecc5c58e4b1c55693ccb1355e739f7019ef5effcef07fe18df4cfef549ea1
-DIST firefox-100.0.1-sv-SE.xpi 544798 BLAKE2B f828c56a5d70d07a8f15d63cffa8f40b515202c8c2d0131eeecb0191f33440ac071fdddde6c64ecc55d7a4a2e5f5a246e7460a820bfbff0d778c48473d565f28 SHA512 64cf675e721f0654c6995d3724448f55d5ce940b4d1603f51a09b4ea0fca31339a9a7bb847a3d33030431238b7733d58c59276c10c129dcbdbbe2a3da75b8a96
-DIST firefox-100.0.1-szl.xpi 503459 BLAKE2B 9c09a11e19a952ceb80420cd418f14096d80ee9657f46084222ea899b9260f305a4fc9e62cc6104d1d37713cadfe306175a8338e31d14885a8be18717433290b SHA512 a1bc681287537a52204dea8e72e4be778943f6c4261807017e42364efdfb4e9e83f02958a2a0e4ef3d02e17078b8345ae3290239575d1e4aeeeb052be172156d
-DIST firefox-100.0.1-ta.xpi 508214 BLAKE2B 2aea58b1b08d01c2928fa81eb3bee96ccc640e84029f512a25e1b898e7e9259e9a6a44f370b35393c7856904f4c2d7797a4ae0a3120324a629b419e900998604 SHA512 13129b958b7fd87034616e2c727f8913dc714ce3b7926a58ca567b2c7710788953ed49597c0bb414b166c129b6e80639bc31246aad289e40993bd086962d4fa9
-DIST firefox-100.0.1-te.xpi 546702 BLAKE2B 727eadef5504eb2a4e88fee3f0f71019446b0781be35c8f12ff8ce3cbfece0e13e364e8ffa9597e4094a20ecd4b207c2f2fb7b5b2dd1d48a1bfc6cc353566491 SHA512 fbb77a84820ef3f693d6aecbbd1ad72e395dc63935239ef1def760123827fcae9d8025ad7e6881c44026ed2394506f13e919041c47c648d80f9625e53cf3a42f
-DIST firefox-100.0.1-th.xpi 610753 BLAKE2B 1ad5b9f2b6973b522ae5391bab68652367a3b250502bd8b04635309f324d603963138e16671714bb655db5038a28f646c9aad979442129090a1eb2c0cf4e02fd SHA512 666914312224456098c83d39caa7fa54fa4f49868ccd3624d5f18ad8739e37f6eedc4f460352547ce4d77e6c96c4992d4fdd98382c4cc43ea2e8e65413034644
-DIST firefox-100.0.1-tl.xpi 518032 BLAKE2B 1b2f68cb2f2b36f9279958f8ca90d7655dabee3aaa030c5a6989e3ee575e518a018bd0cec193c8bdcf444683eca79f130aaa4367a7a1b0fc571afe1ed86b3aa3 SHA512 cffb3f9b262790438c42531ee2b481d067a59a46af8cf1283e90ba6da6b0b33eb1d1e56761227ad494a2c44599a24c54d5e938a2bbf97d36a2a8c4782de1fee0
-DIST firefox-100.0.1-tr.xpi 558387 BLAKE2B f30792a268704503c5eeb1b92c3eee8b06876f7c49fdb7a33210f73f4a906a137c8f3698c02398c0c155599b7879866924de0587d815a26692790211ce2e2715 SHA512 42a5de55228d3bb13b99d6050983ac10e9cbba73c9ae9ed8adeca973a1fa8fefc6a50ce1d313bc3d33cbc3574db2c4470fed0a3340a96c5bb861c354e060ff8b
-DIST firefox-100.0.1-trs.xpi 486843 BLAKE2B f461ab927a1224ae5dafec4703768d992010b247d2ce2baba841b1969146aedbee3bb311eec9137d7084431838a82b75b797b5fb7d0ac7b96a6c472599006c39 SHA512 6bf9071933d54768407a9c1506154dcbb9d5cbaf16f768caf8eef070284b151899c20b8519bb4f70204d633772f6f578b774ac45e3bd22ec8bd53c14b497feca
-DIST firefox-100.0.1-uk.xpi 627012 BLAKE2B b0bf5dfc3d51b3a4d6c89f1d6267602a157b4ededb56df0a4d5b0dda4cdb432e688e0c598069a4acdcccce714ef29f8d8da978ac1acaa63e5c845cc81cdc30bd SHA512 3a1a238b4d0d9ea174659888b4081ca216dd0a74cd6212a09c70172cf8b28dd2c1c9e32570fbda09647e230fab2743edb73c5938ba59ec4d42129c723d435bbd
-DIST firefox-100.0.1-ur.xpi 556884 BLAKE2B 1540e940129b9d98c9581bf8e134291b858172c0145402d29a06248bde15bcfdc8d37bfa1164b8053917a2efd742a1d88344a1ae0f5539f751e5f9e8dc274c76 SHA512 663148b7887cae911f4071a5dc9cd0a58186d8f3925716d2e2eca4711e5e49c2c1a7edb89b878a66ae3e546fa26f4422518e74f501cfaf3f5721cb14cd07d867
-DIST firefox-100.0.1-uz.xpi 473713 BLAKE2B e6846675e09d11f1029eb49183c8859097a503c122d400f2cc22ebde636c44453e8793d0090bfc2c654e46bbdc3dd8926a1c662407fd1d29908830c5c79f13c1 SHA512 72074a5db6d5d1f292f58cfe1c6b3dcca5a5194a906f21580151df0386ac43c0349d829eb9cac81523f911707c031882f2365892251a58877bc054f1895f33c8
-DIST firefox-100.0.1-vi.xpi 578677 BLAKE2B 59940e93b00075e008ca282e46c261c0bac1fc79b7b00b5ad01b2bc2d3080e06a2c15ff47eac0b7513c92f4d6b805b7e64cc20ae610d1323d7ff56c6af389206 SHA512 55591c9d564b88a245211121bef587dea0f4004bf44dc363749e09111e1be2f7beac0e064c7d90ba4ec232938691445236210b620cb3caa622085f0ddb9100bf
-DIST firefox-100.0.1-xh.xpi 419496 BLAKE2B 4d5eb7377461f99eb95ea9ab7be9efb50fe3aec964f9500b4a23d363418a25e6533be998bef86f530207595dcd1c683eb61c43691a19696eaf3844826c89db2b SHA512 63a02534b21f4e34f48430c4780da6ec7857f5c0b4b6335aea5b14880c0818bb9b6c28ebaa820a3003844a67e2a1074e7c9f427121b69084344cf1f6bff21de0
-DIST firefox-100.0.1-zh-CN.xpi 580543 BLAKE2B 1085f62d8e40c64a848b5f22210fe321e4cc16f7e86b0864519d6fb1d3edb705183eded5f9b38db24446b087bb7fc1d42b0284608fab13c7ec087111aa6014b8 SHA512 ef568853c2896081f763679225cceb1e24dcdc9f4a50adae716761b588286a15514fea8fab83bf9e7f5af61d345459a5804675d67ab96a7bc0a46e16f55b390c
-DIST firefox-100.0.1-zh-TW.xpi 581627 BLAKE2B a1606b941ff3342aeac49c166a9798783d1ce3248624adf8aecaea25f5fc2a767e2262d11dc0f7d198db6c339ad4f62b3c5e61fcb92d18f8e4e379b7ea4d6d4d SHA512 0355193f3b7b82b3a5b2915eddb397fe439dee96bd36734f33b3e9b878c59f6e4bb3681d9db4514fb0219814ac8cb309b865b1ab2680ad26e4aac565d01bc253
-DIST firefox-100.0.1.source.tar.xz 490127024 BLAKE2B 5871939407dae83d6dfd070414b290b5cda5dc62f8fa88691a3f637ecead4b2f4efa8062fe8483c0638892f92f225d2a3265d5b68599530353e20f6ac57a609d SHA512 6ba09542d1573e903978f8e63f39381dcf2180219e80e7401c62c8347100d6d4a973208b8094cff07d76106636cdfef93829fff3398011fd9536dac477ef118e
 DIST firefox-100.0.2-ach.xpi 448908 BLAKE2B a52cd317680c7797d13f24fb59416e13aa69a89d62488fa7cfca4d81383dbe873f2a2eda2b721efdcab7233f219bff92e2b3e1c16c4da34cbcb4839d35e9bf8a SHA512 b72811e44c0564a0dec0efb8f13840cae684882ec4aec50c265222c384bea54a0b5a77e6c3056c9d0ece59b5fc3b2fa3126e08d10b1e71af2759abd6469e510c
 DIST firefox-100.0.2-af.xpi 415231 BLAKE2B 594f221495e2a62bbf0c127509015a5b5c8c4d9813be5633c8eb55fe1ec0f4bbda33adc34f46b4062cfabb80c9087f3970a04829425319a4667dcbfdcb78e79d SHA512 e73f3905cc329fe55585f503b8f645f33707baf8d35eb8804e8a3ea138edfab30f9f8f377ea2993f64320add15c6f08ee2257fdf784d266ab2580c7f78081016
 DIST firefox-100.0.2-an.xpi 495514 BLAKE2B 701f16d41446f4d64fcd65c429e41ba606c880f412c32b3e23e6efde80a04809452aacab3df277d6f5843d815fd97e86c1b1c550de5c9392d9abc6191a9bd0c3 SHA512 5d63b2c89c6539a0d28aff3c3c07c25f4587738ae2216d30519e64710deca49fbffd3aed07a16066e020fdd6d022f78fb33b985e12b30fc9b776d06f0dd5c1f4
@@ -301,7 +106,6 @@ DIST firefox-100.0.2-xh.xpi 419501 BLAKE2B 0a8e51da7fee1c844cbc5304d31d0bc260970
 DIST firefox-100.0.2-zh-CN.xpi 580540 BLAKE2B d77af0550b7d5cd561357bfd263680b1ac7ea58f3de14f17e6be712b9eb4979695601d9fabd1f7724acb45263410ec8c0b8f0088fffd27199bb2afad75319bb4 SHA512 ca868ca64d0acf5f0ebb9fbdcad25a3935d3ba7156b0d05b86779a8a21f45d42a74ad6cc9a176d96bd7e38b554e02ecd987d9b1c4e9fc3a4149c4eb3e45df54e
 DIST firefox-100.0.2-zh-TW.xpi 581632 BLAKE2B dd203ff1f4ecdb53ec6f85c03668647b839ba16edb1b06b68ce0677e8f6756b033efeb4c2b9ffc794148dc8dcd8175c5c5d2d657cc13db3ef36940a2a4885519 SHA512 26e737abf949f171a4f03d8bd16dfb6422e89f7f177e40db5f49d03d1b41638580d3e2dc1ed72d857b4c9ba322f88206a25da43ae1c0b5b59543bb42c73da301
 DIST firefox-100.0.2.source.tar.xz 482708576 BLAKE2B 2edfe7ac3f568dc124e6e733fe8cfa554acdf0cb0aa456cab601be0637bbeea1b1b48a4069440a4075c17a7db3a683d554197f1369e614e33af02cdcd39888ba SHA512 6d9922e35e496fa63833ba03d1466e075287e40e50854ddc4f4a2036d9c7ca1f35c03bc6f708a3c469e0ec3b389b3346ac754bb84df0fecb86955fc21c05e00f
-DIST firefox-100.0.source.tar.xz 487179576 BLAKE2B b8a46dce6d15d11476aa24fbc87a9df562fcd613594193ad053367facff9663b7ad0dd79720e7437383b7212869213d275ae12755a91ae22633f03f78db3a601 SHA512 29c56391c980209ff94c02a9aba18fe27bea188bdcbcf7fe0c0f27f61e823f4507a3ec343b27cb5285cf3901843e9cc4aca8e568beb623c4b69b7282e662b2aa
 DIST firefox-91.9.0esr-ach.xpi 453213 BLAKE2B 6ad8fb45ebed65b82ca407ca81e1a32cfae6da2dc93b7c06746f47829b4434a7fa41db3e8b0b307cc65e141485b3164595bed8df12b9ececaf86c251514203db SHA512 6886cbfcaf422a853811f56077a6b29c432bfa34fdc3768e62dde52d477ce99dedda2aba542e2813343b547b350b8d39d32784e496f8d18a02f9fa0954fcc470
 DIST firefox-91.9.0esr-af.xpi 426927 BLAKE2B 5375b04882b53a6ce1828a01a565d49ba02ceb076b89b8a64ff93f07573ebf3594db7ecae373b550496532a61ad2b4bcf62d2854278b517641c8b052cf8c8009 SHA512 7c374825faa131baa771bc4aa836656b1e456dd862db0d9fb52f13206c43f1162de30a0192ca023f0dc1ed98ad351a921917a6ad56ebffa4cfa3643b8210a478
 DIST firefox-91.9.0esr-an.xpi 499888 BLAKE2B f16f44afb6ae2d766a56e5eaa632c07616f0a4c6160625ac2013a0db8180fd8f83cf99d6291cf9d1458326b0dc155a992293682c05d790677f851f5a7d6fb910 SHA512 39069d165df48dea9047dc25dbc2ef8fd2f31249b487638f0769680da4d0a3841fa9bedfc23cdb7f4d563408914c052f388825f331b3a5104169bd79a1c49691
@@ -499,9 +303,7 @@ DIST firefox-91.9.1esr-zh-CN.xpi 575374 BLAKE2B 648216d3c14cd32f083eff3e14dc9003
 DIST firefox-91.9.1esr-zh-TW.xpi 576234 BLAKE2B 99295f79be73b1b50043e995c44848443a3c4d0441b1703c5c1821eb7c3d9c1f7deda75ffdef2cab4f6aca21dcf93ece6fd91356c26b9e9b87df4c65622dbf6c SHA512 96d15cd33e0a0d0b31c6a2b552f2295cbbf7aea2a74d704c4940149bee16fd94d99cb72e9cfc9555f439760aa86d02801f3d9953a9814110bc14a4d0af4205f1
 DIST firefox-91.9.1esr.source.tar.xz 378762560 BLAKE2B 6a29d262396ec63718d4569f37f14f496c46530a3997e05c41c69163e65f2deb382b983cac7adbd2246be9922a644af03a927328cb424bb1e138e87f49208b5d SHA512 d432d559f2c5f4b0bc66a755db7d61585e24a727cd8d18630854b3fb8633d54baf61ed65b580345b13d52b66288aa15ca8ca5cfcde8231e88108241f0b007683
 DIST firefox-91esr-patches-06j.tar.xz 17668 BLAKE2B ebe51e06197b70b0f0661724e1ccf2f2aaf0e0eb4576e795963c6a0f9c32f293825b8d2a487dcadd8e5e1cb5db7c756016c50f34e6bc6df451b44e54ef76686e SHA512 3af533a49c5e4a6fdb5be2225256655d402055332ba98f3aa159fcc78c4a9901a541b63d68cb02440f55ede04858388881118f655efebc75b18c316e0ab522a7
-EBUILD firefox-100.0.1.ebuild 36506 BLAKE2B 565d3ed229f8eea50862642974d926cc766094e54e8f4ddcd8147ced2c11137635ed1e97b2aa41dbc39307494330d3c588ff20c5667dba76c88fbd3da8cf768b SHA512 78cb864ef6044022b53d9330325abc0fa246bfa348350f481ecfe7065574f88cb0a226c294c13e339988c5bc2c65b3b7146c22be70a0ce6159605e602afdc478
 EBUILD firefox-100.0.2.ebuild 36506 BLAKE2B 565d3ed229f8eea50862642974d926cc766094e54e8f4ddcd8147ced2c11137635ed1e97b2aa41dbc39307494330d3c588ff20c5667dba76c88fbd3da8cf768b SHA512 78cb864ef6044022b53d9330325abc0fa246bfa348350f481ecfe7065574f88cb0a226c294c13e339988c5bc2c65b3b7146c22be70a0ce6159605e602afdc478
-EBUILD firefox-100.0.ebuild 36500 BLAKE2B 5825670239cb3ef0b0ab40f4276f913f11087efab0af858823440c2022991b8fda68f7de045c037024ebd9240f6e97a17687e6c6818b5b754da668154fb03dca SHA512 adb7079127455d715f684d28da6d78ede16f6aa81399417996f3ef3ea475ea6400b3c4f9ef0729778a45741e5bb1cd99ed82201d05be31f3856e39e6f0330996
 EBUILD firefox-91.9.0.ebuild 35726 BLAKE2B 39bc57fddcc8faa652e3e30c4f6c0117459fd435dfa583e8589f9d3bb5965634a8adc9428a3af2126af607248e8c2417358481478fdcc27a84eadb7615177808 SHA512 967ed78350ba0bb9067d38957a2c45682cb397d9d1466abe32cedb67a8d04ebc1db5a778cd0b1202c658c65d8d3cdae32aaa8a5c3cf47d236f0c3edfe4f867c1
 EBUILD firefox-91.9.1.ebuild 35727 BLAKE2B 622ffaa2a5e12990dbe512fc10d1639e705ba4b6a2e559a3ba3760ff14116aef7b372cc3e68dc45890278db7c0850b6218d8ee7271a5ae1ebc00d3c3af83c6c1 SHA512 ceadd5c6b6182083f7f05a927886905933a6e27fea74f11621aaa29b974a376fb53245bd8ac0d21eb747fc36f43daf2e27a4600a549a6ff8602b4657f424a71e
 MISC metadata.xml 2395 BLAKE2B ee257e2fbeed0224f696b3cef50af4387e8abed54a840131ff3e07892c0571d5a97221848eeeb20639d2f15be600e9b592dc0f9180f9561356b0fad2c2fcf148 SHA512 3d3f5dee740a64c6dc7a29bae5a9c2b205eeb59cb698f0a5a85b1a4bc7c0aa93724c7196008bd0439c12455ea3c29d4187088b6dda39d797b2f2595c1054337c
diff --git a/www-client/firefox/firefox-100.0.1.ebuild b/www-client/firefox/firefox-100.0.1.ebuild
deleted file mode 100644
index 269124df77f6..000000000000
--- a/www-client/firefox/firefox-100.0.1.ebuild
+++ /dev/null
@@ -1,1267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-100-patches-02j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver"
-IUSE+=" +gmp-autoupdate"
-IUSE+=" screencast"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.57.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.76
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	media-libs/alsa-lib
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.9
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.42:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	>=x11-libs/pango-1.22.0
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	libproxy? ( net-libs/libproxy )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-0.9.3:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-70.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r1 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/firefox/firefox-100.0.ebuild b/www-client/firefox/firefox-100.0.ebuild
deleted file mode 100644
index b1bf622c4f3c..000000000000
--- a/www-client/firefox/firefox-100.0.ebuild
+++ /dev/null
@@ -1,1267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-100-patches-02j.tar.xz"
-
-LLVM_MAX_SLOT=14
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
-	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{juippis,polynomial-c,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Firefox Web Browser"
-HOMEPAGE="https://www.mozilla.com/firefox"
-
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-SLOT="rapid"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
-IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
-IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
-IUSE+=" wayland wifi"
-
-# Firefox-only IUSE
-IUSE+=" geckodriver"
-IUSE+=" +gmp-autoupdate"
-IUSE+=" screencast"
-
-REQUIRED_USE="debug? ( !system-av1 )
-	pgo? ( lto )
-	wayland? ( dbus )
-	wifi? ( dbus )"
-
-# Firefox-only REQUIRED_USE flags
-REQUIRED_USE+=" screencast? ( wayland )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.19.0
-	>=net-libs/nodejs-10.23.1
-	virtual/pkgconfig
-	>=virtual/rust-1.57.0
-	|| (
-		(
-			sys-devel/clang:14
-			sys-devel/llvm:14
-			clang? (
-				=sys-devel/lld-14*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:13
-			sys-devel/llvm:13
-			clang? (
-				=sys-devel/lld-13*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-13*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:12
-			sys-devel/llvm:12
-			clang? (
-				=sys-devel/lld-12*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-12*[profile] )
-			)
-		)
-	)
-	amd64? ( >=dev-lang/nasm-2.14 )
-	x86? ( >=dev-lang/nasm-2.14 )"
-
-COMMON_DEPEND="
-	>=dev-libs/nss-3.76
-	>=dev-libs/nspr-4.32
-	dev-libs/atk
-	dev-libs/expat
-	media-libs/alsa-lib
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.9
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.42:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libxcb:=
-	>=x11-libs/pango-1.22.0
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	libproxy? ( net-libs/libproxy )
-	screencast? ( media-video/pipewire:= )
-	system-av1? (
-		>=media-libs/dav1d-0.9.3:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.8.1:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-70.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )
-	sndio? ( media-sound/sndio )"
-
-RDEPEND="${COMMON_DEPEND}
-	!www-client/firefox:0
-	!www-client/firefox:esr
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libICE
-	x11-libs/libSM
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
-# overridden in the enviromnent (advanced hackers only)
-if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
-	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
-fi
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy da de dsb
-	el en-CA en-GB en-US es-AR es-ES et eu
-	fi fr fy-NL ga-IE gd gl he hr hsb hu
-	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
-	pa-IN pl pt-BR pt-PT rm ro ru
-	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
-)
-
-# Firefox-only LANGS
-MOZ_LANGS+=( ach )
-MOZ_LANGS+=( an )
-MOZ_LANGS+=( az )
-MOZ_LANGS+=( bn )
-MOZ_LANGS+=( bs )
-MOZ_LANGS+=( ca-valencia )
-MOZ_LANGS+=( eo )
-MOZ_LANGS+=( es-CL )
-MOZ_LANGS+=( es-MX )
-MOZ_LANGS+=( fa )
-MOZ_LANGS+=( ff )
-MOZ_LANGS+=( gn )
-MOZ_LANGS+=( gu-IN )
-MOZ_LANGS+=( hi-IN )
-MOZ_LANGS+=( hy-AM )
-MOZ_LANGS+=( ia )
-MOZ_LANGS+=( km )
-MOZ_LANGS+=( kn )
-MOZ_LANGS+=( lij )
-MOZ_LANGS+=( mk )
-MOZ_LANGS+=( mr )
-MOZ_LANGS+=( my )
-MOZ_LANGS+=( ne-NP )
-MOZ_LANGS+=( oc )
-MOZ_LANGS+=( sco )
-MOZ_LANGS+=( si )
-MOZ_LANGS+=( son )
-MOZ_LANGS+=( szl )
-MOZ_LANGS+=( ta )
-MOZ_LANGS+=( te )
-MOZ_LANGS+=( tl )
-MOZ_LANGS+=( trs )
-MOZ_LANGS+=( ur )
-MOZ_LANGS+=( xh )
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6600M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
-				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		if ! use clang && [[ $(gcc-major-version) -eq 11 ]] \
-			&& ! has_version -b ">sys-devel/gcc-11.1.0:11" ; then
-			# bug 792705
-			eerror "Using GCC 11 to compile firefox is currently known to be broken (see bug #792705)."
-			die "Set USE=clang or select <gcc-11 to build ${CATEGORY}/${P}."
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if use pgo ; then
-			# Allow access to GPU during PGO run
-			local ati_cards mesa_cards nvidia_cards render_cards
-			shopt -s nullglob
-
-			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-			if [[ -n "${ati_cards}" ]] ; then
-				addpredict "${ati_cards}"
-			fi
-
-			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-			if [[ -n "${mesa_cards}" ]] ; then
-				addpredict "${mesa_cards}"
-			fi
-
-			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-			if [[ -n "${nvidia_cards}" ]] ; then
-				addpredict "${nvidia_cards}"
-			fi
-
-			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-			if [[ -n "${render_cards}" ]] ; then
-				addpredict "${render_cards}"
-			fi
-
-			shopt -u nullglob
-		fi
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-
-	CONFIG_CHECK="~SECCOMP"
-	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
-	linux-info_pkg_setup
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make cargo respect MAKEOPTS
-	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		AS=llvm-as
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set state path
-	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=browser
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-parental-controls \
-		--disable-strip \
-		--disable-updater \
-		--enable-negotiateauth \
-		--enable-new-pass-manager \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--without-wasm-sandboxed-libraries \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${ESYSROOT}/usr/include" \
-		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	# For future keywording: This is currently (97.0) only supported on:
-	# amd64, arm, arm64 & x86.
-	# Might want to flip the logic around if Firefox is to support more arches.
-	if use ppc64; then
-		mozconfig_add_options_ac '' --disable-sandbox
-	else
-		mozconfig_add_options_ac '' --enable-sandbox
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-png
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-	mozconfig_use_enable libproxy
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	mozconfig_use_enable geckodriver
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	local myaudiobackends=""
-	use jack && myaudiobackends+="jack,"
-	use sndio && myaudiobackends+="sndio,"
-	use pulseaudio && myaudiobackends+="pulseaudio,"
-	! use pulseaudio && myaudiobackends+="alsa,"
-
-	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-
-		else
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
-
-	if use system-python-libs; then
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
-	else
-		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
-	fi
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Portage sets XARGS environment variable to "xargs -r" by default which
-	# breaks build system's check_prog() function which doesn't support arguments
-	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r1 \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	if ! use gmp-autoupdate ; then
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			einfo "Disabling auto-update for ${plugin} plugin ..."
-			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
-			pref("media.${plugin}.autoupdate",   false);
-			EOF
-		done
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install geckodriver
-	if use geckodriver ; then
-		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
-		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
-		exeinto "${MOZILLA_FIVE_HOME}"
-		doexe "${BUILD_DIR}"/dist/bin/geckodriver
-
-		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/browser/branding/official"
-	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menu
-	local app_name="Mozilla ${MOZ_PN^}"
-	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
-	local exec_command="${PN}"
-	local icon="${PN}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		use_wayland="true"
-	fi
-
-	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-	sed -i \
-		-e "s:@NAME@:${app_name}:" \
-		-e "s:@EXEC@:${exec_command}:" \
-		-e "s:@ICON@:${icon}:" \
-		"${WORKDIR}/${PN}.desktop-template" \
-		|| die
-
-	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-	rm "${WORKDIR}/${PN}.desktop-template" || die
-
-	# Install wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
-
-	# Update wrapper
-	sed -i \
-		-e "s:@PREFIX@:${EPREFIX}/usr:" \
-		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-		-e "s:@APULSELIB_DIR@:${apulselib}:" \
-		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-		"${ED}/usr/bin/${PN}" \
-		|| die
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! use gmp-autoupdate ; then
-		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
-		elog "installing into new profiles:"
-		local plugin
-		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
-			elog "\t ${plugin}"
-		done
-		elog
-	fi
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-	local show_normandy_information
-	local show_shortcut_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-		show_shortcut_information=no
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 91.0 ; then
-				# Tell user that we no longer install a shortcut
-				# per supported display protocol
-				show_shortcut_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-
-	if [[ -n "${show_shortcut_information}" ]] ; then
-		elog
-		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
-		elog "each supported display protocol.  Instead we will only install"
-		elog "one generic Mozilla ${PN^} shortcut."
-		elog "If you still want to be able to select between running Mozilla ${PN^}"
-		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
-	fi
-
-	# bug 835078
-	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
-		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
-		ewarn "enabled for Firefox. Nouveau / your GPU might not supported the "
-		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
-		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
-	fi
-
-	elog
-	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
-	elog "useragent checks. To temporarily fix this, enter about:config and modify "
-	elog "network.http.useragent.forceVersion preference to \"99\"."
-	elog "Or install an addon to change your useragent."
-	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
-	elog
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 933f0b88b054..3e4855fdfda8 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_102.0.5005.61-1_amd64.deb 84713828 BLAKE2B 3122652ac21b4149d4c9ed747da70492376ec41ae82560798639550f4b45529813879dafd1f3f790de3bec4e74045559bac3e32cdf70639c4ff9e54a7e377774 SHA512 fa6172b66dfe1595eb52bdce96de074aaa907be386dd78273c2809c8dd55005ff86831c48926b9098e5284eae71331ed97598c3625b7fd5fe32ad0b30b7177eb
-EBUILD google-chrome-beta-102.0.5005.61.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
+DIST google-chrome-beta_103.0.5060.24-1_amd64.deb 90195300 BLAKE2B b615b59e2f3289c669d952373861f9d84a807150b7115ed8e986b105103efb21693c4f967ad09d0e62ca5ed27fd91f5ff9c804e561545a5ecd627cd32bdae365 SHA512 c0f9a60dcb714202ffb43a7125fb8232050b6119a0d5dbddef7569b362b3aa6670a8d26716ceed8bbe2897b95dc672cac54887fb3e8dc9547825cb2310a8946a
+EBUILD google-chrome-beta-103.0.5060.24.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-beta/google-chrome-beta-102.0.5005.61.ebuild b/www-client/google-chrome-beta/google-chrome-beta-103.0.5060.24.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-102.0.5005.61.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-103.0.5060.24.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 7cdc1816d82b..e06c57141123 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_103.0.5060.24-1_amd64.deb 90221160 BLAKE2B bce8c24b0875537be834e6b732f45edaea859a4f51bd8d52d45c7fdfbebb992ec84193971de3df69d66590dee2a1aa6634394e93678a1621afcc571388da9381 SHA512 eeb2a9721607f1b54bb438a76fa6770b47656d92d45c508c5f83dd51ea03f32a726a9d4b37c8ad9ee7ffdd7db5613a53a302f2e2218a35efb5cf7560d877222e
-EBUILD google-chrome-unstable-103.0.5060.24.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
+DIST google-chrome-unstable_104.0.5083.0-1_amd64.deb 90753316 BLAKE2B 069faad1bad977aedf660e7ffdc0765ed1c6a40a984d7632dd8add80edcc242ab1af961158c5a3e04010325db8998ddc9d6cfae6e0d2ac2e4be53fb7ad1e82ad SHA512 b2d2a4a6e814e2beba2325dbb60e015d0e0f5a3eab13e12a26f4fc81db7c39716ce0f2ff76320deb529496a479c4ca68ab2c8db5cf893dd738027cf49f2ebade
+EBUILD google-chrome-unstable-104.0.5083.0.ebuild 2761 BLAKE2B 0c68c9fa06f1076a6c8830d09678ae60d1f3f8fe433f3a39d5ab4c095d6bd3cdd0dec71936db31b3b0d44c5276587b5299122a38e2e43961e5b6aff52fea9940 SHA512 657593a1bc0d7f3ad5225c2372e3f3587a7d34ce7c4933030de7b1c240188968f4fbdb5921437b759d052109f0c6db8f473578b0be9d374af0a22249dafbeb19
 MISC metadata.xml 437 BLAKE2B 35ab5a754d8e65db84e25b08c76bed923c2f9eb1b1d65687dda842313b5f339c90cbb3eb8fe12ecb58f201383955ad8f72a5b34484265194a3fcffcf760122ef SHA512 82e6057b085e849bc5484b53fef974022bb9db33836502e8d54fca3c8f54f47768f9b0ed4591d90a444e82142e727d4e4071236b114705f91c005f170b2a3986
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-103.0.5060.24.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-104.0.5083.0.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-103.0.5060.24.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-104.0.5083.0.ebuild
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 0753dacb8139..06b6a9d9c4bf 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,3 +1,5 @@
 DIST links-2.26.tar.bz2 6508447 BLAKE2B e0bf5ac4e05a8e14ae7342aed7bb7ac0f5f6c2d9e23adda221cc3ba73f39020c95cef90d10d5c9d0697797683ff1edf1ed55a4d8aca0930b2eb01b547a21bf00 SHA512 b732f88ae0e9f63f577fc3041058c56b43ffec3b797328453d0770e326010b05fcc04128287ef35b0d189bd0768446057d8773e10f8e0a76bab72fb252cdd530
+DIST links-2.27.tar.bz2 6510121 BLAKE2B c7326147c583ad380f1b528a216ecf056a40a2939b290d69061682aa9f397ab3eabb71691cb68efcd0739b67acbe1f38f95a8a347d5045efe671eacfd0e5c40a SHA512 8b46472184f2eab1aeca5de9b957a87f475f5acd9801260678b07475cf36afb1a9602e67ef39ad59da90d2d6cee235521db95d93349fd9bd6cee667eab2e5d32
 EBUILD links-2.26-r1.ebuild 3553 BLAKE2B 6fa2d82eb2fd7281a42517a713b8268a92dc9bd60f37f01924adee1b15711ebde2e3a1f1b1268b5cfc7a60bfc74e52488106e3e6db0110c98f2af9deac20ecdd SHA512 159d65284d005ff96758e30c66b079d2da8809f6d07ec4f88244b0c32a59c60c4172ea664220721db008d1b1d17375fc017f220d5f4828e1a68cb66c2fb60927
+EBUILD links-2.27.ebuild 3560 BLAKE2B 19a6720ac267ee91584f11ac17e8126de4a05224e5d1cdcfac4204a5121ba60a44ab299fdc67722a4eb3e311e72dfcf8577f053e616f0a0775105fb0539c0120 SHA512 9a53cbc43159c9d256ca194585d0a93bf9eea880c077e9a8fefa87deacb8134adbcb5fc190f8b2c492b2fcd744a0c290d7309fc7daf50db2d065f64e92b32cdf
 MISC metadata.xml 672 BLAKE2B 5d282c043806b3ce47853e39f6fdee47b4223f0f02eae009124e9e0d9aee81e3f3c4135d27f733b9468760848499233763cd798f74f4ad751e345a6c67e355bb SHA512 198f8bf38632bc4348f8c50f8655dc6575db217ee307dcc8674822bec94c2ee904d650c4ee56a233629165f7085cb1b71eb1267d68b782a67fc88497116fa85b
diff --git a/www-client/links/links-2.27.ebuild b/www-client/links/links-2.27.ebuild
new file mode 100644
index 000000000000..037b3c189417
--- /dev/null
+++ b/www-client/links/links-2.27.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent livecd lzip lzma ssl suid svga tiff unicode webp X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	dev-libs/libbsd
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		media-libs/libjpeg-turbo:=
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		media-libs/libjpeg-turbo:=
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		dev-libs/openssl:0=
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	webp? (
+		media-libs/libwebp:=
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+BDEPEND="virtual/pkgconfig"
+
+IDEPEND="X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	tc-export PKG_CONFIG
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with webp libwebp) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 2db6833fab0a..ab0ccd9ba501 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,8 +1,8 @@
-DIST opera-beta_87.0.4390.17_amd64.deb 85140936 BLAKE2B 6dadea52293c40ad678c554b7846851f0f210c447c268c8f10f02887edc908ba12b634098e11f2db310cc1a4418ee9d429ace944fb95eea7f51784e59a48d4d9 SHA512 46a8a52b73d36fd7a920124e0af6b98e04eb4884619a805c26cece4ffc57ab4428f3e9ed29ee75d76e226032fd6ccb584074eb2c855509f8858bfbbed06de4cc
 DIST opera-beta_87.0.4390.21_amd64.deb 85202928 BLAKE2B 5801bf935d1aa70ace4d10c4a29b23b11b666c3ef0be152b041cea9e4751832c2540f15afcc47e824be1d88df1946e12d13ad59cf920e0a5bdb2fb5b469496d2 SHA512 5055557bd9435f15e1f9661e33d175d37cab467c23f1d53dfc2053f2d00cf15dab610e743005fea99bbcb913e21e31b76e36ce936afb8161abf901f50b4ea623
 DIST opera-beta_88.0.4412.13_amd64.deb 84766736 BLAKE2B 4bc08f2d049b4f9ac06996458d512a85b4be643eae235fbcaec3028f90a962f53485a14ef087f0f5eadb3be1a8e620e6b00af8bc72ce8049108aacb17d4af815 SHA512 0691106a24f361eba8e38f170a4e903595b360315f16a84ecbd3518d8ae23cf821a2fa48497f3b105802b7418d69df350c2655d84e8d5ccc70fcc48eedb65203
+DIST opera-beta_88.0.4412.18_amd64.deb 84660352 BLAKE2B 00bca30e13c5d1a058afc27ba72e31b47a9afab0cecf13e375ec12f334467872cb5d6f44d6a2fe9eb3dc56c0a59f2d590be6cdc88adeba840dc83381baeb76ae SHA512 843e299dd65ce4cc80130968121b87d099a020856a3329b81e2eabf795ce8b2402147d138df76dd9577ec83fbb5f2b0d9de778f38993339497fec83a81cf3ba1
 DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
-EBUILD opera-beta-87.0.4390.17.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
 EBUILD opera-beta-87.0.4390.21.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
 EBUILD opera-beta-88.0.4412.13.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
+EBUILD opera-beta-88.0.4412.18.ebuild 3593 BLAKE2B da8be56b4172f761c079f04351208b3c2099c4c6ddf6dcbfb43ba4eeebad092cd15f810d6349fa239e0dd9f5d417438a7ac64c5d4b52b3c49ee05a6b3aa32d87 SHA512 4db5b67971d618764db4913c48d92be6efbd858fb07127fd54f12f28e9973ae7b0cf1a0f03002f2b50dc7b15509d081e5c9115cf2c88a9765f825c6f25ce4f84
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera-beta/opera-beta-87.0.4390.17.ebuild b/www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
similarity index 100%
rename from www-client/opera-beta/opera-beta-87.0.4390.17.ebuild
rename to www-client/opera-beta/opera-beta-88.0.4412.18.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index e81bb49bf2c8..26d8c2069d41 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -1,4 +1,4 @@
 DIST opera-ffmpeg-codecs-100.0.4896.20.tar.xz 1393360 BLAKE2B be608a42042b2713fff66716c171959609e06d94b6c56cd8081e05313915378eff25c7098228ff6727a430c9f02bd4e9c9dcce4e715f09e10ac62d89ccd6ae1c SHA512 7dab4a091ac3562cd9c09cf37bc70edf9000ad1b3d31f27278e2edc68b9f55fd4f821ebc90a761ae5803542195718015c859e107344b31a5f7f9ad6cf028df42
-DIST opera-stable_87.0.4390.25_amd64.deb 84922376 BLAKE2B 6c935be2749d2b8b4117594be6f1d404983691ad9eb3808f777ab8bcad9a227cf6f16aab328f767cfc481c948e58f5c86d653c97a2447954d761308f756c31d8 SHA512 21444fd242ddf738f88a62f2e178b0f2adaeda934d7ccc8137bee77921667c6f244d2a7efda73416fcdf80529c9014a36f1cb687ae4598ec8bce7611e1fab001
-EBUILD opera-87.0.4390.25.ebuild 3592 BLAKE2B 125c70df7b038b356bed9f7e194a703c319f45103a9962e49ac8cfcc79bd7a4f9a31fe3705bc5fbb35e5db47b2339f882c979a64cd2bb00a3582ca7aaae3ad46 SHA512 6a4b10ef0e16fa07e20b359123b5a1e3ed61244cbdb1b0c6ed3b1fc6eed4a6536ed05cbcb7263eda601c48b6f5e62a0d7ecdffa1a22d800e89089b02deb45a9a
+DIST opera-stable_87.0.4390.36_amd64.deb 84936088 BLAKE2B 9503e789e91fbdc54ec5edb6d395bb7c94b212f87668f3c9be50041d3909ceaabd64f64482e9393c30267af32c71d89b6d2bf81c69c67e322afa4924e47de4a0 SHA512 63f8ced96609eb712972039256ca4dc6e004276affa9b4e47042ad34cdb15f0fe653549d15dfaced3243ce5cf39a49d7aca94e309fc705b46bc88fbd35d178ab
+EBUILD opera-87.0.4390.36.ebuild 3592 BLAKE2B 125c70df7b038b356bed9f7e194a703c319f45103a9962e49ac8cfcc79bd7a4f9a31fe3705bc5fbb35e5db47b2339f882c979a64cd2bb00a3582ca7aaae3ad46 SHA512 6a4b10ef0e16fa07e20b359123b5a1e3ed61244cbdb1b0c6ed3b1fc6eed4a6536ed05cbcb7263eda601c48b6f5e62a0d7ecdffa1a22d800e89089b02deb45a9a
 MISC metadata.xml 380 BLAKE2B 6126e5c5d5f67d1bd7d4b6659fbc9f8f62ef105e737d2cc4e6c652f4c899df1b55ef2abe077e41aa2e4eb3d553a2652e38a583b3c7baac7a20318b69f766997f SHA512 cbe76a1630f13557a0aae1703436b19b0f9f7842c5604695d49255937c8304fff07ec20f26d408527ee672e2e9625ebc748bb7d3879d5fc77c06655c4b9b1816
diff --git a/www-client/opera/opera-87.0.4390.25.ebuild b/www-client/opera/opera-87.0.4390.36.ebuild
similarity index 100%
rename from www-client/opera/opera-87.0.4390.25.ebuild
rename to www-client/opera/opera-87.0.4390.36.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index e023ae8c98f5..6fd3d1053bd5 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,9 +1,5 @@
 DIST vivaldi-snapshot_5.3.2679.16-1_amd64.deb 88876716 BLAKE2B 77c7eb4a93c96f8a094a83a897c69bc3d05b87cb2c8d3e0e1c68d3961d0a7ded168d48a00786ad10dc4aa8912ea487648182721a9bf5573416c434286384713b SHA512 ba27299cf1bcd244ae7d7293556831f2e60d6d473fe842eaf2bde5645398e6ab4e8d1ec570292e35cfb896128c8614fe9d0e084d46ea060e9e7c168a9cb3ab55
 DIST vivaldi-snapshot_5.3.2679.16-1_arm64.deb 80648248 BLAKE2B 2f8b32c501acde38c7f726fc5842a509eaa8fe0e524a668cc37eca162043f177b7b8fdd7cd70760735bf7de579a63269271d101f3cff63e8d4c4adb7f17f3caa SHA512 c2df28cc3c08084917746db207323d3929edcb7045ce09daba6efbfbb5d9c193ef30ef9b050945fccab417f574f56f108962a730d1e20b2511be907d9e099865
 DIST vivaldi-snapshot_5.3.2679.16-1_armhf.deb 80307212 BLAKE2B 8572a1c4bb3111cbf67ed27d52d35e8f6f2ec335a568d5fa476dc70a44514fa50cfc9d413041547b921a91f9f1f99d19d33a209909cb144090a55c083d5bdf1a SHA512 4f10a0148699b8fea1780a53899b5efd5e20ac11584b3e61dfe6374f468482a8c9067c5a972bb2ad63a06aaac8387bf55bb63941577a4f077bee832df467684b
-DIST vivaldi-snapshot_5.3.2679.3-1_amd64.deb 88855108 BLAKE2B 8054051c32fd07e4ee160170a6761c3fb26efcd4a851ab21fdb4d7fc59c6b8284a8e8ea74cf4c98fac77b98162ae3f5b10a2311b85c3ca54a23a9f5472732d83 SHA512 c069192d254dee0a181d123bd0ddd976bebe78e7ce4d70e9525308477ea9d8300b84de98545ab847160f680c730ba257cab4681e990a4ca2b7dc5564b6f30cda
-DIST vivaldi-snapshot_5.3.2679.3-1_arm64.deb 80641012 BLAKE2B 8319e885e453a5cb25ef809e55536f032ee1e5af9d0d7b699e33b3579767264e2754059a3ead6b3fad651c19c541c8f0f2361358dbdcffc3067c5b1bd8bcd499 SHA512 70c17bedd257eb0c39116e9e9d3951c2585afb482d82a163ce1c16d96985576cc1489ce87ffa6fbade74889ad33d7cfa1e0c8921f0c2819923c99de7a9210889
-DIST vivaldi-snapshot_5.3.2679.3-1_armhf.deb 80299864 BLAKE2B 31282b15c203d86369ad806459f4f6d02dd546a63d0ee6957b946b62f896175467d08b8e599a9c95b18dc61b329af70efe0c9bb7c73f0b6c71fde7680151a8ac SHA512 54bb10cd4477f97cca4058e49b187fba2d47f8fd83bfc1bdd7527afe78d2e3664a9536c291c479874b284fe2128d5f18006efe878593f6c9111a14f8162fb773
-EBUILD vivaldi-snapshot-5.3.2679.16.ebuild 3611 BLAKE2B 7099f66c2c515126b57e88bb8d70d123ddb4c93b0677cf2bae22408fda060144f1d714fabd4e077342eb08e6e8353e58fffd2e60ebd8a61118883dc086eaefac SHA512 a84ef17ba8b9371075c15fce10d4064a56104202d1146971a4b3431d131cc1f8438dc77fd2526e5096a2548a3d8d5b9e52bbec591819b5b3d7ea56daaf35b3c0
-EBUILD vivaldi-snapshot-5.3.2679.3.ebuild 3611 BLAKE2B 7099f66c2c515126b57e88bb8d70d123ddb4c93b0677cf2bae22408fda060144f1d714fabd4e077342eb08e6e8353e58fffd2e60ebd8a61118883dc086eaefac SHA512 a84ef17ba8b9371075c15fce10d4064a56104202d1146971a4b3431d131cc1f8438dc77fd2526e5096a2548a3d8d5b9e52bbec591819b5b3d7ea56daaf35b3c0
+EBUILD vivaldi-snapshot-5.3.2679.16-r1.ebuild 3611 BLAKE2B d036836843f8e53d8f578756df54d36777f8fd5dbdd8b2ba0e9377e386f84a426c8384a600cd505a77529400b9b74ad2ceb5ec3bfd3095da84c0fbfe772287d2 SHA512 6130b8b6b50db57b32ffe169d0bc9b152343e6bd74ee2b26ff91c4419cc1d5fed07386cd2afedcd16833f4768c69d7d3a7d9fea9bcb6e048d3ce7a8eca4729dc
 MISC metadata.xml 485 BLAKE2B 2be960ebfbbc2eefeb14ad0e387c02d90fd29adf4dcc77db0413f3c89087cbffac1ce538279d33c9b901cb67ad437c981d230b8f0bed1e98ad60ad049865e716 SHA512 62feb46aa9afe538c9ccaf687ba199779a5ce9231530296db7dcf38149ad2097d0418a7a43dfc9fb4fcdf679cb1a9b66ac550bea2b8927bafaec8fefa9b0d8c8
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16-r1.ebuild
similarity index 99%
rename from www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16.ebuild
rename to www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16-r1.ebuild
index b696aa81a090..63af99839e3a 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-CHROMIUM_VERSION="100"
+CHROMIUM_VERSION="102"
 CHROMIUM_LANGS="
 	af
 	am
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.3.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.3.ebuild
deleted file mode 100644
index b696aa81a090..000000000000
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-5.3.2679.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CHROMIUM_VERSION="100"
-CHROMIUM_LANGS="
-	af
-	am
-	ar
-	bg
-	bn
-	ca
-	cs
-	da
-	de
-	de-CH
-	el
-	en-GB
-	en-US
-	eo
-	es
-	es-419
-	es-PE
-	et
-	fa
-	fi
-	fil
-	fr
-	fy
-	gd
-	gu
-	he
-	hi
-	hr
-	hu
-	id
-	io
-	it
-	ja
-	jbo
-	kab
-	kn
-	ko
-	ku
-	lt
-	lv
-	ml
-	mr
-	ms
-	nb
-	nl
-	nn
-	pl
-	pt-BR
-	pt-PT
-	ro
-	ru
-	sc
-	sk
-	sl
-	sr
-	sv
-	sw
-	ta
-	te
-	th
-	tr
-	uk
-	ur
-	vi
-	zh-CN
-	zh-TW
-"
-
-inherit chromium-2 desktop unpacker xdg
-
-VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
-VIVALDI_HOME="opt/${PN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-
-if [[ ${PV} = *_p* ]]; then
-	DEB_REV="${PV#*_p}"
-else
-	DEB_REV=1
-fi
-
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
-
-RE="\bamd64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" amd64? ( ${VIVALDI_BASE_URI}amd64.deb )"
-RE="\barm\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm? ( ${VIVALDI_BASE_URI}armhf.deb )"
-RE="\barm64\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" arm64? ( ${VIVALDI_BASE_URI}arm64.deb )"
-RE="\bx86\b"; [[ ${KEYWORDS} =~ ${RE} ]] && SRC_URI+=" x86? ( ${VIVALDI_BASE_URI}i386.deb )"
-
-LICENSE="Vivaldi"
-SLOT="0"
-IUSE="proprietary-codecs widevine"
-RESTRICT="bindist mirror"
-
-RDEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-accessibility/at-spi2-core:2
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa[gbm(+)]
-	net-print/cups
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/pango[X]
-	|| ( gui-libs/gtk:4 x11-libs/gtk+:3 )
-	proprietary-codecs? ( media-video/ffmpeg-chromium:${CHROMIUM_VERSION} )
-	widevine? ( www-plugins/chrome-binary-plugins )
-"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	# Rename docs directory to our needs.
-	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
-
-	# Decompress the docs.
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	# The appdata directory is deprecated.
-	mv usr/share/{appdata,metainfo}/ || die
-
-	# Remove cron job for updating from Debian repos.
-	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
-	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
-
-	# Remove scripts that will most likely break things.
-	rm -vf ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
-
-	pushd ${VIVALDI_HOME}/locales > /dev/null || die
-	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	if use proprietary-codecs; then
-		rm ${VIVALDI_HOME}/lib/libffmpeg.so || die
-		rmdir ${VIVALDI_HOME}/lib || die
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	mv */ "${D}" || die
-	dosym ../../${VIVALDI_HOME}/${PN} /usr/bin/${VIVALDI_PN}
-	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
-
-	local logo size
-	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
-		size=${logo##*_}
-		size=${size%.*}
-		newicon -s "${size}" "${logo}" ${PN}.png
-	done
-
-	if use proprietary-codecs; then
-		dosym ../../usr/$(get_libdir)/chromium/libffmpeg.so.${CHROMIUM_VERSION} \
-			  /${VIVALDI_HOME}/libffmpeg.so.$(ver_cut 1-2)
-	fi
-
-	if use widevine; then
-		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
-			  /${VIVALDI_HOME}/WidevineCdm
-	else
-		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
-	fi
-
-	case ${PN} in
-		vivaldi) dosym ${VIVALDI_PN} /usr/bin/${PN} ;;
-		vivaldi-snapshot) dosym ${PN} /${VIVALDI_HOME}/vivaldi ;;
-	esac
-}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 4675a68d4ddc..2b0986e2a72f 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index d926461ef63f..67985b1146f2 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_102.0.5005.61-1_amd64.deb 84713828 BLAKE2B 3122652ac21b4149d4c9ed747da70492376ec41ae82560798639550f4b45529813879dafd1f3f790de3bec4e74045559bac3e32cdf70639c4ff9e54a7e377774 SHA512 fa6172b66dfe1595eb52bdce96de074aaa907be386dd78273c2809c8dd55005ff86831c48926b9098e5284eae71331ed97598c3625b7fd5fe32ad0b30b7177eb
+DIST google-chrome-beta_103.0.5060.24-1_amd64.deb 90195300 BLAKE2B b615b59e2f3289c669d952373861f9d84a807150b7115ed8e986b105103efb21693c4f967ad09d0e62ca5ed27fd91f5ff9c804e561545a5ecd627cd32bdae365 SHA512 c0f9a60dcb714202ffb43a7125fb8232050b6119a0d5dbddef7569b362b3aa6670a8d26716ceed8bbe2897b95dc672cac54887fb3e8dc9547825cb2310a8946a
 DIST google-chrome-stable_102.0.5005.61-1_amd64.deb 84701968 BLAKE2B d5a1d0f7cbdfdddaec3ca4e41a63798ee1f9f28c71284e61ac1f0d3c6d5944ac4e6dddd8042608b81ea8243e4c3a90ec7e2fa216e15952d18b2f075d36305e84 SHA512 dd701b99febf7d927657f38716d90f3a0b967ae75dac5f6e8fbf9df632c8a531ccb9f37ee09340ad730b4fe40d0564c1b64201121d2d3e4e503f3f167ca632cd
-DIST google-chrome-unstable_103.0.5060.24-1_amd64.deb 90221160 BLAKE2B bce8c24b0875537be834e6b732f45edaea859a4f51bd8d52d45c7fdfbebb992ec84193971de3df69d66590dee2a1aa6634394e93678a1621afcc571388da9381 SHA512 eeb2a9721607f1b54bb438a76fa6770b47656d92d45c508c5f83dd51ea03f32a726a9d4b37c8ad9ee7ffdd7db5613a53a302f2e2218a35efb5cf7560d877222e
+DIST google-chrome-unstable_104.0.5083.0-1_amd64.deb 90753316 BLAKE2B 069faad1bad977aedf660e7ffdc0765ed1c6a40a984d7632dd8add80edcc242ab1af961158c5a3e04010325db8998ddc9d6cfae6e0d2ac2e4be53fb7ad1e82ad SHA512 b2d2a4a6e814e2beba2325dbb60e015d0e0f5a3eab13e12a26f4fc81db7c39716ce0f2ff76320deb529496a479c4ca68ab2c8db5cf893dd738027cf49f2ebade
 EBUILD chrome-binary-plugins-102.0.5005.61.ebuild 1178 BLAKE2B 7e2302efe34d64e47dc50e2030eca39e319040087a38f8ae74c1c6bdfb7caec7cf198c53d83b6134ada98292c79c55a3b19ab88ae74d34023310f921652fefdc SHA512 55691ac6f5b345ad9ba9b3d531f8612d9f062bb531057c95e719fca4f447cd872ad74c575251d31331b6176c3165dbf367f5a7711dd21623663093e056aa9411
-EBUILD chrome-binary-plugins-102.0.5005.61_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
-EBUILD chrome-binary-plugins-103.0.5060.24_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-103.0.5060.24_beta.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
+EBUILD chrome-binary-plugins-104.0.5083.0_alpha.ebuild 1179 BLAKE2B 072540ca9510f112844428ac1a26502625c41147bc1bdc716d571f25a595012f0ffd439915cf819de9f2147d1908448d2e47f15aefc1a628b0414ce872edc5ca SHA512 ad9f41198bc9cd2f4e02e58176fb7a5169eff66da4a502d516b787a728cc8fa0fb7531f4c3d746f5a50b174b804f34fdf493594ba461cd76a4d6fec089b7bae9
 MISC metadata.xml 263 BLAKE2B 63f20710af1b20f01824544c06058c4bef7c4b6e1b66a2bcd17c2dde8f48e6b30a074ec6c3940976d652bb8885a80495914a3ddf4de5766c04f5913780c85668 SHA512 85a03d35084d8d81e038c8065fe58a36f3dd1f5355aaf62033ba590636fa4855ee993ec5f3d10645a55754debddf0b57b4403172f3808e4575b3b2d8d7f180c0
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-102.0.5005.61_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-102.0.5005.61_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5083.0_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-103.0.5060.24_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-104.0.5083.0_alpha.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index d6e6fa3ad668..5272736947d1 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 32ddab95855c..cda5020966ec 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -11,8 +11,8 @@ DIST varnish-6.5.2.tgz 3464372 BLAKE2B 68a7bca159ed9539126f66d21450c87780b49b66a
 DIST varnish-6.6.1.tgz 3518308 BLAKE2B 6a88165394c0578427de20588ac2c17f502242bf94f30e9284f7bc2c271b77c3d6511a9dfb8d1cb6d75e1fc4563360fb0bec762aa17481fa598cb5e9d9527705 SHA512 af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
 DIST varnish-7.0.1.tgz 3712763 BLAKE2B ec47b557d8623e349032ac48459ea0c636a4b2810b4354666a651b652b65389abedafd0b665ca1e8178ea2b8339be8fd782dc61e1245f9307e00d665a3c20500 SHA512 7541d50b03a113f0a13660d459cc4c2eb45d57fb19380ab56a5413a4e5d702f9c0856585f09aeea6084a239ad8c69017af3805a864540b4697e0eac29f00b408
 DIST varnish-7.1.0.tgz 3787588 BLAKE2B 1a019b140c467063861460b529c253361975826cee797c304c7c096645c315b67ad20400467ecf11711abae5354134ac29a934793691283e12e3fbe29921943b SHA512 ad9ce0cdc759976fcb7044914d28863edd197167f583fab2d1bc57f4e5b86c224b7c948faf1f7364a2a16bde9c415375d011462bdc43026c5f7a60e65bd21f73
-EBUILD varnish-6.5.2.ebuild 2242 BLAKE2B 12642eb183c75f065bb97891e00642aaeb7f3ea2c05ef20af158a52ed75d14618f97b8a06fa2376aaa4040e315d08838cc153195f136d7f1ce0342868a5219d7 SHA512 5f004408695a3dabe3671f1c8cc69be8b79990ef2155f2ce7e2322fb4de8154ee47da6bcc16f8bb41d0c2fb89b1de9d21d781c948574d27106876e416926e634
-EBUILD varnish-6.6.1.ebuild 2378 BLAKE2B e9a1de09eb47db50bb33fdef696abe0f22bf9608a7e42f1ace47169ba51783953a83fb32d63d3ac9cc86f2e4176404aa6e5e224bf1b6a4b7852ad99c08aca6c2 SHA512 3de370dea3ef7746f39e38f11383261f4d3fd0eefa18ed33f463ba3a1da460256d3367da96be73d9ae5b55c935af23b2ff4f4318d6f612c0418a010df387894c
-EBUILD varnish-7.0.1.ebuild 2162 BLAKE2B dcbb241284b0f5974a3af310f9398fd33a4090397f2ccc7cb67b8c8d54518312c5b063318302a321bd33f05ca1e7fb334c3b6f5a82d831b09f7af71a2537162b SHA512 330aac9d0e3d549d5d0cd19e97f0d39ca8a6e5b54f740ec0b108aef1038493eb793fe78c4b28085b5331eefc4c67aa135cd113161033dedab00c786a04c1c51e
-EBUILD varnish-7.1.0.ebuild 2162 BLAKE2B dcbb241284b0f5974a3af310f9398fd33a4090397f2ccc7cb67b8c8d54518312c5b063318302a321bd33f05ca1e7fb334c3b6f5a82d831b09f7af71a2537162b SHA512 330aac9d0e3d549d5d0cd19e97f0d39ca8a6e5b54f740ec0b108aef1038493eb793fe78c4b28085b5331eefc4c67aa135cd113161033dedab00c786a04c1c51e
+EBUILD varnish-6.5.2.ebuild 2243 BLAKE2B 2b1e7f9685f8a6a186db6d6df4a6ed15b9b343e65c14cc9afec774bc1c9ae424dc205e17c0de64f5c2a5a285b353049eec0bb044ca28b11f6acaf008296c9409 SHA512 26f158e94c4d3567c6ffe85f6e20694a9711d6a6a456413727290ee0aaf1ca0ce2b6f610bd19a2ba32cff8543f03342f0bb5c9bed5360fc7b6cf7636732afc3c
+EBUILD varnish-6.6.1.ebuild 2379 BLAKE2B ce581f92c3be51eb6d032daa06fb1a84dcdc523efd0726ae26e876445fad09cefb51a78c627f8900c8de03bdbfe1c7ead4189bae02be425958851069d43ba8a2 SHA512 4dd59ccac111c157db93bc648ad67a0bd4b67693aac1fc18772cf08a0ef22f03d3a70b3a8c19f6c187f3e2f4329faf08c7a03cc0cb00f7e755b7f60d8d0f2514
+EBUILD varnish-7.0.1.ebuild 2163 BLAKE2B bd669e328fad668363b83365a014c9b6a16de61feec9571c82ab7cd188ab3bc7c8da3ef0c2c81c615ee415ee0da0db5675d4ad34e1724d437a51074ca252a7d5 SHA512 cd58c3d8d3c987f1ecb3742aa4aa8f9d73e353b640431ffe5ef627547a5f4018f7385fb4fb3ad07a5f57c61da7682ecf49438d4501c40a6091ba5a9b77f125c7
+EBUILD varnish-7.1.0.ebuild 2163 BLAKE2B bd669e328fad668363b83365a014c9b6a16de61feec9571c82ab7cd188ab3bc7c8da3ef0c2c81c615ee415ee0da0db5675d4ad34e1724d437a51074ca252a7d5 SHA512 cd58c3d8d3c987f1ecb3742aa4aa8f9d73e353b640431ffe5ef627547a5f4018f7385fb4fb3ad07a5f57c61da7682ecf49438d4501c40a6091ba5a9b77f125c7
 MISC metadata.xml 1155 BLAKE2B 84875f3204cf314d1cb22e323ae8edb4e439e11d165c019bdf959925236ee4df671a9dbfd5a98d4c8841f8ec19cf8e602b703052d9a864d7e3c652ffe40054f0 SHA512 34bad8011b4530abc02f35b1bacb3d632ea5d57da41162a246d5601d766f192448efb31445536e02485fa195ab5f5eb564b4a1886632d0fd32626184d1173db7
diff --git a/www-servers/varnish/varnish-6.5.2.ebuild b/www-servers/varnish/varnish-6.5.2.ebuild
index 42bef71981c5..159da1164758 100644
--- a/www-servers/varnish/varnish-6.5.2.ebuild
+++ b/www-servers/varnish/varnish-6.5.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-6.6.1.ebuild b/www-servers/varnish/varnish-6.6.1.ebuild
index 5f1c242c2b34..490d4d852608 100644
--- a/www-servers/varnish/varnish-6.6.1.ebuild
+++ b/www-servers/varnish/varnish-6.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-7.0.1.ebuild b/www-servers/varnish/varnish-7.0.1.ebuild
index 9043508fdaf4..853efe7b4987 100644
--- a/www-servers/varnish/varnish-7.0.1.ebuild
+++ b/www-servers/varnish/varnish-7.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit autotools systemd python-r1
 
diff --git a/www-servers/varnish/varnish-7.1.0.ebuild b/www-servers/varnish/varnish-7.1.0.ebuild
index 9043508fdaf4..853efe7b4987 100644
--- a/www-servers/varnish/varnish-7.1.0.ebuild
+++ b/www-servers/varnish/varnish-7.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="8"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{9..10} )
 
 inherit autotools systemd python-r1
 
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 5131ee02d96c..51625ac08b61 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 6b17dfed3684..2820ca2d7602 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,5 +1,3 @@
-DIST appres-1.0.5.tar.bz2 124531 BLAKE2B 0d3e497afb3ab7d3565451c0da6594b4e608fa20e1a225162c4347d672db6a94823b5961c112b414e55c86a6b53a684709ddd109991f0545b6897bf276824da8 SHA512 70825563cd80f0f433c48ab2fdae888072939c1b22fb22340b70b9444c97916275ed92c9e5bf9a06bb76c32a5371b89ff7c0211a9a47a227c88311078c2c4137
 DIST appres-1.0.6.tar.xz 118972 BLAKE2B 13e72b26ea51c937e988929626810421f705b7142b3379488b50989114748f5fb2a0d515978dc92c0d0634afdd2fbda1ee4e8f09a1637fc0e70320492d5a61fc SHA512 6d14f6a2ad5c83a4d42d4c51ec9a9f32652dfe7624881f1f41c0b1f4946904e7e5ca81a2fd9f4f4824488ce1bd2a4047f92320626bf33b0f1afc5e6b89d3e2b9
-EBUILD appres-1.0.5-r1.ebuild 413 BLAKE2B 9b97da7ba66d12edb008acc06bf6694c0584f066f0472e2e7c12b731b84b4c71c4f5d66d73edc3eeffb4cb45ee24abf3f8cea19a223bbcf641c52226db2db570 SHA512 9cb2203bbaf0090028f58115d73b9be7653f678c7e83667fc79434da6d38e7fe08c89b9e674b3256e52dfc4e76be02232a7b0caf56e0fa474e056f9bdceb2cb6
-EBUILD appres-1.0.6.ebuild 439 BLAKE2B ddbefdbd51479d533e870a5f52accec59d2561ca0796c11ab6705456cb42b5b65f7f398726b0d9b58cd0399cbeb66b661d40b7c34afaaf2c8aaabb1a56069c4e SHA512 989fe16327040383cbb15d1b0733fa40f5d8928cf1607fd69f45e7267f80d85707ad5d5dc35fbb471b3647e018e0f369670f428c59d2acce0456fec0161c8ad4
+EBUILD appres-1.0.6.ebuild 438 BLAKE2B fa148ab9bb1fd86dbeb48101776862f2ad029634ab5d018ee1ce19ab7989f7ea3650b3bc4d42adfb7d37b8251da7dcc8a7fc37bb0a589df684b1ddc76638fe8c SHA512 e8bd8016ac885f35a01d694bf244234ba67f244f6aa294d7fe308389c098df83810813e68bb1a9702200693502ea97f7df99f6fddd32d55e6176c7d6913f77dc
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/appres/appres-1.0.5-r1.ebuild b/x11-apps/appres/appres-1.0.5-r1.ebuild
deleted file mode 100644
index 8ecda295a8ba..000000000000
--- a/x11-apps/appres/appres-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/appres/appres-1.0.6.ebuild b/x11-apps/appres/appres-1.0.6.ebuild
index c6c244be46e5..c6880bfd61ad 100644
--- a/x11-apps/appres/appres-1.0.6.ebuild
+++ b/x11-apps/appres/appres-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="list X application resource database"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index a07811851837..c4696ca17dd3 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,5 +1,3 @@
-DIST bitmap-1.0.9.tar.bz2 181401 BLAKE2B efdf2d2905f6513ba8942d55a1aadca8f47f22736a55894deb9a4afeff132d8e410b8d84d27314253f16cb84ebb530b79c75991427365c45058e58280ede4449 SHA512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456
 DIST bitmap-1.1.0.tar.xz 163560 BLAKE2B 411ae6d34059cef35456d7a12fbd2fba6de65d0ad551ea884463f123c0e034e89142f103793a1aa6602649b468e4d9ffc33450a67b592b9355c5878c712a4654 SHA512 3d6c94675f10772daeb71598c3e0ddcb51569b1bfc4771159e9df89599bfeb8bf49f464c24fef54d30a8f737af32136f859f844be03e088d24ed962f88381193
-EBUILD bitmap-1.0.9-r1.ebuild 392 BLAKE2B c73391d4c7f2b71c23625ca0c57a49ada0cb637b7e918fec538550927e122c193b44724b18f8cd5ecad3c70c4beeb03eb186a1ffd500c5366496fe820809821c SHA512 17623ce53d17673024f911a7fbbc65319ea23d76f93ae3cc525f66ed260eb0d6b443730999d975922ae9ad3240ec03a2c1753251bf7b5cf2ab3b5e0de9c42050
-EBUILD bitmap-1.1.0.ebuild 416 BLAKE2B 3596deb878081fcae6bca5452c0a719a3e8e6cde366703e633bff0cc2c36435e157891c4dc1dc9aeb9c9f26f9194116384199cd0d49b8973ee458efb1a73174f SHA512 6de1134e054e87c8a9a1b3cab4daa38cf2868dda36ab13118ce42c185446188ce8bd43cc4e28fe4a6e70e2cb559e9897a402ff1d00f97bca6e627c4188361d82
+EBUILD bitmap-1.1.0.ebuild 415 BLAKE2B 69c84fb8d6cb07093ee6c55ac3fdafd9222f1872e86561f31d3efad5b64173f7ccb1995d966e1889bb6211610e5fe8059fb7297e12b1b634ccf0d5db8135823e SHA512 13e64e90798e0ac07ddf82e8469f9697251460a98cff77c6bb0de641064143d4772f775256382cd0b004d45be103b7012d1801ac17217eebc04f6ec761663c2e
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild b/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
deleted file mode 100644
index 9b386559ea7a..000000000000
--- a/x11-apps/bitmap/bitmap-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-misc/xbitmaps"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/bitmap/bitmap-1.1.0.ebuild b/x11-apps/bitmap/bitmap-1.1.0.ebuild
index be77e8f6ef79..2ba774723936 100644
--- a/x11-apps/bitmap/bitmap-1.1.0.ebuild
+++ b/x11-apps/bitmap/bitmap-1.1.0.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX=xz
 inherit xorg-3
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 257e93896cf5..cc04a1d8267e 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,5 +1,3 @@
-DIST editres-1.0.7.tar.bz2 166429 BLAKE2B abaa0764bfc3419e17d5cd222bbe20f5591f7bc8431444aa6739cdc067cfb81f606370df19562410aa54820a0249828ccc9d506a9607031b453a7993af634f60 SHA512 b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32
 DIST editres-1.0.8.tar.xz 158476 BLAKE2B d0b2ef786e68ed6cf37e06bc776f6d6a104a2da2f68dbe27457e31a11d642d3946cd86667bd3ca2ae952c4fcc7162b86a69064a7dcd00ed16bb3e1f1c29e3e54 SHA512 9a007ed7a02abf61af8b65a163a7289a1e960db390db401bdfad162aa642e0eb887ecf85be14093efd8567c68f5e01450bb8321403a203a00065fa21985c7922
-EBUILD editres-1.0.7.ebuild 355 BLAKE2B f6b8b0784e0402937766ef7e53200c17f47de72b2b7e526e351b824dd28db82a9aa63bb0c9fa05341cd8a945c25bc0d5c08d75fdab6ee253be9d479f11196c1f SHA512 aa885b00e061253d9a14efb22ecbfde541756b8c4848acc997c4b89c0a36b156bf1ec91bc08e456049887d14621cfca918b33916f9452beae14a0d7b16290abd
-EBUILD editres-1.0.8.ebuild 402 BLAKE2B bc8bcb6d3f9f278aae98b290f09dbde2e64ac99f6c9e85a60d54ec4224a250ecd0be27af45635f5257eb4ddc0e8f653ea0c4c17007a707c37918cf93e2ac0930 SHA512 879766d368a807e98f8c3df5505e75c811f8464ab790763a28dd85719ba8ad75f9b3811033a08cfe93d45a4db2cb3d512754e9cb3944fb71b2219c2c2c15af13
+EBUILD editres-1.0.8.ebuild 401 BLAKE2B 7bf015239308fd681173031d09935f16dbfb46e1655aae6381321567aa5e3ea04d1c854ee944c72a5a84dfa60d1039a5734ef8dcb953e7ef7c21fa9bf2269e1f SHA512 30abec4f0a835fb1668f500ee8587828714e9c6811f316016e5d1dd024db72aa0312907d0b6d496264197421adb28ac76a856f4975475bd30dbb890290e77ec5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/editres/editres-1.0.7.ebuild b/x11-apps/editres/editres-1.0.7.ebuild
deleted file mode 100644
index 3d918065d7f9..000000000000
--- a/x11-apps/editres/editres-1.0.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="a dynamic resource editor for X Toolkit applications"
-
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/editres-1.0.8.ebuild b/x11-apps/editres/editres-1.0.8.ebuild
index 65edeb123485..d42db008450f 100644
--- a/x11-apps/editres/editres-1.0.8.ebuild
+++ b/x11-apps/editres/editres-1.0.8.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="a dynamic resource editor for X Toolkit applications"
 
-KEYWORDS="amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index cbf0808af8b8..9c7fe4594e22 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,5 +1,3 @@
-DIST iceauth-1.0.8.tar.bz2 137905 BLAKE2B 8fb2e29e5f4fee57e5c1f86eb78ce518519f04301e8aa81778e0de6589f62f32478a7cae05db831177f4425eb388f7b666f697314d5ab967ea3e2b6ac7b47d56 SHA512 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
 DIST iceauth-1.0.9.tar.xz 130724 BLAKE2B 39848a28a289f38b43184bc579d8263509dc71bf78ed0a0282e8c22a9f5f468606308ca7785481ce7ff1b683d7854b15cbbadc6ff7c9d0c4d9ff4beef9598211 SHA512 16b2f58008587cf1544037ca8b1c76dbb75eb043b3048b3064e66ba6b147962233f1453c2cf18bfb136dd6dd21d3e27b5219e17e1ab7b81dbe93fb6aff801a72
-EBUILD iceauth-1.0.8-r1.ebuild 403 BLAKE2B 677bf97945d3263c31c94f9a31e19c07221557186b8971f41a18f9ad1b153326bb478160e4db4de979655b78c6bdefef8b08101b7eeeb58ed8ea20a4a37ade1f SHA512 5d78923f8be6b93eaa6c9a04b3ec16bda340c10eec32ce7033bfe5e6a3b612f28fd5c30e71e3465060d27cce0f61bf5b6f3a7c15f145ac225d8116d2544889ae
-EBUILD iceauth-1.0.9.ebuild 436 BLAKE2B 5f8f1226a0aa34b35a853b4f68084f916fac7c4d2519767ff4a6f0b0bb903aa673ca88feaa36c5c4fee861c7a7e8cc0686d6c24ba2504ad8de7a0fffc43541bc SHA512 e941c3be041925f3a62e8a8d6a4883f7d89fcfc8f6fe9a85d978ac021d955693a48c4929058a56c39db5eed6ece8c9e6c89adc788713f0d46a1148f4a0a8401f
+EBUILD iceauth-1.0.9.ebuild 435 BLAKE2B ea8b492c1379e4b4d70602eb3c1eb7a1ce0cce8ce55cde7c3cc55cca5793e6595582b3db8ead9ae97ac5ab79d21585d368e01c252f7db75b632837df6fd584d6 SHA512 6a5b15846f4e4b4e6cbb135dcc9652f3e2485f3ae049739f1c47a465bea0bf533554e0d24d0261ca46b2f879f97c0c625b7ad4f8692b0f115cf23b5d815c9d63
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild b/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
deleted file mode 100644
index db01a5f7392a..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="ICE authority file utility"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="x11-libs/libICE"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/iceauth/iceauth-1.0.9.ebuild b/x11-apps/iceauth/iceauth-1.0.9.ebuild
index 4511c937f71d..4927c97ed480 100644
--- a/x11-apps/iceauth/iceauth-1.0.9.ebuild
+++ b/x11-apps/iceauth/iceauth-1.0.9.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="ICE authority file utility"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 22981bf5023c..13764e90af74 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,5 +1,3 @@
-DIST listres-1.0.4.tar.bz2 125472 BLAKE2B 99865e682eb2894b7af1a84a6fd29bf16f0345b8660bbb61060dbb7927bf376591c7403356b97cff13ff3392321d52f34388f49fd2aac6dab52592317818010c SHA512 925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a
 DIST listres-1.0.5.tar.xz 119596 BLAKE2B 849b41415eaf7d5251d8fb1cee061e8272e8abd4df986b28737d0a215953be692fe3b0c008a0bf7c831c5c6664ab1402c5034b2685cd3d799bae77a0296b0f8e SHA512 caa3626773031fbf6d8bcc1f697afe6add64fe4a8d1d766c42d5c2346050869dd23a26a1718411134ab05c75835facf0786cab5595721a16df423cdc54dd813d
-EBUILD listres-1.0.4.ebuild 332 BLAKE2B a2746bb241e17a6fd1ab82157b97db3f849944f86f8773d05e3953d193b8edb6d6c8ceae7b51cdfc7c5cbf05be8ae8426a38980fec90ed6f2c3b6f08e8fe52c6 SHA512 c5ef9cc66fa2628c9c07556e6b3ca52e777e2deb0797669809e455796964c9192d26ae135aeb25df21ea962578578755add27b6d5a8687f516efeba26f833354
-EBUILD listres-1.0.5.ebuild 372 BLAKE2B 607ed6e7ed1bf81f78749d481d20a828d26c775811cbb95b60b43ef01cc38568071f37cca880ee5f6fcefd32dfba3d7065af9ca19ce7cb9c4c08057dbfdf490b SHA512 73d0215e777abd0488fe9710bc8becb852dde6f3aca7fe0dfa4437aa38dde61187959e18ed1e159ca10594f32f44ce22b8e587dd7c9ed02469da290d7a7065ee
+EBUILD listres-1.0.5.ebuild 371 BLAKE2B 829bd7e06c2f9bf7875b50f3bec21686df179004fef9dd934963af03e3f4405b0bf20fe2603d4330ae1763911f6079a6296886c1841dea8d34cc5bda405583cc SHA512 14543c8990bdf548f291348d7d5eb4869e50b0acf55dfaec72140d1054809f5d1ddabbea85e6fceed532ae990969219c7f5e78d6e7b9045b02b5aabc2d139d12
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/listres/listres-1.0.4.ebuild b/x11-apps/listres/listres-1.0.4.ebuild
deleted file mode 100644
index 892b157132fc..000000000000
--- a/x11-apps/listres/listres-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/listres/listres-1.0.5.ebuild b/x11-apps/listres/listres-1.0.5.ebuild
index 0f3e0666e373..e464f772e14e 100644
--- a/x11-apps/listres/listres-1.0.5.ebuild
+++ b/x11-apps/listres/listres-1.0.5.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="list resources in widgets"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index cb3d3d5773a7..6ba34a6d5a4c 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,5 +1,8 @@
+AUX 8.5.0-Disable-things-we-don-t-want.patch 5868 BLAKE2B ed8b2e78ce7e05076a74f7ec415afa315db6d6e197936f03a2cb2a322d9ea33e2cdbb15431cc67d26c40ae07045d941fcad357a61eee56e1c26b6b21d1ad0e59 SHA512 8546b12244339fecbf49ce6d1e32701eefaf915d482adecc58c1190cdcf9a918ea7a135988381173c4742bb3b1ba78fcb96285ce6056744f0ed0cb4395855945
 AUX mesa-progs-8.4.0-improve-printing.patch 11963 BLAKE2B ad2dd57bf0959da6253d0e5c19523e701d03b9d4465564ff3f7e1462e2f36db0ef6eca46ad847f8f92f44fb91c46e87425d430c47c13f7efc130540071fa3ac8 SHA512 31048947ba19b03277d5dabff8bf3209274e9c95da3b33d9e27c3c1cdf71c3027cc0591ee27bdc0e8dff506da2f0601911cdf5899594674d2dd178204db3085f
 DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4 SHA512 b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957
+DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
 EBUILD mesa-progs-8.4.0-r1.ebuild 1913 BLAKE2B 835635568c965741f3ad48e4921011ac4aabd0b5032a05ee7e53894942dccac78f9bdb5767b9ce09182b0f7819899f4163c55b6d91b1a69c15d2bdb700462584 SHA512 0bba7f77b310f3a0511acb711aeec47b69ffe29b35bc35e374dc918247820121ba17dd2bc3d7ede88cc2cb0c744a653284aa9e3d0a691157326a46b8ba051aa7
-EBUILD mesa-progs-9999.ebuild 1876 BLAKE2B a9072b8eb308a99945813384d671f87f06a2d61dc6bf0795fb8c54230856bab5ca545a454fdb16334c0fe19a9e5c4b3ce0dfce225d256bb23588d9328d55bacc SHA512 92a4f6e7e976c0a99ad1870a44659c2aff9f20bdf70d48dded22bf2b28343814d11fbd60cfbfae95c651bfdd1dc2f07cd4d6da517aba90fb97e74a2c3ab15500
+EBUILD mesa-progs-8.5.0.ebuild 1803 BLAKE2B c543e47eed51edabec98ce14490901003738fc853a8ef83d85023cf3e95b76ff698cae0b677b271f8a47ac3ed1aaced2bb33d887d87ee3a3cd5907bfbf703d91 SHA512 a48d3c9a8ee6b0efab638120b447df5b35eae83336c132347fa1439a1fd0a1fab2e7914a112809b83ad83f7b867a11ddb0a4bb51fe067d71e93a65d170b0531d
+EBUILD mesa-progs-9999.ebuild 1803 BLAKE2B c543e47eed51edabec98ce14490901003738fc853a8ef83d85023cf3e95b76ff698cae0b677b271f8a47ac3ed1aaced2bb33d887d87ee3a3cd5907bfbf703d91 SHA512 a48d3c9a8ee6b0efab638120b447df5b35eae83336c132347fa1439a1fd0a1fab2e7914a112809b83ad83f7b867a11ddb0a4bb51fe067d71e93a65d170b0531d
 MISC metadata.xml 476 BLAKE2B 2f40a2161f77a5ac55a486f6570c4fca5b85f6c28189f22c8e8a373ffb0fe69329a83babb777a53d4f73c87e3ae1ba54cd3e0fcac25b62ce19e55505ce6d602d SHA512 f6c0f2910974cfb42cf748287bed94281cc7753c2632dd4fa4dc6baa0c261d1c408f792c259c4d66251a6449698aa9dcae8690b9f5aea687f73868571d9a48a6
diff --git a/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
new file mode 100644
index 000000000000..666f568e461f
--- /dev/null
+++ b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 30 May 2022 12:16:24 -0400
+Subject: [PATCH] Disable things we don't want
+
+---
+ meson.build                   | 11 +++--------
+ src/egl/opengl/meson.build    | 29 ----------------------------
+ src/egl/opengles2/meson.build |  5 -----
+ src/glad/meson.build          | 17 -----------------
+ src/meson.build               |  2 --
+ src/util/gl_wrap.h            |  2 --
+ src/util/meson.build          | 20 -------------------
+ src/xdemos/meson.build        | 36 -----------------------------------
+ 8 files changed, 3 insertions(+), 119 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e1968fab..9d59c1ec 100644
+--- a/meson.build
++++ b/meson.build
+@@ -75,14 +75,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : dep_x11.found())
+-if not dep_glu.found()
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-    _glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-endif
++dep_glu = disabler()
+ 
+ # GBM is needed for EGL on KMS
+ dep_gbm = dependency('gbm', required : false, disabler : true)
+@@ -117,6 +110,8 @@ else
+   )
+ endif
+ 
++dep_glut = disabler()
++
+ if dep_glut.found() and cc.has_function('glutInitContextProfile',
+                                         include_directories: glut_incdir,
+                                         prefix : '#include <GL/freeglut.h>')
+diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
+index ba7cadc3..789b25a5 100644
+--- a/src/egl/opengl/meson.build
++++ b/src/egl/opengl/meson.build
+@@ -4,41 +4,12 @@ executable(
+   'eglgears_x11', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_x11]
+ )
+-executable(
+-  'egltri_x11', files('egltri.c'),
+-  dependencies: [_deps, idep_eglut_x11]
+-)
+-executable(
+-  'xeglgears', files('xeglgears.c'),
+-  dependencies: [_deps, dep_egl, dep_x11]
+-)
+-executable(
+-  'xeglthreads', files('xeglthreads.c'),
+-  dependencies: [_deps, dep_x11]
+-)
+-
+ executable(
+   'eglgears_wayland', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_wayland]
+ )
+-executable(
+-  'egltri_wayland', files('egltri.c'),
+-  dependencies: [_deps, idep_eglut_wayland]
+-)
+-
+-executable(
+-  'eglkms', 'eglkms.c',
+-  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-)
+-
+ executable(
+   'eglinfo', 'eglinfo.c',
+   dependencies: [dep_egl],
+   install: true
+ )
+-
+-executable(
+-  'peglgears', 'peglgears.c',
+-  dependencies: [dep_gl, dep_egl, dep_m, idep_util]
+-)
+-
+diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
+index 59f69ed7..7137a961 100644
+--- a/src/egl/opengles2/meson.build
++++ b/src/egl/opengles2/meson.build
+@@ -9,11 +9,6 @@ executable(
+   dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+   install: true
+ )
+-executable(
+-  'es2tri', files('es2tri.c'),
+-  dependencies: [_deps_x11, dep_m],
+-  install: true
+-)
+ executable(
+   'es2gears_wayland', files('es2gears.c'),
+   dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
+diff --git a/src/glad/meson.build b/src/glad/meson.build
+index 2d107609..23dacd45 100644
+--- a/src/glad/meson.build
++++ b/src/glad/meson.build
+@@ -19,20 +19,3 @@
+ # SOFTWARE.
+ 
+ inc_glad = include_directories('include')
+-
+-_libglad_files = files('src/glad.c')
+-if host_machine.system() == 'windows'
+-  _libglad_files += files('src/glad_wgl.c')
+-endif
+-
+-_libglad = static_library(
+-  'glad',
+-  _libglad_files,
+-  include_directories: inc_glad
+-)
+-
+-idep_glad = declare_dependency(
+-  link_with: _libglad,
+-  dependencies: dep_dl,
+-  include_directories: inc_glad,
+-)
+diff --git a/src/meson.build b/src/meson.build
+index 39cac78d..4d4abbf8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,5 +55,3 @@ endif
+ if host_machine.system() == 'windows'
+   subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+ 
+ #ifdef __APPLE__
+ #  include <OpenGL/gl.h>
+-#  include <OpenGL/glu.h>
+ #else
+ #  include <GL/gl.h>
+-#  include <GL/glu.h>
+ #endif
+ 
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 9168aecf..066073cc 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -20,26 +20,6 @@
+ 
+ inc_util = include_directories('.')
+ 
+-files_libutil = files(
+-  'readtex.c',
+-  'showbuffer.c',
+-  'trackball.c',
+-)
+-
+-_deps = []
+-if dep_glut.found()
+-  files_libutil += files('shaderutil.c')
+-  _deps += dep_glut
+-endif
+-
+-_libutil = static_library(
+-  'util',
+-  files_libutil,
+-  include_directories: inc_glad,
+-  dependencies: _deps,
+-)
+-
+ idep_util = declare_dependency(
+-  link_with: _libutil,
+   include_directories: inc_util,
+ )
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index d6d5d5d5..ce26699f 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_x11, dep_m]
+ 
+ progs = [
+-  'glsync',
+-  'glxdemo',
+   'glxgears',
+-  'glxgears_pixmap',
+-  'glxcontexts',
+-  'glxheads',
+-  'glxpixmap',
+-  'glxpbdemo',
+-  'glxsnoop',
+-  'glxswapcontrol',
+-  'manywin',
+-  'multictx',
+-  'offset',
+-  'overlay',
+-  'shape',
+-  'sharedtex',
+-  'texture_from_pixmap',
+-  'wincopy',
+-  'xfont',
+ ]
+ foreach p : progs
+   executable(
+@@ -56,23 +38,7 @@ executable(
+   install: true
+ )
+ 
+-executable(
+-  'xrotfontdemo',
+-  files('xrotfontdemo.c', 'xuserotfont.c'),
+-  dependencies: glx_deps,
+-  install: true
+-)
+-
+-_libpbutil = static_library(
+-  'pbutil',
+-  files('pbutil.c'),
+-  dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+-  'glxgears_fbconfig',
+-  'pbinfo',
+-  'pbdemo',
+ ]
+ foreach p : pbutil_progs
+   executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+ 
+ thread_progs = [
+-  'glthreads',
+-  'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+   executable(
+-- 
+2.35.1
+
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
new file mode 100644
index 000000000000..0de99d7b802b
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+else
+	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
+		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="gles2 wayland X"
+
+RDEPEND="
+	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
+
+PATCHES=(
+	"${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
+)
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/eglinfo
+	)
+
+	use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/glxgears
+		/usr/bin/glxinfo
+	)
+
+	use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2_info
+		/usr/bin/es2gears_x11
+	)
+
+	use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2gears_wayland
+	)
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dlibdrm=disabled
+		-Degl=enabled
+		-Dgles1=disabled
+		$(meson_feature gles2)
+		-Dosmesa=disabled
+		$(meson_feature wayland)
+		$(meson_feature X x11)
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index ac2f9b7db41f..0de99d7b802b 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit meson-multilib
 
 MY_PN="${PN/progs/demos}"
 MY_P="${MY_PN}-${PV}"
@@ -9,10 +11,8 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
 HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
 if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
-	EGIT_CHECKOUT_DIR="${S}"
-	EXPERIMENTAL="true"
 else
 	SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
 		https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
@@ -21,49 +21,58 @@ else
 fi
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="egl gles2"
+IUSE="gles2 wayland X"
 
 RDEPEND="
-	media-libs/mesa[egl(+)?,gles2?]
-	virtual/opengl
-	x11-libs/libX11"
+	media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}
-	virtual/glu
-	x11-base/xorg-proto"
-BDEPEND="sys-apps/grep
-	sys-apps/file"
+	wayland? ( >=dev-libs/wayland-protocols-1.12 )
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	virtual/pkgconfig
+	wayland? ( dev-util/wayland-scanner )
+"
 
-src_prepare() {
-	default
-	[[ ${PV} = 9999* ]] && eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
+)
 
-src_compile() {
-	emake -C src/glad libglad.la
-	emake -C src/xdemos glxgears glxinfo
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/eglinfo
+	)
 
-	if use egl; then
-		emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
-		emake -C src/egl/eglut/ libeglut_x11.la
-		emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+	use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/glxgears
+		/usr/bin/glxinfo
+	)
 
-		if use gles2; then
-			emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
-			emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
-		fi
-	fi
-}
+	use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2_info
+		/usr/bin/es2gears_x11
+	)
 
-src_install() {
-	local demo='src/xdemos'
-	if use egl; then
-		demo="${demo} src/egl/opengl"
-
-		use gles2 && demo="${demo} src/egl/opengles2"
-	fi
+	use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/es2gears_wayland
+	)
+}
 
-	# Ensure only the binaries are installed and not a similarly named wrapper script
-	find ${demo} -type f -print0 |
-		xargs -0 file | grep executable | grep ELF | cut -f 1 -d : |
-		xargs -I '{}' dobin '{}' || die
+multilib_src_configure() {
+	local emesonargs=(
+		-Dlibdrm=disabled
+		-Degl=enabled
+		-Dgles1=disabled
+		$(meson_feature gles2)
+		-Dosmesa=disabled
+		$(meson_feature wayland)
+		$(meson_feature X x11)
+	)
+	meson_src_configure
 }
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index a4308c7e123e..05dac7b4d905 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,5 +1,3 @@
-DIST mkfontscale-1.2.1.tar.bz2 150808 BLAKE2B 0c2cce3a5b400f8c757a9e1f7a0c8ea85f41c7d229cc1197c68340ec9f2b0b36872a914bf04dabb584727405092b4bf9abbc465190ac1b91419d9ecb3d359b83 SHA512 4d243160e1f7f8dfa6a8f53349c1a42a55fc99426455ebdef58352c5e951fce8b4f1fbd1061a76c9a148095b002eac372db1ae5e2647d2ccb4886635b317b18c
 DIST mkfontscale-1.2.2.tar.xz 143436 BLAKE2B 796c6b95f4eb0959db93ccfb1ebae9c73afc618645d85b7ba382559fe4e008ece16c9d86ab32c815923cda9928f030d75c47f2dd5ee6c9857b9e861f9bab0dc9 SHA512 4c846816325347c91008d76b3a5610c1e58a8414fd55117e7ccf51310db4b20b8397ecf6c9177ff77322e27ee088bf034fd175c9210465c50b094bab8dada4b3
-EBUILD mkfontscale-1.2.1.ebuild 611 BLAKE2B c240104b6305309a7dcf3d2c5eb4377315206b3bba217322980275bcedee0f3da02ebd0ce8b603c44c3c30c6a87240971cfa346813b95a6aa3db43ab69a6745d SHA512 cf9a4488f2407b03499b56f1db528a5e69507d08a341e1710cd3a5fc2dfcb75cc05322225c33e7a87314b0469d4e6ca351b94ec0ce82fd1d4ee15b4b19ec0679
-EBUILD mkfontscale-1.2.2.ebuild 569 BLAKE2B fdbfb61791cdec8cd0444ab63657b0749e202723cff9e891aaf5d58099e66f82317715ec55786af2f73b2d21234075db4ac148e356c7e2d6729afebd7860b419 SHA512 7464cb444f47d4bcf55de7b35cf7c1166852beddb8beb68f5e4b5f2357dda4edca5239a58312fa4cb77f1219c5c54f8a2b9447933732fc80a7a67036e8fe7e12
+EBUILD mkfontscale-1.2.2.ebuild 568 BLAKE2B 4d389938770f797b98ae26a21b22e98d96cbcb6d46e1d44c7d3c2fb98ae4cd500f6ff51d3f4f2a96cee0d4e7fdfabea8095a4e588f99335e08a3fd3b71745885 SHA512 0c170d405791a5229ef82ea9d1aab556a2e54b2129fa8f1595be5f7b6c1c7d35f60162e3981d8b1133dfde7b063f08316f719928eb3ce896412ff028499265d4
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.1.ebuild
deleted file mode 100644
index 3095e7332bfb..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.2.1.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
-
-inherit xorg-3
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/libfontenc
-	media-libs/freetype:2
-	sys-libs/zlib
-	app-arch/bzip2"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-apps/mkfontdir-1.2.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-bzip2
-)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
index e93bdf887ad5..754e9e1106ae 100644
--- a/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-1.2.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="create an index of scalable font files for X"
 
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	x11-libs/libfontenc
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index f6f178f0f1c2..0b493d388a17 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,5 +1,3 @@
-DIST rstart-1.0.5.tar.bz2 144607 BLAKE2B 2048877683a5a1c1d07bb68d8814cea2a0e1755d7cea3f40b62c086a7f2e8ea2582eea81db46117f906f998bc830f50c437188131584d07fbb68730bfe2491ae SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a
 DIST rstart-1.0.6.tar.xz 144888 BLAKE2B d8ea7d48af6bffcbcd5c2f4ed4c6e7678f2d0ef17b5e104731c0a84fcd36d9c877b3f856a5137d066e671d1405d9ad21497c79885f02ba332fa059c0af59c3f6 SHA512 8c0840f172c9efade4557e9a28de19e76e510bd17f1e964936a957dde5ada3d9ae8b2fa0502f61da15cdfc0c69d3308599253ee03571017086a45e4e83958e8f
-EBUILD rstart-1.0.5-r1.ebuild 273 BLAKE2B 914e1fd0ab78cb4d4099e4dc08ffba52c1c9e7e9d67dbb0a2195f9a057320779897d269071208601a66a4e6f024ff109a6a44692c1a0e84e670f0181a3535c05 SHA512 638208dd8676e8f63953578bd845bff593abad42d4169c4fdd72bcd6d04eed9b2bbdba0eaccbe4fe1344a90d4e33eb422af05c61a545797dd831857fddd762be
-EBUILD rstart-1.0.6.ebuild 290 BLAKE2B d83391dbecbbe62c7bec7c862f784a40a7d15c5051913fe4d6ddc2411954e647ea3b427ceab7bc178e55b207525f0047243a7e9fb79db9a1a138bbdcd9e19f7d SHA512 0a02b443bba38723023939fed07988b8f89188cd3df40a7cb2f7b2d0eeb006597ed04eeb399b134bb4c725a9b1a875e60dfde60ce3ba4189023240c2feca987b
+EBUILD rstart-1.0.6.ebuild 289 BLAKE2B f6329b7b9c6328606355985f8db700c03140917b8b271e93c9126c1f57e4d8e1a565d2685992acb2c461cd6569586385398cf36654eeb9592d95a1025c1b1963 SHA512 ced3918781a4e6be2b21c27c5aa872ad90d22d07ae64272842b2543b9211c43a5f641e68ce34ca31341a47953a4d7d3eb8cb9a31dcc65d21ebf2021a5a5aa1d8
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/rstart/rstart-1.0.5-r1.ebuild b/x11-apps/rstart/rstart-1.0.5-r1.ebuild
deleted file mode 100644
index ee7cbcde71e5..000000000000
--- a/x11-apps/rstart/rstart-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org rstart application"
-
-KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
-
-DEPEND="x11-base/xorg-proto"
-RDEPEND="${DEPEND}"
diff --git a/x11-apps/rstart/rstart-1.0.6.ebuild b/x11-apps/rstart/rstart-1.0.6.ebuild
index af8ff336aa4d..88d460806c91 100644
--- a/x11-apps/rstart/rstart-1.0.6.ebuild
+++ b/x11-apps/rstart/rstart-1.0.6.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org rstart application"
 
-KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sparc x86"
 
 DEPEND="x11-base/xorg-proto"
 RDEPEND=""
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 690498c27b9d..66e00bca4eae 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,5 +1,3 @@
-DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
 DIST setxkbmap-1.3.3.tar.xz 130416 BLAKE2B 34ea39054a4e03e5d33778b993afbc0356f898ed45eb9d182fc589a75c92a63275f9c49abbf18b637d83acb9a2f9609794253f3f38f814dbbea741987ddc72ba SHA512 208f07a7f7bce47b573099d4cd8c941a3a4d74b456720bc3ca1cbba298381a2ab98c7500d6e6cd6d5dd61840b7c42cf6521da754ec395f266f8158102a55ad58
-EBUILD setxkbmap-1.3.2.ebuild 468 BLAKE2B 8d6cbd7410260dfa21716e7deac5027090cbbe19a85ddc2b589bb32b38b35bad16ee27ca52d664c151025506bf5859a846be02d7c1847e647620fd2418e40e35 SHA512 5d49e5eedb3c8f021cb395c7269b73cbc69555a06e6e8f5a2c93a9b4f8f1d4d8f6ec43b576fcbdff92445ce08be1265f9960a37dd5075bd4bbf7051ce217dfbd
-EBUILD setxkbmap-1.3.3.ebuild 514 BLAKE2B 2d2667a86c0014d09e8d7a6cd703ce8bcec7d0a4e5b68e1d3dcedfc0d1cdbee60fbdb4d9071f4639afc8f14308c9c84863163627123910e4aa5a8ddb262f3a8f SHA512 e4666ae7495d18be118428a0615e1ec55760c2209d39b5e284bcd556f698bd0d4dc64a96a29e0ba21cef555de3306a7c3c7437c9aa11b59a074a346882d240af
+EBUILD setxkbmap-1.3.3.ebuild 513 BLAKE2B 0db6457e2750c5eaeb3bf06d94cc502254bbf8037d8f58100ee9f869f91781d6272c958afdb5a948ec37b5827384514a5db68603cba507cf2596a80fbd3269f4 SHA512 6e982f0c9c1c71a2cf39ab230302427d9c3d56871cc8139d528fbba7d083cd8b9849c08c1b1a771e55460b1244a1096c045f00a2e8bf4e55a763aa00034e0079
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
deleted file mode 100644
index bcf37d4539fd..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Controls the keyboard layout of a running X server"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-COMMON_DEPEND="
-	x11-libs/libxkbfile
-	x11-libs/libX11"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xkeyboard-config"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
index bf68365d5b68..6f10074efa6c 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="Controls the keyboard layout of a running X server"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	x11-libs/libxkbfile
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 40d3c84d525a..490b4bb075ee 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,6 +1,4 @@
-DIST xauth-1.1.1.tar.bz2 167315 BLAKE2B fbe36f867031c734e3a8ae9719145caa16828d4df156503c299812fb63f86462561ffea945f12fabc5e036cc63664ee1d8b5b37630dee8d4af6f2473aa5fcd1a SHA512 998c3158378fff50d368959c29335173b8d98e02591cb3d7b2f9534b5a44b19deb4cb7da9bf291ca5a37f69f833d72839b2c6611723306d10c1b4968ae4d4120
 DIST xauth-1.1.2.tar.xz 156960 BLAKE2B 2ba168229bdf0c1d0fdd4c352e434abfc6f527cbafce35abac8d403a0dea91f00fd858f91f177128d13a0e618d1d95061c71ef32a3e12ac91b72a257dcfcd12b SHA512 ac23fcd166b45abf7b030994ff3332c9906023dc1ddfa9b9d3000e6a914dc5e0213c4a2aa409cb3ddb93e1f9f4f6374376109241a95ef8c36af842de1f6f76e8
-EBUILD xauth-1.1.1.ebuild 627 BLAKE2B 5f961ef4642fe9a226211d3f7c6731b505a05912d23e2feef1edef821b398a9440b8a6944f1e50c45cfe81e419d4e1d47e655816574c4e03f4a8dfa9781c8f1b SHA512 dbabc69355b416ecf3791fac9c87f499588095432424e8d0bbfaca96211e8ed30cdb5c1edb22fd48db1d92fe6b53e201e0ec0643b4ff07dad6b8c3346c833256
-EBUILD xauth-1.1.2.ebuild 592 BLAKE2B 8b51885bea153c46bc9e2f52845fb808c8ab2c64ac2ed10cb544783eb8b9d12160e51288c43206c174296a5a7e14e5d9df7e0b43230ff773cac7379d2c221a7d SHA512 8c8c0d1a06c5f7d9ed1ba97a60e5f86ddfacd2d1b3e19360e683e02748c03ad09a3ae2ec7181814bbb9687b3af1468ddfedf4c5811b4b1e23e039fe32c0ce02a
+EBUILD xauth-1.1.2.ebuild 591 BLAKE2B cd4513fcdf1e456ded9b3c4086dec2201eb0f0f5a5378bdd4cfa66c101dcadb84fec7f0abb8b6094963ff64d176cf062cd9076f846557a03ac7f9656566b8a45 SHA512 8e3e433884c6b766d18b1532081f72974d8fab4d1edfd5b145bb11824b3dba020ab32f1203adff333b16c7d76589badaab6a5723b457ecfdd6687388a1876ee3
 EBUILD xauth-9999.ebuild 599 BLAKE2B 757c7dc62ca39a50b64b5f2ffbf3bf5dcc123524d284457f62259a21fbfbd2db7eb854682cafbbb7ddf260c4254ad5c1836b2c7d9cc6eb2cbb47e626696f3d0f SHA512 8ccbfd002dd63a8d769d9d4a99e6c077bd9253e6dc8e35db34daa0dbe01350e749f12c3e46660ab9ec3b4e9db8379b5ffd238d07e3139690bb4ec640e8f8ccd7
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-apps/xauth/xauth-1.1.1.ebuild b/x11-apps/xauth/xauth-1.1.1.ebuild
deleted file mode 100644
index 98550907e512..000000000000
--- a/x11-apps/xauth/xauth-1.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="X authority file utility"
-IUSE="ipv6"
-RESTRICT="test" # Depends on dead cmdtest package
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xauth/xauth-1.1.2.ebuild b/x11-apps/xauth/xauth-1.1.2.ebuild
index 63fbb3f137fb..8d85f6e27fa3 100644
--- a/x11-apps/xauth/xauth-1.1.2.ebuild
+++ b/x11-apps/xauth/xauth-1.1.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="X authority file utility"
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 4975985c57d8..7963980a0903 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,5 +1,3 @@
-DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
 DIST xcalc-1.1.1.tar.xz 140204 BLAKE2B b747a658b03ded2a071f0b54047f8dd4a1aecf6093af14059f2311019e6f9d3790f1190159c278fd3f9d5bf5740bbb1bfb0996540a0985728ed2966239bb4902 SHA512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb
-EBUILD xcalc-1.1.0.ebuild 406 BLAKE2B 54f544bd220946bebd58be10afc930cd413db960412d9cfef28227504d29cfc7871b396f5da4305599501acb5600114b5d20bdad128b2372f09bc63754403c75 SHA512 a73d9ccf820c7c109a640379169cc5bc899c33b710b1934ee5caf880805b448c18316d419bdd37624fb5930d53de8e75ff5001de920d23453ecc09b509bca946
-EBUILD xcalc-1.1.1.ebuild 424 BLAKE2B 1711ca2a343e053b3266e478eb5911f66aa7cd665d82d76b7056e982aa33004ff0ce32c74ce32f2737f2834b74b5f5995ff09eeb95110a22a98413f954e88cfe SHA512 ffb55173ed190d86c20d55b289add0fc5040ad968d86562e8bceef8d25367679ab27ad6261c549411985731669b9934898b6cd9d2a7ac6b215f52e871692c6cb
+EBUILD xcalc-1.1.1.ebuild 423 BLAKE2B 850d2d18b404bbe64bc6b637fc0449f8ad9db47ba95d763502fb77f68cb1a21eb540e395e08146d8f71e4dc442568f548b5a159fd0e464f3aaf7ed4b595aef22 SHA512 558dbe40c146202bf107dad50f26d86880f4278def727da4b8bf2c14e91df32b1439c73c5d3550061ab5ec4aea91e005def3dbeb57be01509cc3963635253622
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
deleted file mode 100644
index 110fb3082444..000000000000
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="scientific calculator for X"
-
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xcalc/xcalc-1.1.1.ebuild b/x11-apps/xcalc/xcalc-1.1.1.ebuild
index bde1087cc07c..01215f168970 100644
--- a/x11-apps/xcalc/xcalc-1.1.1.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXt
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index 92fe51851204..3f8858f9fefb 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,7 +1,3 @@
-DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
-DIST xclock-1.1.0.tar.xz 158984 BLAKE2B 26f39053decd25d481db90f8d2d9e854a4d66170d414de6232e48359c57f1865a581740f34419c8ad986e10c6dbe4aea921d4760c9eb33ca6345255552eca3fe SHA512 9456ed43cb8afce4a1f1c4edcb87bfb86f61fb54d1892f26812ed10662c9b8f8c28854934ce4eb981090d500fec0f295ba96df9867dd1685dc5f31202729a1a0
 DIST xclock-1.1.1.tar.xz 159556 BLAKE2B 5770cc0cf9065eb83b427c63190dae070635eade9410676a343505fc7a9d94098fd8d416384383f5311453a7ec80a0b72e8cb9a86be98eb8275dfd9cc92ba478 SHA512 059ea986bc7537c2796e8855676e8357bd8a7852fbac0839b3f8a9e3ffa088de41bc4e4961973353f0a7b7293366b81bc764d74f3dc4e90e361da06185d976e7
-EBUILD xclock-1.0.9.ebuild 483 BLAKE2B 99bea3e93a63617d084c27c01273b5c426998a3ac6f04a0fba03f0adee2d178c734b1be890390025415ffc22b31f982ba370eff32cfbf907281004b149793b0f SHA512 0dd6779fd3530c68e233aae14753d6ddde1c60cdc40d765ad48e364a9b1ac71e4cf88380448dc4e771696c906b5eda6fc9f2442c811449fc7d4c507c76f6c0a5
-EBUILD xclock-1.1.0.ebuild 507 BLAKE2B 0c8bc56f7ac9ab4cd424f91a82cde1301f69cfc9e180c3845a24cefbab3155f76dcfa56fbd1416aac6add5f29fcfad50cb91798e3d873c6b0a739aadb0506000 SHA512 c5d0f7671cdcbeaae4f7fa8afad05cdbdc485e31c4647f83a12f4141226a68913b98b72ac08c950f302c67a1f7d17f3d97ba93696ec05fbf8c7e6a82a45261c9
-EBUILD xclock-1.1.1.ebuild 508 BLAKE2B f01371a801df8301e517a444e12f6abef2833cb85387f4cbcdd7f31d1f6b1c93a4fd5e021eb5f6deb08a422aba15ce9ae28c4fbf7c568a0ba462adcd70b96875 SHA512 97ab278cb6141fa2446b068d0b772505ef9ee1afbc1878f6b5536b9d111c4e39792fb49f9368f9fbf92340fee78a8c80a35928ed84bab1cf75cec73c32db9a4c
+EBUILD xclock-1.1.1.ebuild 507 BLAKE2B a713d405b4ed21c15a49041033e140aa69f9c8a7970fce4719e8d5733dcee0aa7a7d1b95ee1a1265cae1df5fe8f0820d7502debd764cda033d09818c1a1f2b4b SHA512 e479619651a8023ce2ec61fe475a719a101ca15dd4aff73f7d7b94328ba390ebf82952125840bdd9ac45175b89a4abaede732569e45d4b92debccfc67d631b26
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
deleted file mode 100644
index a7f8cdae5cae..000000000000
--- a/x11-apps/xclock/xclock-1.0.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/xclock-1.1.0.ebuild b/x11-apps/xclock/xclock-1.1.0.ebuild
deleted file mode 100644
index 7034dfd5e4fe..000000000000
--- a/x11-apps/xclock/xclock-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="analog / digital clock for X"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/xclock-1.1.1.ebuild b/x11-apps/xclock/xclock-1.1.1.ebuild
index 91806a4ed2a8..0b2c4f840ccc 100644
--- a/x11-apps/xclock/xclock-1.1.1.ebuild
+++ b/x11-apps/xclock/xclock-1.1.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="analog / digital clock for X"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 2322ccbe2991..17717d15613e 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,8 +1,5 @@
 AUX Xsession 1521 BLAKE2B cb2090c2f2c1626df08fe45e80ab668ec9ca43f8f647f9a16d09e7cde7fa33964cbc4f51aa41a537a027749e40c69c3f8543c41924d9d05b54226a0e4400a3a1 SHA512 6cb72d93ab8004e42e9f5002f7f8bb6eb7d9833fd7d3fb0acf7b7b481ead5fb55cb1b836a1e6010fe859e9e04e14064c442e23fdde5991ffb8556ed5aa5af555
-AUX xdm-1.1.12-consolekit.patch 7815 BLAKE2B 1ef67b15385c3cc9a74797fadc34e5701889bf669f70e9c3720a82db595472dcf8fc36011ce35cad763dc68580a7680a272c7617d9cf58db8314f788974031cd SHA512 e318ebe0e606964712db40cb70177d4aa275679ef6e2c0ca97cd5156434d037e8774bc75dad3584e8d13ad4577798fac6624bdb6359f1a57de9eb2961bfdc5f7
 AUX xdm-1.1.12-make-xinerama-optional.patch 978 BLAKE2B feb81c4815c61c62ebd25acec572de03450c4ee5fd7a634cb0444e17d35566548c0bc8dab05562264533676012410839f61b2e5cb5bc98d83bf9a36daa1b59cc SHA512 efddf2cd662cc4e1ca5cea2a9efe49b4ef8e98276f37def047091088a9deaaadc61646deeefbd8668286d08edabd245a532db84ddf938a2853bdcc1865c221c9
-DIST xdm-1.1.12.tar.bz2 512074 BLAKE2B a82d124f4b7ce3185d703fca3aade92e86094602aec5343566ba8c91c54b70cdedbaea2fa6fee330d7ed48d9138b04a998aa2dae06db2683bfcce6c7693edc82 SHA512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb
 DIST xdm-1.1.13.tar.xz 418404 BLAKE2B b5e1df5e0fd284b227bac5b07114b7882c34adca8c8f7878350576f865ec0675fc7f8218b5eba24e0ca75895093f9412e838a997562ec99bc8196233354bd7eb SHA512 1c7ba51dc8c6989ff6ede3a3abd06e002903609d4ebd31f06ec39fbfee3a80a690c6180f85c3ab135a0de4623261d92a191d1ca5f733cdb3bd2e7e78977b98e5
-EBUILD xdm-1.1.12-r1.ebuild 1896 BLAKE2B 06349c1ad1581abd22fdc2ef29c1b779c172787c90e955c6f08670916bb4358a1693ea3c58618b005ffe690623222985ff1da143841836bd7d64c77e4f16a680 SHA512 e5e85ac18f7e04f9e2c68964e5bb299068aa28731f38132bf35fdd426643f7bfd5b08b1078353cc35d200c6b147b54e33aabffaa2e8e04cb4e4d59bd1644e5f1
-EBUILD xdm-1.1.13.ebuild 1867 BLAKE2B 6e401f909858d0861772c0a42e1d12bcd47b942b3424acd9168fb033dd3374e92cee4c0d8f253e0b116fedf8d7a585892dfffc6c5e0cbfdc095d8c2beb307b04 SHA512 08f249e9130870d1c4a62c37f2aa8d95469b85c4db433f6b6c8b2c173a8f0cf05f205bc89537d535cb487b5417d58749bc7d4534fe27eba6e56f61c41afd2e29
+EBUILD xdm-1.1.13.ebuild 1866 BLAKE2B 128b28ef17de6f7b6cdf16b512d9f7f7e27e3516481e43928d921e957615d5285d4d11f51aac5164ac9485df5f64eb5d5ef9bff239dea49439397f6e04b8437a SHA512 d9d53faa7a148b69e70166fd635f6b184916f915a664d1ae055019b3a26c4140f58708a72a8f1bb6920c10e7609bebd7897ebf6c23c2c80c6295ccbb36ea0daa
 MISC metadata.xml 241 BLAKE2B 6fe56bd098998705ece21eed6d30e595c470dfde14e39c39e6413dfc3a7b5a207742d52f5c8cf7a582bdbdb651b0a8fd9729a334393386e3a1afb1587fad1531 SHA512 672a7690a5fc03c8758403450a5e320b891b58fc523fbfe258bef0b214fffee41e43df65cff1528379343a5d8b815d1bf9edb9001049748c1cf118b52450c412
diff --git a/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch b/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
deleted file mode 100644
index 232d10d94db8..000000000000
--- a/x11-apps/xdm/files/xdm-1.1.12-consolekit.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-http://bugs.gentoo.org/360987
-http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
-http://lists.x.org/archives/xorg-devel/2011-February/019615.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
----
- configure.ac   |  20 ++++++++--
- include/dm.h   |   3 ++
- man/xdm.man    |   6 +++
- xdm/resource.c |  13 ++++++-
- xdm/session.c  | 102 +++++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 140 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d110809..db973f7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -168,15 +168,15 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
- # Check whether to enable systemd startup notification.
--# This requires libsystemd-daemon.
-+# This requires libsystemd.
- AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
- 	[Add support for systemd startup notification (default is autodetected)]),
- 	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
- AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
--    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd],
- 	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
- 	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
--	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])]
- 	)]
-     )
- ])
-@@ -395,6 +395,20 @@ PKG_CHECK_MODULES(DMCP, xdmcp)
- PKG_CHECK_MODULES(XLIB, x11)
- PKG_CHECK_MODULES(AUTH, xau)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- # Greeter
- #
-diff --git a/include/dm.h b/include/dm.h
-index 9116d6f..27fdd71 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -327,6 +327,9 @@ extern char	*randomFile;
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
- 
- extern char	*greeterLib;
- extern char	*willing;
-diff --git a/man/xdm.man b/man/xdm.man
-index ef57d8c..de99d25 100644
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -48,6 +48,8 @@ xdm \- X Display Manager with support for XDMCP, host chooser
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -215,6 +217,10 @@ indicates the program to run as the session after the user has logged in.
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
-diff --git a/xdm/resource.c b/xdm/resource.c
-index 316ace4..725351e 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -65,6 +65,9 @@ char	*randomDevice;
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
- 
- char	*greeterLib;
- char	*willing;
-@@ -192,6 +195,10 @@ struct dmResources {
- 				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
- 				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
- 
- #define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -377,7 +384,11 @@ XrmOptionDescRec optionTable [] = {
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
- 
- static int	originalArgc;
-diff --git a/xdm/session.c b/xdm/session.c
-index 4fd7d0a..c16978d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -73,6 +73,11 @@ extern int key_setnet(struct key_netstarg *arg);
- # endif
- #endif /* USE_PAM */
- 
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef USE_SELINUX
- #include <selinux/selinux.h>
- #include <selinux/get_context_list.h>
-@@ -523,6 +528,97 @@ UnsecureDisplay (struct display *d, Display *dpy)
-     }
- }
- 
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 0;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -537,6 +633,8 @@ SessionExit (struct display *d, int status, int removeAuth)
-     }
- #endif
- 
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
- 	kill (d->serverPid, d->resetSignal);
-@@ -614,6 +712,10 @@ StartClient (
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
- 	CleanUpChild ();
--- 
-2.19.2
-
diff --git a/x11-apps/xdm/xdm-1.1.12-r1.ebuild b/x11-apps/xdm/xdm-1.1.12-r1.ebuild
deleted file mode 100644
index cf6d38b4a06a..000000000000
--- a/x11-apps/xdm/xdm-1.1.12-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_EAUTORECONF=yes
-
-inherit xorg-3 pam systemd
-
-DEFAULTVT=vt7
-
-DESCRIPTION="X.Org xdm application"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="ipv6 pam systemd truetype xinerama xpm"
-
-RDEPEND="
-	x11-apps/sessreg
-	x11-apps/xconsole
-	x11-apps/xinit
-	x11-apps/xrdb
-	x11-apps/xsm
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXdmcp
-	x11-libs/libXmu
-	x11-libs/libXt
-	virtual/libcrypt:=
-	pam? ( sys-libs/pam )
-	systemd? ( >=sys-apps/systemd-209 )
-	truetype? (
-		x11-libs/libXrender
-		x11-libs/libXft
-	)
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )
-	elibc_glibc? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-consolekit.patch # bug 747124
-		"${FILESDIR}"/${P}-make-xinerama-optional.patch
-	)
-
-	sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
-		xdm.service.in || die
-
-	# Disable XDM-AUTHORIZATION-1 (bug #445662).
-	# it causes issue with libreoffice and SDL games (bug #306223).
-	sed -i -e '/authorize/a DisplayManager*authName:	MIT-MAGIC-COOKIE-1' \
-			config/xdm-config.in || die
-
-	xorg-3_src_prepare
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable ipv6)
-		$(use_with pam)
-		$(use_with systemd systemd-daemon)
-		$(use_with truetype xft)
-		$(use_with xinerama)
-		$(use_enable xpm xpm-logos)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-default-vt=${DEFAULTVT}
-		--with-xdmconfigdir=/etc/X11/xdm
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-
-	exeinto /usr/$(get_libdir)/X11/xdm
-	doexe "${FILESDIR}"/Xsession
-
-	use pam && pamd_mimic system-local-login xdm auth account session
-
-	# Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
-	keepdir /var/lib/xdm
-}
diff --git a/x11-apps/xdm/xdm-1.1.13.ebuild b/x11-apps/xdm/xdm-1.1.13.ebuild
index 2594355d2c6a..33796ac95e7b 100644
--- a/x11-apps/xdm/xdm-1.1.13.ebuild
+++ b/x11-apps/xdm/xdm-1.1.13.ebuild
@@ -11,7 +11,7 @@ DEFAULTVT=vt7
 
 DESCRIPTION="X.Org xdm application"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="ipv6 pam systemd truetype xinerama xpm"
 
 RDEPEND="
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index 445db8186479..24b821b64df3 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,5 +1,3 @@
-DIST xdpyinfo-1.3.2.tar.bz2 141351 BLAKE2B b2dee4f424dee902c31430b8843c14d6836508ee0125db7de41f5e9faef1732dea571e90b37638cc90dabd3995a0ceb5e4094707138b7e066ee1ae856258503c SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d
 DIST xdpyinfo-1.3.3.tar.xz 137088 BLAKE2B 8fdf49e65ac05ab27672ef2044044353f8bbfe0c8bf6135e71b9fbd45b3cb643f5794977802cbb7a44cfe9d20905b5e74b0cc41829c9fef837f32c81bb05ea2f SHA512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442
-EBUILD xdpyinfo-1.3.2-r1.ebuild 807 BLAKE2B 9809040ba064c2c295f455a5a6ba350973348abcf8fd09e7f768831ffde5e182aee5e199147c968ecf2f441a252d8e17f3b4fbf65041a89be038bc6a50d75786 SHA512 3e7301b21af2bdb457c020aec37b9a9cab6cee2afd7f9dfa064cb4f95b9c9dff078d3bcdb2e81dbaa52c5c0c3783f5e92e5ce543b50c39d82cfebad85319b26a
-EBUILD xdpyinfo-1.3.3.ebuild 840 BLAKE2B 76f66e41e0e622d1bda3fd88f544b249d2e17f3753e3468df609f34ff9b220b34a1f75910652919fd794c5161f0997aadeae41aa42f1d0663ae9a497224da00c SHA512 77a67263b9f3d3c7b2468616baa4cbf5cc07fe6bc7eadbbbb8a9ecfb08568760272a011902f5e97c73780be238aa037d724b4d17a64243c8de0464eb6a3c5a5b
+EBUILD xdpyinfo-1.3.3.ebuild 839 BLAKE2B 3f2f7ea5acfe02edc9afbd02adc844801fb5a03968e901d10a84d857e288af982c1bce8ec74355443a733cbd0e11917e342105da805212fbea70a3f56d1b9ece SHA512 85106268c09a3244b8e28574c99b9275a856dc066d25e3d4436efd5b5fab58937b732d964393772dd4775f11841d4cbd85749e4132c5568dd744190007012ed4
 MISC metadata.xml 348 BLAKE2B c29f79a25abe32eee42ed83aae3760812638a6696c8f27392673c9e9bb178e086b8fcc344b3db42bb9fe02ae23757ea201c8f3b5d4e03f466c6a524368df4778 SHA512 5a9e3ec8b2303c5d61cbc08cddacfe978140f9db3c5b1a2b72b896c6a61c408e6f22bcdb0a0d4e7542d946397a11878d1ca38c2e9e6cf211ad3b45eb1a45f914
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
deleted file mode 100644
index 8d341e0d5d79..000000000000
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
-IUSE="dga dmx xinerama"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	dga? ( x11-libs/libXxf86dga )
-	dmx? ( x11-libs/libdmx )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--without-xf86misc
-		$(use_with dga)
-		$(use_with dmx)
-		$(use_with xinerama)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
index 0ee5e0662dc2..fa38684215ac 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.3.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
 inherit xorg-3
 
 DESCRIPTION="Display information utility for X"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
 IUSE="dga dmx xinerama"
 
 RDEPEND="
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index 8a25ac85e3eb..d6215fe1c7f4 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,5 +1,3 @@
-DIST xedit-1.2.2.tar.bz2 525861 BLAKE2B 608f3f2b06d14f99a71d9eaf45114ba71271957f584c685236bd78e2f7c9a6e969ce15de72a7530a41835b951caa800a7cb0c45d71a4790aab5fe703d654e912 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d
 DIST xedit-1.2.3.tar.xz 480288 BLAKE2B 15dabc6952228246b2fcd67c33298ce75ebd3a943e930d3e5110c4b32a8c5b7340f5127b64d9bda9819fa3bcb4bebe870e4bcca0ecf5310f4b765f488d88c61d SHA512 1089c35ef961e53f74cc7d892960e1ee7f0da17529e3173e7f7764b0eb4ee94d1e068cb177d8502ca55c1dd6808962d4b1427e303adc7e6db80be8828557f45a
-EBUILD xedit-1.2.2.ebuild 324 BLAKE2B 0f3b2f9a67f5ea5e7ae95554ef70f6ebbe406b73f9d02075908c0017a5c8a0d781a1138edd38ae6dc23c4ed6e1032693d567d1c70db92d5be5928cddd9a27d1f SHA512 c4ad52e58106cfdde4b9a9c2565b6ce3d748efecb507882ed5c3acf7b188330f4372ebe10b7950b0a89e58f2ad86c56bd76d823e5b215c6374727b72ad407d93
-EBUILD xedit-1.2.3.ebuild 371 BLAKE2B 5e63f4e3e7ba87b4ba577451b8af8aa983b7bebf6a2512a22a32d1ea3ec8d1d879b45d865671bfe5730485671bcc413a7806fb70f06dc391bcb300d64b886507 SHA512 ae0668269860e39ba687bc2d63f939a7ef5b525d1b4f6e58d8ef092bc1e9b0845272ce4e020cb8ff19a410fed9cab3aab3df31f2734ec7786e6b7292baaec600
+EBUILD xedit-1.2.3.ebuild 370 BLAKE2B dd37f13a768cb2b032fdf919f7af51f6bf833c0185d4909e6c77d28f582f5fa6a61afaf20c75aa3f3d7b9abd078808fb18fe8c3a60fee32ae50c35bf0c8f6908 SHA512 692856b43b1073c8c0a0bcc6686e65b44209733e1fad743e950b04da5ea14111899a5ef892a7c75795cc38717486d42992e582017bbc3a37ac2a9241dd48e7a5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
deleted file mode 100644
index a91671b39076..000000000000
--- a/x11-apps/xedit/xedit-1.2.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="simple text editor for X"
-
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xedit/xedit-1.2.3.ebuild b/x11-apps/xedit/xedit-1.2.3.ebuild
index d7edaf83dbb1..df416b4e840f 100644
--- a/x11-apps/xedit/xedit-1.2.3.ebuild
+++ b/x11-apps/xedit/xedit-1.2.3.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="simple text editor for X"
 
-KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index e0e6c47400bd..2162f1a47fa6 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,5 +1,3 @@
-DIST xload-1.1.3.tar.bz2 140327 BLAKE2B e3e4e817b65a405b2e4733fbf736d2f2a9803436bd752d8fc14204f2c6e342dcf60c9fe69d749283ed53345020fbf7c250c91453d4b6634c41795e91e072cd46 SHA512 8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5
 DIST xload-1.1.4.tar.xz 133204 BLAKE2B 46002e9bb6156552c9dada2daf68723638b822df6b87433682dbdffa684bd8b344dba2d66c6d2a9bef60f148455fb64885d9a5e28b319367df3dfed267cc0841 SHA512 114babe4e5a60f4713f9e4627ee0a1bbb2f1f238cb46f24c38aecff67f25e6b0f58cbd554c71095ddc2b01398adbfa379550a34c23c413db52157648028554f2
-EBUILD xload-1.1.3.ebuild 391 BLAKE2B ba35977a69a9bb3dd66e3a7ab7d14953d793d58641921c3f1a9f862e17a882bfccf8b06aa124caa28ac466165e95dbe3489784d05d0821a1e18cb0e935568585 SHA512 5853cb89b03efcd91bb1499acc38f506f87f5d66e3c955630b1a5e77bdde95b0324982b3b0fc82798109743d62b047f587504bf33797dcec1b54f4534a3c678d
-EBUILD xload-1.1.4.ebuild 438 BLAKE2B 7d0292ffb46c48609a83a2cb3abc26a21a8a6bed30421dfb159e38f2da4bce6cb999c752225cb13fb9fad009636dbc7426866097a96728a19a3698255bfcaad7 SHA512 67b0ba02cffa680dabb55f94dd94f109a746d6437764ccef7da7eaeb4122ef4c80e7a764fe50926010529a199e4aa9b387536d5043ddf9234511b6e2055b1663
+EBUILD xload-1.1.4.ebuild 437 BLAKE2B 7412a7fd9511d4381d0d7d72b2b0e41842c5f0a4d26408be04ee48ed2230d6ec2742aa404b87db5a5c1df4c5af8f811a617b6b548a8ec06ed45025b6aa1f9760 SHA512 93841106ad716c7b42d2aad11de4a779f7041a71cd479eef7cb3b3b46e7910ff660bf3e2a7ed50717de53ad5982b090045bcef1c2604603c5502c53497de694d
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xload/xload-1.1.3.ebuild b/x11-apps/xload/xload-1.1.3.ebuild
deleted file mode 100644
index 82a498240cfe..000000000000
--- a/x11-apps/xload/xload-1.1.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="system load average display for X"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
diff --git a/x11-apps/xload/xload-1.1.4.ebuild b/x11-apps/xload/xload-1.1.4.ebuild
index 43c057210cce..868a96e6472a 100644
--- a/x11-apps/xload/xload-1.1.4.ebuild
+++ b/x11-apps/xload/xload-1.1.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="system load average display for X"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	x11-libs/libXaw
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 866ef6ada4c1..f83dcb1ca4ca 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,5 +1,3 @@
-DIST xlsfonts-1.0.6.tar.bz2 133500 BLAKE2B e21b5776ca02c5fe07ba80c2e845fd04d75642ed7984080df3402a478748e4bea00f93134eaf359da9d5223be6bf98224067bd3413c072c2f38bd589fdc90328 SHA512 052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0
 DIST xlsfonts-1.0.7.tar.xz 126888 BLAKE2B 13f2e2007c38f7d1724e6ffd0c7fe9a3b887a150f50107b892327c3620e4ffdbd4ae1191a9764cc4000d6422fe0f331dcbef11c0b50013ff2d94b699c0cba1ee SHA512 ec82be0a97500a9e64fb5a6adbbec470b249b1267c3081c2bd44cd3e7148107517d1234c1da2f81b0405230ab03ad2943ea53756c3380f4d561665b38d0cedc0
-EBUILD xlsfonts-1.0.6.ebuild 349 BLAKE2B 7a4c5121c956ab737f6544d8d75deb411a71c05fdddef22ef0a01706179dd382a3efbfb78d48778449f09cde29e615bb8baf040c95239e8729cb53dfc239dbc5 SHA512 22d2a34808c31804ad1ce453c23380644db35209609b48fdbc3f367147eb7a3814875b833d4e287fdc227d4e3b6b91c903d1d6517dbb5236bcc73301796a74fa
-EBUILD xlsfonts-1.0.7.ebuild 396 BLAKE2B c2ec7d9f60d1a75f8ec839317efacced14d31a61c48108f6ddae681e067ba8d8dfc5e530807817aebcf971b74c9470f67af1f7463584fa82d221c68d76b4224f SHA512 91bc943e48652438762413a5b1c1284721926ec9bae76853d4427c48e50eec0beb07a85bd548410ce6db2450b21be8ba350c89ca9dd41db33ce28f89fa4a4399
+EBUILD xlsfonts-1.0.7.ebuild 395 BLAKE2B 128c635e9a1abc6dfc79b76eef548e1b23bcc49fc85c5b90eb6aaad6b8696e672086b10c9777a47cca1903a71d9ef7e80d88d40bc6b7540710d8636e72277b06 SHA512 dc0dbbaaf013ab4ea0329037d6e4ce3d12a090a9529cf64a46070b081ae3f5d5abfef98e10aef01457191239f94ee476c39e5a31b861b79458367d63c2b2ce33
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
deleted file mode 100644
index 4a6bb9ed055a..000000000000
--- a/x11-apps/xlsfonts/xlsfonts-1.0.6.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org xlsfonts application"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
index 2dbf8e0c807b..0078044a27dc 100644
--- a/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.7.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xlsfonts application"
 
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 6ac9cf590b5d..d100830f1d25 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,5 +1,3 @@
-DIST xsm-1.0.4.tar.bz2 170933 BLAKE2B 05cf4614440f36da6ed1e8e0949ef6955da03d1fe0cc2d0323150b34ea01c293301aa49006a93fe7c44c842db41fb6b66a2f4a4051ddf2258143e54a6e99b390 SHA512 d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176
 DIST xsm-1.0.5.tar.xz 159496 BLAKE2B 18531fd06970a244478cd674cac1d669d4fcecb4f680a656c5182927c76a111aa82b96fd96e5b887d6f8b44e7ab88292607812b7d6bbcac86d9f4448bbb4fed5 SHA512 df3777b3aab813ec8aa906f5a03f93b8ca645978970290cf7baf732e175c36c00ae19baeb45ea7404d35838c21e6f8fca28f0da3e2f398d17adac5f2acb7b351
-EBUILD xsm-1.0.4.ebuild 683 BLAKE2B 2fc21d9f48ce11f7161f9946f801cc2792d6012ac067e989fd7436388fe0c4cb8bf2e78caa2fc98007ecb44bc0d42c5a34af8d96e1b3cd5466a41f820cd63626 SHA512 baeee15e28e6ae030625b14cef85c09749647a3d71a1ac4013df4eaed504622a2750434ed73431e134eb12ded40fd6a9b4d5a7d11bd2ebd75d8496315649113a
-EBUILD xsm-1.0.5.ebuild 737 BLAKE2B 5128c445b219244e04e7aac39ace8bc3fcc07bdd4908ffd7ac3f5a49c9d3b3654470156c39d2317c7f35250c9ec27574ef8779a8963d5fad57f4a2fb419e8dfd SHA512 478438c5ac1bd18225799402cf735dd1a6bf4684c8c7b6fb55e19b1cbf885e11bfd3c4e5e06528756a224e9fffb29095aaece8554120b73a647f051d0284c2fa
+EBUILD xsm-1.0.5.ebuild 736 BLAKE2B 615d1ecd0ba4fdd756d119bb1753b4a6a83b296f8d1b705af11ae2da704098b01b2eb861ca0ea49de4b84f721b6c0b731f75f45599f645aeb1ef7682f7884403 SHA512 c32e4f0ed668dfe7081819e8687dd963f893c646f8903681a500e1922ac3f7cb51a3ca9a4618f7ac06cf78d9d51bc74cd73f5dbf74dea2a6f59d29792847a46f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-apps/xsm/xsm-1.0.4.ebuild b/x11-apps/xsm/xsm-1.0.4.ebuild
deleted file mode 100644
index 419ed2866914..000000000000
--- a/x11-apps/xsm/xsm-1.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X Session Manager"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	# (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
-	local XSMPATH="${EROOT}/usr/$(get_libdir)/X11/xsm"
-	if [[ -L ${XSMPATH} ]]; then
-		einfo "Removing symlink ${XSMPATH}"
-		rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
-	fi
-	xorg-3_pkg_setup
-}
diff --git a/x11-apps/xsm/xsm-1.0.5.ebuild b/x11-apps/xsm/xsm-1.0.5.ebuild
index 715fc2058343..4933f1c06a35 100644
--- a/x11-apps/xsm/xsm-1.0.5.ebuild
+++ b/x11-apps/xsm/xsm-1.0.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X Session Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND="x11-libs/libXaw
 	x11-libs/libX11
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz
index bc2529007647..9ce1c7aa94f7 100644
Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 0a9bdca2fefa..44dc4b278123 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1,6 +1,4 @@
-DIST xorgproto-2021.5.tar.gz 1132811 BLAKE2B 3fe288cf8a848436dacc0ebf437b6a1d2c81878abaf8c542ff45e70389643cb2bc25bdab5ab6ff9d44a4f9bbdbd24757d21617c2c6a0754870afcd9f60ccbb05 SHA512 9c9ec62f0af68fd0dff24010986326a2b201be2b56b8b94abfe7258bf66b3c4c37088596c43a234aae63b1d781f7797caf408e434c98e8805803bc890b8aacb0
 DIST xorgproto-2022.1.tar.gz 1107316 BLAKE2B b7c60d77978f95b62208c5c5974c7310a9b6197c8b14218ba319eb44660f20c5eb33ef106beccae16f79a0530a20bd38b6aa2de81329c4b48a2da285ab903c31 SHA512 e34404eb9f7edfebdecbf38c66491fbca91929c59b5762d3266b2808cdae3f4e65589001d29bf5374effc56173a5467f5a107bf4fe05acae69839b841e83f72c
-EBUILD xorg-proto-2021.5.ebuild 1184 BLAKE2B 7129e8ed1e437e04359d2d61612f808715f2639f0ae6846343d4f844556b570c9d5fd240597a408d2295ea6c76a88bc582c3d6cd388c12f8e93019cb3e1a3822 SHA512 32a3cef52319fbe9c15aa31fd2378e743b8a1ea8b6c366aed9bb97f3882252e3eeb0d4b340d6f69a45a87cc3587be937b5cf223bc3f60049bb34600f53a03613
-EBUILD xorg-proto-2022.1.ebuild 1192 BLAKE2B 6827ee2f8f8b453531f2321ba66115627dcb6661208883752aa175e26bea21db72e3e8ba737f85ee50f3423970cd7aa412ceef904130128c54f515d8c30b23ad SHA512 cc145a8fbe341d8032fdcdf4a86fda98c04ed9499f3ed050cab7d8c4ab4007959993fbe548eb3990cae42bcc49209b5409dca6e6a3e0ac3b55d0f5eeb9a5e7e1
+EBUILD xorg-proto-2022.1.ebuild 1191 BLAKE2B 9567169384ee96cc76657454bcf694b3e16bae60cb70c5be5e546583ba5bce6e165d4e22bb4e4a7149a0d6d0a22c574c222c0d5fbbde94f4827c3fd40b785e4f SHA512 fee1de9b17ea8d5f1c7266cf8ae1166bd526b3a77032b6e4aa265f3dfbb9752072209b6dc4c861ebe8a05247973dabba59ad9397753837549577bde46944fdfa
 EBUILD xorg-proto-9999.ebuild 1192 BLAKE2B db4567f72fd74372e3b7b1e1af421cd18ecc209bba232e9ce9fddbf5a0fa5c3f0a9aeedcc5505dca752f8f227a72444beadd3c35f5c0889eb9f9b449bbc461d8 SHA512 a32f16a207591f291b07be006349486068da9dae00f05c4028a4ffa67a9cf9840c788d37148554ca622d25689cb7108e67aa1bcfa830e8d74fe85291a999750a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild b/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
deleted file mode 100644
index 6bd2e9b7da19..000000000000
--- a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson python-any-r1
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/python-libevdev[${PYTHON_USEDEP}]
-		')
-	)
-"
-RDEPEND=""
-
-python_check_deps() {
-	has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_install() {
-	meson_src_install
-
-	mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die
-}
diff --git a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
index e799fcf66406..cdf53c6454cf 100644
--- a/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
+++ b/x11-base/xorg-proto/xorg-proto-2022.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
 if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
 	S="${WORKDIR}/${MY_P}"
 fi
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e6f52af7441c..8cfb00dc84ed 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -5,7 +5,6 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d
 DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963
 DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b
 EBUILD xorg-server-1.20.14-r1.ebuild 5195 BLAKE2B 845754526068efc9d3e98256ce1d9a947a1533429416acd94b6025a86d7c4de4737177b8786a3238aee42e3f10314c42a00445dcad29caad6c94253fcfb9a1e0 SHA512 9615fbd48424508cec887368ed589857f80ad2087f63887529b3fa569a781c70aa7e1fa5a7d253c3731ca25db6da2f7cd9c9f9fd65f2eff66378412731dfcdc9
-EBUILD xorg-server-21.1.3-r1.ebuild 4445 BLAKE2B b8c7a20bb4a1d812305e16a4cd83e6ba0893ac447c9c84cfe802f1f2f2b61c307d5482690c59cc5e375b15a53014e89524425da7d59c88cd24731b536a1d5b14 SHA512 42f7029d9f3b5014bbd61369c417cfb97f59b1cc73193f52d3b0ef1453eede6e9bf8db570d8b9a97e16ac447c90bc649b18c14b3c839e740d48ac51ac6aafdd7
-EBUILD xorg-server-21.1.3-r2.ebuild 4485 BLAKE2B f361f3a9f3eb79703a2b117c1dda7f9f278ed9600eca30a7d32e08b0d0c27ed5c9dac40b9afbf235158aeb16d3e6e6f7c54041dcc0353133dc774c0f42cddd4f SHA512 e1c0150cd8007bb217dd09d85dd171e9fdbd5c188aef698dc28b13aaa70eba6eaae90012e4e64ecf8c6b9937c25b2024c61b1671392f249477f56e44e5678d78
+EBUILD xorg-server-21.1.3-r2.ebuild 4484 BLAKE2B 95ac43670df395fbd1c6ee31e7cc85d9b467be934e159eeab08e3b2638e16f7b4470065a6e20f4aa1829fc116882826e7252742a99c23038411dabeb097eee88 SHA512 0f180a3ec665f29436d978352846015a8046b1aca9717692aa9458ec22f9d36794b3cb98d6f29d9857f7f2d1159c2f9663a4ae8af5249b19882bd0003d9fa7cd
 EBUILD xorg-server-9999.ebuild 4454 BLAKE2B 0ca1c606ecbc7f47cdc8d13273141ce29d80130000eb7e00b5a24a069b599f276d4ff2b4583a6206b636137977d0a38b3559d3a6ab8843908c3e2691e9c7ef0b SHA512 d4daa9b356ab4a2044cb0ea88e63eada448b2cf75882f6e6c0639b06543f804dad8d52353035caac5f12ec001f95a468f6a25416ce4e500039e1728a0e4d6f88
 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637
diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
deleted file mode 100644
index 6b140fe486f3..000000000000
--- a/x11-base/xorg-server/xorg-server-21.1.3-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_TARBALL_SUFFIX="xz"
-XORG_EAUTORECONF="no"
-inherit xorg-3 meson
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	media-libs/libglvnd[X]
-	dev-libs/libbsd
-	dev-libs/openssl:0=
-	>=x11-apps/iceauth-1.0.2
-	>=x11-apps/rgb-1.0.3
-	>=x11-apps/xauth-1.0.3
-	x11-apps/xkbcomp
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libpciaccess-0.12.901
-	>=x11-libs/libXau-1.0.4
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	>=x11-libs/libxcvt-0.1.0
-	>=x11-libs/libxkbfile-1.0.4
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xbitmaps-1.0.1
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-	>=x11-libs/libXext-1.0.5
-	x11-libs/libXv
-	xephyr? (
-		x11-libs/libxcb[xkb]
-		x11-libs/xcb-util
-		x11-libs/xcb-util-image
-		x11-libs/xcb-util-keysyms
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-	!minimal? (
-		>=x11-libs/libX11-1.1.5
-		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-18[X(+),egl(+),gbm(+)]
-		>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	)
-	udev? ( virtual/libudev:= )
-	unwind? ( sys-libs/libunwind:= )
-	selinux? (
-		sys-process/audit
-		sys-libs/libselinux:=
-	)
-	systemd? (
-		sys-apps/dbus
-		sys-apps/systemd
-	)
-	elogind? (
-		sys-apps/dbus
-		sys-auth/elogind[pam]
-		sys-auth/pambase[elogind]
-	)
-	!!x11-drivers/nvidia-drivers[-libglvnd(+)]
-"
-DEPEND="${CDEPEND}
-	>=x11-base/xorg-proto-2021.4.99.2
-	>=x11-libs/xtrans-1.3.5
-	media-fonts/font-util
-"
-RDEPEND="${CDEPEND}
-	!systemd? ( gui-libs/display-manager-init )
-	selinux? ( sec-policy/selinux-xserver )
-	xorg? ( >=x11-apps/xinit-1.3.3-r1 )
-"
-BDEPEND="
-	sys-devel/flex
-"
-PDEPEND="
-	xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
-		|| ( ${IUSE_SERVERS} )
-	)
-	elogind? ( udev )
-	?? ( elogind systemd )"
-
-UPSTREAMED_PATCHES=(
-)
-
-PATCHES=(
-	"${UPSTREAMED_PATCHES[@]}"
-	"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
-	# needed for new eselect-opengl, bug #541232
-	"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-src_configure() {
-	# localstatedir is used for the log location; we need to override the default
-	#	from ebuild.sh
-	# sysconfdir is used for the xorg.conf location; same applies
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}/var"
-		--sysconfdir "${EPREFIX}/etc/X11"
-		--buildtype $(usex debug debug plain)
-		-Db_ndebug=$(usex debug false true)
-		$(meson_use !minimal dri1)
-		$(meson_use !minimal dri2)
-		$(meson_use !minimal dri3)
-		$(meson_use !minimal glamor)
-		$(meson_use !minimal glx)
-		$(meson_use udev)
-		$(meson_use udev udev_kms)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use selinux xselinux)
-		$(meson_use xephyr)
-		$(meson_use xnest)
-		$(meson_use xorg)
-		$(meson_use xvfb)
-		-Ddocs=false
-		-Ddrm=true
-		-Ddtrace=false
-		-Dipv6=true
-		-Dhal=false
-		-Dlinux_acpi=false
-		-Dlinux_apm=false
-		-Dsecure-rpc=false
-		-Dsha1=libcrypto
-		-Dxkb_output_dir="${EPREFIX}/var/lib/xkb"
-	)
-
-	if [[ ${PV} == 9999 ]] ; then
-		# Gone in 21.1.x, but not in master.
-		emesonargs+=( -Dxwayland=false )
-	fi
-
-	if use systemd || use elogind; then
-		emesonargs+=(
-			-Dsystemd_logind=true
-			$(meson_use suid suid_wrapper)
-		)
-	else
-		emesonargs+=(
-			-Dsystemd_logind=false
-			-Dsuid_wrapper=false
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# The meson build system does not support install-setuid
-	if ! use systemd && ! use elogind; then
-		if use suid; then
-			chmod u+s "${ED}"/usr/bin/Xorg
-		fi
-	fi
-
-	if ! use xorg; then
-		rm -f "${ED}"/usr/share/man/man1/Xserver.1x \
-			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${ED}"/usr/share/man/man1/Xserver.1x || die
-	fi
-
-	# install the @x11-module-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-}
-
-pkg_postrm() {
-	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
-	fi
-}
diff --git a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
index f184f85e417c..774aa6cf5f64 100644
--- a/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-21.1.3-r2.ebuild
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
 DESCRIPTION="X.Org X servers"
 SLOT="0/${PV}"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 IUSE_SERVERS="xephyr xnest xorg xvfb"
diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest
index 7ed6a1fe8d66..587006a75824 100644
--- a/x11-base/xorg-sgml-doctools/Manifest
+++ b/x11-base/xorg-sgml-doctools/Manifest
@@ -1,5 +1,3 @@
-DIST xorg-sgml-doctools-1.11.tar.bz2 120356 BLAKE2B 55a6e89675dff17bb873e187325255a3da0a431a49950dfb3aea353efa6335a01118512edc0a24b0690f2d2d8b2ddda49bd84e71064574048e06c0a4923cf0ba SHA512 64bf561bc7a6855f96d9df8b062860deb3b9967203339ae2fc02404ad29c05272f7ead3aa792b149811ecfc7af786567e0b8a66a2bf112d33ec7385dd1398e7e
 DIST xorg-sgml-doctools-1.12.tar.bz2 131356 BLAKE2B 555faf50f2e83b689566c7033669bd6e2e93294b9b6895d07110497392387f60b821fe570063e34d8089dc1a9f273eefb5ea0d0556d5965bf893756279e8688f SHA512 5c4f8506992abcc3d98b99d33b60ac770f039c3ffa11ad49005942bc9b7497367842a57967cee51b0e8e9095a660879af9a243abddf6b1af88741dbb882b3a4a
-EBUILD xorg-sgml-doctools-1.11.ebuild 406 BLAKE2B df22ff8918a192ac1044b55d63a031271a896b7c2edaa31bfbb305aeb21e7b1f1c25e03c581871128b19c8de07939fea102fda2da8ee0acd50da98349144dbe2 SHA512 9e992185a735469e4baf7d7def7a46d5399ccf564b5ad0fe33abdf9fea7d82a8cdf4ea7c0802e07bc949f3104e7892f1a9b66733e4f4b064c4b46f21c7ddca68
 EBUILD xorg-sgml-doctools-1.12.ebuild 411 BLAKE2B 64bc330961fc85110336ae852aefc9dbf55def2f60e3ebaa59e7d21241ff098826ab9a22a70b13548fa7f55bd5c6ad6ab1ad292809c09b5685327f335f4c1ca0 SHA512 bc88ec4fdc74fef2329a17462f2ba665fc5832bf502b1991311421ebf61847e01a0137a0e4cc397f776ba02e9ddb9326f737660f3106c83b02a3bbf4d3559748
 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267
diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
deleted file mode 100644
index 79f67580decb..000000000000
--- a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MODULE=doc/
-
-inherit xorg-3
-
-DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="x11-misc/util-macros"
-RDEPEND=""
-BDEPEND=""
diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index dca7615f8bd5..c191051eaba9 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1,12 +1,8 @@
 AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252
 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24
-DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525
-DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5
 DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5
 DIST xwayland-22.1.2.tar.xz 1271848 BLAKE2B 2efb3111396e1ed6ae6a4489c6d8612d511daea95edf456e60136185db9a69f937f0ab838e3c3095b76f9221d3b84ec0a1a7424f849e69d26eada0b988ebb675 SHA512 c8620169f16c2bbd592dbe77bc1f7a2c27a78f49a89bf966d8a449b7faacd69f5ea4aac7adb5b75e06dcc5efca26a2141c9b5d4cf6a592ec7882bad5e235bce4
-EBUILD xwayland-21.1.4.ebuild 1889 BLAKE2B 084f95eb85009e95da761a339a84cd0645ba0d0fa0c298722e3bcf56a8adc2f4433816be8bb2d9c8f6dce67d2cfc6ace08538d1111bbf5671e842fe2cd5ff451 SHA512 7612a13407450e6655ff958bcc316f40a5c180a9f3dbae8550a65abae12f341748471868592e26b01ca078bc894735cc80b9d1c59628509308a28cdf2c120405
-EBUILD xwayland-22.1.0.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705
-EBUILD xwayland-22.1.1.ebuild 2025 BLAKE2B 3f6065e7c66ef70eda549f7549184ce367b146d166cec49faa2ca1163c8e3f4f64e0ecb7330dd861966c9431005594f112f90a3165d59b8bbdf4688bcf0ace19 SHA512 cb12305607099945c057d7fbc9b8d174ded2235824c558922946d82d84fad850e9773270ddfe29806ff83029bec3d7663e299f7ef0dda0df7e0ecfee43832959
+EBUILD xwayland-22.1.1.ebuild 2024 BLAKE2B 303818387b24dcda4732e955da2198a1644d58bf8db85663d81644a0fd2bb1bbab88f4880f6dd6f1e169f88fec87d1161144829c01b54bc34e9c25a28c5be291 SHA512 9adb330f7818976f4bded0141ac3c4c3f1aa22668effaeebc29e781162574ff6dbf925b1cd82cab8cedc6bbf7b69b86c377d9525428b921bc3be8ab49835d529
 EBUILD xwayland-22.1.2.ebuild 2030 BLAKE2B 4ada48a4e50637f5cb12787d34aa29069d534c4fcbb672a57b8e99889927d963543eb3e70e69506f9ce121670db3d293529d0caee6a392a100763e924d6d7d49 SHA512 833f3dce21485744fe04ff6f6a27c5baf8997744e590e5b0d7a831e975f4f2a4902f56779d44df935f73551252a2da79c582072e85c8f3016ef9a7a94f661927
 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 7e7383bfa79c1aa60274d44068f63cd06f59c5e4f1c93b78660989068fbea140e2e9ed294a78466bcaa22fd43bae7c7d085f82d498180e7b8f1a08b905c204c7 SHA512 b3cfdae1ada3028a22afc4ffaf1165a8cfbaba345055afea7a4a35649c1900f9f12def59956309eb1c0f80304ce1f00b21566096743d41abd5f2032f367e070f
 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11
diff --git a/x11-base/xwayland/xwayland-21.1.4.ebuild b/x11-base/xwayland/xwayland-21.1.4.ebuild
deleted file mode 100644
index 3f95543af791..000000000000
--- a/x11-base/xwayland/xwayland-21.1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	>=x11-libs/pixman-0.27.2
-	dev-libs/libbsd
-	>=x11-libs/libXfont2-2.0.1
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libdrm-2.4.89
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/libXau-1.0.4
-	media-libs/libglvnd[X]
-	unwind? ( sys-libs/libunwind )
-	>=dev-libs/wayland-protocols-1.18
-	media-fonts/font-util
-	x11-libs/libxkbfile
-	>=x11-libs/xtrans-1.3.5
-	x11-base/xorg-proto
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-"
-
-RDEPEND="
-	${DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.0.ebuild b/x11-base/xwayland/xwayland-22.1.0.ebuild
deleted file mode 100644
index 242b2daef28f..000000000000
--- a/x11-base/xwayland/xwayland-22.1.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-DESCRIPTION="Standalone X server running under Wayland"
-HOMEPAGE="https://wayland.freedesktop.org/xserver.html"
-SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz"
-
-IUSE="selinux video_cards_nvidia unwind xcsecurity"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/libbsd
-	dev-libs/openssl:=
-	>=dev-libs/wayland-1.20
-	>=dev-libs/wayland-protocols-1.22
-	media-fonts/font-util
-	>=media-libs/libepoxy-1.5.4[X,egl(+)]
-	media-libs/libglvnd[X]
-	>=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-	>=x11-libs/libdrm-2.4.89
-	>=x11-libs/libXau-1.0.4
-	x11-libs/libxcvt
-	>=x11-libs/libXdmcp-1.0.2
-	>=x11-libs/libXfont2-2.0.1
-	x11-libs/libxkbfile
-	>=x11-libs/libxshmfence-1.1
-	>=x11-libs/pixman-0.27.2
-	>=x11-misc/xkeyboard-config-2.4.1-r3
-
-	unwind? ( sys-libs/libunwind )
-	video_cards_nvidia? ( gui-libs/egl-wayland )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	x11-base/xorg-proto
-	>=x11-libs/xtrans-1.3.5
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-apps/xkbcomp
-	!<=x11-base/xorg-server-1.20.11
-	selinux? ( sec-policy/selinux-xserver )
-"
-BDEPEND="
-	sys-devel/flex
-	dev-util/wayland-scanner
-"
-
-PATCHES=(
-	"${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use selinux xselinux)
-		$(meson_use unwind libunwind)
-		$(meson_use xcsecurity)
-		$(meson_use video_cards_nvidia xwayland_eglstream)
-		-Ddpms=true
-		-Ddri3=true
-		-Ddrm=true
-		-Ddtrace=false
-		-Dglamor=true
-		-Dglx=true
-		-Dipv6=true
-		-Dsecure-rpc=false
-		-Dscreensaver=true
-		-Dsha1=libcrypto
-		-Dxace=true
-		-Dxdmcp=true
-		-Dxinerama=true
-		-Dxvfb=true
-		-Dxv=true
-		-Dxwayland-path="${EPREFIX}"/usr/bin
-		-Ddocs=false
-		-Ddevel-docs=false
-		-Ddocs-pdf=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	dosym ../bin/Xwayland /usr/libexec/Xwayland
-
-	meson_src_install
-}
diff --git a/x11-base/xwayland/xwayland-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.1.ebuild
index 02348f4f658e..641cf14cc35b 100644
--- a/x11-base/xwayland/xwayland-22.1.1.ebuild
+++ b/x11-base/xwayland/xwayland-22.1.1.ebuild
@@ -13,7 +13,7 @@ IUSE="selinux video_cards_nvidia unwind xcsecurity"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND="
 	dev-libs/libbsd
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 2bb332d1e9ef..c9c6b071c59e 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 288447ff604e..8d61c50e3a40 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -44,9 +44,9 @@ DIST nvidia-xconfig-470.103.01.tar.bz2 108687 BLAKE2B 2e5de637f9ba7bb516fd1a6801
 DIST nvidia-xconfig-470.129.06.tar.bz2 108704 BLAKE2B 71ead889bca8503e987bc00c71531a4fd1a779ba6e679da5bee7636bfb4c46ff2984fc3b7feadd296ec45b58730fee52c55e1eedc0b24a4ff0976357eed79b3c SHA512 26955fbcd17e5d2caaadd0ff818cbdf93934d6cec5f29bb43fbc98bf300c9bc745f9e3dd977be1209a5f5a7f812d3fb9b2b33140ffc4b86789477661bb8c49c3
 DIST nvidia-xconfig-510.73.05.tar.bz2 109809 BLAKE2B 4554555b543073281f7b2e3f2d3463f7b4e8a7c8a734663af0d6a3110d432dd8f9e14e4e0efbd93902ae1e8cd1afefd35838f0bf70a5a619b05119acef25aa1a SHA512 bc992cd75e9e757f2e3edf35b38106362de0900085dec059b3b609bca3bc02fcac4a39a1481a7c9ca0e704fe0355e8f9620a1e8cc867e1c341d2b0df2cf47bf0
 DIST nvidia-xconfig-515.43.04.tar.bz2 109791 BLAKE2B d85d5f59be3e9cd919f0c89f2553186499e632bb77a46286ac1b3ef6a8adf2cd2ac1bc09dfa3dd4dc2f4017f9d3dd8d3d3f76f617d3a52e4e777a85218bbd525 SHA512 0eac9cda62fe1a9c5a5be11bffd5e6b06796626ed57ed602285bfd33422cc5f978a33664f39db8a94e46741ce89fa18d2c183945f42cc6bd1e52b6e1c54d9cc1
-EBUILD nvidia-drivers-390.151.ebuild 13917 BLAKE2B 6e6aecb15f27bf5388403fa71c4945c861fd72b717b25a57063d47620cb356156a2d6e45a11b95f2058f49836939d99d9e5268edb66d2d1e625ef8e0e62a7e3d SHA512 310d0c617d39c0bcf0bb2fad1c525baa37e19d6e920394115255f59aef3c82a529035fb5a182e55f62557d674334e80d65f7ee108de0faa94c9ae677c7297db1
-EBUILD nvidia-drivers-470.129.06.ebuild 14760 BLAKE2B abf9896b94b58390b423cad6442b45c6545c9278ae1a3226d9f980f417b0a4a1b0df3a3654482b4516226b1e191947144bef396726961524205647bc2e2d73d7 SHA512 4a5a728478fe4964e4c0e7f7925e361ce4704de4e0988cb38b5cb21f17854f44d2761c08f89200ad0659b5cddb25d4384261524efffaecda1801e9092209edf9
-EBUILD nvidia-drivers-470.62.30.ebuild 14595 BLAKE2B 945f51459a22d3a2af86512bca3faa486959aecf8fb65e711432a580e8d1bc3a035c6849915b72671b8bebb1a3f98f8c5a1b031c3a68a788f576df9b09628c13 SHA512 5041549c8c7f8bf7522ea3a634279982b4e9bc3a336bed0d620a87cc5d3bf9cc09d3f5ee0d93e001e795677e584f99109fd603a26957fabc7bc648834a129e39
-EBUILD nvidia-drivers-510.73.05.ebuild 15207 BLAKE2B d3ee1a9d2c0448db9bb02f60863c6bfe1683c0c2d6c84495b55a8356d73089cefa80ccff9c0e232e986d2c726e12c9851733fd9b9750900696c9be4546307b1d SHA512 96f381ad3bdaffd3bd0edde2defe4f5a35ad2102d1d1e141233e0a6911e85897aa012ded6e1a4abfde9d9a57acad711ae6d2c96ed0b3cdf7bc821e6f8ffe2f54
-EBUILD nvidia-drivers-515.43.04.ebuild 16947 BLAKE2B 9ca6572844291dca54f7261cdee47b24dc2caba135b063e6c72497b02bc9acd4bd03d6c64aec6b60590090d26d0e55c5f39bca14f2cc3c426c1a904200c287f7 SHA512 a968b182975e1123068a7cf0801899d71319d92625d607e283509d30745238a5a389940a51bdc38565717596ac254aecf41dbf6694bc73e44d316199b771b40b
+EBUILD nvidia-drivers-390.151.ebuild 13921 BLAKE2B 012229359b782811a356b5d34932b24429429156dbb125a341170f70ca91ef02f359e8160af344aa6214199d5ec8105a99f7fea77868b9f0ce5cdb87d40d6ba1 SHA512 6ef95202dd1b4083964501071dcd70ef5a7d61c23f69fe4a8b55e51144795a001d34cf801278d9b11867cfbc63c75d7d105ba875c9d60abefb218606b33fab25
+EBUILD nvidia-drivers-470.129.06.ebuild 14764 BLAKE2B e561563aa8be36dd5cabd837eea8006f8301879e099d5f2857267825f4909e919f5673649714e30892b128ea3c345e3f0a19b34435a0df66300727c18b58e5fe SHA512 e50488c062d0eb17d80e57a0e23fb0ebccd9f9858e72c26261b734b8bdbb79942748f4f79cf026b9d1ddccddbdf7ad5fd5c154bb0e34bf6ea5b7ed44bd57d220
+EBUILD nvidia-drivers-470.62.30.ebuild 14599 BLAKE2B 5476670d186ed7885e07cc173c72b759c0f5135ef52032cbaff0f9a6a5434268068987ed0233abc915981a585170dcd29d8f607fdd56cb65838871a7cb0b3bf8 SHA512 68fc4a37574ac8855332d0e796ea96f159812799ed1194185e0eb5eea0d13bafb24f57fc6a07e48e2e5d2c3b270411b5c22b5328f30291eef401cb92f55c577e
+EBUILD nvidia-drivers-510.73.05.ebuild 15173 BLAKE2B 77f46a7307faaa65ec2cdbd3e2997c574254bd3915050525f5755657e8da6d7822cb160facb94a8c8ce68a8768f3fe8b24a47c60ec04703eb1bfc0de5d8cbae1 SHA512 673cc47ffe05e42145b1df2e94cbb4f46d7ca5426eb5d0c117fe3ba3a9cc7faf2819a197d63dfefdd0cd11c974b0d27b67a35cd60263f01919ebe8457f8eb3b7
+EBUILD nvidia-drivers-515.43.04.ebuild 16913 BLAKE2B ce2182cdb4ba0c0f2edc094463e264b36ee783f92d228a63aa15f8aa33e24c961bf11131fca34ea184d469b2598badfb928f01d8ac73cf2852351e6c667a0256 SHA512 c00aa91f4117936362cba01b83bfcbf71f815f3975855ba0e26792878e560204a413bd6f5e74bc8752bb86f58ea3839e9fb82198c4d75bfa7ff292cb89107966
 MISC metadata.xml 1320 BLAKE2B f8aa8f9a39d6da284b60afb50087acf75744057628e79b77a95e6bebb1e386e9d1a819f41e73d3e94b8ab74322ec8e8b077ad6d2af0804a5c6f20b4dd5f2897d SHA512 9fb939f8c8892ce43afc4f577181474c88a0aae3cc58af57987000b82f6c52f3f7b40fc538fa8eae0d5dbaf1fe3734d84f72fda2106853edd945149b3f2d2747
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
index 3adab87a26ea..a76225d551c3 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.151.ebuild
@@ -167,7 +167,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export AR CC LD OBJCOPY
+	tc-export AR CC CXX LD OBJCOPY
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
index 3e46b31cd435..0288dd432838 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.129.06.ebuild
@@ -164,7 +164,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export AR CC LD OBJCOPY
+	tc-export AR CC CXX LD OBJCOPY
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
index f2528612b9fc..88c5511fa81a 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.30.ebuild
@@ -164,7 +164,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export AR CC LD OBJCOPY
+	tc-export AR CC CXX LD OBJCOPY
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
index b9f23f3149ff..c8428c85a142 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.73.05.ebuild
@@ -169,7 +169,7 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export AR CC LD OBJCOPY
+	tc-export AR CC CXX LD OBJCOPY
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
@@ -374,9 +374,7 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# MODULE:powerd extras
 	if use amd64; then
 		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
+		dodoc nvidia-dbus.conf
 	fi
 
 	# symlink non-versioned so nvidia-settings can use it even if misdetected
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
index fb4a71fa0b6a..6b86f430e3c4 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-515.43.04.ebuild
@@ -191,7 +191,7 @@ options nvidia NVreg_OpenRmEnableUnsupportedGpus=1' "${T}"/nvidia.conf || die
 }
 
 src_compile() {
-	tc-export AR CC LD OBJCOPY
+	tc-export AR CC CXX LD OBJCOPY
 
 	NV_ARGS=(
 		PREFIX="${EPREFIX}"/usr
@@ -397,9 +397,7 @@ https://wiki.gentoo.org/wiki/NVIDIA/nvidia-drivers"
 	# MODULE:powerd extras
 	if use amd64; then
 		systemd_dounit systemd/system/nvidia-powerd.service
-
-		insinto /usr/share/dbus-1/system.d
-		doins nvidia-dbus.conf
+		dodoc nvidia-dbus.conf
 	fi
 
 	# symlink non-versioned profile for nvidia-settings in case
diff --git a/x11-drivers/xf86-input-wacom/Manifest b/x11-drivers/xf86-input-wacom/Manifest
index 4ce0e953631f..281eb39c1928 100644
--- a/x11-drivers/xf86-input-wacom/Manifest
+++ b/x11-drivers/xf86-input-wacom/Manifest
@@ -1,3 +1,5 @@
 DIST xf86-input-wacom-0.40.0.tar.bz2 629310 BLAKE2B 63b930d3cd786d825250048fdf368fff4e607a39bfabee44e42a2c3ce9693c44ec8966871759d06b823f0568c4e3c2aee003633b863f5437eedc3125f19dd351 SHA512 ce0a24e2e9b4768e7eb65a5c663b3adce856356da7b83a1367dd7e031525805fc26d0b7c8b176a21fcd949c757940e18fec51d7253da157c0ac43ca446c4e536
+DIST xf86-input-wacom-1.0.0.tar.bz2 629019 BLAKE2B 4270dd4988a40d1307d15fce7fa0b6748db754e779cff5473b7a8f8ca5d0bbb36fd6125186e3ddba073f5521ee5c8657523d57dfaa82937a9d50b06605bcb8d1 SHA512 61b48380d8874241bbf687a3916aa089af087e50be93034cfc701a3311513ff855705e3e4073590a1b55be9751ab744166ddf14aa2311fdf0ccc01122af8e315
 EBUILD xf86-input-wacom-0.40.0.ebuild 1882 BLAKE2B bddb296eb4ea85cbb251e88f3bac83fd14eed98b94d6c57a7ce489e985b418308edc38f53dbf5fc3348efc22696fd0597439d1655b93985afb0abbf80fbf5007 SHA512 91d9d201e7446a55a5302cc3aec95aa19307f5e3edca8350a960416b24fa31d87267e91634e8ac52063369051dea39410513aa9da0863b628b3344682b798fed
+EBUILD xf86-input-wacom-1.0.0.ebuild 1893 BLAKE2B 2f3a80da39b37284d8a981ac0a1b5c5c71fd6a793fa0e6318fe7fc5dc96225a266a4fae9f92bc965d292b0ba612a18c95cb9fbe1c6f42050274001eb1a1732dc SHA512 32d63083f61f2bceadb666c20afc4f2947d2e926c7ffcc22bd1473ad23466cfa5072c432d00a189c5b2eed80c690e328c0f8ffa3ec53900b5ae48601142534bc
 MISC metadata.xml 337 BLAKE2B 4af5fa6cfa58ef6ecec60cbe9f316cc4adfa0b1eb304d2c1fe4525b916e1c347bd3b9a74c2e79a5bb88649aae92f00b624c619169fc8cb6ac81e359e58c53d2b SHA512 fba2d6d8bbfe90c65794dd1b831c6bad7dcd2b6e67036f46d629f4e85f926409b7fba0e99892ce7a2ce527fd080d5e75467d0ec38fee0ea2f7ecd311c2c49893
diff --git a/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.0.0.ebuild b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.0.0.ebuild
new file mode 100644
index 000000000000..3805f49a4e28
--- /dev/null
+++ b/x11-drivers/xf86-input-wacom/xf86-input-wacom-1.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd udev xorg-3 meson
+
+DESCRIPTION="Driver for Wacom tablets and drawing devices"
+HOMEPAGE="https://linuxwacom.github.io/"
+LICENSE="GPL-2"
+SRC_URI="https://github.com/linuxwacom/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libwacom-2:=
+	>=x11-base/xorg-server-1.13:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXinerama
+	virtual/libudev:="
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+
+	if kernel_is lt 3 17; then
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present TABLET_USB_WACOM \
+				|| ! linux_chkconfig_present INPUT_EVDEV; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    Input device support --->"
+			ewarn "      <*>   Event interface"
+			ewarn "      [*]   Tablets  --->"
+			ewarn "        <*>   Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	else
+		if ! linux_config_exists \
+				|| ! linux_chkconfig_present HID_WACOM; then
+			echo
+			ewarn "If you use a USB Wacom tablet, you need to enable support in your kernel"
+			ewarn "  Device Drivers --->"
+			ewarn "    HID support  --->"
+			ewarn "      Special HID drivers  --->"
+			ewarn "        <*> Wacom Intuos/Graphire tablet support (USB)"
+			echo
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	xorg-3_flags_setup
+
+	local emesonargs=(
+		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
+		-Dudev-rules-dir="$(get_udevdir)/rules.d"
+		$(meson_feature test unittests)
+		-Dwacom-gobject=disabled
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/x11-drivers/xf86-video-amdgpu/Manifest b/x11-drivers/xf86-video-amdgpu/Manifest
index 41e7f397affe..d3f5a3e84be6 100644
--- a/x11-drivers/xf86-video-amdgpu/Manifest
+++ b/x11-drivers/xf86-video-amdgpu/Manifest
@@ -1,6 +1,4 @@
-DIST xf86-video-amdgpu-21.0.0.tar.bz2 448400 BLAKE2B c7a90606b37b646b946f76d083b3d59755df331ffb7e83e4e65a821a8c0e556504b20207d6bb86e80ea98646184549b6388727df543e1e2cbab37600e243fa72 SHA512 44ccc8ddc36f09d1608cf58b6cf85dda090671c46c5643e9453f7d67f4d6850c3c9753eba43539d45773198b8042898a50153b5225780e4b2852410c5521314a
 DIST xf86-video-amdgpu-22.0.0.tar.xz 376956 BLAKE2B 30936b45cce499791272e9194d5180c208e5159d1b3643ce6f261b2e92a30127a55096cdb07391cb4e91b9b47bbc9a4c5673ee66bdca5cd6f86fc74c7e3d6077 SHA512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a
-EBUILD xf86-video-amdgpu-21.0.0.ebuild 561 BLAKE2B 0525c53ecf1b2a7b3fe8d4e1823e50d390cdbde0b89df0c9267238a00dcfb515ba7c40dd34dbf5326de4fb4afe2aa886253208364788f0439538476e6ef902a0 SHA512 915f463eb31af478da19ed6dc8caa8d3d0d27de5ae517de3594a3ed575b71c4c02369f00aba21ffc63b3c95afeda9fd839866856562c4f6866d0531df66d8716
-EBUILD xf86-video-amdgpu-22.0.0.ebuild 594 BLAKE2B cc4b3702b62db7096a96603f573ac9decda0e40ff4f0b53ea834eb8911ed8f02fac94deafd2ee1015554c1fefa375b65fc0e434f2f3654a649e0ec8dfcbc1dd9 SHA512 d6169e4c54a688ef6a119fb124d02e3ad73d6cafe746db58f85de7506948cc2313cfaf450b7ef6719b101787f3355563bac79b9e755180f9665abcfb9b51e2a1
+EBUILD xf86-video-amdgpu-22.0.0.ebuild 593 BLAKE2B 881696e3cf2213c0a9712b9d03a92ef9da03f15bb2610a308a662c3bec991f44650367b2012e63f6b338ceed39a88aebd60f6b9cc7e84b7083da1bc5a2e497ca SHA512 febfb8903f9d5ecdac50496425944c09d3288430c80b58e673bce337ab0a9e903554d070bfb26fcf36dce92d364ad9c8e6214edb8c9040ae60d12e8a987b23e7
 EBUILD xf86-video-amdgpu-9999.ebuild 596 BLAKE2B 754c17bf2bf12fa8989d256f4741ed245e144c4dda78c06fc400a68fbdf6b3ed600540e506456dc3951cd55d7e27ba04780869737cf2e73c48c4fcadd670e4de SHA512 5827e02eaca03d267131979a3abfe0542fb92af35b0e32a26835f287226af38c5393bd0eee835def73a355fa77de7cc4b97759cc266dafd4f951bd5140928058
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
deleted file mode 100644
index 9576e9abf56e..000000000000
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-21.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-XORG_DRI="always"
-inherit xorg-3
-
-if [[ ${PV} == 9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
-
-IUSE="udev"
-
-RDEPEND=">=x11-libs/libdrm-2.4.89[video_cards_amdgpu]
-	x11-base/xorg-server[-minimal]
-	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		--enable-glamor
-		$(use_enable udev)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
index eac0c4a356e7..5c2b441fc865 100644
--- a/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
+++ b/x11-drivers/xf86-video-amdgpu/xf86-video-amdgpu-22.0.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~loong ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~loong ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Accelerated Open Source driver for AMDGPU cards"
diff --git a/x11-drivers/xf86-video-dummy/Manifest b/x11-drivers/xf86-video-dummy/Manifest
index 5f1c943c84dc..bf113df7e0fa 100644
--- a/x11-drivers/xf86-video-dummy/Manifest
+++ b/x11-drivers/xf86-video-dummy/Manifest
@@ -1,5 +1,3 @@
-DIST xf86-video-dummy-0.3.8.tar.bz2 302353 BLAKE2B 1327db3aeec2ff7e3ff0876b25eace6fcdc7fc428967dee9f0b8ee4c22dd7904dcb47d5433bdc14ab56638225b2d33f3a26543dc9e6041c60af4135c1555f798 SHA512 f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80
 DIST xf86-video-dummy-0.4.0.tar.xz 258452 BLAKE2B 8364a705bac5bc0bf2767be30b23a67753cb9232a58819c5b3ea3fa91769049e38cb04a5504b34e4aa5978f45a17617b999541333e3a1ee66d30892f281d7cc8 SHA512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9
-EBUILD xf86-video-dummy-0.3.8.ebuild 475 BLAKE2B f2d8127e457dea06bd3dca38808cb80f597a85275572ce1806cad20f3b76dd3a00b5934576c88f8776d6d39f293ad38efbc38ece53370972c2b320071b0e2475 SHA512 68caf4e84367b2429af6f1b1ff30598fae369485db667a97ac2867289f2179927c4d6d645d05f25a1842539fa8eef650882b3e00cc0d93a9c7a1c5065b0cd250
-EBUILD xf86-video-dummy-0.4.0.ebuild 354 BLAKE2B 0edb41b70305cbaad8d07fd8cd69c3522b2119d4440c4d4ccbd73e278d2783e866571f0fcc3f4b2c0dfba412e653b309e863e97e691b4cf6883f7f8930dcfde3 SHA512 166a4c8e8a078d0365812599f4be2d6a3304a21f4c218a04293aea779936e73499589cd303e58ae0e16a9a200a936aea76eccc09081f50031cbea1ba5d0b22e8
+EBUILD xf86-video-dummy-0.4.0.ebuild 353 BLAKE2B 593760020e7b31e7c9f314c86d1ed70d51c9f81f16e6c83b6b051c8b6ea85ab6fea68500ab7824a84b4d52e59e5dde9104c143b63752c7c9fe18de26ad56cc6f SHA512 dc5e4bb32114cc12ab37a6b4a883f64edd02051e764a79d6ddc24e62aac956623496bdf6b7114ba2316edc61bbf3fcc26ef42c3119986289042bc8177a4e42f5
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
deleted file mode 100644
index d42b8ae591db..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xorg-3
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dga"
-
-RDEPEND="x11-base/xorg-server"
-DEPEND="
-	${RDEPEND}
-	dga? ( x11-base/xorg-proto )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable dga)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
index a5c01740ded5..74a8f32f592e 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="x11-base/xorg-proto"
diff --git a/x11-drivers/xf86-video-qxl/Manifest b/x11-drivers/xf86-video-qxl/Manifest
index da4d9054ee4b..a8d061a2b92f 100644
--- a/x11-drivers/xf86-video-qxl/Manifest
+++ b/x11-drivers/xf86-video-qxl/Manifest
@@ -2,5 +2,4 @@ AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build-bool.patch 339 BLAKE2B eb34df
 AUX xf86-video-qxl-0.1.5_p20200205-xorg-21.0-build.patch 3197 BLAKE2B b2a03a9af5b0ab733288e1c484d057bedd065332c2ac05349b6ae4aeb439f8d8cee8ca1ff4a3de413b53ff2bcb1f989a91d8b373721209c452226b3a8ca7bcf8 SHA512 35bd57e0876d5ab18e629a8d24598b05f59424c842e6902d127a377cb76ed92f9af923b0e32f49044b67223a7b3f44dd4b3afbf971471509f50e4d31ee5fab2e
 DIST xf86-video-qxl-0.1.5_p20200205.tar.xz 137452 BLAKE2B 1639a393dadcba251a8fe761d52112d51c29e70960524785343379ec088e69c5e2cbd1a9710d72c749dc8b7303b3eceb545fbaec82d5d22613f8ebb0a4e7aca8 SHA512 9a2ba4aa7ef61d3ea0043ff1e3a8f312b7fe00f707045bcb4e4fc1189786b9aba2b6e44696f47e7c215485044f6c953f831ed4da48d4098cd7b62555c74a79f8
 EBUILD xf86-video-qxl-0.1.5_p20200205-r1.ebuild 1052 BLAKE2B ba88989993a4fb127f9df01e8ec7b1329fa1001ea623cf3439f08aaa1c55877e2faff484e45e9915e2e3d5b5aef55b6efec9b925b2e2a56dbf6a1caee8d48124 SHA512 8b19efa6862d31de106a8ad29abc93b459571a982651cfffc3b802a06391b04afe7462edfb90586ea3bc64f9fc707b4d28621955965507646365333f0e7d1b33
-EBUILD xf86-video-qxl-0.1.5_p20200205.ebuild 910 BLAKE2B 1788386f0dd74631283555897608fe893baba6c3921856987e89a2b1234e784ef147aff0e688a41bd0864b5e268999288ddc71f362b8afaca1db8ea7c712536b SHA512 a737c5ec8cd5f69ac672f17ccfab8cae9f3e77e84824137ea4aca425cb0e95cfa25da71c8ff60039f8b6f1bbc0ba7b465136f296e06607a8cf40cc12dcb39656
 MISC metadata.xml 353 BLAKE2B 069be65314e1a998fd531c1f26b09f78282983ed7e2bac3e0349b506cbce9293e7d80514a935ca1e4e74219656d0471ae329b694510a2fd30dd54508769ce6b3 SHA512 caf03baa6cf42a11adc3649fe17a0eab7b1eab66f2b0f44131de40d19f50e32202f245f767910b062ad7825a0263563922f8ec07f7584225839557f6d0668c2e
diff --git a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild b/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
deleted file mode 100644
index de439fe01e35..000000000000
--- a/x11-drivers/xf86-video-qxl/xf86-video-qxl-0.1.5_p20200205.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit autotools python-single-r1 xorg-3
-
-DESCRIPTION="QEMU QXL paravirt video driver"
-SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
-S="${WORKDIR}"
-
-KEYWORDS="amd64 x86"
-IUSE="xspice"
-REQUIRED_USE="xspice? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	xspice? (
-		app-emulation/spice
-		${PYTHON_DEPS}
-	)
-	x11-base/xorg-server[-minimal]
-	>=x11-libs/libdrm-2.4.46"
-DEPEND="
-	${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.0
-	x11-base/xorg-proto"
-BDEPEND="virtual/pkgconfig"
-
-pkg_setup() {
-	use xspice && python-single-r1_pkg_setup
-	xorg-3_pkg_setup
-}
-
-src_prepare() {
-	xorg-3_src_prepare
-	eautoreconf
-
-	use xspice && python_fix_shebang scripts
-}
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_enable xspice)
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 6e5e9dae895e..f6170faabdb0 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index c3d86ffdc8fb..2d7933afce5a 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -2,5 +2,5 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.42.6.tar.xz 7708484 BLAKE2B 003b1de915ce8f17a987059bd9b2679127a08032dc70567ea169aa0dcdcc194216f66d03f35f5580e70e1c05fa15f08b18c86a72e9bcefc2bd6ed59abdb24b82 SHA512 02e6d89de6cb6c9768d5173dada88c038e2454b4345ebc6f7b012d484303c08e53b58f085e872290555e1ccb74a478fa6cef4623a75f2e1f05c27bfc4e986f4d
 DIST gdk-pixbuf-2.42.8.tar.xz 8503020 BLAKE2B 39960043c5aa980f311d2705c868c170c90c7b580ac9ae849a3fdfc6a5faffcc24be23b82ca8fefb1cd5c28d2a02bfb87b1c5c5d1eab7b897f5e551a57577f7c SHA512 994a1374becec6235d347f4980afcc8b85f43ac373e4d7e00b7445880d0a51932e63b54429b28ab5af09e7c4437f9d6008e1c25b2d44a2c9ef7cc9821b478387
 EBUILD gdk-pixbuf-2.42.6-r1.ebuild 3307 BLAKE2B 1fba64eace5724ce75edc53a499372559ed6602dbbe32871de052187e28c540393d6e403226dce86695807f7bf6d7376f1ff492ddce8b2f48a4fb8c4fc0f5215 SHA512 09f1bf11be4a9be92688a8747bea2891e2c49d50ebc8469576af3f95a9a07571e80d4fed35a83ecd3ab0e8c17169a92838d6f227a8a36d5488b10a18160b7d0f
-EBUILD gdk-pixbuf-2.42.8.ebuild 3467 BLAKE2B 871c6da3bb686d019add7a186a86fe9bae99a73cd30d9d4e0cf8d896fba0109ff0d0fb70b6c8d5e10feea9f68001bd1463eefb2b67ad8c18566dfe37258f3feb SHA512 dadd3c63c80817e4a79640a0891b5747cfc04c9c3b5be6b45279472adf5a86c978daf5ae11bb8963b0c8550fcf21ae7e467fdf86dcc410d163af410f5569e904
+EBUILD gdk-pixbuf-2.42.8.ebuild 3460 BLAKE2B ed11c3509fb618c3036157499a9e1ee88118dd802a343b3fbf7df1da5068181f7d0ec7057cb66d0a78c3dc1b8cd5bcb488425d677eec4e023fd85f157a8d31e8 SHA512 689748e685b6363ff41451ce406ca5bbdc82a1632ef2447d660718d5368573997ed9adc3a5e1ffcd17414ae921f777a7548c075e35f2debf079ebb3bef7c9805
 MISC metadata.xml 332 BLAKE2B d11021f9889f64b977816523c2ed8f4b122b3f510e9649ef1548584f99b97e28f782d6fa753e92042bfefc8da4d1c9694949559660d99bdcdaa648af0bb01c4d SHA512 9bfa76b3e49cc2038dfa8af478bd12ec1832c4cf073987a88d6c1b0da791496d45f20b7a411e08c89bcffa1ce207fa07c08da244f93a2534175e0b80079965af
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
index 197b9021df0a..eddc8dc3665d 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.8.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-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"
+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"
 IUSE="gtk-doc +introspection jpeg tiff"
 
 # TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 52cb88b951e6..f3f5355f49f1 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,5 @@
 DIST goffice-0.10.51.tar.xz 2432992 BLAKE2B 89da3c4707516884c13fed15f3ea04a60f871888469c7a119d42654f1470001bbcbc5a67bd46fcdb6af458ded0cb951a132cc60cd7861d6ebb762bdab1cf4311 SHA512 4d0e6c4c4c6c2f18b1e22c2b24d4034a693c1f6698e58589b83a956b9ff52d1ce05f1e7fdaab5c22c8c6f1d93b53c202f2505bdf9fddba646ef34c75fdb2f520
 DIST goffice-0.10.52.tar.xz 2436944 BLAKE2B 13c2d28cd9bd081d4636325e3df14193d5ffad913f4f9fa78251d848f293eeca5ee265058b2c9662b5bd48957b39f31714eb41469f3228359dba1923f918bea5 SHA512 8636bdfd436a0b5853aead6ecf09ae39c5059b2d9044cf04c9f2e0f4d2572aaa07e51cfd123b0dd153877d1c0d5f4af78a031d63b03c724bf1e8282d2e1cc841
 EBUILD goffice-0.10.51.ebuild 1426 BLAKE2B c26a2b63209d72e576da5e60899e2e30351530a819e060d6adb5451660a1d5557b5a511030d7bffabf106d7dfe843b391b71b361c4691a00b515e58533daedca SHA512 97e0490875f3698a4405cc203fa87a7eaa3c7e336f6d71bb7de0cf411e24afc59a304fab9d45f9c16952af6f77269c3296fb6525cc97002a99e7432806d8a1dd
-EBUILD goffice-0.10.52.ebuild 1427 BLAKE2B 3524f72f80da0d858b23d8598d34d4b987b49d73bc33990489634696266471eb8332d9fceaf0af0ba477efe05b0271efddb8d7115e621be2e9fb4eb410888809 SHA512 7d3d4b895e36936e05c126861993f529fe84236deb6ede9426f80ee4b1439d0f672dbead9b619c550b0efb7a11120b9dbb7556efa0fb03fee6607b04c311df49
+EBUILD goffice-0.10.52.ebuild 1426 BLAKE2B c26a2b63209d72e576da5e60899e2e30351530a819e060d6adb5451660a1d5557b5a511030d7bffabf106d7dfe843b391b71b361c4691a00b515e58533daedca SHA512 97e0490875f3698a4405cc203fa87a7eaa3c7e336f6d71bb7de0cf411e24afc59a304fab9d45f9c16952af6f77269c3296fb6525cc97002a99e7432806d8a1dd
 MISC metadata.xml 547 BLAKE2B d4d95fec4ee5b452af722544aeab368219ecd832def2458af565639cbed6e37807a8fd54dc388070bef89f6f277ac323f27cc397f9b469f60e02e001e12a91fb SHA512 b5b72cea3a76b2ce768510f32e7e4ac77a4af086671304a52f19897c54a3e8af1f36b625e590498bbb51da5c267af66ed979c8a27d9e0d6c4f4bfc7f78390326
diff --git a/x11-libs/goffice/goffice-0.10.52.ebuild b/x11-libs/goffice/goffice-0.10.52.ebuild
index 2bcc131cd893..d5051f0e3b5c 100644
--- a/x11-libs/goffice/goffice-0.10.52.ebuild
+++ b/x11-libs/goffice/goffice-0.10.52.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # FIXME: add lasem to tree
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3be43f142bbe..5dadc46a2f4e 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -16,5 +16,5 @@ EBUILD gtk+-3.24.31.ebuild 7203 BLAKE2B 7ad891b9fa23e198e2f76273cb60bcfd5a8d9acb
 EBUILD gtk+-3.24.32.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
 EBUILD gtk+-3.24.33-r1.ebuild 7538 BLAKE2B 1dbfd69f08d8284b6c25b1282c7e27c2c33842ec52ecee9bdbfae5a8f8d01ea486c70de3cd547dfc680aa8e098fc03a23abd35e7211395b80525d1e19b980884 SHA512 2520c07a5d54909bd775e96a760994723c6d0b4f12f165e8f9174d7a1a66c106b824665c2fec6c28383d9b13403bba5b00db3109f8492d8e9884a00af3bcd40a
 EBUILD gtk+-3.24.33.ebuild 7211 BLAKE2B 79d8cf2baeaa79731fb74c2de6d17662cf952ddd0975b4e64ea45e28dd789a29c47cd3bf713228600ccce03a46a392ef3ef73bda600213a30a59cc94f0468f21 SHA512 d0cc7ebd356d006a41f085e98cfad987f9e95dba5983d575fa82914a1e3c8c2225f67258296b2c9b805f9fb4232882c9c002d4047c5d5d6eda9e8cb0d52600da
-EBUILD gtk+-3.24.34.ebuild 7218 BLAKE2B 8be69dd912b7b7a00d84005fc8f3bd63cd9f0d01fc7c20935cd40659030a703fd594072611d09c164aceff478aa5dd5240acb6884a6f839d6a75b53f22d65dda SHA512 6e700fd8bfd95c9ba558852cdc71e222f7296fb0455a1b7474518e1a8bf17c00b2f9d109a8966f2dff80d0e3cb9cb53c5e1135028320aae0c9ceefc3671a7d85
+EBUILD gtk+-3.24.34.ebuild 7211 BLAKE2B e32905a2a7136eb17df892bfb7eba0eafe90d014a2e7f49b191d095ac934af3cf7b26ad116f2622280b4002f0cce95dcb089173bcb7998e4e0ec57f423c46f4b SHA512 aceafadb37a09176c2f24f1d68f84c7dffa6fc6d562c498c4ead554d5f5e68c11529ebfd780c651d71417cce22a73d16938ea46d62db9f56c9c48e3044517718
 MISC metadata.xml 875 BLAKE2B 40b9f97f4db18f276bb80587843146c5227b5b803306da704ad99f8c7c34fb22cddbfb9f1df3395e2288ed258970851cb9d100f40b846f95d414e2b47ab78f99 SHA512 02b9c2674783308f54bde4d983185d36b372f64f1ee5d9d2cd797fe1158e3653a1edb8ece51a0be143775e9b85d71d4375769e2682778a9286fff42cbf18836b
diff --git a/x11-libs/gtk+/gtk+-3.24.34.ebuild b/x11-libs/gtk+/gtk+-3.24.34.ebuild
index d1ebbb11b084..efcf497b2c91 100644
--- a/x11-libs/gtk+/gtk+-3.24.34.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.34.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 6ee094fe705e..26cfb6d68bcf 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1,9 +1,5 @@
-DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
-EBUILD libX11-1.7.3.ebuild 931 BLAKE2B d27af79560a6b919d117482959f3b33602025477821be40a1f1a63a53114608d726cdc561ca1c774341c9100949bd534a044dc3366d2a1fb422f15fd817b5c85 SHA512 d37cfe03fc06a48e09812118671f3fb9070ab388ba95025fdfd8bb35c68e0bcd775285aa22b5d07e62454639abe7c3ee773ea087b31a27313adcbbd005f6a5cd
-EBUILD libX11-1.7.4.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
-EBUILD libX11-1.7.5.ebuild 939 BLAKE2B 5df73e1caa71a9e9966480d7a2969bce9c522573222eaa6ee58e40f48adad38219dc4c56ab382c442540321e15ea376de843b78e36eb8bae2b40b6444bac4623 SHA512 cd2580b710ebad96400c4ca72f5c70cb975a37014b59a3d163ebca99649ec089ad9e8a546ee5f050b2f70e9b67c9b4fd322f15181329f98eb3bd72d7c6651bee
+EBUILD libX11-1.7.5.ebuild 938 BLAKE2B 6559a7c7633d55efa6774d3b0d100a289e060a32c53cff2fb1c7dcaeffa2119058eeb8aeb1b0ff1d13dfca02fe07086c9d42071233388ede0a5b5f9a74b5bff9 SHA512 340786682d8218feb524815a1813af189f21d5a4b100e3fb61c399afff7897298a34aff2bbe8f6efe96ca9899b89f1e5acc2515f21e9277aad7c423b319f2d32
 EBUILD libX11-1.8.ebuild 939 BLAKE2B c8c70725bb4cfd15cb2eeaba451fff53a239c07c0e159d1a905cdeef850222ff1aebd161bbed83ec68f105235b0c2bd96bce2112330e641ad9d55e82aaf871cb SHA512 a582dd6fed67cfd1af18035632e9d3c5e1505232c2287028cad6cdfb24b3892f3d61d715aa26debd41aa85adf8ed61afcd960e8fda71579da6b3df9587ed93d4
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-libs/libX11/libX11-1.7.3.ebuild b/x11-libs/libX11/libX11-1.7.3.ebuild
deleted file mode 100644
index 348c3207fb78..000000000000
--- a/x11-libs/libX11/libX11-1.7.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX=xz
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-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"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libX11/libX11-1.7.4.ebuild b/x11-libs/libX11/libX11-1.7.4.ebuild
deleted file mode 100644
index 34171b8bc0c2..000000000000
--- a/x11-libs/libX11/libX11-1.7.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-XORG_TARBALL_SUFFIX=xz
-inherit toolchain-funcs xorg-3
-
-# Note: please bump this with x11-misc/compose-tables
-DESCRIPTION="X.Org X11 library"
-
-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"
-IUSE="ipv6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/xtrans"
-BDEPEND="test? ( dev-lang/perl )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable ipv6)
-		--without-fop
-		CPP="$(tc-getPROG CPP cpp)"
-	)
-	xorg-3_src_configure
-}
-
-src_install() {
-	xorg-3_src_install
-	rm -rf "${ED}"/usr/share/X11/locale || die
-}
diff --git a/x11-libs/libX11/libX11-1.7.5.ebuild b/x11-libs/libX11/libX11-1.7.5.ebuild
index c041a90fd768..30015bc8dc2d 100644
--- a/x11-libs/libX11/libX11-1.7.5.ebuild
+++ b/x11-libs/libX11/libX11-1.7.5.ebuild
@@ -11,7 +11,7 @@ inherit toolchain-funcs xorg-3
 # Note: please bump this with x11-misc/compose-tables
 DESCRIPTION="X.Org X11 library"
 
-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"
+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"
 IUSE="ipv6 test"
 RESTRICT="!test? ( test )"
 
diff --git a/x11-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
index 498dfa701eb6..699f40797fa0 100644
--- a/x11-libs/libXcursor/Manifest
+++ b/x11-libs/libXcursor/Manifest
@@ -1,5 +1,3 @@
-DIST libXcursor-1.2.0.tar.bz2 334144 BLAKE2B d1dc7f09b88bc570653e615ec5e854b7cd9362a8429e90dc36e1d7efe26fd9c0eb9a38ae8d18a308e1912bb1765e2adbf13f36a265500be2f787d60017091898 SHA512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03
 DIST libXcursor-1.2.1.tar.xz 280352 BLAKE2B 5c59a43d9cdaaab887ef7ffbe836534508e3542959dd5011c08e46db1d5e4de6e7ee47b1574eb1bd2aebc8baa8fe401e5195fa73bb2ab47b779dbd03af4bbf4a SHA512 ebb42a39855aab86d0c11fe6ad33d011cf56a6dc5c309bef643460319c03df239b7e09fe88777bb25c0e9ff8aceac6bf66e51cc04a2d5ee463b3bc3bbf1674e3
-EBUILD libXcursor-1.2.0.ebuild 887 BLAKE2B 3556729903c8d63bfba3d1e40ae86ba71812a740467bc0485847c2fd4611d00624ba2a138bb07bae79facb1d16ccbafe2f0ccaa5f6b099a0262aa30f7608f898 SHA512 8141cc2c6c1a704b1ca7b33828ceae7dc0e0e0c5b5663076c5b489acf6dcfcf0e52e409277ebffe01583a603b1e07bb2c348c3cffc3c2ae0daa49d9aedbc3656
-EBUILD libXcursor-1.2.1.ebuild 939 BLAKE2B 2280d6e5df8e31fe6ce3f8531f33884404ed862c6dd2360102f6af5ba7a553d7e5dd36f5e54f34e1b8eff6ab263051090af5d1a4c8639703fbede428ba6d61e6 SHA512 16db8820d7ed24ce86a7a0a588e349e0071d082455b71169ed66b17ec7051eb00b6d8983f5ba29a3e03bdad40f2b3ecf3a9a4d387157c71eef4e4d835962d10a
+EBUILD libXcursor-1.2.1.ebuild 938 BLAKE2B f1c19a8c8b0dbf8e9e84e0c81a8494398cfaa3877eb81cad39c5b63dd0f00765ebe720f67b80c1f83cb79aff318c9f60956e56cfb330ba2ad5e5dc79b4370a9b SHA512 a6eca0db489a7913b7380d5b902c09d7c299fca00084bd2af504db5c1b0e9319083956f2d2e57569bacafc2ed01c7a2b6bc8bbd12757b8d117b879082b9130e2
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
deleted file mode 100644
index 6a7647d50d38..000000000000
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xcursor library"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
-	>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-icondir="${EPREFIX}"/usr/share/cursors/xorg-x11
-	--with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
-)
diff --git a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
index 7e64637a99b6..9a3ebe6dd3d0 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Xcursor library"
 
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index cdaea95b7ac2..eefaf2cf6771 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,5 +1,3 @@
-DIST libXt-1.2.0.tar.bz2 810521 BLAKE2B dc60b8fb126f465122eec4df287d5a0d12e483457ba20abbd04a17a8a5fb8a1073d8765236b8020353ec3c5f472b1580ba7a99d6896ce5fcdabaed5f4fbc6753 SHA512 06248508b6fe5dfba8ceb4518475f656162351d78136eeb5d65086d680dabe9aca7bba3c94347f9c13ef03f82dab3ac19d0952ee610bc8c51c14cee7cf65f0b1
 DIST libXt-1.2.1.tar.bz2 784610 BLAKE2B 69a1446a22acb50e625ab4a7b24b5db634d47a540d4543a3f58459dbb380d61aa4bbbde50328c76b2c31eaae3662a1c71cdbcf9bd3a0c915ae4e587f63fbee7a SHA512 6877af61ba91eeed6b6f80471b84f354ad0ec0827249c7ee0a00c13508063fe8d2696dd400a4bdbc6ca2ff67cbe1317ad5ac24522fd96099dc56535e33ca052c
-EBUILD libXt-1.2.0.ebuild 875 BLAKE2B d7139b22e4a29967a99a807004a4a56b210f44bfe7f5975077dcd17a60fa8f51bc64d5c7b49e8cc6661883b5c1cad091eaaef6ae9a94a300668b8c571dab5624 SHA512 5dbad6e7ace4f45106551511e21262b4b31c398712ffae506284dc54c01db353a8619685f20017dfbfb1d8d32aa923c8d8078b8ccea63e64b2bb4974c2c5c115
 EBUILD libXt-1.2.1.ebuild 887 BLAKE2B e02f6eb93eb829133807f01734cf666f62e0ae59bd5ff48857454c4e5ba7a7b1ce9eed3a9156e7b78b2b38e75038b96e74c0cbc3a405785a7643ae04ba46bb41 SHA512 4cd64255595ecf5db9659f696c1a8609fae80c7d98d5eb86019df48c40dc9c29f4cd57c558a7016e1035b6d214daac01d74fb619302d243c466df42c2627426a
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXt/libXt-1.2.0.ebuild b/x11-libs/libXt/libXt-1.2.0.ebuild
deleted file mode 100644
index b0e36cae59e9..000000000000
--- a/x11-libs/libXt/libXt-1.2.0.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
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org X Toolkit Intrinsics library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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 ~x86-winnt"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	test? ( dev-libs/glib[${MULTILIB_USEDEP}] )"
-
-src_configure() {
-	local XORG_CONFIGURE_OPTIONS=(
-		$(use_with doc xmlto)
-		$(use_enable doc specs)
-		$(use_enable test unit-tests)
-		--without-fop
-	)
-	xorg-3_src_configure
-}
diff --git a/x11-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
index 7eb244c19d24..9fcaf43ec0c8 100644
--- a/x11-libs/libXvMC/Manifest
+++ b/x11-libs/libXvMC/Manifest
@@ -1,5 +1,3 @@
-DIST libXvMC-1.0.12.tar.bz2 306581 BLAKE2B 180867489863f45ee2cbeb259ae07cead3cef595652f6c02fcb5ffeadb8c286f4dc6fc8ef4b7df0c30b95ef51d8626798a76b50165689927c3449157fbe1a552 SHA512 62cb9a72b20af3b081d2d555a253b0e2b8b26b31f4fad10bd3e53bbf96e1663b61bd8df2b78b16f18218cd37cce0c9e6809ae16ded226b37a8b199e41b223955
 DIST libXvMC-1.0.13.tar.xz 274180 BLAKE2B 51e7a08b0a1c76c9ed3bf53dc9656d7cea836ce7f5c17175b0700f73f2a8c4c0a9a91a6c3bc3b3919c4fbfaecc8e305d344ebf4654662d297735bf53d9a55579 SHA512 c9d0f73884a586efb9ea4f77fc8555f60d940077d7dff8eaa765b86345c8b4e3d80b860f68191d2830c272b9e464c08450fbb51bb64819753a6f4228c71861ac
-EBUILD libXvMC-1.0.12-r1.ebuild 533 BLAKE2B 9046b13633b260e85afd2cb81745cbc5c2ecf437e4a914ff5e3e17ca8a523bedc9206dcb466d00fe370aa35f83165d7c5d4efedc0e5c73b4dc1e97fa558cdac0 SHA512 fb00943b7cb92d3b751750ed709d4f79fb1d31ca8996d8027405f769be49977f8d4d505da72966c93af17783c50623c36daea045e7c935b9488737dc15f730ee
-EBUILD libXvMC-1.0.13.ebuild 713 BLAKE2B 2d057b611890a5c21a3eb4c4da11d60144792ac29a6331e49f849ec5d23b7755483eed476bd7de62c7b231d4a46ca0b9d6b9af7ef6816e3c8724f6b1cc11217e SHA512 c1346640781efab4dd1b27109011bda07cd22fb1dfe471fb1154c8c42ee6624569b9131e1d4169bce5385b0a679f1d8806c6eea9ecc2b8a2de144a10483defd9
+EBUILD libXvMC-1.0.13.ebuild 712 BLAKE2B 31436bd0b4a60b2ea420fb41488b43863be6578525564e5b4f42c7a985b97d7e1b02c9e95994380dad6e35614233d19ee71c6b2d0d588f7fa417b937432966f7 SHA512 03a81ca400ef552469191fa733692ec2342ea7345cbd82b55f0493e02b6fee7c4f3be3d23cb833cf35cfdc9b9555012b8d9e811cb5ec2f70ab21331335aa0047
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
deleted file mode 100644
index 33757667d0b2..000000000000
--- a/x11-libs/libXvMC/libXvMC-1.0.12-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org XvMC library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-RDEPEND="
-	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	!<x11-base/xorg-proto-2019.2"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
index dbcbb4d09dfb..d0d92c186cfc 100644
--- a/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
+++ b/x11-libs/libXvMC/libXvMC-1.0.13.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3 meson-multilib
 
 DESCRIPTION="X.Org XvMC library"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 2b1592d20453..dce9ec2ceba3 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,6 +1,4 @@
-DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
 DIST libdrm-2.4.110.tar.xz 436372 BLAKE2B 0d5f8bfe47bdcc96ef7dbe3ecf2da0b21262bae4396fa1e73c0f728d970d041a9925082c4526bc71e00f110c2eb0ba94313d9a7c27a2d4676073fdbc3708c628 SHA512 52f92ef1fe4c218a1d7dba53ef43334dbfca80e3209afe59f3a32c4bf67473126534e990df07a931a12d46a3b997c21ef17c1c4d8a0c88d44d5c6c040e3b6be3
-EBUILD libdrm-2.4.109.ebuild 1964 BLAKE2B 773409a81dd537f1fdb79422c25639f1a9e3ac222a413099a6de3cadd0b3cbe44141b3563d9dfbfc37e5fe034bc71b4aabcb4f4d990bac7d86e11cdaeb9d93f8 SHA512 be75aab37f19d08cb71cc8efacb0def1a086db3b88a4b53e6658da064c4c1d879b5eda0ba1fbdf7f74a1718b65206b17e00aaeb9906b9662c3f8317bdaa48317
-EBUILD libdrm-2.4.110.ebuild 1972 BLAKE2B 03a0b2b34613ba80e17620547130f1472fc1619f38150b7f4a41a2c1acc0456016805da3805b90337a8b518303be62dc59f40e7ae664e7e69febce9d0569bae0 SHA512 6ab4b61ad2fd0d3d84b55ef23d4c61ab9ee9e15bbe6dc5e63dc2189eb5ec77fd6372f1fa8c8af887d15e4b4476fb0ea15412f542befb85c9798af10aca149796
+EBUILD libdrm-2.4.110.ebuild 1971 BLAKE2B 0493208ad962927697e870e8dcdbc7800d184472c7ef121c192a6ea84e0aa1594b9ce72edbb8eec7a2467e6fff756e3bb682178c6f72286e74ac1e0e6fb6beb2 SHA512 944f92796f65158e3974f3b57eaf76237e2ecbbe144dbbb9fb345fa68b8caa83a4fe11f1da74d277d1b860aea66e4c3d351579d134bd3d5635eedb17e37be142
 EBUILD libdrm-9999.ebuild 1944 BLAKE2B 76ef85b65180a0f3f799a91a54d6ee1484bf71c3df87d14f10b8a45402b58d5e76f0b676905843a90e7e965ac81c3ab8dd35845aa960427492527a1b5038d8b7 SHA512 810efaf6477edacf82e1ca195db85908f17ab71807dbe43b7da84d9b15aca6e0740572b3702c2eadff7ced2c90009964c9290c68a21b6d0c2a9805337764594e
 MISC metadata.xml 407 BLAKE2B 1ec724640ea057ea29a6c84f3dcd34cb6a3f4bd7731c00d486688c9ec1dce393133e58b86ade00e51f91c80fe521e8829cfb796bd7cdc2e3d8c7be450d4c4188 SHA512 b54da0a8739fda9bb388e9893d992323247df89d9e97d20f29c62e64b189bf38092615cf113ae5048ce223270ebfaa128bb6b5fa119e5e8c8cdf2bda76a64769
diff --git a/x11-libs/libdrm/libdrm-2.4.109.ebuild b/x11-libs/libdrm/libdrm-2.4.109.ebuild
deleted file mode 100644
index d8d497e8f3f8..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.109.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
-PYTHON_COMPAT=( python3_{8..10} )
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} python-any-r1 meson-multilib
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
-if [[ ${PV} = 9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-BDEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
-
-python_check_deps() {
-	has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		# Udev is only used by tests now.
-		-Dudev=false
-		-Dcairo-tests=false
-		$(meson_use video_cards_amdgpu amdgpu)
-		$(meson_use video_cards_exynos exynos)
-		$(meson_use video_cards_freedreno freedreno)
-		$(meson_use video_cards_intel intel)
-		$(meson_use video_cards_nouveau nouveau)
-		$(meson_use video_cards_omap omap)
-		$(meson_use video_cards_radeon radeon)
-		$(meson_use video_cards_tegra tegra)
-		$(meson_use video_cards_vc4 vc4)
-		$(meson_use video_cards_vivante etnaviv)
-		$(meson_use video_cards_vmware vmwgfx)
-		$(meson_use libkms)
-		# valgrind installs its .pc file to the pkgconfig for the primary arch
-		-Dvalgrind=$(usex valgrind auto false)
-	)
-	meson_src_configure
-}
diff --git a/x11-libs/libdrm/libdrm-2.4.110.ebuild b/x11-libs/libdrm/libdrm-2.4.110.ebuild
index f7bd2ee2bebe..5fda2ea65c15 100644
--- a/x11-libs/libdrm/libdrm-2.4.110.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.110.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 02c8c76ec0c7..f81294102eab 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -4,8 +4,10 @@ AUX libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch 1473 BLAKE2B d3
 DIST intel-media-22.1.0.tar.gz 26188730 BLAKE2B 7ade4b25d2fe50ed6c3498c37f0fb39ecf7241ba21485c423a4a8769628b78d8134471639aad12bcac79a7d107682e36cb5954227528601eb5253be5ce00acac SHA512 dd444608fd15fc7f05a0d2c9e6e2c8be3a588a1253ac014c045c207d5d59c9d172c89d248e94688078097a224f57025c11e86b9392271cd111bb9dce6d07617e
 DIST intel-media-22.3.1.tar.gz 27302226 BLAKE2B 24ac80adcd9a72f9e9b7db4b878715233835f2b69a25d1029538fb87da1fa49ed3c0606478a8b24e198f0c366003ff315e31972c7576e9ff2ecd8419e12ab150 SHA512 286f974a11546f8541429230330c5bd514c5eb372d3278461a132fb236f19908aa544a44010e52981bb942573ab6c2047c8c03471517182e2daf2da87b0eb74f
 DIST intel-media-22.4.1.tar.gz 27407593 BLAKE2B eed738064b6febc17e93f195f81f71be55cb539f0bac1a90b0a60695b89ed2eb8deac5da3a646bd178396ace8e68c35a8e58fbebd74e6298aea6c1bd505fd482 SHA512 7615c76d501f9fa127da8465c4f5ecf8067b0374e14ee699b874ec7b4dfc131630901e2ec4d85e420b13c33bb1431938adefb60add7e1abe7e7351bec5e6322c
+DIST intel-media-22.4.2.tar.gz 27408373 BLAKE2B dfc72e1188eddc47207f7def060efb4852aaa57971d26690657117facfab8dbfc7f3a249bb1defbf52ed2e3db218f5f4eedcd397e25d8f790bf472c92d058bf5 SHA512 1f32709b80cd25006e2156e4487d75d07ff5eb337164c6aaacb92385dc31c1ce0c80a3c7062c830f89674d70bfedd7f81e4f34ea4d1dd8adb4da0d2212e744ea
 EBUILD libva-intel-media-driver-22.1.0-r1.ebuild 1368 BLAKE2B 5f58f95f23416c6dfa77cd61e311c59448a5b1dadd3280115d17176bb392607320d3b4b00324cf80c7bfd953cf8365edeaed562edc7117ecf3a3f94c7577a00b SHA512 b24aa898bb3c48126c0e85f886cc564eee38f611d8ffb21ecc163b070814e526262892b7dc6d99fbec302345d2788b98c335734f82258d68a0357c0de9c8ca38
 EBUILD libva-intel-media-driver-22.3.1.ebuild 1368 BLAKE2B 6867cae8428766be791e91ecfd074062ff94a26a36cbbfcbe1d18136edd32b9a2245a1abd3799f18985a3099165098812ae400e3ef36cd063de6343815fdbc16 SHA512 9546f6afff8f11566e0f4b2f6b1862d31b766b383f42ffc91edb4282711e72bb1260972d8a049f777526e6cfccc970780dad9b48a2372cb0cec1faea8c43999d
 EBUILD libva-intel-media-driver-22.4.1.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
+EBUILD libva-intel-media-driver-22.4.2.ebuild 1369 BLAKE2B 93487cf7effcc1749b455c7459195f0e4ea9a802e3f12b22bef4d29d928227c293e0d18ce713f1f2abbe5784fde6171f33447c8eff9d176d62fb69a9133ab4c8 SHA512 7635e220c3ec9c69c6351fa87867570971a07a65054b911e982b05c191d45c53c10799d37932482f4500481baced5801d1859d805735b9f584b1a54f4cc32d32
 EBUILD libva-intel-media-driver-9999.ebuild 1369 BLAKE2B e7a9336e295f00875c9eaef26a47113e5e94fd804459b3c17ec7ada98ae2ab70760d13ed9eff17295465e79c54a26ace0f5ba5d2bb3fca7a431bef7aa7b503dc SHA512 171e12e7d4613336a534bfcbac98aa53e68ad64a00edd21840c10f4db848803ed3d254c82a32c54fe99a02b401b7afb0782c2e35b7a453068208cbfe91ffc717
 MISC metadata.xml 506 BLAKE2B 22e3db4e87af8f032b2f02d18937c894524ede02e6a408cee8f8fddf492cfd2ebc8de6ebe8e2e1786ec81f119a09d3abb50dd2617c7651ff2082986d66421760 SHA512 5f7ebdec168766dc148294d92b1a6f6a355293a78ff8c879d1de94dca283ecfb9136bb0f124f41af15256f31832c2b034452a2b4d0ea0616a36b2576b7d8da58
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
new file mode 100644
index 000000000000..9a49528f5647
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-22.4.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	: ${EGIT_REPO_URI:="https://github.com/intel/media-driver"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+	inherit git-r3
+else
+	MY_PV="${PV%_pre}"
+	SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
+	S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
+	if [[ ${PV} != *_pre* ]] ; then
+		KEYWORDS="~amd64"
+	fi
+fi
+
+DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
+HOMEPAGE="https://github.com/intel/media-driver"
+
+LICENSE="MIT BSD redistributable? ( no-source-code )"
+SLOT="0"
+IUSE="+redistributable test X"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=media-libs/gmmlib-22.0.0:=
+	>=x11-libs/libva-2.14.0[X?]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
+	"${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
+	"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DMEDIA_BUILD_FATAL_WARNINGS=OFF
+		-DMEDIA_RUN_TEST_SUITE=$(usex test)
+		-DBUILD_TYPE=Release
+		-DPLATFORM=linux
+		-DUSE_X11=$(usex X)
+		-DENABLE_NONFREE_KERNELS=$(usex redistributable)
+		-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
+	)
+	local CMAKE_BUILD_TYPE="Release"
+	cmake_src_configure
+}
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 6bb54f104a2d..c02987415bff 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,5 @@
-DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
 DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
 DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
-EBUILD libxkbcommon-1.3.1.ebuild 1474 BLAKE2B 6fad57ab223145b1f966714970d6e21bc16841405a569e68a505587c7ac2fedaab111be7b58d0d99bc700c4dc8c6e3723e49b1594e2d6033519a640530908515 SHA512 1e78ed395916ed6e9c2691ae7113ba90cdb0123e9ca2d675ff3ea6d22da9dfbe91771131a6ef8a7a1ac6fcbee6238ff88761180ee3ea7e60da066d549b9aab21
-EBUILD libxkbcommon-1.4.0.ebuild 1546 BLAKE2B 5230c275b5501d94bebdcd2a6ea0ba2edf19eb975555c95966be138dd5c5681dac74f291e856b2a5ebb1f4fd050ec8f5b91023b40846afde6c83e128132874e8 SHA512 94e6a920574886b4356b402b6987e6ddcc573443c4e38bc1793ec66aa14ecd9ed5962444c4e2c46548812ab5a286c7d5e37a587ea04a35c8deaa432598dfe213
+EBUILD libxkbcommon-1.4.0.ebuild 1545 BLAKE2B 298465c21b402115970f4e407832afaae66e78da6b55d3def4e07b8974e431a9131e103ca49db3377d88b72d178d53a0c02c0674a51570358a1b059e77de1ea4 SHA512 a26476ddf446e7e27a5e544ac0fa59c665b1dbc28fa2d09a3547c44f1d83983096e15533b867309188546675bc9c664a30bef12373213c40b67ca9e2b66beb72
 EBUILD libxkbcommon-1.4.1.ebuild 1552 BLAKE2B 71bfc2747bfb9726fdec31ee0ec0386427da53c5c8bcf986550af64d692c1cf1ca851042221befdc21836b159710bb2008b6874944a982f26c19513ffc58b7da SHA512 845e8f2d068fc455dec422b80b29cd2b613b4c7780e2ff5b5cb85ca6ffc697b75beed54da3add2021746800812ea74eb2c1f4c719506efab4de35954a178dbe8
 MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
deleted file mode 100644
index 513cfd69b0c3..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="doc static-libs test wayland X"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-	wayland? ( dev-util/wayland-scanner )
-"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
-	wayland? ( >=dev-libs/wayland-1.2.0 )
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	wayland? ( >=dev-libs/wayland-protocols-1.12 )
-"
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(meson_use wayland enable-wayland)
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
index f74e33fa27a5..6a314d97c7cb 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{8..10} )
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 10de905666f0..b6004aa9f7e5 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -10,5 +10,5 @@ EBUILD pango-1.42.4-r2.ebuild 2317 BLAKE2B 7bbc0227f8b846c1e51cc142e7a3088ec88c2
 EBUILD pango-1.50.4.ebuild 2264 BLAKE2B d506d18f028db1a83bd38485a60706f7563f08f1b4bf5256a8e2d3a1be097030281d60a4946b8812b89c55d19c3d5a2dd4e3d11a7b24827a2fa0201c75c58d69 SHA512 769ba222582a9cd3c4b3bbacb2b27d5c5cc5cdb752a93ea8d94036ce35c9b31e0a1614c5b4384ca320edcfcc681204e2a4fff37b75adbdb56ed99ab2ab3073de
 EBUILD pango-1.50.5.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
 EBUILD pango-1.50.6.ebuild 2272 BLAKE2B 5c1fa2368a5f1fe99f4e50cac03851c0cb28ec7fca9318d614257583df94182d07ef754990911466aafd75b0122c839106e51c90c5cc4a04bbdddf85bf8f9ce5 SHA512 f07c6b8ce20b9855790a3fcd075480294646be56ce1184b72125784f6c5717ac94f3fdd02f73e13137d6ad136c2780cd5d190ff9fffddbc426284bffc50031ea
-EBUILD pango-1.50.7.ebuild 2285 BLAKE2B 816e9beb98b284da2329bfeb689f6cc96e9444cd8edb1d9203de97a1718c8a460f726d9d856f043ac0befcfe3af1b13ff1a1d715c44213c02efeb9e8a868128b SHA512 5eee864ff9213742aa1920191a05b5e014d220887eb3f5d454217996f066fa3f34ea30d280a3ed842122ce64999cd7940c2221420221272be6d7b6222b325d6d
+EBUILD pango-1.50.7.ebuild 2278 BLAKE2B a990222bbccd5313dec11ad58ef9a43ba186dc525732682c0390a8fdbc549636d66cd3807e97fdbfcbaf98386d7161abb33d53059c943e0f3a7a100d823e48d0 SHA512 ca4e205e33f039fe81a75e6bc21d1a1232851c2d5328e49ee1147baf99778836d6e2bac5948e4fdf0fd24455f74dc926d1ce315221600390bcc367d26b9c9837
 MISC metadata.xml 523 BLAKE2B 623788e7504fe89c7d8604eaa2a6b1ab5fb022965eaa3044dd2a94b6f68638453011257659c0f17b7ced9b6945acb3eb4767f9fd3ce9686b69b3b60b867dcdfb SHA512 a60feab6e4e50cb9b477f388d4534eed4616fac6aca4f6eae450fac42bfa9ca0d7382e36b98a159732f9c6926162cb2ea55d72a644bc77629ff09fd0097226eb
diff --git a/x11-libs/pango/pango-1.50.7.ebuild b/x11-libs/pango/pango-1.50.7.ebuild
index 65dc3f75adbd..956dd4fb1643 100644
--- a/x11-libs/pango/pango-1.50.7.ebuild
+++ b/x11-libs/pango/pango-1.50.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 IUSE="debug +introspection sysprof X"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index ccaaa1935e37..9c8e1bd68bcc 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -11,5 +11,5 @@ DIST vte-0.68.0-command-notify.patch.xz 9748 BLAKE2B de2d4c9b7f2c2b21518984f818d
 DIST vte-0.68.0.tar.bz2 507598 BLAKE2B 10274d9e804f00bf071b7848633ca8de2953f4e91dc2967e33b7d6698bb304baac4f0e0431debae5a972c2c56c65efd1c5b92455a17db08cf254ddec56d3276e SHA512 785df7261b5075f166e59de7d3535b381564715ce65efd4837a130e153528691b610fc6160c00f0f17008f5f4ee94c23350d9a477b4b1d58da6ace083e5caae1
 EBUILD vte-0.28.2-r209.ebuild 1864 BLAKE2B 61c287edd403d36a67fa2b45987bcb7a5ee446516df9c84a2ae10bcdcf8318795a98683a702e868aa4f6178d7dfd8c59afdc1a4a412544c52a01131ad2a41bc6 SHA512 c5ea6ab70fc89c5ddb4f097c5ee699829d96c98bc0fe4430b8aa3bf8e5767fcd5aff112304d8ea680f92a8b6ceccc1bbdd29ebce10c126f9b329ad5869da246b
 EBUILD vte-0.66.2.ebuild 2753 BLAKE2B 4c5ad9e4b0e991d80320163c6d467c0e928439290b61a9a11df8a3937736aa63f4fed3c660ba4f20482b274dd1cb60db970945b4ff261d0a94808c508d8309fb SHA512 5a6c210080a552a3a6ba726f877423513347b78b886c2d42952eeb3ed611c6dd418d3ba99c6b5324e04448f77ef83499bd4f4a4683894cc5840dbba021f4d5a9
-EBUILD vte-0.68.0.ebuild 2748 BLAKE2B 4b0fbf6fdb7413806d149053db377399f81a25b873dab1268cdc78d7ca00f57d41e40a0b22134e26735f2a498b0e4c5a8997a3ff3428613bbe27511046bc69cd SHA512 9370eea27e06b64fb4da77f2f091045ea51a97bcb7aec69187d2b65fd0c895f05e4c93e84487fcdc6c44c8acb639b0b9fb7a24190caf93aed69caf630a52399c
+EBUILD vte-0.68.0.ebuild 2742 BLAKE2B e0bf75856c6aa0a2d7a105bd770bbf36991581ead73fa58dc048466b8682bed09a68d980fcc176d012dc6590ab2baf648faf5fe1ff68d133e43b3181f905ea03 SHA512 85036a59d64470d36d6b2f8e4b967ff19df803b0a688dd5d526bbd6a2f439f0abca522a8faa0b26463870255d95994355e060d7a991f59793f2f6432bc971be9
 MISC metadata.xml 519 BLAKE2B e34530c7e9882f9d61b6c1fe9cc1d523037bcc05034e3f98351ff33bb543a0a25d96c0debdd1572cfeb0d2166b41a324c7fdfed38482c11cbe053db96b312ef8 SHA512 313a0af6b28d47bf385594a9306f38476bbfcc44517d7219ba1d0a8ddee224a37cd4ee8f7c4f8aed8bd7eae0ad2b3461bc4ae49c5eb8b08bc61459c76bf7a5ef
diff --git a/x11-libs/vte/vte-0.68.0.ebuild b/x11-libs/vte/vte-0.68.0.ebuild
index 699c5793cff3..c7d8c979dd51 100644
--- a/x11-libs/vte/vte-0.68.0.ebuild
+++ b/x11-libs/vte/vte-0.68.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE https://gitlab.gnome.org/GNOM
 LICENSE="LGPL-3+ GPL-3+"
 SLOT="2.91"
 IUSE="+crypt debug gtk-doc +icu +introspection systemd +vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 # Upstream is hostile and refuses to upload tarballs.
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d4e323477309..6fba8270989e 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/alacarte/Manifest b/x11-misc/alacarte/Manifest
index b2f9f61c5285..8d65537c5b05 100644
--- a/x11-misc/alacarte/Manifest
+++ b/x11-misc/alacarte/Manifest
@@ -1,5 +1,5 @@
 DIST alacarte-3.42.0.tar.xz 203836 BLAKE2B e020529acd5b6b716c8e1b876b3edc1107cf61fbcebb648ce7f593e830f0ae7ea3445a5ccda2cd798e0441e999cff2e9e4630a7b2fe0b711adef56bf59931c25 SHA512 df56f79e0697268ceebd15614c9e6c6bbef82c10c64c90b39eac1718043edb1a1ea71d03798705d94407cf2dcc3fead6c2d08ff6c5a9ca710574eb15ffed68d1
 DIST alacarte-3.44.1.tar.xz 253364 BLAKE2B ebd542430f909291d06c1094aac52f87760547013f012167fa5616609251a6cb48b258122424a119b3ab10e6e2289d9a282dd66da3dcf5590b09d9c686a8934b SHA512 84b1cebdcbb53e2cca5a1425829b00db0b2a11e308584ea96179c2d0451d8c77fa6a995ae4671a024fab72869c7d2e9986dc310bfab38fe8b7b2f54d383501ca
 EBUILD alacarte-3.42.0.ebuild 817 BLAKE2B 2c10e517fe9fa01f04aeb8e137627ed64f078e57d878519ffb73304d23c73f2afd81768254d235743fd6536dd1d9f8fad514d55c0a6b0163507d18f94de35def SHA512 f66c007d4d4d3f9e05652b66281a0427db2cc4c914dac507583898364eda91c1a2507810aec8164769bcf003846a33758d0385c28137fa7831c5b6258e2bfe5c
-EBUILD alacarte-3.44.1.ebuild 769 BLAKE2B 0bab1c893de5a2673b16e04842ef9d4eba62f66cea2f2287605a09c2b972b24f9c305ce229da3cc9d44ce5fec4c1b2d2e45a5ba8d9213ae62e65d0d5a77c30a1 SHA512 54ab52a056000ce6d31a8f1b2c1b48ab34aa07f2338607b80ab626910c552458e5ce3a48e3d8269a300a99985fc42dfc05645773495ef7742694f0348e060aed
+EBUILD alacarte-3.44.1.ebuild 767 BLAKE2B d0fcb8a65e335b244e2c523f3c15050d9de601e62622f33cbd50ab6b63834fb9a206fc60620c3c299e7be9062542dd5c52f0adac12aca318de01748d5a2795bf SHA512 a3debc82c2206b86a3a5aab6f0e72da9a1f98d95e4ae59f918662f29570c2c1018876463efb78d359279e3d374cf5bf0f76e5beea96468b9c1ebeafc56617487
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-misc/alacarte/alacarte-3.44.1.ebuild b/x11-misc/alacarte/alacarte-3.44.1.ebuild
index c78a03bfd63d..bd4396e3b88b 100644
--- a/x11-misc/alacarte/alacarte-3.44.1.ebuild
+++ b/x11-misc/alacarte/alacarte-3.44.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/alacarte"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/x11-misc/compose-tables/Manifest b/x11-misc/compose-tables/Manifest
index 7bf8ef5a054d..16ce6b1f27df 100644
--- a/x11-misc/compose-tables/Manifest
+++ b/x11-misc/compose-tables/Manifest
@@ -1,9 +1,5 @@
-DIST libX11-1.7.3.tar.xz 1861304 BLAKE2B e0f647ef55567b1d7eff74bc053b8e73f8c696be6f233c2ff6f64dee65c1b40b746683ea7a6fafb4304eba4dec43301b4b3506e2ec6fac1d4c89d664b516bbdd SHA512 abc70837d19f7e104a5db1e6d2cfa1256625332c0b53fec44a0a39916a60a430bb53fd436207892aabe4199ac7a0f9287a06588fcd27e0eed54d45d67bbe1294
-DIST libX11-1.7.4.tar.xz 1872992 BLAKE2B 6a25e5008ead53be5af7411f51711789eb410473f9aefc49fb4d0bf7227b89c5fd71f0f61fef9bc3f83e585e4815644f42884d5e5cf0bdcdd120abe6fe8a741b SHA512 8bfaaf9fc3081c47152d533d30cdc0b2521bfeb088ff813b041c08ffd518c80ba3725bb68cac7c21b521a4bace546f99424700fe21955b498015d14c2f7f9a57
 DIST libX11-1.7.5.tar.xz 1853152 BLAKE2B 95ceccbfd37d8a749a533bdc03feba94236a47185a2cd7ad6592c534c17636906b735aa5800d810d13d3e342e3dbe281bb1f1f3ecab9d07e6a6a50f33beef8af SHA512 ef33e2f631226cab27657f46e1fd4cfc928f62f928d8297474e7b993017c8f92b60272eed6515990cdf3a9d34581837b7a3896e584f3546dd26f3790034df347
 DIST libX11-1.8.tar.xz 1782508 BLAKE2B 15a41cbcdb54d68cd54b6fa4147d55d277a6c091af7d38341ec261b42c547acf981270ceebec5abb3fcc15da5c1e05b7908114e157555f8184234922e3c05fde SHA512 64899ba9efbda00211daf08534a2a98eba86bb377980d21ce319106075cd36b511b17245d02e8ebd1045e7c2147f2c005004bcf579121138be7a7b879eeca83b
-EBUILD compose-tables-1.7.3.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
-EBUILD compose-tables-1.7.4.ebuild 951 BLAKE2B 450f86acb64044d49f6fd21d92a70a3997fd5fe96105aa2676de65737086d982f9a139764e6cbe32e9e0379ae5deca0a17f6e455c5129ed2db6b1c3756ee71ee SHA512 da3d0b1217ef9a2d7f786e99001de745659d5aba01cd9e4d316116972d411abedabf006f1020437b6657c188162088d5b4f02a2c1074e1c736b3fd51bb25c610
-EBUILD compose-tables-1.7.5.ebuild 944 BLAKE2B f59fe583c6e9cca79aad00e01828b63a866b9c1d9fc9dcfa2f32e55fc3574c9d37d7cecd20ce950e33d0f123b4b6cb0006dcd5342c4513f39afab9319ae14668 SHA512 8dbd3992458251bbe80d207942c45c12ec5bcbc225efec81b97a9b0fb6ae69cfe11a14d156d01019721d39b585a353e1801fb1f56c018184891b3349b789f7d2
+EBUILD compose-tables-1.7.5.ebuild 943 BLAKE2B 859cec003f23b043e2271eab3aa31a01ee8ff66a7a78749ced99ff98d09eeb085497fe799138d5efa2a30f83f1097305a90ffa7caccf47bffbdfed72faa29e48 SHA512 2355bba44c7af1937aea4cc68248a96e38f9fd6188d85da7a755e344f4e3add63ae19db03409703b103ebb5045401b621a4258866ead6c79fbd1fb78f9e1e9a4
 EBUILD compose-tables-1.8.ebuild 958 BLAKE2B 10ca97660777f3ccce45c6f669885e43d970267cce91174caf69a7629e4af791b8a5b6bd311c98786542548eae52655319e2cca7a54788d14b9b53bb49f37fb5 SHA512 d2266d1488116a1d916b967b77676fe40f1ac619e469554075fbb0349b30aab0d98c431626d738ac48fa2771ac45b1fb881cde7a4d1708d0a1e1d36a688b24b5
 MISC metadata.xml 312 BLAKE2B 297d68d5585ee7fe053a0b9d1e4758d1c8538fbfa6037cddfefa84f5b757c1c768d4ab072f6198e19c1b9bf4d21120440db61e5a9690cc6cfd387ee9d2add736 SHA512 4b5fc7ba8a7c24241e7ab5dd68677ccba15f5e89a76482679f18139faea4ff1555759066041afbf51c65d1870ec0d999a772c340f1e934a6aba0135b8da28d18
diff --git a/x11-misc/compose-tables/compose-tables-1.7.3.ebuild b/x11-misc/compose-tables/compose-tables-1.7.3.ebuild
deleted file mode 100644
index 884e98ec6339..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild b/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
deleted file mode 100644
index 4cdfc490b634..000000000000
--- a/x11-misc/compose-tables/compose-tables-1.7.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=no
-XORG_TARBALL_SUFFIX=xz
-inherit xorg-3
-
-# Note: please bump this with x11-libs/libX11
-DESCRIPTION="X.Org Compose Key tables from libX11"
-# xorg-3.eclass would attempt to fetch a tarball with a matching name to this package
-SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
-S="${WORKDIR}/libX11-${PV}/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# Only needed by configure
-DEPEND="
-	x11-base/xorg-proto
-	>=x11-libs/libxcb-1.11.1
-	x11-libs/xtrans"
-RDEPEND="!<x11-libs/libX11-1.7.0"
-
-XORG_CONFIGURE_OPTIONS=(
-	--without-xmlto
-	--without-fop
-	--disable-specs
-	--disable-xkb
-)
-
-src_compile() {
-	emake -C nls
-}
-
-src_test() {
-	:;
-}
-
-src_install() {
-	emake DESTDIR="${D}" -C nls install
-}
diff --git a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
index d4f2248ad1dc..884e98ec6339 100644
--- a/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
+++ b/x11-misc/compose-tables/compose-tables-1.7.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="X.Org Compose Key tables from libX11"
 SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/lib/libX11-${PV}.tar.${XORG_TARBALL_SUFFIX}"
 S="${WORKDIR}/libX11-${PV}/"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # Only needed by configure
 DEPEND="
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index 2422dfcfb0d2..417ff4038cb3 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,5 @@
 DIST i3lock-2.13.tar.bz2 149332 BLAKE2B 4b285fb3a27463f0d538d291134942a19933394c4c2d0acf27dfe5624a854cef0f29c5fc2e4ce4398c85ac0e6b774521c7daa65abedc0d38b0fd4897b2e6db88 SHA512 3a9bed3d14a2d59e641b3603448bb46d769104995b1c0239eca87d582e80e64dd8905b8e455bd5b0e635d4b37d7a87208d8de37253e9af799c65f4f8d396789d
+DIST i3lock-2.14.tar.xz 28648 BLAKE2B ef315c4d1175a692b8ea2ac1a6a9cefdaa642fc28cfcc28cbf0c637f9d0cf0ea47738447cf0d90c3c2f869819c178a416aabc44dbfe93ab938e48da2a0143d0a SHA512 85f755333739e61a8ac90447410c48cf54345740bb6c6977efa88500e2b66dfd7fe3338e4fe38f817773219e5994ef6375010fdb3cf711e2ad42045874e39e20
 EBUILD i3lock-2.13.ebuild 700 BLAKE2B 084d7874c12f5e311f7c02089aa59ce8126385a96c6afb77969f3bae51c99881d638cac22656bb1b6b12c6cf6fdd04a697da547471d7656f1a198de732024b2f SHA512 2efbdcf1fa1fbe01d78d18b2c55ef1afe4ba8f87393905837bbf45837036d7747b1630dd6a827fbba3a641c72fb09ca4574ca491b7d92b0a93f9f945d9af7bee
-MISC metadata.xml 354 BLAKE2B 7ac8f18c5369a061aa50ea7bb68419d3567f56c0880d4d9325325bff00f17c7b10bd304e8b79b481aa8bef4b3c7ab631b3d789191fe036fe6eeb65f39be5845b SHA512 a847af326d7e82d2d75859f10b9b4fd172a89f8edd425710aed88a430b2896ad53ff4a3f3283603dfeeb77f33e7d8138e8b0b0819c3e0bda6ae4b28a16681cdb
+EBUILD i3lock-2.14.ebuild 602 BLAKE2B 28aca33b836be07f9178389adf70478cc1a696488e146e7fcd22312d7c12d07e5ad1bdc9cebb21e49bb769a87e4de5b484ef704de93fab1fb4f7d93f0e66fcf0 SHA512 03d5d8c8fb82bf4c56f277f63e8524eb8ca84c5986f4287aac14d2b11601d5dbbb43a82bd8f735f1be4a49b4184052b3f98aa7d0c7035313d0adf47c5e15f8eb
+MISC metadata.xml 428 BLAKE2B f85198563990c2c04b6dc2f8144e52641757c14808ad0c17fc622d3a0d5788bd0f4faf15aec0439eb74b549e369664b50074c9d6611f4f425b2050d1dad16281 SHA512 e96eb498c24e7a52823e03e688b5c9f2796618edb5a8f4e4cbd1883ab804ec6a3eca98d0adb62d466f56206e6342652acf26a0fe43c1ee3a227632c2592001fc
diff --git a/x11-misc/i3lock/i3lock-2.14.ebuild b/x11-misc/i3lock/i3lock-2.14.ebuild
new file mode 100644
index 000000000000..29d754d62271
--- /dev/null
+++ b/x11-misc/i3lock/i3lock-2.14.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+DESCRIPTION="Simple screen locker"
+HOMEPAGE="https://i3wm.org/i3lock/"
+SRC_URI="https://i3wm.org/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="dev-libs/libev
+	sys-libs/pam
+	x11-libs/cairo[X,xcb(+)]
+	x11-libs/libxcb[xkb]
+	x11-libs/libxkbcommon[X]
+	x11-libs/xcb-util
+	x11-libs/xcb-util-xrm"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:login:system-auth:g' pam/${PN} || die
+}
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index 249bd3e01081..808603e364cb 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/metadata.xml
@@ -9,4 +9,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">i3/i3lock</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/i855crt/Manifest b/x11-misc/i855crt/Manifest
deleted file mode 100644
index 23bcf8de6072..000000000000
--- a/x11-misc/i855crt/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX i855crt-0.4-makefile.patch 351 BLAKE2B ef060908432899a333a29fe12d393d3d2d99d76d0619b071c0457b592c17edc0bf9af6f6994bfbcd73fdfd4bacd580387be1483e7a851ec88a38df532babb3b2 SHA512 41a96234b1864d04089c64a7859ec25f1388af519e107c5760954366d497a13dc6d623c5d26e870d52bcc8748e23b760662101a4205b2489aa002f25306155ac
-AUX i855crt-i915support.diff 2128 BLAKE2B 1fc795cafb494e084d2233bdebe74cb1881a9d14e2c78662a6ec4d7e24554734938a8f58cc723e2bbd4f70b5e2aa7080b13b7a2806291f9b5e934fbb5e3d9ea5 SHA512 96049b926a2007915bdaf71ba2252bb6556711d66b45eac69ee3223557e892ba8d742b520406a6f7fd20f3091f194015aec59613624abc1efaee5caad090caf4
-DIST i855crt-0.4.tar.gz 65209 BLAKE2B a7c8e041cb66cd711e1cdf7ac1ee0d6d218377b5c1183c11c658d3345de814a21b9eab0c4579c56db316a3b5fb3e430774174100f989c921e86650bc59adc1ee SHA512 8bd6d05334bcbe75f85c128ffe1179368fcf94bb0ba07c2ea7ce9b6ed38252ffc5dcd7a3208f6524be064bea595abda5a29f6a2960ad9f2f7b6f6ba528c36290
-EBUILD i855crt-0.4-r1.ebuild 719 BLAKE2B 47c38eb6e2af17e18d18c0c8432632abc63af1667f0dc86c9fe0c91d49adfa9936a92515465454baade689e8860611c5d1d56d9129ca631a4353ababfc03f34d SHA512 69dd89bc2b25da213a1fb33d0e19d99cf4b2e6ca28d64de321bce4dafdfd1fd77359e067211aca9fdd0c13458bda6be00ddc0a6cf668d0090e3c1d72607ee3bc
-MISC metadata.xml 413 BLAKE2B b34faa9cdea56299f3d481918b962a88ee55375bf847b06e37c0a3bffc7c60e0882e3140752a1af66044d04d36991ab23c780d2f7b5950f9f4101f78deda9bdc SHA512 2aae00f05bb0d6f6f78543ee549e282f07d1740b526a8855eead0c9afc393bb76b09b553c0ab5b8108b4b2059938073a595323666c73586a50e14e4955bdbe7c
diff --git a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch b/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
deleted file mode 100644
index e7deffb4d30a..000000000000
--- a/x11-misc/i855crt/files/i855crt-0.4-makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,11 +1,6 @@
--i855crt: i855crt.o vmodes.o
--	gcc $(LDFLAGS) -o i855crt i855crt.o vmodes.o -L /usr/X11R6/lib -lXext -lXv
-+LDLIBS = -lXv -lX11
- 
--i855crt.o: i855crt.c i855crt.h vmodes.h hw.h
--	gcc $(CFLAGS) -c i855crt.c
--
--vmodes.o: vmodes.c vmodes.h
--	gcc $(CFLAGS) -c vmodes.c
-+i855crt: vmodes.o
- 
- clean:
- 	rm *.o -f
diff --git a/x11-misc/i855crt/files/i855crt-i915support.diff b/x11-misc/i855crt/files/i855crt-i915support.diff
deleted file mode 100644
index 5aea3a7dd96c..000000000000
--- a/x11-misc/i855crt/files/i855crt-i915support.diff
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/dumpreg.c
-+++ b/dumpreg.c
-@@ -36,10 +36,11 @@
- 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
- 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
- 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
--		(p = strstr(*buff_ptr, I865STR)) != NULL ;
-+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
-+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
- 	
- 		if(i)
- 		{
-@@ -89,7 +90,7 @@
- 	chip = i810_chip(&buff, &len, pci_f);
- 	if (chip == NULL) 
- 	{
--		fprintf(stderr, "No know videocard has been found.\n");
-+		fprintf(stderr, "No known videocard has been found.\n");
- 		exit(1);
- 	}
- 	pclose(pci_f);
---- a/i855crt.c
-+++ b/i855crt.c
-@@ -254,14 +254,15 @@
- 		(p = strstr(*buff_ptr, I810_DC100STR_1)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_DC100STR_2)) != NULL ||
- 		(p = strstr(*buff_ptr, I810_IGSTR)) != NULL ||
--		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL;
-+		(p = strstr(*buff_ptr, I810_CFCSTR)) != NULL ||
- 		(p = strstr(*buff_ptr, I830STR)) != NULL ||
- 		(p = strstr(*buff_ptr, I845STR)) != NULL ||
--		(p = strstr(*buff_ptr, I865STR)) != NULL ;
-+		(p = strstr(*buff_ptr, I865STR)) != NULL ||
-+		(p = strstr(*buff_ptr, I915STR)) != NULL ;
- 	
- 		if(i)
- 		{
--			fprintf(stderr,"This driver is untested with your videocard !\n");  
-+			fprintf(stderr,"This driver is untested with your video card !\n");  
- 			return p;
- 		}
- 		
-@@ -493,7 +494,7 @@
- 	chip = i810_chip(&buff, &len, pci_f);
- 	if (chip == NULL) 
- 	{
--		fprintf(stderr, "No know videocard has been found.\n");
-+		fprintf(stderr, "No known videocard has been found.\n");
- 		exit(1);
- 	}
- 	pclose(pci_f);
---- a/i855crt.h
-+++ b/i855crt.h
-@@ -1,3 +1,4 @@
-+
- /* 
- * This is part of the source for i855crt driver
- * copyright(c) Merello Andrea 2004
-@@ -45,6 +46,7 @@
- #define I845STR			"8086:2562"
- #define I855STR			"8086:3582"
- #define I865STR			"8086:2572"
-+#define I915STR			"8086:2592"
- #define MEMSTR			"Memory at"
- #define NONPRSTR		"32-bit, non-prefetchable"
- 
diff --git a/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
deleted file mode 100644
index 25df8327c91c..000000000000
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Intel Montara 855GM CRT out auxiliary driver"
-HOMEPAGE="http://i855crt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXv"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-i915support.diff
-	"${FILESDIR}"/${PN}-0.4-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	# upstream ships it with the binary, we want to make sure we compile it
-	emake clean
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin i855crt
-	insinto /etc
-	doins i855crt.conf
-	einstalldocs
-}
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
deleted file mode 100644
index 5e2d40ca2392..000000000000
--- a/x11-misc/i855crt/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 -->
-	<longdescription lang="en">
-i855crt is a tool to send the output of a i855-based graphic card to the
-external VGA, primarily used for presentations.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">i855crt</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 0b8a0e1c79c5..d0644bb0882b 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -4,5 +4,4 @@ AUX imake-1.0.8-respect-LD.patch 379 BLAKE2B 1b031fc8cbc884cd975b338f57ef9de554a
 AUX imake-1.0.8-xmkmf-pass-cc-ld.patch 461 BLAKE2B 643264da121725cd2424e3e6d3dc7af05d9068ada3a53ca5b92f6af7beb17caf7eb7de5bc4187a7ebdfed508f242d13bcba9876533d2d7cc52dbd0f9c80ab701 SHA512 c73feb329adcda1f08051965a0ce0ba6031a8b8aceef19d10d11e475a603337da661ff4af72620924e1efb76ed9347fc0535b31ac3e98707aee298a36e715bdf
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
 EBUILD imake-1.0.8-r1.ebuild 676 BLAKE2B 9b48c875622fcb42052cc9b24e2b83f9ca52ba51013388b49666bf96cdce506417bff63b7254750e2815ce40c3e71f184ccf05b904db508b5eeba76c617abeeb SHA512 97a9f6a495354e3a32ecad68b7b3a6004e847d9152255a495bdcaaff42d18c98e4ea1ab27a3f68a359c177464f2f60184518d27b6413d94a04823c866ac9be7d
-EBUILD imake-1.0.8.ebuild 508 BLAKE2B 10f2fc16413dc09c3ad1022bee49e7ee54c0186836a821bd279520d70877fe37bd27b5cecc8591c346437b9934e45aea3fa272689e0aee99cb6aab33e6952dca SHA512 f37a1fae560be0236d4919d0ed7cd83a2a93504de77d266d732d89382d28f5f2dce6c526ddc1a5dbfda3b9603b0e4101db136de5e7bc18b8e3ed3fb74a7f9266
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
deleted file mode 100644
index 0a444446e083..000000000000
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xorg-3
-
-DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-misc/xorg-cf-files"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf CPP="$(tc-getPROG CPP cpp)"
-}
diff --git a/x11-misc/util-macros/Manifest b/x11-misc/util-macros/Manifest
index 670fe79a9103..cd03a5fbbbc4 100644
--- a/x11-misc/util-macros/Manifest
+++ b/x11-misc/util-macros/Manifest
@@ -1,6 +1,3 @@
-AUX util-macros-1.19.2-CPP.patch 1103 BLAKE2B 19ea2f1ca56daa27a8949566337305b383f3e1481e9a2bd8046a05188eff00a8a89dcefc30598ceb2a0641c99bf1c6bf13bbcf55e894767cc77e9b897154c47d SHA512 572f64b4a1fc2989f1fbe969c070f19312c90d7f5c4d3fd98bd749f8024a2e21a1a43ae2520e2bbbe7c9b74f76b55615e3618ca7f700837d6d8fbd574775cf26
-DIST util-macros-1.19.2.tar.bz2 84139 BLAKE2B 94eeeca771042671c6915c562e055c8b965f874c3a5aa1c8107abe38ca984ee32293f68a51ca73d65ac82d245dec6e02ddd62939ab14aee12b4b6fbf350b8c39 SHA512 3f51504b27f0478c136126f15110cf3cdbba218c4d74a8e974cca1381c6e8364609bd0c444f2fb19aa86a7f4e848dfce4f4da940463b224036f75a60b3d88619
 DIST util-macros-1.19.3.tar.bz2 84690 BLAKE2B 95f6bd6cca47111f973eef60915ab0b0a1c6a6b15facb08da138df100c27caacce28866c5ac05aae79116fe3bafa15f454ea6cb9997069f0b5fab7968777d383 SHA512 b9c7398a912c688a782eab5b1e0f6da2df11a430775c5c98fc3269f73a665de6eeb60d300a849e38d345714a6e51f74e9334cb6039767304cca4b93d823a53a2
-EBUILD util-macros-1.19.2-r2.ebuild 741 BLAKE2B 1673e1903448a8a5e2a2d3dc767f06a231c703c04234b0f31389f0baf683b12e9fbf3de7d938261c87f845578828985b1e2ebc57079ee13697f58c7b3efcaadb SHA512 32f89da45bcc1ab722ce415dee6bd0bc595d971aa13ab6da568d684e4c72ecf346093d4683d300c97b6ae8b48cfbe93ffea9e8494ecdbbc2dddf325fb92cf7fa
 EBUILD util-macros-1.19.3.ebuild 710 BLAKE2B 76fe57383e1f5eb715092ac442c54b38dd038037adcb8a2c2c67be1f53c07deb66341352e56c4b670e9e1ce974d0c883ad8b0e1088a4a99801587155fba43e48 SHA512 52484762335a47dae0561001f8745a6cee5205b348eab602af51acfeb57e4ed8458222eea1853a6ea6651191e8b1282759d8649f3f89f988c160f4c0a8a6739f
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch b/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
deleted file mode 100644
index e6cbee98d11c..000000000000
--- a/x11-misc/util-macros/files/util-macros-1.19.2-CPP.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/726130
-
-From bd66ce3ba4a9d1d1490cb5775a2fdd0b408879b6 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Fri, 27 May 2016 15:13:56 +0200
-Subject: [PATCH util/macros] XORG_PROG_RAWCPP: Use AC_PATH_TOOL to find
- preprocessor
-
-On some distributions tools like cpp are prefixed with the host-triple,
-to check for this prefixed version first AC_PATH_TOOL should be used. If
-no prefixed cpp, it will fallback to the unprefixed name.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=96257
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
- xorg-macros.m4.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/xorg-macros.m4.in
-+++ b/xorg-macros.m4.in
-@@ -57,7 +57,7 @@ m4_undefine([maj_needed])
- # such as man pages and config files
- AC_DEFUN([XORG_PROG_RAWCPP],[
- AC_REQUIRE([AC_PROG_CPP])
--AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
-+AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
-    [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
- 
- # Check for flag to avoid builtin definitions - assumes unix is predefined,
--- 
-2.27.0
-
diff --git a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild b/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
deleted file mode 100644
index 933fe66464b7..000000000000
--- a/x11-misc/util-macros/util-macros-1.19.2-r2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X.Org autotools utility macros"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/util/macros"
-SRC_URI="https://www.x.org/releases/individual/util/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~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"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CPP.patch
-)
-
-# there is nothing to compile for this package, all its contents are produced by
-# configure. the only make job that matters is make install
-src_compile() { true; }
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1ae82bdab834..1635a7a8cb75 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
 DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94
-EBUILD xkeyboard-config-2.34.ebuild 1032 BLAKE2B 41a3ecfdaf5cf06466f10357f308fe12fd78054558b71763b5c2e720f7e47816d1f71e19d153865e52aa95039d96236af5c424dd88dea42b58218e7a4ff6f20c SHA512 680e6caf58081372230c19aacdca0e5b4e06d309ecfc6d0c791532519cf04a04630d391a353c694ed7b2db389929a8556f9ab18b8a09a4d70a34d457b8d2a802
-EBUILD xkeyboard-config-2.35.1.ebuild 1031 BLAKE2B d421a181597baf39a85d3c13348112889c8f1a284d8c49d0b512e33932c1ce642466821f8930754c5b25c343910c23237f853f52a634ce466524291aa95bcee1 SHA512 3eff275e762c0e5612dfb48ce3fdab9af6d421644bd688a3bbdabaa18b9381b838817ef8bd2c9501727a8024b770fdb1974140aa430521e688c07ffd0ee1c305
+EBUILD xkeyboard-config-2.35.1.ebuild 1030 BLAKE2B 164b75403f67163fd688e5b494574436d85634b2123f6eb73d860d228618ba9d905c9cc8b486f022fa4beaee478b638cddeea4f460d7efe4508f4fc3540e4de0 SHA512 ab9c02ef0ce4fec301ee4667cdc4f57a97e9694f488f13ec25c37300dc75640e73086bd813c5b90d7076be508a21234411d49f640403bfdddb75367e0fcb0a51
 EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B bfbfcf9d6007d88400383cd60939d3e5cff03f69dd6979174ea2476688ac8a28b6ddeccdd5b2573194da1c95ebfbfd6fe5b06ebf352685b7037a3a1fda835dc0 SHA512 d291d500994eb2a0d95e4c1bccd9e5714dc83e8327f3addc181b83f940cadd9a2fd000f027912215957bf62cf282b4c4f7edf7933704f9447a47a372c1f00168
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
deleted file mode 100644
index d4fd5d0d6e36..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-inherit meson python-any-r1
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
index e72b60acc1d2..5bb870c11de6 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 21844056bb04..74ee7d217f77 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,7 +11,9 @@ AUX xscreensaver-6.03-without-gl-configure.patch 541 BLAKE2B 42818f7ad82513cde53
 DIST xscreensaver-6.01.tar.gz 27820165 BLAKE2B b2c90b47fb65db79d2473c1e396717156e414a0200672971adadf5729056ad9210822955a71f1a098e2142c00c5e60b24aababf9431903f96ff76e8c2d474052 SHA512 3a6e875196e1340909b2a379c25e758fef490d3d10154aef3096ec1be50fabe0d852de806d45a067eefd061381c8541acd7902d28be3bac15b76bd9d4bf0c02a
 DIST xscreensaver-6.02.tar.gz 22672643 BLAKE2B 2d931fe93230e8c7344abd9180e26ab8775f82604e6f4804c82821c486203be567708cf50f7a11276a6b39df493fe5652b4198765ecb3bc5afc8cbc5a01d4801 SHA512 2291ec6ca2d2a24dae975f7f3a8e1733c06f289eb74955db5b3344c7ddcc1d72f82d380df984ef9199f2ed7ab8a7bc920da57d98f589ae5fd1cee082755ba1ff
 DIST xscreensaver-6.03.tar.gz 25703584 BLAKE2B 1276e469e8f4116fac5d434aeacbc16ff8243b56095d39ff4fcbb390abad935e70d308d2a3ecfebaa453f2dd19944ecc2edb18a229248c02f2e3997f30436bce SHA512 4aa30824c972a73dc09aeba478cad074f273839a4c7641cddd292da38fc75db10a3f6243cbe8619c5e39cad54c27d33e1e271dfed167458faa7747fb0a090630
+DIST xscreensaver-6.04.tar.gz 26112437 BLAKE2B 42411d5f63a99d4aaccbc3bc34f8c31a1f25f1806eaf513a1ba59c2f24722e27fa2a7b1970c82a591502627224c4b4269176bda3475aba58bb945d5cd9a9464b SHA512 7e8f01853b3d9252ce0120894db7dd4fa3cd19114602a09aa770ec750e2f3742585ca4daf19b009e97386f8c0e3cc89330fe760148c6388f41de8cc1f48f8071
 EBUILD xscreensaver-6.01-r4.ebuild 5884 BLAKE2B e6e2b8f44c38c9c22181262b227bccc4fe16339c283de394de919670010ed1b0690681da990792162760ff93ff5090f9ffb2a01547c9abe25686d5726586ace9 SHA512 ded2ad6cf75c380f343b33d64ac2f3540b55fb3a91f640dd49d6f2cabae4634b17c124637e38a6ebd6425f1aeaf54092eb75f3787fbdf7f690e211f4960f3900
 EBUILD xscreensaver-6.02-r1.ebuild 6208 BLAKE2B 73c3fe81451df69263624479a6729da783a89618ebbcac9199bc6623ff56b3a7ada878d21185052d45dd3512618e3603a8d4acd2c2be45e1d8432a76acbfa5bf SHA512 15f08b0b0a41363b6f20206741eaf1dcb6d320f6f84df3a6d6ef76bf91e80607043481ef4b2a31e9a6018724213d3fde17a658c9843663ad09ace60a52969e7a
 EBUILD xscreensaver-6.03.ebuild 6519 BLAKE2B 3714eb6a47f0f4673b5e1e01169d36f50df8a8374f68b080bde5916dcc448100beac6cd09e203d1c42e88bd0f6cc7da574f3f5b9d4b243e5078ed156ecd719b0 SHA512 dacfd2604e1774cd53870c7af26db910f123449c360351e43ae6d2b0eabf64d5001e011c72a5362f9c61312d7bf44fe4cc679eed29e84e9c492b9a74fd483beb
+EBUILD xscreensaver-6.04.ebuild 6531 BLAKE2B 4b47d5e87f477c20a53b79b2ec3fd3f99ad4d9f68a9e68d86b19a352af59381e219bea56e60d5a64d215f71af53034bbc5ca36ce90700e5734a45e3939713559 SHA512 686a2c7183cf0b2e2de2b7a91fa0278a3b7e15144f024bc8f8f4f34efa24d8a6c92a626ddcba36c93cda3207051ac616f39912ea9dc200927a99913612f9f296
 MISC metadata.xml 1125 BLAKE2B a1ac7ece845498dceb98238023472300253798ca00e14a278479e0fad6d91dd37e8cbe205f59ba3080b4cd942bb503a8f3c20ec4513d9b88b397f23b7eaf91a1 SHA512 045d8161087ba016fbfc0bf3ba82b3018e93f0be9467e44b9707818084adb110fce2c94f59f2623a2c4ec3ecadb99a91ebb7f1beb31c16565582da37bb6d582c
diff --git a/x11-misc/xscreensaver/xscreensaver-6.04.ebuild b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
new file mode 100644
index 000000000000..630db4ff3676
--- /dev/null
+++ b/x11-misc/xscreensaver/xscreensaver-6.04.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic font optfeature pam strip-linguas
+
+DESCRIPTION="Modular screen saver and locker for the X Window System"
+HOMEPAGE="https://www.jwz.org/xscreensaver/"
+SRC_URI="https://www.jwz.org/xscreensaver/${P}.tar.gz"
+
+# Font license mapping for folder ./hacks/fonts/ as following:
+#   clacon.ttf       -- MIT
+#   gallant12x22.ttf -- unclear, hence dropped
+#   luximr.ttf       -- bh-luxi (package media-fonts/font-bh-ttf)
+#   OCRAStd.otf      -- unclear, hence dropped
+#   SpecialElite.ttf -- Apache-2.0
+LICENSE="BSD fonts? ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="elogind fonts +gdk-pixbuf gdm gles glx +gtk jpeg +locking new-login offensive opengl pam +perl +png selinux suid systemd +xft xinerama"
+REQUIRED_USE="
+	gdk-pixbuf? ( gtk )
+	gles? ( !glx opengl )
+	glx? ( opengl )
+	gtk? ( png )
+	opengl? ( png )
+	?? ( elogind systemd )
+"
+
+COMMON_DEPEND="
+	dev-libs/libxml2
+	x11-apps/appres
+	x11-apps/xwininfo
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/libXxf86vm
+	elogind? ( sys-auth/elogind )
+	gdk-pixbuf? (
+		x11-libs/gdk-pixbuf-xlib
+		>=x11-libs/gdk-pixbuf-2.42.0:2
+	)
+	gtk? ( x11-libs/gtk+:2 )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	locking? ( virtual/libcrypt:= )
+	new-login? (
+		gdm? ( gnome-base/gdm )
+		!gdm? ( || ( x11-misc/lightdm lxde-base/lxdm ) )
+	)
+	opengl? (
+		virtual/glu
+		virtual/opengl
+	)
+	pam? ( sys-libs/pam )
+	png? ( media-libs/libpng:= )
+	systemd? ( >=sys-apps/systemd-221 )
+	xft? ( x11-libs/libXft )
+	xinerama? ( x11-libs/libXinerama )
+"
+# For USE="perl" see output of `qlist xscreensaver | grep bin | xargs grep '::'`
+RDEPEND="
+	${COMMON_DEPEND}
+	media-gfx/fbida
+	perl? (
+		dev-lang/perl
+		dev-perl/libwww-perl
+		virtual/perl-Digest-MD5
+	)
+	selinux? ( sec-policy/selinux-xscreensaver )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/bc
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.01-interix.patch
+	"${FILESDIR}"/${PN}-5.31-pragma.patch
+	"${FILESDIR}"/${PN}-6.01-gentoo.patch
+	"${FILESDIR}"/${PN}-5.45-gcc.patch
+	"${FILESDIR}"/${PN}-6.01-configure.ac-sandbox.patch
+	"${FILESDIR}"/${PN}-6.01-without-gl-makefile.patch
+	"${FILESDIR}"/${PN}-6.01-non-gtk-install.patch
+	"${FILESDIR}"/${PN}-6.01-gtk-detection.patch
+	"${FILESDIR}"/${PN}-6.01-configure-install_sh.patch
+	"${FILESDIR}"/${PN}-6.03-without-gl-configure.patch
+)
+
+DOCS=( README{,.hacking} )
+
+src_prepare() {
+	default
+
+	sed -i configure.ac -e '/^ALL_LINGUAS=/d' || die
+	strip-linguas -i po/
+	export ALL_LINGUAS="${LINGUAS}"
+
+	if use new-login && ! use gdm; then #392967
+		sed -i \
+			-e "/default_l.*1/s:gdmflexiserver -ls:${EPREFIX}/usr/libexec/lightdm/&:" \
+			configure{,.ac} || die
+	fi
+
+	# We are patching driver/XScreenSaver.ad.in, so let's delete the
+	# header generated from it so that it gets back in sync during build:
+	rm driver/XScreenSaver_ad.h || die
+
+	if ! use offensive; then
+		sed -i \
+			-e '/boobies/d;/boobs/d;/cock/d;/pussy/d;/viagra/d;/vibrator/d' \
+			hacks/barcode.c || die
+		sed -i \
+			-e 's|erect penis|shuffle board|g' \
+			-e 's|flaccid penis|flaccid anchor|g' \
+			-e 's|vagina|engagement ring|g' \
+			-e 's|Penis|Shuttle|g' \
+			hacks/glx/glsnake.c || die
+		sed -i \
+			's| Stay.*fucking mask\.$||' \
+			hacks/glx/covid19.man \
+			hacks/config/covid19.xml || die
+	fi
+
+	config_rpath_update "${S}"/config.rpath
+
+	# Must be eauto*re*conf, to force the rebuild
+	eautoreconf
+}
+
+src_configure() {
+	if use ppc || use ppc64; then
+		filter-flags -maltivec -mabi=altivec
+		append-flags -U__VEC__
+	fi
+
+	unset BC_ENV_ARGS #24568
+
+	# Works similarly to -Werror,
+	# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wimplicit-function-declaration
+	filter-flags -pedantic-errors
+
+	# /proc/interrupts won't always have the keyboard bits needed
+	# Not clear this does anything in 6.03+(?) but let's keep it for now in case.
+	# (See also: configure argument)
+	export ac_cv_have_proc_interrupts=yes
+
+	# WARNING: This is NOT a normal autoconf script
+	# Some of the --with options are NOT standard, and expect "--with-X=no" rather than "--without-X"
+	ECONF_OPTS=(
+		$(use_enable locking)
+		$(use_with elogind)
+		$(use_with gdk-pixbuf pixbuf)
+		$(use_with gles)
+		$(use_with glx)
+		$(use_with gtk)
+		$(use_with new-login login-manager)
+		$(use_with opengl gl)
+		$(use_with pam)
+		$(use_with suid setuid-hacks)
+		$(use_with systemd)
+		$(use_with xinerama xinerama-ext)
+		--with-jpeg=$(usex jpeg yes no)
+		--with-png=$(usex png yes no)
+		--with-xft=$(usex xft yes no)
+		--with-app-defaults="${EPREFIX}"/usr/share/X11/app-defaults
+		--with-configdir="${EPREFIX}"/usr/share/${PN}/config
+		--with-dpms-ext
+		--with-hackdir="${EPREFIX}"/usr/$(get_libdir)/misc/${PN}
+		--with-proc-interrupts
+		--with-randr-ext
+		--with-text-file="${EPREFIX}"/etc/gentoo-release
+		--with-xdbe-ext
+		--with-xf86gamma-ext
+		--with-xf86vmode-ext
+		--with-xinput-ext
+		--with-xkb-ext
+		--with-xshm-ext
+		--without-gle
+		--without-kerberos
+		--without-motif
+		--with-proc-oom
+		--x-includes="${EPREFIX}"/usr/include
+		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
+	)
+	# WARNING: This is NOT a normal autoconf script
+	econf "${ECONF_OPTS[@]}"
+}
+
+src_compile() {
+	# stock target is "default", which is broken in some releases.
+	emake all
+}
+
+src_install() {
+	use pam && dodir /etc/pam.d/
+	emake install_prefix="${D}" DESTDIR="${D}" install
+
+	if use fonts; then
+		# Do not install fonts with unclear licensing
+		rm -v "${ED}${FONTDIR}"/{gallant12x22.ttf,OCRAStd.otf} || die
+
+		# Do not duplicate font Luxi Mono (of package media-fonts/font-bh-ttf)
+		rm -v "${ED}${FONTDIR}"/luximr.ttf || die
+
+		font_xfont_config
+	else
+		rm -v "${ED}${FONTDIR}"/*.{ttf,otf} || die
+		rmdir -v "${ED}${FONTDIR}" || die #812473
+	fi
+
+	einstalldocs
+
+	if use pam; then
+		fperms 755 /usr/bin/${PN}
+		pamd_mimic_system ${PN} auth
+	fi
+
+	# bugs #809599, #828869
+	if ! use gtk; then
+		rm "${ED}/usr/bin/xscreensaver-demo" || die
+	fi
+}
+
+pkg_postinst() {
+	use fonts && font_pkg_postinst
+
+	# bug #811885
+	if ! use glx && use opengl; then
+		elog "Enable USE='glx' if OpenGL screensavers are crashing."
+	fi
+
+	optfeature 'Bitmap fonts 75dpi' media-fonts/font-adobe-75dpi
+	optfeature 'Bitmap fonts 100dpi' media-fonts/font-adobe-100dpi
+	optfeature 'Truetype font Luxi Mono' media-fonts/font-bh-ttf
+}
+
+pkg_postrm() {
+	use fonts && font_pkg_postrm
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 247699b68dcd..735cd402230d 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 78e424b4edb6..f5411d485430 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -4,6 +4,8 @@ DIST gnome-terminal-3.42.2-cntr-ntfy-autottl-ts.patch.xz 33980 BLAKE2B e0400f960
 DIST gnome-terminal-3.42.2.tar.xz 1806388 BLAKE2B 9e3068d9731689dd5dc012405384073a6ea07d59370340bcccdc3383e24f5a5424a14b5e903a01b4cca3925758f9b2f5cd7861b30658324297f817807fefbb66 SHA512 001504539adbcdac609f22ee8120455d2a2db8f4208ca2715c6bb271b5488bfdbe78deca3c997cd4d2293f2e7e51db66746af56f5ba46792542654972dbc739e
 DIST gnome-terminal-3.44.0-cntr-ntfy-autottl-ts.patch.xz 37248 BLAKE2B b3599386e7272fc5b742c11663f09bbfafa84cc855bd13fd602d679601fbb4126f36cdb157db37db335bf9edfe7d2b85e534baf837c5817984ec17baa4cdbb6c SHA512 6422a774abfee18b2681115344f508b72ead1bb9f27b5b1596b419a9ce5a137d41e2d749b6d784170225e7f21f15c109f7eb74cc3164371d53dee7790bf99187
 DIST gnome-terminal-3.44.0.tar.xz 1810124 BLAKE2B 041aa7400cbf0f075c37f6276d06dbffb0b87da13d8bcb9d13e62b13a1e16ae612970d1ec6462c7c257f7bcf2da222b48df1d8d28ce24b216ae3d11c76f05341 SHA512 0cf039c0aa364a9ac63d9f24d466506a919cf733f2ee8dc1c6f42459e6c742bad678f7ad7cec3721e9512b8f414dc4c4c1f29057c73e5e4a870a04d6bcd98ed6
+DIST gnome-terminal-3.44.1.tar.xz 1813032 BLAKE2B 3e001139aa0516bd27f7215c692c048393d6ad41737b8817f212529d3c530f6417d05601f63e6265e3fb84e788322341c25784a0a26ee7434f1d4bccd31c1eea SHA512 afaa9a1b4fa86fea853a242f167d1ba3438efe4e049336bae138cb800d43c3325f624849463f16c9d4e34360916377c4edbfd2f3977212b51e35a41cca88b283
 EBUILD gnome-terminal-3.42.2.ebuild 2903 BLAKE2B 141f3a347695d2f6f740aa889bd447f15c28b03810823550aa182262a8da4a9a506d036bf1cb4e5399445f7494c68758d59deb6978364fa4ccd21f42759cab4e SHA512 73effc80fec9f29beaa6fe5d200a7c3b4651274e61f0a05116fbe07d84b7f486c1227d9596a652f4fead335d3275ba5b56083952b49be744520bb227bda1b636
-EBUILD gnome-terminal-3.44.0.ebuild 2901 BLAKE2B 7207aed27e888f8069c147d298c65b4678f3fdb9fa1b5ba846503b40dd951eab5d91310e7e15d38ef05e36b1666611c45ba35e5fb3abb975163683fc77f7af53 SHA512 f9890e7bd3ac16b9c81f729b8d630e3ce969d67ac5733b25b8e244ae3a8319d052e2346fd8fb22a9049af14fe125a5b7e450f95bd4a0d727740a8f1f3b71c6d6
+EBUILD gnome-terminal-3.44.0.ebuild 2898 BLAKE2B 2f4426d25fd36980f6de0d37c0268f8a27d4611ad5bee9e9093071bc69fad56f18b9c2e7e7ab60e0456c4f9c47d9db5eb6d383c38107e641cabdcb49bbc6fdea SHA512 171eeaa4ac719e5f80e42e3c2807259a5661d14bcd70d1a9acdc3c12e42d11434b97de5eccaa1aceecc59d489f400a312da79025551ab2c0bf5e35225cbdf7e3
+EBUILD gnome-terminal-3.44.1.ebuild 2901 BLAKE2B c1f4bbae598e83594b00d3b602d9615894eae13fc619a8cc97391420585bf2008a968b07f85ab7e6e97a19926514c5bf42902b95e80360ea850e8f3b5ebc09d7 SHA512 81012f75698cdfeac4fa25cab06d6bb978979ff69178dba8d3b978910a1945c8986877e2a27d35dd1d61af0539bef5a3b41c2d83a51b0f0ad67af46795814f19
 MISC metadata.xml 418 BLAKE2B f4066a783c4612bc4d4b0883a5f74e626c2fe8716ba3cf78b2f5ac17aa803e3bfd3ed0ad6c88bd4142163f2f0f8b6e37638ba3c13fb4f199c7a667d9220d7f3c SHA512 b3bdd052a5038b59c040633331cb9a00da50db1ac6af26b0dbeb5b94a91ec6ada15e493101db1882fb194af590301e9965a400db3f1d29800589ea2256c16636
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
index a5297be2d0ec..de2616fb840b 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
 IUSE="debug +gnome-shell +nautilus vanilla"
 SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 # FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
 RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
new file mode 100644
index 000000000000..ee6bad56441b
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.44.1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="A terminal emulator for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/ https://gitlab.gnome.org/GNOME/gnome-terminal"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+SRC_URI+=" !vanilla? ( https://dev.gentoo.org/~mattst88/distfiles/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch.xz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X], just transitive but needs proper control, bug 624960
+RDEPEND="
+	>=dev-libs/glib-2.52:2
+	>=x11-libs/gtk+-3.22.27:3
+	>=x11-libs/vte-0.68.0:2.91[!vanilla?]
+	>=dev-libs/libpcre2-10
+	>=gnome-base/dconf-0.14
+	>=gnome-base/gsettings-desktop-schemas-0.1.0
+	sys-apps/util-linux
+	gnome-shell? ( gnome-base/gnome-shell )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened tab, or
+	notifications of long-running commands finishing, you will need
+	to add the following line to your ~/.bashrc:\n
+	. /etc/profile.d/vte-2.91.sh"
+
+src_prepare() {
+	if ! use vanilla; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=695371
+		# Fedora patches:
+		# Restore transparency support (with compositing WMs only)
+		# OSC 777 desktop notification support (notifications on tabs for long-running commands completing)
+		# Restore "Set title" support
+		# Automatic title updating based on currently running foreground process
+		# https://src.fedoraproject.org/rpms/gnome-terminal/raw/f31/f/gnome-terminal-cntr-ntfy-autottl-ts.patch
+		# Depends on vte[-vanilla] for OSC 777 and the preexec/precmd/etc patches in VTE
+		eapply "${WORKDIR}"/${PN}-3.44.0-cntr-ntfy-autottl-ts.patch
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use debug dbg)
+		-Ddocs=false
+		$(meson_use nautilus nautilus_extension)
+		$(meson_use gnome-shell search_provider)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if ! use vanilla; then
+		# Separate "New Window/Tab" menu entries by default, instead of unified "New Terminal"
+		insinto /usr/share/glib-2.0/schemas
+		newins "${FILESDIR}"/separate-new-tab-window.gschema.override org.gnome.Terminal.gschema.override
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c7e7acce9452..364a1cf019eb 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,9 +1,3 @@
-DIST xterm-367.tgz 1448562 BLAKE2B 29b38ba3b48c843ecbf22d209a05afb4e9a6d52cf8f14efa18ed5dd02b26cc11c107bfb17260cb62f68fc318cb08e5147b5f12e8779ca63151c7b712ada60b7e SHA512 86fd6ed4e4aa0201349edd67d8bf00d3b93a19640307372011f9bdcd26fdb453267d1ab092a0639902e419b00c175d793b196884b6e65e546650e1b83a4461c4
-DIST xterm-370.tgz 1500208 BLAKE2B 973cda2511e761be64332746f004ed9ea716c8f5b7065cef2ef60d789e6186138b671920f23135b5c66d3226ce17c1d195db456350c94f5f0973e29610896b1a SHA512 24f1836c4f5aec175c45db77e9bc829b45ee2c93cf12c20252b22bee470392ef0637cfbbb6e90074b1c038ac023f74a4fb713bbd4abf2b5b86d064667caf38dd
-DIST xterm-371.tgz 1507938 BLAKE2B 4ae16885bc07e7a0feb9aae29ef724f45e1170ba1eb7660c000df9a3f903c73063569d366383e7c30546480675b3fcd6513bb824ee3a5ee05155739e858360c5 SHA512 024c2cd8ab5a9da6585999907974a917497f693a0fb8cf4519c41c7e75ef2bfcc146c7078129590a836a322f7e59a550ad741b55dcbe98be6ee7988ccebe8903
 DIST xterm-372.tgz 1507107 BLAKE2B 256b99b13512740086203c4c05685cd170356118e11029a01d30b32f69c1fc5088efa0dabc955d8a24acf36f3e061faf7af9866c2302a4ac45405b97455384a0 SHA512 f65fee6227ca27be85569ec06f3701a6114489e036975d0fe37f3c71d7598d1b06c8689cfbda593a98418eec1417bd60b33e3978752b255989cfa0bb4ce332bf
-EBUILD xterm-367.ebuild 2599 BLAKE2B cfd80d741533347fc330450bf7ecfffc2c8a73b27a6c2fcb0368c29ccac49412f4acc7838440cdb9821cc06a1c77a84d7a454524161e3826e8e14682566f390f SHA512 878cb054f5764bdf6cf0b517464261301b97d8040e2d28a5f4efcecbda6851ebd2e68c784ad00b0dd7856a89b7bcd5413c98bc16d671412381f8d86caec3f37a
-EBUILD xterm-370.ebuild 2612 BLAKE2B a252994bb9060d018b83c4aad3d25ec5730bb89dcde80814d84efdb7399af7651639f048eb211fcab759208b2ae63314ca4a1bab9ecd176639b2f925d444a49e SHA512 38f8df8d294cacaa1d6e8dea246aca2116e9263a485df7e09282265453158c104951bb6b5624675b40e417c6a94875755ce5cae7a9131d34e97dba2ac22f9be2
-EBUILD xterm-371.ebuild 2602 BLAKE2B e1597c676eebf44289dadfc3cd50ae974a839f92cee438dbd2322856b2bd4a537574785d61735846b3ab3f19b45d88b31570f5f208257a2b27e099ab9d153b4e SHA512 c995b9ce3cf0e6c3e7e9524eb8a8c16b250517296c49d90dd38715ecdffb51e2af3ab601f2fe9749b8a31d97c5f7a50651f2acb0bce2aae6069af1adc5a346b4
 EBUILD xterm-372.ebuild 2602 BLAKE2B 34217a79398617f43dceb77255dc2f60ef742e0626a75a3362e0f440e976eabeabe5b68f01b64b04c944102b041b490550a7cfa11a49bb9a26a4f4a7045d4326 SHA512 931ebdb5db36135ab730418b2bcef4565040250f27b4d403cfa57abead4b2b2046f5982c202a034b5dfca3705b3dd613359b56740d8280336bb66da1211be1e0
 MISC metadata.xml 551 BLAKE2B ea228db9f2a50592917875e25ff88094c4aa1389db78b1301c59f98e3b3259ea69827c20e48a187c423b6303977532b9172a3dedd08e52cb1faf3e60bfb181db SHA512 fa450afa13de5b0fabb81f6fa55961e1b603f902836065736ed381cd447561eda6449a269e4c2a3d63c1c6967848c82997b93fa6462b7a622361929e619d1025
diff --git a/x11-terms/xterm/xterm-367.ebuild b/x11-terms/xterm/xterm-367.ebuild
deleted file mode 100644
index 99c8680dc55c..000000000000
--- a/x11-terms/xterm/xterm-367.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-370.ebuild b/x11-terms/xterm/xterm-370.ebuild
deleted file mode 100644
index 57e07cc5fdd8..000000000000
--- a/x11-terms/xterm/xterm-370.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-pkg_setup() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-}
-
-src_configure() {
-	# 454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-terms/xterm/xterm-371.ebuild b/x11-terms/xterm/xterm-371.ebuild
deleted file mode 100644
index 9a982a2d7cbb..000000000000
--- a/x11-terms/xterm/xterm-371.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="Terminal Emulator for X Windows"
-HOMEPAGE="https://invisible-island.net/xterm/"
-SRC_URI="ftp://ftp.invisible-island.net/${PN}/${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+openpty sixel toolbar truetype unicode Xaw3d xinerama"
-
-BDEPEND="virtual/pkgconfig
-	x11-base/xorg-proto"
-DEPEND="
-	kernel_linux? ( sys-libs/libutempter )
-	media-libs/fontconfig:1.0
-	>=sys-libs/ncurses-5.7-r7:0=
-	x11-apps/xmessage
-	x11-libs/libICE
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXft
-	x11-libs/libxkbfile
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	unicode? ( x11-apps/luit )
-	Xaw3d? ( x11-libs/libXaw3d )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${DEPEND}
-	media-fonts/font-misc-misc
-	x11-apps/rgb"
-
-DOCS=( README{,.i18n} ctlseqs.txt )
-
-src_configure() {
-	DEFAULTS_DIR="${EPREFIX}"/usr/share/X11/app-defaults
-
-	# bug #454736
-	# Workaround for ncurses[tinfo] until upstream fixes their buildsystem using
-	# something sane like pkg-config or ncurses5-config and stops guessing libs
-	# Everything gets linked against ncurses anyways, so don't shout
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	local myeconfargs=(
-		--disable-full-tgetent
-		--disable-imake
-		--disable-setgid
-		--disable-setuid
-		--enable-256-color
-		--enable-broken-osc
-		--enable-broken-st
-		--enable-dabbrev
-		--enable-exec-xterm
-		--enable-i18n
-		--enable-load-vt-fonts
-		--enable-logging
-		--enable-screen-dumps
-		--enable-warnings
-		--enable-wide-chars
-		--libdir="${EPREFIX}"/etc
-		--with-app-defaults="${DEFAULTS_DIR}"
-		--with-utempter
-		--with-x
-		$(use_enable openpty)
-		$(use_enable sixel sixel-graphics)
-		$(use_enable toolbar)
-		$(use_enable truetype freetype)
-		$(use_enable unicode luit)
-		$(use_enable unicode mini-luit)
-		$(use_with Xaw3d)
-		$(use_with xinerama)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc xterm.log.html
-	domenu *.desktop
-
-	# Fix permissions -- it grabs them from live system, and they can
-	# be suid or sgid like they were in pre-unix98 pty or pre-utempter days,
-	# respectively (#69510).
-	# (info from Thomas Dickey) - Donnie Berkholz <spyderous@gentoo.org>
-	fperms 0755 /usr/bin/xterm
-
-	# restore the navy blue
-	sed -i -e 's:blue2$:blue:' "${D}${DEFAULTS_DIR}"/XTerm-color || die
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 4929e81d95a4..6f9508d8a32a 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 70aa13e982b9..2ce550eb2d5d 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -1,8 +1,11 @@
 DIST adwaita-icon-theme-3.32.0.tar.xz 18540012 BLAKE2B a82ca6758cdbf459ac617d3b3d834e4147c3a3c5e6ca7c705ed2d16e8cf0a1255f5ae999d7e930b9716585b8c498c220f1ab40fec929dde7679efd56f3b18a45 SHA512 9609732cd51c6794d4d86598818bb2a589b0f4b6b795e57f3507dad69b21ef1b2fc2e83e24e937428bbace32fcccf587a5771cbc02c5768206e704f0456a6d1d
 DIST adwaita-icon-theme-41.0.tar.xz 17086916 BLAKE2B 6899bf734a3f708e6596a4aeb2df426041dd46232a3cbd55f530fab2cc92277db74322a31a443e251a06c74bf7fad7d5f9394b63edb33fced5ce8987e5c87d3e SHA512 2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86
 DIST adwaita-icon-theme-42.0.tar.xz 10407000 BLAKE2B 1ec998731b8da4ed17d7bb5887faba7a33721955836265c67efeffcf16bbb82e6f20750245b9b6d7dc4e816ec0e6ae71cb51a839debb0e070edf5d347d6260d5 SHA512 521bfd44fdc253f5fd01fcdfaa485669849ad73c35354ccfe9b358ba433cfa40ee6d68b70ec2268a4ce0631a48670b03b30811ca68e2e19f9430082454e02015
+DIST adwaita-icon-theme_42.0-2.debian.tar.xz 38420 BLAKE2B 49d88218881bd064394faa320a90e0ce1ef3a1295fbb1fbb276fb79f99f1caf7a6b1b1600ad6c648a6cb479e7bc429101cd0c327bcb8da64d50c7ea1e7a1c8fe SHA512 0bcbad6e63a05b3e916b76e6e6e5b629cf859d7bfa8e0edb53112967921cc00b9217270b663aadd36bde4bea38769345ea54593337cc0c524cf998266a4a3f65
+DIST adwaita-icon-theme_42.0.orig-41.tar.xz 17086916 BLAKE2B 6899bf734a3f708e6596a4aeb2df426041dd46232a3cbd55f530fab2cc92277db74322a31a443e251a06c74bf7fad7d5f9394b63edb33fced5ce8987e5c87d3e SHA512 2a540f2b53cb64433780029ea70c2cfe8417ae7e619d8eefa59825e3ebcb8585acd4ccae25344c8e146a0ee0705ccbb39a2cb729a162534fd86a4ff24e505c86
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.32.0.ebuild 1608 BLAKE2B 9fe50b4414ed37f44d8db02017e263c2ebbda88304422d56cead5eb65a0ffa74262241e5f41333ac823d6b0bdb04fcb28746ef7058be7fed349bcc34853f12e4 SHA512 a145ffb05832fbb569efa21c166cb004f94605dcfcc7c1b2a10080e9ae641902357d6f9d7a773bae3f43fa024c6ce3bf9231a93fc0366f46bda961930b5e2112
 EBUILD adwaita-icon-theme-41.0.ebuild 1541 BLAKE2B 70ce4473116bd53db0548420176cd9e4b2162eff5cd63dc320bc97c9b3dd4d12fe8cc2eb8ca2762e6bca94cd3bcf0e34086f19840daf48cfb60b88e38492af5d SHA512 4c2407584b7596bf31e73f745b2928af15a52fe3fc1b979e84ce728775dd81b2af1e7b8cdbeb3f7a627e5dbdf04fc03a375d55190e79c0dc4d6cfe6535ae577f
-EBUILD adwaita-icon-theme-42.0.ebuild 1546 BLAKE2B c9fa11e4da0d684763623fac46ed5a047a436a9cc07e7ec4be1659f3f6ad198579d0b37df4beb4ce7cc3e8f63800036305e7803188b81346de87c8cb83a8df54 SHA512 b2b970547bb8204b1f7cdcbbe06c71c34e654592330740149fa5bf892bb5e30a401a9c493170dd0e33c3a021b065a6bebe5fee51d63bce017dd5911fd5dd9137
+EBUILD adwaita-icon-theme-42.0.ebuild 1542 BLAKE2B 762b895fc4547b54c7cab851611f96cb174fc70a876e2c4ec438f1c07dbda9d57b95cea04b38505a8da4c783184bc815efe013f5fabfed88a248e6fa45ede707 SHA512 efae365d3121df7971926ebf285dcd2d422feee75d6517d9af5b9331d322bc527c1db61a86553b3b0d538eaa2abe236b81a7dbd13193933db96a84ee4d29938d
+EBUILD adwaita-icon-theme-42.0_p2.ebuild 3743 BLAKE2B 2e9d2a8010308b30169c87c1453720baf53e58b3a15528b1dc7bfa12926bcdd80f2e5cf1b67f7e0558fe535f9df05e8debf53002166bccbc6719e30fbbba5716 SHA512 dafae4a56e4365e181290e03ddb5529ffb6a79121fa2748c9c1e2922312081ad9dfa8ec79cda54977008f5152ea2e13ae0a608fd293fe1061cb34be8c241a8e1
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
index 7154dd1d95ab..19e131b77cec 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
 # librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild
new file mode 100644
index 000000000000..b6c5f66fbb73
--- /dev/null
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-42.0_p2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome2 python-any-r1
+
+DESCRIPTION="GNOME default icon theme"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
+
+# Rely on Debian workaround until all involved upstreams agree on how to
+# fix this: https://gitlab.gnome.org/GNOME/evolution/-/issues/1848
+SRC_URI="${SRC_URI/_p*}.tar.xz
+	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig-41.tar.xz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+LICENSE="
+	|| ( LGPL-3 CC-BY-SA-3.0 )
+	branding? ( CC-BY-SA-4.0 )
+"
+SLOT="0"
+IUSE="branding"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# gtk+:3 is needed for build for the gtk-encode-symbolic-svg utility
+# librsvg is needed for gtk-encode-symbolic-svg to be able to read the source SVG via its pixbuf loader and at runtime for rendering scalable icons shipped by the theme
+DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+RDEPEND="${DEPEND}
+	>=gnome-base/librsvg-2.48:2
+"
+BDEPEND="${PYTHON_DEPS}
+	>=gnome-base/librsvg-2.48:2
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-libs/gtk+:3
+"
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+S="${WORKDIR}/${P/_p*}"
+
+src_prepare() {
+	if use branding; then
+		for i in 16 22 24 32 48; do
+			cp "${WORKDIR}"/tango-gentoo-v1.1/${i}x${i}/gentoo.png \
+			"${S}"/Adwaita/${i}x${i}/places/start-here.png \
+			|| die "Copying gentoo logos failed"
+		done
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+	einfo "Configuring legacy icons"
+	cd "${WORKDIR}/${PN}-41.0" && gnome2_src_configure GTK_UPDATE_ICON_CACHE=$(type -P true)
+}
+
+src_compile() {
+	gnome2_src_compile
+	einfo "Compiling legacy icons"
+	cd "${WORKDIR}/${PN}-41.0" && gnome2_src_compile
+}
+
+pkg_preinst() {
+	# Needed until bug #834600 is solved
+	if [[ -d "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita ]] ; then
+		rm -r "${EROOT}"/usr/share/cursors/xorg-x11/Adwaita || die
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Gentoo uses the following location for cursors too, but keep
+	# upstream path to prevent issues like bugs #838451, #834277, #834001
+	dosym ../../../../usr/share/icons/Adwaita/cursors /usr/share/cursors/xorg-x11/Adwaita
+
+	# Fix until https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/commit/706d29cc5ca35bef6d0b3e682ae1752f33bf2705
+	# is in a release
+	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-seek-backward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-seek-forward-symbolic-rtl.svg
+	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-seek-forward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-seek-backward-symbolic-rtl.svg
+	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-skip-backward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-skip-forward-symbolic-rtl.svg
+	dosym ../../../../../../usr/share/icons/Adwaita/scalable/actions/media-skip-forward-symbolic.svg /usr/share/icons/Adwaita/scalable/actions/media-skip-backward-symbolic-rtl.svg
+
+	# Install missing icons, bug #844910
+	# https://gitlab.gnome.org/GNOME/evolution/-/issues/1848
+	einfo "Installing legacy icons"
+	cd "${WORKDIR}/${PN}-41.0"
+	emake DESTDIR="${WORKDIR}/debian/tmp-41" install
+	"${PYTHON}" "${WORKDIR}/debian/move-subset.py" \
+		--icon-names-from-file="${WORKDIR}"/debian/legacy-icons-41.txt \
+		--icon-names-from-file="${WORKDIR}"/debian/removed-icons-41.txt \
+		"${WORKDIR}"/debian/tmp-41 \
+		"${ED}" || die
+}
diff --git a/x11-themes/fluent-icon-theme/Manifest b/x11-themes/fluent-icon-theme/Manifest
index 41c193f4b969..8e9aa7318f27 100644
--- a/x11-themes/fluent-icon-theme/Manifest
+++ b/x11-themes/fluent-icon-theme/Manifest
@@ -1,5 +1,7 @@
 DIST fluent-icon-theme-2021.12.20.tar.gz 33924235 BLAKE2B 17f051f086858ceb9969a8cacf6bbd2a9efd2e19d98872866ec5d9ea40e0389f3f9ad451dd6ed449716108eee20ad34fff1b121b497b4323314868bb1fb4429e SHA512 fc5e131c90f9444c92d0305489350f590f29dd78f03dd090959db00a1415a0bd35998e25ed93213c176536fa31e780942593b5d5470e4aac6fe98eb066463fa8
 DIST fluent-icon-theme-2022.02.04.tar.gz 6742454 BLAKE2B 4795639edb540a2ab6e91f14e60e692e8d5826de6ab91d7a2db9a8386105887eff24d080541425b39ffddae4430d2967b168289c9e6444fe38a0e2135348314a SHA512 2da9e9ff1b75284228dd3d32009c302326504107d0e384977161e28cf95e4b0cb143cff94841712a549ea3f0e1cafe393392ec89f9827c12e64dde4bc8194ddf
+DIST fluent-icon-theme-2022.02.28.tar.gz 6125855 BLAKE2B 629de6f0ef9f5740124f2da53ecfff0e406af2e35d949c70447769397634cc2223afbc19d13c380f87b8ea19d78155fd3a7d971904238dc41ddb5cbf6007591c SHA512 04a65ac452f0f68a02ed849d4180766d1e893e4869b31c9f1dbe5938d7cc5a49cdb10409e5fa6b1cd3c27e309693774611a9fe9c431899aceda75f965da75e2a
 EBUILD fluent-icon-theme-2021.12.20.ebuild 1330 BLAKE2B ce342f063d645089b3951d22537c5187da90967c22d36400af1cd2797f34bfc26327202a98b5cfd836500043f78e4c0fa67fc30c83500a9f0281a563a0ef2722 SHA512 a6d7789cbccb4960f146d17cbb73a6b386ecf4c86c872c64281aea51d8b98626bbb807bbd00a22060104b41c2a744a07bcbbd2f8e4d8784bf62900b26e468e05
 EBUILD fluent-icon-theme-2022.02.04.ebuild 1330 BLAKE2B ce342f063d645089b3951d22537c5187da90967c22d36400af1cd2797f34bfc26327202a98b5cfd836500043f78e4c0fa67fc30c83500a9f0281a563a0ef2722 SHA512 a6d7789cbccb4960f146d17cbb73a6b386ecf4c86c872c64281aea51d8b98626bbb807bbd00a22060104b41c2a744a07bcbbd2f8e4d8784bf62900b26e468e05
+EBUILD fluent-icon-theme-2022.02.28.ebuild 1330 BLAKE2B ce342f063d645089b3951d22537c5187da90967c22d36400af1cd2797f34bfc26327202a98b5cfd836500043f78e4c0fa67fc30c83500a9f0281a563a0ef2722 SHA512 a6d7789cbccb4960f146d17cbb73a6b386ecf4c86c872c64281aea51d8b98626bbb807bbd00a22060104b41c2a744a07bcbbd2f8e4d8784bf62900b26e468e05
 MISC metadata.xml 761 BLAKE2B 6ff0f7e9cfd1ed82e6e34e8b730fa60ecfb4827467b5f0bc9aa94df860f54a28ad30290526046d28f952d794bbd287e000634fa24ea9a9aa9a4b088f076900c9 SHA512 54b5cb1d7da3a7098ec9e538c35c0e96349dcf828206d7ae7588444bd82e2a95b3a95306db1ec598b0684157133278386dacd48763d993669cc6269e0a5b4288
diff --git a/x11-themes/fluent-icon-theme/fluent-icon-theme-2022.02.28.ebuild b/x11-themes/fluent-icon-theme/fluent-icon-theme-2022.02.28.ebuild
new file mode 100644
index 000000000000..82a474b46799
--- /dev/null
+++ b/x11-themes/fluent-icon-theme/fluent-icon-theme-2022.02.28.ebuild
@@ -0,0 +1,56 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ie. 2021.12.20 -> 2021-12-20
+MY_PV="${PV//./-}"
+MY_PN="${PN^}"
+
+inherit xdg
+
+DESCRIPTION="Fluent icon theme for Linux desktops"
+HOMEPAGE="https://github.com/vinceliuice/Fluent-icon-theme"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vinceliuice/${MY_PN}.git"
+else
+	SRC_URI="https://github.com/vinceliuice/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+black +hardlink round"
+RESTRICT="binchecks strip test"
+
+BDEPEND="sys-apps/util-linux[hardlink(-)?]"
+
+src_prepare() {
+	default
+
+	sed -i '/gtk-update-icon-cache/d' install.sh || die
+}
+
+src_install() {
+	dodir /usr/share/icons
+	local myinstallopts=(
+		--all
+		--dest "${ED}/usr/share/icons"
+		$(usev black '--black')
+		$(usev round '--round')
+	)
+	bash ./install.sh "${myinstallopts[@]}" || die "install script failed"
+
+	if use hardlink; then
+		einfo "Linking duplicate icons... (may take a long time)"
+		hardlink -pot "${ED}/usr/share/icons" || die "hardlink failed"
+	fi
+
+	# installs broken symlink (by design, but we remove it due to QA warnings)
+	find "${ED}" -xtype l -delete || die "removing broken symlinks failed"
+
+	einstalldocs
+}
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index abd249a6dcf2..d49cec76b126 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-backgrounds-41.0.tar.xz 44919212 BLAKE2B 34f84a855447cc83624be22d4757b4165a7d5552ef9b2c30f21710ad11aa769ceb3c374d07e8e4461a6322bfd29e2e9138c2dbfd50678c0db200516e0881bd8b SHA512 d5b408e702ea15dd30482f6e3b446fe27c8032c1358957a8d3d491864716144df9a074a5667f4c3ab300f90961e1fb72d3db461cca6ae7a48a0ccf865723941a
 DIST gnome-backgrounds-42.0.tar.xz 51639368 BLAKE2B 3dc288732a91d53e2db9cfca5e529c3a6bda4d272645090751349485836a3c6807bdc071a9ae9ae58032265155a04c2b381cb7479fe913608cf9e39ff0ae79ed SHA512 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d
 EBUILD gnome-backgrounds-41.0.ebuild 458 BLAKE2B b0cb22b5b5a6485ce1347604702bb665d737e5b7d95bf1e521897ac39c4f9b03300e15f1453de6c02085ae43dc2b7fd8330c818de6c8f1b2ef86a99737ea0c9c SHA512 1a79002a2840421cfa343882a05b40e9a4e68c9640fb8f221c239d270fa7de553295775abf00695c1c3bbf9fe814a496e61db5f2a653ca08a57b1bfc1c7928be
-EBUILD gnome-backgrounds-42.0.ebuild 461 BLAKE2B 78a05d2dcee68ad30621e3e925db540d7163d99fda61708dceea6155d4777764578ceb231fd0f58a329e98eff5d5a3bd2e0bed1ace8a7986a9b49a4213f0ceb8 SHA512 e2fc578a1f638c2733fe46e35f1c225a6075262ab79b0e54df44eaf25dba21bc875e9a593966fa9ed5179cda054b3dc25a28f98e9a95eb45e5febff5424877a5
+EBUILD gnome-backgrounds-42.0.ebuild 458 BLAKE2B b0cb22b5b5a6485ce1347604702bb665d737e5b7d95bf1e521897ac39c4f9b03300e15f1453de6c02085ae43dc2b7fd8330c818de6c8f1b2ef86a99737ea0c9c SHA512 1a79002a2840421cfa343882a05b40e9a4e68c9640fb8f221c239d270fa7de553295775abf00695c1c3bbf9fe814a496e61db5f2a653ca08a57b1bfc1c7928be
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
index 899bc57295bc..f35589d4838f 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-42.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
 
 LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8cd8402e0613..2ad0c6fd6d38 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index e1cb9b62c74e..7bcbe8ae1141 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,4 +1,6 @@
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
+DIST herbstluftwm-0.9.4.tar.gz 549029 BLAKE2B 23f1dbf212c4d0a64f2e2d8442ac7c2465a54a13af74de6c949c4d6eda85fd4e66b73188c526d0968372eb45691ffca43e387c8410691fd134f662e1e8c501b3 SHA512 068438d14b0addcd17a0c0bda1d33ec4aaff08a3c85698a49e9d3dd0c07f91e315f936d73c11b0c159b8735373ea1efe8a572a0976fc327f4aaa6a0f08436e9d
 EBUILD herbstluftwm-0.9.3.ebuild 2982 BLAKE2B e9cbbe5b76e1553cdf2bd3197b93a3e7ad22612b8284c8ef20008bf9fab94f2117879f2f3c529766048f03ba0a22035750a62f5c8d78ab7b2d8e5ddb192bbcfc SHA512 107c2485d18e30abac5801a946cd565700ce90d75057a762ecb4c8a8d503b9c9f011396b6bf746ae90eb7da922ef5b043c915eea57bf348ea386b66b55c53d53
-EBUILD herbstluftwm-9999.ebuild 3262 BLAKE2B 0c6d211c2fa9d0e80b271e5107650a5176fa1bab34f1c948d25fd72f8111409c6d9c6543a1b46bb02ba103c030cc3b28edcd34d2b9e121f2b75072b534d7a7e4 SHA512 2739175752081dc17db123bd089e8f027d17ba1d1fb9a81b836d381976f07aaea194509733d766617b2dd8444992d62a065f5b83a091e0395c1b218c3afc893e
+EBUILD herbstluftwm-0.9.4.ebuild 2988 BLAKE2B 2ecb6e7cfbf2edecc2b59c3549fad303f789ed9aad902a516359b9b3aae98bda69da512d9a54a9ef6d7d4deab5f00b3f3e6b96282b41ae45256f1ae4c5ca4076 SHA512 ec915b61d54cbf11451cfcad2da47ab753229dfa7c9a52e3eeb490fbe67cc16a4cd02158c740b55563ad0587582ffae21baf73cc0b0fe75df4d5f4fee01eebd2
+EBUILD herbstluftwm-9999.ebuild 3400 BLAKE2B ebc8f10a0506aa602092455f0e51b8c1ca3c2a3d4a6c585a6210ffe240b1006b0dcebff3282b8c84eef02605679c86ccfb8900aa4f2c2486a7ca95d0dd39c446 SHA512 0b1be1854a4a331ded3929d4cbb9045a8a690b9da1d916c6cd1a67d12eac9f53c4bc6ae74bbd756d6193f11ad50127362445e2cba1d79dab375ccd7cc0e5456d
 MISC metadata.xml 337 BLAKE2B 7ef28bc6ce30abb6c2f44524b4dd05a479cd5ca2b98901ffe570b870d0b98f94589cd1d3f197ee7e3fd90f4c73144e1dc44996df8b1b3ec28ce6950578ada74e SHA512 6e7cb80e1870901554ac0c2a4947cceb4e6284ccc84714bb0f42dbfa69cab5b32a8bd34fd384731b9462535d7e80feef606030be3e03babc80828a980050f333
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
new file mode 100644
index 000000000000..4989b68eb8db
--- /dev/null
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
+
+DESCRIPTION="A manual tiling window manager for X"
+HOMEPAGE="https://herbstluftwm.org/"
+
+if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
+	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
+	inherit git-r3
+else
+	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="+doc python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXrender
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-python/ewmh
+		dev-python/python-xlib
+		x11-apps/xsetroot
+		x11-base/xorg-server[xephyr,xvfb]
+		x11-misc/xdotool
+		x11-terms/xterm
+	)
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-shells/bash
+	python? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+"
+
+if [[ -n "${EGIT_REPO_URI}" ]]; then
+	# Herbstluftwm tarballs ship with pre-compiled documentation, only
+	# if we build from git asciidoc is needed.
+	BDEPEND+=" doc? ( app-text/asciidoc )"
+fi
+
+src_prepare() {
+	# Do not install LICENSE and respect CMAKE_INSTALL_DOCDIR.
+	sed -i \
+		-e '/^install.*LICENSEDIR/d' \
+		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
+		CMakeLists.txt || die
+	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# Ensure that 'python3' is in PATH. #765118
+	python_setup
+
+	mycmakeargs=(
+		-DWITH_DOCUMENTATION=$(usex doc)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	if use python; then
+		pushd python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+	fi
+
+	# The man pages exists in src_install either in non-live ebuilds,
+	# since they are then shipped pre-compiled in herbstluftwm's
+	# release tarbal. Or they exist in live ebuilds if the 'doc' USE
+	# flag is enabled.
+	if [[ "${PV}" != 9999 ]] || use doc; then
+		local man_pages=(
+			herbstluftwm.1
+			herbstclient.1
+			herbstluftwm-tutorial.7
+		)
+		for man_page in "${man_pages[@]}"; do
+			doman "doc/${man_page}"
+		done
+	fi
+}
+
+distutils_enable_tests pytest
+
+src_test() {
+	ln -s "${BUILD_DIR}/herbstclient" || die "Could not symlink herbstclient"
+	ln -s "${BUILD_DIR}/herbstluftwm" || die "Could not symlink herbstluftwm"
+
+	pushd python > /dev/null || die
+	distutils_install_for_testing
+	popd > /dev/null || die
+
+	# Ensure PYTHONPATH is exported, see https://bugs.gentoo.org/801658.
+	export PYTHONPATH
+	python_test
+}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
index ed397f906c24..4bb6c21b60f1 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
 
-inherit cmake distutils-r1 toolchain-funcs
+inherit cmake distutils-r1
 
 DESCRIPTION="A manual tiling window manager for X"
 HOMEPAGE="https://herbstluftwm.org/"
@@ -26,12 +26,13 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND="
-	media-libs/freetype
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXft
 	x11-libs/libXinerama
 	x11-libs/libXrandr
+	x11-libs/libXrender
 "
 DEPEND="
 	${COMMON_DEPEND}
@@ -70,6 +71,11 @@ src_prepare() {
 		-e '/^install.*LICENSEDIR/d' \
 		-e '/set(DOCDIR / s#.*#set(DOCDIR ${CMAKE_INSTALL_DOCDIR})#' \
 		CMakeLists.txt || die
+
+	# Do not install MAN pages, we use doman in src_install() for that.
+	sed -i '/MANDIR/d' \
+		doc/CMakeLists.txt || die
+
 	cmake_src_prepare
 
 	if use python; then
@@ -123,7 +129,7 @@ src_install() {
 			herbstluftwm-tutorial.7
 		)
 		for man_page in "${man_pages[@]}"; do
-			doman "doc/${man_page}"
+			doman "${BUILD_DIR}/doc/${man_page}"
 		done
 	fi
 }
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index ce24d30ed597..3f03de0e85cb 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,7 +3,9 @@ AUX mutter-42.0-Disable-anonymous-file-test.patch 765 BLAKE2B 7d223e0dc98963b61c
 DIST mutter-41.4.tar.xz 2717012 BLAKE2B 2f9d144380072427c0ee65c1e3bb26e5caca76e0656f316459a77df09f9e8bda3ea9c17c6400d04abee9c7f82b36dbd035794cf31feef7ee4574ce308d627e55 SHA512 ee3881f9047f0b9ef8598609e9ac90294cb36a7549fcc6a647a80553045ed315998d0dbac247887ae06b32126bab1525f13f7f92655b9103cac77750e347e405
 DIST mutter-42.0.tar.xz 2742212 BLAKE2B 4867d184fbf63f7624c907f941f1aa1ac8d66108554385c1500b6259958a3c2bf5dcd30cebed95cbafd4a1bbd5368b6078edec695884a0ee9eb48dbf0ad4cecf SHA512 ffcfbb1b6d3add84adf2d67d459905d164dc272289b645994288c376bc656481526d445cdfe6df027b88ab590258ee9d9d4ba251e03c6ef93d17f0758f75520d
 DIST mutter-42.1.tar.xz 2747056 BLAKE2B 7973e6178e3a61078c37c593a8ffabbd002b791b8251fdf9aa7c90b40efa76591f9946cdd31dd6f274c2a4455157c8661d63714619f3966250eeca5ddae34689 SHA512 b7c7011f1c3c4361ddfdcffc61057f8821c37cfb602d7f7ec97fdd1f0ab19dd331f396ca4f61c83253d003d1d866b0d2ff1e7f34bbc9e98b48aacb973aabd6d5
+DIST mutter-42.2.tar.xz 2747612 BLAKE2B 39d83283dc04473e47263d463849030c1076bb5b8d6fbc37f03e1936cb999ab554784f02ad9a04cdbfa2f35ad95c74c0899ee44e9710e435e66de613628cc683 SHA512 e43bdc7c9183b2578ae1f777fdf84bfde550a26bfc28fd4a1a183c7f310d852110f3dcabd50a2fabdafba4cfb8aa6577aec4c65775075f0afff7bd1bb4dde957
 EBUILD mutter-41.4.ebuild 4973 BLAKE2B cf7432698172a8ec8baff3d665201e3f531c888acf9cca24eee2dbb33b743f536161a9ad88c7d83a5b6564594794c4ec6c5bb4346e38344a9adac8edc69f2baf SHA512 f8566f3a13911e970ca52e5fd057a8d80b9d782d5ef5bd1a85ab310514a7afa9f6c4bb5d1c4042b421f819ef0a9e02b0d623b531fb9d76a49147f4c24f1f9532
 EBUILD mutter-42.0-r1.ebuild 5377 BLAKE2B bdd67a1ac3dfa4f2494c78848138cc10043add8e5fec79e3aa21c294475abb21660c7f672e73d6eb2de7e3cc70b0ddc9cd0a52b8281693b53514e689ede06197 SHA512 d83ec646bfbfdd02c5b462c40e9c8ed15b2f050cfd277445d38e5c9d921f34aca53f9ce5c6cd14e05a803b197532f8419fc4f0546caab06be18d555e79d0d25a
-EBUILD mutter-42.1.ebuild 5454 BLAKE2B 5bbf7ae350497c55259f50cb4c95e9deda0bee55931ded79291c51f478750fa506f8156e5b0ccfce33cd31e9ca3107143ccece182dc20cc276a129db49ca8f8b SHA512 7a79d7302d8a15658ad5d7d3e49aa039c87356f73311390b0f926e988502e4a8809d257efedb4bac1ba19117c2ba6df7cb98b9e0e0616fbad041c3bac1c27c5a
+EBUILD mutter-42.1.ebuild 5451 BLAKE2B 1e19e26fb5c7685eb43ca8e49ce9c470d5bf59ef55013d7b9eb34ddbfa8258b74b974fb80900238ce4ab3fa1ed1441f73457fa0b54abcf30f9d8f49de53f4296 SHA512 5f9a049dcf87d30ff0e892da6aa1621c21565b9e3dc56576463abe19a59bcc489e0fec44b5012468b6033747f9bfe58a1b1543a1b7598289b1c3d28293f5f4ec
+EBUILD mutter-42.2.ebuild 5454 BLAKE2B 5bbf7ae350497c55259f50cb4c95e9deda0bee55931ded79291c51f478750fa506f8156e5b0ccfce33cd31e9ca3107143ccece182dc20cc276a129db49ca8f8b SHA512 7a79d7302d8a15658ad5d7d3e49aa039c87356f73311390b0f926e988502e4a8809d257efedb4bac1ba19117c2ba6df7cb98b9e0e0616fbad041c3bac1c27c5a
 MISC metadata.xml 606 BLAKE2B 54a05fee61cf9a1d958a46e0cc94e1cd61e69e187f89393c483c7022d455b7248684df4f1df028f0733995dacfbdf1faab600d8c239885eb0c7ea3097326f156 SHA512 6dea733bb5da3bd2db059a467cec81f7cfc0765750cdcfa0404a72cbb168495f13d01051198206178615b1a3fa41f78dffd9f0a38f6d7579116e782d76fab899
diff --git a/x11-wm/mutter/mutter-42.1.ebuild b/x11-wm/mutter/mutter-42.1.ebuild
index 1ea322f5ea67..3edf61ef69c1 100644
--- a/x11-wm/mutter/mutter-42.1.ebuild
+++ b/x11-wm/mutter/mutter-42.1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
 	test? ( wayland )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 
 # gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
 # xorg-server is needed at build and runtime with USE=wayland for Xwayland
diff --git a/x11-wm/mutter/mutter-42.2.ebuild b/x11-wm/mutter/mutter-42.2.ebuild
new file mode 100644
index 000000000000..1ea322f5ea67
--- /dev/null
+++ b/x11-wm/mutter/mutter-42.2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 udev xdg
+
+DESCRIPTION="GNOME compositing window manager based on Clutter"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/mutter/"
+
+LICENSE="GPL-2+"
+SLOT="0/$(($(ver_cut 1) - 32))" # 0/libmutter_api_version - ONLY gnome-shell (or anything using mutter-clutter-<api_version>.pc) should use the subslot
+
+IUSE="doc elogind gnome input_devices_wacom +introspection screencast sysprof systemd test udev wayland video_cards_nvidia"
+# native backend requires gles3 for hybrid graphics blitting support, udev and a logind provider
+REQUIRED_USE="
+	wayland? ( ^^ ( elogind systemd ) udev )
+	test? ( wayland )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+# gnome-settings-daemon is build checked, but used at runtime only for org.gnome.settings-daemon.peripherals.keyboard gschema
+# xorg-server is needed at build and runtime with USE=wayland for Xwayland
+# v3.32.2 has many excessive or unused *_req variables declared, thus currently the dep order ignores those and goes via dependency() call order
+DEPEND="
+	>=x11-libs/libX11-1.7.0
+	>=media-libs/graphene-1.10.2[introspection?]
+	>=x11-libs/gtk+-3.19.8:3[X,introspection?]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/pango-1.46[introspection?]
+	>=dev-libs/fribidi-1.0.0
+	>=x11-libs/cairo-1.14[X]
+	>=gnome-base/gsettings-desktop-schemas-42.0[introspection?]
+	>=dev-libs/glib-2.69.0:2
+	gnome-base/gnome-settings-daemon
+	>=dev-libs/json-glib-0.12.0[introspection?]
+	>=x11-libs/libXcomposite-0.4
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	>=x11-libs/libXfixes-3
+	>=x11-libs/libXi-1.7.4
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	x11-misc/xkeyboard-config
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-libs/libXrender
+	>=x11-libs/libXrandr-1.5.0
+	x11-libs/libxcb
+	x11-libs/libXinerama
+	x11-libs/libXau
+	x11-libs/libICE
+	>=dev-libs/atk-2.5.3[introspection?]
+	>=media-libs/libcanberra-0.26
+	sys-apps/dbus
+	gnome? ( gnome-base/gnome-desktop:3= )
+	media-libs/mesa[X(+),egl(+)]
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	systemd? ( sys-apps/systemd )
+	wayland? (
+		>=dev-libs/wayland-protocols-1.21
+		>=dev-libs/wayland-1.18.0
+		x11-libs/libdrm:=
+		>=media-libs/mesa-17.3[egl(+),gbm(+),wayland,gles2]
+		>=dev-libs/libinput-1.18.0
+		elogind? ( sys-auth/elogind )
+		x11-base/xwayland
+		video_cards_nvidia? ( gui-libs/egl-wayland )
+	)
+	udev? ( >=dev-libs/libgudev-232:=
+		>=virtual/libudev-232-r1:= )
+	x11-libs/libSM
+	input_devices_wacom? ( >=dev-libs/libwacom-0.13 )
+	>=x11-libs/startup-notification-0.7
+	screencast? ( >=media-video/pipewire-0.3.21:= )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	doc? ( >=dev-util/gi-docgen-2021.1 )
+"
+RDEPEND="${DEPEND}
+	gnome-extra/zenity
+
+	!<gui-libs/gtk-4.6.4:4
+	!<x11-libs/gtk+-3.24.34:3
+"
+DEPEND="${DEPEND}
+	x11-base/xorg-proto
+	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
+"
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
+BDEPEND="
+	dev-libs/wayland
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/python-dbusmock[${PYTHON_USEDEP}]
+		')
+		app-text/docbook-xml-dtd:4.5
+		x11-misc/xvfb-run
+	)
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		x11-libs/libxcvt
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-42.0-Disable-anonymous-file-test.patch
+)
+
+python_check_deps() {
+	if use test; then
+		has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_configure() {
+	# TODO: Replicate debug vs release meson build type behaviour under our buildtype=plain
+	local emesonargs=(
+		-Dopengl=true
+		#opengl_libname
+		#gles2_libname
+		$(meson_use wayland gles2)
+		-Degl=true
+		-Dglx=true
+		$(meson_use wayland)
+		$(meson_use systemd)
+		$(meson_use wayland native_backend)
+		$(meson_use screencast remote_desktop)
+		-Dlibgnome_desktop=true
+		$(meson_use udev)
+		-Dudev_dir=$(get_udevdir)
+		$(meson_use input_devices_wacom libwacom)
+		-Dpango_ft2=true
+		-Dstartup_notification=true
+		-Dsm=true
+		$(meson_use introspection)
+		$(meson_use doc docs)
+		$(meson_use test cogl_tests)
+		$(meson_use wayland core_tests) # core tests require wayland; overall -Dtests option is honored on top, so no extra conditional needed
+		-Dnative_tests=false
+		$(meson_use test clutter_tests)
+		$(meson_use test tests)
+		-Dkvm_tests=false
+		-Dtty_tests=false
+		$(meson_use sysprof profiler)
+		-Dinstalled_tests=false
+		#verbose # Let upstream choose default for verbose mode
+		#xwayland_path
+		# TODO: relies on default settings, but in Gentoo we might have some more packages we want to give Xgrab access (mostly virtual managers and remote desktops)
+		#xwayland_grab_default_access_rules
+	)
+
+	if use wayland && use video_cards_nvidia; then
+		emesonargs+=(
+			-Degl_device=true
+			-Dwayland_eglstream=true
+		)
+	else
+		emesonargs+=(
+			-Degl_device=false
+			-Dwayland_eglstream=false
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_test() {
+	gnome2_environment_reset # Avoid dconf that looks at XDG_DATA_DIRS, which can sandbox fail if flatpak is installed
+	glib-compile-schemas "${BUILD_DIR}"/data
+	GSETTINGS_SCHEMA_DIR="${BUILD_DIR}"/data meson_src_test --setup=CI
+}
+
+pkg_postinst() {
+	use udev && udev_reload
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 05959308dc95..0e6614905c38 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,5 +1,3 @@
-DIST twm-1.0.11.tar.xz 261176 BLAKE2B 775ee483f34b1f45e737e0f1a907c07398883bd7bb2c17f729b38a2562af1a85f27b4dfa76b5fa1f88768e01c17c8cb364baaf39d80307aee3732183c5964653 SHA512 948034bba23e6b6c4412fcd2e46bb11a9980297601218a54a5055165ab0229a44dde0d50f338b24e82d76f390597e2fa09d11ff7f3fe1b1d736b10083c7da20d
 DIST twm-1.0.12.tar.xz 262624 BLAKE2B 4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f SHA512 f3d68df7e06516f6b74f19181efcfd9db2479c8ea0c72c3a6ed0dc1b222405b40d81a2dea17b662955e0c1783e87d0d3eb067c3b6e7c6eed8c0d38d03d362260
-EBUILD twm-1.0.11.ebuild 561 BLAKE2B aa2e20f143ac5cafee61239be93679da4900f9f3325e7cd637830009e3f3164fa1b2f9b28ef11cf7aec621537b28990eff5b5e0d35202fab660fa2d01bd38e92 SHA512 a005868f3c14a1d7ac4e78104ab56ed93d00fa44436384f8bee6e0fea7aa1146631504093d8e7f39d5456f0dc0501cc1338414cb1927b83d26d6dd8fc7d3ccdd
-EBUILD twm-1.0.12.ebuild 569 BLAKE2B cdbd0df6bb257bd47795e9dcf1eb5fe557abbac35f06786c86dddd85c71bd5bea7fdeb58429a040b8afcd53fe0b3f91201c0d3ba6b3ad59d9d175a17edf5eccb SHA512 4928cae415d6d12762716d423b888132238b8c86aafb2ce09e1290869cea73b61c8c7b7bf420203c2254aff22415e474f211bf39999638c1be6ebe1439d7fe2b
+EBUILD twm-1.0.12.ebuild 568 BLAKE2B 5ec681257bda1fb9b0edaac06f41fa11cad6f91baa362c7476fef16b966a2bba00e8eeae327fa38dee288a59aec6d2737f2930c7b360caad17f40aa292756858 SHA512 90e66923fb95dca08ef6a66e8992c0dab75911c423ceffaa714db37af3a931c83c75ec0583125033630f30ea8320c78ea386bcb320a0c6257c02aa57d45de802
 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc
diff --git a/x11-wm/twm/twm-1.0.11.ebuild b/x11-wm/twm/twm-1.0.11.ebuild
deleted file mode 100644
index cd028be52d14..000000000000
--- a/x11-wm/twm/twm-1.0.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_TARBALL_SUFFIX="xz"
-inherit xorg-3
-
-DESCRIPTION="X.Org Tab Window Manager"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-COMMON_DEPEND="
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrandr
-	x11-libs/libXt
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto"
-RDEPEND="${COMMON_DEPEND}
-	media-fonts/font-adobe-75dpi"
diff --git a/x11-wm/twm/twm-1.0.12.ebuild b/x11-wm/twm/twm-1.0.12.ebuild
index 31b89dc79357..f891b052eeaa 100644
--- a/x11-wm/twm/twm-1.0.12.ebuild
+++ b/x11-wm/twm/twm-1.0.12.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org Tab Window Manager"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 COMMON_DEPEND="